@codingame/monaco-vscode-katex-common 33.0.9 → 34.0.0

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

@@ -52,6 +52,7 @@ import { registerAndCreateHistoryNavigationContext } from '@codingame/monaco-vsc
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
+import { canLog, LogLevel } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log';
 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';
@@ -74,16 +75,17 @@ import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vs
 import { AccessibilityCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
 import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions, setupSimpleEditorSelectionStyling } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { ChatRequestVariableSet, isImageVariableEntry, 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 { 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 { localChatSessionType, isIChatSessionFileChange2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { SessionType, 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, 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 { shouldResetOnModelListChange, shouldRestorePersistedModel, shouldRestoreLateArrivingModel, resolveModelFromSyncState, shouldResetModelToDefault, mergeModelsWithCache, filterModelsForSession, hasModelsTargetingSession, isModelValidForSession, findDefaultModel } from './chatModelSelectionLogic.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 { 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';
@@ -102,7 +104,7 @@ 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, OpenAgentHostBranchPickerAction, OpenAgentHostIsolationPickerAction } from '../../agentSessions/agentHost/agentHostChatInputPicker.contribution.js';
+import { OpenAgentHostModePickerAction, OpenAgentHostAutoApprovePickerAction, OpenAgentHostPermissionModePickerAction } from '../../agentSessions/agentHost/agentHostChatInputPicker.contribution.js';
 import { AgentHostGenericConfigChips } from '../../agentSessions/agentHost/agentHostGenericConfigChips.js';
 import { SessionConfigKey } from '../../../../../../platform/agentHost/common/sessionConfigKeys.js';
 import { ClaudeSessionConfigKey } from '../../../../../../platform/agentHost/common/claudeSessionConfigKeys.js';
@@ -118,6 +120,7 @@ import { ChatArtifactsWidget } from '../chatArtifactsWidget.js';
 import { ChatDragAndDrop } from '../chatDragAndDrop.js';
 import { ChatFollowups } from './chatFollowups.js';
 import { IChatInputNotificationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatInputNotificationService.service';
+import { ChatGoalBannerWidget } from './chatGoalBannerWidget.js';
 import { ChatInputNotificationWidget } from './chatInputNotificationWidget.js';
 import { ChatSelectedTools } from './chatSelectedTools.js';
 import { DelegationSessionPickerActionItem } from './delegationSessionPickerActionItem.js';
@@ -127,13 +130,16 @@ import { PermissionPickerActionItem } from './permissionPickerActionItem.js';
 import { SessionTypePickerActionItem } from './sessionTargetPickerActionItem.js';
 import { WorkspacePickerActionItem } from './workspacePickerActionItem.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 { 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 { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 
 var ChatInputPart_1;
 const $ = $$1;
@@ -218,6 +224,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     get inputEditor() {
         return this._inputEditor;
     }
+    setHistoryKey(historyKey) {
+        this.history.setHistoryKey(historyKey);
+    }
     get currentLanguageModel() {
         return this._currentLanguageModel.get()?.identifier;
     }
@@ -378,6 +387,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.overlayClickListener = this._register(( new MutableDisposable()));
         this.attachedContextDisposables = this._register(( new MutableDisposable()));
         this._notificationWidget = this._register(( new MutableDisposable()));
+        this._goalBannerWidget = this._register(( new MutableDisposable()));
+        this._onDidDismissGoalBanner = this._register(( new Emitter()));
+        this.onDidDismissGoalBanner = this._onDidDismissGoalBanner.event;
         this._contextUsageDisposables = this._register(( new MutableDisposable()));
         this.height = observableValue(this, 0);
         this._forceVisibleScrollbarUntilAccept = false;
@@ -403,7 +415,16 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._chatSessionIsEmpty = false;
         this._pendingDelegationTarget = undefined;
         this._currentSessionType = undefined;
-        this._syncTextDebounced = this._register(( new RunOnceScheduler(() => this._syncInputStateToModel(), 150)));
+        this._syncTextDebounced = this._register(( new RunOnceScheduler(() => {
+            logChangesToStateModel(
+                this._inputModel,
+                `[DEBOUNCE] _syncTextDebounced fired -> _syncInputStateToModel in ${this._currentSessionKey}`,
+                undefined,
+                this._inputModel?.state.get(),
+                this.logService
+            );
+            this._syncInputStateToModel();
+        }, 150)));
         this._emptyInputState = this._register(
             emptyInputState(StorageScope.WORKSPACE, StorageTarget.USER, this.storageService)
         );
@@ -443,6 +464,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     this.updateWidgetLockStateFromSessionType(newSessionType);
                     this.checkModeInSessionPool(newSessionType);
                     this.refreshChatSessionPickers();
+                    this._notificationWidget.value?.rerender();
                 })
             );
         }
@@ -458,6 +480,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         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.inputEditorHasSendableContent = ChatContextKeys.inputHasSendableContent.bindTo(contextKeyService);
         this.chatCursorAtTop = ChatContextKeys.inputCursorAtTop.bindTo(contextKeyService);
         this.inputEditorHasFocus = ChatContextKeys.inputHasFocus.bindTo(contextKeyService);
         this._hasQuestionCarouselContextKey = ChatContextKeys.Editing.hasQuestionCarousel.bindTo(contextKeyService);
