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

package/vscode/src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.js

@@ -97,12 +97,12 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
         contextNode.tabIndex = 0;
         contextNode.classList.toggle("disabled", !context.enabled);
         const file = context.uri;
-        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(5791, "cell")) : ( localize(5792, "file"));
-        const contextLabel = context.name ?? (file ? basename(file) : ( localize(5793, "context")));
+        const attachmentTypeName = file?.scheme === Schemas.vscodeNotebookCell ? ( localize(5865, "cell")) : ( localize(5866, "file"));
+        const contextLabel = context.name ?? (file ? basename(file) : ( localize(5867, "context")));
         const isSuggestedEnabled = this.configService.getValue("chat.implicitContext.suggestedContext");
         if (isSuggestedEnabled) {
             if (!isSelection) {
-                const buttonMsg = context.enabled ? ( localize(5794, "Disable {0} context {1}", attachmentTypeName, contextLabel)) : ( localize(5795, "Add {0} to context", contextLabel));
+                const buttonMsg = context.enabled ? ( localize(5868, "Disable {0} context {1}", attachmentTypeName, contextLabel)) : ( localize(5869, "Add {0} to context", contextLabel));
                 const toggleButton = this.renderDisposables.add(( new Button(contextNode, {
                     supportIcons: true,
                     title: buttonMsg
@@ -117,7 +117,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                     context.enabled = false;
                 }));
             } else {
-                const pinButtonMsg = ( localize(5796, "Pin selection"));
+                const pinButtonMsg = ( localize(5870, "Pin selection"));
                 const pinButton = this.renderDisposables.add(( new Button(contextNode, {
                     supportIcons: true,
                     title: pinButtonMsg
@@ -150,7 +150,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                 })
             );
         } else {
-            const buttonMsg = context.enabled ? ( localize(5797, "Disable current {0} context", attachmentTypeName)) : ( localize(5798, "Enable current {0} context", attachmentTypeName));
+            const buttonMsg = context.enabled ? ( localize(5871, "Disable current {0} context", attachmentTypeName)) : ( localize(5872, "Enable current {0} context", attachmentTypeName));
             const toggleButton = this.renderDisposables.add(( new Button(contextNode, {
                 supportIcons: true,
                 title: buttonMsg
@@ -161,9 +161,9 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                 context.enabled = !context.enabled;
             }));
         }
-        const label = this.resourceLabels.create(contextNode, {
+        const label = this.renderDisposables.add(this.resourceLabels.create(contextNode, {
             supportIcons: true
-        });
+        }));
         let title;
         let markdownTooltip;
         if (isStringImplicitContextValue(context.value)) {
@@ -174,9 +174,9 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
                 context.icon,
                 context.value.resourceUri,
                 markdownTooltip,
-                ( localize(5799, "Current file context"))
+                ( localize(5873, "Current file context"))
             );
-            contextNode.ariaLabel = ( localize(5800, "Suggested context, {0}", context.name));
+            contextNode.ariaLabel = ( localize(5874, "Suggested context, {0}", context.name));
         } else {
             title = this.renderResource(context.value, context.isSelection, context.enabled, label, contextNode);
         }
@@ -236,23 +236,23 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
         if (file.scheme === Schemas.vscodeBrowser) {
             return this.renderBrowserResource(file, label, contextNode);
         }
-        const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? ( localize(5791, "cell")) : ( localize(5792, "file"));
+        const attachmentTypeName = file.scheme === Schemas.vscodeNotebookCell ? ( localize(5865, "cell")) : ( localize(5866, "file"));
         const fileBasename = basename(file);
         const fileDirname = dirname(file);
         const friendlyName = `${fileBasename} ${fileDirname}`;
         const ariaLabel = range ? ( localize(
-            5801,
+            5875,
             "Suggested context, {0}, {1}, line {2} to line {3}",
             attachmentTypeName,
             friendlyName,
             range.startLineNumber,
             range.endLineNumber
-        )) : ( localize(5802, "Suggested context, {0}, {1}", attachmentTypeName, friendlyName));
+        )) : ( localize(5876, "Suggested context, {0}, {1}", attachmentTypeName, friendlyName));
         const uriLabel = this.labelService.getUriLabel(file, {
             relative: true
         });
-        const currentFile = ( localize(5803, "Current {0} context", attachmentTypeName));
-        const inactive = ( localize(5804, "Enable current {0} context", attachmentTypeName));
+        const currentFile = ( localize(5877, "Current {0} context", attachmentTypeName));
+        const inactive = ( localize(5878, "Enable current {0} context", attachmentTypeName));
         const currentFileHint = enabled || isSelection ? currentFile : inactive;
         const title = `${currentFileHint}\n${uriLabel}`;
         label.setFile(file, {
@@ -274,7 +274,7 @@ let ImplicitContextAttachmentWidget = class ImplicitContextAttachmentWidget exte
             label.setLabel(input.getName(), undefined, {
                 iconPath: Codicon.globe
             });
-            contextNode.ariaLabel = ( localize(5805, "Suggested browser context, {0}", input.getName()));
+            contextNode.ariaLabel = ( localize(5879, "Suggested browser context, {0}", input.getName()));
         };
         update();
         this.renderDisposables.add(input.onDidChangeLabel(() => update()));

package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions.js

@@ -82,7 +82,7 @@ registerAction2(class OpenFileInDiffAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.openFileInDiff",
-            title: ( localize2(6362, "Open Changes in Diff Editor")),
+            title: ( localize2(6442, "Open Changes in Diff Editor")),
             icon: Codicon.diffSingle,
             menu: [{
                 id: MenuId.ChatEditingWidgetModifiedFilesToolbar,
@@ -113,7 +113,7 @@ registerAction2(class AcceptAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.acceptFile",
-            title: ( localize2(6363, "Keep")),
+            title: ( localize2(6443, "Keep")),
             icon: Codicon.check,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -139,7 +139,7 @@ registerAction2(class DiscardAction extends WorkingSetAction {
     constructor() {
         super({
             id: "chatEditing.discardFile",
-            title: ( localize2(6364, "Undo")),
+            title: ( localize2(6444, "Undo")),
             icon: Codicon.discard,
             menu: [{
                 when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("resourceScheme", CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME)), ContextKeyExpr.notIn(
@@ -165,9 +165,9 @@ class ChatEditingAcceptAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.acceptAllFiles",
-            title: ( localize(6365, "Keep")),
+            title: ( localize(6445, "Keep")),
             icon: Codicon.check,
-            tooltip: ( localize(6366, "Keep All Edits")),
+            tooltip: ( localize(6446, "Keep All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             keybinding: {
                 primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -191,9 +191,9 @@ class ChatEditingDiscardAllAction extends EditingSessionAction {
     constructor() {
         super({
             id: "chatEditing.discardAllFiles",
-            title: ( localize(6367, "Undo")),
+            title: ( localize(6447, "Undo")),
             icon: Codicon.discard,
-            tooltip: ( localize(6368, "Undo All Edits")),
+            tooltip: ( localize(6448, "Undo All Edits")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -224,8 +224,8 @@ class ToggleExplanationWidgetAction extends EditingSessionAction {
     constructor() {
         super({
             id: ToggleExplanationWidgetAction.ID,
-            title: ( localize(6369, "Explain")),
-            tooltip: ( localize(6370, "Toggle Change Explanations")),
+            title: ( localize(6449, "Explain")),
+            tooltip: ( localize(6450, "Toggle Change Explanations")),
             precondition: hasUndecidedChatEditingResourceContextKey,
             menu: [{
                 id: MenuId.ChatEditingWidgetToolbar,
@@ -249,17 +249,17 @@ async function discardAllEditsWithConfirmation(accessor, currentEditingSession)
     const entries = currentEditingSession.entries.get().filter(e => e.state.get() === ModifiedFileEntryState.Modified);
     if (entries.length > 0) {
         const confirmation = await dialogService.confirm({
-            title: ( localize(6371, "Undo all edits?")),
+            title: ( localize(6451, "Undo all edits?")),
             message: entries.length === 1 ? ( localize(
-                6372,
+                6452,
                 "This will undo changes made in {0}. Do you want to proceed?",
                 basename(entries[0].modifiedURI)
             )) : ( localize(
-                6373,
+                6453,
                 "This will undo changes made in {0} files. Do you want to proceed?",
                 entries.length
             )),
-            primaryButton: ( localize(6374, "Yes")),
+            primaryButton: ( localize(6454, "Yes")),
             type: "info"
         });
         if (!confirmation.confirmed) {
@@ -274,7 +274,7 @@ class ChatEditingShowChangesAction extends EditingSessionAction {
         this.ID = "chatEditing.viewChanges";
     }
     static {
-        this.LABEL = ( localize(6375, "View All Edits"));
+        this.LABEL = ( localize(6455, "View All Edits"));
     }
     constructor() {
         super({
@@ -336,13 +336,13 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     if (editsToUndo === 1) {
         if (entriesModifiedInRequestsToRemove.length === 1) {
             message = ( localize(
-                6376,
+                6456,
                 "This will remove your last request and undo the edits made to {0}. Do you want to proceed?",
                 basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
             ));
         } else {
             message = ( localize(
-                6377,
+                6457,
                 "This will remove your last request and undo edits made to {0} files in your working set. Do you want to proceed?",
                 entriesModifiedInRequestsToRemove.length
             ));
@@ -350,24 +350,24 @@ async function restoreSnapshotWithConfirmationByRequestId(accessor, sessionResou
     } else {
         if (entriesModifiedInRequestsToRemove.length === 1) {
             message = ( localize(
-                6378,
+                6458,
                 "This will remove all subsequent requests and undo edits made to {0}. Do you want to proceed?",
                 basename(entriesModifiedInRequestsToRemove[0].modifiedURI)
             ));
         } else {
             message = ( localize(
-                6379,
+                6459,
                 "This will remove all subsequent requests and undo edits made to {0} files in your working set. Do you want to proceed?",
                 entriesModifiedInRequestsToRemove.length
             ));
         }
     }
     const confirmation = shouldPrompt ? await dialogService.confirm({
-        title: editsToUndo === 1 ? ( localize(6380, "Do you want to undo your last edit?")) : ( localize(6381, "Do you want to undo {0} edits?", editsToUndo)),
+        title: editsToUndo === 1 ? ( localize(6460, "Do you want to undo your last edit?")) : ( localize(6461, "Do you want to undo {0} edits?", editsToUndo)),
         message: message,
-        primaryButton: ( localize(6382, "Yes")),
+        primaryButton: ( localize(6462, "Yes")),
         checkbox: {
-            label: ( localize(6383, "Don't ask again")),
+            label: ( localize(6463, "Don't ask again")),
             checked: false
         },
         type: "info"
@@ -397,7 +397,7 @@ registerAction2(class RemoveAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.undoEdits",
-            title: ( localize2(6384, "Undo Requests")),
+            title: ( localize2(6464, "Undo Requests")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
@@ -443,8 +443,8 @@ registerAction2(class RestoreCheckpointAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.restoreCheckpoint",
-            title: ( localize2(6385, "Restore Checkpoint")),
-            tooltip: ( localize2(6386, "Restores workspace and chat to this point")),
+            title: ( localize2(6465, "Restore Checkpoint")),
+            tooltip: ( localize2(6466, "Restores workspace and chat to this point")),
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -489,8 +489,8 @@ registerAction2(class StartOverAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.startOver",
-            title: ( localize2(6387, "Start Over")),
-            tooltip: ( localize2(6388, "Clears the chat and undoes all changes")),
+            title: ( localize2(6467, "Start Over")),
+            tooltip: ( localize2(6468, "Clears the chat and undoes all changes")),
             f1: false,
             category: CHAT_CATEGORY,
             menu: [{
@@ -519,7 +519,7 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.restoreLastCheckpoint",
-            title: ( localize2(6389, "Restore to Last Checkpoint")),
+            title: ( localize2(6469, "Restore to Last Checkpoint")),
             f1: true,
             category: CHAT_CATEGORY,
             icon: Codicon.discard,
@@ -544,7 +544,7 @@ registerAction2(class RestoreLastCheckpoint extends Action2 {
         }
         const checkpointRequest = chatModel.checkpoint;
         if (!checkpointRequest) {
-            alert(( localize(6390, "There is no checkpoint to restore.")));
+            alert(( localize(6470, "There is no checkpoint to restore.")));
             return;
         }
         widget?.viewModel?.model.setCheckpoint(checkpointRequest.id);
@@ -557,7 +557,7 @@ registerAction2(class EditAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.chat.editRequests",
-            title: ( localize2(6391, "Edit Request")),
+            title: ( localize2(6471, "Edit Request")),
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.edit,
@@ -596,7 +596,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(6392, "Open File")),
+            title: ( localize(6472, "Open File")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -622,7 +622,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
     constructor() {
         super({
             id: OpenWorkingSetHistoryAction.id,
-            title: ( localize(6393, "Open File Snapshot")),
+            title: ( localize(6473, "Open File Snapshot")),
             menu: [{
                 id: MenuId.ChatEditingCodeBlockContext,
                 group: "navigation",
@@ -646,7 +646,7 @@ registerAction2(class OpenWorkingSetHistoryAction extends Action2 {
         if (snapshot) {
             const editor = await editorService.openEditor({
                 resource: snapshot,
-                label: ( localize(6394, "{0} (Snapshot)", basename(context.uri))),
+                label: ( localize(6474, "{0} (Snapshot)", basename(context.uri))),
                 options: {
                     activation: EditorActivation.ACTIVATE
                 }
@@ -663,7 +663,7 @@ registerAction2(class ResolveSymbolsContextAction extends EditingSessionAction {
     constructor() {
         super({
             id: "workbench.action.edits.addFilesFromReferences",
-            title: ( localize2(6395, "Add Files From References")),
+            title: ( localize2(6475, "Add Files From References")),
             f1: false,
             category: CHAT_CATEGORY,
             menu: {
@@ -731,7 +731,7 @@ class ViewPreviousEditsAction extends EditingSessionAction {
         this.Id = "chatEditing.viewPreviousEdits";
     }
     static {
-        this.Label = ( localize(6396, "View Previous Edits"));
+        this.Label = ( localize(6476, "View Previous Edits"));
     }
     constructor() {
         super({

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.d.ts

@@ -1,7 +1,7 @@
 import { IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IActionWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service";
-import { IActionWidgetDropdownAction } from "../../../../../platform/actionWidget/browser/actionWidgetDropdown.js";
+import { IActionWidgetDropdownAction } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidgetDropdown";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ActionWidgetDropdownActionViewItem } from "../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js";
@@ -11,6 +11,8 @@ import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IChatInputPickerOptions } from "../widget/input/chatInputPickerActionItem.js";
+import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
+import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 export interface IChatSessionPickerDelegate {
     readonly onDidChangeOption: Event<IChatSessionProviderOptionItem>;
     getCurrentOption(): IChatSessionProviderOptionItem | undefined;
@@ -26,16 +28,19 @@ export declare class ChatSessionPickerActionItem extends ActionWidgetDropdownAct
     protected readonly delegate: IChatSessionPickerDelegate;
     protected readonly _pickerOptions: IChatInputPickerOptions | undefined;
     protected readonly commandService: ICommandService;
+    private readonly openerService;
+    private readonly chatEntitlementService;
     protected currentOption: IChatSessionProviderOptionItem | undefined;
     protected container: HTMLElement | undefined;
     constructor(action: IAction, initialState: {
         group: IChatSessionProviderOptionGroup;
         item: IChatSessionProviderOptionItem | undefined;
-    }, delegate: IChatSessionPickerDelegate, _pickerOptions: IChatInputPickerOptions | undefined, actionWidgetService: IActionWidgetService, contextKeyService: IContextKeyService, keybindingService: IKeybindingService, commandService: ICommandService, telemetryService: ITelemetryService);
+    }, delegate: IChatSessionPickerDelegate, _pickerOptions: IChatInputPickerOptions | undefined, actionWidgetService: IActionWidgetService, contextKeyService: IContextKeyService, keybindingService: IKeybindingService, commandService: ICommandService, telemetryService: ITelemetryService, openerService: IOpenerService, chatEntitlementService: IChatEntitlementService);
     /**
      * Returns the actions to show in the dropdown. Can be overridden by subclasses.
      */
     protected getDropdownActions(): IActionWidgetDropdownAction[];
+    private _buildOptionHover;
     /**
      * Creates a disabled action for a locked option.
      */

package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionPickerActionItem.js

@@ -9,8 +9,14 @@ import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { ActionWidgetDropdownActionViewItem } from '../../../../../platform/actions/browser/actionWidgetDropdownActionViewItem.js';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { renderIcon, renderLabelWithIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
+import { renderIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
+import { getModelHoverContent } from '../widget/input/chatModelPicker.js';
+import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 registerCss(chatSessionPickerActionItem);
 let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends ActionWidgetDropdownActionViewItem {
@@ -23,7 +29,9 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
         contextKeyService,
         keybindingService,
         commandService,
-        telemetryService
+        telemetryService,
+        openerService,
+        chatEntitlementService
     ) {
         const {
             group,
@@ -58,6 +66,8 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
         this.delegate = delegate;
         this._pickerOptions = _pickerOptions;
         this.commandService = commandService;
+        this.openerService = openerService;
+        this.chatEntitlementService = chatEntitlementService;
         this.currentOption = item;
         this._register(this.delegate.onDidChangeOption(newOption => {
             this.currentOption = newOption;
@@ -66,6 +76,15 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
             }
             this.updateEnabled();
         }));
+        const pickerOptions = this._pickerOptions;
+        if (pickerOptions) {
+            this._register(autorun(reader => {
+                pickerOptions.compact.read(reader);
+                if (this.element) {
+                    this.renderLabel(this.element);
+                }
+            }));
+        }
     }
     getDropdownActions() {
         const currentOption = this.delegate.getCurrentOption();
@@ -87,6 +106,7 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
                 description: optionItem.description,
                 tooltip: optionItem.description ?? optionItem.name,
                 label: optionItem.name,
+                hover: this._buildOptionHover(optionItem),
                 run: () => {
                     this.delegate.setOption(optionItem);
                 }
@@ -120,6 +140,51 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
         }
         return actions;
     }
+    _buildOptionHover(optionItem) {
+        if (optionItem.modelMetadata) {
+            const isUBB = !!this.chatEntitlementService.quotas.usageBasedBilling;
+            const syntheticModel = {
+                metadata: {
+                    extension: ( new ExtensionIdentifier("")),
+                    name: optionItem.modelMetadata.name,
+                    id: optionItem.modelMetadata.id,
+                    vendor: optionItem.modelMetadata.vendor ?? "",
+                    version: optionItem.modelMetadata.version ?? "",
+                    family: optionItem.modelMetadata.family ?? "",
+                    tooltip: optionItem.modelMetadata.tooltip,
+                    pricing: optionItem.modelMetadata.pricing,
+                    multiplierNumeric: optionItem.modelMetadata.multiplierNumeric,
+                    inputCost: optionItem.modelMetadata.inputCost,
+                    outputCost: optionItem.modelMetadata.outputCost,
+                    cacheCost: optionItem.modelMetadata.cacheCost,
+                    longContextInputCost: optionItem.modelMetadata.longContextInputCost,
+                    longContextOutputCost: optionItem.modelMetadata.longContextOutputCost,
+                    longContextCacheCost: optionItem.modelMetadata.longContextCacheCost,
+                    priceCategory: optionItem.modelMetadata.priceCategory,
+                    maxInputTokens: optionItem.modelMetadata.maxInputTokens ?? 0,
+                    maxOutputTokens: optionItem.modelMetadata.maxOutputTokens ?? 0,
+                    capabilities: optionItem.modelMetadata.capabilities ? {
+                        vision: optionItem.modelMetadata.capabilities.vision,
+                        toolCalling: optionItem.modelMetadata.capabilities.toolCalling
+                    } : undefined,
+                    isDefaultForLocation: {}
+                }
+            };
+            const hover = getModelHoverContent(syntheticModel, this.openerService, isUBB);
+            if (hover) {
+                return {
+                    content: hover.element,
+                    disposable: hover.disposable
+                };
+            }
+        }
+        if (optionItem.tooltip) {
+            return {
+                content: optionItem.tooltip
+            };
+        }
+        return undefined;
+    }
     createLockedOptionAction(option) {
         return {
             id: option.id,
@@ -151,10 +216,9 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
             domChildren.push($(
                 "span.chat-session-option-label",
                 undefined,
-                this.currentOption?.name ?? group?.description ?? ( localize(6562, "Pick Option"))
+                this.currentOption?.name ?? group?.description ?? ( localize(6676, "Pick Option"))
             ));
         }
-        domChildren.push(...renderLabelWithIcons(`$(chevron-down)`));
         reset(element, ...domChildren);
         this.setAriaLabelAttributes(element);
         return null;
@@ -182,6 +246,6 @@ let ChatSessionPickerActionItem = class ChatSessionPickerActionItem extends Acti
         }
     }
 };
-ChatSessionPickerActionItem = ( __decorate([( __param(4, IActionWidgetService)), ( __param(5, IContextKeyService)), ( __param(6, IKeybindingService)), ( __param(7, ICommandService)), ( __param(8, ITelemetryService))], ChatSessionPickerActionItem));
+ChatSessionPickerActionItem = ( __decorate([( __param(4, IActionWidgetService)), ( __param(5, IContextKeyService)), ( __param(6, IKeybindingService)), ( __param(7, ICommandService)), ( __param(8, ITelemetryService)), ( __param(9, IOpenerService)), ( __param(10, IChatEntitlementService))], ChatSessionPickerActionItem));
 
 export { ChatSessionPickerActionItem };

package/vscode/src/vs/workbench/contrib/chat/browser/tools/chatToolRiskAssessmentService.js

@@ -235,15 +235,15 @@ function truncate(s, max) {
 function defaultExplanationFor(risk, tool) {
     switch (risk) {
     case ToolRiskLevel.Green:
-        return localize(7025, "{0} appears to have no observable side effects.", tool.displayName);
+        return localize(7145, "{0} appears to have no observable side effects.", tool.displayName);
     case ToolRiskLevel.Orange:
         return localize(
-            7026,
+            7146,
             "{0} may modify your workspace or send data over the network.",
             tool.displayName
         );
     case ToolRiskLevel.Red:
-        return localize(7027, "{0} performs an action that is hard to undo.", tool.displayName);
+        return localize(7147, "{0} performs an action that is hard to undo.", tool.displayName);
     }
 }
 

package/vscode/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.js

@@ -44,7 +44,7 @@ const toolSetsSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-        label: ( localize(7094, "Empty tool set")),
+        label: ( localize(7214, "Empty tool set")),
         body: {
             "${1:toolSetName}": {
                 "tools": ["${2:someTool}", "${3:anotherTool}"],
@@ -54,7 +54,7 @@ const toolSetsSchema = {
         }
     }],
     type: "object",
-    description: ( localize(7095, "User tool sets configuration")),
+    description: ( localize(7215, "User tool sets configuration")),
     additionalProperties: {
         type: "object",
         required: ["tools"],
@@ -62,7 +62,7 @@ const toolSetsSchema = {
         properties: {
             tools: {
                 description: ( localize(
-                    7096,
+                    7216,
                     "A list of tools or tool sets to include in this tool set. Cannot be empty and must reference tools the way they are referenced in prompts."
                 )),
                 type: "array",
@@ -75,7 +75,7 @@ const toolSetsSchema = {
             },
             icon: {
                 description: ( localize(
-                    7097,
+                    7217,
                     "Icon to use for this tool set in the UI. Uses the \"\\$(name)\"-syntax, like \"\\$(zap)\""
                 )),
                 type: "string",
@@ -83,7 +83,7 @@ const toolSetsSchema = {
                 markdownEnumDescriptions: Array.from(getAllCodicons(), icon => `$(${icon.id})`)
             },
             description: {
-                description: ( localize(7098, "A short description of this tool set.")),
+                description: ( localize(7218, "A short description of this tool set.")),
                 type: "string"
             }
         }
@@ -184,7 +184,7 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
             });
             for (const item of data) {
                 toolEnumValues.push(item.name);
-                toolEnumDescriptions.push(( localize(7099, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
+                toolEnumDescriptions.push(( localize(7219, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
             }
             store.clear();
             reg.registerSchema(toolSetSchemaId, toolSetsSchema, store);
@@ -281,8 +281,8 @@ class ConfigureToolSets extends Action2 {
     constructor() {
         super({
             id: ConfigureToolSets.ID,
-            title: ( localize2(7100, "Configure Tool Sets...")),
-            shortTitle: ( localize(7101, "Tool Sets")),
+            title: ( localize2(7220, "Configure Tool Sets...")),
+            shortTitle: ( localize(7221, "Tool Sets")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.Tools.toolsCount.greater(0))),
@@ -308,7 +308,7 @@ class ConfigureToolSets extends Action2 {
         const textFileService = accessor.get(ITextFileService);
         const picks = [];
         picks.push({
-            label: ( localize(7102, "Create new tool sets file...")),
+            label: ( localize(7222, "Create new tool sets file...")),
             alwaysShow: true,
             iconClass: ThemeIcon.asClassName(Codicon.plus)
         });
@@ -325,7 +325,7 @@ class ConfigureToolSets extends Action2 {
         }
         const pick = await quickInputService.pick(picks, {
             canPickMany: false,
-            placeHolder: ( localize(7103, "Select a tool set to configure"))
+            placeHolder: ( localize(7223, "Select a tool set to configure"))
         });
         if (!pick) {
             return;
@@ -333,13 +333,13 @@ class ConfigureToolSets extends Action2 {
         let resource;
         if (!pick.toolset) {
             const name = await quickInputService.input({
-                placeHolder: ( localize(7104, "Type tool sets file name")),
+                placeHolder: ( localize(7224, "Type tool sets file name")),
                 validateInput: async input => {
                     if (!input) {
-                        return localize(7105, "Invalid file name");
+                        return localize(7225, "Invalid file name");
                     }
                     if (!isValidBasename(input)) {
-                        return localize(7106, "'{0}' is not a valid file name", input);
+                        return localize(7226, "'{0}' is not a valid file name", input);
                     }
                     return undefined;
                 }

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

@@ -49,7 +49,7 @@ let ChatAgentHover = class ChatAgentHover extends Disposable {
         this.publisherName = $("span.chat-agent-hover-publisher-name");
         append(hoverElement.publisher, verifiedBadge, this.publisherName);
         hoverElement.warning.appendChild(renderIcon(Codicon.warning));
-        hoverElement.warning.appendChild($("span", undefined, ( localize(7120, "This chat extension is using a reserved name."))));
+        hoverElement.warning.appendChild($("span", undefined, ( localize(7240, "This chat extension is using a reserved name."))));
     }
     setAgent(id) {
         const agent = this.chatAgentService.getAgent(id);
@@ -94,7 +94,7 @@ ChatAgentHover = ( __decorate([( __param(0, IChatAgentService)), ( __param(1, IE
 function getChatAgentHoverOptions(getAgent, commandService) {
     const viewExtensionAction = {
         commandId: showExtensionsWithIdsCommandId,
-        label: ( localize(7121, "View Extension")),
+        label: ( localize(7241, "View Extension")),
         run: () => {
             const agent = getAgent();
             if (agent) {