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

package/vscode/src/vs/workbench/api/browser/mainThreadChatSessions.js

@@ -16,10 +16,10 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { hasValidDiff } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel';
 import { isIChatViewViewContext, ChatViewPaneTarget } 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 { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 import { awaitStatsForSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chat';
-import { ResponseModelState } 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 { ResponseModelState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatSessionStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
 import { IChatSessionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
@@ -107,7 +107,7 @@ class ObservableChatSession extends Disposable {
                         return confirmInterrupt();
                     }
                     return this._dialogService.confirm({
-                        message: ( localize(2479, 'Are you sure you want to interrupt the active session?'))
+                        message: ( localize(2498, 'Are you sure you want to interrupt the active session?'))
                     }).then(confirmed => {
                         if (confirmed.confirmed) {
                             return confirmInterrupt();
@@ -258,7 +258,6 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
             chatSessionType,
             onDidChangeChatSessionItems: Event.debounce(changeEmitter.event, (_, e) => e, 200),
             provideChatSessionItems: (token) => this._provideChatSessionItems(handle, token),
-            provideNewChatSessionItem: (options, token) => this._provideNewChatSessionItem(handle, options, token)
         };
         disposables.add(this._chatSessionsService.registerChatSessionItemProvider(provider));
         this._itemProvidersRegistrations.set(handle, {
@@ -292,7 +291,7 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
         const options = {
             title: {
                 preferred: originalEditor?.getName() || undefined,
-                fallback: ( localize(2480, "{0}", contribution?.displayName)),
+                fallback: ( localize(2499, "{0}", contribution?.displayName)),
             }
         };
         const newSession = await this._chatSessionsService.getOrCreateChatSession(URI.revive(modifiedResource), CancellationToken.None);
@@ -359,7 +358,7 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
         return [];
     }
     async handleSessionModelOverrides(model, session) {
-        const inProgress = this._chatSessionsService.getInProgress();
+        const inProgress = model.getRequests().filter(r => r.response && !r.response.isComplete);
         if (inProgress.length) {
             session.description = this._chatSessionsService.getInProgressSessionDescription(model);
         }
@@ -378,25 +377,6 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
         }
         return session;
     }
-    async _provideNewChatSessionItem(handle, options, token) {
-        try {
-            const chatSessionItem = await this._proxy.$provideNewChatSessionItem(handle, options, token);
-            if (!chatSessionItem) {
-                throw ( new Error('Extension failed to create chat session'));
-            }
-            return {
-                ...chatSessionItem,
-                changes: revive(chatSessionItem.changes),
-                resource: URI.revive(chatSessionItem.resource),
-                iconPath: chatSessionItem.iconPath,
-                tooltip: chatSessionItem.tooltip ? this._reviveTooltip(chatSessionItem.tooltip) : undefined,
-            };
-        }
-        catch (error) {
-            this._logService.error('Error creating chat session:', error);
-            throw error;
-        }
-    }
     async _provideChatSessionContent(providerHandle, sessionResource, token) {
         let session = this._activeSessions.get(sessionResource);
         if (!session) {
@@ -444,11 +424,7 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
         };
         this._sessionTypeToHandle.set(chatSessionScheme, handle);
         this._contentProvidersRegistrations.set(handle, this._chatSessionsService.registerChatSessionContentProvider(chatSessionScheme, provider));
-        this._proxy.$provideChatSessionProviderOptions(handle, CancellationToken.None).then(options => {
-            if (options?.optionGroups && options.optionGroups.length) {
-                this._chatSessionsService.setOptionGroupsForSessionType(chatSessionScheme, handle, options.optionGroups);
-            }
-        }).catch(err => this._logService.error('Error fetching chat session options', err));
+        this._refreshProviderOptions(handle, chatSessionScheme);
     }
     $unregisterChatSessionContentProvider(handle) {
         this._contentProvidersRegistrations.deleteAndDispose(handle);
@@ -489,6 +465,27 @@ let MainThreadChatSessions = class MainThreadChatSessions extends Disposable {
     }
     $handleAnchorResolve(handle, sesssionResource, requestId, requestHandle, anchor) {
     }
+    $onDidChangeChatSessionProviderOptions(handle) {
+        let sessionType;
+        for (const [type, h] of this._sessionTypeToHandle) {
+            if (h === handle) {
+                sessionType = type;
+                break;
+            }
+        }
+        if (!sessionType) {
+            this._logService.warn(`No session type found for chat session content provider handle ${handle} when refreshing provider options`);
+            return;
+        }
+        this._refreshProviderOptions(handle, sessionType);
+    }
+    _refreshProviderOptions(handle, chatSessionScheme) {
+        this._proxy.$provideChatSessionProviderOptions(handle, CancellationToken.None).then(options => {
+            if (options?.optionGroups && options.optionGroups.length) {
+                this._chatSessionsService.setOptionGroupsForSessionType(chatSessionScheme, handle, options.optionGroups);
+            }
+        }).catch(err => this._logService.error('Error fetching chat session options', err));
+    }
     dispose() {
         for (const session of ( this._activeSessions.values())) {
             session.dispose();

package/vscode/src/vs/workbench/api/browser/mainThreadComments.js

@@ -424,7 +424,7 @@ class MainThreadCommentController extends Disposable {
         };
     }
 }
-const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(2481, 'View icon of the comments view.')));
+const commentsViewIcon = registerIcon('comments-view-icon', Codicon.commentDiscussion, ( localize(2500, 'View icon of the comments view.')));
 let MainThreadComments = class MainThreadComments extends Disposable {
     constructor(extHostContext, _commentService, _viewsService, _viewDescriptorService, _uriIdentityService, _editorService) {
         super();

package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js

@@ -289,7 +289,6 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         this._currentEditIndex = -1;
         this._savePoint = -1;
         this._edits = [];
-        this._isDirtyFromContentChange = false;
         this.typeId = NO_TYPE_ID;
         this._onDidChangeDirty = this._register(( new Emitter()));
         this.onDidChangeDirty = this._onDidChangeDirty.event;
@@ -299,19 +298,17 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         this.onDidSave = this._onDidSave.event;
         this.onDidChangeReadonly = Event.None;
         this._fromBackup = fromBackup;
+        this._isDirtyFromContentChange = startDirty;
         if (_editable) {
             this._register(workingCopyService.registerWorkingCopy(this));
             this._register(extensionService.onWillStop(e => {
                 e.veto(true, ( localize(
-                    2482,
+                    2501,
                     "An extension provided editor for '{0}' is still open that would close otherwise.",
                     this.name
                 )));
             }));
         }
-        if (startDirty) {
-            this._isDirtyFromContentChange = true;
-        }
     }
     get editorResource() {
         return this._editorResource;
@@ -371,7 +368,7 @@ let MainThreadCustomEditorModel = MainThreadCustomEditorModel_1 = class MainThre
         this._undoService.pushElement({
             type: UndoRedoElementType.Resource,
             resource: this._editorResource,
-            label: label ?? ( localize(2483, "Edit")),
+            label: label ?? ( localize(2502, "Edit")),
             code: 'undoredo.customEditorEdit',
             undo: () => this.undo(),
             redo: () => this.redo(),

package/vscode/src/vs/workbench/api/browser/mainThreadDocumentContentProviders.js

@@ -60,6 +60,9 @@ let MainThreadDocumentContentProviders = class MainThreadDocumentContentProvider
             if (myToken.token.isCancellationRequested) {
                 return;
             }
+            if (model.isDisposed()) {
+                return;
+            }
             if (edits && edits.length > 0) {
                 model.applyEdits(( edits.map(edit => EditOperation.replace(Range.lift(edit.range), edit.text))));
             }

package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js

@@ -14,7 +14,7 @@ class ExtHostEditSessionIdentityCreateParticipant {
     }
     async participate(workspaceFolder, token) {
         const p = ( new Promise((resolve, reject) => {
-            setTimeout(() => reject(( new Error(( localize(2484, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
+            setTimeout(() => reject(( new Error(( localize(2503, "Aborted onWillCreateEditSessionIdentity-event after 10000ms"))))), this.timeout);
             this._proxy.$onWillCreateEditSessionIdentity(workspaceFolder.uri, token, this.timeout).then(resolve, reject);
         }));
         return raceCancellationError(p, token);

package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js

@@ -12,7 +12,7 @@ import { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbenc
 import { isGroupEditorMoveEvent } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorGroupModel';
 import { SideBySideEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/sideBySideEditorInput';
 import { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 import { CustomEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { InteractiveEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
 import { MergeEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';

package/vscode/src/vs/workbench/api/browser/mainThreadEditors.js

@@ -20,7 +20,6 @@ import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/in
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { isITextModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
 import { equals as equals$1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { constObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/constObservable';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
@@ -106,47 +105,29 @@ let MainThreadTextEditors = class MainThreadTextEditors {
             : observableFromEvent(this, codeEditor.onDidChangeModel, () => codeEditor.getModel());
         const editorChangesObs = derived(reader => {
             const editorModel = editorModelObs.read(reader);
-            if (!editorModel) {
+            const editorModelUri = codeEditor.getModel()?.uri;
+            if (!editorModel || !editorModelUri) {
                 return constObservable(undefined);
             }
-            const editorModelUri = isITextModel(editorModel)
-                ? editorModel.uri
-                : editorModel.modified.uri;
+            let quickDiffModelRef;
             if (isITextModel(editorModel)) {
-                const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModelUri);
-                if (!quickDiffModelRef) {
-                    return constObservable(undefined);
-                }
-                toDispose.push(quickDiffModelRef);
-                return observableFromEvent(this, quickDiffModelRef.object.onDidChange, () => {
-                    return ( quickDiffModelRef.object.getQuickDiffResults()
-                        .map(result => ({
-                        original: result.original,
-                        modified: result.modified,
-                        changes: result.changes2
-                    })));
-                });
+                quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModelUri);
+            }
+            else {
+                const diffAlgorithm = this._configurationService.getValue('diffEditor.diffAlgorithm');
+                quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModelUri, { algorithm: diffAlgorithm });
             }
-            const diffAlgorithm = this._configurationService.getValue('diffEditor.diffAlgorithm');
-            const quickDiffModelRef = this._quickDiffModelService.createQuickDiffModelReference(editorModelUri, { algorithm: diffAlgorithm });
             if (!quickDiffModelRef) {
                 return constObservable(undefined);
             }
             toDispose.push(quickDiffModelRef);
-            return observableFromEvent(Event.any(quickDiffModelRef.object.onDidChange, diffEditor.onDidUpdateDiff), () => {
-                const quickDiffInformation = ( quickDiffModelRef.object.getQuickDiffResults()
+            return observableFromEvent(this, quickDiffModelRef.object.onDidChange, () => {
+                return ( quickDiffModelRef.object.getQuickDiffResults()
                     .map(result => ({
                     original: result.original,
                     modified: result.modified,
                     changes: result.changes2
                 })));
-                const diffChanges = diffEditor.getDiffComputationResult()?.changes2 ?? [];
-                const diffInformation = [{
-                        original: editorModel.original.uri,
-                        modified: editorModel.modified.uri,
-                        changes: ( diffChanges.map(change => change))
-                    }];
-                return [...quickDiffInformation, ...diffInformation];
             });
         });
         return derivedOpts({

package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js

@@ -89,13 +89,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2485,
+                    2504,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?",
                     extName,
                     missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                 )),
                 actions: {
-                    primary: [toAction({ id: 'reload', label: ( localize(2486, "Reload Window")), run: () => this._hostService.reload() })]
+                    primary: [toAction({ id: 'reload', label: ( localize(2505, "Reload Window")), run: () => this._hostService.reload() })]
                 }
             });
         }
@@ -105,7 +105,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2487,
+                        2506,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -116,13 +116,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2488,
+                        2507,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
-                        primary: [toAction({ id: 'manageWorkspaceTrust', label: ( localize(2489, "Manage Workspace Trust")), run: () => this._commandService.executeCommand('workbench.trust.manage') })]
+                        primary: [toAction({ id: 'manageWorkspaceTrust', label: ( localize(2508, "Manage Workspace Trust")), run: () => this._commandService.executeCommand('workbench.trust.manage') })]
                     }
                 });
             }
@@ -130,14 +130,14 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2490,
+                        2509,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
                         primary: [toAction({
-                                id: 'enable', label: ( localize(2491, "Enable and Reload")), enabled: true,
+                                id: 'enable', label: ( localize(2510, "Enable and Reload")), enabled: true,
                                 run: () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
                                     .then(() => this._hostService.reload(), e => this._notificationService.error(e))
                             })]
@@ -148,7 +148,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2492,
+                        2511,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -169,7 +169,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2493,
+                    2512,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?",
                     extName,
                     dependencyExtension.displayName,
@@ -178,7 +178,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 actions: {
                     primary: [toAction({
                             id: 'install',
-                            label: ( localize(2494, "Install and Reload")),
+                            label: ( localize(2513, "Install and Reload")),
                             run: () => this._extensionsWorkbenchService.install(dependencyExtension)
                                 .then(() => this._hostService.reload(), e => this._notificationService.error(e))
                         })]
@@ -187,7 +187,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
         }
         else {
             this._notificationService.error(( localize(
-                2495,
+                2514,
                 "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
                 extName,
                 missingDependency

package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js

@@ -75,28 +75,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     if (data.extensionNames.length === 1) {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2496,
+                                2515,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2497,
+                                2516,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2498,
+                                2517,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2499,
+                                2518,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
@@ -105,28 +105,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     else {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2500,
+                                2519,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2501,
+                                2520,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2502,
+                                2521,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2503,
+                                2522,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -136,8 +136,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         const { confirmed } = await dialogService.confirm({
                             type: Severity.Info,
                             message,
-                            primaryButton: ( localize(2504, "Show &&Preview")),
-                            cancelButton: ( localize(2505, "Skip Changes"))
+                            primaryButton: ( localize(2523, "Show &&Preview")),
+                            cancelButton: ( localize(2524, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -156,19 +156,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localize(2506, "&&OK")),
+                                    label: ( localize(2525, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localize(2504, "Show &&Preview")),
+                                    label: ( localize(2523, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localize(2505, "Skip Changes")),
+                                label: ( localize(2524, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localize(2507, "Do not ask me again")) }
+                            checkbox: { label: ( localize(2526, "Do not ask me again")) }
                         });
                         if (result === Choice.Cancel) {
                             return;
@@ -185,15 +185,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             _progressLabel(operation) {
                 switch (operation) {
                     case FileOperation.CREATE:
-                        return localize(2508, "Running 'File Create' participants...");
+                        return localize(2527, "Running 'File Create' participants...");
                     case FileOperation.MOVE:
-                        return localize(2509, "Running 'File Rename' participants...");
+                        return localize(2528, "Running 'File Rename' participants...");
                     case FileOperation.COPY:
-                        return localize(2510, "Running 'File Copy' participants...");
+                        return localize(2529, "Running 'File Copy' participants...");
                     case FileOperation.DELETE:
-                        return localize(2511, "Running 'File Delete' participants...");
+                        return localize(2530, "Running 'File Delete' participants...");
                     case FileOperation.WRITE:
-                        return localize(2512, "Running 'File Write' participants...");
+                        return localize(2531, "Running 'File Write' participants...");
                 }
             }
         });
@@ -268,7 +268,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localize(2513, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2532, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js

@@ -1174,6 +1174,7 @@ let ExtensionBackedInlineCompletionsProvider = class ExtensionBackedInlineComple
             reason: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Accepted ? 'accepted'
                 : reason.kind === InlineCompletionEndOfLifeReasonKind$1.Rejected ? 'rejected'
                     : reason.kind === InlineCompletionEndOfLifeReasonKind$1.Ignored ? 'ignored' : undefined,
+            acceptedAlternativeAction: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Accepted && reason.alternativeAction,
             noSuggestionReason: undefined,
             notShownReason: lifetimeSummary.notShownReason,
             renameCreated: lifetimeSummary.renameCreated,

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModelTools.d.ts

@@ -1,7 +1,7 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IToolInvocation, IToolProgressStep, 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";
+import { IToolInvocation, IToolProgressStep, IToolResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { Dto, SerializableObjectWithBuffers } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
 import { IToolDataDto, MainThreadLanguageModelToolsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModelTools.js

@@ -3,8 +3,8 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
-import { toolResultHasBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { toolResultHasBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { SerializableObjectWithBuffers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js

@@ -9,7 +9,7 @@ import { DisposableStore, DisposableMap, Disposable, toDisposable } from '@codin
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
 import { ILanguageModelIgnoredFilesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { IAuthenticationAccessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
@@ -160,7 +160,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2514, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(2533, 'Language Models'));
         const disposables = ( new DisposableStore());
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel)));
         disposables.add(toDisposable(() => {
@@ -236,7 +236,7 @@ class LanguageModelAccessAuthProvider {
     }
     confirmation(extensionName, _recreatingSession) {
         return localize(
-            2515,
+            2534,
             "The extension '{0}' wants to access the language models provided by {1}.",
             extensionName,
             this.label

package/vscode/src/vs/workbench/api/browser/mainThreadLanguages.d.ts

@@ -9,16 +9,15 @@ import { StandardTokenType } from "@codingame/monaco-vscode-api/vscode/vs/editor
 import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { ILanguageStatus } from "@codingame/monaco-vscode-languages-service-override/vscode/vs/workbench/services/languageStatus/common/languageStatusService";
 import { ILanguageStatusService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service";
-export declare class MainThreadLanguages implements MainThreadLanguagesShape {
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+export declare class MainThreadLanguages extends Disposable implements MainThreadLanguagesShape {
     private readonly _languageService;
     private readonly _modelService;
     private _resolverService;
     private readonly _languageStatusService;
-    private readonly _disposables;
     private readonly _proxy;
     private readonly _status;
     constructor(_extHostContext: IExtHostContext, _languageService: ILanguageService, _modelService: IModelService, _resolverService: ITextModelService, _languageStatusService: ILanguageStatusService);
-    dispose(): void;
     $changeLanguage(resource: UriComponents, languageId: string): Promise<void>;
     $tokensAtPosition(resource: UriComponents, position: IPosition): Promise<undefined | {
         type: StandardTokenType;

package/vscode/src/vs/workbench/api/browser/mainThreadLanguages.js

@@ -8,26 +8,22 @@ import { extHostNamedCustomer } from '../../services/extensions/common/extHostCu
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { ILanguageStatusService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service';
-import { DisposableStore, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 
-let MainThreadLanguages = class MainThreadLanguages {
+let MainThreadLanguages = class MainThreadLanguages extends Disposable {
     constructor(_extHostContext, _languageService, _modelService, _resolverService, _languageStatusService) {
+        super();
         this._languageService = _languageService;
         this._modelService = _modelService;
         this._resolverService = _resolverService;
         this._languageStatusService = _languageStatusService;
-        this._disposables = ( new DisposableStore());
-        this._status = ( new DisposableMap());
+        this._status = this._register(( new DisposableMap()));
         this._proxy = ( _extHostContext.getProxy(ExtHostContext.ExtHostLanguages));
         this._proxy.$acceptLanguageIds(_languageService.getRegisteredLanguageIds());
-        this._disposables.add(_languageService.onDidChange(_ => {
+        this._register(_languageService.onDidChange(_ => {
             this._proxy.$acceptLanguageIds(_languageService.getRegisteredLanguageIds());
         }));
     }
-    dispose() {
-        this._disposables.dispose();
-        this._status.dispose();
-    }
     async $changeLanguage(resource, languageId) {
         if (!this._languageService.isRegisteredLanguageId(languageId)) {
             return Promise.reject(( new Error(`Unknown language id: ${languageId}`)));
@@ -61,11 +57,10 @@ let MainThreadLanguages = class MainThreadLanguages {
         };
     }
     $setLanguageStatus(handle, status) {
-        this._status.get(handle)?.dispose();
         this._status.set(handle, this._languageStatusService.addStatus(status));
     }
     $removeLanguageStatus(handle) {
-        this._status.get(handle)?.dispose();
+        this._status.deleteAndDispose(handle);
     }
 };
 MainThreadLanguages = __decorate([