@codingame/monaco-vscode-chat-service-override 13.1.6 → 14.0.0

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

@@ -4,8 +4,8 @@ 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 { 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 { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
+import { IChatModel, IChatRequestVariableData, IChatRequestVariableEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
 import { IChatRequestVariableValue, IChatVariableData, IChatVariableResolver, IChatVariableResolverProgress, 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 { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";

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

@@ -8,8 +8,8 @@ import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/th
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 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 { ChatRequestVariablePart, ChatRequestDynamicVariablePart, ChatRequestToolPart } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { showEditsView, showChatView } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatRequestVariablePart, ChatRequestDynamicVariablePart, ChatRequestToolPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { showEditsView, showChatView } from '@codingame/monaco-vscode-api/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';
 

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

@@ -30,15 +30,15 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quic
 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-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
-import { Memento } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/common/memento';
+import { Memento } from '@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common/vscode/vs/workbench/common/memento';
 import { SIDE_BAR_FOREGROUND } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/theme';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatModelInitState } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel';
-import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatModelInitState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { CHAT_PROVIDER_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParticipantContribTypes';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { SetupWelcomeViewKeys, SetupWelcomeViewCondition } from './chatSetup.js';
 import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import { ChatViewWelcomeController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewWelcomeController';
 
@@ -86,7 +86,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
             this._onDidChangeViewWelcomeState.fire();
         }));
         this._register(this.contextKeyService.onDidChangeContext(e => {
-            if (e.affectsSome(SetupWelcomeViewKeys)) {
+            if (e.affectsSome(ChatContextKeys.SetupViewKeys)) {
                 this._onDidChangeViewWelcomeState.fire();
             }
         }));
@@ -113,7 +113,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
         this.updateActions();
     }
     shouldShowWelcome() {
-        const showSetup = this.contextKeyService.contextMatchesRules(SetupWelcomeViewCondition);
+        const showSetup = this.contextKeyService.contextMatchesRules(ChatContextKeys.SetupViewCondition);
         const noPersistedSessions = !this.chatService.hasSessions();
         const shouldShow = this.didUnregisterProvider || !this._widget?.viewModel && noPersistedSessions || this.defaultParticipantRegistrationFailed || showSetup;
         this.logService.trace(`ChatViewPane#shouldShowWelcome(${this.chatOptions.location}) = ${shouldShow}: didUnregister=${this.didUnregisterProvider} || noViewModel:${!this._widget?.viewModel} && noPersistedSessions=${noPersistedSessions} || defaultParticipantRegistrationFailed=${this.defaultParticipantRegistrationFailed} || showSetup=${showSetup}`);
@@ -151,6 +151,7 @@ let ChatViewPane = class ChatViewPane extends ViewPane {
                 },
                 enableImplicitContext: this.chatOptions.location === ChatAgentLocation.Panel,
                 editorOverflowWidgetsDomNode: editorOverflowNode,
+                enableWorkingSet: this.chatOptions.location === ChatAgentLocation.EditingSession ? 'explicit' : undefined
             }, {
                 listForeground: SIDE_BAR_FOREGROUND,
                 listBackground: locationBasedColors.background,

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

@@ -1,5 +1,5 @@
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ICodeBlockActionContextProvider } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chat";
+import { ICodeBlockActionContextProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatCodeBlockContextProviderService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
 export declare class ChatCodeBlockContextProviderService implements IChatCodeBlockContextProviderService {
     _serviceBrand: undefined;

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

@@ -21,7 +21,7 @@ import { ChatWidget } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0
 import { dynamicVariableDecorationType } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { chatSlashCommandBackground, chatSlashCommandForeground } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/common/chatColors';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestSlashCommandPart, ChatRequestTextPart, ChatRequestVariablePart, ChatRequestToolPart, chatAgentLeader, chatSubcommandLeader } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { ChatRequestParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 
 const decorationDescription = 'chat';

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

@@ -8,7 +8,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatAgentHover, getChatAgentHoverOptions } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
 import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
-import { extractAgentAndCommand } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { extractAgentAndCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
 let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
@@ -58,7 +58,7 @@ let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(4590, 'There is a chat agent hover part here.');
+        return localize(4702, 'There is a chat agent hover part here.');
     }
 };
 ChatAgentHoverParticipant = ( __decorate([

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

@@ -4,6 +4,10 @@ import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { WorkingSetEntryState, WorkingSetEntryRemovalReason, ChatEditingSessionChangeType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
@@ -16,10 +20,12 @@ let ChatRelatedFilesContribution = class ChatRelatedFilesContribution extends Di
         this.chatEditingService = chatEditingService;
         this.chatWidgetService = chatWidgetService;
         this.chatEditingSessionDisposables = ( new DisposableStore());
-        this._handleNewEditingSession();
-        this._register(this.chatEditingService.onDidCreateEditingSession(() => {
+        this._register(autorun(r => {
             this.chatEditingSessionDisposables.clear();
-            this._handleNewEditingSession();
+            const session = this.chatEditingService.currentEditingSessionObs.read(r);
+            if (session) {
+                this._handleNewEditingSession(session);
+            }
         }));
     }
     _updateRelatedFileSuggestions() {
@@ -65,18 +71,14 @@ let ChatRelatedFilesContribution = class ChatRelatedFilesContribution extends Di
             }
             currentEditingSession?.remove(WorkingSetEntryRemovalReason.Programmatic, ...existingSuggestedEntriesToRemove);
             for (const [uri, data] of newSuggestions) {
-                currentEditingSession.addFileToWorkingSet(uri, ( localize(4591, "{0} (Suggested)", data.description)), WorkingSetEntryState.Suggested);
+                currentEditingSession.addFileToWorkingSet(uri, ( localize(4703, "{0} (Suggested)", data.description)), WorkingSetEntryState.Suggested);
             }
         })
             .finally(() => {
             this._currentRelatedFilesRetrievalOperation = undefined;
         });
     }
-    _handleNewEditingSession() {
-        const currentEditingSession = this.chatEditingService.currentEditingSessionObs.get();
-        if (!currentEditingSession) {
-            return;
-        }
+    _handleNewEditingSession(currentEditingSession) {
         const widget = this.chatWidgetService.getWidgetBySessionId(currentEditingSession.chatSessionId);
         if (!widget || widget.viewModel?.sessionId !== currentEditingSession.chatSessionId) {
             return;

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

@@ -2,6 +2,7 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 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 { 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";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
@@ -13,13 +14,15 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     private readonly _chatService;
     private readonly _dialogService;
     private readonly _telemetryService;
+    private readonly _logService;
     _serviceBrand: undefined;
     private _onDidChangeTools;
     readonly onDidChangeTools: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
     private _onDidChangeToolsScheduler;
     private _tools;
     private _toolContextKeys;
-    constructor(_extensionService: IExtensionService, _contextKeyService: IContextKeyService, _chatService: IChatService, _dialogService: IDialogService, _telemetryService: ITelemetryService);
+    private _callsByRequestId;
+    constructor(_extensionService: IExtensionService, _contextKeyService: IContextKeyService, _chatService: IChatService, _dialogService: IDialogService, _telemetryService: ITelemetryService, _logService: ILogService);
     registerToolData(toolData: IToolData): IDisposable;
     private _refreshAllToolContextKeys;
     registerToolImplementation(id: string, tool: IToolImpl): IDisposable;
@@ -28,4 +31,7 @@ export declare class LanguageModelToolsService extends Disposable implements ILa
     private _getToolEntry;
     getToolByName(name: string): IToolData | undefined;
     invokeTool(dto: IToolInvocation, countTokens: CountTokensCallback, token: CancellationToken): Promise<IToolResult>;
+    private cleanupCallDisposables;
+    cancelToolCallsForRequest(requestId: string): void;
+    dispose(): void;
 }

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

@@ -2,31 +2,35 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 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 { 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 { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
-import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, toDisposable, DisposableStore, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 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 { 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';
 import { ChatToolInvocation } from '../common/chatProgressTypes/chatToolInvocation.js';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 
 let LanguageModelToolsService = class LanguageModelToolsService extends Disposable {
-    constructor(_extensionService, _contextKeyService, _chatService, _dialogService, _telemetryService) {
+    constructor(_extensionService, _contextKeyService, _chatService, _dialogService, _telemetryService, _logService) {
         super();
         this._extensionService = _extensionService;
         this._contextKeyService = _contextKeyService;
         this._chatService = _chatService;
         this._dialogService = _dialogService;
         this._telemetryService = _telemetryService;
+        this._logService = _logService;
         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._register(this._contextKeyService.onDidChangeContext(e => {
             if (e.affectsSome(this._toolContextKeys)) {
                 this._onDidChangeToolsScheduler.schedule();
@@ -90,6 +94,7 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         return undefined;
     }
     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);
         if (!tool) {
             throw ( new Error(`Tool ${dto.toolId} was not contributed`));
@@ -102,24 +107,51 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
             }
         }
         let toolInvocation;
+        let requestId;
+        let store;
         try {
             if (dto.context) {
+                store = ( new DisposableStore());
                 const model = this._chatService.getSession(dto.context?.sessionId);
+                if (!model) {
+                    throw ( new Error(`Tool called for unknown chat session`));
+                }
                 const request = model.getRequests().at(-1);
+                requestId = request.id;
+                if (!( this._callsByRequestId.has(requestId))) {
+                    this._callsByRequestId.set(requestId, []);
+                }
+                this._callsByRequestId.get(requestId).push(store);
+                const source = ( new CancellationTokenSource());
+                store.add(toDisposable(() => {
+                    source.dispose(true);
+                }));
+                store.add(token.onCancellationRequested(() => {
+                    toolInvocation?.confirmed.complete(false);
+                    source.cancel();
+                }));
+                store.add(source.token.onCancellationRequested(() => {
+                    toolInvocation?.confirmed.complete(false);
+                }));
+                token = source.token;
                 const prepared = tool.impl.prepareToolInvocation ?
                     await tool.impl.prepareToolInvocation(dto.parameters, token)
                     : undefined;
-                const defaultMessage = ( localize(4593, "Using {0}", `"${tool.data.displayName}"`));
+                const defaultMessage = ( localize(4705, "Using {0}", `"${tool.data.displayName}"`));
                 const invocationMessage = prepared?.invocationMessage ?? defaultMessage;
-                toolInvocation = ( new ChatToolInvocation(invocationMessage, prepared?.confirmationMessages));
-                token.onCancellationRequested(() => {
-                    toolInvocation.confirmed.complete(false);
-                });
-                model.acceptResponseProgress(request, toolInvocation);
-                if (prepared?.confirmationMessages) {
-                    const userConfirmed = await toolInvocation.confirmed.p;
-                    if (!userConfirmed) {
-                        throw ( new CancellationError());
+                if (tool.data.id !== 'vscode_editFile') {
+                    toolInvocation = ( new ChatToolInvocation(
+                        invocationMessage,
+                        prepared?.pastTenseMessage,
+                        prepared?.tooltip,
+                        prepared?.confirmationMessages
+                    ));
+                    model.acceptResponseProgress(request, toolInvocation);
+                    if (prepared?.confirmationMessages) {
+                        const userConfirmed = await toolInvocation.confirmed.p;
+                        if (!userConfirmed) {
+                            throw ( new CancellationError());
+                        }
                     }
                 }
             }
@@ -134,6 +166,9 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
                     }
                 }
             }
+            if (token.isCancellationRequested) {
+                throw ( new CancellationError());
+            }
             const result = await tool.impl.invoke(dto, countTokens, token);
             this._telemetryService.publicLog2('languageModelToolInvoked', {
                 result: 'success',
@@ -155,15 +190,43 @@ let LanguageModelToolsService = class LanguageModelToolsService extends Disposab
         }
         finally {
             toolInvocation?.isCompleteDeferred.complete();
+            if (requestId && store) {
+                this.cleanupCallDisposables(requestId, store);
+            }
         }
     }
+    cleanupCallDisposables(requestId, store) {
+        const disposables = this._callsByRequestId.get(requestId);
+        if (disposables) {
+            const index = disposables.indexOf(store);
+            if (index > -1) {
+                disposables.splice(index, 1);
+            }
+            if (disposables.length === 0) {
+                this._callsByRequestId.delete(requestId);
+            }
+        }
+        store.dispose();
+    }
+    cancelToolCallsForRequest(requestId) {
+        const calls = this._callsByRequestId.get(requestId);
+        if (calls) {
+            calls.forEach(call => call.dispose());
+            this._callsByRequestId.delete(requestId);
+        }
+    }
+    dispose() {
+        super.dispose();
+        this._callsByRequestId.forEach(calls => dispose(calls));
+    }
 };
 LanguageModelToolsService = ( __decorate([
     ( __param(0, IExtensionService)),
     ( __param(1, IContextKeyService)),
     ( __param(2, IChatService)),
     ( __param(3, IDialogService)),
-    ( __param(4, ITelemetryService))
+    ( __param(4, ITelemetryService)),
+    ( __param(5, ILogService))
 ], LanguageModelToolsService));
 
 export { LanguageModelToolsService };

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

@@ -1,6 +1,6 @@
 import n from '@codingame/monaco-vscode-api/external/rollup-plugin-styles/dist/runtime/inject-css';
 
-var css = ".chat-welcome-view .chat-setup-view{text-align:center;p{width:100%}.chat-features-container{background-color:var(--vscode-chat-requestBackground);border:1px solid var(--vscode-chat-requestBorder);border-radius:2px;text-align:initial}.chat-feature-container{align-items:center;display:flex;gap:6px;padding:5px 10px}.chat-feature-container .codicon[class*=codicon-]{font-size:16px}.codicon[class*=codicon-]{font-size:13px;line-height:1.4em;vertical-align:bottom}.button-container{padding-top:20px}.monaco-button-dropdown,.monaco-button-dropdown .monaco-text-button{width:100%}p>.monaco-button{display:inline-block;padding:4px 7px;text-align:center;width:100%}}";
+var css = ".chat-welcome-view .chat-setup-view{text-align:center;p{width:100%}.chat-features-container{background-color:var(--vscode-chat-requestBackground);border:1px solid var(--vscode-chat-requestBorder);border-radius:2px;display:flex;justify-content:center;text-align:initial}.chat-feature-container{align-items:center;display:flex;gap:6px;padding:5px 10px}.chat-feature-container .codicon[class*=codicon-]{font-size:16px}.codicon[class*=codicon-]{font-size:13px;line-height:1.4em;vertical-align:bottom}.button-container{padding-top:20px}.monaco-button-dropdown,.monaco-button-dropdown .monaco-text-button{width:100%}}";
 n(css,{});
 
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeHandler.js

@@ -13,7 +13,7 @@ import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-c465110a-57
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatViewsWelcome',
     jsonSchema: {
-        description: ( localize(4595, 'Contributes a welcome message to a chat view')),
+        description: ( localize(4709, 'Contributes a welcome message to a chat view')),
         type: 'array',
         items: {
             additionalProperties: false,
@@ -21,22 +21,22 @@ const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint
             properties: {
                 icon: {
                     type: 'string',
-                    description: ( localize(4596, 'The icon for the welcome message.')),
+                    description: ( localize(4710, 'The icon for the welcome message.')),
                 },
                 title: {
                     type: 'string',
-                    description: ( localize(4597, 'The title of the welcome message.')),
+                    description: ( localize(4711, 'The title of the welcome message.')),
                 },
                 content: {
                     type: 'string',
                     description: ( localize(
-                        4598,
+                        4712,
                         'The content of the welcome message. The first command link will be rendered as a button.'
                     )),
                 },
                 when: {
                     type: 'string',
-                    description: ( localize(4599, 'Condition when the welcome message is shown.')),
+                    description: ( localize(4713, 'Condition when the welcome message is shown.')),
                 }
             }
         },

package/vscode/src/vs/workbench/contrib/chat/common/chatCodeMapperService.d.ts

@@ -1,11 +1,8 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { DocumentContextItem, TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
-import { IChatAgentResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents";
+import { TextEdit } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
 import { ICodeMapperService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service";
-import { IChatResponseModel } from "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatContentReference } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
 export interface ICodeMapperResponse {
     textEdit: (resource: URI, textEdit: TextEdit[]) => void;
 }
@@ -14,31 +11,21 @@ export interface ICodeMapperCodeBlock {
     readonly resource: URI;
     readonly markdownBeforeBlock?: string;
 }
-export interface ConversationRequest {
-    readonly type: "request";
-    readonly message: string;
-}
-export interface ConversationResponse {
-    readonly type: "response";
-    readonly message: string;
-    readonly result?: IChatAgentResult;
-    readonly references?: DocumentContextItem[];
-}
 export interface ICodeMapperRequest {
     readonly codeBlocks: ICodeMapperCodeBlock[];
-    readonly conversation: (ConversationResponse | ConversationRequest)[];
+    readonly chatRequestId?: string;
+    readonly location?: string;
 }
 export interface ICodeMapperResult {
     readonly errorMessage?: string;
 }
 export interface ICodeMapperProvider {
+    readonly displayName: string;
     mapCode(request: ICodeMapperRequest, response: ICodeMapperResponse, token: CancellationToken): Promise<ICodeMapperResult | undefined>;
 }
 export declare class CodeMapperService implements ICodeMapperService {
     _serviceBrand: undefined;
-    private readonly providers;
+    readonly providers: ICodeMapperProvider[];
     registerCodeMapperProvider(handle: number, provider: ICodeMapperProvider): IDisposable;
     mapCode(request: ICodeMapperRequest, response: ICodeMapperResponse, token: CancellationToken): Promise<ICodeMapperResult | undefined>;
-    mapCodeFromResponse(responseModel: IChatResponseModel, response: ICodeMapperResponse, token: CancellationToken): Promise<ICodeMapperResult | undefined>;
 }
-export declare function getReferencesAsDocumentContext(res: readonly IChatContentReference[]): DocumentContextItem[];

package/vscode/src/vs/workbench/contrib/chat/common/chatCodeMapperService.js

@@ -1,10 +1,4 @@
 
-import { CharCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
-import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
-import { splitLinesIncludeSeparators } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
-import { isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { isLocation } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 
 class CodeMapperService {
     constructor() {
@@ -24,125 +18,13 @@ class CodeMapperService {
     async mapCode(request, response, token) {
         for (const provider of this.providers) {
             const result = await provider.mapCode(request, response, token);
-            if (result) {
-                return result;
+            if (token.isCancellationRequested) {
+                return undefined;
             }
+            return result;
         }
         return undefined;
     }
-    async mapCodeFromResponse(responseModel, response, token) {
-        const fenceLanguageRegex = /^`{3,}/;
-        const codeBlocks = [];
-        const currentBlock = [];
-        const markdownBeforeBlock = [];
-        let currentBlockUri = undefined;
-        let fence = undefined;
-        for (const lineOrUri of iterateLinesOrUris(responseModel)) {
-            if (isString(lineOrUri)) {
-                const fenceLanguageIdMatch = lineOrUri.match(fenceLanguageRegex);
-                if (fenceLanguageIdMatch) {
-                    if (fence !== undefined && fenceLanguageIdMatch[0] === fence) {
-                        fence = undefined;
-                        if (currentBlockUri) {
-                            codeBlocks.push({ code: currentBlock.join(''), resource: currentBlockUri, markdownBeforeBlock: markdownBeforeBlock.join('') });
-                            currentBlock.length = 0;
-                            markdownBeforeBlock.length = 0;
-                            currentBlockUri = undefined;
-                        }
-                    }
-                    else {
-                        fence = fenceLanguageIdMatch[0];
-                    }
-                }
-                else {
-                    if (fence !== undefined) {
-                        currentBlock.push(lineOrUri);
-                    }
-                    else {
-                        markdownBeforeBlock.push(lineOrUri);
-                    }
-                }
-            }
-            else {
-                currentBlockUri = lineOrUri;
-            }
-        }
-        const conversation = [];
-        for (const request of responseModel.session.getRequests()) {
-            const response = request.response;
-            if (!response || response === responseModel) {
-                break;
-            }
-            conversation.push({
-                type: 'request',
-                message: request.message.text
-            });
-            conversation.push({
-                type: 'response',
-                message: response.response.getMarkdown(),
-                result: response.result,
-                references: getReferencesAsDocumentContext(response.contentReferences)
-            });
-        }
-        return this.mapCode({ codeBlocks, conversation }, response, token);
-    }
-}
-function iterateLinesOrUris(responseModel) {
-    return {
-        *[Symbol.iterator]() {
-            let lastIncompleteLine = undefined;
-            for (const part of responseModel.response.value) {
-                if (part.kind === 'markdownContent' || part.kind === 'markdownVuln') {
-                    const lines = splitLinesIncludeSeparators(part.content.value);
-                    if (lines.length > 0) {
-                        if (lastIncompleteLine !== undefined) {
-                            lines[0] = lastIncompleteLine + lines[0];
-                        }
-                        lastIncompleteLine = isLineIncomplete(lines[lines.length - 1]) ? lines.pop() : undefined;
-                        for (const line of lines) {
-                            yield line;
-                        }
-                    }
-                }
-                else if (part.kind === 'codeblockUri') {
-                    yield part.uri;
-                }
-            }
-            if (lastIncompleteLine !== undefined) {
-                yield lastIncompleteLine;
-            }
-        }
-    };
-}
-function isLineIncomplete(line) {
-    const lastChar = line.charCodeAt(line.length - 1);
-    return lastChar !== CharCode.LineFeed && lastChar !== CharCode.CarriageReturn;
-}
-function getReferencesAsDocumentContext(res) {
-    const map = ( new ResourceMap());
-    for (const r of res) {
-        let uri;
-        let range;
-        if (URI.isUri(r.reference)) {
-            uri = r.reference;
-        }
-        else if (isLocation(r.reference)) {
-            uri = r.reference.uri;
-            range = r.reference.range;
-        }
-        if (uri) {
-            const item = map.get(uri);
-            if (item) {
-                if (range) {
-                    item.ranges.push(range);
-                }
-            }
-            else {
-                map.set(uri, { uri, version: -1, ranges: range ? [range] : [] });
-            }
-        }
-    }
-    return [...( map.values())];
 }
 
-export { CodeMapperService, getReferencesAsDocumentContext };
+export { CodeMapperService };

package/vscode/src/vs/workbench/contrib/chat/common/chatProgressTypes/chatToolInvocation.d.ts

@@ -4,6 +4,8 @@ import { IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/m
 import { IToolConfirmationMessages } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 export declare class ChatToolInvocation implements IChatToolInvocation {
     readonly invocationMessage: string | IMarkdownString;
+    readonly pastTenseMessage: string | IMarkdownString | undefined;
+    readonly tooltip: string | IMarkdownString | undefined;
     private _confirmationMessages;
     readonly kind: "toolInvocation";
     private _isComplete;
@@ -16,7 +18,7 @@ export declare class ChatToolInvocation implements IChatToolInvocation {
     get confirmed(): DeferredPromise<boolean>;
     private _isConfirmed;
     get isConfirmed(): boolean | undefined;
-    constructor(invocationMessage: string | IMarkdownString, _confirmationMessages: IToolConfirmationMessages | undefined);
+    constructor(invocationMessage: string | IMarkdownString, pastTenseMessage: string | IMarkdownString | undefined, tooltip: string | IMarkdownString | undefined, _confirmationMessages: IToolConfirmationMessages | undefined);
     get confirmationMessages(): IToolConfirmationMessages | undefined;
     toJSON(): IChatToolInvocationSerialized;
 }