@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

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

@@ -4,6 +4,7 @@ import { getWindow, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browse
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { MarshalledId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshallingIds';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -29,8 +30,8 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 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 { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { ViewPane } from '@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common/vscode/vs/workbench/browser/parts/views/viewPane';
-import { Memento } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/common/memento';
+import { ViewPane } from '@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common/vscode/vs/workbench/browser/parts/views/viewPane';
+import { Memento } from '@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common/vscode/vs/workbench/common/memento';
 import { SIDE_BAR_FOREGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
 import { ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
@@ -38,14 +39,16 @@ import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatSessionUri } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatUri';
 import { ChatWidget } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatViewWelcomeController } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController';
 
 const CHAT_SIDEBAR_PANEL_ID = 'workbench.panel.chat';
 let ChatViewPane = class ChatViewPane extends ViewPane {
     get widget() { return this._widget; }
-    constructor(chatOptions, options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService, storageService, chatService, chatAgentService, logService, layoutService) {
+    constructor(chatOptions, options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService, storageService, chatService, chatAgentService, logService, layoutService, chatSessionsService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, hoverService);
         this.chatOptions = chatOptions;
         this.storageService = storageService;
@@ -53,6 +56,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.chatAgentService = chatAgentService;
         this.logService = logService;
         this.layoutService = layoutService;
+        this.chatSessionsService = chatSessionsService;
         this.modelDisposables = this._register(( new DisposableStore()));
         this.memento = ( new Memento('interactive-session-view-' + CHAT_PROVIDER_ID, this.storageService));
         this.viewState = this.memento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
@@ -146,48 +150,42 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         }
     }
     async renderBody(parent) {
-        try {
-            super.renderBody(parent);
-            this._register(this.instantiationService.createInstance(ChatViewWelcomeController, parent, this, this.chatOptions.location));
-            const scopedInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.scopedContextKeyService]))));
-            const locationBasedColors = this.getLocationBasedColors();
-            const editorOverflowNode = this.layoutService.getContainer(getWindow(parent)).appendChild($('.chat-editor-overflow.monaco-editor'));
-            this._register({ dispose: () => editorOverflowNode.remove() });
-            this._widget = this._register(scopedInstantiationService.createInstance(ChatWidget, this.chatOptions.location, { viewId: this.id }, {
-                autoScroll: mode => mode !== ChatModeKind.Ask,
-                renderFollowups: this.chatOptions.location === ChatAgentLocation.Panel,
-                supportsFileReferences: true,
-                rendererOptions: {
-                    renderTextEditsAsSummary: (uri) => {
-                        return true;
-                    },
-                    referencesExpandedWhenEmptyResponse: false,
-                    progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask,
+        super.renderBody(parent);
+        this._register(this.instantiationService.createInstance(ChatViewWelcomeController, parent, this, this.chatOptions.location));
+        const scopedInstantiationService = this._register(this.instantiationService.createChild(( new ServiceCollection([IContextKeyService, this.scopedContextKeyService]))));
+        const locationBasedColors = this.getLocationBasedColors();
+        const editorOverflowNode = this.layoutService.getContainer(getWindow(parent)).appendChild($('.chat-editor-overflow.monaco-editor'));
+        this._register({ dispose: () => editorOverflowNode.remove() });
+        this._widget = this._register(scopedInstantiationService.createInstance(ChatWidget, this.chatOptions.location, { viewId: this.id }, {
+            autoScroll: mode => mode !== ChatModeKind.Ask,
+            renderFollowups: this.chatOptions.location === ChatAgentLocation.Panel,
+            supportsFileReferences: true,
+            rendererOptions: {
+                renderTextEditsAsSummary: (uri) => {
+                    return true;
                 },
-                editorOverflowWidgetsDomNode: editorOverflowNode,
-                enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel,
-                enableWorkingSet: 'explicit',
-                supportsChangingModes: true,
-            }, {
-                listForeground: SIDE_BAR_FOREGROUND,
-                listBackground: locationBasedColors.background,
-                overlayBackground: locationBasedColors.overlayBackground,
-                inputEditorBackground: locationBasedColors.background,
-                resultEditorBackground: editorBackground,
-            }));
-            this._register(this.onDidChangeBodyVisibility(visible => {
-                this._widget.setVisible(visible);
-            }));
-            this._register(this._widget.onDidClear(() => this.clear()));
-            this._widget.render(parent);
-            const info = this.getTransferredOrPersistedSessionInfo();
-            const model = info.sessionId ? await this.chatService.getOrRestoreSession(info.sessionId) : undefined;
-            await this.updateModel(model, info.inputValue || info.mode ? { inputState: { chatMode: info.mode }, inputValue: info.inputValue } : undefined);
-        }
-        catch (e) {
-            this.logService.error(e);
-            throw e;
-        }
+                referencesExpandedWhenEmptyResponse: false,
+                progressMessageAtBottomOfResponse: mode => mode !== ChatModeKind.Ask,
+            },
+            editorOverflowWidgetsDomNode: editorOverflowNode,
+            enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel,
+            enableWorkingSet: 'explicit',
+            supportsChangingModes: true,
+        }, {
+            listForeground: SIDE_BAR_FOREGROUND,
+            listBackground: locationBasedColors.background,
+            overlayBackground: locationBasedColors.overlayBackground,
+            inputEditorBackground: locationBasedColors.background,
+            resultEditorBackground: editorBackground,
+        }));
+        this._register(this.onDidChangeBodyVisibility(visible => {
+            this._widget.setVisible(visible);
+        }));
+        this._register(this._widget.onDidClear(() => this.clear()));
+        this._widget.render(parent);
+        const info = this.getTransferredOrPersistedSessionInfo();
+        const model = info.sessionId ? await this.chatService.getOrRestoreSession(info.sessionId) : undefined;
+        await this.updateModel(model, info.inputValue || info.mode ? { inputState: { chatMode: info.mode }, inputValue: info.inputValue } : undefined);
     }
     acceptInput(query) {
         this._widget.acceptInput(query);
@@ -204,6 +202,17 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         if (this.widget.viewModel) {
             await this.chatService.clearSession(this.widget.viewModel.sessionId);
         }
+        if (URI.isUri(sessionId) && sessionId.scheme === Schemas.vscodeChatSession) {
+            const parsed = ChatSessionUri.parse(sessionId);
+            if (parsed?.chatSessionType) {
+                await this.chatSessionsService.canResolveContentProvider(parsed.chatSessionType);
+                const contributions = this.chatSessionsService.getAllChatSessionContributions();
+                const contribution = contributions.find((c) => c.type === parsed.chatSessionType);
+                if (contribution) {
+                    this.widget.lockToCodingAgent(contribution.name, contribution.displayName, contribution.type);
+                }
+            }
+        }
         const newModel = await (URI.isUri(sessionId) ? this.chatService.loadSessionForResource(sessionId, ChatAgentLocation.Panel, CancellationToken.None) : this.chatService.getOrRestoreSession(sessionId));
         await this.updateModel(newModel, viewState);
     }
