@codingame/monaco-vscode-katex-common 30.0.1 → 31.0.0

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

@@ -1,4 +1,3 @@
-import { IHoverPositionOptions } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover";
 import { IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { ActionWidgetDropdownActionViewItem } from "../../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js";
@@ -16,7 +15,6 @@ export interface IChatInputPickerOptions {
     readonly getOverflowAnchor?: () => HTMLElement | undefined;
     readonly actionContext?: IChatExecuteActionContext;
     readonly hideChevrons: IObservable<boolean>;
-    readonly hoverPosition?: IHoverPositionOptions;
 }
 /**
  * Base class for chat input picker action items (model picker, mode picker, session target picker).

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

@@ -3,7 +3,6 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { IActionListItem } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionList";
-import { IHoverPositionOptions } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover";
 import { IActionWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service";
 import { IActionWidgetDropdownAction } from "../../../../../../platform/actionWidget/browser/actionWidgetDropdown.js";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
@@ -28,13 +27,13 @@ import { IUpdateService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
  * 3. Other Models (collapsible toggle, available first, then sorted by vendor then name)
  * 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, hoverPosition?: IHoverPositionOptions, languageModelsService?: ILanguageModelsService): IActionListItem<IActionWidgetDropdownAction>[];
+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): IActionListItem<IActionWidgetDropdownAction>[];
 export declare function getModelPickerAccessibilityProvider(): {
     readonly isChecked: (element: IActionListItem<IActionWidgetDropdownAction>) => boolean | undefined;
     readonly getRole: (element: IActionListItem<IActionWidgetDropdownAction>) => "separator" | "menuitem" | "menuitemradio";
     readonly getWidgetRole: () => string;
 };
-export type ModelPickerBadge = "info" | "warning";
+type ModelPickerBadge = "info" | "warning";
 /**
  * A model selection dropdown widget.
  *
@@ -47,7 +46,6 @@ export type ModelPickerBadge = "info" | "warning";
  */
 export declare class ModelPickerWidget extends Disposable {
     private readonly _delegate;
-    private readonly _hoverPosition;
     private readonly _actionWidgetService;
     private readonly _commandService;
     private readonly _openerService;
@@ -66,7 +64,7 @@ export declare class ModelPickerWidget extends Disposable {
     private _badgeIcon;
     get selectedModel(): ILanguageModelChatMetadataAndIdentifier | undefined;
     get domNode(): HTMLElement | undefined;
-    constructor(_delegate: IModelPickerDelegate, _hoverPosition: IHoverPositionOptions | undefined, _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);
     setHideChevrons(hideChevrons: IObservable<boolean>): void;
     setSelectedModel(model: ILanguageModelChatMetadataAndIdentifier | undefined): void;
     setEnabled(enabled: boolean): void;
@@ -76,3 +74,4 @@ export declare class ModelPickerWidget extends Disposable {
     private _updateBadge;
     private _renderLabel;
 }
+export {};

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(
-            7044,
+            7168,
             "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(
-            7045,
+            7169,
             "This model requires a newer version of VS Code. [Restart to Update](command:update.restartToUpdate) to access it."
         )));
         break;
     default:
         hoverContent.appendMarkdown(( localize(
-            7046,
+            7170,
             "This model requires a newer version of VS Code. [Update VS Code](command:update.checkForUpdate) to access it."
         )));
         break;
@@ -67,7 +67,7 @@ function getUpdateHoverContent(updateState) {
 const ModelPickerSection = {
     Other: "other"
 };
-function createModelItem(action, model, hoverPosition, languageModelsService) {
+function createModelItem(action, model) {
     return {
         item: action,
         kind: ActionListItemKind.Action,
@@ -80,8 +80,7 @@ function createModelItem(action, model, hoverPosition, languageModelsService) {
         hideIcon: false,
         section: action.section,
         hover: model ? {
-            content: getModelHoverContent(model, languageModelsService),
-            position: hoverPosition
+            content: getModelHoverContent(model)
         } : undefined,
         submenuActions: action.toolbarActions
     };
@@ -97,6 +96,9 @@ function getModelConfigurationDescription(model, languageModelsService) {
         if (propSchema.group !== "navigation") {
             continue;
         }
+        if (!propSchema.enum || propSchema.enum.length < 2) {
+            continue;
+        }
         const value = currentConfig[key] ?? propSchema.default;
         if (value === undefined) {
             continue;
@@ -136,8 +138,8 @@ function createManageModelsAction(commandService) {
         enabled: true,
         checked: false,
         class: ThemeIcon.asClassName(Codicon.gear),
-        tooltip: ( localize(7047, "Manage Language Models")),
-        label: ( localize(7048, "Manage Models...")),
+        tooltip: ( localize(7171, "Manage Language Models")),
+        label: ( localize(7172, "Manage Models...")),
         run: () => {
             commandService.executeCommand(MANAGE_CHAT_COMMAND_ID);
         }
@@ -157,7 +159,6 @@ function buildModelPickerItems(
     chatEntitlementService,
     showUnavailableFeatured,
     showFeatured,
-    hoverPosition,
     languageModelsService
 ) {
     const items = [];
@@ -167,8 +168,8 @@ function buildModelPickerItems(
             enabled: true,
             checked: true,
             class: undefined,
-            tooltip: ( localize(7049, "Auto")),
-            label: ( localize(7049, "Auto")),
+            tooltip: ( localize(7173, "Auto")),
+            label: ( localize(7173, "Auto")),
             run: () => {}
         }));
     }
@@ -204,9 +205,7 @@ function buildModelPickerItems(
                 markPlaced(autoModel.identifier, autoModel.metadata.id);
                 items.push(createModelItem(
                     createModelAction(autoModel, selectedModelId, onSelect, languageModelsService),
-                    autoModel,
-                    hoverPosition,
-                    languageModelsService
+                    autoModel
                 ));
             }
             const promotedItems = [];
@@ -306,20 +305,12 @@ function buildModelPickerItems(
                     if (item.kind === "available") {
                         items.push(createModelItem(
                             createModelAction(item.model, selectedModelId, onSelect, languageModelsService),
-                            item.model,
-                            hoverPosition,
-                            languageModelsService
+                            item.model
                         ));
                     } else {
-                        items.push(createUnavailableModelItem(
-                            item.id,
-                            item.entry,
-                            item.reason,
-                            manageSettingsUrl,
-                            updateStateType,
-                            undefined,
-                            hoverPosition
-                        ));
+                        items.push(
+                            createUnavailableModelItem(item.id, item.entry, item.reason, manageSettingsUrl, updateStateType)
+                        );
                     }
                 }
             }
@@ -351,12 +342,12 @@ function buildModelPickerItems(
                         enabled: true,
                         checked: false,
                         class: undefined,
-                        tooltip: ( localize(7050, "Other Models")),
-                        label: ( localize(7050, "Other Models")),
+                        tooltip: ( localize(7174, "Other Models")),
+                        label: ( localize(7174, "Other Models")),
                         run: () => {}
                     },
                     kind: ActionListItemKind.Action,
-                    label: ( localize(7050, "Other Models")),
+                    label: ( localize(7174, "Other Models")),
                     group: {
                         title: "",
                         icon: Codicon.chevronDown
@@ -374,8 +365,7 @@ function buildModelPickerItems(
                             "update",
                             manageSettingsUrl,
                             updateStateType,
-                            ModelPickerSection.Other,
-                            hoverPosition
+                            ModelPickerSection.Other
                         ));
                     } else {
                         items.push(createModelItem(createModelAction(
@@ -384,7 +374,7 @@ function buildModelPickerItems(
                             onSelect,
                             languageModelsService,
                             ModelPickerSection.Other
-                        ), model, hoverPosition, languageModelsService));
+                        ), model));
                     }
                 }
             }
