@codingame/monaco-vscode-chat-service-override 24.2.0 → 25.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/chatModeActions.js

@@ -1,7 +1,7 @@
 
 import { CHAT_CATEGORY, CHAT_CONFIG_MENU_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { PromptFilePickers } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/promptSyntax/pickers/promptFilePickers';
 import { Action2, MenuId, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -17,7 +17,7 @@ class ConfigAgentActionImpl extends Action2 {
         const openerService = accessor.get(IOpenerService);
         const pickers = instaService.createInstance(PromptFilePickers);
         const placeholder = ( localize(
-            5756,
+            5458,
             "Select the custom agents to open and configure visibility in the agent picker"
         ));
         const result = await pickers.selectPromptFile({ placeholder, type: PromptsType.agent, optionEdit: false, optionVisibility: true });
@@ -30,8 +30,8 @@ const PICKER_CONFIGURE_AGENTS_ACTION_ID = 'workbench.action.chat.picker.customag
 function createPickerConfigureAgentsActionConfig(disabled) {
     const config = {
         id: disabled ? PICKER_CONFIGURE_AGENTS_ACTION_ID + '.disabled' : PICKER_CONFIGURE_AGENTS_ACTION_ID,
-        title: ( localize2(5757, "Configure Custom Agents...")),
-        tooltip: disabled ? ( localize(5758, "Managed by your organization")) : undefined,
+        title: ( localize2(5459, "Configure Custom Agents...")),
+        tooltip: disabled ? ( localize(5460, "Managed by your organization")) : undefined,
         icon: disabled ? Codicon.lock : undefined,
         category: CHAT_CATEGORY,
         f1: false,
@@ -53,8 +53,8 @@ const CONFIGURE_AGENTS_ACTION_ID = 'workbench.action.chat.configure.customagents
 function createManageAgentsActionConfig(disabled) {
     const base = {
         id: disabled ? CONFIGURE_AGENTS_ACTION_ID + '.disabled' : CONFIGURE_AGENTS_ACTION_ID,
-        title: ( localize2(5759, "Configure Custom Agents...")),
-        shortTitle: ( localize(5760, "Custom Agents")),
+        title: ( localize2(5461, "Configure Custom Agents...")),
+        shortTitle: ( localize(5462, "Custom Agents")),
         icon: disabled ? Codicon.lock : Codicon.bookmark,
         f1: !disabled,
         precondition: disabled ? ( ContextKeyExpr.false()) : ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.Modes.agentModeDisabledByPolicy.negate()))),
@@ -68,7 +68,7 @@ function createManageAgentsActionConfig(disabled) {
             }
         ]
     };
-    return disabled ? { ...base, tooltip: ( localize(5758, "Managed by your organization")) } : base;
+    return disabled ? { ...base, tooltip: ( localize(5460, "Managed by your organization")) } : base;
 }
 class ManageAgentsAction extends ConfigAgentActionImpl {
     constructor() { super(createManageAgentsActionConfig(false)); }

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptCodingAgentActionOverlay.js

@@ -4,7 +4,7 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { OverlayWidgetPositionPreference } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IRemoteCodingAgentsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.service';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
@@ -28,11 +28,11 @@ let PromptCodingAgentActionOverlayWidget = class PromptCodingAgentActionOverlayW
         this._domNode = $('.prompt-coding-agent-action-overlay');
         this._button = this._register(( new Button(this._domNode, {
             supportIcons: true,
-            title: ( localize(5815, "Run prompt file in a remote coding agent"))
+            title: ( localize(5517, "Run prompt file in a remote coding agent"))
         })));
         this._button.element.style.background = 'var(--vscode-button-background)';
         this._button.element.style.color = 'var(--vscode-button-foreground)';
-        this._button.label = ( localize(5816, "{0} Delegate to Copilot coding agent", '$(cloud-upload)'));
+        this._button.label = ( localize(5518, "{0} Delegate to Copilot coding agent", '$(cloud-upload)'));
         this._register(this._button.onDidClick(async () => {
             await this._execute();
         }));

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptToolsCodeLensProvider.js

@@ -8,7 +8,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { showToolsPicker } from '../actions/chatToolPicker.js';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { ALL_PROMPTS_LANGUAGE_SELECTOR, getPromptsTypeForLanguageId, PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
 import { registerEditorFeature } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorFeatures';
@@ -56,7 +56,7 @@ let PromptToolsCodeLensProvider = class PromptToolsCodeLensProvider extends Disp
         const codeLens = {
             range: toolsAttr.range.collapseToStart(),
             command: {
-                title: ( localize(5817, "Configure Tools...")),
+                title: ( localize(5519, "Configure Tools...")),
                 id: this.cmdId,
                 arguments: [model, toolsAttr.value.range, selectedTools, header.target]
             }
@@ -65,7 +65,7 @@ let PromptToolsCodeLensProvider = class PromptToolsCodeLensProvider extends Disp
     }
     async updateTools(model, range, selectedTools, target) {
         const selectedToolsNow = () => this.languageModelToolsService.toToolAndToolSetEnablementMap(selectedTools, target);
-        const newSelectedAfter = await this.instantiationService.invokeFunction(showToolsPicker, ( localize(5818, "Select tools")), undefined, selectedToolsNow);
+        const newSelectedAfter = await this.instantiationService.invokeFunction(showToolsPicker, ( localize(5520, "Select tools")), undefined, selectedToolsNow);
         if (!newSelectedAfter) {
             return;
         }

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/promptUrlHandler.js

@@ -70,7 +70,7 @@ let PromptUrlHandler = class PromptUrlHandler extends Disposable {
             const result = await this.requestService.request({ type: 'GET', url: urlString }, CancellationToken.None);
             if (result.res.statusCode !== 200) {
                 this.logService.error(`[PromptUrlHandler] Failed to fetch URL: ${urlString}`);
-                this.notificationService.error(( localize(5819, 'Failed to fetch URL: {0}', urlString)));
+                this.notificationService.error(( localize(5521, 'Failed to fetch URL: {0}', urlString)));
                 return true;
             }
             const responseData = ( (await streamToBuffer(result.stream)).toString());
@@ -99,36 +99,36 @@ let PromptUrlHandler = class PromptUrlHandler extends Disposable {
             uriLabel = `${uriLabel.substring(0, 35)}...${uriLabel.substring(uriLabel.length - 15)}`;
         }
         const detail = ( new MarkdownString('', { supportHtml: true }));
-        detail.appendMarkdown(( localize(5820, "This will access {0}.\n\n", `[${uriLabel}](${( url.toString())})`)));
+        detail.appendMarkdown(( localize(5522, "This will access {0}.\n\n", `[${uriLabel}](${( url.toString())})`)));
         detail.appendMarkdown(( localize(
-            5821,
+            5523,
             "If you did not initiate this request, it may represent an attempted attack on your system. Unless you took an explicit action to initiate this request, you should press 'No'"
         )));
         let message;
         switch (promptType) {
             case PromptsType.prompt:
                 message = ( localize(
-                    5822,
+                    5524,
                     "An external application wants to create a prompt file with content from a URL. Do you want to continue by selecting a destination folder and name?"
                 ));
                 break;
             case PromptsType.instructions:
                 message = ( localize(
-                    5823,
+                    5525,
                     "An external application wants to create an instructions file with content from a URL. Do you want to continue by selecting a destination folder and name?"
                 ));
                 break;
             default:
                 message = ( localize(
-                    5824,
+                    5526,
                     "An external application wants to create a custom agent with content from a URL. Do you want to continue by selecting a destination folder and name?"
                 ));
                 break;
         }
         const { confirmed } = await this.dialogService.confirm({
             type: 'warning',
-            primaryButton: ( localize(5825, "&&Yes")),
-            cancelButton: ( localize(5826, "No")),
+            primaryButton: ( localize(5527, "&&Yes")),
+            cancelButton: ( localize(5528, "No")),
             message,
             custom: {
                 markdownDetails: [{

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/runPromptAction.js

@@ -4,7 +4,7 @@ import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { CHAT_CATEGORY, ACTION_ID_NEW_CHAT, CHAT_CONFIG_MENU_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { assertDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { PROMPT_LANGUAGE_ID, PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
@@ -70,7 +70,7 @@ class RunPromptBaseAction extends Action2 {
         return widget;
     }
 }
-const RUN_CURRENT_PROMPT_ACTION_TITLE = ( localize2(5827, "Run Prompt in Current Chat"));
+const RUN_CURRENT_PROMPT_ACTION_TITLE = ( localize2(5529, "Run Prompt in Current Chat"));
 const RUN_CURRENT_PROMPT_ACTION_ICON = Codicon.playCircle;
 class RunCurrentPromptAction extends RunPromptBaseAction {
     constructor() {
@@ -89,7 +89,7 @@ class RunSelectedPromptAction extends Action2 {
     constructor() {
         super({
             id: RUN_SELECTED_PROMPT_ACTION_ID,
-            title: ( localize2(5828, "Run Prompt...")),
+            title: ( localize2(5530, "Run Prompt...")),
             icon: Codicon.bookmark,
             f1: true,
             precondition: ChatContextKeys.enabled,
@@ -108,7 +108,7 @@ class RunSelectedPromptAction extends Action2 {
         const widgetService = accessor.get(IChatWidgetService);
         const pickers = instaService.createInstance(PromptFilePickers);
         const placeholder = ( localize(
-            5829,
+            5531,
             'Select the prompt file to run (hold {0}-key to use in new chat)',
             UILabelProvider.modifierLabels[OS].ctrlKey
         ));
@@ -132,8 +132,8 @@ class ManagePromptFilesAction extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_PROMPTS_ACTION_ID,
-            title: ( localize2(5830, "Configure Prompt Files...")),
-            shortTitle: ( localize2(5831, "Prompt Files")),
+            title: ( localize2(5532, "Configure Prompt Files...")),
+            shortTitle: ( localize2(5533, "Prompt Files")),
             icon: Codicon.bookmark,
             f1: true,
             precondition: ChatContextKeys.enabled,
@@ -150,7 +150,7 @@ class ManagePromptFilesAction extends Action2 {
         const openerService = accessor.get(IOpenerService);
         const instaService = accessor.get(IInstantiationService);
         const pickers = instaService.createInstance(PromptFilePickers);
-        const placeholder = ( localize(5832, 'Select the prompt file to open'));
+        const placeholder = ( localize(5534, 'Select the prompt file to open'));
         const result = await pickers.selectPromptFile({ placeholder, type: PromptsType.prompt, optionEdit: false });
         if (result !== undefined) {
             await openerService.open(result.promptFile);
@@ -166,7 +166,7 @@ function getActivePromptFileUri(accessor) {
     return undefined;
 }
 const RUN_CURRENT_PROMPT_IN_NEW_CHAT_ACTION_ID = 'workbench.action.chat.run-in-new-chat.prompt.current';
-const RUN_IN_NEW_CHAT_ACTION_TITLE = ( localize2(5833, "Run Prompt In New Chat"));
+const RUN_IN_NEW_CHAT_ACTION_TITLE = ( localize2(5535, "Run Prompt In New Chat"));
 const RUN_IN_NEW_CHAT_ACTION_ICON = Codicon.play;
 class RunCurrentPromptInNewChatAction extends RunPromptBaseAction {
     constructor() {

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/saveAsPromptFileActions.js

@@ -9,7 +9,7 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
-import { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/editing/chatEditingService';
 import { getCleanPromptName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { PROMPT_LANGUAGE_ID, PromptsType, AGENT_LANGUAGE_ID, INSTRUCTIONS_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
@@ -70,19 +70,19 @@ function createOptions(id, title, description, languageId) {
 const SAVE_AS_PROMPT_FILE_ACTION_ID = 'workbench.action.chat.save-as-prompt';
 class SaveAsPromptFileAction extends BaseSaveAsPromptFileAction {
     constructor() {
-        super(createOptions(SAVE_AS_PROMPT_FILE_ACTION_ID, ( localize2(5834, "Save As Prompt File")), ( localize2(5835, "Save as prompt file")), PROMPT_LANGUAGE_ID), PromptsType.prompt);
+        super(createOptions(SAVE_AS_PROMPT_FILE_ACTION_ID, ( localize2(5536, "Save As Prompt File")), ( localize2(5537, "Save as prompt file")), PROMPT_LANGUAGE_ID), PromptsType.prompt);
     }
 }
 const SAVE_AS_AGENT_FILE_ACTION_ID = 'workbench.action.chat.save-as-agent';
 class SaveAsAgentFileAction extends BaseSaveAsPromptFileAction {
     constructor() {
-        super(createOptions(SAVE_AS_AGENT_FILE_ACTION_ID, ( localize2(5836, "Save As Agent File")), ( localize2(5837, "Save as agent file")), AGENT_LANGUAGE_ID), PromptsType.agent);
+        super(createOptions(SAVE_AS_AGENT_FILE_ACTION_ID, ( localize2(5538, "Save As Agent File")), ( localize2(5539, "Save as agent file")), AGENT_LANGUAGE_ID), PromptsType.agent);
     }
 }
 const SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID = 'workbench.action.chat.save-as-instructions';
 class SaveAsInstructionsFileAction extends BaseSaveAsPromptFileAction {
     constructor() {
-        super(createOptions(SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID, ( localize2(5838, "Save As Instructions File")), ( localize2(5839, "Save as instructions file")), INSTRUCTIONS_LANGUAGE_ID), PromptsType.instructions);
+        super(createOptions(SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID, ( localize2(5540, "Save As Instructions File")), ( localize2(5541, "Save as instructions file")), INSTRUCTIONS_LANGUAGE_ID), PromptsType.instructions);
     }
 }
 

package/vscode/src/vs/workbench/contrib/chat/browser/{languageModelToolsConfirmationService.d.ts → tools/languageModelToolsConfirmationService.d.ts}

@@ -1,10 +1,10 @@
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
-import { ConfirmedReason } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { ILanguageModelToolConfirmationActions, ILanguageModelToolConfirmationContribution, ILanguageModelToolConfirmationRef } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsConfirmationService";
-import { ILanguageModelToolsConfirmationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsConfirmationService.service";
-import { IToolData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { ConfirmedReason } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
+import { ILanguageModelToolConfirmationActions, ILanguageModelToolConfirmationContribution, ILanguageModelToolConfirmationRef } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService";
+import { ILanguageModelToolsConfirmationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service";
+import { IToolData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 export declare class LanguageModelToolsConfirmationService extends Disposable implements ILanguageModelToolsConfirmationService {
     private readonly _instantiationService;
     private readonly _quickInputService;

package/vscode/src/vs/workbench/contrib/chat/browser/{languageModelToolsConfirmationService.js → tools/languageModelToolsConfirmationService.js}

@@ -1,6 +1,5 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Toggle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/toggle/toggle';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -8,24 +7,14 @@ import { LRUCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { QuickInputButtonLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { asCssVariable } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
-import { inputActiveOptionBackground, inputActiveOptionForeground, inputActiveOptionBorder } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
-import { ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
+import { ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 
-const RUN_WITHOUT_APPROVAL = ( localize(5697, "without approval"));
-const CONTINUE_WITHOUT_REVIEWING_RESULTS = ( localize(5698, "without reviewing result"));
+const RUN_WITHOUT_APPROVAL = ( localize(5542, "without approval"));
+const CONTINUE_WITHOUT_REVIEWING_RESULTS = ( localize(5543, "without reviewing result"));
 class GenericConfirmStore extends Disposable {
     constructor(_storageKey, _instantiationService) {
         super();
@@ -222,23 +211,23 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
             return actions;
         }
         actions.push({
-            label: ( localize(5699, 'Allow in this Session')),
-            detail: ( localize(5700, 'Allow this tool to run in this session without confirmation.')),
+            label: ( localize(5544, 'Allow in this Session')),
+            detail: ( localize(5545, 'Allow this tool to run in this session without confirmation.')),
             divider: !!actions.length,
             select: async () => {
                 this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'session');
                 return true;
             }
         }, {
-            label: ( localize(5701, 'Allow in this Workspace')),
-            detail: ( localize(5702, 'Allow this tool to run in this workspace without confirmation.')),
+            label: ( localize(5546, 'Allow in this Workspace')),
+            detail: ( localize(5547, 'Allow this tool to run in this workspace without confirmation.')),
             select: async () => {
                 this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'workspace');
                 return true;
             }
         }, {
-            label: ( localize(5703, 'Always Allow')),
-            detail: ( localize(5704, 'Always allow this tool to run without confirmation.')),
+            label: ( localize(5548, 'Always Allow')),
+            detail: ( localize(5549, 'Always allow this tool to run without confirmation.')),
             select: async () => {
                 this._preExecutionToolConfirmStore.setAutoConfirmation(ref.toolId, 'profile');
                 return true;
@@ -247,9 +236,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         if (ref.source.type === 'mcp') {
             const { serverLabel, definitionId } = ref.source;
             actions.push({
-                label: ( localize(5705, 'Allow Tools from {0} in this Session', serverLabel)),
+                label: ( localize(5550, 'Allow Tools from {0} in this Session', serverLabel)),
                 detail: ( localize(
-                    5706,
+                    5551,
                     'Allow all tools from this server to run in this session without confirmation.'
                 )),
                 divider: true,
@@ -258,9 +247,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(5707, 'Allow Tools from {0} in this Workspace', serverLabel)),
+                label: ( localize(5552, 'Allow Tools from {0} in this Workspace', serverLabel)),
                 detail: ( localize(
-                    5708,
+                    5553,
                     'Allow all tools from this server to run in this workspace without confirmation.'
                 )),
                 select: async () => {
@@ -268,9 +257,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(5709, 'Always Allow Tools from {0}', serverLabel)),
+                label: ( localize(5554, 'Always Allow Tools from {0}', serverLabel)),
                 detail: ( localize(
-                    5710,
+                    5555,
                     'Always allow all tools from this server to run without confirmation.'
                 )),
                 select: async () => {
@@ -291,9 +280,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
             return actions;
         }
         actions.push({
-            label: ( localize(5711, 'Allow Without Review in this Session')),
+            label: ( localize(5556, 'Allow Without Review in this Session')),
             detail: ( localize(
-                5712,
+                5557,
                 'Allow results from this tool to be sent without confirmation in this session.'
             )),
             divider: !!actions.length,
@@ -302,9 +291,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(5713, 'Allow Without Review in this Workspace')),
+            label: ( localize(5558, 'Allow Without Review in this Workspace')),
             detail: ( localize(
-                5714,
+                5559,
                 'Allow results from this tool to be sent without confirmation in this workspace.'
             )),
             select: async () => {
@@ -312,9 +301,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                 return true;
             }
         }, {
-            label: ( localize(5715, 'Always Allow Without Review')),
+            label: ( localize(5560, 'Always Allow Without Review')),
             detail: ( localize(
-                5716,
+                5561,
                 'Always allow results from this tool to be sent without confirmation.'
             )),
             select: async () => {
@@ -325,9 +314,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         if (ref.source.type === 'mcp') {
             const { serverLabel, definitionId } = ref.source;
             actions.push({
-                label: ( localize(5717, 'Allow Tools from {0} Without Review in this Session', serverLabel)),
+                label: ( localize(5562, 'Allow Tools from {0} Without Review in this Session', serverLabel)),
                 detail: ( localize(
-                    5718,
+                    5563,
                     'Allow results from all tools from this server to be sent without confirmation in this session.'
                 )),
                 divider: true,
@@ -336,9 +325,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(5719, 'Allow Tools from {0} Without Review in this Workspace', serverLabel)),
+                label: ( localize(5564, 'Allow Tools from {0} Without Review in this Workspace', serverLabel)),
                 detail: ( localize(
-                    5720,
+                    5565,
                     'Allow results from all tools from this server to be sent without confirmation in this workspace.'
                 )),
                 select: async () => {
@@ -346,9 +335,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                     return true;
                 }
             }, {
-                label: ( localize(5721, 'Always Allow Tools from {0} Without Review', serverLabel)),
+                label: ( localize(5566, 'Always Allow Tools from {0} Without Review', serverLabel)),
                 detail: ( localize(
-                    5722,
+                    5567,
                     'Always allow results from all tools from this server to be sent without confirmation.'
                 )),
                 select: async () => {
@@ -482,7 +471,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                         type: 'server-post',
                         serverId,
                         iconClass: ThemeIcon.asClassName(Codicon.play),
-                        label: ( localize(5723, "Continue without reviewing any tool results")),
+                        label: ( localize(5568, "Continue without reviewing any tool results")),
                         checked: serverPostConfirmed
                     });
                 }
@@ -491,7 +480,7 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
                         type: 'server-pre',
                         serverId,
                         iconClass: ThemeIcon.asClassName(Codicon.play),
-                        label: ( localize(5724, "Run any tool without approval")),
+                        label: ( localize(5569, "Run any tool without approval")),
                         checked: serverPreConfirmed
                     });
                 }
@@ -594,29 +583,29 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
         quickTree.ignoreFocusOut = true;
         quickTree.sortByLabel = false;
         if (currentScope !== 'session') {
-            const scopeToggle = disposables.add(( new Toggle({
-                title: ( localize(5725, "Configure for this workspace only")),
-                icon: Codicon.folder,
-                isChecked: currentScope === 'workspace',
-                inputActiveOptionBorder: asCssVariable(inputActiveOptionBorder),
-                inputActiveOptionForeground: asCssVariable(inputActiveOptionForeground),
-                inputActiveOptionBackground: asCssVariable(inputActiveOptionBackground)
-            })));
-            quickTree.toggles = [scopeToggle];
-            disposables.add(scopeToggle.onChange(() => {
-                currentScope = currentScope === 'workspace' ? 'profile' : 'workspace';
-                updatePlaceholder();
-                quickTree.setItemTree(buildTreeItems());
+            const scopeButton = {
+                iconClass: ThemeIcon.asClassName(Codicon.folder),
+                tooltip: ( localize(5570, "Configure for this workspace only")),
+                toggle: { checked: currentScope === 'workspace' },
+                location: QuickInputButtonLocation.Input
+            };
+            quickTree.buttons = [scopeButton];
+            disposables.add(quickTree.onDidTriggerButton(button => {
+                if (button === scopeButton) {
+                    currentScope = currentScope === 'workspace' ? 'profile' : 'workspace';
+                    updatePlaceholder();
+                    quickTree.setItemTree(buildTreeItems());
+                }
             }));
         }
         const updatePlaceholder = () => {
             if (currentScope === 'session') {
-                quickTree.placeholder = ( localize(5726, "Configure session tool approvals"));
+                quickTree.placeholder = ( localize(5571, "Configure session tool approvals"));
             }
             else {
                 quickTree.placeholder = currentScope === 'workspace'
-                    ? ( localize(5727, "Configure workspace tool approvals"))
-                    : ( localize(5728, "Configure global tool approvals"));
+                    ? ( localize(5572, "Configure workspace tool approvals"))
+                    : ( localize(5573, "Configure global tool approvals"));
             }
         };
         updatePlaceholder();
@@ -666,9 +655,9 @@ let LanguageModelToolsConfirmationService = class LanguageModelToolsConfirmation
             for (const item of quickTree.activeItems) {
                 if (item.type === 'manage') {
                     item.onDidOpen?.();
+                    quickTree.hide();
                 }
             }
-            quickTree.hide();
         }));
         disposables.add(quickTree.onDidHide(() => {
             disposables.dispose();

package/vscode/src/vs/workbench/contrib/chat/browser/{languageModelToolsService.d.ts → tools/languageModelToolsService.d.ts}

@@ -14,11 +14,11 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IVariableReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { ChatRequestToolReferenceEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries";
-import { ILanguageModelToolsConfirmationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsConfirmationService.service";
-import { CountTokensCallback, IToolAndToolSetEnablementMap, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolDataSource, ToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { ChatRequestToolReferenceEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariableEntries";
+import { ILanguageModelToolsConfirmationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service";
+import { CountTokensCallback, IToolAndToolSetEnablementMap, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolDataSource, ToolSet } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 export declare const globalAutoApproveDescription: import("@codingame/monaco-vscode-api/vscode/vs/nls").ILocalizedString;
 export declare class LanguageModelToolsService extends Disposable implements ILanguageModelToolsService {
     private readonly _instantiationService;