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

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

@@ -20,12 +20,10 @@ import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
-import { IChatModeService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes.service';
 import { 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, matchesSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
+import { PromptsStorage } 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';
@@ -56,7 +54,6 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
         keybindingService,
         configurationService,
         contextKeyService,
-        chatModeService,
         menuService,
         commandService,
         _productService,
@@ -69,15 +66,15 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
         });
         const getCustomAgentTarget = () => delegate.customAgentTarget?.() ?? Target.Undefined;
         const builtInCategory = {
-            label: ( localize(7221, "Built-In")),
+            label: ( localize(7526, "Built-In")),
             order: 0
         };
         const customCategory = {
-            label: ( localize(7222, "Custom")),
+            label: ( localize(7527, "Custom")),
             order: 1
         };
         const policyDisabledCategory = {
-            label: ( localize(7223, "Managed by your organization")),
+            label: ( localize(7528, "Managed by your organization")),
             order: 999,
             showHeader: true
         };
@@ -92,11 +89,11 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
                     if (mode.source?.storage === PromptsStorage.extension) {
                         icon = Codicon.file;
                         id = `viewAgent:${mode.id}`;
-                        label = ( localize(7224, "View {0} agent", mode.label.get()));
+                        label = ( localize(7529, "View {0} agent", mode.label.get()));
                     } else {
                         icon = Codicon.edit;
                         id = `editAgent:${mode.id}`;
-                        label = ( localize(7225, "Edit {0} agent", mode.label.get()));
+                        label = ( localize(7530, "Edit {0} agent", mode.label.get()));
                     }
                     const modeResource = mode.uri;
                     toolbarActions.push({
@@ -152,18 +149,13 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
             };
         };
         const getActionsForCustomAgentTarget = currentTarget => {
-            const modes = chatModeService.getModes();
+            const modes = delegate.currentChatModes.get();
             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(
@@ -186,18 +178,13 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
         };
         const actionProvider = {
             getActions: () => {
-                const modes = chatModeService.getModes();
+                const modes = delegate.currentChatModes.get();
                 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);
                     }
@@ -298,14 +285,11 @@ let ModePickerActionItem = class ModePickerActionItem extends ChatInputPickerAct
         if (!collapsed || !icon) {
             labelElements.push($("span.chat-input-picker-label", undefined, state));
         }
-        if (!collapsed) {
-            labelElements.push(...renderLabelWithIcons(`$(chevron-down)`));
-        }
         reset(element, ...labelElements);
         return null;
     }
 };