@@ -412,9 +402,7 @@ function buildModelPickerItems(
         if (autoModel) {
             items.push(createModelItem(
                 createModelAction(autoModel, selectedModelId, onSelect, languageModelsService),
-                autoModel,
-                hoverPosition,
-                languageModelsService
+                autoModel
             ));
         }
         const sortedModels = models.filter(m => m !== autoModel).sort((a, b) => {
@@ -424,9 +412,7 @@ function buildModelPickerItems(
         for (const model of sortedModels) {
             items.push(createModelItem(
                 createModelAction(model, selectedModelId, onSelect, languageModelsService),
-                model,
-                hoverPosition,
-                languageModelsService
+                model
             ));
         }
     }
@@ -456,26 +442,18 @@ function getModelPickerAccessibilityProvider() {
         getWidgetRole: () => "menu"
     };
 }
-function createUnavailableModelItem(
-    id,
-    entry,
-    reason,
-    manageSettingsUrl,
-    updateStateType,
-    section,
-    hoverPosition
-) {
+function createUnavailableModelItem(id, entry, reason, manageSettingsUrl, updateStateType, section) {
     let description;
     if (reason === "upgrade") {
-        description = ( new MarkdownString(( localize(7051, "[Upgrade](command:workbench.action.chat.upgradePlan \" \")")), {
+        description = ( new MarkdownString(( localize(7175, "[Upgrade](command:workbench.action.chat.upgradePlan \" \")")), {
             isTrusted: true
         }));
     } else if (reason === "update") {
-        description = ( localize(7052, "Update VS Code"));
+        description = ( localize(7176, "Update VS Code"));
     } else {
-        description = manageSettingsUrl ? ( new MarkdownString(( localize(7053, "[Contact your admin]({0})", manageSettingsUrl)), {
+        description = manageSettingsUrl ? ( new MarkdownString(( localize(7177, "[Contact your admin]({0})", manageSettingsUrl)), {
             isTrusted: true
-        })) : ( localize(7054, "Contact your admin"));
+        })) : ( localize(7178, "Contact your admin"));
     }
     let hoverContent;
     if (reason === "upgrade") {
@@ -484,8 +462,8 @@ function createUnavailableModelItem(
             supportThemeIcons: true
         }));
         hoverContent.appendMarkdown(( localize(
-            7055,
-            "[Upgrade to GitHub Copilot Pro](command:workbench.action.chat.upgradePlan \" \") with a free 30-day trial to use the best models."
+            7179,
+            "[Upgrade to GitHub Copilot Pro](command:workbench.action.chat.upgradePlan \" \") to use the best models."
         )));
     } else if (reason === "update") {
         hoverContent = getUpdateHoverContent(updateStateType);
@@ -495,7 +473,7 @@ function createUnavailableModelItem(
             supportThemeIcons: true
         }));
         hoverContent.appendMarkdown(( localize(
-            7056,
+            7180,
             "This model is not available. Contact your administrator to enable it."
         )));
     }
@@ -522,8 +500,7 @@ function createUnavailableModelItem(
         className: "chat-model-picker-unavailable",
         section,
         hover: {
-            content: hoverContent,
-            position: hoverPosition
+            content: hoverContent
         }
     };
 }
@@ -536,7 +513,6 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
     }
     constructor(
         _delegate,
-        _hoverPosition,
         _actionWidgetService,
         _commandService,
         _openerService,
@@ -549,7 +525,6 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
     ) {
         super();
         this._delegate = _delegate;
-        this._hoverPosition = _hoverPosition;
         this._actionWidgetService = _actionWidgetService;
         this._commandService = _commandService;
         this._openerService = _openerService;
@@ -658,12 +633,11 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
             this._entitlementService,
             this._delegate.showUnavailableFeatured(),
             this._delegate.showFeatured(),
-            this._hoverPosition,
             this._languageModelsService
         );
         const listOptions = {
             showFilter,
-            filterPlaceholder: ( localize(7057, "Search models")),
+            filterPlaceholder: ( localize(7181, "Search models")),
             filterActions: showFilter && manageModelsAction ? [manageModelsAction] : undefined,
             focusFilterOnOpen: true,
             collapsedByDefault: ( new Set([ModelPickerSection.Other])),
@@ -740,7 +714,7 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
             const iconElement = renderIcon(statusIcon);
             domChildren.push(iconElement);
         }
-        const modelLabel = name ?? ( localize(7049, "Auto"));
+        const modelLabel = name ?? ( localize(7173, "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));
@@ -749,56 +723,29 @@ let ModelPickerWidget = class ModelPickerWidget extends Disposable {
         }
         domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));
         reset(this._domNode, ...domChildren);
-        this._domNode.ariaLabel = ( localize(7058, "Pick Model, {0}", fullLabel));
+        this._domNode.ariaLabel = ( localize(7182, "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));
-function getModelHoverContent(model, languageModelsService) {
+ModelPickerWidget = ( __decorate([( __param(1, IActionWidgetService)), ( __param(2, ICommandService)), ( __param(3, IOpenerService)), ( __param(4, ITelemetryService)), ( __param(5, ILanguageModelsService)), ( __param(6, IProductService)), ( __param(7, IChatEntitlementService)), ( __param(8, IUpdateService)), ( __param(9, IUriIdentityService))], ModelPickerWidget));
+function getModelHoverContent(model) {
     const isAuto = model.metadata.id === "auto" && model.metadata.vendor === "copilot";
     const markdown = ( new MarkdownString("", {
         isTrusted: true,
         supportThemeIcons: true
     }));
     markdown.appendMarkdown(`**${model.metadata.name}**`);
-    markdown.appendText(`\n`);
-    if (model.metadata.statusIcon && model.metadata.tooltip) {
+    if (model.metadata.tooltip) {
+        markdown.appendMarkdown(`\n\n`);
         if (model.metadata.statusIcon) {
             markdown.appendMarkdown(`$(${model.metadata.statusIcon.id})&nbsp;`);
         }
         markdown.appendMarkdown(`${model.metadata.tooltip}`);
-        markdown.appendText(`\n`);
-    }
-    if (model.metadata.multiplier) {
-        markdown.appendMarkdown(`${( localize(
-            7059,
-            "Each chat message counts {0} toward your premium request quota",
-            model.metadata.multiplier
-        ))}`);
-        markdown.appendText(`\n`);
     }
     if (!isAuto && (model.metadata.maxInputTokens || model.metadata.maxOutputTokens)) {
+        markdown.appendMarkdown(`\n\n`);
         const totalTokens = (model.metadata.maxInputTokens ?? 0) + (model.metadata.maxOutputTokens ?? 0);
-        markdown.appendMarkdown(`${( localize(7060, "Context Size"))}: `);
+        markdown.appendMarkdown(`${( localize(7183, "Context Size"))}: `);
         markdown.appendMarkdown(`${formatTokenCount(totalTokens)}`);
-        markdown.appendText(`\n`);
-    }
-    if (languageModelsService) {
-        const schema = model.metadata.configurationSchema;
-        if (schema?.properties) {
-            const currentConfig = languageModelsService.getModelConfiguration(model.identifier) ?? {};
-            for (const [key, propSchema] of Object.entries(schema.properties)) {
-                const value = currentConfig[key] ?? propSchema.default;
-                if (value === undefined) {
-                    continue;
-                }
-                const enumItemLabels = propSchema.enumItemLabels;
-                const enumIndex = propSchema.enum?.indexOf(value) ?? -1;
-                const displayValue = enumItemLabels?.[enumIndex] ?? String(value);
-                const label = propSchema.title ?? key;
-                markdown.appendText(`${label}: ${displayValue}`);
-                markdown.appendText(`\n`);
-            }
-        }
     }
     return markdown;
 }

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

@@ -3,7 +3,7 @@ import { ILanguageModelChatMetadataAndIdentifier } from "@codingame/monaco-vscod
 /**
  * Describes the context needed for model selection decisions.
  */
-export interface IModelSelectionContext {
+interface IModelSelectionContext {
     readonly location: ChatAgentLocation;
     readonly currentModeKind: ChatModeKind;
     readonly isInlineChatV2Enabled: boolean;
@@ -102,3 +102,4 @@ export declare function shouldResetOnModelListChange(currentModelId: string | un
  * The model must pass both the persisted-default check and the `isUserSelectable` check.
  */
 export declare function shouldRestoreLateArrivingModel(persistedModelId: string, persistedAsDefault: boolean, model: ILanguageModelChatMetadataAndIdentifier, location: ChatAgentLocation): boolean;
+export {};

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

@@ -82,6 +82,9 @@ let DelegationSessionPickerActionItem = class DelegationSessionPickerActionItem
         return this._getSelectedSessionType() !== type;
     }
     _hasGitRepository() {
+        if (this.delegate.hasGitRepository) {
+            return this.delegate.hasGitRepository();
+        }
         return !Iterable.isEmpty(this.gitService.repositories);
     }
     _isVisible(type) {
@@ -96,28 +99,25 @@ let DelegationSessionPickerActionItem = class DelegationSessionPickerActionItem
     _getSessionCategory(sessionTypeItem) {
         if (isFirstPartyAgentSessionProvider(sessionTypeItem.type)) {
             return {
-                label: ( localize(7074, "Continue In")),
+                label: ( localize(7197, "Continue In")),
                 order: 1,
                 showHeader: true
             };
         }
         return {
-            label: ( localize(7075, "Continue In (Third Party)")),
+            label: ( localize(7198, "Continue In (Third Party)")),
             order: 2,
             showHeader: false
         };
     }
     _getSessionDescription(sessionTypeItem) {
-        if (this._isSessionsWindow && sessionTypeItem.type === AgentSessionProviders.Cloud && !this._hasGitRepository()) {
-            return localize(7076, "Requires a Git repository");
-        }
         return undefined;
     }
     _getLearnMore() {
         const learnMoreUrl = "https://aka.ms/vscode-continue-chat-in";
         return {
             id: "workbench.action.chat.agentOverview.learnMoreHandOff",
-            label: ( localize(7077, "Learn about agent handoff...")),
+            label: ( localize(7199, "Learn about agent handoff...")),
             tooltip: learnMoreUrl,
             class: undefined,
             enabled: true,
@@ -133,17 +133,16 @@ let DelegationSessionPickerActionItem = class DelegationSessionPickerActionItem
         return [{
             id: "newChatSession",
             class: undefined,
-            label: ( localize(7078, "New Chat Session")),
+            label: ( localize(7200, "New Chat Session")),
             tooltip: "",
             hover: {
-                content: "",
-                position: this.pickerOptions.hoverPosition
+                content: ""
             },
             checked: false,
             icon: Codicon.plus,
             enabled: true,
             category: {
-                label: ( localize(7079, "New Chat Session")),
+                label: ( localize(7201, "New Chat Session")),
                 order: 0,
                 showHeader: false
             },

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

@@ -23,8 +23,9 @@ import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contr
 import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
 import { isOrganizationPromptFile } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/utils/promptsServiceUtils';
 import { ChatConfiguration, ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
+import { PromptsStorage, matchesSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { Target } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { getOpenChatActionIdForMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ToggleAgentModeActionId } from '../../actions/chatExecuteActions.js';
 import { ChatInputPickerActionViewItem } from './chatInputPickerActionItem.js';
@@ -66,17 +67,17 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
         const assignments = observableValue("modePickerAssignments", {
             showOldAskMode: false
         });
-        const customAgentTarget = delegate.customAgentTarget?.() ?? Target.Undefined;
+        const getCustomAgentTarget = () => delegate.customAgentTarget?.() ?? Target.Undefined;
         const builtInCategory = {
-            label: ( localize(7100, "Built-In")),
+            label: ( localize(7221, "Built-In")),
             order: 0
         };
         const customCategory = {
-            label: ( localize(7101, "Custom")),
+            label: ( localize(7222, "Custom")),
             order: 1
         };
         const policyDisabledCategory = {
-            label: ( localize(7102, "Managed by your organization")),
+            label: ( localize(7223, "Managed by your organization")),
             order: 999,
             showHeader: true
         };
@@ -91,11 +92,11 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
                     if (mode.source?.storage === PromptsStorage.extension) {
                         icon = Codicon.file;
                         id = `viewAgent:${mode.id}`;
-                        label = ( localize(7103, "View {0} agent", mode.label.get()));
+                        label = ( localize(7224, "View {0} agent", mode.label.get()));
                     } else {
                         icon = Codicon.edit;
                         id = `editAgent:${mode.id}`;
-                        label = ( localize(7104, "Edit {0} agent", mode.label.get()));
+                        label = ( localize(7225, "Edit {0} agent", mode.label.get()));
                     }
                     const modeResource = mode.uri;
                     toolbarActions.push({
@@ -120,8 +121,7 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
                 checked: !isDisabledViaPolicy && currentMode.id === mode.id,
                 tooltip: "",
                 hover: {
-                    content: tooltip,
-                    position: this.pickerOptions.hoverPosition
+                    content: tooltip
                 },
                 toolbarActions,
                 run: async () => {
@@ -145,49 +145,59 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
                 ...makeAction(mode, currentMode),
                 tooltip: "",
                 hover: {
-                    content: mode.description.get() ?? chatAgentService.getDefaultAgent(ChatAgentLocation.Chat, mode.kind)?.description ?? action.tooltip,
-                    position: this.pickerOptions.hoverPosition
+                    content: mode.description.get() ?? chatAgentService.getDefaultAgent(ChatAgentLocation.Chat, mode.kind)?.description ?? action.tooltip
                 },
                 icon: mode.icon.get() ?? (isModeConsideredBuiltIn(mode, this._productService) ? builtinDefaultIcon(mode) : undefined),
                 category: agentModeDisabledViaPolicy ? policyDisabledCategory : customCategory
             };
         };
-        const actionProviderWithCustomAgentTarget = {
-            getActions: () => {
-                const modes = chatModeService.getModes();
-                const currentMode = delegate.currentMode.get();
-                const filteredCustomModes = modes.custom.filter(mode => {
-                    const target = mode.target.get();
-                    return target === customAgentTarget || target === Target.Undefined;
-                });
-                const customModes = groupBy(
-                    filteredCustomModes,
-                    mode => isModeConsideredBuiltIn(mode, this._productService) ? "builtin" : "custom"
-                );
-                const checked = currentMode.id === ChatMode.Agent.id;
-                const defaultAction = {
-                    ...makeAction(ChatMode.Agent, ChatMode.Agent),
-                    checked
-                };
-                defaultAction.category = builtInCategory;
-                const builtInActions = customModes.builtin?.map(mode => {
-                    const action = makeActionFromCustomMode(mode, currentMode);
-                    action.category = builtInCategory;
-                    return action;
-                }) ?? [];
-                const customActions = customModes.custom?.map(mode => makeActionFromCustomMode(mode, currentMode)) ?? [];
-                return [defaultAction, ...builtInActions, ...customActions];
-            }
+        const getActionsForCustomAgentTarget = currentTarget => {
+            const modes = chatModeService.getModes();
+            const currentMode = delegate.currentMode.get();
+            const sessionResource = delegate.sessionResource();
+            const currentSessionType = sessionResource ? getChatSessionType(sessionResource) : undefined;
+            const filteredCustomModes = modes.custom.filter(mode => {
+                const target = mode.target.get();
+                if (target !== currentTarget && target !== Target.Undefined) {
+                    return false;
+                }
+                if (!matchesSessionType(mode.sessionTypes, currentSessionType)) {
+                    return false;
+                }
+                return true;
+            });
+            const customModes = groupBy(
+                filteredCustomModes,
+                mode => isModeConsideredBuiltIn(mode, this._productService) ? "builtin" : "custom"
+            );
+            const checked = currentMode.id === ChatMode.Agent.id;
+            const defaultAction = {
+                ...makeAction(ChatMode.Agent, ChatMode.Agent),
+                checked
+            };
+            defaultAction.category = builtInCategory;
+            const builtInActions = customModes.builtin?.map(mode => {
+                const action = makeActionFromCustomMode(mode, currentMode);
+                action.category = builtInCategory;
+                return action;
+            }) ?? [];
+            const customActions = customModes.custom?.map(mode => makeActionFromCustomMode(mode, currentMode)) ?? [];
+            return [defaultAction, ...builtInActions, ...customActions];
         };
         const actionProvider = {
             getActions: () => {
                 const modes = chatModeService.getModes();
                 const currentMode = delegate.currentMode.get();
                 const agentMode = modes.builtin.find(mode => mode.id === ChatMode.Agent.id);
+                const sessionResource = delegate.sessionResource();
+                const currentSessionType = sessionResource ? getChatSessionType(sessionResource) : undefined;
                 const otherBuiltinModes = modes.builtin.filter(mode => {
                     return mode.id !== ChatMode.Agent.id && shouldShowBuiltInMode(mode, assignments.get(), agentModeDisabledViaPolicy);
                 });
                 const filteredCustomModes = modes.custom.filter(mode => {
+                    if (!matchesSessionType(mode.sessionTypes, currentSessionType)) {
+                        return false;
+                    }
                     if (isModeConsideredBuiltIn(mode, this._productService)) {
                         return shouldShowBuiltInMode(mode, assignments.get(), agentModeDisabledViaPolicy);
                     }
@@ -209,8 +219,17 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
                 return orderedModes;
             }
         };
+        const dynamicActionProvider = {
+            getActions: () => {
+                const currentTarget = getCustomAgentTarget();
+                if (currentTarget !== Target.Undefined) {
+                    return getActionsForCustomAgentTarget(currentTarget);
+                }
+                return actionProvider.getActions();
+            }
+        };
         const modePickerActionWidgetOptions = {
-            actionProvider: customAgentTarget !== Target.Undefined ? actionProviderWithCustomAgentTarget : actionProvider,
+            actionProvider: dynamicActionProvider,
             actionBarActionProvider: {
                 getActions: () => this.getModePickerActionBarActions()
             },