@codingame/monaco-vscode-katex-common 34.1.3 → 35.0.1

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

@@ -56,6 +56,7 @@ import { canLog, LogLevel } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { observableMemento } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/observableMemento';
 import { bindContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
+import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
@@ -78,20 +79,22 @@ import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { ChatRequestVariableSet, isImageVariableEntry, isExplicitFileOrImageVariableEntry, isStringVariableEntry, getImageAttachmentLimit, OmittedState, isNotebookOutputVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isElementVariableEntry, isPasteVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry, isBrowserViewVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
 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 { SessionType, localChatSessionType, isIChatSessionFileChange2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { SessionType, localChatSessionType, isAgentHostTarget, 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, ChatPermissionLevel, isChatPermissionLevel } 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 { ChatModelConfigurationStore } from './chatModelConfigurationStore.js';
+import { deserializeUntitledInputState, serializeUntitledInputState, deserializeUntitledInputAttachments, serializeUntitledInputAttachments } from './chatInputStatePersistence.js';
 import { logChangesToStateModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
-import { filterModelsForSession, shouldResetOnModelListChange, shouldRestorePersistedModel, shouldRestoreLateArrivingModel, resolveModelFromSyncState, shouldResetModelToDefault, mergeModelsWithCache, hasModelsTargetingSession, isModelValidForSession, findDefaultModel } from './chatModelSelectionLogic.js';
+import { filterModelsForSession, shouldResetOnModelListChange, findBestMatchingModel, hasModelsTargetingSession, resolveConfiguredModel, shouldRestorePersistedModel, shouldRestoreLateArrivingModel, resolveModelFromSyncState, shouldResetModelToDefault, mergeModelsWithCache, isModelValidForSession, findDefaultModel } from './chatModelSelectionLogic.js';
 import { LocalChatSessionUri, 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, OpenModePickerAction, OpenModelPickerAction, OpenSessionTargetPickerAction, OpenDelegationPickerAction, ChatSessionPrimaryPickerAction, OpenWorkspacePickerAction, OpenPermissionPickerAction } from '../../actions/chatExecuteActions.js';
+import { ChatSubmitAction, OpenModePickerAction, OpenModelPickerAction, OpenAutomationsWorkspacePickerAction, OpenSessionTargetPickerAction, OpenDelegationPickerAction, ChatSessionPrimaryPickerAction, OpenWorkspacePickerAction, 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';
@@ -104,8 +107,9 @@ import { ChatEditingShowChangesAction, ViewPreviousEditsAction } from '../../cha
 import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
 import { ChatSessionPickerActionItem } from '../../chatSessions/chatSessionPickerActionItem.js';
 import { AgentHostChatInputPicker, AgentHostChatInputPickerActionViewItem } from '../../agentSessions/agentHost/agentHostChatInputPicker.js';
-import { OpenAgentHostModePickerAction, OpenAgentHostAutoApprovePickerAction, OpenAgentHostPermissionModePickerAction } from '../../agentSessions/agentHost/agentHostChatInputPicker.contribution.js';
+import { OpenAgentHostModePickerAction, OpenAgentHostAutoApprovePickerAction, OpenAgentHostPermissionModePickerAction, OpenAgentHostFolderPickerAction } from '../../agentSessions/agentHost/agentHostChatInputPicker.contribution.js';
 import { AgentHostGenericConfigChips } from '../../agentSessions/agentHost/agentHostGenericConfigChips.js';
+import { AgentHostFolderPickerActionItem } from '../../agentSessions/agentHost/agentHostFolderPickerActionItem.js';
 import { SessionConfigKey } from '../../../../../../platform/agentHost/common/sessionConfigKeys.js';
 import { ClaudeSessionConfigKey } from '../../../../../../platform/agentHost/common/claudeSessionConfigKeys.js';
 import { MobileChatInputCombinedPickerActionItem } from './chatPhoneInputPresenter.js';
@@ -125,16 +129,17 @@ import { ChatInputNotificationWidget } from './chatInputNotificationWidget.js';
 import { ChatSelectedTools } from './chatSelectedTools.js';
 import { DelegationSessionPickerActionItem } from './delegationSessionPickerActionItem.js';
 import { ModelPickerActionItem } from './modelPickerActionItem.js';
-import { ModePickerActionItem } from './modePickerActionItem.js';
+import { isModeConsideredBuiltIn, ModePickerActionItem } from './modePickerActionItem.js';
 import { PermissionPickerActionItem } from './permissionPickerActionItem.js';
 import { SessionTypePickerActionItem } from './sessionTargetPickerActionItem.js';
 import { WorkspacePickerActionItem } from './workspacePickerActionItem.js';
+import { WorkspacePickerInputActionItem } from './workspacePickerInputActionItem.js';
 import { ChatContextUsageWidget } from '../../widgetHosts/viewPane/chatContextUsageWidget.js';
-import { ChatInputStatusActionViewItem } from './chatInputStatusActionViewItem.js';
 import { Target } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { findLast } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
 import { ConfigureToolsAction } from '../../actions/chatToolActions.js';
 import { InlineCompletionsController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
+import { PlaceholderTextContribution } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/placeholderText/browser/placeholderTextContribution';
 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';
@@ -165,24 +170,39 @@ var ChatWidgetLocation;
     ChatWidgetLocation["Panel"] = "panel";
     ChatWidgetLocation["Editor"] = "editor";
 })(ChatWidgetLocation || (ChatWidgetLocation = {}));
-const emptyInputState = observableMemento({
-    defaultValue: undefined,
-    key: "chat.untitledInputState",
-    toStorage: JSON.stringify,
-    fromStorage(value) {
-        const obj = JSON.parse(value);
-        if (obj.selectedModel && !obj.selectedModel.metadata.isDefaultForLocation) {
-            const oldIsDefault = obj.selectedModel.metadata.isDefault;
-            const isDefaultForLocation = {
-                [ChatAgentLocation.Chat]: Boolean(oldIsDefault)
-            };
-            mixin(obj.selectedModel.metadata, {
-                isDefaultForLocation: isDefaultForLocation
-            });
-            delete obj.selectedModel.metadata.isDefault;
-        }
-        return obj;
+const LEGACY_SHARED_INPUT_STATE_TAGS = ( new Set(["view", "editor", "quick"]));
+function getInputStateStorageKey(widgetViewKindTag) {
+    if (( LEGACY_SHARED_INPUT_STATE_TAGS.has(widgetViewKindTag))) {
+        return "chat.untitledInputState";
     }
+    return `chat.untitledInputState.${widgetViewKindTag}`;
+}
+function createEmptyInputStateMemento(widgetViewKindTag) {
+    return observableMemento({
+        defaultValue: undefined,
+        key: getInputStateStorageKey(widgetViewKindTag),
+        toStorage: serializeUntitledInputState,
+        fromStorage(value) {
+            const obj = deserializeUntitledInputState(value);
+            if (obj.selectedModel && !obj.selectedModel.metadata.isDefaultForLocation) {
+                const oldIsDefault = obj.selectedModel.metadata.isDefault;
+                const isDefaultForLocation = {
+                    [ChatAgentLocation.Chat]: Boolean(oldIsDefault)
+                };
+                mixin(obj.selectedModel.metadata, {
+                    isDefaultForLocation: isDefaultForLocation
+                });
+                delete obj.selectedModel.metadata.isDefault;
+            }
+            return obj;
+        }
+    });
+}
+const emptyInputAttachments = observableMemento({
+    defaultValue: [],
+    key: "chat.untitledInputAttachments",
+    toStorage: serializeUntitledInputAttachments,
+    fromStorage: deserializeUntitledInputAttachments
 });
 let ChatInputPart = class ChatInputPart extends Disposable {
     static {
@@ -258,11 +278,12 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 name: mode.name.get(),
                 content: modeInstructions.content,
                 toolReferences: this.toolService.toToolReferences(modeInstructions.toolReferences),
+                allowedSubagents: mode.agents?.get(),
                 metadata: modeInstructions.metadata,
                 isBuiltin: mode.isBuiltin
             } : undefined,
-            modeId: modeId,
-            modeName: getModeNameForTelemetry(mode),
+            telemetryModeId: modeId,
+            telemetryModeName: getModeNameForTelemetry(mode),
             applyCodeBlockSuggestionId: undefined,
             permissionLevel: this._currentPermissionLevel.get()
         };
@@ -316,7 +337,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         viewDescriptorService,
         _chatAttachmentWidgetRegistry,
         chatInputNotificationService,
-        chatPhoneInputPresenter
+        chatPhoneInputPresenter,
+        productService
     ) {
         super();
         this.location = location;
@@ -350,6 +372,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._chatAttachmentWidgetRegistry = _chatAttachmentWidgetRegistry;
         this.chatInputNotificationService = chatInputNotificationService;
         this.chatPhoneInputPresenter = chatPhoneInputPresenter;
+        this.productService = productService;
         this._workingSetCollapsed = observableValue("chatInputPart.workingSetCollapsed", true);
         this._stableInputPartWidth = observableValue("chatInputPart.stableInputPartWidth", 0);
         this._chatInputTodoListWidget = this._register(( new MutableDisposable()));
@@ -413,8 +436,14 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._renderingChatEdits = this._register(( new MutableDisposable()));
         this._attemptedWorkingSetEntriesCount = 0;
         this._chatSessionIsEmpty = false;
+        this._userExplicitlySelectedModel = false;
         this._pendingDelegationTarget = undefined;
         this._currentSessionType = undefined;
+        this._modelConfigStore = this._register(( new ChatModelConfigurationStore(
+            () => this.getModelConfigurationStorageKey(),
+            this.languageModelsService,
+            this.storageService
+        )));
         this._syncTextDebounced = this._register(( new RunOnceScheduler(() => {
             logChangesToStateModel(
                 this._inputModel,
@@ -426,7 +455,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this._syncInputStateToModel();
         }, 150)));
         this._emptyInputState = this._register(
-            emptyInputState(StorageScope.WORKSPACE, StorageTarget.USER, this.storageService)
+            createEmptyInputStateMemento(this.options.widgetViewKindTag)(StorageScope.WORKSPACE, StorageTarget.USER, this.storageService)
+        );
+        this._emptyInputAttachments = this._register(
+            emptyInputAttachments(StorageScope.WORKSPACE, StorageTarget.USER, this.storageService)
         );
         this._contextResourceLabels = this._register(this.instantiationService.createInstance(ResourceLabels, {
             onDidChangeVisibility: this._onDidChangeVisibility.event
@@ -458,18 +490,26 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (this.options.sessionTypePickerDelegate?.onDidChangeActiveSessionProvider) {
             this._register(
                 this.options.sessionTypePickerDelegate.onDidChangeActiveSessionProvider(async newSessionType => {
+                    this._currentSessionType = newSessionType;
                     this.getVisibleOptionGroupsModeAndUpdateContextKeys(this.getCurrentSessionResource());
                     this.agentSessionTypeKey.set(newSessionType);
                     this.chatSessionSupportsDelegationKey.set(this.chatSessionsService.supportsDelegationForSessionType(newSessionType));
                     this.updateWidgetLockStateFromSessionType(newSessionType);
                     this.checkModeInSessionPool(newSessionType);
+                    this.revalidateModelForSessionType();
                     this.refreshChatSessionPickers();
                     this._notificationWidget.value?.rerender();
                 })
             );
         }
         this._attachmentModel = this._register(this.instantiationService.createInstance(ChatAttachmentModel));
-        this._register(this._attachmentModel.onDidChange(() => this._syncInputStateToModel()));
+        this._register(this._attachmentModel.onDidChange(() => {
+            if (this._chatSessionIsEmpty) {
+                this._emptyInputAttachments.set(this._attachmentModel.attachments, undefined);
+            }
+            this._syncInputStateToModel();
+        }));
+        this._register(this._modelConfigStore.onDidChange(() => this._syncInputStateToModel()));
         this.selectedToolsModel = this._register(
             this.instantiationService.createInstance(ChatSelectedTools, this.currentModeObs, this._currentLanguageModel)
         );
@@ -478,6 +518,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         );
         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.singleLineInputEditorHeight = INPUT_EDITOR_LINE_HEIGHT + padding.top + padding.bottom;
         this.inputEditorMinHeight = this.options.inputEditorMinLines ? this.options.inputEditorMinLines * INPUT_EDITOR_LINE_HEIGHT + padding.top + padding.bottom : undefined;
         this.inputEditorHasText = ChatContextKeys.inputHasText.bindTo(contextKeyService);
         this.inputEditorHasSendableContent = ChatContextKeys.inputHasSendableContent.bindTo(contextKeyService);
@@ -495,6 +536,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.chatSessionOptionsValid = ChatContextKeys.chatSessionOptionsValid.bindTo(contextKeyService);
         this.agentSessionTypeKey = ChatContextKeys.agentSessionType.bindTo(contextKeyService);
         this.chatSessionSupportsDelegationKey = ChatContextKeys.chatSessionSupportsDelegation.bindTo(contextKeyService);
+        this.chatHasPendingDelegationTargetKey = ChatContextKeys.hasPendingDelegationTarget.bindTo(contextKeyService);
         if (this.options.sessionTypePickerDelegate?.getActiveSessionProvider) {
             const initialSessionType = this.options.sessionTypePickerDelegate.getActiveSessionProvider();
             if (initialSessionType) {
@@ -519,6 +561,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     this.setPermissionLevel(this.getDefaultPermissionLevel());
                 }
             }
+            if (e.affectsConfiguration(ChatConfiguration.DefaultModel)) {
+                this._applyConfiguredDefaultForEmptySession();
+            }
             if (e.affectsConfiguration(AccessibilityVerbositySettingId.Chat)) {
                 newOptions.ariaLabel = this._getAriaLabel();
             }
@@ -546,6 +591,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         ));
         this._hasFileAttachmentContextKey = ChatContextKeys.hasFileAttachments.bindTo(contextKeyService);
         this.initSelectedModel();
+        this._register(this._onDidChangeCurrentChatMode.event(() => {
+            this.checkModelSupported();
+        }));
         const resetCurrentLanguageModelIfUnavailable = () => {
             const modelIdentifier = this._currentLanguageModel.get()?.identifier;
             const models = this.getModels();
@@ -587,9 +635,19 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     this.logService
                 );
             }
+            if (this._applyConfiguredDefaultForEmptySession()) {
+                this._updateInputContentContextKeys();
+                return;
+            }
             if (shouldResetOnModelListChange(modelIdentifier, models)) {
-                this.setCurrentLanguageModelToDefault();
+                const match = findBestMatchingModel(this._currentLanguageModel.get(), models);
+                if (match) {
+                    this.setCurrentLanguageModel(match);
+                } else {
+                    this.setCurrentLanguageModelToDefault();
+                }
             }
+            this._updateInputContentContextKeys();
         };
         this._register(
             this.languageModelsService.onDidChangeLanguageModels(resetCurrentLanguageModelIfUnavailable)
@@ -609,6 +667,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._register(autorun(reader => {
             const lm = this._currentLanguageModel.read(reader);
             this.chatModelIdKey.set(lm?.metadata.id.toLowerCase() ?? "");
+            this.contextUsageWidget?.setSelectedModel(lm?.identifier);
             if (lm?.metadata.name) {
                 this.accessibilityService.alert(lm.metadata.name);
             }
@@ -626,6 +685,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             const mode = this._currentModeObservable.read(r);
             this.chatModeKindKey.set(mode.kind);
             this.chatModeNameKey.set(mode.name.read(r));
+            if (this.options.suppressModePreferredModel) {
+                return;
+            }
             const models = mode.model?.read(r);
             if (models) {
                 this.switchModelByQualifiedName(models);
@@ -644,20 +706,24 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     }
     getSelectedModelStorageKey() {
         const sessionType = this._currentSessionType;
-        if (sessionType && this.hasModelsTargetingSessionType()) {
+        if (sessionType && this.sessionTypeHasOwnModelPool(sessionType)) {
             return `chat.currentLanguageModel.${this.location}.${sessionType}`;
         }
         return `chat.currentLanguageModel.${this.location}`;
     }
     getSelectedModelIsDefaultStorageKey() {
         const sessionType = this._currentSessionType;
-        if (sessionType && this.hasModelsTargetingSessionType()) {
+        if (sessionType && this.sessionTypeHasOwnModelPool(sessionType)) {
             return `chat.currentLanguageModel.${this.location}.${sessionType}.isDefault`;
         }
         return `chat.currentLanguageModel.${this.location}.isDefault`;
     }
+    sessionTypeHasOwnModelPool(sessionType) {
+        return this.chatSessionsService.requiresCustomModelsForSessionType(sessionType) || hasModelsTargetingSession(this.getAllMergedModels(), sessionType);
+    }
     initSelectedModel() {
         this._waitForPersistedLanguageModel.clear();
+        this._modelConfigStore.clear();
         const selectedModelStorageKey = this.getSelectedModelStorageKey();
         const selectedModelIsDefaultStorageKey = this.getSelectedModelIsDefaultStorageKey();
         const persistedSelection = this.storageService.get(selectedModelStorageKey, StorageScope.APPLICATION);
@@ -669,6 +735,24 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             undefined,
             this.logService
         );
+        const configuredValue = this.getConfiguredModelValue();
+        if (configuredValue) {
+            const configuredModel = resolveConfiguredModel(configuredValue, this.getModels());
+            if (configuredModel) {
+                this.setCurrentLanguageModel(configuredModel);
+                this.checkModelSupported();
+                return;
+            }
+            this._waitForPersistedLanguageModel.value = this.languageModelsService.onDidChangeLanguageModels(() => {
+                const lateModel = resolveConfiguredModel(configuredValue, this.getModels());
+                if (lateModel) {
+                    this._waitForPersistedLanguageModel.clear();
+                    this.setCurrentLanguageModel(lateModel);
+                    this.checkModelSupported();
+                }
+            });
+            return;
+        }
         if (persistedSelection) {
             const result = shouldRestorePersistedModel(persistedSelection, persistedAsDefault, this.getModels(), this.location);
             logChangesToStateModel(
@@ -700,9 +784,6 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 });
             }
         }
-        this._register(this._onDidChangeCurrentChatMode.event(() => {
-            this.checkModelSupported();
-        }));
     }
     setEditing(enabled, editingSentRequest) {
         this.currentlyEditingInputKey?.set(enabled);
@@ -717,11 +798,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this.setCurrentLanguageModel(model);
         }
     }
-    switchModelByIdentifier(identifier) {
+    switchModelByIdentifier(identifier, storeSelection = true) {
         const models = this.getModels();
         const model = models.find(m => m.identifier === identifier);
         if (model) {
-            this.setCurrentLanguageModel(model);
+            this.setCurrentLanguageModel(model, false, storeSelection);
             return true;
         }
         return false;
@@ -747,7 +828,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (models.length > 0) {
             const currentIndex = models.findIndex(model => model.identifier === this._currentLanguageModel.get()?.identifier);
             const nextIndex = (currentIndex + 1) % models.length;
-            this.setCurrentLanguageModel(models[nextIndex]);
+            this.setCurrentLanguageModel(models[nextIndex], true);
         }
     }
     switchToNextPinnedModel() {
@@ -762,7 +843,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         const currentIndex = pinnedModels.findIndex(model => model.identifier === this._currentLanguageModel.get()?.identifier);
         const nextIndex = (currentIndex + 1) % pinnedModels.length;
-        this.setCurrentLanguageModel(pinnedModels[nextIndex]);
+        this.setCurrentLanguageModel(pinnedModels[nextIndex], true);
     }
     openModelPicker() {
         if (this.chatPhoneInputPresenter.enabled.get()) {
@@ -794,13 +875,14 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             setModel: model => {
                 this._waitForPersistedLanguageModel.clear();
                 this._waitForSessionHistoryLanguageModel.clear();
-                this.setCurrentLanguageModel(model);
+                this.setCurrentLanguageModel(model, true, !this.options.suppressModelPersistence);
                 this.renderAttachedContext();
             },
             getModels: () => this.getModels(),
+            isCacheWarm: () => (this._widget?.viewModel?.model.getRequests().length ?? 0) > 0,
             useGroupedModelPicker: () => {
                 const sessionType = this.getCurrentSessionType();
-                return !sessionType || sessionType === localChatSessionType;
+                return !sessionType || sessionType === localChatSessionType || isAgentHostTarget(sessionType);
             },
             showManageModelsAction: () => {
                 const sessionType = this.getCurrentSessionType();
@@ -808,19 +890,51 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             },
             showUnavailableFeatured: () => {
                 const sessionType = this.getCurrentSessionType();
-                return !sessionType || sessionType === localChatSessionType;
+                return !sessionType || sessionType === localChatSessionType || isAgentHostTarget(sessionType);
             },
             showFeatured: () => {
                 const sessionType = this.getCurrentSessionType();
-                return !sessionType || sessionType === localChatSessionType;
-            }
+                return !sessionType || sessionType === localChatSessionType || isAgentHostTarget(sessionType);
+            },
+            showAutoModel: () => this._showAutoModel(),
+            modelConfiguration: this._modelConfigStore
         };
     }
+    getModelConfiguration(modelId) {
+        return this._modelConfigStore.getModelConfiguration(modelId);
+    }
+    restoreModelConfiguration(modelId, modelConfiguration) {
+        if (modelConfiguration) {
+            this._modelConfigStore.restoreModelConfiguration(modelId, modelConfiguration);
+        }
+    }
+    getModelConfigurationStorageKey() {
+        const sessionType = this._currentSessionType;
+        if (sessionType && this.sessionTypeHasOwnModelPool(sessionType)) {
+            return `chat.modelConfiguration.${this.location}.${sessionType}`;
+        }
+        return `chat.modelConfiguration.${this.location}`;
+    }
     _createModePickerDelegate() {
+        const productService = this.productService;
+        const currentChatModes = this.options.hideCustomChatModes ? derived(reader => {
+            const inner = this._currentChatModesObservable.read(reader);
+            const filteredCustom = inner.custom.filter(m => isModeConsideredBuiltIn(m, productService));
+            const wrapped = {
+                onDidChange: inner.onDidChange,
+                builtin: inner.builtin,
+                custom: filteredCustom,
+                findModeById: id => inner.builtin.find(m => m.id === id) ?? filteredCustom.find(m => m.id === id),
+                findModeByName: name => inner.builtin.find(m => m.name.read(undefined) === name) ?? filteredCustom.find(m => m.name.read(undefined) === name),
+                waitForPendingUpdates: () => inner.waitForPendingUpdates()
+            };
+            return wrapped;
+        }) : this._currentChatModesObservable;
         return {
             currentMode: this._currentModeObservable,
-            currentChatModes: this._currentChatModesObservable,
+            currentChatModes,
             sessionResource: () => this._widget?.viewModel?.sessionResource,
+            setMode: mode => this.setChatMode2(mode, true),
             customAgentTarget: () => {
                 const sessionResource = this._widget?.viewModel?.model.sessionResource;
                 return (sessionResource && this.chatSessionsService.getCustomAgentTargetForSessionType(getChatSessionType(sessionResource))) ?? Target.Undefined;
@@ -941,7 +1055,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._currentChatModesObservable.set(chatModes, undefined);
         this.selectedToolsModel.resetSessionEnablementState();
         this._chatSessionIsEmpty = chatSessionIsEmpty;
+        this._userExplicitlySelectedModel = false;
         if (chatSessionIsEmpty) {
+            const persistedState = model.state.get() ? undefined : this._getPersistedEmptyInputState();
+            if (persistedState) {
+                model.setState(persistedState);
+                this._syncFromModel(persistedState, forSessionResource);
+            }
             logChangesToStateModel(this._inputModel, `(1) setting empty model state for ${( forSessionResource.toString())}`, undefined, undefined, this.logService);
             this._setEmptyModelState();
             this._modelSyncDisposables.add(this.configurationService.onDidChangeConfiguration(e => {
@@ -970,8 +1090,26 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             let state = model.state.read(reader);
             let message = `syncing from model for ${( forSessionResource.toString())} in ${this._currentSessionKey}`;
             if (!state && this._chatSessionIsEmpty) {
-                state = this._emptyInputState.read(undefined);
+                state = this._getPersistedEmptyInputState();
                 message = `syncing from empty input state for ${( forSessionResource.toString())}`;
+                if (state && this.getConfiguredModelValue()) {
+                    const configuredModel = this.getConfiguredDefaultModel(this.getModels());
+                    if (configuredModel) {
+                        if (configuredModel.identifier !== state.selectedModel?.identifier) {
+                            state = {
+                                ...state,
+                                selectedModel: configuredModel,
+                                modelConfiguration: undefined
+                            };
+                        }
+                    } else if (state.selectedModel) {
+                        state = {
+                            ...state,
+                            selectedModel: undefined,
+                            modelConfiguration: undefined
+                        };
+                    }
+                }
             }
             const widgetSessionResource = this._widget?.viewModel?.model.sessionResource;
             const isStaleSession = !!this._inputModelSessionResource && !isEqual(this._inputModelSessionResource, forSessionResource);
@@ -986,6 +1124,36 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this._syncFromModel(state, forSessionResource);
         }));
     }
+    _getPersistedEmptyInputState() {
+        let state = this._emptyInputState.read(undefined);
+        if (!state) {
+            return undefined;
+        }
+        const persistedAttachments = this._emptyInputAttachments.read(undefined);
+        state = {
+            ...state,
+            attachments: persistedAttachments.length > 0 ? persistedAttachments : state.attachments
+        };
+        if (this.getConfiguredModelValue()) {
+            const configuredModel = this.getConfiguredDefaultModel(this.getModels());
+            if (configuredModel) {
+                if (configuredModel.identifier !== state.selectedModel?.identifier) {
+                    state = {
+                        ...state,
+                        selectedModel: configuredModel,
+                        modelConfiguration: undefined
+                    };
+                }
+            } else if (state.selectedModel) {
+                state = {
+                    ...state,
+                    selectedModel: undefined,
+                    modelConfiguration: undefined
+                };
+            }
+        }
+        return state;
+    }
     _setEmptyModelState() {
         logChangesToStateModel(
             this._inputModel,
@@ -1049,9 +1217,20 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     this.logService
                 );
                 if (syncResult.action === "apply") {
+                    this._waitForPersistedLanguageModel.clear();
+                    this.restoreModelConfiguration(state.selectedModel.identifier, state.modelConfiguration);
                     this.setCurrentLanguageModel(state.selectedModel);
+                } else if (syncResult.action === "keep") {
+                    this._waitForPersistedLanguageModel.clear();
+                    this.restoreModelConfiguration(state.selectedModel.identifier, state.modelConfiguration);
                 } else if (syncResult.action === "default") {
-                    this.setCurrentLanguageModelToDefault();
+                    const pool = this.getModelsForSessionType(sessionType);
+                    const match = findBestMatchingModel(state.selectedModel, pool) ?? findBestMatchingModel(currentLm, pool);
+                    if (match) {
+                        this.setCurrentLanguageModel(match);
+                    } else {
+                        this.setCurrentLanguageModelToDefault(sessionType);
+                    }
                 }
             } else if (state) {
                 logChangesToStateModel(
@@ -1117,13 +1296,16 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this._syncInputStateToModel();
         }
     }
-    setCurrentLanguageModel(model) {
+    setCurrentLanguageModel(model, isUserAction = false, storeSelection = true) {
+        if (isUserAction) {
+            this._userExplicitlySelectedModel = true;
+        }
         const modelDetails = ( this.getModels().map(m => `${m.identifier} (${m.metadata.id})`)).join(", ");
         const selectedModelStorageKey = this.getSelectedModelStorageKey();
         const selectedModelIsDefaultStorageKey = this.getSelectedModelIsDefaultStorageKey();
         logChangesToStateModel(
             this._inputModel,
-            `setCurrentLanguageModel to ${model.identifier} in ${this._currentSessionKey}, storageKey=${selectedModelStorageKey}, isDefaultKey=${selectedModelIsDefaultStorageKey}, currentSessionType=${this._currentSessionType}, getCurrentSessionType=${this.getCurrentSessionType()}, boundInputModelSession=${this._inputModelSessionResource?.toString()}, modelDetials = ${modelDetails}`,
+            `setCurrentLanguageModel to ${model.identifier} in ${this._currentSessionKey}, storageKey=${selectedModelStorageKey}, isDefaultKey=${selectedModelIsDefaultStorageKey}, currentSessionType=${this._currentSessionType}, getCurrentSessionType=${this.getCurrentSessionType()}, boundInputModelSession=${this._inputModelSessionResource?.toString()}, modelDetials = ${modelDetails}, storeSelection=${storeSelection}`,
             undefined,
             undefined,
             this.logService
@@ -1132,18 +1314,20 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (this.cachedWidth) {
             this.layout(this.cachedWidth);
         }
-        this.storageService.store(
-            this.getSelectedModelStorageKey(),
-            model.identifier,
-            StorageScope.APPLICATION,
-            StorageTarget.USER
-        );
-        this.storageService.store(
-            this.getSelectedModelIsDefaultStorageKey(),
-            !!model.metadata.isDefaultForLocation[this.location],
-            StorageScope.APPLICATION,
-            StorageTarget.USER
-        );
+        if (storeSelection) {
+            this.storageService.store(
+                this.getSelectedModelStorageKey(),
+                model.identifier,
+                StorageScope.APPLICATION,
+                StorageTarget.USER
+            );
+            this.storageService.store(
+                this.getSelectedModelIsDefaultStorageKey(),
+                !!model.metadata.isDefaultForLocation[this.location],
+                StorageScope.APPLICATION,
+                StorageTarget.USER
+            );
+        }
         this._syncInputStateToModel();
     }
     checkModelSupported() {
@@ -1166,7 +1350,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             currentModeKind: this.currentModeKind,
             sessionType: this.getCurrentSessionType()
         }, allModels)) {
-            this.setCurrentLanguageModelToDefault();
+            this.setCurrentLanguageModelToDefault(undefined, !this.options.suppressModelPersistence);
         }
     }
     setChatMode(mode, storeSelection = true) {
@@ -1183,14 +1367,16 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         this._currentModeObservable.set(mode, undefined);
         this._onDidChangeCurrentChatMode.fire();
-        logChangesToStateModel(
-            this._inputModel,
-            `setChatMode2 -> _syncInputStateToModel (mode=${mode.id}, storeSelection=${storeSelection}, currentLanguageModel=${this._currentLanguageModel.get()?.identifier}) in ${this._currentSessionKey}`,
-            undefined,
-            undefined,
-            this.logService
-        );
-        this._syncInputStateToModel();
+        if (storeSelection) {
+            logChangesToStateModel(
+                this._inputModel,
+                `setChatMode2 -> _syncInputStateToModel (mode=${mode.id}, storeSelection=${storeSelection}, currentLanguageModel=${this._currentLanguageModel.get()?.identifier}) in ${this._currentSessionKey}`,
+                undefined,
+                undefined,
+                this.logService
+            );
+            this._syncInputStateToModel();
+        }
     }
     getAllMergedModels() {
         const cachedModels = this.storageService.getObject(CachedLanguageModelsKey, StorageScope.APPLICATION, []);
@@ -1217,21 +1403,33 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         return models;
     }
     getModels() {
-        const models = this.getAllMergedModels();
-        models.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
-        const sessionFiltered = filterModelsForSession(models, this.getCurrentSessionType(), this.currentModeKind, this.location);
+        return this.getModelsForSessionType(this.getCurrentSessionType());
+    }
+    _showAutoModel() {
+        const sessionType = this.getCurrentSessionType();
+        return !sessionType || this.chatSessionsService.supportsAutoModelForSessionType(sessionType);
+    }
+    hasNoAvailableModel() {
+        return !this._showAutoModel() && this.getModels().length === 0;
+    }
+    getModelsForSessionType(sessionType) {
+        const allModels = this.getAllMergedModels();
+        if (sessionType && this.chatSessionsService.requiresCustomModelsForSessionType(sessionType) && !hasModelsTargetingSession(allModels, sessionType)) {
+            return [];
+        }
+        allModels.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
+        const sessionFiltered = filterModelsForSession(allModels, sessionType, this.currentModeKind, this.location);
         return sessionFiltered.filter(m => !this.languageModelsService.isModelHidden(m.identifier));
     }
     getCurrentSessionType() {
-        const delegateSessionType = this.options.sessionTypePickerDelegate?.getActiveSessionProvider?.();
-        if (delegateSessionType) {
-            return delegateSessionType;
-        }
         const sessionResource = this._widget?.viewModel?.model.sessionResource;
-        return sessionResource ? getChatSessionType(sessionResource) : undefined;
+        if (sessionResource) {
+            return getChatSessionType(sessionResource);
+        }
+        return this.options.sessionTypePickerDelegate?.getActiveSessionProvider?.();
     }
-    hasModelsTargetingSessionType() {
-        return hasModelsTargetingSession(this.getAllMergedModels(), this.getCurrentSessionType());
+    getNotificationSessionType() {
+        return this._pendingDelegationTarget ?? this._currentSessionType ?? this.getCurrentSessionType();
     }
     isModelValidForCurrentSession(model) {
         return isModelValidForSession(model, this.getAllMergedModels(), this.getCurrentSessionType());
@@ -1242,6 +1440,20 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this.setCurrentLanguageModelToDefault();
         }
     }
+    revalidateModelForSessionType() {
+        const previousModel = this._currentLanguageModel.get();
+        this.initSelectedModel();
+        const restored = this._currentLanguageModel.get();
+        if (restored && this.isModelValidForCurrentSession(restored)) {
+            return;
+        }
+        const match = findBestMatchingModel(previousModel, this.getModels());
+        if (match) {
+            this.setCurrentLanguageModel(match);
+            return;
+        }
+        this.setCurrentLanguageModelToDefault();
+    }
     checkModeInSessionPool(sessionType) {
         if (!sessionType) {
             const sessionResource = this._widget?.viewModel?.model.sessionResource;
@@ -1318,22 +1530,56 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             }
         });
     }
-    setCurrentLanguageModelToDefault() {
-        const allModels = this.getModels();
-        const defaultModel = findDefaultModel(allModels, this.location);
+    setCurrentLanguageModelToDefault(forSessionType, storeSelection = true) {
+        const sessionType = forSessionType ?? this.getCurrentSessionType();
+        if (sessionType && this.chatSessionsService.requiresCustomModelsForSessionType(sessionType) && !hasModelsTargetingSession(this.getAllMergedModels(), sessionType)) {
+            return;
+        }
+        const allModels = this.getModelsForSessionType(sessionType);
+        const configuredModel = this.getConfiguredDefaultModel(allModels);
+        const defaultModel = configuredModel ?? findDefaultModel(allModels, this.location);
         logChangesToStateModel(
             this._inputModel,
-            `[DEFAULT] setCurrentLanguageModelToDefault called (defaultModel=${defaultModel?.identifier}, currentLm=${this._currentLanguageModel.get()?.identifier}) in ${this._currentSessionKey}`,
+            `[DEFAULT] setCurrentLanguageModelToDefault called (defaultModel=${defaultModel?.identifier}, configuredModel=${configuredModel?.identifier}, currentLm=${this._currentLanguageModel.get()?.identifier}, storeSelection=${storeSelection}) in ${this._currentSessionKey}`,
             undefined,
             this._inputModel?.state.get(),
             this.logService
         );
         if (defaultModel) {
-            this.setCurrentLanguageModel(defaultModel);
+            this.setCurrentLanguageModel(defaultModel, false, storeSelection);
+        }
+    }
+    getConfiguredDefaultModel(pool) {
+        return resolveConfiguredModel(this.getConfiguredModelValue(), pool);
+    }
+    getConfiguredModelValue() {
+        const model = this.configurationService.getValue(ChatConfiguration.DefaultModel)?.trim();
+        return model ? model : undefined;
+    }
+    _applyConfiguredDefaultForEmptySession() {
+        if (!this._chatSessionIsEmpty || this._userExplicitlySelectedModel) {
+            return false;
+        }
+        const configuredValue = this.getConfiguredModelValue();
+        if (!configuredValue) {
+            return false;
+        }
+        const configuredModel = this.getConfiguredDefaultModel(this.getModels());
+        if (!configuredModel || configuredModel.identifier === this._currentLanguageModel.get()?.identifier) {
+            return false;
         }
+        this._waitForPersistedLanguageModel.clear();
+        this.setCurrentLanguageModel(configuredModel);
+        this.checkModelSupported();
+        return true;
+    }
+    resetLanguageModelToDefault(storeSelection = true) {
+        this._waitForPersistedLanguageModel.clear();
+        this.setCurrentLanguageModelToDefault(undefined, storeSelection);
     }
     getCurrentInputState() {
         const mode = this._currentModeObservable.get();
+        const selectedModel = this._currentLanguageModel.get();
         const state = {
             inputText: this._inputEditor?.getValue() ?? "",
             attachments: this._attachmentModel.attachments,
@@ -1341,7 +1587,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 id: mode.id,
                 kind: mode.kind
             },
-            selectedModel: this._currentLanguageModel.get(),
+            selectedModel,
+            modelConfiguration: selectedModel ? this._modelConfigStore.getModelConfiguration(selectedModel.identifier) : undefined,
             selections: this._inputEditor?.getSelections() || [],
             permissionLevel: this._currentPermissionLevel.get(),
             contrib: {}
@@ -1359,40 +1606,40 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         const mode = this._currentModeObservable.get();
         const modelName = this._currentLanguageModel.get()?.metadata.name;
-        const modelInfo = modelName ? ( localize(7677, ", {0}. ", modelName)) : "";
+        const modelInfo = modelName ? ( localize(8243, ", {0}. ", modelName)) : "";
         let modeLabel = "";
         if (!mode.isBuiltin) {
             const mode = this.currentModeObs.get();
-            modeLabel = ( localize(7678, "({0}), {1}", mode.label.get(), mode.description.get()));
+            modeLabel = ( localize(8244, "({0}), {1}", mode.label.get(), mode.description.get()));
         } else {
             switch (this.currentModeKind) {
             case ChatModeKind.Agent:
-                modeLabel = ( localize(7679, "(Agent), edit files in your workspace."));
+                modeLabel = ( localize(8245, "(Agent), edit files in your workspace."));
                 break;
             case ChatModeKind.Edit:
-                modeLabel = ( localize(7680, "(Edit), edit files in your workspace."));
+                modeLabel = ( localize(8246, "(Edit), edit files in your workspace."));
                 break;
             case ChatModeKind.Ask:
             default:
-                modeLabel = ( localize(7681, "(Ask), ask questions or type / for topics."));
+                modeLabel = ( localize(8247, "(Ask), ask questions or type / for topics."));
                 break;
             }
         }
         if (verbose) {
             return kbLabel ? ( localize(
-                7682,
+                8248,
                 "Chat Input {0}{1} Press Enter to send out the request. Use {2} for Chat Accessibility Help.",
                 modeLabel,
                 modelInfo,
                 kbLabel
             )) : ( localize(
-                7683,
+                8249,
                 "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(7684, "Chat Input {0}{1}.", modeLabel, modelInfo);
+            return localize(8250, "Chat Input {0}{1}.", modeLabel, modelInfo);
         }
     }
     validateCurrentChatMode() {
@@ -1531,7 +1778,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     hasVisibleTodos() {
         return this._chatInputTodoListWidget.value?.hasTodos() ?? false;
     }
-    async acceptInput(isUserQuery) {
+    async acceptInput(isUserQuery, preserveFocus) {
         if (isUserQuery) {
             const userQuery = this.getCurrentInputState();
             this.history.append(this._getFilteredEntry(userQuery));
@@ -1541,6 +1788,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (this._chatSessionIsEmpty) {
             this._chatSessionIsEmpty = false;
             this._emptyInputState.set(undefined, undefined);
+            this._emptyInputAttachments.set([], undefined);
         }
         logChangesToStateModel(
             this._inputModel,
@@ -1553,6 +1801,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._onDidLoadInputState.fire();
         if (this.accessibilityService.isScreenReaderOptimized() && isMacintosh) {
             this._acceptInputForVoiceover();
+        } else if (preserveFocus) {
+            this._inputEditor.setValue("");
         } else {
             this._inputEditor.focus();
             this._inputEditor.setValue("");
@@ -1597,7 +1847,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     _updateInputContentContextKeys() {
         const inputHasText = !!this._inputEditor?.getModel()?.getValue().trim();
         this.inputEditorHasText.set(inputHasText);
-        this.inputEditorHasSendableContent.set(inputHasText || ( this._attachmentModel.attachments.some(isExplicitFileOrImageVariableEntry)));
+        const hasSendableContent = inputHasText || ( this._attachmentModel.attachments.some(isExplicitFileOrImageVariableEntry));
+        this.inputEditorHasSendableContent.set(hasSendableContent && !this.hasNoAvailableModel());
     }
     getOrCreateOptionEmitter(optionGroupId) {
         let emitter = this._chatSessionOptionEmitters.get(optionGroupId);
@@ -1649,11 +1900,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (!visibleOptionGroups.length) {
             this.chatSessionHasOptions.set(false);
             this.chatSessionOptionsValid.set(true);
+            this._updateInputContentContextKeys();
             return [];
         }
         const allOptionsValid = sessionResource ? this.areAllOptionsValid(sessionResource, visibleOptionGroups) : true;
         this.chatSessionHasOptions.set(true);
         this.chatSessionOptionsValid.set(allOptionsValid);
+        this._updateInputContentContextKeys();
         return visibleOptionGroups;
     }
     getCurrentSessionResource() {
@@ -1815,17 +2068,36 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         const contribution = this.chatSessionsService.getChatSessionContribution(sessionType);
         if (contribution) {
-            this._widget?.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
+            this._widget?.lockToCodingAgent(
+                contribution.name,
+                contribution.displayName,
+                contribution.type,
+                contribution.agentHostProviderId
+            );
         } else {
             this._widget?.unlockFromCodingAgent();
         }
     }
+    getActiveSessionTypeForDelegation() {
+        const sessionResource = this._widget?.viewModel?.sessionResource;
+        return sessionResource ? (getAgentSessionProvider(sessionResource) ?? getChatSessionType(sessionResource)) : undefined;
+    }
+    continueInSession(provider) {
+        this.setPendingDelegationTarget(provider);
+        this.focus();
+    }
+    setPendingDelegationTarget(provider) {
+        const isActive = this.getActiveSessionTypeForDelegation() === provider;
+        this._pendingDelegationTarget = isActive ? undefined : provider;
+        this.chatHasPendingDelegationTargetKey.set(!!this._pendingDelegationTarget);
+        this.updateWidgetLockStateFromSessionType(provider);
+        this.updateAgentSessionTypeContextKey();
+        this.refreshChatSessionPickers();
+        this._notificationWidget.value?.rerender();
+    }
     ensureNotificationWidget() {
         if (!this._notificationWidget.value) {
-            this._notificationWidget.value = this.instantiationService.createInstance(
-                ChatInputNotificationWidget,
-                () => this._currentSessionType ?? this.getCurrentSessionType()
-            );
+            this._notificationWidget.value = this.instantiationService.createInstance(ChatInputNotificationWidget, () => this.getNotificationSessionType());
             this.chatInputNotificationContainer.appendChild(this._notificationWidget.value.domNode);
         }
     }
@@ -1860,10 +2132,16 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._contextUsageDisposables.value = store;
         store.add(model.onDidChange(e => {
             if (e.kind === "addRequest" || e.kind === "completedRequest") {
-                this.contextUsageWidget?.update(model.lastRequest);
+                this.contextUsageWidget?.update(model.lastRequest, model.sessionCost);
             }
         }));
-        this.contextUsageWidget.update(model.lastRequest);
+        store.add(this.languageModelsService.onDidChangeLanguageModels(() => {
+            const lastRequest = model.lastRequest;
+            if (lastRequest?.modelId) {
+                this.contextUsageWidget?.update(lastRequest, model.sessionCost);
+            }
+        }));
+        this.contextUsageWidget.update(model.lastRequest, model.sessionCost);
     }
     render(container, initialValue, widget) {
         this._widget = widget;
@@ -1877,6 +2155,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         this._register(widget.onDidChangeViewModel(e => {
             this._pendingDelegationTarget = undefined;
+            this.chatHasPendingDelegationTargetKey.set(false);
             this.updateAgentSessionTypeContextKey();
             this.refreshChatSessionPickers();
             this.ensureNotificationWidget();
@@ -2021,10 +2300,16 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.chatGoalBannerContainer = elements.chatGoalBannerContainer;
         this.contextUsageWidgetContainer = elements.contextUsageWidgetContainer;
         this.statusToolbarContainer = elements.statusToolbarContainer;
-        if (this.options.isSessionsWindow || this.options.renderStyle === "compact") {
+        if (this.options.renderStyle === "compact") {
             toolbarsContainer.prepend(this.contextUsageWidgetContainer);
         }
         this.contextUsageWidget = this._register(this.instantiationService.createInstance(ChatContextUsageWidget));
+        this.contextUsageWidget.setChatWidget(widget);
+        this.contextUsageWidget.setSelectedModel(this._currentLanguageModel.get()?.identifier);
+        this.contextUsageWidget.setModelConfigurationResolver(
+            modelId => this.getModelConfiguration(modelId),
+            this._modelConfigStore.onDidChange
+        );
         this.contextUsageWidgetContainer.appendChild(this.contextUsageWidget.domNode);
         if (this.options.enableImplicitContext && !this._implicitContext) {
             this._implicitContext = this._register(this.instantiationService.createInstance(ChatImplicitContexts));
@@ -2106,7 +2391,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             DropIntoEditorController.ID,
             CopyPasteController.ID,
             LinkDetector.ID,
-            InlineCompletionsController.ID
+            InlineCompletionsController.ID,
+            PlaceholderTextContribution.ID
         ]));
         this._inputEditor = this._register(
             scopedInstantiationService.createInstance(CodeEditorWidget, this._inputEditorElement, options, editorOptions)
@@ -2249,24 +2535,26 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     } else if (action.id === OpenModePickerAction.ID && action instanceof MenuItemAction) {
                         const delegate = this._createModePickerDelegate();
                         return this.modeWidget = this.instantiationService.createInstance(ModePickerActionItem, action, delegate, pickerOptions);
+                    } else if (action.id === OpenAutomationsWorkspacePickerAction.ID && action instanceof MenuItemAction) {
+                        if (this.options.workspacePickerInput) {
+                            return this.instantiationService.createInstance(
+                                WorkspacePickerInputActionItem,
+                                action,
+                                this.options.workspacePickerInput,
+                                undefined
+                            );
+                        }
+                        return ( new HiddenActionViewItem(action));
                     } else if ((action.id === OpenSessionTargetPickerAction.ID || action.id === OpenDelegationPickerAction.ID) && action instanceof MenuItemAction) {
-                        const getActiveSessionType = () => {
-                            const sessionResource = this._widget?.viewModel?.sessionResource;
-                            return sessionResource ? (getAgentSessionProvider(sessionResource) ?? getChatSessionType(sessionResource)) : undefined;
-                        };
                         const delegate = this.options.sessionTypePickerDelegate ?? {
                             getActiveSessionProvider: () => {
-                                return getActiveSessionType();
+                                return this.getActiveSessionTypeForDelegation();
                             },
                             getPendingDelegationTarget: () => {
                                 return this._pendingDelegationTarget;
                             },
                             setPendingDelegationTarget: provider => {
-                                const isActive = getActiveSessionType() === provider;
-                                this._pendingDelegationTarget = isActive ? undefined : provider;
-                                this.updateWidgetLockStateFromSessionType(provider);
-                                this.updateAgentSessionTypeContextKey();
-                                this.refreshChatSessionPickers();
+                                this.setPendingDelegationTarget(provider);
                             },
                             hasGitRepository: () => this.hasWorkspaceScmRepository()
                         };
@@ -2361,6 +2649,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             [OpenAgentHostModePickerAction.ID, 22],
             [OpenAgentHostAutoApprovePickerAction.ID, 22],
             [OpenAgentHostPermissionModePickerAction.ID, 22],
+            [OpenAgentHostFolderPickerAction.ID, 22],
             ["sessions.tunnelHost.toggleSharing", 16]
         ]));
         const genericChipsContainer = $$1(".chat-secondary-generic-chips");
@@ -2387,24 +2676,20 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     getActionMinWidth: action => agentHostShortPickerMinWidths.get(action.id)
                 },
                 actionViewItemProvider: (action, options) => {
+                    const customSecondaryItem = this.options.secondaryToolbarActionViewItemProvider?.(action, options);
+                    if (customSecondaryItem) {
+                        return customSecondaryItem;
+                    }
                     if ((action.id === OpenSessionTargetPickerAction.ID || action.id === OpenDelegationPickerAction.ID) && action instanceof MenuItemAction) {
-                        const getActiveSessionType = () => {
-                            const sessionResource = this._widget?.viewModel?.sessionResource;
-                            return sessionResource ? (getAgentSessionProvider(sessionResource) ?? getChatSessionType(sessionResource)) : undefined;
-                        };
                         const delegate = this.options.sessionTypePickerDelegate ?? {
                             getActiveSessionProvider: () => {
-                                return getActiveSessionType();
+                                return this.getActiveSessionTypeForDelegation();
                             },
                             getPendingDelegationTarget: () => {
                                 return this._pendingDelegationTarget;
                             },
                             setPendingDelegationTarget: provider => {
-                                const isActive = getActiveSessionType() === provider;
-                                this._pendingDelegationTarget = isActive ? undefined : provider;
-                                this.updateWidgetLockStateFromSessionType(provider);
-                                this.updateAgentSessionTypeContextKey();
-                                this.refreshChatSessionPickers();
+                                this.setPendingDelegationTarget(provider);
                             },
                             hasGitRepository: () => this.hasWorkspaceScmRepository()
                         };
@@ -2460,7 +2745,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                                     this.chatSessionsService.setSessionOption(sessionResource, groupId, item);
                                 }
                                 this.permissionWidget?.refresh();
-                            }
+                            },
+                            isSandboxToggleApplicable: () => this.getEffectiveSessionType(this.getCurrentSessionResource()) === SessionType.Local
                         };
                         const widget = this.instantiationService.createInstance(PermissionPickerActionItem, action, delegate, secondaryPickerOptions);
                         this.permissionWidget = widget;
@@ -2478,6 +2764,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                         const property = action.id === OpenAgentHostAutoApprovePickerAction.ID ? SessionConfigKey.AutoApprove : action.id === OpenAgentHostPermissionModePickerAction.ID ? ClaudeSessionConfigKey.PermissionMode : SessionConfigKey.Mode;
                         const picker = this.instantiationService.createInstance(AgentHostChatInputPicker, widget, property);
                         return ( new AgentHostChatInputPickerActionViewItem(action, picker));
+                    } else if (action.id === OpenAgentHostFolderPickerAction.ID && action instanceof MenuItemAction) {
+                        if (this.options.isSessionsWindow) {
+                            return ( new HiddenActionViewItem(action));
+                        }
+                        return this.instantiationService.createInstance(AgentHostFolderPickerActionItem, action, widget, secondaryPickerOptions);
                     } else if (action.id === ChatSessionPrimaryPickerAction.ID && action instanceof MenuItemAction) {
                         const widgets = this.createChatSessionPickerWidgets(action, secondaryPickerOptions);
                         if (widgets.length === 0) {
@@ -2511,13 +2802,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     shouldForwardArgs: true
                 },
                 hiddenItemStrategy: HiddenItemStrategy.NoHide,
-                hoverDelegate,
-                actionViewItemProvider: (action, _opts) => {
-                    if (action instanceof MenuItemAction) {
-                        return this.instantiationService.createInstance(ChatInputStatusActionViewItem, action);
-                    }
-                    return undefined;
-                }
+                hoverDelegate
             }
         ));
         this.statusToolbar.getElement().classList.add("chat-input-status-toolbar");
@@ -2688,7 +2973,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             let attachmentWidget;
             const options = {
                 shouldFocusClearButton,
-                supportsDeletion: true
+                supportsDeletion: true,
+                isCurrentInput: true
             };
             const lm = this._currentLanguageModel.get();
             if (attachment.kind === "tool" || attachment.kind === "toolset") {
@@ -3242,7 +3528,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const button = this._chatEditsActionsDisposables.add(( new ButtonWithIcon(overviewTitle, {
             supportIcons: true,
             secondary: true,
-            ariaLabel: ( localize(7685, "Toggle changed files."))
+            ariaLabel: ( localize(8251, "Toggle changed files."))
         })));
         const topLevelStats = derived(reader => {
             const entries = editSessionEntriesObs.read(reader);
@@ -3304,6 +3590,12 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                                 isSecondary: true
                             };
                         }
+                        if (action.id === "github.copilot.chat.cloudSessions.openPullRequestForTask") {
+                            return {
+                                showIcon: true,
+                                showLabel: false
+                            };
+                        }
                         return undefined;
                     }
                 }
@@ -3316,10 +3608,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 removed,
                 shouldShowEditingSession
             } = topLevelStats.read(reader);
-            const buttonLabel = files === 1 ? ( localize(7686, "1 file changed")) : ( localize(7687, "{0} files changed", files));
+            const buttonLabel = files === 1 ? ( localize(8252, "1 file changed")) : ( localize(8253, "{0} files changed", files));
             button.label = buttonLabel;
             button.element.setAttribute("aria-label", ( localize(
-                7688,
+                8254,
                 "{0}, {1} lines added, {2} lines removed",
                 buttonLabel,
                 added,
@@ -3485,7 +3777,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const currentEditorHeight = this.previousInputEditorDimension?.height ?? 0;
         const nonEditorHeight = Math.max(0, this.height.get() - currentEditorHeight);
         const budgetForEditor = this._maxHeight - nonEditorHeight;
-        return Math.min(this.inputEditorMaxHeight, Math.max(0, budgetForEditor));
+        const minEditorHeight = this.inputEditorMinHeight ?? this.singleLineInputEditorHeight;
+        return Math.max(
+            minEditorHeight,
+            Math.min(this.inputEditorMaxHeight, Math.max(0, budgetForEditor))
+        );
     }
     _layout(width, allowRecurse = true) {
         const data = this.getLayoutData();
@@ -3525,7 +3821,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         };
         return {
             editorBorder: 2,
-            inputPartHorizontalPadding: this.options.renderStyle === "compact" ? 16 : 24,
+            inputPartHorizontalPadding: this.options.inputPartHorizontalPadding ?? (this.options.renderStyle === "compact" ? 16 : (this.options.isSessionsWindow ? 64 : 24)),
             inputPartHorizontalPaddingInside: this.options.renderStyle === "compact" ? 12 : 10,
             toolbarsWidth: this.options.renderStyle === "compact" ? getToolbarsWidthCompact() : 0,
             sideToolbarWidth: inputSideToolbarWidth > 0 ? inputSideToolbarWidth + 4  : 0
@@ -3604,7 +3900,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.updateInputEditorScrollbarOptions();
     }
 };
-ChatInputPart = ChatInputPart_1 = ( __decorate([( __param(4, IModelService)), ( __param(5, IInstantiationService)), ( __param(6, IContextKeyService)), ( __param(7, IConfigurationService)), ( __param(8, IKeybindingService)), ( __param(9, IAccessibilityService)), ( __param(10, ILanguageModelsService)), ( __param(11, ILogService)), ( __param(12, IFileService)), ( __param(13, IEditorService)), ( __param(14, IThemeService)), ( __param(15, ITextModelService)), ( __param(16, IStorageService)), ( __param(17, IChatAgentService)), ( __param(18, ISharedWebContentExtractorService)), ( __param(19, IChatEntitlementService)), ( __param(20, IChatModeService)), ( __param(21, ILanguageModelToolsService)), ( __param(22, IChatSessionsService)), ( __param(23, IChatContextService)), ( __param(24, IAgentSessionsService)), ( __param(25, IWorkspaceContextService)), ( __param(26, ISCMService)), ( __param(27, IWorkbenchLayoutService)), ( __param(28, IViewDescriptorService)), ( __param(29, IChatAttachmentWidgetRegistry)), ( __param(30, IChatInputNotificationService)), ( __param(31, IChatPhoneInputPresenter))], ChatInputPart));
+ChatInputPart = ChatInputPart_1 = ( __decorate([( __param(4, IModelService)), ( __param(5, IInstantiationService)), ( __param(6, IContextKeyService)), ( __param(7, IConfigurationService)), ( __param(8, IKeybindingService)), ( __param(9, IAccessibilityService)), ( __param(10, ILanguageModelsService)), ( __param(11, ILogService)), ( __param(12, IFileService)), ( __param(13, IEditorService)), ( __param(14, IThemeService)), ( __param(15, ITextModelService)), ( __param(16, IStorageService)), ( __param(17, IChatAgentService)), ( __param(18, ISharedWebContentExtractorService)), ( __param(19, IChatEntitlementService)), ( __param(20, IChatModeService)), ( __param(21, ILanguageModelToolsService)), ( __param(22, IChatSessionsService)), ( __param(23, IChatContextService)), ( __param(24, IAgentSessionsService)), ( __param(25, IWorkspaceContextService)), ( __param(26, ISCMService)), ( __param(27, IWorkbenchLayoutService)), ( __param(28, IViewDescriptorService)), ( __param(29, IChatAttachmentWidgetRegistry)), ( __param(30, IChatInputNotificationService)), ( __param(31, IChatPhoneInputPresenter)), ( __param(32, IProductService))], ChatInputPart));
 function getLastPosition(model) {
     return {
         lineNumber: model.getLineCount(),