@codingame/monaco-vscode-chat-service-override 27.0.0 → 28.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupProviders.js

@@ -137,7 +137,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.vscode",
                 "vscode",
                 false,
-                ( localize2(6020, "Ask questions about VS Code")).value,
+                ( localize2(6090, "Ask questions about VS Code")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -152,7 +152,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.workspace",
                 "workspace",
                 false,
-                ( localize2(6021, "Ask about your workspace")).value,
+                ( localize2(6091, "Ask about your workspace")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -167,7 +167,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 "setup.terminal.agent",
                 "terminal",
                 false,
-                ( localize2(6022, "Ask how to do something in the terminal")).value,
+                ( localize2(6092, "Ask how to do something in the terminal")).value,
                 ChatAgentLocation.Chat,
                 ChatModeKind.Agent,
                 context,
@@ -178,9 +178,9 @@ let SetupAgent = class SetupAgent extends Disposable {
                 id: "setup_tools_createNewWorkspace",
                 source: ToolDataSource.Internal,
                 icon: Codicon.newFolder,
-                displayName: ( localize(6023, "New Workspace")),
+                displayName: ( localize(6093, "New Workspace")),
                 modelDescription: "Scaffold a new workspace in VS Code",
-                userDescription: ( localize(6024, "Scaffold a new workspace in VS Code")),
+                userDescription: ( localize(6094, "Scaffold a new workspace in VS Code")),
                 canBeReferencedInPrompt: true,
                 toolReferenceName: "new",
                 when: ContextKeyExpr.true()
@@ -235,10 +235,10 @@ let SetupAgent = class SetupAgent extends Disposable {
         };
     }
     static {
-        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(6025, "You need to set up GitHub Copilot and be signed in to use Chat."))));
+        this.SETUP_NEEDED_MESSAGE = ( new MarkdownString(( localize(6095, "You need to set up GitHub Copilot and be signed in to use Chat."))));
     }
     static {
-        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(6026, "You need to trust this workspace to use Chat."))));
+        this.TRUST_NEEDED_MESSAGE = ( new MarkdownString(( localize(6096, "You need to trust this workspace to use Chat."))));
     }
     static {
         this.CHAT_RETRY_COMMAND_ID = "workbench.action.chat.retrySetup";
@@ -381,7 +381,7 @@ let SetupAgent = class SetupAgent extends Disposable {
         }
         progress({
             kind: "progressMessage",
-            content: ( new MarkdownString(( localize(6027, "Getting chat ready")))),
+            content: ( new MarkdownString(( localize(6097, "Getting chat ready")))),
             shimmer: true
         });
         await this.forwardRequestToChat(
@@ -418,7 +418,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             this.logService.error("[chat setup] Failed to forward request to chat", error);
             progress({
                 kind: "warning",
-                content: ( new MarkdownString(( localize(6028, "Failed to get a response. Please try again."))))
+                content: ( new MarkdownString(( localize(6098, "Failed to get a response. Please try again."))))
             });
         }
     }
@@ -486,7 +486,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             const timeoutHandle = setTimeout(() => {
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(6029, "Chat is almost ready")))),
+                    content: ( new MarkdownString(( localize(6099, "Chat is almost ready")))),
                     shimmer: true
                 });
             }, 10000);
