@codingame/monaco-vscode-katex-common 32.0.1 → 33.0.7

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { $ as $$1, clearNode, h, hide, append, addStandardDisposableListener, EventType, isHTMLElement, DisposableResizeObserver, setVisibility, isKeyboardEvent, getActiveElement, getWindow, show, addDisposableListener, scheduleAtNextAnimationFrame, getTotalWidth } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { $ as $$1, clearNode, h, hide, append, addStandardDisposableListener, EventType, isHTMLElement, AnimationFrameScheduler, DisposableResizeObserver, setVisibility, isKeyboardEvent, getActiveElement, getWindow, show, addDisposableListener, scheduleAtNextAnimationFrame, getTotalWidth } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { DEFAULT_FONT_FAMILY } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/fonts';
 import { hasModifierKeys } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
 import { ActionViewItem, BaseActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
@@ -84,7 +84,7 @@ import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/w
 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 { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { LocalChatSessionUri, getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatViewModel';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
@@ -101,6 +101,11 @@ import { isIChatResourceViewContext, isIChatViewViewContext } from '@codingame/m
 import { ChatEditingShowChangesAction, ViewPreviousEditsAction } from '../../chatEditing/chatEditingActions.js';
 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 { AgentHostGenericConfigChips } from '../../agentSessions/agentHost/agentHostGenericConfigChips.js';
+import { SessionConfigKey } from '../../../../../../platform/agentHost/common/sessionConfigKeys.js';
+import { ClaudeSessionConfigKey } from '../../../../../../platform/agentHost/common/claudeSessionConfigKeys.js';
 import { MobileChatInputCombinedPickerActionItem } from './chatPhoneInputPresenter.js';
 import { IChatPhoneInputPresenter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widget/input/chatPhoneInputPresenter.service';
 import { IChatContextService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/contextContrib/chatContextService.service';
@@ -377,9 +382,12 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.height = observableValue(this, 0);
         this._forceVisibleScrollbarUntilAccept = false;
         this._modelSyncDisposables = this._register(( new DisposableStore()));
+        this._currentChatModes = this._register(( new MutableDisposable()));
         this._isSyncingToOrFromInputModel = false;
+        this.permissionWidgetDisposeListener = this._register(( new MutableDisposable()));
         this.chatSessionPickerWidgets = this._register(( new DisposableMap()));
         this._waitForPersistedLanguageModel = this._register(( new MutableDisposable()));
+        this._waitForSessionHistoryLanguageModel = this._register(( new MutableDisposable()));
         this._chatSessionOptionEmitters = this._register(( new DisposableMap()));
         this._optionContextKeys = ( new Map());
         this._currentLanguageModel = observableValue("_currentLanguageModel", undefined);
@@ -403,7 +411,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             onDidChangeVisibility: this._onDidChangeVisibility.event
         }));
         this._currentModeObservable = observableValue("currentMode", this.options.defaultMode ?? ChatMode.Agent);
-        this._currentChatModesObservable = observableValue("currentChatModes", this.chatModeService.getModes(localChatSessionType));
+        const localModes = this.chatModeService.createModes(LocalChatSessionUri.getNewSessionUri());
+        this._currentChatModes.value = localModes;
+        this._currentChatModesObservable = observableValue("currentChatModes", localModes);
         this._currentPermissionLevel = observableValue("permissionLevel", this.getDefaultPermissionLevel());
         this._register(this.editorService.onDidActiveEditorChange(() => {
             this._indexOfLastOpenedContext = -1;
@@ -576,6 +586,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         return `chat.currentLanguageModel.${this.location}.isDefault`;
     }
     initSelectedModel() {
+        this._waitForPersistedLanguageModel.clear();
         const persistedSelection = this.storageService.get(this.getSelectedModelStorageKey(), StorageScope.APPLICATION);
         const persistedAsDefault = this.storageService.getBoolean(this.getSelectedModelIsDefaultStorageKey(), StorageScope.APPLICATION, true);
         if (persistedSelection) {
@@ -643,6 +654,20 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this.setCurrentLanguageModel(models[nextIndex]);
         }
     }
+    switchToNextPinnedModel() {
+        const models = this.getModels();
+        if (models.length === 0) {
+            return;
+        }
+        const modelMap = ( new Map(( models.map(model => [model.identifier, model]))));
+        const pinnedModels = ( this.languageModelsService.getPinnedModelIds().map(modelId => modelMap.get(modelId))).filter(isDefined);
+        if (pinnedModels.length === 0) {
+            return;
+        }
+        const currentIndex = pinnedModels.findIndex(model => model.identifier === this._currentLanguageModel.get()?.identifier);
+        const nextIndex = (currentIndex + 1) % pinnedModels.length;
+        this.setCurrentLanguageModel(pinnedModels[nextIndex]);
+    }
     openModelPicker() {
         if (this.chatPhoneInputPresenter.enabled.get()) {
             this._showCombinedPhonePickerSheet();
@@ -672,6 +697,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             currentModel: this._currentLanguageModel,
             setModel: model => {
                 this._waitForPersistedLanguageModel.clear();
+                this._waitForSessionHistoryLanguageModel.clear();
                 this.setCurrentLanguageModel(model);
                 this.renderAttachedContext();
             },
@@ -797,10 +823,9 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         this._inputModel = model;
         this._modelSyncDisposables.clear();
-        this._currentChatModesObservable.set(
-            this.chatModeService.getModes(getChatSessionType(forSessionResource)),
-            undefined
-        );
+        const chatModes = this.chatModeService.createModes(forSessionResource);
+        this._currentChatModes.value = chatModes;
+        this._currentChatModesObservable.set(chatModes, undefined);
         this.selectedToolsModel.resetSessionEnablementState();
         this._chatSessionIsEmpty = chatSessionIsEmpty;
         if (chatSessionIsEmpty) {
@@ -864,7 +889,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             }
             if (state?.selectedModel) {
                 const allModels = this.getAllMergedModels();
-                const sessionType = this.getCurrentSessionType() ?? getChatSessionType(forSessionResource);
+                const sessionType = getChatSessionType(forSessionResource);
                 const syncResult = resolveModelFromSyncState(
                     state.selectedModel,
                     this._currentLanguageModel.get(),
@@ -1050,7 +1075,13 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
     }
     preselectModelFromSessionHistory() {
-        const requests = this._widget?.viewModel?.model.getRequests();
+        this._waitForSessionHistoryLanguageModel.clear();
+        const sessionModel = this._widget?.viewModel?.model;
+        const sessionResource = sessionModel?.sessionResource;
+        const requests = sessionModel?.getRequests();
+        if (!sessionResource) {
+            return;
+        }
         if (!requests || requests.length === 0) {
             return;
         }
@@ -1081,10 +1112,15 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this.setCurrentLanguageModel(match);
             return;
         }
-        this._waitForPersistedLanguageModel.value = this.languageModelsService.onDidChangeLanguageModels(() => {
+        this._waitForSessionHistoryLanguageModel.value = this.languageModelsService.onDidChangeLanguageModels(() => {
+            const currentSessionResource = this._widget?.viewModel?.model.sessionResource;
+            if (!currentSessionResource || !isEqual(currentSessionResource, sessionResource)) {
+                this._waitForSessionHistoryLanguageModel.clear();
+                return;
+            }
             const found = tryMatch();
             if (found) {
-                this._waitForPersistedLanguageModel.clear();
+                this._waitForSessionHistoryLanguageModel.clear();
                 this.setCurrentLanguageModel(found);
             }
         });
@@ -1123,40 +1159,40 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         }
         const mode = this._currentModeObservable.get();
         const modelName = this._currentLanguageModel.get()?.metadata.name;
-        const modelInfo = modelName ? ( localize(7456, ", {0}. ", modelName)) : "";
+        const modelInfo = modelName ? ( localize(7535, ", {0}. ", modelName)) : "";
         let modeLabel = "";
         if (!mode.isBuiltin) {
             const mode = this.currentModeObs.get();
-            modeLabel = ( localize(7457, "({0}), {1}", mode.label.get(), mode.description.get()));
+            modeLabel = ( localize(7536, "({0}), {1}", mode.label.get(), mode.description.get()));
         } else {
             switch (this.currentModeKind) {
             case ChatModeKind.Agent:
-                modeLabel = ( localize(7458, "(Agent), edit files in your workspace."));
+                modeLabel = ( localize(7537, "(Agent), edit files in your workspace."));
                 break;
             case ChatModeKind.Edit:
-                modeLabel = ( localize(7459, "(Edit), edit files in your workspace."));
+                modeLabel = ( localize(7538, "(Edit), edit files in your workspace."));
                 break;
             case ChatModeKind.Ask:
             default:
-                modeLabel = ( localize(7460, "(Ask), ask questions or type / for topics."));
+                modeLabel = ( localize(7539, "(Ask), ask questions or type / for topics."));
                 break;
             }
         }
         if (verbose) {
             return kbLabel ? ( localize(
-                7461,
+                7540,
                 "Chat Input {0}{1} Press Enter to send out the request. Use {2} for Chat Accessibility Help.",
                 modeLabel,
                 modelInfo,
                 kbLabel
             )) : ( localize(
-                7462,
+                7541,
                 "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(7463, "Chat Input {0}{1}.", modeLabel, modelInfo);
+            return localize(7542, "Chat Input {0}{1}.", modeLabel, modelInfo);
         }
     }
     validateCurrentChatMode() {
@@ -2047,6 +2083,19 @@ 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 genericChipsContainer = $$1(".chat-secondary-generic-chips");
+        const genericChipsLane = this._register(
+            this.instantiationService.createInstance(AgentHostGenericConfigChips, widget, secondaryPickerOptions)
+        );
+        genericChipsLane.render(genericChipsContainer);
         this.secondaryToolbar = this._register(this.instantiationService.createInstance(
             MenuWorkbenchToolBar,
             this.secondaryToolbarContainer,
@@ -2060,9 +2109,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 hoverDelegate,
                 responsiveBehavior: {
                     enabled: true,
-                    kind: "last",
+                    kind: "all",
                     minItems: 1,
-                    actionMinWidth: 48
+                    actionMinWidth: 48,
+                    getActionMinWidth: action => ( agentHostShortPickerIds.has(action.id)) ? 22 : undefined
                 },
                 actionViewItemProvider: (action, options) => {
                     if ((action.id === OpenSessionTargetPickerAction.ID || action.id === OpenDelegationPickerAction.ID) && action instanceof MenuItemAction) {
@@ -2142,12 +2192,20 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                         };
                         const widget = this.instantiationService.createInstance(PermissionPickerActionItem, action, delegate, secondaryPickerOptions);
                         this.permissionWidget = widget;
-                        this._register(widget.onDidDispose(() => {
+                        this.permissionWidgetDisposeListener.value = widget.onDidDispose(() => {
                             if (this.permissionWidget === widget) {
                                 this.permissionWidget = undefined;
                             }
-                        }));
+                            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) {
+                        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);
+                        return ( new AgentHostChatInputPickerActionViewItem(action, picker));
                     } else if (action.id === ChatSessionPrimaryPickerAction.ID && action instanceof MenuItemAction) {
                         const widgets = this.createChatSessionPickerWidgets(action, secondaryPickerOptions);
                         if (widgets.length === 0) {
@@ -2163,6 +2221,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         this.secondaryToolbar.context = {
             widget
         };
+        append(this.secondaryToolbarContainer, genericChipsContainer);
         this._register(this.secondaryToolbar.onDidChangeMenuItems(() => {
             const toolbarElement = this.secondaryToolbar.getElement();
             const container = toolbarElement.querySelector(".chat-sessionPicker-container");
@@ -2220,8 +2279,11 @@ let ChatInputPart = class ChatInputPart extends Disposable {
             this.renderAttachedContext();
         }));
         this.renderAttachedContext();
+        const updateCarouselMaxHeightScheduler = this._register(
+            new AnimationFrameScheduler(this.container, () => this.updateToolConfirmationCarouselMaxHeight())
+        );
         const inputResizeObserver = this._register(new DisposableResizeObserver("ChatInputPart.containerHeight", () => {
-            this.updateToolConfirmationCarouselMaxHeight();
+            updateCarouselMaxHeightScheduler.schedule();
             const newHeight = this.container.offsetHeight;
             this.height.set(newHeight, undefined);
         }));
@@ -2885,7 +2947,7 @@ let ChatInputPart = class ChatInputPart extends Disposable {
         const button = this._chatEditsActionsDisposables.add(( new ButtonWithIcon(overviewTitle, {
             supportIcons: true,
             secondary: true,
-            ariaLabel: ( localize(7464, "Toggle changed files."))
+            ariaLabel: ( localize(7543, "Toggle changed files."))
         })));
         const topLevelStats = derived(reader => {
             const entries = editSessionEntriesObs.read(reader);
@@ -2959,10 +3021,10 @@ let ChatInputPart = class ChatInputPart extends Disposable {
                 removed,
                 shouldShowEditingSession
             } = topLevelStats.read(reader);
-            const buttonLabel = files === 1 ? ( localize(7465, "1 file changed")) : ( localize(7466, "{0} files changed", files));
+            const buttonLabel = files === 1 ? ( localize(7544, "1 file changed")) : ( localize(7545, "{0} files changed", files));
             button.label = buttonLabel;
             button.element.setAttribute("aria-label", ( localize(
-                7467,
+                7546,
                 "{0}, {1} lines added, {2} lines removed",
                 buttonLabel,
                 added,

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

@@ -14,6 +14,7 @@ import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/w
 import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 import { IModelPickerDelegate } from "./modelPickerActionItem.js";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { IDefaultAccountService } from "@codingame/monaco-vscode-api/vscode/vs/platform/defaultAccount/common/defaultAccount.service";
 import { StateType } from "@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update";
 import { IUpdateService } from "@codingame/monaco-vscode-api/vscode/vs/platform/update/common/update.service";
 /**
@@ -35,7 +36,7 @@ import { IUpdateService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
  *      the `customoai` vendor) renders as distinct sections.
  * 4. Optional "Manage Models..." action shown in Other Models after a separator
  */
-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, languageModelsService?: ILanguageModelsService, openerService?: IOpenerService, isUBB?: boolean): IActionListItem<IActionWidgetDropdownAction>[];
+export declare function buildModelPickerItems(models: ILanguageModelChatMetadataAndIdentifier[], selectedModelId: string | undefined, recentModelIds: string[], pinnedModelIds: string[], controlModels: IStringDictionary<IModelControlEntry>, currentVSCodeVersion: string, updateStateType: StateType, onSelect: (model: ILanguageModelChatMetadataAndIdentifier) => void, onTogglePin: ((modelIdentifier: string, pinned: boolean) => void) | undefined, manageSettingsUrl: string | undefined, useGroupedModelPicker: boolean, manageModelsAction: IActionWidgetDropdownAction | undefined, chatEntitlementService: IChatEntitlementService, showUnavailableFeatured: boolean, showFeatured: boolean, languageModelsService?: ILanguageModelsService, openerService?: IOpenerService, isUBB?: boolean): IActionListItem<IActionWidgetDropdownAction>[];
 export declare function getModelPickerAccessibilityProvider(): {
     readonly getAriaLabel: (element: IActionListItem<IActionWidgetDropdownAction>) => string | null;
     readonly isChecked: (element: IActionListItem<IActionWidgetDropdownAction>) => boolean | undefined;
@@ -64,6 +65,7 @@ export declare class ModelPickerWidget extends Disposable {
     private readonly _entitlementService;
     private readonly _updateService;
     private readonly _uriIdentityService;
+    private readonly _defaultAccountService;
     private readonly _onDidChangeSelection;
     readonly onDidChangeSelection: Event<ILanguageModelChatMetadataAndIdentifier>;
     private _selectedModel;
@@ -77,7 +79,7 @@ export declare class ModelPickerWidget extends Disposable {
     get selectedModel(): ILanguageModelChatMetadataAndIdentifier | undefined;
     get domNode(): HTMLElement | undefined;
     get nameButton(): HTMLElement | undefined;
-    constructor(_delegate: IModelPickerDelegate, _actionWidgetService: IActionWidgetService, _commandService: ICommandService, _openerService: IOpenerService, _telemetryService: ITelemetryService, _languageModelsService: ILanguageModelsService, _productService: IProductService, _entitlementService: IChatEntitlementService, _updateService: IUpdateService, _uriIdentityService: IUriIdentityService);
+    constructor(_delegate: IModelPickerDelegate, _actionWidgetService: IActionWidgetService, _commandService: ICommandService, _openerService: IOpenerService, _telemetryService: ITelemetryService, _languageModelsService: ILanguageModelsService, _productService: IProductService, _entitlementService: IChatEntitlementService, _updateService: IUpdateService, _uriIdentityService: IUriIdentityService, _defaultAccountService: IDefaultAccountService);
     setHideChevrons(hideChevrons: IObservable<boolean>): void;
     setSelectedModel(model: ILanguageModelChatMetadataAndIdentifier | undefined): void;
     setEnabled(enabled: boolean): void;