@codingame/monaco-vscode-katex-common 29.1.0 → 30.0.0

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

@@ -10,6 +10,7 @@ import { createInstantHoverDelegate } from '@codingame/monaco-vscode-api/vscode/
 import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { RunOnceScheduler, DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
@@ -75,13 +76,13 @@ import { AccessibilityCommandId } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { getSimpleEditorOptions, getSimpleCodeEditorWidgetOptions, setupSimpleEditorSelectionStyling } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { InlineChatConfigKeys } from '../../../../inlineChat/common/inlineChat.js';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { ChatRequestVariableSet, isImageVariableEntry, isStringVariableEntry, isNotebookOutputVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isElementVariableEntry, isPasteVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries';
+import { ChatRequestVariableSet, isImageVariableEntry, isStringVariableEntry, MAX_IMAGES_PER_REQUEST, OmittedState, isNotebookOutputVariableEntry, isPromptFileVariableEntry, isPromptTextVariableEntry, isElementVariableEntry, isPasteVariableEntry, isSCMHistoryItemVariableEntry, isSCMHistoryItemChangeVariableEntry, isSCMHistoryItemChangeRangeVariableEntry } 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 { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { agentOptionId, localChatSessionType, isIChatSessionFileChange2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
-import { ChatAgentLocation, ChatModeKind, ChatPermissionLevel, ChatConfiguration, isAutoApproveLevel, validateChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatAgentLocation, ChatModeKind, ChatPermissionLevel, validateChatMode, ChatConfiguration } 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';
@@ -91,7 +92,7 @@ import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { ChatHistoryNavigator } from '../../../common/widget/chatWidgetHistoryService.js';
-import { ChatSubmitAction, OpenModelPickerAction, OpenModePickerAction, OpenSessionTargetPickerAction, OpenDelegationPickerAction, OpenWorkspacePickerAction, ChatSessionPrimaryPickerAction, OpenPermissionPickerAction } from '../../actions/chatExecuteActions.js';
+import { ChatSubmitAction, OpenModePickerAction, OpenModelPickerAction, OpenSessionTargetPickerAction, OpenDelegationPickerAction, OpenWorkspacePickerAction, ChatSessionPrimaryPickerAction, OpenPermissionPickerAction } from '../../actions/chatExecuteActions.js';
 import { getAgentSessionProvider, AgentSessionProviders } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
 import { ChatAttachmentModel } from '../../attachments/chatAttachmentModel.js';
@@ -121,6 +122,8 @@ import { WorkspacePickerActionItem } from './workspacePickerActionItem.js';
 import { ChatContextUsageWidget } from '../../widgetHosts/viewPane/chatContextUsageWidget.js';
 import { Target } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { EnhancedModelPickerActionItem } from './modelPickerActionItem2.js';
+import { findLast } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
+import { ConfigureToolsAction } from '../../actions/chatToolActions.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { derived, derivedOpts } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -364,9 +367,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._forceVisibleScrollbarUntilAccept = false;
         this._modelSyncDisposables = this._register(( new DisposableStore()));
         this._isSyncingToOrFromInputModel = false;
-        this.chatSessionPickerWidgets = ( new Map());
+        this.chatSessionPickerWidgets = this._register(( new DisposableMap()));
         this._waitForPersistedLanguageModel = this._register(( new MutableDisposable()));
-        this._chatSessionOptionEmitters = ( new Map());
+        this._chatSessionOptionEmitters = this._register(( new DisposableMap()));
         this._optionContextKeys = ( new Map());
         this._currentLanguageModel = observableValue("_currentLanguageModel", undefined);
         this._onDidChangeCurrentChatMode = this._register(( new Emitter()));
@@ -651,6 +654,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this._currentPermissionLevel.set(level, undefined);
         this.permissionLevelKey.set(level);
         this.permissionWidget?.refresh();
+        this._syncInputStateToModel();
     }
     openSessionTargetPicker() {
         this.sessionTargetWidget?.show();
@@ -674,7 +678,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             optionGroups,
             effectiveSessionType
         } = result;
-        this.disposeSessionPickerWidgets();
+        this.chatSessionPickerWidgets.clearAndDisposeAll();
         const widgets = [];
         for (const optionGroup of optionGroups) {
             if (!( visibleGroupIds.has(optionGroup.id))) {
@@ -719,15 +723,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         return widgets;
     }
     setInputModel(model, chatSessionIsEmpty) {
+        if (this._inputModel) {
+            this._syncInputStateToModel();
+        }
         this._inputModel = model;
         this._modelSyncDisposables.clear();
         this.selectedToolsModel.resetSessionEnablementState();
         this._chatSessionIsEmpty = chatSessionIsEmpty;
-        if (chatSessionIsEmpty && !this.configurationService.getValue(ChatConfiguration.GlobalAutoApprove) && !isAutoApproveLevel(this._currentPermissionLevel.get())) {
-            this._currentPermissionLevel.set(ChatPermissionLevel.Default, undefined);
-            this.permissionLevelKey.set(ChatPermissionLevel.Default);
-            this.permissionWidget?.refresh();
-        }
         if (chatSessionIsEmpty) {
             this._setEmptyModelState();
         }
@@ -805,6 +807,14 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     this._inputEditor.setSelections(state.selections);
                 }
             }
+            if (!this.configurationService.getValue(ChatConfiguration.GlobalAutoApprove)) {
+                const targetLevel = state?.permissionLevel ?? ChatPermissionLevel.Default;
+                if (this._currentPermissionLevel.get() !== targetLevel) {
+                    this._currentPermissionLevel.set(targetLevel, undefined);
+                    this.permissionLevelKey.set(targetLevel);
+                    this.permissionWidget?.refresh();
+                }
+            }
             if (state) {
                 this._widget?.contribs.forEach(contrib => {
                     contrib.setInputState?.(state.contrib);
@@ -825,6 +835,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         this._inputModel?.setState(state);
         this._isSyncingToOrFromInputModel = false;
+        queueMicrotask(() => this.inputActionsToolbar?.relayout());
     }
     setCurrentLanguageModel(model) {
         this._currentLanguageModel.set(model, undefined);
@@ -923,23 +934,15 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
     }
     preselectModelFromSessionHistory() {
-        const sessionResource = this._widget?.viewModel?.model.sessionResource;
-        const ctx = sessionResource ? this.chatService.getChatSessionFromInternalUri(sessionResource) : undefined;
-        const requiresCustomModels = ctx && this.chatSessionsService.requiresCustomModelsForSessionType(getChatSessionType(ctx.chatSessionResource));
-        if (!requiresCustomModels) {
-            return;
-        }
         const requests = this._widget?.viewModel?.model.getRequests();
         if (!requests || requests.length === 0) {
             return;
         }
-        let lastModelId;
-        for (let i = requests.length - 1; i >= 0; i--) {
-            if (requests[i].modelId) {
-                lastModelId = requests[i].modelId;
-                break;
-            }
+        const modeInfo = findLast(requests, req => !!req.modeInfo)?.modeInfo;
+        if (modeInfo && modeInfo.modeInstructions?.uri) {
+            this.setChatMode(( modeInfo.modeInstructions.uri.toString()));
         }
+        const lastModelId = findLast(requests, req => !!req.modelId)?.modelId;
         if (!lastModelId) {
             return;
         }
@@ -982,6 +985,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             },
             selectedModel: this._currentLanguageModel.get(),
             selections: this._inputEditor?.getSelections() || [],
+            permissionLevel: this._currentPermissionLevel.get(),
             contrib: {}
         };
         for (const contrib of this._widget?.contribs || Iterable.empty()) {
@@ -997,40 +1001,40 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         const mode = this._currentModeObservable.get();
         const modelName = this._currentLanguageModel.get()?.metadata.name;
-        const modelInfo = modelName ? ( localize(6978, ", {0}. ", modelName)) : "";
+        const modelInfo = modelName ? ( localize(7032, ", {0}. ", modelName)) : "";
         let modeLabel = "";
         if (!mode.isBuiltin) {
             const mode = this.currentModeObs.get();
-            modeLabel = ( localize(6979, "({0}), {1}", mode.label.get(), mode.description.get()));
+            modeLabel = ( localize(7033, "({0}), {1}", mode.label.get(), mode.description.get()));
         } else {
             switch (this.currentModeKind) {
             case ChatModeKind.Agent:
-                modeLabel = ( localize(6980, "(Agent), edit files in your workspace."));
+                modeLabel = ( localize(7034, "(Agent), edit files in your workspace."));
                 break;
             case ChatModeKind.Edit:
-                modeLabel = ( localize(6981, "(Edit), edit files in your workspace."));
+                modeLabel = ( localize(7035, "(Edit), edit files in your workspace."));
                 break;
             case ChatModeKind.Ask:
             default:
-                modeLabel = ( localize(6982, "(Ask), ask questions or type / for topics."));
+                modeLabel = ( localize(7036, "(Ask), ask questions or type / for topics."));
                 break;
             }
         }
         if (verbose) {
             return kbLabel ? ( localize(
-                6983,
+                7037,
                 "Chat Input {0}{1} Press Enter to send out the request. Use {2} for Chat Accessibility Help.",
                 modeLabel,
                 modelInfo,
                 kbLabel
             )) : ( localize(
-                6984,
+                7038,
                 "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(6985, "Chat Input {0}{1}.", modeLabel, modelInfo);
+            return localize(7039, "Chat Input {0}{1}.", modeLabel, modelInfo);
         }
     }
     validateCurrentChatMode() {
@@ -1101,12 +1105,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         this.navigateHistory(false);
     }
-    async navigateHistory(previous) {
-        const historyEntry = previous ? this.history.previous() : this.history.next();
-        let historyAttachments = historyEntry?.attachments ?? [];
-        if (historyAttachments.length > 0) {
-            historyAttachments = (await Promise.all(( historyAttachments.map(async attachment => {
-                if (isImageVariableEntry(attachment) && attachment.references?.length && URI.isUri(attachment.references[0].reference)) {
+    async restoreAttachments(attachments) {
+        let restored = [...attachments];
+        if (restored.length > 0) {
+            restored = (await Promise.all(( restored.map(async attachment => {
+                if (isImageVariableEntry(attachment) && !attachment.value && attachment.references?.length && URI.isUri(attachment.references[0].reference)) {
                     const currReference = attachment.references[0].reference;
                     try {
                         const imageBinary = ( currReference.toString(true)).startsWith("http") ? await this.sharedWebExtracterService.readImage(currReference, CancellationToken.None) : (await this.fileService.readFile(currReference)).value;
@@ -1124,9 +1127,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     }
                 }
                 return attachment;
-            })))).filter(attachment => attachment !== undefined);
+            })))).filter(isDefined);
         }
-        this._attachmentModel.clearAndSetContext(...historyAttachments);
+        this._attachmentModel.clearAndSetContext(...restored);
+    }
+    async navigateHistory(previous) {
+        const historyEntry = previous ? this.history.previous() : this.history.next();
+        await this.restoreAttachments(historyEntry?.attachments ?? []);
         const inputText = historyEntry?.inputText ?? "";
         const contribData = historyEntry?.contrib ?? {};
         status(inputText);
@@ -1227,7 +1234,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
     getOrCreateOptionEmitter(optionGroupId) {
         let emitter = this._chatSessionOptionEmitters.get(optionGroupId);
         if (!emitter) {
-            emitter = this._register(( new Emitter()));
+            emitter = ( new Emitter());
             this._chatSessionOptionEmitters.set(optionGroupId, emitter);
         }
         return emitter;
@@ -1276,8 +1283,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const requiresCustomModels = ctx && this.chatSessionsService.requiresCustomModelsForSessionType(getChatSessionType(ctx.chatSessionResource));
         this.chatSessionHasTargetedModels.set(!!requiresCustomModels);
         if (customAgentTarget) {
+            const contribution = ctx && this.chatSessionsService.getChatSessionContribution(getChatSessionType(ctx.chatSessionResource));
             const agentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, agentOptionId);
-            if (typeof agentOption !== "undefined") {
+            if (typeof agentOption !== "undefined" && !contribution?.useRequestToPopulateBuiltInPickers) {
                 const agentId = (typeof agentOption === "string" ? agentOption : agentOption.id) || ChatMode.Agent.id;
                 const currentMode = this._currentModeObservable.get();
                 const isDefaultAgent = agentId === ChatMode.Agent.id;
@@ -1369,7 +1377,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this.chatSessionPickerContainer.style.display = "";
         }
         if (ctx) {
-            for (const [optionGroupId] of this.chatSessionPickerWidgets.entries()) {
+            for (const [optionGroupId] of this.chatSessionPickerWidgets) {
                 const currentOption = this.chatSessionsService.getSessionOption(ctx.chatSessionResource, optionGroupId);
                 if (currentOption) {
                     const optionGroup = optionGroups.find(g => g.id === optionGroupId);
@@ -1391,12 +1399,6 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this.chatSessionPickerContainer.style.display = "none";
         }
     }
-    disposeSessionPickerWidgets() {
-        for (const widget of ( this.chatSessionPickerWidgets.values())) {
-            widget.dispose();
-        }
-        this.chatSessionPickerWidgets.clear();
-    }
     getCurrentOptionForGroup(optionGroupId) {
         const sessionResource = this._widget?.viewModel?.model.sessionResource;
         if (!sessionResource) {
@@ -1699,7 +1701,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             }
         }));
         this._register(this._inputEditor.onDidChangeModelContent(() => {
-            const currentHeight = Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight);
+            const currentHeight = Math.min(this._inputEditor.getContentHeight(), this._effectiveInputEditorMaxHeight);
             if (currentHeight !== this.inputEditorHeight) {
                 this.inputEditorHeight = currentHeight;
                 if (this.cachedWidth) {
@@ -1759,6 +1761,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             EventType.CLICK,
             e => this.inputEditor.focus()
         ));
+        const shorterChatInputActionIds = ( new Set([OpenModePickerAction.ID, ConfigureToolsAction.ID]));
         this.inputActionsToolbar = this._register(this.instantiationService.createInstance(
             MenuWorkbenchToolBar,
             this.options.renderInputToolbarBelowInput ? this.attachmentsContainer : toolbarsContainer,
@@ -1774,7 +1777,8 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     enabled: true,
                     kind: "last",
                     minItems: 1,
-                    actionMinWidth: 22
+                    actionMinWidth: 48,
+                    getActionMinWidth: action => ( shorterChatInputActionIds.has(action.id)) ? 22 : undefined
                 },
                 actionViewItemProvider: (action, options) => {
                     if (action.id === OpenModelPickerAction.ID && action instanceof MenuItemAction) {
@@ -1821,7 +1825,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     } 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) : undefined;
+                            return sessionResource ? (getAgentSessionProvider(sessionResource) ?? getChatSessionType(sessionResource)) : undefined;
                         };
                         const delegate = this.options.sessionTypePickerDelegate ?? {
                             getActiveSessionProvider: () => {
@@ -1881,6 +1885,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 this._toolbarRelayoutScheduler.schedule();
             }
         }));
+        this._register(autorun(reader => {
+            pickerOptions.hideChevrons.read(reader);
+            queueMicrotask(() => this.inputActionsToolbar.relayout());
+        }));
         this.executeToolbar = this._register(this.instantiationService.createInstance(
             MenuWorkbenchToolBar,
             toolbarsContainer,
@@ -1937,7 +1945,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                     if ((action.id === OpenSessionTargetPickerAction.ID || action.id === OpenDelegationPickerAction.ID) && action instanceof MenuItemAction) {
                         const getActiveSessionType = () => {
                             const sessionResource = this._widget?.viewModel?.sessionResource;
-                            return sessionResource ? getAgentSessionProvider(sessionResource) : undefined;
+                            return sessionResource ? (getAgentSessionProvider(sessionResource) ?? getChatSessionType(sessionResource)) : undefined;
                         };
                         const delegate = this.options.sessionTypePickerDelegate ?? {
                             getActiveSessionProvider: () => {
@@ -1982,8 +1990,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                         const delegate = {
                             currentPermissionLevel: this._currentPermissionLevel,
                             setPermissionLevel: level => {
-                                this._currentPermissionLevel.set(level, undefined);
-                                this.permissionLevelKey.set(level);
+                                this.setPermissionLevel(level);
                             }
                         };
                         return this.permissionWidget = this.instantiationService.createInstance(PermissionPickerActionItem, action, delegate, pickerOptions);
@@ -2124,6 +2131,27 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this._indexOfLastAttachedContextDeletedWithKeyboard = -1;
             this._indexOfLastOpenedContext = -1;
         }
+        const imageAttachments = attachments.filter(([, a]) => isImageVariableEntry(a));
+        if (imageAttachments.length > MAX_IMAGES_PER_REQUEST) {
+            const excessCount = imageAttachments.length - MAX_IMAGES_PER_REQUEST;
+            for (let i = 0; i < excessCount; i++) {
+                const attachment = imageAttachments[i][1];
+                if (attachment.omittedState === OmittedState.NotOmitted || attachment.omittedState === OmittedState.ImageLimitExceeded) {
+                    attachment.omittedState = OmittedState.ImageLimitExceeded;
+                }
+            }
+            for (let i = excessCount; i < imageAttachments.length; i++) {
+                if (imageAttachments[i][1].omittedState === OmittedState.ImageLimitExceeded) {
+                    imageAttachments[i][1].omittedState = OmittedState.NotOmitted;
+                }
+            }
+        } else {
+            for (const [, a] of imageAttachments) {
+                if (a.omittedState === OmittedState.ImageLimitExceeded) {
+                    a.omittedState = OmittedState.NotOmitted;
+                }
+            }
+        }
         for (const [index, attachment] of attachments) {
             const resource = URI.isUri(attachment.value) ? attachment.value : isLocation(attachment.value) ? attachment.value.uri : undefined;
             const range = isLocation(attachment.value) ? attachment.value.range : undefined;
@@ -2557,7 +2585,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const button = this._chatEditsActionsDisposables.add(( new ButtonWithIcon(overviewTitle, {
             supportIcons: true,
             secondary: true,
-            ariaLabel: ( localize(6986, "Toggle changed files."))
+            ariaLabel: ( localize(7040, "Toggle changed files."))
         })));
         const topLevelStats = derived(reader => {
             const entries = editSessionEntriesObs.read(reader);
@@ -2631,10 +2659,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 removed,
                 shouldShowEditingSession
             } = topLevelStats.read(reader);
-            const buttonLabel = files === 1 ? ( localize(6987, "1 file changed")) : ( localize(6988, "{0} files changed", files));
+            const buttonLabel = files === 1 ? ( localize(7041, "1 file changed")) : ( localize(7042, "{0} files changed", files));
             button.label = buttonLabel;
             button.element.setAttribute("aria-label", ( localize(
-                6989,
+                7043,
                 "{0}, {1} lines added, {2} lines removed",
                 buttonLabel,
                 added,
@@ -2748,21 +2776,35 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             ));
         }
     }
+    setMaxHeight(maxHeight) {
+        this._maxHeight = maxHeight;
+    }
     layout(width) {
         this.cachedWidth = width;
         this._stableInputPartWidth.set(width, undefined);
         return this._layout(width);
     }
+    get _effectiveInputEditorMaxHeight() {
+        if (this._maxHeight === undefined) {
+            return this.inputEditorMaxHeight;
+        }
+        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));
+    }
     _layout(width, allowRecurse = true) {
         const data = this.getLayoutData();
         const followupsWidth = width - data.inputPartHorizontalPadding;
         this.followupsContainer.style.width = `${followupsWidth}px`;
         const initialEditorScrollWidth = this._inputEditor.getScrollWidth();
         const newEditorWidth = width - data.inputPartHorizontalPadding - data.editorBorder - data.inputPartHorizontalPaddingInside - data.toolbarsWidth - data.sideToolbarWidth;
-        const inputEditorHeight = this.inputEditorMinHeight ? Math.max(
-            this.inputEditorMinHeight,
-            Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight)
-        ) : Math.min(this._inputEditor.getContentHeight(), this.inputEditorMaxHeight);
+        const effectiveMaxHeight = this._effectiveInputEditorMaxHeight;
+        const clampedContentHeight = Math.min(this._inputEditor.getContentHeight(), effectiveMaxHeight);
+        const inputEditorHeight = this.inputEditorMinHeight ? Math.min(
+            Math.max(this.inputEditorMinHeight, clampedContentHeight),
+            effectiveMaxHeight
+        ) : clampedContentHeight;
         const newDimension = {
             width: newEditorWidth,
             height: inputEditorHeight

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/chatModelPicker.d.ts

@@ -31,7 +31,7 @@ import { IUpdateService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 export declare function buildModelPickerItems(models: ILanguageModelChatMetadataAndIdentifier[], selectedModelId: string | undefined, recentModelIds: string[], controlModels: IStringDictionary<IModelControlEntry>, currentVSCodeVersion: string, updateStateType: StateType, onSelect: (model: ILanguageModelChatMetadataAndIdentifier) => void, manageSettingsUrl: string | undefined, useGroupedModelPicker: boolean, manageModelsAction: IActionWidgetDropdownAction | undefined, chatEntitlementService: IChatEntitlementService, showUnavailableFeatured: boolean, showFeatured: boolean, hoverPosition?: IHoverPositionOptions, languageModelsService?: ILanguageModelsService): IActionListItem<IActionWidgetDropdownAction>[];
 export declare function getModelPickerAccessibilityProvider(): {
     readonly isChecked: (element: IActionListItem<IActionWidgetDropdownAction>) => boolean | undefined;
-    readonly getRole: (element: IActionListItem<IActionWidgetDropdownAction>) => "separator" | "menuitemradio";
+    readonly getRole: (element: IActionListItem<IActionWidgetDropdownAction>) => "separator" | "menuitem" | "menuitemradio";
     readonly getWidgetRole: () => string;
 };
 export type ModelPickerBadge = "info" | "warning";
@@ -69,6 +69,7 @@ export declare class ModelPickerWidget extends Disposable {
     constructor(_delegate: IModelPickerDelegate, _hoverPosition: IHoverPositionOptions | undefined, _actionWidgetService: IActionWidgetService, _commandService: ICommandService, _openerService: IOpenerService, _telemetryService: ITelemetryService, _languageModelsService: ILanguageModelsService, _productService: IProductService, _entitlementService: IChatEntitlementService, _updateService: IUpdateService, _uriIdentityService: IUriIdentityService);
     setHideChevrons(hideChevrons: IObservable<boolean>): void;
     setSelectedModel(model: ILanguageModelChatMetadataAndIdentifier | undefined): void;
+    setEnabled(enabled: boolean): void;
     setBadge(badge: ModelPickerBadge | undefined): void;
     render(container: HTMLElement): void;
     show(anchor?: HTMLElement): void;

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

@@ -44,20 +44,20 @@ function getUpdateHoverContent(updateState) {
     switch (updateState) {
     case StateType.AvailableForDownload:
         hoverContent.appendMarkdown(( localize(
-            6990,
+            7044,
             "This model requires a newer version of VS Code. [Download Update](command:update.downloadUpdate) to access it."
         )));
         break;
     case StateType.Downloaded:
     case StateType.Ready:
         hoverContent.appendMarkdown(( localize(
-            6991,
+            7045,
             "This model requires a newer version of VS Code. [Restart to Update](command:update.restartToUpdate) to access it."
         )));
         break;
     default:
         hoverContent.appendMarkdown(( localize(
-            6992,
+            7046,
             "This model requires a newer version of VS Code. [Update VS Code](command:update.checkForUpdate) to access it."
         )));
         break;
@@ -128,7 +128,7 @@ function createModelAction(model, selectedModelId, onSelect, languageModelsServi
     };
 }
 function shouldShowManageModelsAction(chatEntitlementService) {
-    return chatEntitlementService.entitlement === ChatEntitlement.Free || chatEntitlementService.entitlement === ChatEntitlement.Pro || chatEntitlementService.entitlement === ChatEntitlement.ProPlus || chatEntitlementService.entitlement === ChatEntitlement.Business || chatEntitlementService.entitlement === ChatEntitlement.Enterprise || chatEntitlementService.isInternal;
+    return chatEntitlementService.entitlement === ChatEntitlement.Free || chatEntitlementService.entitlement === ChatEntitlement.EDU || chatEntitlementService.entitlement === ChatEntitlement.Pro || chatEntitlementService.entitlement === ChatEntitlement.ProPlus || chatEntitlementService.entitlement === ChatEntitlement.Business || chatEntitlementService.entitlement === ChatEntitlement.Enterprise || chatEntitlementService.isInternal;
 }
 function createManageModelsAction(commandService) {
     return {
@@ -136,8 +136,8 @@ function createManageModelsAction(commandService) {
         enabled: true,
         checked: false,
         class: ThemeIcon.asClassName(Codicon.gear),
-        tooltip: ( localize(6993, "Manage Language Models")),
-        label: ( localize(6994, "Manage Models...")),
+        tooltip: ( localize(7047, "Manage Language Models")),
+        label: ( localize(7048, "Manage Models...")),
         run: () => {
             commandService.executeCommand(MANAGE_CHAT_COMMAND_ID);
         }
@@ -167,8 +167,8 @@ function buildModelPickerItems(
             enabled: true,
             checked: true,
             class: undefined,
-            tooltip: ( localize(6995, "Auto")),
-            label: ( localize(6995, "Auto")),
+            tooltip: ( localize(7049, "Auto")),
+            label: ( localize(7049, "Auto")),
             run: () => {}
         }));
     }
@@ -351,12 +351,12 @@ function buildModelPickerItems(
                         enabled: true,
                         checked: false,
                         class: undefined,
-                        tooltip: ( localize(6996, "Other Models")),
-                        label: ( localize(6996, "Other Models")),
+                        tooltip: ( localize(7050, "Other Models")),
+                        label: ( localize(7050, "Other Models")),
                         run: () => {}
                     },
                     kind: ActionListItemKind.Action,
-                    label: ( localize(6996, "Other Models")),
+                    label: ( localize(7050, "Other Models")),
                     group: {
                         title: "",
                         icon: Codicon.chevronDown
@@ -435,9 +435,15 @@ function buildModelPickerItems(
 function getModelPickerAccessibilityProvider() {
     return {
         isChecked(element) {
+            if (element.isSectionToggle) {
+                return undefined;
+            }
             return element.kind === ActionListItemKind.Action ? !!element?.item?.checked : undefined;
         },
         getRole: element => {
+            if (element.isSectionToggle) {
+                return "menuitem";
+            }
             switch (element.kind) {
             case ActionListItemKind.Action:
                 return "menuitemradio";
@@ -461,15 +467,15 @@ function createUnavailableModelItem(
 ) {
     let description;
     if (reason === "upgrade") {
-        description = ( new MarkdownString(( localize(6997, "[Upgrade](command:workbench.action.chat.upgradePlan \" \")")), {
+        description = ( new MarkdownString(( localize(7051, "[Upgrade](command:workbench.action.chat.upgradePlan \" \")")), {
             isTrusted: true
         }));
     } else if (reason === "update") {
-        description = ( localize(6998, "Update VS Code"));
+        description = ( localize(7052, "Update VS Code"));
     } else {
-        description = manageSettingsUrl ? ( new MarkdownString(( localize(6999, "[Contact your admin]({0})", manageSettingsUrl)), {
+        description = manageSettingsUrl ? ( new MarkdownString(( localize(7053, "[Contact your admin]({0})", manageSettingsUrl)), {
             isTrusted: true
-        })) : ( localize(7000, "Contact your admin"));
+        })) : ( localize(7054, "Contact your admin"));
     }
     let hoverContent;
     if (reason === "upgrade") {
@@ -478,7 +484,7 @@ function createUnavailableModelItem(
             supportThemeIcons: true
         }));
         hoverContent.appendMarkdown(( localize(
-            7001,
+            7055,
             "[Upgrade to GitHub Copilot Pro](command:workbench.action.chat.upgradePlan \" \") with a free 30-day trial to use the best models."
         )));
     } else if (reason === "update") {
@@ -489,7 +495,7 @@ function createUnavailableModelItem(
             supportThemeIcons: true
         }));
         hoverContent.appendMarkdown(( localize(
-            7002,
+            7056,
             "This model is not available. Contact your administrator to enable it."
         )));
     }
@@ -573,6 +579,12 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         this._selectedModel = model;
         this._renderLabel();
     }
+    setEnabled(enabled) {
+        if (this._domNode) {
+            this._domNode.classList.toggle("disabled", !enabled);
+            this._domNode.setAttribute("aria-disabled", String(!enabled));
+        }
+    }
     setBadge(badge) {
         this._badge = badge;
         this._updateBadge();
@@ -606,7 +618,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
     }
     show(anchor) {
         const anchorElement = anchor ?? this._domNode;
-        if (!anchorElement) {
+        if (!anchorElement || this._domNode?.classList.contains("disabled")) {
             return;
         }
         const previousModel = this._selectedModel;
@@ -651,7 +663,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         );
         const listOptions = {
             showFilter,
-            filterPlaceholder: ( localize(7003, "Search models")),
+            filterPlaceholder: ( localize(7057, "Search models")),
             filterActions: showFilter && manageModelsAction ? [manageModelsAction] : undefined,
             focusFilterOnOpen: true,
             collapsedByDefault: ( new Set([ModelPickerSection.Other])),
@@ -728,7 +740,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
             const iconElement = renderIcon(statusIcon);
             domChildren.push(iconElement);
         }
-        const modelLabel = name ?? ( localize(6995, "Auto"));
+        const modelLabel = name ?? ( localize(7049, "Auto"));
         const configDescription = this._selectedModel ? getModelConfigurationDescription(this._selectedModel, this._languageModelsService) : undefined;
         const fullLabel = configDescription ? `${modelLabel} · ${configDescription}` : modelLabel;
         domChildren.push($("span.chat-input-picker-label", undefined, fullLabel));
@@ -737,7 +749,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         }
         domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));
         reset(this._domNode, ...domChildren);
-        this._domNode.ariaLabel = ( localize(7004, "Pick Model, {0}", fullLabel));
+        this._domNode.ariaLabel = ( localize(7058, "Pick Model, {0}", fullLabel));
     }
 };
 ModelPickerWidget = ( __decorate([( __param(2, IActionWidgetService)), ( __param(3, ICommandService)), ( __param(4, IOpenerService)), ( __param(5, ITelemetryService)), ( __param(6, ILanguageModelsService)), ( __param(7, IProductService)), ( __param(8, IChatEntitlementService)), ( __param(9, IUpdateService)), ( __param(10, IUriIdentityService))], ModelPickerWidget));
@@ -758,7 +770,7 @@ function getModelHoverContent(model, languageModelsService) {
     }
     if (model.metadata.multiplier) {
         markdown.appendMarkdown(`${( localize(
-            7005,
+            7059,
             "Each chat message counts {0} toward your premium request quota",
             model.metadata.multiplier
         ))}`);
@@ -766,7 +778,7 @@ function getModelHoverContent(model, languageModelsService) {
     }
     if (!isAuto && (model.metadata.maxInputTokens || model.metadata.maxOutputTokens)) {
         const totalTokens = (model.metadata.maxInputTokens ?? 0) + (model.metadata.maxOutputTokens ?? 0);
-        markdown.appendMarkdown(`${( localize(7006, "Context Size"))}: `);
+        markdown.appendMarkdown(`${( localize(7060, "Context Size"))}: `);
         markdown.appendMarkdown(`${formatTokenCount(totalTokens)}`);
         markdown.appendText(`\n`);
     }