-ModePickerActionItem = ( __decorate([( __param(3, IActionWidgetService)), ( __param(4, IChatAgentService)), ( __param(5, IKeybindingService)), ( __param(6, IConfigurationService)), ( __param(7, IContextKeyService)), ( __param(8, IChatModeService)), ( __param(9, IMenuService)), ( __param(10, ICommandService)), ( __param(11, IProductService)), ( __param(12, ITelemetryService)), ( __param(13, IOpenerService)), ( __param(14, IWorkbenchAssignmentService))], ModePickerActionItem));
+ModePickerActionItem = ( __decorate([( __param(3, IActionWidgetService)), ( __param(4, IChatAgentService)), ( __param(5, IKeybindingService)), ( __param(6, IConfigurationService)), ( __param(7, IContextKeyService)), ( __param(8, IMenuService)), ( __param(9, ICommandService)), ( __param(10, IProductService)), ( __param(11, ITelemetryService)), ( __param(12, IOpenerService)), ( __param(13, IWorkbenchAssignmentService))], ModePickerActionItem));
 function isModeConsideredBuiltIn(mode, productService) {
     if (mode.isBuiltin) {
         return true;

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

@@ -62,18 +62,19 @@ let ModelPickerActionItem = class ModelPickerActionItem extends BaseActionViewIt
         this._pickerWidget.show(this._getAnchorElement());
     }
     _updateTooltip() {
-        if (!this.element) {
+        const target = this._pickerWidget.nameButton;
+        if (!target) {
             return;
         }
         const hoverContent = this._getHoverContents();
         if (typeof hoverContent === "string" && hoverContent) {
-            this._managedHover.value = getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate("mouse"), this.element, hoverContent);
+            this._managedHover.value = getBaseLayerHoverDelegate().setupManagedHover(getDefaultHoverDelegate("mouse"), target, hoverContent);
         } else {
             this._managedHover.clear();
         }
     }
     _getHoverContents() {
-        let label = ( localize(7226, "Pick Model"));
+        let label = ( localize(7531, "Pick Model"));
         const keybindingLabel = this.keybindingService.lookupKeybinding(this._action.id, this._contextKeyService)?.getLabel();
         if (keybindingLabel) {
             label += ` (${keybindingLabel})`;

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

@@ -1,3 +1,4 @@
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { IActionWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service";
@@ -5,19 +6,37 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { ChatPermissionLevel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
+import { IChatSessionProviderOptionItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
 import { MenuItemAction } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { ChatInputPickerActionViewItem, IChatInputPickerOptions } from "./chatInputPickerActionItem.js";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+export interface IExtensionPermissionState {
+    /** Stable identifier for the contributing chat session type, used to namespace action ids. */
+    readonly sessionType: string;
+    readonly groupId: string;
+    readonly items: readonly IChatSessionProviderOptionItem[];
+    readonly selectedId: string | undefined;
+}
 export interface IPermissionPickerDelegate {
     readonly currentPermissionLevel: IObservable<ChatPermissionLevel>;
     readonly setPermissionLevel: (level: ChatPermissionLevel) => void;
+    /**
+     * When defined and returns a non-empty state, the picker shows the extension-contributed
+     * items in place of the built-in {@link ChatPermissionLevel} items.
+     */
+    readonly getExtensionPermissions?: () => IExtensionPermissionState | undefined;
+    readonly setExtensionPermission?: (groupId: string, item: IChatSessionProviderOptionItem) => void;
 }
 export declare class PermissionPickerActionItem extends ChatInputPickerActionViewItem {
     private readonly delegate;
     private readonly dialogService;
-    constructor(action: MenuItemAction, delegate: IPermissionPickerDelegate, pickerOptions: IChatInputPickerOptions, actionWidgetService: IActionWidgetService, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, telemetryService: ITelemetryService, configurationService: IConfigurationService, dialogService: IDialogService, openerService: IOpenerService);
+    private readonly _onDidDispose;
+    readonly onDidDispose: Event<void>;
+    constructor(action: MenuItemAction, delegate: IPermissionPickerDelegate, pickerOptions: IChatInputPickerOptions, actionWidgetService: IActionWidgetService, keybindingService: IKeybindingService, contextKeyService: IContextKeyService, telemetryService: ITelemetryService, configurationService: IConfigurationService, dialogService: IDialogService, openerService: IOpenerService, storageService: IStorageService);
     protected renderLabel(element: HTMLElement): IDisposable | null;
     refresh(): void;
+    dispose(): void;
 }

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

@@ -3,30 +3,25 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { $, reset } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { renderLabelWithIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IActionWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actionWidget/browser/actionWidget.service';
 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 { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { ChatPermissionLevel, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatConfiguration, ChatPermissionLevel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { SessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
-import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
-import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { ChatInputPickerActionViewItem } from './chatInputPickerActionItem.js';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { maybeConfirmElevatedPermissionLevel } from '../../../common/chatPermissionWarnings.js';
 
-const shownWarnings = ( new Set());
-function hasShownElevatedWarning(level) {
-    if (( shownWarnings.has(level))) {
-        return true;
-    }
-    if (level === ChatPermissionLevel.AutoApprove && ( shownWarnings.has(ChatPermissionLevel.Autopilot))) {
-        return true;
-    }
-    return false;
+function sanitizeIdSegment(value) {
+    return value.replace(/[^a-zA-Z0-9_-]/g, "_");
 }
 let PermissionPickerActionItem = class PermissionPickerActionItem extends ChatInputPickerActionViewItem {
     constructor(
@@ -39,24 +34,49 @@ let PermissionPickerActionItem = class PermissionPickerActionItem extends ChatIn
         telemetryService,
         configurationService,
         dialogService,
-        openerService
+        openerService,
+        storageService
     ) {
         const isAutoApprovePolicyRestricted = () => configurationService.inspect(ChatConfiguration.GlobalAutoApprove).policyValue === false;
         const isAutopilotEnabled = () => configurationService.getValue(ChatConfiguration.AutopilotEnabled) !== false;
         const actionProvider = {
             getActions: () => {
+                const ext = delegate.getExtensionPermissions?.();
+                if (ext && ext.items.length > 0) {
+                    const sessionTypeSeg = sanitizeIdSegment(ext.sessionType);
+                    const groupSeg = sanitizeIdSegment(ext.groupId);
+                    return (ext.items.map(item => ({
+                        ...action,
+                        id: `chat.permissions.ext.${sessionTypeSeg}.${groupSeg}.${sanitizeIdSegment(item.id)}`,
+                        label: item.name,
+                        detail: item.description,
+                        icon: item.icon,
+                        checked: ext.selectedId === item.id,
+                        enabled: !item.locked,
+                        tooltip: item.locked ? ( localize(7532, "This option is locked")) : "",
+                        hover: item.description ? {
+                            content: item.description
+                        } : undefined,
+                        run: async () => {
+                            delegate.setExtensionPermission?.(ext.groupId, item);
+                            if (this.element) {
+                                this.renderLabel(this.element);
+                            }
+                        }
+                    })));
+                }
                 const currentLevel = delegate.currentPermissionLevel.get();
                 const policyRestricted = isAutoApprovePolicyRestricted();
                 const actions = [{
                     ...action,
                     id: "chat.permissions.default",
-                    label: ( localize(7227, "Default Approvals")),
-                    description: ( localize(7228, "Copilot uses your configured settings")),
+                    label: ( localize(7533, "Default Approvals")),
+                    detail: ( localize(7534, "Copilot uses your configured settings")),
                     icon: ThemeIcon.fromId(Codicon.shield.id),
                     checked: currentLevel === ChatPermissionLevel.Default,
                     tooltip: "",
                     hover: {
-                        content: ( localize(7229, "Use configured approval settings"))
+                        content: ( localize(7535, "Use configured approval settings"))
                     },
                     run: async () => {
                         delegate.setPermissionLevel(ChatPermissionLevel.Default);
@@ -67,46 +87,18 @@ let PermissionPickerActionItem = class PermissionPickerActionItem extends ChatIn
                 }, {
                     ...action,
                     id: "chat.permissions.autoApprove",
-                    label: ( localize(7230, "Bypass Approvals")),
-                    description: ( localize(7231, "All tool calls are auto-approved")),
+                    label: ( localize(7536, "Bypass Approvals")),
+                    detail: ( localize(7537, "All tool calls are auto-approved")),
                     icon: ThemeIcon.fromId(Codicon.warning.id),
                     checked: currentLevel === ChatPermissionLevel.AutoApprove,
                     enabled: !policyRestricted,
-                    tooltip: policyRestricted ? ( localize(7232, "Disabled by enterprise policy")) : "",
+                    tooltip: policyRestricted ? ( localize(7538, "Disabled by enterprise policy")) : "",
                     hover: {
-                        content: policyRestricted ? ( localize(7233, "Disabled by enterprise policy")) : ( localize(7234, "Auto-approve all tool calls and retry on errors"))
+                        content: policyRestricted ? ( localize(7539, "Disabled by enterprise policy")) : ( localize(7540, "Auto-approve all tool calls and retry on errors"))
                     },
                     run: async () => {
-                        if (!hasShownElevatedWarning(ChatPermissionLevel.AutoApprove)) {
-                            const result = await this.dialogService.prompt({
-                                type: Severity.Warning,
-                                message: ( localize(7235, "Enable Bypass Approvals?")),
-                                buttons: [{
-                                    label: ( localize(7236, "Enable")),
-                                    run: () => true
-                                }, {
-                                    label: ( localize(7237, "Cancel")),
-                                    run: () => false
-                                }],
-                                custom: {
-                                    icon: Codicon.warning,
-                                    markdownDetails: [{
-                                        markdown: ( new MarkdownString(( localize(
-                                            7238,
-                                            "Bypass Approvals will auto-approve all tool calls without asking for confirmation. This includes file edits, terminal commands, and external tool calls.\n\nTo make this the starting permission level for new chat sessions, change the [{0}](command:workbench.action.openSettings?%5B%22{0}%22%5D) setting.",
-                                            ChatConfiguration.DefaultPermissionLevel
-                                        )), {
-                                            isTrusted: {
-                                                enabledCommands: ["workbench.action.openSettings"]
-                                            }
-                                        }))
-                                    }]
-                                }
-                            });
-                            if (result.result !== true) {
-                                return;
-                            }
-                            shownWarnings.add(ChatPermissionLevel.AutoApprove);
+                        if (!(await maybeConfirmElevatedPermissionLevel(ChatPermissionLevel.AutoApprove, this.dialogService, storageService))) {
+                            return;
                         }
                         delegate.setPermissionLevel(ChatPermissionLevel.AutoApprove);
                         if (this.element) {
@@ -118,46 +110,18 @@ let PermissionPickerActionItem = class PermissionPickerActionItem extends ChatIn
                     actions.push({
                         ...action,
                         id: "chat.permissions.autopilot",
-                        label: ( localize(7239, "Autopilot (Preview)")),
-                        description: ( localize(7240, "Autonomously iterates from start to finish")),
+                        label: ( localize(7541, "Autopilot (Preview)")),
+                        detail: ( localize(7542, "Autonomously iterates from start to finish")),
                         icon: ThemeIcon.fromId(Codicon.rocket.id),
                         checked: currentLevel === ChatPermissionLevel.Autopilot,
                         enabled: !policyRestricted,
-                        tooltip: policyRestricted ? ( localize(7241, "Disabled by enterprise policy")) : "",
+                        tooltip: policyRestricted ? ( localize(7543, "Disabled by enterprise policy")) : "",
                         hover: {
-                            content: policyRestricted ? ( localize(7242, "Disabled by enterprise policy")) : ( localize(7243, "Auto-approve all tool calls and continue until the task is done"))
+                            content: policyRestricted ? ( localize(7544, "Disabled by enterprise policy")) : ( localize(7545, "Auto-approve all tool calls and continue until the task is done"))
                         },
                         run: async () => {
-                            if (!hasShownElevatedWarning(ChatPermissionLevel.Autopilot)) {
-                                const result = await this.dialogService.prompt({
-                                    type: Severity.Warning,
-                                    message: ( localize(7244, "Enable Autopilot?")),
-                                    buttons: [{
-                                        label: ( localize(7245, "Enable")),
-                                        run: () => true
-                                    }, {
-                                        label: ( localize(7246, "Cancel")),
-                                        run: () => false
-                                    }],
-                                    custom: {
-                                        icon: Codicon.rocket,
-                                        markdownDetails: [{
-                                            markdown: ( new MarkdownString(( localize(
-                                                7247,
-                                                "Autopilot will auto-approve all tool calls and continue working autonomously until the task is complete. This includes terminal commands, file edits, and external tool calls. The agent will make decisions on your behalf without asking for confirmation.\n\nYou can stop the agent at any time by clicking the stop button. This applies to the current session only.\n\nTo make this the starting permission level for new chat sessions, change the [{0}](command:workbench.action.openSettings?%5B%22{0}%22%5D) setting.",
-                                                ChatConfiguration.DefaultPermissionLevel
-                                            )), {
-                                                isTrusted: {
-                                                    enabledCommands: ["workbench.action.openSettings"]
-                                                }
-                                            }))
-                                        }]
-                                    }
-                                });
-                                if (result.result !== true) {
-                                    return;
-                                }
-                                shownWarnings.add(ChatPermissionLevel.Autopilot);
+                            if (!(await maybeConfirmElevatedPermissionLevel(ChatPermissionLevel.Autopilot, this.dialogService, storageService))) {
+                                return;
                             }
                             delegate.setPermissionLevel(ChatPermissionLevel.Autopilot);
                             if (this.element) {
@@ -173,14 +137,14 @@ let PermissionPickerActionItem = class PermissionPickerActionItem extends ChatIn
             actionProvider,
             actionBarActions: [{
                 id: "chat.permissions.learnMore",
-                label: ( localize(7248, "Learn more about permissions")),
-                tooltip: ( localize(7248, "Learn more about permissions")),
+                label: ( localize(7546, "Learn more about permissions")),
+                tooltip: ( localize(7546, "Learn more about permissions")),
                 class: undefined,
                 enabled: true,
                 run: async () => {
-                    await openerService.open(( URI.parse(
-                        "https://code.visualstudio.com/docs/copilot/agents/agent-tools#_permission-levels"
-                    )));
+                    const ext = delegate.getExtensionPermissions?.();
+                    const url = ext?.sessionType === SessionType.ClaudeCode ? "https://code.claude.com/docs/en/permission-modes#available-modes" : "https://code.visualstudio.com/docs/copilot/agents/agent-tools#_permission-levels";
+                    await openerService.open(( URI.parse(url)));
                 }
             }],
             reporter: {
@@ -189,39 +153,49 @@ let PermissionPickerActionItem = class PermissionPickerActionItem extends ChatIn
                 includeOptions: true
             },
             listOptions: {
-                descriptionBelow: true,
-                minWidth: 255
+                minWidth: 255,
+                detailItemHeight: 44
             }
         }, pickerOptions, actionWidgetService, keybindingService, contextKeyService, telemetryService);
         this.delegate = delegate;
         this.dialogService = dialogService;
+        this._onDidDispose = this._register(( new Emitter()));
+        this.onDidDispose = this._onDidDispose.event;
     }
     renderLabel(element) {
         this.setAriaLabelAttributes(element);
-        const level = this.delegate.currentPermissionLevel.get();
+        const ext = this.delegate.getExtensionPermissions?.();
         let icon;
         let label;
-        switch (level) {
-        case ChatPermissionLevel.Autopilot:
-            icon = Codicon.rocket;
-            label = ( localize(7249, "Autopilot (Preview)"));
-            break;
-        case ChatPermissionLevel.AutoApprove:
-            icon = Codicon.warning;
-            label = ( localize(7250, "Bypass Approvals"));
-            break;
-        default:
-            icon = Codicon.shield;
-            label = ( localize(7251, "Default Approvals"));
-            break;
+        const level = this.delegate.currentPermissionLevel.get();
+        if (ext && ext.items.length > 0) {
+            const selected = ext.items.find(i => i.id === ext.selectedId) ?? ext.items.find(i => i.default) ?? ext.items[0];
+            icon = selected.icon ?? Codicon.lock;
+            label = selected.name;
+        } else {
+            switch (level) {
+            case ChatPermissionLevel.Autopilot:
+                icon = Codicon.rocket;
+                label = ( localize(7547, "Autopilot (Preview)"));
+                break;
+            case ChatPermissionLevel.AutoApprove:
+                icon = Codicon.warning;
+                label = ( localize(7548, "Bypass Approvals"));
+                break;
+            default:
+                icon = Codicon.shield;
+                label = ( localize(7549, "Default Approvals"));
+                break;
+            }
         }
         const labelElements = [];
         labelElements.push(...renderLabelWithIcons(`$(${icon.id})`));
         labelElements.push($("span.chat-input-picker-label", undefined, label));
         labelElements.push(...renderLabelWithIcons(`$(chevron-down)`));
         reset(element, ...labelElements);
-        element.classList.toggle("warning", level === ChatPermissionLevel.Autopilot);
-        element.classList.toggle("info", level === ChatPermissionLevel.AutoApprove);
+        element.classList.toggle("warning", !ext && level === ChatPermissionLevel.Autopilot);
+        element.classList.toggle("info", !ext && level === ChatPermissionLevel.AutoApprove);
+        element.setAttribute("aria-label", ( localize(7550, "Permission picker, {0}", label)));
         return null;
     }
     refresh() {
@@ -229,7 +203,14 @@ let PermissionPickerActionItem = class PermissionPickerActionItem extends ChatIn
             this.renderLabel(this.element);
         }
     }
+    dispose() {
+        if (this._store.isDisposed) {
+            return;
+        }
+        this._onDidDispose.fire();
+        super.dispose();
+    }
 };
-PermissionPickerActionItem = ( __decorate([( __param(3, IActionWidgetService)), ( __param(4, IKeybindingService)), ( __param(5, IContextKeyService)), ( __param(6, ITelemetryService)), ( __param(7, IConfigurationService)), ( __param(8, IDialogService)), ( __param(9, IOpenerService))], PermissionPickerActionItem));
+PermissionPickerActionItem = ( __decorate([( __param(3, IActionWidgetService)), ( __param(4, IKeybindingService)), ( __param(5, IContextKeyService)), ( __param(6, ITelemetryService)), ( __param(7, IConfigurationService)), ( __param(8, IDialogService)), ( __param(9, IOpenerService)), ( __param(10, IStorageService))], PermissionPickerActionItem));
 
 export { PermissionPickerActionItem };

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

@@ -17,11 +17,11 @@ import { AgentSessionProviders, getAgentSessionProviderDescription, getAgentSess
 import { ChatInputPickerActionViewItem } from './chatInputPickerActionItem.js';
 
 const firstPartyCategory = {
-    label: ( localize(7252, "Agent Types")),
+    label: ( localize(7551, "Agent Types")),
     order: 1
 };
 const otherCategory = {
-    label: ( localize(7253, "Other")),
+    label: ( localize(7552, "Other")),
     order: 2
 };
 let SessionTypePickerActionItem = class SessionTypePickerActionItem extends ChatInputPickerActionViewItem {
@@ -126,7 +126,7 @@ let SessionTypePickerActionItem = class SessionTypePickerActionItem extends Chat
         const learnMoreUrl = "https://code.visualstudio.com/docs/copilot/agents/overview";
         return {
             id: "workbench.action.chat.agentOverview.learnMore",
-            label: ( localize(7254, "Learn about agent types...")),
+            label: ( localize(7553, "Learn about agent types...")),
             tooltip: learnMoreUrl,
             class: undefined,
             enabled: true,

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

@@ -48,10 +48,10 @@ let WorkspacePickerActionItem = class WorkspacePickerActionItem extends ChatInpu
                 actions.push({
                     ...action,
                     id: "workspace.openFolder",
-                    label: ( localize(7255, "Open Folder...")),
+                    label: ( localize(7554, "Open Folder...")),
                     checked: false,
                     enabled: true,
-                    tooltip: ( localize(7256, "Open Folder...")),
+                    tooltip: ( localize(7555, "Open Folder...")),
                     run: async () => {
                         this.commandService.executeCommand(this.delegate.openFolderCommand);
                     }
@@ -104,7 +104,7 @@ let WorkspacePickerActionItem = class WorkspacePickerActionItem extends ChatInpu
             labelElements.push($("span.chat-input-picker-label", undefined, label));
         } else {
             labelElements.push(...renderLabelWithIcons(`$(folder)`));
-            labelElements.push($("span.chat-input-picker-label", undefined, ( localize(7257, "Workspace"))));
+            labelElements.push($("span.chat-input-picker-label", undefined, ( localize(7556, "Workspace"))));
         }
         if (!this.pickerOptions.hideChevrons.get()) {
             labelElements.push(...renderLabelWithIcons(`$(chevron-down)`));