@codingame/monaco-vscode-chat-service-override 15.0.2 → 16.0.0

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

@@ -0,0 +1,19 @@
+import { IChatStatusItemService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatStatusItemService.service";
+export interface IChatStatusItemChangeEvent {
+    readonly entry: ChatStatusEntry;
+}
+export type ChatStatusEntry = {
+    id: string;
+    label: string;
+    description: string;
+    detail: string | undefined;
+};
+export declare class ChatStatusItemService implements IChatStatusItemService {
+    readonly _serviceBrand: undefined;
+    private readonly _entries;
+    private readonly _onDidChange;
+    readonly onDidChange: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<IChatStatusItemChangeEvent>;
+    setOrUpdateEntry(entry: ChatStatusEntry): void;
+    deleteEntry(id: string): void;
+    getEntries(): Iterable<ChatStatusEntry>;
+}

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

@@ -0,0 +1,27 @@
+
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+
+class ChatStatusItemService {
+    constructor() {
+        this._entries = ( new Map());
+        this._onDidChange = ( new Emitter());
+        this.onDidChange = this._onDidChange.event;
+    }
+    setOrUpdateEntry(entry) {
+        const isUpdate = ( this._entries.has(entry.id));
+        this._entries.set(entry.id, entry);
+        if (isUpdate) {
+            this._onDidChange.fire({ entry });
+        }
+    }
+    deleteEntry(id) {
+        this._entries.delete(id);
+    }
+    getEntries() {
+        return ( this._entries.values());
+    }
+}
+
+export { ChatStatusItemService };

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

@@ -1,17 +1,19 @@
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { Location } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
-import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
 import { IChatRequestVariableData, IChatRequestVariableEntry } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
 import { IParsedChatRequest } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
 import { IDynamicVariable } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables";
 import { IChatVariablesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.service";
+import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export declare class ChatVariablesService implements IChatVariablesService {
     private readonly chatWidgetService;
     private readonly viewsService;
+    private readonly configurationService;
     _serviceBrand: undefined;
-    constructor(chatWidgetService: IChatWidgetService, viewsService: IViewsService);
+    constructor(chatWidgetService: IChatWidgetService, viewsService: IViewsService, configurationService: IConfigurationService);
     resolveVariables(prompt: IParsedChatRequest, attachedContextVariables: IChatRequestVariableEntry[] | undefined): IChatRequestVariableData;
     getDynamicVariables(sessionId: string): ReadonlyArray<IDynamicVariable>;
     attachContext(name: string, value: string | URI | Location, location: ChatAgentLocation): Promise<void>;

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

@@ -2,17 +2,19 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 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 { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { ChatRequestDynamicVariablePart, ChatRequestToolPart } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatAgentLocation, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { showEditsView, showChatView } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 
 let ChatVariablesService = class ChatVariablesService {
-    constructor(chatWidgetService, viewsService) {
+    constructor(chatWidgetService, viewsService, configurationService) {
         this.chatWidgetService = chatWidgetService;
         this.viewsService = viewsService;
+        this.configurationService = configurationService;
     }
     resolveVariables(prompt, attachedContextVariables) {
         let resolvedVariables = [];
@@ -46,7 +48,8 @@ let ChatVariablesService = class ChatVariablesService {
         if (location !== ChatAgentLocation.Panel && location !== ChatAgentLocation.EditingSession) {
             return;
         }
-        const widget = location === ChatAgentLocation.EditingSession
+        const unifiedViewEnabled = !!this.configurationService.getValue(ChatConfiguration.UnifiedChatView);
+        const widget = location === ChatAgentLocation.EditingSession && !unifiedViewEnabled
             ? await showEditsView(this.viewsService)
             : (this.chatWidgetService.lastFocusedWidget ?? (await showChatView(this.viewsService)));
         if (!widget || !widget.viewModel) {
@@ -56,14 +59,19 @@ let ChatVariablesService = class ChatVariablesService {
         if (key === 'file' && typeof value !== 'string') {
             const uri = URI.isUri(value) ? value : value.uri;
             const range = 'range' in value ? value.range : undefined;
-            widget.attachmentModel.addFile(uri, range);
+            await widget.attachmentModel.addFile(uri, range);
+            return;
+        }
+        if (key === 'folder' && URI.isUri(value)) {
+            widget.attachmentModel.addFolder(value);
             return;
         }
     }
 };
 ChatVariablesService = ( __decorate([
     ( __param(0, IChatWidgetService)),
-    ( __param(1, IViewsService))
+    ( __param(1, IViewsService)),
+    ( __param(2, IConfigurationService))
 ], ChatVariablesService));
 
 export { ChatVariablesService };

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

@@ -22,7 +22,7 @@ import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codinga
 import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { ChatWidget } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
+import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 
 const decorationDescription = 'chat';
 const placeholderDecorationType = 'chat-session-detail';
@@ -99,7 +99,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
             return;
         }
         if (!inputValue) {
-            const defaultAgent = this.chatAgentService.getDefaultAgent(this.widget.location);
+            const defaultAgent = this.chatAgentService.getDefaultAgent(this.widget.location, this.widget.input.currentMode);
             const decoration = [
                 {
                     range: {
@@ -258,7 +258,7 @@ let ChatTokenDeleter = class ChatTokenDeleter extends Disposable {
             }
             const change = e.changes[0];
             if (!change.text && this.widget.viewModel) {
-                const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent });
+                const previousParsedValue = parser.parseChatRequest(this.widget.viewModel.sessionId, previousInputValue, widget.location, { selectedAgent: previousSelectedAgent, mode: this.widget.input.currentMode });
                 const deletableTokens = previousParsedValue.parts.filter(p => p instanceof ChatRequestAgentPart || p instanceof ChatRequestAgentSubcommandPart || p instanceof ChatRequestSlashCommandPart || p instanceof ChatRequestToolPart);
                 deletableTokens.forEach(token => {
                     const deletedRangeOfToken = Range.intersectRanges(token.editorRange, change.range);

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

@@ -5,7 +5,7 @@ import { HoverAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHover
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatAgentData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { IChatAgentData } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatAgents";
 export declare class ChatAgentHoverParticipant implements IEditorHoverParticipant<ChatAgentHoverPart> {
     private readonly editor;
     private readonly instantiationService;

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(4788, 'There is a chat agent hover part here.');
+        return localize(4902, 'There is a chat agent hover part here.');
     }
 };
 ChatAgentHoverParticipant = ( __decorate([

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

@@ -1,4 +1,4 @@
-import { IHoverAction } from "@codingame/monaco-vscode-view-status-bar-service-override/vscode/vs/base/browser/ui/hover/hover";
+import { IHoverAction } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hover";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 export declare class ChatEditorHoverWrapper {
     private readonly keybindingService;

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import './media/editorHoverWrapper.css.js';
+import './media/editorHoverWrapper.css';
 import { $ as $$1, h as h$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/media/editorHoverWrapper.css

@@ -0,0 +1,3 @@
+.chat-editor-hover-wrapper-content {
+	padding: 2px 8px;
+}

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

@@ -1,7 +1,10 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
+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";
 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 { 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";
@@ -9,20 +12,27 @@ import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { CountTokensCallback, IToolData, IToolImpl, IToolInvocation, IToolResult } 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 class LanguageModelToolsService extends Disposable implements ILanguageModelToolsService {
+    private readonly _instantiationService;
     private readonly _extensionService;
     private readonly _contextKeyService;
     private readonly _chatService;
     private readonly _dialogService;
     private readonly _telemetryService;
     private readonly _logService;
+    private readonly _configurationService;
+    private readonly _accessibilityService;
     _serviceBrand: undefined;
     private _onDidChangeTools;
     readonly onDidChangeTools: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     private _onDidChangeToolsScheduler;
     private _tools;
     private _toolContextKeys;
+    private readonly _ctxToolsCount;
     private _callsByRequestId;
-    constructor(_extensionService: IExtensionService, _contextKeyService: IContextKeyService, _chatService: IChatService, _dialogService: IDialogService, _telemetryService: ITelemetryService, _logService: ILogService);
+    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);
     registerToolData(toolData: IToolData): IDisposable;
     private _refreshAllToolContextKeys;
     registerToolImplementation(id: string, tool: IToolImpl): IDisposable;
@@ -30,7 +40,13 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     getTool(id: string): IToolData | undefined;
     private _getToolEntry;
     getToolByName(name: string): IToolData | undefined;
+    setToolAutoConfirmation(toolId: string, scope: "workspace" | "profile" | "memory", autoConfirm?: boolean): void;
+    resetToolAutoConfirmation(): void;
     invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
+    private prepareToolInvocation;
+    private ensureToolDetails;
+    private toolResultToString;
+    private shouldAutoConfirm;
     private cleanupCallDisposables;
     cancelToolCallsForRequest(requestId: string): void;
     dispose(): void;

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

@@ -3,48 +3,95 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { renderStringAsPlaintext } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/markdownRenderer';
 import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+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 { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
-import { Disposable, toDisposable, DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
+import { Disposable, DisposableStore, toDisposable, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { LRUCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+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 { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
+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';
 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 { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+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 { 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 { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatToolInvocation } from '../common/chatProgressTypes/chatToolInvocation.js';
 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 { stringifyPromptTsxPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 
+var ToolConfirmStore_1;
+const jsonSchemaRegistry = ( Registry.as(Extensions.JSONContribution));
 let LanguageModelToolsService = class LanguageModelToolsService extends Disposable {
-    constructor(_extensionService, _contextKeyService, _chatService, _dialogService, _telemetryService, _logService) {
+    constructor(_instantiationService, _extensionService, _contextKeyService, _chatService, _dialogService, _telemetryService, _logService, _configurationService, _accessibilityService) {
         super();
+        this._instantiationService = _instantiationService;
         this._extensionService = _extensionService;
         this._contextKeyService = _contextKeyService;
         this._chatService = _chatService;
         this._dialogService = _dialogService;
         this._telemetryService = _telemetryService;
         this._logService = _logService;
+        this._configurationService = _configurationService;
+        this._accessibilityService = _accessibilityService;
         this._onDidChangeTools = ( new Emitter());
         this.onDidChangeTools = this._onDidChangeTools.event;
         this._onDidChangeToolsScheduler = ( new RunOnceScheduler(() => this._onDidChangeTools.fire(), 750));
         this._tools = ( new Map());
         this._toolContextKeys = ( new Set());
         this._callsByRequestId = ( new Map());
+        this._memoryToolConfirmStore = ( new Set());
+        this._workspaceToolConfirmStore = ( new Lazy(
+            () => this._register(this._instantiationService.createInstance(ToolConfirmStore, StorageScope.WORKSPACE))
+        ));
+        this._profileToolConfirmStore = ( new Lazy(
+            () => this._register(this._instantiationService.createInstance(ToolConfirmStore, StorageScope.PROFILE))
+        ));
         this._register(this._contextKeyService.onDidChangeContext(e => {
             if (e.affectsSome(this._toolContextKeys)) {
                 this._onDidChangeToolsScheduler.schedule();
             }
         }));
+        this._register(this._configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(ChatConfiguration.ExtensionToolsEnabled)) {
+                this._onDidChangeToolsScheduler.schedule();
+            }
+        }));
+        this._ctxToolsCount = ChatContextKeys.Tools.toolsCount.bindTo(_contextKeyService);
     }
     registerToolData(toolData) {
         if (( this._tools.has(toolData.id))) {
             throw ( new Error(`Tool "${toolData.id}" is already registered.`));
         }
         this._tools.set(toolData.id, { data: toolData });
+        this._ctxToolsCount.set(this._tools.size);
         this._onDidChangeToolsScheduler.schedule();
         toolData.when?.keys().forEach(key => this._toolContextKeys.add(key));
+        let store;
+        if (toolData.inputSchema) {
+            store = ( new DisposableStore());
+            const schemaUrl = ( ( URI.from(
+                { scheme: Schemas.vscode, authority: 'schemas', path: `/lm/tool/${toolData.id}` }
+            )).toString());
+            jsonSchemaRegistry.registerSchema(schemaUrl, toolData.inputSchema, store);
+            store.add(jsonSchemaRegistry.registerSchemaAssociation(schemaUrl, `/lm/tool/${toolData.id}/tool_input.json`));
+        }
         return toDisposable(() => {
+            store?.dispose();
             this._tools.delete(toolData.id);
+            this._ctxToolsCount.set(this._tools.size);
             this._refreshAllToolContextKeys();
             this._onDidChangeToolsScheduler.schedule();
         });
@@ -70,7 +117,14 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
     }
     getTools() {
         const toolDatas = ( Iterable.map(( this._tools.values()), i => i.data));
-        return Iterable.filter(toolDatas, toolData => !toolData.when || this._contextKeyService.contextMatchesRules(toolData.when));
+        const extensionToolsEnabled = this._configurationService.getValue(ChatConfiguration.ExtensionToolsEnabled);
+        return Iterable.filter(toolDatas, toolData => {
+            const satisfiesWhenClause = !toolData.when || this._contextKeyService.contextMatchesRules(toolData.when);
+            const satisfiesExternalToolCheck = toolData.source.type === 'extension' && !extensionToolsEnabled ?
+                !toolData.source.isExternalTool :
+                true;
+            return satisfiesWhenClause && satisfiesExternalToolCheck;
+        });
     }
     getTool(id) {
         return this._getToolEntry(id)?.data;
@@ -92,6 +146,22 @@ 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);
+        }
+        else {
+            this._memoryToolConfirmStore.add(toolId);
+        }
+    }
+    resetToolAutoConfirmation() {
+        this._workspaceToolConfirmStore.value.reset();
+        this._profileToolConfirmStore.value.reset();
+        this._memoryToolConfirmStore.clear();
+    }
     async invokeTool(dto, countTokens, token) {
         this._logService.trace(`[LanguageModelToolsService#invokeTool] Invoking tool ${dto.toolId} with parameters ${JSON.stringify(dto.parameters)}`);
         let tool = this._tools.get(dto.toolId);
@@ -118,6 +188,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                 }
                 const request = model.getRequests().at(-1);
                 requestId = request.id;
+                dto.modelId = request.modelId;
                 if (!( this._callsByRequestId.has(requestId))) {
                     this._callsByRequestId.set(requestId, []);
                 }
@@ -134,23 +205,27 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                     toolInvocation?.confirmed.complete(false);
                 }));
                 token = source.token;
-                const prepared = tool.impl.prepareToolInvocation ?
-                    await tool.impl.prepareToolInvocation(dto.parameters, token)
-                    : undefined;
-                toolInvocation = ( new ChatToolInvocation(prepared, tool.data));
+                const prepared = await this.prepareToolInvocation(tool, dto, token);
+                toolInvocation = ( new ChatToolInvocation(prepared, tool.data, dto.callId));
+                if (this.shouldAutoConfirm(tool.data.id, tool.data.runsInWorkspace)) {
+                    toolInvocation.confirmed.complete(true);
+                }
                 model.acceptResponseProgress(request, toolInvocation);
                 if (prepared?.confirmationMessages) {
+                    this._accessibilityService.alert(( localize(4905, "Action required: {0}", prepared.confirmationMessages.title)));
                     const userConfirmed = await toolInvocation.confirmed.p;
                     if (!userConfirmed) {
                         throw ( new CancellationError());
                     }
                     dto.toolSpecificData = toolInvocation?.toolSpecificData;
+                    if (dto.toolSpecificData?.kind === 'input') {
+                        dto.parameters = dto.toolSpecificData.rawInput;
+                        dto.toolSpecificData = undefined;
+                    }
                 }
             }
             else {
-                const prepared = tool.impl.prepareToolInvocation ?
-                    await tool.impl.prepareToolInvocation(dto.parameters, token)
-                    : undefined;
+                const prepared = await this.prepareToolInvocation(tool, dto, token);
                 if (prepared?.confirmationMessages) {
                     const result = await this._dialogService.confirm({ message: prepared.confirmationMessages.title, detail: renderStringAsPlaintext(prepared.confirmationMessages.message) });
                     if (!result.confirmed) {
@@ -162,11 +237,13 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                 throw ( new CancellationError());
             }
             toolResult = await tool.impl.invoke(dto, countTokens, token);
+            this.ensureToolDetails(dto, toolResult, tool.data);
             this._telemetryService.publicLog2('languageModelToolInvoked', {
                 result: 'success',
                 chatSessionId: dto.context?.sessionId,
                 toolId: tool.data.id,
-                toolExtensionId: tool.data.extensionId?.value,
+                toolExtensionId: tool.data.source.type === 'extension' ? tool.data.source.extensionId.value : undefined,
+                toolSourceKind: tool.data.source.type,
             });
             return toolResult;
         }
@@ -176,8 +253,10 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                 result,
                 chatSessionId: dto.context?.sessionId,
                 toolId: tool.data.id,
-                toolExtensionId: tool.data.extensionId?.value,
+                toolExtensionId: tool.data.source.type === 'extension' ? tool.data.source.extensionId.value : undefined,
+                toolSourceKind: tool.data.source.type,
             });
+            this._logService.error(`[LanguageModelToolsService#invokeTool] Error from tool ${dto.toolId}: ${toErrorMessage(err)}. With parameters ${JSON.stringify(dto.parameters)}`);
             throw err;
         }
         finally {
@@ -187,6 +266,76 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             }
         }
     }
+    async prepareToolInvocation(tool, dto, token) {
+        let prepared = tool.impl.prepareToolInvocation ?
+            await tool.impl.prepareToolInvocation(dto.parameters, token)
+            : undefined;
+        if (!prepared?.confirmationMessages && tool.data.requiresConfirmation && tool.data.source.type === 'extension') {
+            if (!prepared) {
+                prepared = {};
+            }
+            const toolWarning = ( localize(
+                4906,
+                "{0} This tool is from the extension `{1}`. Please carefully review any requested actions.",
+                '$(info)',
+                tool.data.source.extensionId.value
+            ));
+            prepared.confirmationMessages = {
+                title: ( localize(4907, "Run {0}", `"${tool.data.displayName}"`)),
+                message: ( new MarkdownString(
+                    (tool.data.userDescription ?? tool.data.modelDescription) + '\n\n' + toolWarning,
+                    { supportThemeIcons: true }
+                )),
+                allowAutoConfirm: true,
+            };
+        }
+        if (prepared?.confirmationMessages) {
+            if (prepared.toolSpecificData?.kind !== 'terminal' && typeof prepared.confirmationMessages.allowAutoConfirm !== 'boolean') {
+                prepared.confirmationMessages.allowAutoConfirm = true;
+            }
+            if (!prepared.toolSpecificData && tool.data.alwaysDisplayInputOutput) {
+                prepared.toolSpecificData = {
+                    kind: 'input',
+                    rawInput: dto.parameters,
+                };
+            }
+        }
+        return prepared;
+    }
+    ensureToolDetails(dto, toolResult, toolData) {
+        if (!toolResult.toolResultDetails && toolData.alwaysDisplayInputOutput) {
+            toolResult.toolResultDetails = {
+                input: JSON.stringify(dto.parameters, undefined, 2),
+                output: this.toolResultToString(toolResult),
+            };
+        }
+    }
+    toolResultToString(toolResult) {
+        const strs = [];
+        for (const part of toolResult.content) {
+            if (part.kind === 'text') {
+                strs.push(part.value);
+            }
+            else if (part.kind === 'promptTsx') {
+                strs.push(stringifyPromptTsxPart(part));
+            }
+        }
+        return strs.join('');
+    }
+    shouldAutoConfirm(toolId, runsInWorkspace) {
+        if (this._workspaceToolConfirmStore.value.getAutoConfirm(toolId) || this._profileToolConfirmStore.value.getAutoConfirm(toolId) || ( this._memoryToolConfirmStore.has(toolId))) {
+            return true;
+        }
+        const config = this._configurationService.inspect('chat.tools.autoApprove');
+        let value = config.value ?? config.defaultValue;
+        if (typeof runsInWorkspace === 'boolean') {
+            value = config.userLocalValue ?? config.applicationValue;
+            if (runsInWorkspace) {
+                value = config.workspaceValue ?? config.workspaceFolderValue ?? config.userRemoteValue ?? value;
+            }
+        }
+        return value === true || (typeof value === 'object' && value.hasOwnProperty(toolId) && value[toolId] === true);
+    }
     cleanupCallDisposables(requestId, store) {
         const disposables = this._callsByRequestId.get(requestId);
         if (disposables) {
@@ -210,15 +359,65 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
     dispose() {
         super.dispose();
         this._callsByRequestId.forEach(calls => dispose(calls));
+        this._ctxToolsCount.reset();
     }
 };
 LanguageModelToolsService = ( __decorate([
-    ( __param(0, IExtensionService)),
-    ( __param(1, IContextKeyService)),
-    ( __param(2, IChatService)),
-    ( __param(3, IDialogService)),
-    ( __param(4, ITelemetryService)),
-    ( __param(5, ILogService))
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IExtensionService)),
+    ( __param(2, IContextKeyService)),
+    ( __param(3, IChatService)),
+    ( __param(4, IDialogService)),
+    ( __param(5, ITelemetryService)),
+    ( __param(6, ILogService)),
+    ( __param(7, IConfigurationService)),
+    ( __param(8, IAccessibilityService))
 ], LanguageModelToolsService));
+let ToolConfirmStore = class ToolConfirmStore extends Disposable {
+    static { ToolConfirmStore_1 = this; }
+    static { this.STORED_KEY = 'chat/autoconfirm'; }
+    constructor(_scope, storageService) {
+        super();
+        this._scope = _scope;
+        this.storageService = storageService;
+        this._autoConfirmTools = ( new LRUCache(100));
+        this._didChange = false;
+        const stored = storageService.getObject(ToolConfirmStore_1.STORED_KEY, this._scope);
+        if (stored) {
+            for (const key of stored) {
+                this._autoConfirmTools.set(key, true);
+            }
+        }
+        this._register(storageService.onWillSaveState(() => {
+            if (this._didChange) {
+                this.storageService.store(ToolConfirmStore_1.STORED_KEY, [...( this._autoConfirmTools.keys())], this._scope, StorageTarget.MACHINE);
+                this._didChange = false;
+            }
+        }));
+    }
+    reset() {
+        this._autoConfirmTools.clear();
+        this._didChange = true;
+    }
+    getAutoConfirm(toolId) {
+        if (this._autoConfirmTools.get(toolId)) {
+            this._didChange = true;
+            return true;
+        }
+        return false;
+    }
+    setAutoConfirm(toolId, autoConfirm) {
+        if (autoConfirm) {
+            this._autoConfirmTools.set(toolId, true);
+        }
+        else {
+            this._autoConfirmTools.delete(toolId);
+        }
+        this._didChange = true;
+    }
+};
+ToolConfirmStore = ToolConfirmStore_1 = ( __decorate([
+    ( __param(1, IStorageService))
+], ToolConfirmStore));
 
 export { LanguageModelToolsService };