@@ -523,11 +546,57 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         ));
         this._hasFileAttachmentContextKey = ChatContextKeys.hasFileAttachments.bindTo(contextKeyService);
         this.initSelectedModel();
-        this._register(this.languageModelsService.onDidChangeLanguageModels(() => {
-            if (shouldResetOnModelListChange(this._currentLanguageModel.get()?.identifier, this.getModels())) {
+        const resetCurrentLanguageModelIfUnavailable = () => {
+            const modelIdentifier = this._currentLanguageModel.get()?.identifier;
+            const models = this.getModels();
+            if (canLog(this.logService.getLevel(), LogLevel.Debug)) {
+                const mergedModels = this.getAllMergedModels();
+                const filteredModels = filterModelsForSession(models, this.getCurrentSessionType(), this.currentModeKind, this.location);
+                const messageparts = [
+                    `resetting current language model due to model list change from ${modelIdentifier}`,
+                    `this._widget?.viewModel?.model.sessionResource = ${this._widget?.viewModel?.model.sessionResource?.toString()}`,
+                    `this.currentModeKind = ${this.currentModeKind}`,
+                    `this.getCurrentSessionType = ${this.getCurrentSessionType()}`,
+                    `this._currentSessionType = ${this._currentSessionType}`,
+                    `shouldResetOnModelListChange(modelIdentifier, models) = ${shouldResetOnModelListChange(modelIdentifier, models)}`,
+                    `vendors: ${( this.languageModelsService.getVendors().map(v => v.vendor)).join(", ")}`,
+                    `hiddenModelIds: ${this.languageModelsService.getHiddenModelIds().join(", ")}`,
+                    `model identifiers: ${( models.map(m => m.identifier)).join(", ")}`,
+                    `model target Session Types: ${( models.map(m => m.metadata.targetChatSessionType || "")).join(", ")}`,
+                    `model metadataid: ${( models.map(m => m.metadata.id)).join(", ")}`,
+                    `merged.model identifiers: ${( mergedModels.map(m => m.identifier)).join(", ")}`,
+                    `merged.model target Session Types: ${( mergedModels.map(m => m.metadata.targetChatSessionType || "")).join(", ")}`,
+                    `merged.model metadataid: ${( mergedModels.map(m => m.metadata.id)).join(", ")}`,
+                    `filtered.model identifiers: ${( filteredModels.map(m => m.identifier)).join(", ")}`,
+                    `filtered.model target Session Types: ${( filteredModels.map(m => m.metadata.targetChatSessionType || "")).join(", ")}`,
+                    `filtered.model metadataid: ${( filteredModels.map(m => m.metadata.id)).join(", ")}`
+                ];
+                if (this.getCurrentSessionType() !== SessionType.CopilotCLI) {
+                    const delegateSessionType = this.options.sessionTypePickerDelegate?.getActiveSessionProvider?.();
+                    if (delegateSessionType) {
+                        messageparts.push(`delegateSessionType = ${delegateSessionType}`);
+                    }
+                    const sessionResource = this._widget?.viewModel?.model.sessionResource;
+                    messageparts.push(`current session resource = ${sessionResource}`);
+                }
+                logChangesToStateModel(
+                    this._inputModel,
+                    messageparts.join(", "),
+                    undefined,
+                    undefined,
+                    this.logService
+                );
+            }
+            if (shouldResetOnModelListChange(modelIdentifier, models)) {
                 this.setCurrentLanguageModelToDefault();
             }
-        }));
+        };
+        this._register(
+            this.languageModelsService.onDidChangeLanguageModels(resetCurrentLanguageModelIfUnavailable)
+        );
+        this._register(
+            this.languageModelsService.onDidChangeModelVisibility(resetCurrentLanguageModelIfUnavailable)
+        );
         this._register(this.onDidChangeCurrentChatMode(() => {
             this.accessibilityService.alert(this._currentModeObservable.get().label.get());
             if (this._inputEditor) {
@@ -549,7 +618,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }));
         this._register(autorun(reader => {
             const modes = this._currentChatModesObservable.read(reader);
-            reader.store.add(modes.onDidChange(() => this.validateCurrentChatMode()));
+            reader.store.add(modes.onDidChange(() => {
+                this.validateCurrentChatMode();
+            }));
         }));
         this._register(autorun(r => {
             const mode = this._currentModeObservable.read(r);
@@ -587,10 +658,26 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     }
     initSelectedModel() {
         this._waitForPersistedLanguageModel.clear();
-        const persistedSelection = this.storageService.get(this.getSelectedModelStorageKey(), StorageScope.APPLICATION);
-        const persistedAsDefault = this.storageService.getBoolean(this.getSelectedModelIsDefaultStorageKey(), StorageScope.APPLICATION, true);
+        const selectedModelStorageKey = this.getSelectedModelStorageKey();
+        const selectedModelIsDefaultStorageKey = this.getSelectedModelIsDefaultStorageKey();
+        const persistedSelection = this.storageService.get(selectedModelStorageKey, StorageScope.APPLICATION);
+        const persistedAsDefault = this.storageService.getBoolean(selectedModelIsDefaultStorageKey, StorageScope.APPLICATION, true);
+        logChangesToStateModel(
+            this._inputModel,
+            `[INIT-SELECTED-MODEL] storageKey=${selectedModelStorageKey}, isDefaultKey=${selectedModelIsDefaultStorageKey}, persistedSelection=${persistedSelection}, persistedAsDefault=${persistedAsDefault}, currentSessionType=${this._currentSessionType}, getCurrentSessionType=${this.getCurrentSessionType()}, widgetSession=${this._currentSessionKey}, boundInputModelSession=${this._inputModelSessionResource?.toString()}, currentLanguageModel=${this._currentLanguageModel.get()?.identifier}`,
+            this._inputModel?.state.get(),
+            undefined,
+            this.logService
+        );
         if (persistedSelection) {
             const result = shouldRestorePersistedModel(persistedSelection, persistedAsDefault, this.getModels(), this.location);
+            logChangesToStateModel(
+                this._inputModel,
+                `[INIT-SELECTED-MODEL] restore decision persistedSelection=${persistedSelection}, shouldRestore=${result.shouldRestore}, resultModel=${result.model?.identifier}, storageKey=${selectedModelStorageKey}, currentSessionType=${this._currentSessionType}, getCurrentSessionType=${this.getCurrentSessionType()}`,
+                this._inputModel?.state.get(),
+                undefined,
+                this.logService
+            );
             if (result.shouldRestore && result.model) {
                 this.setCurrentLanguageModel(result.model);
                 this.checkModelSupported();
@@ -630,6 +717,15 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this.setCurrentLanguageModel(model);
         }
     }
+    switchModelByIdentifier(identifier) {
+        const models = this.getModels();
+        const model = models.find(m => m.identifier === identifier);
+        if (model) {
+            this.setCurrentLanguageModel(model);
+            return true;
+        }
+        return false;
+    }
     switchModelByQualifiedName(qualifiedModelNames) {
         const models = this.getModels();
         for (const qualifiedModelName of qualifiedModelNames) {
@@ -743,6 +839,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (sessionResource) {
             this.chatSessionsService.setSessionOption(sessionResource, PERMISSION_LEVEL_OPTION_ID, level);
         }
+        logChangesToStateModel(
+            this._inputModel,
+            `setPermissionLevel -> _syncInputStateToModel (level=${level}, currentLanguageModel=${this._currentLanguageModel.get()?.identifier}) in ${this._currentSessionKey}`,
+            undefined,
+            undefined,
+            this.logService
+        );
         this._syncInputStateToModel();
     }
     getDefaultPermissionLevel() {
@@ -818,10 +921,20 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         return widgets;
     }
     setInputModel(model, chatSessionIsEmpty, forSessionResource) {
+        logChangesToStateModel(this._inputModel, `setInputModel for ${( forSessionResource.toString())} (chatSessionIsEmpty=${chatSessionIsEmpty}, outgoing._inputModel=${this._inputModel ? "present" : "undefined"})`, model.state.get(), this._inputModel?.state.get(), this.logService);
         if (this._inputModel) {
+            logChangesToStateModel(
+                this._inputModel,
+                `[FLUSH-PRE] setInputModel pre-flush boundInputModelSession=${this._inputModelSessionResource?.toString()} widgetSession=${this._currentSessionKey} incoming=${( forSessionResource.toString())}`,
+                undefined,
+                this._inputModel.state.get(),
+                this.logService
+            );
             this._syncInputStateToModel();
         }
+        this._currentSessionType = getChatSessionType(forSessionResource);
         this._inputModel = model;
+        this._inputModelSessionResource = forSessionResource;
         this._modelSyncDisposables.clear();
         const chatModes = this.chatModeService.createModes(forSessionResource);
         this._currentChatModes.value = chatModes;
@@ -829,28 +942,60 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.selectedToolsModel.resetSessionEnablementState();
         this._chatSessionIsEmpty = chatSessionIsEmpty;
         if (chatSessionIsEmpty) {
+            logChangesToStateModel(this._inputModel, `(1) setting empty model state for ${( forSessionResource.toString())}`, undefined, undefined, this.logService);
             this._setEmptyModelState();
             this._modelSyncDisposables.add(this.configurationService.onDidChangeConfiguration(e => {
                 if (this._chatSessionIsEmpty && e.affectsConfiguration(ChatConfiguration.DefaultNewSessionMode)) {
+                    logChangesToStateModel(this._inputModel, `(2) setting empty model state for ${( forSessionResource.toString())}`, undefined, undefined, this.logService);
                     this._setEmptyModelState();
                 }
             }));
             this._modelSyncDisposables.add(this._currentChatModesObservable.get().onDidChange(() => {
                 if (this._chatSessionIsEmpty) {
+                    logChangesToStateModel(this._inputModel, `(3) setting empty model state for ${( forSessionResource.toString())}`, undefined, undefined, this.logService);
                     this._setEmptyModelState();
                 }
             }));
         }
+        const widgetViewModelSession = this._widget?.viewModel?.model.sessionResource;
+        const isStaleAtRegistration = !!widgetViewModelSession && !isEqual(widgetViewModelSession, forSessionResource);
+        logChangesToStateModel(
+            this._inputModel,
+            `[AUTORUN-REG] registering model->view autorun for ${( forSessionResource.toString())}, widgetSession=${this._currentSessionKey}, widgetViewModelSession=${widgetViewModelSession?.toString()}, isStaleAtRegistration=${isStaleAtRegistration}, model.state.selectedModel=${model.state.get()?.selectedModel?.identifier}, _currentLanguageModel=${this._currentLanguageModel.get()?.identifier}`,
+            undefined,
+            undefined,
+            this.logService
+        );
         this._modelSyncDisposables.add(autorun(reader => {
             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);
+                message = `syncing from empty input state for ${( forSessionResource.toString())}`;
+            }
+            const widgetSessionResource = this._widget?.viewModel?.model.sessionResource;
+            const isStaleSession = !!this._inputModelSessionResource && !isEqual(this._inputModelSessionResource, forSessionResource);
+            if (isStaleSession) {
+                message = `[STALE-SESSION-AUTORUN] ${message} (widget now on ${widgetSessionResource?.toString()}, ${this._inputModelSessionResource?.toString()}, ${( forSessionResource.toString())} is old)`;
+            }
+            const prevState = this._inputModel?.state.read(undefined);
+            logChangesToStateModel(this._inputModel, message, state, prevState, this.logService);
+            if (isStaleSession) {
+                return;
             }
             this._syncFromModel(state, forSessionResource);
         }));
     }
     _setEmptyModelState() {
-        if (this._inputModel?.state?.get()?.permissionLevel !== this.getDefaultPermissionLevel()) {
+        logChangesToStateModel(
+            this._inputModel,
+            `setting empty model state for ${this._widget?.viewModel?.sessionResource.toString()} in ${this._currentSessionKey}`,
+            undefined,
+            undefined,
+            this.logService
+        );
+        const currentLevel = this._inputModel?.state?.get()?.permissionLevel;
+        if (currentLevel === undefined || !isChatPermissionLevel(currentLevel)) {
             this.setPermissionLevel(this.getDefaultPermissionLevel());
         }
         if (this.entitlementService.anonymous) {
@@ -890,22 +1035,32 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             if (state?.selectedModel) {
                 const allModels = this.getAllMergedModels();
                 const sessionType = getChatSessionType(forSessionResource);
-                const syncResult = resolveModelFromSyncState(
-                    state.selectedModel,
-                    this._currentLanguageModel.get(),
-                    allModels,
-                    sessionType,
-                    {
-                        location: this.location,
-                        currentModeKind: this.currentModeKind,
-                        sessionType
-                    }
+                const currentLm = this._currentLanguageModel.get();
+                const syncResult = resolveModelFromSyncState(state.selectedModel, currentLm, allModels, sessionType, {
+                    location: this.location,
+                    currentModeKind: this.currentModeKind,
+                    sessionType
+                });
+                logChangesToStateModel(
+                    this._inputModel,
+                    `[RESOLVE] _syncFromModel resolveModelFromSyncState for ${( forSessionResource.toString())} in ${this._currentSessionKey}: stateModel=${state.selectedModel.identifier} currentLm=${currentLm?.identifier} sessionType=${sessionType} -> action=${syncResult.action}`,
+                    state,
+                    undefined,
+                    this.logService
                 );
                 if (syncResult.action === "apply") {
                     this.setCurrentLanguageModel(state.selectedModel);
                 } else if (syncResult.action === "default") {
                     this.setCurrentLanguageModelToDefault();
                 }
+            } else if (state) {
+                logChangesToStateModel(
+                    this._inputModel,
+                    `_syncFromModel: state has no selectedModel (no-op for model picker) for ${( forSessionResource.toString())} in ${this._currentSessionKey} (current=${this._currentLanguageModel.get()?.identifier})`,
+                    state,
+                    undefined,
+                    this.logService
+                );
             }
             const currentAttachments = this._attachmentModel.attachments;
             if (!state) {
@@ -945,6 +1100,14 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (this._chatSessionIsEmpty) {
             this._emptyInputState.set(state, undefined);
         }
+        const prevState = this._inputModel?.state.get();
+        logChangesToStateModel(
+            this._inputModel,
+            `_syncInputStateToModel boundInputModelSession=${this._inputModelSessionResource?.toString()} widgetSession=${this._currentSessionKey} mismatch=${this._inputModelSessionResource?.toString() !== this._currentSessionKey}`,
+            state,
+            prevState,
+            this.logService
+        );
         this._inputModel?.setState(state);
         this._isSyncingToOrFromInputModel = false;
         queueMicrotask(() => this.inputActionsToolbar?.relayout());
@@ -955,6 +1118,16 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
     }
     setCurrentLanguageModel(model) {
+        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}`,
+            undefined,
+            undefined,
+            this.logService
+        );
         this._currentLanguageModel.set(model, undefined);
         if (this.cachedWidth) {
             this.layout(this.cachedWidth);
@@ -976,6 +1149,18 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     checkModelSupported() {
         const lm = this._currentLanguageModel.get();
         const allModels = this.getAllMergedModels();
+        const willReset = shouldResetModelToDefault(lm, this.getModels(), {
+            location: this.location,
+            currentModeKind: this.currentModeKind,
+            sessionType: this.getCurrentSessionType()
+        }, allModels);
+        logChangesToStateModel(
+            this._inputModel,
+            `[CMS] checkModelSupported lm=${lm?.identifier} mode=${this.currentModeKind} sessionType=${this.getCurrentSessionType()} willReset=${willReset} in ${this._currentSessionKey}`,
+            undefined,
+            this._inputModel?.state.get(),
+            this.logService
+        );
         if (shouldResetModelToDefault(lm, this.getModels(), {
             location: this.location,
             currentModeKind: this.currentModeKind,
@@ -998,6 +1183,13 @@ 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();
     }
     getAllMergedModels() {
@@ -1027,7 +1219,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     getModels() {
         const models = this.getAllMergedModels();
         models.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name));
-        return filterModelsForSession(models, this.getCurrentSessionType(), this.currentModeKind, this.location);
+        const sessionFiltered = filterModelsForSession(models, this.getCurrentSessionType(), this.currentModeKind, this.location);
+        return sessionFiltered.filter(m => !this.languageModelsService.isModelHidden(m.identifier));
     }
     getCurrentSessionType() {
         const delegateSessionType = this.options.sessionTypePickerDelegate?.getActiveSessionProvider?.();
@@ -1082,7 +1275,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         if (!sessionResource) {
             return;
         }
-        if (!requests || requests.length === 0) {
+        if (!requests || requests.length === 0 || getChatSessionType(sessionResource) !== SessionType.CopilotCLI) {
             return;
         }
         const modeInfo = findLast(requests, req => !!req.modeInfo)?.modeInfo;
@@ -1128,6 +1321,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     setCurrentLanguageModelToDefault() {
         const allModels = this.getModels();
         const defaultModel = findDefaultModel(allModels, this.location);
+        logChangesToStateModel(
+            this._inputModel,
+            `[DEFAULT] setCurrentLanguageModelToDefault called (defaultModel=${defaultModel?.identifier}, currentLm=${this._currentLanguageModel.get()?.identifier}) in ${this._currentSessionKey}`,
+            undefined,
+            this._inputModel?.state.get(),
+            this.logService
+        );
         if (defaultModel) {
             this.setCurrentLanguageModel(defaultModel);
         }
@@ -1159,40 +1359,40 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         const mode = this._currentModeObservable.get();
         const modelName = this._currentLanguageModel.get()?.metadata.name;
-        const modelInfo = modelName ? ( localize(7535, ", {0}. ", modelName)) : "";
+        const modelInfo = modelName ? ( localize(7677, ", {0}. ", modelName)) : "";
         let modeLabel = "";
         if (!mode.isBuiltin) {
             const mode = this.currentModeObs.get();
-            modeLabel = ( localize(7536, "({0}), {1}", mode.label.get(), mode.description.get()));
+            modeLabel = ( localize(7678, "({0}), {1}", mode.label.get(), mode.description.get()));
         } else {
             switch (this.currentModeKind) {
             case ChatModeKind.Agent:
-                modeLabel = ( localize(7537, "(Agent), edit files in your workspace."));
+                modeLabel = ( localize(7679, "(Agent), edit files in your workspace."));
                 break;
             case ChatModeKind.Edit:
-                modeLabel = ( localize(7538, "(Edit), edit files in your workspace."));
+                modeLabel = ( localize(7680, "(Edit), edit files in your workspace."));
                 break;
             case ChatModeKind.Ask:
             default:
-                modeLabel = ( localize(7539, "(Ask), ask questions or type / for topics."));
+                modeLabel = ( localize(7681, "(Ask), ask questions or type / for topics."));
                 break;
             }
         }
         if (verbose) {
             return kbLabel ? ( localize(
-                7540,
+                7682,
                 "Chat Input {0}{1} Press Enter to send out the request. Use {2} for Chat Accessibility Help.",
                 modeLabel,
                 modelInfo,
                 kbLabel
             )) : ( localize(
-                7541,
+                7683,
                 "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(7542, "Chat Input {0}{1}.", modeLabel, modelInfo);
+            return localize(7684, "Chat Input {0}{1}.", modeLabel, modelInfo);
         }
     }
     validateCurrentChatMode() {
@@ -1342,6 +1542,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this._chatSessionIsEmpty = false;
             this._emptyInputState.set(undefined, undefined);
         }
+        logChangesToStateModel(
+            this._inputModel,
+            `[ACCEPT] acceptInput -> attachmentModel.clear() in ${this._currentSessionKey}`,
+            undefined,
+            this._inputModel?.state.get(),
+            this.logService
+        );
         this.attachmentModel.clear();
         this._onDidLoadInputState.fire();
         if (this.accessibilityService.isScreenReaderOptimized() && isMacintosh) {
@@ -1384,8 +1591,14 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     }
     _handleAttachedContextChange() {
         this._hasFileAttachmentContextKey.set(Boolean(this._attachmentModel.attachments.find(a => a.kind === "file")));
+        this._updateInputContentContextKeys();
         this.renderAttachedContext();
     }
+    _updateInputContentContextKeys() {
+        const inputHasText = !!this._inputEditor?.getModel()?.getValue().trim();
+        this.inputEditorHasText.set(inputHasText);
+        this.inputEditorHasSendableContent.set(inputHasText || ( this._attachmentModel.attachments.some(isExplicitFileOrImageVariableEntry)));
+    }
     getOrCreateOptionEmitter(optionGroupId) {
         let emitter = this._chatSessionOptionEmitters.get(optionGroupId);
         if (!emitter) {
@@ -1609,10 +1822,31 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     }
     ensureNotificationWidget() {
         if (!this._notificationWidget.value) {
-            this._notificationWidget.value = this.instantiationService.createInstance(ChatInputNotificationWidget);
+            this._notificationWidget.value = this.instantiationService.createInstance(
+                ChatInputNotificationWidget,
+                () => this._currentSessionType ?? this.getCurrentSessionType()
+            );
             this.chatInputNotificationContainer.appendChild(this._notificationWidget.value.domNode);
         }
     }
+    ensureGoalBannerWidget() {
+        if (!this._goalBannerWidget.value) {
+            const widget = ( new ChatGoalBannerWidget());
+            this._register(widget.onDismiss(() => this._onDidDismissGoalBanner.fire()));
+            this._goalBannerWidget.value = widget;
+            this.chatGoalBannerContainer.appendChild(widget.domNode);
+        }
+        return this._goalBannerWidget.value;
+    }
+    showGoalBannerLoading() {
+        this.ensureGoalBannerWidget().setLoading();
+    }
+    setGoalBanner(summary) {
+        this.ensureGoalBannerWidget().setGoal(summary);
+    }
+    clearGoalBanner() {
+        this._goalBannerWidget.value?.clear();
+    }
     showContextUsageDetails() {
         return this.contextUsageWidget?.showDetails() ?? false;
     }
@@ -1673,11 +1907,28 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             }
             this._syncToolConfirmationCarouselForSession();
             const newSessionType = this.getCurrentSessionType();
-            if (e.currentSessionResource && newSessionType !== this._currentSessionType) {
+            if (e.currentSessionResource && this._currentSessionType && newSessionType !== this._currentSessionType) {
+                logChangesToStateModel(
+                    this._inputModel,
+                    `[CVVM].1 onDidChangeViewModel -> session change: ${this._currentSessionType} -> ${newSessionType} in ${this._currentSessionKey}, ${( e.currentSessionResource.toString())}`,
+                    undefined,
+                    this._inputModel?.state.get(),
+                    this.logService
+                );
                 this._currentSessionType = newSessionType;
                 this.initSelectedModel();
                 this.checkModelInSessionPool();
                 this.checkModeInSessionPool();
+                this._notificationWidget.value?.rerender();
+            } else if (e.currentSessionResource) {
+                logChangesToStateModel(
+                    this._inputModel,
+                    `[CVVM].2 onDidChangeViewModel -> session change: ${this._currentSessionType} -> ${newSessionType} in ${this._currentSessionKey}, ${( e.currentSessionResource.toString())}`,
+                    undefined,
+                    this._inputModel?.state.get(),
+                    this.logService
+                );
+                this._currentSessionType = newSessionType;
             }
             this.preselectModelFromSessionHistory();
         }));
@@ -1690,6 +1941,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     ".chat-tool-confirmation-carousel-container@chatToolConfirmationCarouselContainer"
                 ),
                 h(".chat-input-notification-container@chatInputNotificationContainer"),
+                h(".chat-goal-banner-container@chatGoalBannerContainer"),
                 h(".chat-todo-list-widget-container@chatInputTodoListWidgetContainer"),
                 h(".chat-artifacts-widget-container@chatArtifactsWidgetContainer"),
                 h(".chat-editing-session@chatEditingSessionWidgetContainer"),
@@ -1701,10 +1953,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                         h(".chat-input-toolbars@inputToolbars")
                     ])]
                 ),
-                h(
-                    ".chat-secondary-toolbar@secondaryToolbar",
-                    [h(".chat-context-usage-container@contextUsageWidgetContainer")]
-                ),
+                h(".chat-secondary-toolbar@secondaryToolbar", [
+                    h(".chat-context-usage-container@contextUsageWidgetContainer"),
+                    h(".chat-input-status-container@statusToolbarContainer")
+                ]),
                 h(
                     ".chat-attachments-container@attachmentsContainer",
                     [h(".chat-attached-context@attachedContextContainer")]
@@ -1720,6 +1972,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 ),
                 h(".interactive-input-followups@followupsContainer"),
                 h(".chat-input-notification-container@chatInputNotificationContainer"),
+                h(".chat-goal-banner-container@chatGoalBannerContainer"),
                 h(".chat-todo-list-widget-container@chatInputTodoListWidgetContainer"),
                 h(".chat-artifacts-widget-container@chatArtifactsWidgetContainer"),
                 h(".chat-editing-session@chatEditingSessionWidgetContainer"),
@@ -1731,10 +1984,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                         [h(".chat-attached-context@attachedContextContainer")]
                     ), h(".chat-editor-container@editorContainer"), h(".chat-input-toolbars@inputToolbars")])]
                 ),
-                h(
-                    ".chat-secondary-toolbar@secondaryToolbar",
-                    [h(".chat-context-usage-container@contextUsageWidgetContainer")]
-                )
+                h(".chat-secondary-toolbar@secondaryToolbar", [
+                    h(".chat-context-usage-container@contextUsageWidgetContainer"),
+                    h(".chat-input-status-container@statusToolbarContainer")
+                ])
             ]);
         }
         this.container = elements.root;
@@ -1765,7 +2018,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.chatToolConfirmationCarouselContainer = elements.chatToolConfirmationCarouselContainer;
         hide(this.chatToolConfirmationCarouselContainer);
         this.chatInputNotificationContainer = elements.chatInputNotificationContainer;
+        this.chatGoalBannerContainer = elements.chatGoalBannerContainer;
         this.contextUsageWidgetContainer = elements.contextUsageWidgetContainer;
+        this.statusToolbarContainer = elements.statusToolbarContainer;
         if (this.options.isSessionsWindow || this.options.renderStyle === "compact") {
             toolbarsContainer.prepend(this.contextUsageWidgetContainer);
         }
@@ -1824,6 +2079,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         options.autoClosingBrackets = this.configurationService.getValue("editor.autoClosingBrackets");
         options.autoClosingQuotes = this.configurationService.getValue("editor.autoClosingQuotes");
         options.autoSurround = this.configurationService.getValue("editor.autoSurround");
+        options.quickSuggestions = false;
         options.suggest = {
             showIcons: true,
             showSnippets: false,
@@ -1849,7 +2105,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             GlyphHoverController.ID,
             DropIntoEditorController.ID,
             CopyPasteController.ID,
-            LinkDetector.ID
+            LinkDetector.ID,
+            InlineCompletionsController.ID
         ]));
         this._inputEditor = this._register(
             scopedInstantiationService.createInstance(CodeEditorWidget, this._inputEditorElement, options, editorOptions)
@@ -1877,9 +2134,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     this._layout(this.cachedWidth);
                 }
             }
-            const model = this._inputEditor.getModel();
-            const inputHasText = !!model && model.getValue().trim().length > 0;
-            this.inputEditorHasText.set(inputHasText);
+            this._updateInputContentContextKeys();
             this._syncTextDebounced.schedule();
         }));
         this._register(this._inputEditor.onDidContentSizeChange(e => {
@@ -1913,13 +2168,18 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             actionContext: {
                 widget
             },
-            hideChevrons: derived(
+            compact: derived(
                 reader => this._stableInputPartWidth.read(reader) < CHAT_INPUT_PICKER_COLLAPSE_WIDTH
             )
         };
+        const primarySessionPickerOptions = {
+            ...pickerOptions,
+            compact: constObservable(true)
+        };
         const secondaryPickerOptions = {
             ...pickerOptions,
-            getOverflowAnchor: () => this.secondaryToolbar.getElement()
+            getOverflowAnchor: () => this.secondaryToolbar.getElement(),
+            compact: constObservable(true)
         };
         this._register(
             addStandardDisposableListener(toolbarsContainer, EventType.CLICK, e => this.inputEditor.focus())
@@ -1952,6 +2212,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     if (this.chatPhoneInputPresenter.enabled.get()) {
                         if (action.id === OpenModelPickerAction.ID && action instanceof MenuItemAction) {
                             if (!this._currentLanguageModel.get()) {
+                                logChangesToStateModel(
+                                    this._inputModel,
+                                    `actionViewItemProvider[phone]: _currentLanguageModel is undefined at toolbar build, forcing default for ${this._currentSessionKey}`,
+                                    undefined,
+                                    undefined,
+                                    this.logService
+                                );
                                 this.setCurrentLanguageModelToDefault();
                             }
                             const modelDelegate = this._createModelPickerDelegate();
@@ -1968,6 +2235,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     }
                     if (action.id === OpenModelPickerAction.ID && action instanceof MenuItemAction) {
                         if (!this._currentLanguageModel.get()) {
+                            logChangesToStateModel(
+                                this._inputModel,
+                                `actionViewItemProvider[desktop]: _currentLanguageModel is undefined at toolbar build, forcing default for ${this._currentSessionKey}`,
+                                undefined,
+                                undefined,
+                                this.logService
+                            );
                             this.setCurrentLanguageModelToDefault();
                         }
                         const itemDelegate = this._createModelPickerDelegate();
@@ -2006,7 +2280,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                             pickerOptions
                         );
                     } else if (action.id === ChatSessionPrimaryPickerAction.ID && action instanceof MenuItemAction) {
-                        const widgets = this.createChatSessionPickerWidgets(action, pickerOptions);
+                        const widgets = this.createChatSessionPickerWidgets(action, primarySessionPickerOptions);
                         if (widgets.length === 0) {
                             return ( new HiddenActionViewItem(action));
                         }
@@ -2031,7 +2305,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             }
         }));
         this._register(autorun(reader => {
-            pickerOptions.hideChevrons.read(reader);
+            pickerOptions.compact.read(reader);
             queueMicrotask(() => this.inputActionsToolbar.relayout());
         }));
         let lastPhoneEnabled = this.chatPhoneInputPresenter.enabled.get();
@@ -2083,17 +2357,15 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 widget
             };
         }
-        const agentHostShortPickerIds = ( new Set([
-            OpenAgentHostModePickerAction.ID,
-            OpenAgentHostAutoApprovePickerAction.ID,
-            OpenAgentHostPermissionModePickerAction.ID,
-            OpenAgentHostBranchPickerAction.ID,
-            OpenAgentHostIsolationPickerAction.ID,
-            "sessions.tunnelHost.toggleSharing"
+        const agentHostShortPickerMinWidths = ( new Map([
+            [OpenAgentHostModePickerAction.ID, 22],
+            [OpenAgentHostAutoApprovePickerAction.ID, 22],
+            [OpenAgentHostPermissionModePickerAction.ID, 22],
+            ["sessions.tunnelHost.toggleSharing", 16]
         ]));
         const genericChipsContainer = $$1(".chat-secondary-generic-chips");
         const genericChipsLane = this._register(
-            this.instantiationService.createInstance(AgentHostGenericConfigChips, widget, secondaryPickerOptions)
+            this.instantiationService.createInstance(AgentHostGenericConfigChips, widget)
         );
         genericChipsLane.render(genericChipsContainer);
         this.secondaryToolbar = this._register(this.instantiationService.createInstance(
@@ -2112,7 +2384,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     kind: "all",
                     minItems: 1,
                     actionMinWidth: 48,
-                    getActionMinWidth: action => ( agentHostShortPickerIds.has(action.id)) ? 22 : undefined
+                    getActionMinWidth: action => agentHostShortPickerMinWidths.get(action.id)
                 },
                 actionViewItemProvider: (action, options) => {
                     if ((action.id === OpenSessionTargetPickerAction.ID || action.id === OpenDelegationPickerAction.ID) && action instanceof MenuItemAction) {
@@ -2199,12 +2471,12 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                             this.permissionWidgetDisposeListener.clear();
                         });
                         return widget;
-                    } else if ((action.id === OpenAgentHostModePickerAction.ID || action.id === OpenAgentHostAutoApprovePickerAction.ID || action.id === OpenAgentHostPermissionModePickerAction.ID || action.id === OpenAgentHostBranchPickerAction.ID || action.id === OpenAgentHostIsolationPickerAction.ID) && action instanceof MenuItemAction) {
+                    } else if ((action.id === OpenAgentHostModePickerAction.ID || action.id === OpenAgentHostAutoApprovePickerAction.ID || action.id === OpenAgentHostPermissionModePickerAction.ID) && action instanceof MenuItemAction) {
                         if (this.options.isSessionsWindow) {
                             return ( new HiddenActionViewItem(action));
                         }
-                        const property = action.id === OpenAgentHostBranchPickerAction.ID ? SessionConfigKey.Branch : action.id === OpenAgentHostIsolationPickerAction.ID ? SessionConfigKey.Isolation : action.id === OpenAgentHostAutoApprovePickerAction.ID ? SessionConfigKey.AutoApprove : action.id === OpenAgentHostPermissionModePickerAction.ID ? ClaudeSessionConfigKey.PermissionMode : SessionConfigKey.Mode;
-                        const picker = this.instantiationService.createInstance(AgentHostChatInputPicker, widget, property, secondaryPickerOptions);
+                        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 === ChatSessionPrimaryPickerAction.ID && action instanceof MenuItemAction) {
                         const widgets = this.createChatSessionPickerWidgets(action, secondaryPickerOptions);
@@ -2229,9 +2501,32 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 this.chatSessionPickerContainer = container;
             }
         }));
+        this.statusToolbar = this._register(this.instantiationService.createInstance(
+            MenuWorkbenchToolBar,
+            this.statusToolbarContainer,
+            MenuId.ChatInputStatus,
+            {
+                telemetrySource: this.options.menus.telemetrySource,
+                menuOptions: {
+                    shouldForwardArgs: true
+                },
+                hiddenItemStrategy: HiddenItemStrategy.NoHide,
+                hoverDelegate,
+                actionViewItemProvider: (action, _opts) => {
+                    if (action instanceof MenuItemAction) {
+                        return this.instantiationService.createInstance(ChatInputStatusActionViewItem, action);
+                    }
+                    return undefined;
+                }
+            }
+        ));
+        this.statusToolbar.getElement().classList.add("chat-input-status-toolbar");
+        this.statusToolbar.context = {
+            widget
+        };
         let inputModel = this.modelService.getModel(this.inputUri);
         if (!inputModel) {
-            inputModel = this._register(this.modelService.createModel("", null, this.inputUri, true));
+            inputModel = this._register(this.modelService.createModel("", null, this.inputUri, false));
         }
         this.textModelResolverService.createModelReference(this.inputUri).then(ref => {
             if (this._store.isDisposed) {
@@ -2947,7 +3242,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const button = this._chatEditsActionsDisposables.add(( new ButtonWithIcon(overviewTitle, {
             supportIcons: true,
             secondary: true,
-            ariaLabel: ( localize(7543, "Toggle changed files."))
+            ariaLabel: ( localize(7685, "Toggle changed files."))
         })));
         const topLevelStats = derived(reader => {
             const entries = editSessionEntriesObs.read(reader);
@@ -3021,10 +3316,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 removed,
                 shouldShowEditingSession
             } = topLevelStats.read(reader);
-            const buttonLabel = files === 1 ? ( localize(7544, "1 file changed")) : ( localize(7545, "{0} files changed", files));
+            const buttonLabel = files === 1 ? ( localize(7686, "1 file changed")) : ( localize(7687, "{0} files changed", files));
             button.label = buttonLabel;
             button.element.setAttribute("aria-label", ( localize(
-                7546,
+                7688,
                 "{0}, {1} lines added, {2} lines removed",
                 buttonLabel,
                 added,