@@ -247,7 +256,8 @@ ChatViewPane = ( __decorate([
     ( __param(12, IChatService)),
     ( __param(13, IChatAgentService)),
     ( __param(14, ILogService)),
-    ( __param(15, ILayoutService))
+    ( __param(15, ILayoutService)),
+    ( __param(16, IChatSessionsService))
 ], ChatViewPane));
 
 export { CHAT_SIDEBAR_PANEL_ID, ChatViewPane };

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

@@ -119,7 +119,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             const mode = this.widget.input.currentModeObs.get();
             let description = mode.description.get();
             if (this.configurationService.getValue('chat.emptyChatState.enabled')) {
-                description = ( localize(5231, "Add context (#), extensions (@), commands (/)"));
+                description = ( localize(5352, "Add context (#), extensions (@), commands (/)"));
             }
             const decoration = [
                 {
@@ -227,8 +227,11 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             varDecorations.push({ range: tool.editorRange });
         }
         const dynamicVariableParts = parsedRequest.filter((p) => p instanceof ChatRequestDynamicVariablePart);
-        for (const variable of dynamicVariableParts) {
-            varDecorations.push({ range: variable.editorRange, hoverMessage: URI.isUri(variable.data) ? ( new MarkdownString(this.labelService.getUriLabel(variable.data, { relative: true }))) : undefined });
+        const isEditingPreviousRequest = !!this.widget.viewModel?.editing;
+        if (isEditingPreviousRequest) {
+            for (const variable of dynamicVariableParts) {
+                varDecorations.push({ range: variable.editorRange, hoverMessage: URI.isUri(variable.data) ? ( new MarkdownString(this.labelService.getUriLabel(variable.data, { relative: true }))) : undefined });
+            }
         }
         this.widget.inputEditor.setDecorationsByType(decorationDescription, variableTextDecorationType, varDecorations);
     }

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

@@ -58,7 +58,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(5232, 'There is a chat agent hover part here.');
+        return localize(5353, 'There is a chat agent hover part here.');
     }
 };
 ChatAgentHoverParticipant = ( __decorate([

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

@@ -1,4 +1,5 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { ThemeIcon } from "@codingame/monaco-vscode-api/vscode/vs/base/common/themables";
@@ -9,11 +10,13 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 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 { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
-import { CountTokensCallback, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolSet, ToolDataSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { CountTokensCallback, IToolData, IToolImpl, IToolInvocation, IToolResult, ToolDataSource, ToolSet, IToolAndToolSetEnablementMap } 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";
+export declare const globalAutoApproveDescription: import("@codingame/monaco-vscode-api/vscode/vs/nls").ILocalizedString;
 export declare class LanguageModelToolsService extends Disposable implements ILanguageModelToolsService {
     private readonly _instantiationService;
     private readonly _extensionService;
@@ -25,9 +28,10 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     private readonly _configurationService;
     private readonly _accessibilityService;
     private readonly _accessibilitySignalService;
+    private readonly _storageService;
     _serviceBrand: undefined;
     private _onDidChangeTools;
-    readonly onDidChangeTools: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    readonly onDidChangeTools: Event<void>;
     /** Throttle tools updates because it sends all tools and runs on context key updates */
     private _onDidChangeToolsScheduler;
     private _tools;
@@ -37,17 +41,18 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     private _workspaceToolConfirmStore;
     private _profileToolConfirmStore;
     private _memoryToolConfirmStore;
-    constructor(_instantiationService: IInstantiationService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService, _chatService: IChatService, _dialogService: IDialogService, _telemetryService: ITelemetryService, _logService: ILogService, _configurationService: IConfigurationService, _accessibilityService: IAccessibilityService, _accessibilitySignalService: IAccessibilitySignalService);
+    constructor(_instantiationService: IInstantiationService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService, _chatService: IChatService, _dialogService: IDialogService, _telemetryService: ITelemetryService, _logService: ILogService, _configurationService: IConfigurationService, _accessibilityService: IAccessibilityService, _accessibilitySignalService: IAccessibilitySignalService, _storageService: IStorageService);
     dispose(): void;
     registerToolData(toolData: IToolData): IDisposable;
     private _refreshAllToolContextKeys;
-    flushToolChanges(): void;
     registerToolImplementation(id: string, tool: IToolImpl): IDisposable;
+    registerTool(toolData: IToolData, tool: IToolImpl): IDisposable;
     getTools(includeDisabled?: boolean): Iterable<Readonly<IToolData>>;
     getTool(id: string): IToolData | undefined;
     private _getToolEntry;
     getToolByName(name: string, includeDisabled?: boolean): IToolData | undefined;
-    setToolAutoConfirmation(toolId: string, scope: "workspace" | "profile" | "memory", autoConfirm?: boolean): void;
+    setToolAutoConfirmation(toolId: string, scope: "workspace" | "profile" | "session" | "never"): void;
+    getToolAutoConfirmation(toolId: string): "workspace" | "profile" | "session" | "never";
     resetToolAutoConfirmation(): void;
     invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
     private prepareToolInvocation;
@@ -56,15 +61,16 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     private formatToolInput;
     private toolResultToIO;
     private shouldAutoConfirm;
+    private _checkGlobalAutoApprove;
     private cleanupCallDisposables;
     cancelToolCallsForRequest(requestId: string): void;
     toToolEnablementMap(toolOrToolsetNames: Set<string>): Record<string, boolean>;
     /**
      * Create a map that contains all tools and toolsets with their enablement state.
-     * @param toolOrToolSetNames A list of tool or toolset names to check for enablement. If undefined, all tools and toolsets are enabled.
+     * @param toolOrToolSetNames A list of tool or toolset names that are enabled.
      * @returns A map of tool or toolset instances to their enablement state.
      */
-    toToolAndToolSetEnablementMap(enabledToolOrToolSetNames: readonly string[] | undefined): Map<ToolSet | IToolData, boolean>;
+    toToolAndToolSetEnablementMap(enabledToolOrToolSetNames: readonly string[]): IToolAndToolSetEnablementMap;
     private readonly _toolSets;
     readonly toolSets: IObservable<Iterable<ToolSet>>;
     getToolSet(id: string): ToolSet | undefined;

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

@@ -8,12 +8,15 @@ import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { CancellationError, isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
-import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, toDisposable, combinedDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { LRUCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
+import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
 import { AccessibilitySignal } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
@@ -30,6 +33,7 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatToolInvocation } from '../common/chatProgressTypes/chatToolInvocation.js';
+import { ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { createToolSchemaUri, stringifyPromptTsxPart, ToolSet } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
@@ -38,8 +42,16 @@ import { ObservableSet } from '@codingame/monaco-vscode-api/vscode/vs/base/commo
 
 var ToolConfirmStore_1;
 const jsonSchemaRegistry = ( Registry.as(Extensions.JSONContribution));
+var AutoApproveStorageKeys;
+(function (AutoApproveStorageKeys) {
+    AutoApproveStorageKeys["GlobalAutoApproveOptIn"] = "chat.tools.global.autoApprove.optIn";
+})(AutoApproveStorageKeys || (AutoApproveStorageKeys = {}));
+const globalAutoApproveDescription = ( localize2(
+    5356,
+    'Global auto approve also known as "YOLO mode" disables manual approval completely for _all tools in all workspaces_, allowing the agent to act fully autonomously. This is extremely dangerous and is *never* recommended, even containerized environments like [Codespaces](https://github.com/features/codespaces) and [Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) have user keys forwarded into the container that could be compromised.\n\n**This feature disables [critical security protections](https://code.visualstudio.com/docs/copilot/security) and makes it much easier for an attacker to compromise the machine.**'
+));
 let LanguageModelToolsService = class LanguageModelToolsService extends Disposable {
-    constructor(_instantiationService, _extensionService, _contextKeyService, _chatService, _dialogService, _telemetryService, _logService, _configurationService, _accessibilityService, _accessibilitySignalService) {
+    constructor(_instantiationService, _extensionService, _contextKeyService, _chatService, _dialogService, _telemetryService, _logService, _configurationService, _accessibilityService, _accessibilitySignalService, _storageService) {
         super();
         this._instantiationService = _instantiationService;
         this._extensionService = _extensionService;
@@ -51,6 +63,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         this._configurationService = _configurationService;
         this._accessibilityService = _accessibilityService;
         this._accessibilitySignalService = _accessibilitySignalService;
+        this._storageService = _storageService;
         this._onDidChangeTools = ( new Emitter());
         this.onDidChangeTools = this._onDidChangeTools.event;
         this._onDidChangeToolsScheduler = ( new RunOnceScheduler(() => this._onDidChangeTools.fire(), 750));
@@ -76,6 +89,13 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                 this._onDidChangeToolsScheduler.schedule();
             }
         }));
+        this._register(Event.runAndSubscribe(this._configurationService.onDidChangeConfiguration, e => {
+            if (!e || e.affectsConfiguration(ChatConfiguration.GlobalAutoApprove)) {
+                if (this._configurationService.getValue(ChatConfiguration.GlobalAutoApprove) !== true) {
+                    this._storageService.remove(AutoApproveStorageKeys.GlobalAutoApproveOptIn, StorageScope.APPLICATION);
+                }
+            }
+        }));
         this._ctxToolsCount = ChatContextKeys.Tools.toolsCount.bindTo(_contextKeyService);
     }
     dispose() {
@@ -112,10 +132,6 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             tool.data.when?.keys().forEach(key => this._toolContextKeys.add(key));
         }
     }
-    flushToolChanges() {
-        this._onDidChangeToolsScheduler.cancel();
-        this._onDidChangeTools.fire();
-    }
     registerToolImplementation(id, tool) {
         const entry = this._tools.get(id);
         if (!entry) {
@@ -129,6 +145,9 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             entry.impl = undefined;
         });
     }
+    registerTool(toolData, tool) {
+        return combinedDisposable(this.registerToolData(toolData), this.registerToolImplementation(toolData.id, tool));
+    }
     getTools(includeDisabled) {
         const toolDatas = ( Iterable.map(( this._tools.values()), i => i.data));
         const extensionToolsEnabled = this._configurationService.getValue(ChatConfiguration.ExtensionToolsEnabled);
@@ -158,17 +177,28 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         }
         return undefined;
     }
-    setToolAutoConfirmation(toolId, scope, autoConfirm = true) {
-        if (scope === 'workspace') {
-            this._workspaceToolConfirmStore.value.setAutoConfirm(toolId, autoConfirm);
-        }
-        else if (scope === 'profile') {
-            this._profileToolConfirmStore.value.setAutoConfirm(toolId, autoConfirm);
+    setToolAutoConfirmation(toolId, scope) {
+        this._workspaceToolConfirmStore.value.setAutoConfirm(toolId, scope === 'workspace');
+        this._profileToolConfirmStore.value.setAutoConfirm(toolId, scope === 'profile');
+        if (scope === 'session') {
+            this._memoryToolConfirmStore.add(toolId);
         }
         else {
-            this._memoryToolConfirmStore.add(toolId);
+            this._memoryToolConfirmStore.delete(toolId);
         }
     }
+    getToolAutoConfirmation(toolId) {
+        if (this._workspaceToolConfirmStore.value.getAutoConfirm(toolId)) {
+            return 'workspace';
+        }
+        if (this._profileToolConfirmStore.value.getAutoConfirm(toolId)) {
+            return 'profile';
+        }
+        if (( this._memoryToolConfirmStore.has(toolId))) {
+            return 'session';
+        }
+        return 'never';
+    }
     resetToolAutoConfirmation() {
         this._workspaceToolConfirmStore.value.reset();
         this._profileToolConfirmStore.value.reset();
@@ -211,30 +241,39 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                     source.dispose(true);
                 }));
                 store.add(token.onCancellationRequested(() => {
-                    toolInvocation?.confirmed.complete(false);
+                    toolInvocation?.confirmed.complete({ type: ToolConfirmKind.Denied });
                     source.cancel();
                 }));
                 store.add(source.token.onCancellationRequested(() => {
-                    toolInvocation?.confirmed.complete(false);
+                    toolInvocation?.confirmed.complete({ type: ToolConfirmKind.Denied });
                 }));
                 token = source.token;
                 const prepared = await this.prepareToolInvocation(tool, dto, token);
                 toolInvocation = ( new ChatToolInvocation(prepared, tool.data, dto.callId));
                 trackedCall.invocation = toolInvocation;
-                const autoConfirmed = this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace);
+                const autoConfirmed = await this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace);
                 if (autoConfirmed) {
-                    toolInvocation.confirmed.complete(true);
+                    toolInvocation.confirmed.complete(autoConfirmed);
                 }
                 model.acceptResponseProgress(request, toolInvocation);
                 dto.toolSpecificData = toolInvocation?.toolSpecificData;
                 if (prepared?.confirmationMessages) {
-                    if (!toolInvocation.isConfirmed && !autoConfirmed) {
+                    if (!toolInvocation.isConfirmed?.type && !autoConfirmed) {
                         this.playAccessibilitySignal([toolInvocation]);
                     }
                     const userConfirmed = await toolInvocation.confirmed.p;
-                    if (!userConfirmed) {
+                    if (userConfirmed.type === ToolConfirmKind.Denied) {
                         throw ( new CancellationError());
                     }
+                    if (userConfirmed.type === ToolConfirmKind.Skipped) {
+                        toolResult = {
+                            content: [{
+                                    kind: 'text',
+                                    value: 'The user chose to skip the tool call, they want to proceed without running it'
+                                }]
+                        };
+                        return toolResult;
+                    }
                     if (dto.toolSpecificData?.kind === 'input') {
                         dto.parameters = dto.toolSpecificData.rawInput;
                         dto.toolSpecificData = undefined;
@@ -243,7 +282,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             }
             else {
                 const prepared = await this.prepareToolInvocation(tool, dto, token);
-                if (prepared?.confirmationMessages && !this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace)) {
+                if (prepared?.confirmationMessages && !(await this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace))) {
                     const result = await this._dialogService.confirm({ message: renderAsPlaintext(prepared.confirmationMessages.title), detail: renderAsPlaintext(prepared.confirmationMessages.message) });
                     if (!result.confirmed) {
                         throw ( new CancellationError());
@@ -288,7 +327,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         }
         finally {
             toolInvocation?.complete(toolResult);
-            if (requestId && store) {
+            if (store) {
                 this.cleanupCallDisposables(requestId, store);
             }
         }
@@ -316,7 +355,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         return prepared;
     }
     playAccessibilitySignal(toolInvocations) {
-        const autoApproved = this._configurationService.getValue('chat.tools.autoApprove');
+        const autoApproved = this._configurationService.getValue(ChatConfiguration.GlobalAutoApprove);
         if (autoApproved) {
             return;
         }
@@ -357,11 +396,17 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             }
         }));
     }
-    shouldAutoConfirm(toolId, runsInWorkspace) {
-        if (this._workspaceToolConfirmStore.value.getAutoConfirm(toolId) || this._profileToolConfirmStore.value.getAutoConfirm(toolId) || ( this._memoryToolConfirmStore.has(toolId))) {
-            return true;
+    async shouldAutoConfirm(toolId, runsInWorkspace) {
+        if (this._workspaceToolConfirmStore.value.getAutoConfirm(toolId)) {
+            return { type: ToolConfirmKind.LmServicePerTool, scope: 'workspace' };
+        }
+        if (this._profileToolConfirmStore.value.getAutoConfirm(toolId)) {
+            return { type: ToolConfirmKind.LmServicePerTool, scope: 'profile' };
+        }
+        if (( this._memoryToolConfirmStore.has(toolId))) {
+            return { type: ToolConfirmKind.LmServicePerTool, scope: 'session' };
         }
-        const config = this._configurationService.inspect('chat.tools.autoApprove');
+        const config = this._configurationService.inspect(ChatConfiguration.GlobalAutoApprove);
         let value = config.value ?? config.defaultValue;
         if (typeof runsInWorkspace === 'boolean') {
             value = config.userLocalValue ?? config.applicationValue;
@@ -369,17 +414,58 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                 value = config.workspaceValue ?? config.workspaceFolderValue ?? config.userRemoteValue ?? value;
             }
         }
-        return value === true || (typeof value === 'object' && value.hasOwnProperty(toolId) && value[toolId] === true);
+        const autoConfirm = value === true || (typeof value === 'object' && value.hasOwnProperty(toolId) && value[toolId] === true);
+        if (autoConfirm) {
+            if (await this._checkGlobalAutoApprove()) {
+                return { type: ToolConfirmKind.Setting, id: ChatConfiguration.GlobalAutoApprove };
+            }
+        }
+        return undefined;
     }
-    cleanupCallDisposables(requestId, store) {
-        const disposables = this._callsByRequestId.get(requestId);
-        if (disposables) {
-            const index = disposables.findIndex(d => d.store === store);
-            if (index > -1) {
-                disposables.splice(index, 1);
+    async _checkGlobalAutoApprove() {
+        const optedIn = this._storageService.getBoolean(AutoApproveStorageKeys.GlobalAutoApproveOptIn, StorageScope.APPLICATION, false);
+        if (optedIn) {
+            return true;
+        }
+        const promptResult = await this._dialogService.prompt({
+            type: Severity.Warning,
+            message: ( localize(5357, 'Enable global auto approve?')),
+            buttons: [
+                {
+                    label: ( localize(5358, 'Enable')),
+                    run: () => true
+                },
+                {
+                    label: ( localize(5359, 'Disable')),
+                    run: () => false
+                },
+            ],
+            custom: {
+                icon: Codicon.warning,
+                disableCloseAction: true,
+                markdownDetails: [{
+                        markdown: ( new MarkdownString(globalAutoApproveDescription.value)),
+                    }],
             }
-            if (disposables.length === 0) {
-                this._callsByRequestId.delete(requestId);
+        });
+        if (promptResult.result !== true) {
+            await this._configurationService.updateValue(ChatConfiguration.GlobalAutoApprove, false);
+            return false;
+        }
+        this._storageService.store(AutoApproveStorageKeys.GlobalAutoApproveOptIn, true, StorageScope.APPLICATION, StorageTarget.USER);
+        return true;
+    }
+    cleanupCallDisposables(requestId, store) {
+        if (requestId) {
+            const disposables = this._callsByRequestId.get(requestId);
+            if (disposables) {
+                const index = disposables.findIndex(d => d.store === store);
+                if (index > -1) {
+                    disposables.splice(index, 1);
+                }
+                if (disposables.length === 0) {
+                    this._callsByRequestId.delete(requestId);
+                }
             }
         }
         store.dispose();
@@ -411,22 +497,18 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         return result;
     }
     toToolAndToolSetEnablementMap(enabledToolOrToolSetNames) {
-        const toolOrToolSetNames = enabledToolOrToolSetNames ? ( new Set(enabledToolOrToolSetNames)) : undefined;
+        const toolOrToolSetNames = ( new Set(enabledToolOrToolSetNames));
         const result = ( new Map());
         for (const tool of this.getTools()) {
             if (tool.canBeReferencedInPrompt) {
-                result.set(tool, toolOrToolSetNames === undefined || ( toolOrToolSetNames.has(tool.toolReferenceName ?? tool.displayName)));
+                result.set(tool, ( toolOrToolSetNames.has(tool.toolReferenceName ?? tool.displayName)));
             }
         }
         for (const toolSet of this._toolSets) {
-            const enabled = toolOrToolSetNames === undefined || ( toolOrToolSetNames.has(toolSet.referenceName));
+            const enabled = ( toolOrToolSetNames.has(toolSet.referenceName));
             result.set(toolSet, enabled);
-            if (enabled && toolSet.source.type === 'mcp') {
-                for (const tool of toolSet.getTools()) {
-                    if (tool.canBeReferencedInPrompt) {
-                        result.set(tool, enabled);
-                    }
-                }
+            for (const tool of toolSet.getTools()) {
+                result.set(tool, enabled || toolOrToolSetNames?.has(tool.toolReferenceName ?? tool.displayName));
             }
         }
         return result;
@@ -471,7 +553,8 @@ LanguageModelToolsService = ( __decorate([
     ( __param(6, ILogService)),
     ( __param(7, IConfigurationService)),
     ( __param(8, IAccessibilityService)),
-    ( __param(9, IAccessibilitySignalService))
+    ( __param(9, IAccessibilitySignalService)),
+    ( __param(10, IStorageService))
 ], LanguageModelToolsService));
 let ToolConfirmStore = class ToolConfirmStore extends Disposable {
     static { ToolConfirmStore_1 = this; }
@@ -520,4 +603,4 @@ ToolConfirmStore = ToolConfirmStore_1 = ( __decorate([
     ( __param(1, IStorageService))
 ], ToolConfirmStore));
 
-export { LanguageModelToolsService };
+export { LanguageModelToolsService, globalAutoApproveDescription };

package/vscode/src/vs/workbench/contrib/chat/browser/media/apple-dark.svg

@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.15673 3C8.7435 3 9.47904 2.60331 9.91706 2.07438C10.3137 1.59504 10.603 0.92562 10.603 0.256199C10.603 0.165289 10.5947 0.0743802 10.5782 0C9.92532 0.0247934 9.1402 0.438017 8.66912 0.991736C8.29722 1.41322 7.95838 2.07438 7.95838 2.75207C7.95838 2.85124 7.97491 2.95041 7.98317 2.98347C8.0245 2.99174 8.09061 3 8.15673 3ZM6.09061 13C6.89226 13 7.24764 12.4628 8.24764 12.4628C9.26417 12.4628 9.48731 12.9835 10.3798 12.9835C11.2559 12.9835 11.8427 12.1736 12.3964 11.3802C13.0162 10.4711 13.2724 9.57851 13.2889 9.53719C13.2311 9.52066 11.5534 8.83471 11.5534 6.90909C11.5534 5.23967 12.8757 4.4876 12.9501 4.42975C12.0741 3.17355 10.7435 3.1405 10.3798 3.1405C9.3964 3.1405 8.59474 3.73554 8.09061 3.73554C7.54516 3.73554 6.82615 3.17355 5.97491 3.17355C4.35507 3.17355 2.71045 4.5124 2.71045 7.04132C2.71045 8.61157 3.32202 10.2727 4.07408 11.3471C4.71871 12.2562 5.28069 13 6.09061 13Z" fill="white"/>
+<path d="M8.19299 3.69231C8.91408 3.69231 9.818 3.20407 10.3563 2.55308C10.8437 1.96313 11.1993 1.13922 11.1993 0.315322C11.1993 0.203433 11.1891 0.0915449 11.1688 0C10.3664 0.030515 9.40159 0.539098 8.82268 1.2206C8.36564 1.73935 7.94924 2.55308 7.94924 3.38716C7.94924 3.50922 7.96955 3.63127 7.9797 3.67196C8.0305 3.68214 8.11174 3.69231 8.19299 3.69231ZM5.65392 16C6.63907 16 7.0758 15.3388 8.30472 15.3388C9.55394 15.3388 9.82816 15.9797 10.925 15.9797C12.0016 15.9797 12.7227 14.9829 13.4032 14.0064C14.1649 12.8875 14.4797 11.7889 14.5 11.7381C14.429 11.7177 12.3672 10.8735 12.3672 8.5035C12.3672 6.44883 13.9922 5.5232 14.0836 5.452C13.0071 3.90591 11.3719 3.86523 10.925 3.86523C9.71644 3.86523 8.73127 4.59759 8.11174 4.59759C7.44143 4.59759 6.55783 3.90591 5.51173 3.90591C3.52109 3.90591 1.5 5.55372 1.5 8.66624C1.5 10.5989 2.25157 12.6433 3.17578 13.9657C3.96797 15.0846 4.6586 16 5.65392 16Z" fill="white"/>
 </svg>