@@ -502,7 +502,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                     whenToolsModelReady
                 ])]);
                 if (ready === "panelGuidance") {
-                    const warningMessage = ( localize(6030, "Please try again."));
+                    const warningMessage = ( localize(6100, "Please try again."));
                     progress({
                         kind: "markdownContent",
                         content: ( new MarkdownString(warningMessage))
@@ -514,13 +514,13 @@ let SetupAgent = class SetupAgent extends Disposable {
                     let warningMessage;
                     if (this.chatEntitlementService.anonymous) {
                         warningMessage = ( localize(
-                            6031,
+                            6101,
                             "Chat took too long to get ready. Please ensure that the extension `{0}` is installed and enabled. Click restart to try again if this issue persists.",
                             defaultChat.chatExtensionId
                         ));
                     } else {
                         warningMessage = ( localize(
-                            6032,
+                            6102,
                             "Chat took too long to get ready. Please ensure you are signed in to {0} and that the extension `{1}` is installed and enabled. Click restart to try again if this issue persists.",
                             defaultChat.provider.default.name,
                             defaultChat.chatExtensionId
@@ -587,7 +587,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_SHOW_OUTPUT_COMMAND_ID,
-                                title: ( localize(6033, "Show Details"))
+                                title: ( localize(6103, "Show Details"))
                             }
                         });
                     } else {
@@ -595,7 +595,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                             kind: "command",
                             command: {
                                 id: SetupAgent_1.CHAT_RETRY_COMMAND_ID,
-                                title: ( localize(6034, "Restart")),
+                                title: ( localize(6104, "Restart")),
                                 arguments: [requestModel.session.sessionResource]
                             }
                         });
@@ -719,7 +719,7 @@ let SetupAgent = class SetupAgent extends Disposable {
                 progress({
                     kind: "progressMessage",
                     content: ( new MarkdownString(( localize(
-                        6035,
+                        6105,
                         "Signing in to {0}",
                         defaultAccountService.getDefaultAccountAuthenticationProvider().name
                     )))),
@@ -729,7 +729,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             case ChatSetupStep.Installing:
                 progress({
                     kind: "progressMessage",
-                    content: ( new MarkdownString(( localize(6036, "Getting chat ready")))),
+                    content: ( new MarkdownString(( localize(6106, "Getting chat ready")))),
                     shimmer: true
                 });
                 break;
@@ -766,7 +766,7 @@ let SetupAgent = class SetupAgent extends Disposable {
             } else {
                 progress({
                     kind: "warning",
-                    content: ( new MarkdownString(( localize(6037, "Chat setup failed."))))
+                    content: ( new MarkdownString(( localize(6107, "Chat setup failed."))))
                 });
             }
         }
@@ -920,13 +920,13 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
         if (range.isEmpty()) {
             const textAtLine = model.getLineContent(range.startLineNumber);
             if (/^\s*$/.test(textAtLine)) {
-                generateOrModifyTitle = ( localize(6038, "Generate"));
+                generateOrModifyTitle = ( localize(6108, "Generate"));
                 generateOrModifyCommand = AICodeActionsHelper.generate(range);
             }
         } else {
             const textInSelection = model.getValueInRange(range);
             if (!/^\s*$/.test(textInSelection)) {
-                generateOrModifyTitle = ( localize(6039, "Modify"));
+                generateOrModifyTitle = ( localize(6109, "Modify"));
                 generateOrModifyCommand = AICodeActionsHelper.modify(range);
             }
         }
@@ -944,14 +944,14 @@ let ChatCodeActionsProvider = ChatCodeActionsProvider_1 = class ChatCodeActionsP
                 kind: CodeActionKind.QuickFix.append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(6040, "Fix")),
+                title: ( localize(6110, "Fix")),
                 command: AICodeActionsHelper.fixMarkers(markers, range)
             });
             actions.push({
                 kind: CodeActionKind.QuickFix.append("explain").append("copilot").value,
                 isAI: true,
                 diagnostics: markers,
-                title: ( localize(6041, "Explain")),
+                title: ( localize(6111, "Explain")),
                 command: AICodeActionsHelper.explainMarkers(markers)
             });
         }
@@ -974,7 +974,7 @@ class AICodeActionsHelper {
     static modify(range) {
         return {
             id: ACTION_START,
-            title: ( localize(6039, "Modify")),
+            title: ( localize(6109, "Modify")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -985,7 +985,7 @@ class AICodeActionsHelper {
     static generate(range) {
         return {
             id: ACTION_START,
-            title: ( localize(6038, "Generate")),
+            title: ( localize(6108, "Generate")),
             arguments: [{
                 initialSelection: this.rangeToSelection(range),
                 initialRange: range,
@@ -1004,7 +1004,7 @@ class AICodeActionsHelper {
     static explainMarkers(markers) {
         return {
             id: CHAT_OPEN_ACTION_ID,
-            title: ( localize(6041, "Explain")),
+            title: ( localize(6111, "Explain")),
             arguments: [{
                 query: `@workspace /explain ${( markers.map(marker => marker.message)).join(", ")}`,
                 isPartialQuery: true
@@ -1014,7 +1014,7 @@ class AICodeActionsHelper {
     static fixMarkers(markers, range) {
         return {
             id: ACTION_START,
-            title: ( localize(6040, "Fix")),
+            title: ( localize(6110, "Fix")),
             arguments: [{
                 message: `/fix ${( markers.map(marker => marker.message)).join(", ")}`,
                 initialSelection: this.rangeToSelection(range),

package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetupRunner.js

@@ -132,7 +132,7 @@ let ChatSetup = class ChatSetup {
         const dialogSkipped = this.skipDialogOnce;
         this.skipDialogOnce = false;
         const trusted = await this.workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(6042, "AI features are currently only supported in trusted workspaces."))
+            message: ( localize(6112, "AI features are currently only supported in trusted workspaces."))
         });
         if (!trusted) {
             this.context.update({
@@ -257,20 +257,20 @@ let ChatSetup = class ChatSetup {
         });
         let buttons;
         if (!options?.forceAnonymous && (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog)) {
-            const defaultProviderButton = [( localize(6043, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton("continue-button", "default")];
+            const defaultProviderButton = [( localize(6113, "Continue with {0}", defaultChat.provider.default.name)), ChatSetupStrategy.SetupWithoutEnterpriseProvider, styleButton("continue-button", "default")];
             const defaultProviderLink = [
                 defaultProviderButton[0],
                 defaultProviderButton[1],
                 styleButton("link-button")
             ];
-            const enterpriseProviderButton = [( localize(6043, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton("continue-button", "default")];
+            const enterpriseProviderButton = [( localize(6113, "Continue with {0}", defaultChat.provider.enterprise.name)), ChatSetupStrategy.SetupWithEnterpriseProvider, styleButton("continue-button", "default")];
             const enterpriseProviderLink = [
                 enterpriseProviderButton[0],
                 enterpriseProviderButton[1],
                 styleButton("link-button")
             ];
-            const googleProviderButton = [( localize(6043, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
-            const appleProviderButton = [( localize(6043, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
+            const googleProviderButton = [( localize(6113, "Continue with {0}", defaultChat.provider.google.name)), ChatSetupStrategy.SetupWithGoogleProvider, styleButton("continue-button", "google")];
+            const appleProviderButton = [( localize(6113, "Continue with {0}", defaultChat.provider.apple.name)), ChatSetupStrategy.SetupWithAppleProvider, styleButton("continue-button", "apple")];
             if (!this.defaultAccountService.getDefaultAccountAuthenticationProvider().enterprise) {
                 buttons = coalesce([
                     defaultProviderButton,
@@ -287,10 +287,10 @@ let ChatSetup = class ChatSetup {
                 ]);
             }
         } else {
-            buttons = [[( localize(6044, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
+            buttons = [[( localize(6114, "Use AI Features")), ChatSetupStrategy.DefaultSetup, undefined]];
         }
         if (!useCloseButton) {
-            buttons.push([( localize(6045, "Skip for now")), ChatSetupStrategy.Canceled, styleButton("link-button", "skip-button")]);
+            buttons.push([( localize(6115, "Skip for now")), ChatSetupStrategy.Canceled, styleButton("link-button", "skip-button")]);
         }
         return buttons;
     }
@@ -300,22 +300,22 @@ let ChatSetup = class ChatSetup {
         }
         if (this.chatEntitlementService.anonymous) {
             if (options?.forceAnonymous) {
-                return localize(6046, "Start using AI Features");
+                return localize(6116, "Start using AI Features");
             } else {
-                return localize(6047, "Enable more AI features");
+                return localize(6117, "Enable more AI features");
             }
         }
         if (this.context.state.entitlement === ChatEntitlement.Unknown || options?.forceSignInDialog) {
-            return localize(6048, "Sign in to use AI Features");
+            return localize(6118, "Sign in to use AI Features");
         }
-        return localize(6046, "Start using AI Features");
+        return localize(6116, "Start using AI Features");
     }
     createDialogFooter(disposables, options) {
         const element = $(".chat-setup-dialog-footer");
         let footer;
         if (options?.forceAnonymous || this.telemetryService.telemetryLevel === TelemetryLevel.NONE) {
             footer = ( localize(
-                6049,
+                6119,
                 "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}).",
                 defaultChat.provider.default.name,
                 defaultChat.termsStatementUrl,
@@ -323,7 +323,7 @@ let ChatSetup = class ChatSetup {
             ));
         } else {
             footer = ( localize(
-                6050,
+                6120,
                 "By continuing, you agree to {0}'s [Terms]({1}) and [Privacy Statement]({2}). {3} Copilot may show [public code]({4}) suggestions and use your data to improve the product. You can change these [settings]({5}) anytime.",
                 defaultChat.provider.default.name,
                 defaultChat.termsStatementUrl,

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

@@ -9,7 +9,9 @@ import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbe
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatSlashCommands.service";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { IAgentSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service";
+import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 export declare class ChatSlashCommandsContribution extends Disposable {
+    private readonly environmentService;
     static readonly ID = "workbench.contrib.chatSlashCommands";
-    constructor(slashCommandService: IChatSlashCommandService, commandService: ICommandService, chatAgentService: IChatAgentService, instantiationService: IInstantiationService, agentSessionsService: IAgentSessionsService, chatService: IChatService, configurationService: IConfigurationService, dialogService: IDialogService, notificationService: INotificationService, storageService: IStorageService);
+    constructor(slashCommandService: IChatSlashCommandService, commandService: ICommandService, chatAgentService: IChatAgentService, instantiationService: IInstantiationService, agentSessionsService: IAgentSessionsService, chatService: IChatService, configurationService: IConfigurationService, dialogService: IDialogService, notificationService: INotificationService, storageService: IStorageService, environmentService: IWorkbenchEnvironmentService);
 }

package/vscode/src/vs/workbench/contrib/chat/browser/chatSlashCommands.js

@@ -2,7 +2,8 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { timeout } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { MarkdownString, isMarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -18,15 +19,17 @@ import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ACTION_ID_NEW_CHAT } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { OpenModelPickerAction, OpenModePickerAction, ChatSubmitAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
+import { ManagePluginsAction } from './actions/chatPluginActions.js';
 import { ConfigureToolsAction } from './actions/chatToolActions.js';
 import { IAgentSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service';
 import { CONFIGURE_INSTRUCTIONS_ACTION_ID } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/chat/browser/promptSyntax/attachInstructionsAction';
 import { showConfigureHooksQuickPick } from './promptSyntax/hookActions.js';
 import { CONFIGURE_PROMPTS_ACTION_ID } from './promptSyntax/runPromptAction.js';
 import { CONFIGURE_SKILLS_ACTION_ID } from './promptSyntax/skillActions.js';
-import { globalAutoApproveDescription } from './tools/languageModelToolsService.js';
+import { AutoApproveStorageKeys, globalAutoApproveDescription } from './tools/languageModelToolsService.js';
 import { agentToMarkdown, agentSlashCommandToMarkdown } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatMarkdownDecorationsRenderer';
-import { Target } 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 { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends Disposable {
@@ -43,12 +46,14 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         configurationService,
         dialogService,
         notificationService,
-        storageService
+        storageService,
+        environmentService
     ) {
         super();
+        this.environmentService = environmentService;
         this._store.add(slashCommandService.registerSlashCommand({
             command: "clear",
-            detail: ( localize(6051, "Start a new chat and archive the current one")),
+            detail: ( localize(6121, "Start a new chat and archive the current one")),
             sortText: "z2_clear",
             executeImmediately: true,
             locations: [ChatAgentLocation.Chat]
@@ -58,7 +63,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "hooks",
-            detail: ( localize(6052, "Configure hooks")),
+            detail: ( localize(6122, "Configure hooks")),
             sortText: "z3_hooks",
             executeImmediately: true,
             silent: true,
@@ -69,7 +74,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "models",
-            detail: ( localize(6053, "Open the model picker")),
+            detail: ( localize(6123, "Open the model picker")),
             sortText: "z3_models",
             executeImmediately: true,
             silent: true,
@@ -80,7 +85,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "tools",
-            detail: ( localize(6054, "Configure tools")),
+            detail: ( localize(6124, "Configure tools")),
             sortText: "z3_tools",
             executeImmediately: true,
             silent: true,
@@ -90,18 +95,31 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             await commandService.executeCommand(ConfigureToolsAction.ID);
         }));
         this._store.add(slashCommandService.registerSlashCommand({
-            command: "debug",
-            detail: ( localize(6055, "Show Chat Debug View")),
-            sortText: "z3_debug",
+            command: "plugins",
+            detail: ( localize(6125, "Manage plugins")),
+            sortText: "z3_plugins",
             executeImmediately: true,
             silent: true,
-            locations: [ChatAgentLocation.Chat]
+            locations: [ChatAgentLocation.Chat],
+            target: Target.VSCode
         }, async () => {
-            await commandService.executeCommand("github.copilot.debug.showChatLogView");
+            await commandService.executeCommand(ManagePluginsAction.ID);
         }));
+        if (!this.environmentService.isSessionsWindow) {
+            this._store.add(slashCommandService.registerSlashCommand({
+                command: "debug",
+                detail: ( localize(6126, "Show Chat Debug View")),
+                sortText: "z3_debug",
+                executeImmediately: true,
+                silent: true,
+                locations: [ChatAgentLocation.Chat]
+            }, async () => {
+                await commandService.executeCommand("github.copilot.debug.showChatLogView");
+            }));
+        }
         this._store.add(slashCommandService.registerSlashCommand({
             command: "agents",
-            detail: ( localize(6056, "Configure custom agents")),
+            detail: ( localize(6127, "Configure custom agents")),
             sortText: "z3_agents",
             executeImmediately: true,
             silent: true,
@@ -112,7 +130,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "skills",
-            detail: ( localize(6057, "Configure skills")),
+            detail: ( localize(6128, "Configure skills")),
             sortText: "z3_skills",
             executeImmediately: true,
             silent: true,
@@ -123,7 +141,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "instructions",
-            detail: ( localize(6058, "Configure instructions")),
+            detail: ( localize(6129, "Configure instructions")),
             sortText: "z3_instructions",
             executeImmediately: true,
             silent: true,
@@ -134,7 +152,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "prompts",
-            detail: ( localize(6059, "Configure prompt files")),
+            detail: ( localize(6130, "Configure prompt files")),
             sortText: "z3_prompts",
             executeImmediately: true,
             silent: true,
@@ -145,7 +163,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "fork",
-            detail: ( localize(6060, "Fork conversation into a new chat session")),
+            detail: ( localize(6131, "Fork conversation into a new chat session")),
             sortText: "z2_fork",
             executeImmediately: true,
             silent: true,
@@ -156,7 +174,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "rename",
-            detail: ( localize(6061, "Rename this chat")),
+            detail: ( localize(6132, "Rename this chat")),
             sortText: "z2_rename",
             executeImmediately: false,
             silent: true,
@@ -172,54 +190,79 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             const inspection = configurationService.inspect(ChatConfiguration.GlobalAutoApprove);
             if (inspection.policyValue !== undefined) {
                 if (inspection.policyValue === true) {
-                    notificationService.info(( localize(6062, "Global auto-approve is already enabled.")));
+                    notificationService.info(( localize(6133, "Global auto-approve is already enabled.")));
                     return;
                 }
                 notificationService.warn(( localize(
-                    6063,
+                    6134,
                     "Global auto-approve is managed by your organization policy. Contact your administrator to change this setting."
                 )));
                 return;
             }
             if (configurationService.getValue(ChatConfiguration.GlobalAutoApprove)) {
-                notificationService.info(( localize(6062, "Global auto-approve is already enabled.")));
+                notificationService.info(( localize(6133, "Global auto-approve is already enabled.")));
                 return;
             }
-            const alreadyOptedIn = storageService.getBoolean("chat.tools.global.autoApprove.optIn", StorageScope.APPLICATION, false);
+            const alreadyOptedIn = storageService.getBoolean(
+                AutoApproveStorageKeys.GlobalAutoApproveOptIn,
+                StorageScope.APPLICATION,
+                false
+            );
             if (!alreadyOptedIn) {
-                const result = await dialogService.prompt({
-                    type: Severity.Warning,
-                    message: ( localize(6064, "Enable global auto approve?")),
-                    buttons: [{
-                        label: ( localize(6065, "Enable")),
-                        run: () => true
-                    }, {
-                        label: ( localize(6066, "Cancel")),
-                        run: () => false
-                    }],
-                    custom: {
-                        markdownDetails: [{
-                            markdown: ( new MarkdownString(globalAutoApproveDescription.value, {
-                                isTrusted: {
-                                    enabledCommands: ["workbench.action.openSettings"]
-                                }
-                            }))
-                        }]
+                const store = ( new DisposableStore());
+                try {
+                    const cts = ( new CancellationTokenSource());
+                    store.add(cts);
+                    store.add(storageService.onDidChangeValue(
+                        StorageScope.APPLICATION,
+                        AutoApproveStorageKeys.GlobalAutoApproveOptIn,
+                        store
+                    )(() => {
+                        if (storageService.getBoolean(
+                            AutoApproveStorageKeys.GlobalAutoApproveOptIn,
+                            StorageScope.APPLICATION,
+                            false
+                        )) {
+                            cts.cancel();
+                        }
+                    }));
+                    const result = await dialogService.prompt({
+                        type: Severity.Warning,
+                        message: ( localize(6135, "Enable global auto approve?")),
+                        buttons: [{
+                            label: ( localize(6136, "Enable")),
+                            run: () => true
+                        }, {
+                            label: ( localize(6137, "Cancel")),
+                            run: () => false
+                        }],
+                        custom: {
+                            markdownDetails: [{
+                                markdown: ( new MarkdownString(globalAutoApproveDescription.value, {
+                                    isTrusted: {
+                                        enabledCommands: ["workbench.action.openSettings"]
+                                    }
+                                }))
+                            }]
+                        },
+                        token: cts.token
+                    });
+                    if (!cts.token.isCancellationRequested && result.result !== true) {
+                        return;
                     }
-                });
-                if (result.result !== true) {
-                    return;
+                    storageService.store(
+                        AutoApproveStorageKeys.GlobalAutoApproveOptIn,
+                        true,
+                        StorageScope.APPLICATION,
+                        StorageTarget.USER
+                    );
+                } finally {
+                    store.dispose();
                 }
-                storageService.store(
-                    "chat.tools.global.autoApprove.optIn",
-                    true,
-                    StorageScope.APPLICATION,
-                    StorageTarget.USER
-                );
             }
             await configurationService.updateValue(ChatConfiguration.GlobalAutoApprove, true);
             notificationService.info(( localize(
-                6067,
+                6138,
                 "Global auto-approve enabled — all tool calls will be approved automatically"
             )));
         };
@@ -227,25 +270,25 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
             const inspection = configurationService.inspect(ChatConfiguration.GlobalAutoApprove);
             if (inspection.policyValue !== undefined) {
                 if (inspection.policyValue === false) {
-                    notificationService.info(( localize(6068, "Global auto-approve is already disabled.")));
+                    notificationService.info(( localize(6139, "Global auto-approve is already disabled.")));
                     return;
                 }
                 notificationService.warn(( localize(
-                    6063,
+                    6134,
                     "Global auto-approve is managed by your organization policy. Contact your administrator to change this setting."
                 )));
                 return;
             }
             if (!configurationService.getValue(ChatConfiguration.GlobalAutoApprove)) {
-                notificationService.info(( localize(6068, "Global auto-approve is already disabled.")));
+                notificationService.info(( localize(6139, "Global auto-approve is already disabled.")));
                 return;
             }
             await configurationService.updateValue(ChatConfiguration.GlobalAutoApprove, false);
-            notificationService.info(( localize(6069, "Global auto-approve disabled — tools will require approval")));
+            notificationService.info(( localize(6140, "Global auto-approve disabled — tools will require approval")));
         };
         this._store.add(slashCommandService.registerSlashCommand({
             command: "autoApprove",
-            detail: ( localize(6070, "Enable global auto-approval of all tool calls")),
+            detail: ( localize(6141, "Enable global auto-approval of all tool calls")),
             sortText: "z1_autoApprove",
             executeImmediately: true,
             silent: true,
@@ -254,7 +297,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }, handleEnableAutoApprove));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "disableAutoApprove",
-            detail: ( localize(6071, "Disable global auto-approval of all tool calls")),
+            detail: ( localize(6142, "Disable global auto-approval of all tool calls")),
             sortText: "z1_disableAutoApprove",
             executeImmediately: true,
             silent: true,
@@ -263,7 +306,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }, handleDisableAutoApprove));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "yolo",
-            detail: ( localize(6072, "Enable global auto-approval of all tool calls")),
+            detail: ( localize(6143, "Enable global auto-approval of all tool calls")),
             sortText: "z1_yolo",
             executeImmediately: true,
             silent: true,
@@ -272,7 +315,7 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }, handleEnableAutoApprove));
         this._store.add(slashCommandService.registerSlashCommand({
             command: "disableYolo",
-            detail: ( localize(6073, "Disable global auto-approval of all tool calls")),
+            detail: ( localize(6144, "Disable global auto-approval of all tool calls")),
             sortText: "z1_disableYolo",
             executeImmediately: true,
             silent: true,
@@ -346,6 +389,6 @@ let ChatSlashCommandsContribution = class ChatSlashCommandsContribution extends
         }));
     }
 };
-ChatSlashCommandsContribution = ( __decorate([( __param(0, IChatSlashCommandService)), ( __param(1, ICommandService)), ( __param(2, IChatAgentService)), ( __param(3, IInstantiationService)), ( __param(4, IAgentSessionsService)), ( __param(5, IChatService)), ( __param(6, IConfigurationService)), ( __param(7, IDialogService)), ( __param(8, INotificationService)), ( __param(9, IStorageService))], ChatSlashCommandsContribution));
+ChatSlashCommandsContribution = ( __decorate([( __param(0, IChatSlashCommandService)), ( __param(1, ICommandService)), ( __param(2, IChatAgentService)), ( __param(3, IInstantiationService)), ( __param(4, IAgentSessionsService)), ( __param(5, IChatService)), ( __param(6, IConfigurationService)), ( __param(7, IDialogService)), ( __param(8, INotificationService)), ( __param(9, IStorageService)), ( __param(10, IWorkbenchEnvironmentService))], ChatSlashCommandsContribution));
 
 export { ChatSlashCommandsContribution };