@codingame/monaco-vscode-extensions-service-override 23.2.2 → 24.1.0

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(
-                                2483,
+                                2496,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2484,
+                                2497,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2485,
+                                2498,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2486,
+                                2499,
                                 "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(
-                                2487,
+                                2500,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2488,
+                                2501,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2489,
+                                2502,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2490,
+                                2503,
                                 "{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(2491, "Show &&Preview")),
-                            cancelButton: ( localize(2492, "Skip Changes"))
+                            primaryButton: ( localize(2504, "Show &&Preview")),
+                            cancelButton: ( localize(2505, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -156,19 +156,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localize(2493, "&&OK")),
+                                    label: ( localize(2506, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localize(2491, "Show &&Preview")),
+                                    label: ( localize(2504, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localize(2492, "Skip Changes")),
+                                label: ( localize(2505, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localize(2494, "Do not ask me again")) }
+                            checkbox: { label: ( localize(2507, "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(2495, "Running 'File Create' participants...");
+                        return localize(2508, "Running 'File Create' participants...");
                     case FileOperation.MOVE:
-                        return localize(2496, "Running 'File Rename' participants...");
+                        return localize(2509, "Running 'File Rename' participants...");
                     case FileOperation.COPY:
-                        return localize(2497, "Running 'File Copy' participants...");
+                        return localize(2510, "Running 'File Copy' participants...");
                     case FileOperation.DELETE:
-                        return localize(2498, "Running 'File Delete' participants...");
+                        return localize(2511, "Running 'File Delete' participants...");
                     case FileOperation.WRITE:
-                        return localize(2499, "Running 'File Write' participants...");
+                        return localize(2512, "Running 'File Write' participants...");
                 }
             }
         });
@@ -202,6 +202,10 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
     }
     async $watch(extensionId, session, resource, unvalidatedOpts, correlate) {
         const uri = URI.revive(resource);
+        const canHandleWatcher = await this._fileService.canHandleResource(uri);
+        if (!canHandleWatcher) {
+            this._logService.warn(`MainThreadFileSystemEventService#$watch(): cannot watch resource as its scheme is not handled by the file service (extension: ${extensionId}, path: ${( uri.toString(true))})`);
+        }
         const opts = {
             ...unvalidatedOpts
         };
@@ -264,7 +268,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localize(2500, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2513, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

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

@@ -1,5 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ResourceLabelFormatter } from "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common/vscode/vs/platform/label/common/label";
+import { ResourceLabelFormatter } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { MainThreadLabelServiceShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";

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

@@ -11,7 +11,7 @@ import { ILanguageFeaturesService } from "@codingame/monaco-vscode-api/vscode/vs
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
-import { ExtHostLanguageFeaturesShape, ICodeActionProviderMetadataDto, IDocumentDropEditProviderMetadata, IDocumentFilterDto, ILanguageConfigurationDto, IPasteEditProviderMetadataDto, ISignatureHelpProviderMetadataDto, MainThreadLanguageFeaturesShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { ExtHostLanguageFeaturesShape, ICodeActionProviderMetadataDto, IDocumentDropEditProviderMetadata, IDocumentFilterDto, IInlineCompletionModelInfoDto, ILanguageConfigurationDto, IPasteEditProviderMetadataDto, ISignatureHelpProviderMetadataDto, MainThreadLanguageFeaturesShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IInlineCompletionsUnificationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.service";
 export declare class MainThreadLanguageFeatures extends Disposable implements MainThreadLanguageFeaturesShape {
@@ -63,8 +63,9 @@ export declare class MainThreadLanguageFeatures extends Disposable implements Ma
     $registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend, eventHandle: number | undefined): void;
     private static _inflateSuggestDto;
     $registerCompletionsProvider(handle: number, selector: IDocumentFilterDto[], triggerCharacters: string[], supportsResolveDetails: boolean, extensionId: ExtensionIdentifier): void;
-    $registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleEvents: boolean, extensionId: string, extensionVersion: string, groupId: string | undefined, yieldsToExtensionIds: string[], displayName: string | undefined, debounceDelayMs: number | undefined, excludesExtensionIds: string[], eventHandle: number | undefined): void;
+    $registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleEvents: boolean, extensionId: string, extensionVersion: string, groupId: string | undefined, yieldsToExtensionIds: string[], displayName: string | undefined, debounceDelayMs: number | undefined, excludesExtensionIds: string[], supportsOnDidChange: boolean, supportsSetModelId: boolean, initialModelInfo: IInlineCompletionModelInfoDto | undefined, supportsOnDidChangeModelInfo: boolean): void;
     $emitInlineCompletionsChange(handle: number): void;
+    $emitInlineCompletionModelInfoChange(handle: number, data: IInlineCompletionModelInfoDto | undefined): void;
     $registerSignatureHelpProvider(handle: number, selector: IDocumentFilterDto[], metadata: ISignatureHelpProviderMetadataDto): void;
     $registerInlayHintsProvider(handle: number, selector: IDocumentFilterDto[], supportsResolve: boolean, eventHandle: number | undefined, displayName: string | undefined): void;
     $emitInlayHintsEvent(eventHandle: number): void;

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

@@ -18,9 +18,9 @@ import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { reviveWorkspaceEditDto } from './mainThreadBulkEdits.js';
 import { DataTransfer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypeConverters';
 import { DataTransferFileCache } from '../common/shared/dataTransferCache.js';
-import { CallHierarchyProviderRegistry } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
-import { WorkspaceSymbolProviderRegistry } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/search';
-import { TypeHierarchyProviderRegistry } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
+import { CallHierarchyProviderRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
+import { WorkspaceSymbolProviderRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/search/common/search';
+import { TypeHierarchyProviderRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, ISuggestDataDtoField, ISuggestResultDtoField, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { InlineCompletionEndOfLifeReasonKind as InlineCompletionEndOfLifeReasonKind$1 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypes';
@@ -523,143 +523,21 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
         }
         this._registrations.set(handle, this._languageFeaturesService.completionProvider.register(selector, provider));
     }
-    $registerInlineCompletionsSupport(handle, selector, supportsHandleEvents, extensionId, extensionVersion, groupId, yieldsToExtensionIds, displayName, debounceDelayMs, excludesExtensionIds, eventHandle) {
+    $registerInlineCompletionsSupport(handle, selector, supportsHandleEvents, extensionId, extensionVersion, groupId, yieldsToExtensionIds, displayName, debounceDelayMs, excludesExtensionIds, supportsOnDidChange, supportsSetModelId, initialModelInfo, supportsOnDidChangeModelInfo) {
         const providerId = new ProviderId(extensionId, extensionVersion, groupId);
-        const provider = {
-            provideInlineCompletions: async (model, position, context, token) => {
-                const result = await this._proxy.$provideInlineCompletions(handle, model.uri, position, context, token);
-                return result;
-            },
-            handleItemDidShow: async (completions, item, updatedInsertText, editDeltaInfo) => {
-                this._instantiationService.invokeFunction(accessor => {
-                    const aiEditTelemetryService = accessor.getIfExists(IAiEditTelemetryService);
-                    if (item.suggestionId === undefined) {
-                        item.suggestionId = aiEditTelemetryService?.createSuggestionId({
-                            applyCodeBlockSuggestionId: undefined,
-                            feature: 'inlineSuggestion',
-                            source: providerId,
-                            languageId: completions.languageId,
-                            editDeltaInfo: editDeltaInfo,
-                            modeId: undefined,
-                            modelId: undefined,
-                            presentation: item.isInlineEdit ? 'nextEditSuggestion' : 'inlineCompletion',
-                        });
-                    }
-                });
-                if (supportsHandleEvents) {
-                    await this._proxy.$handleInlineCompletionDidShow(handle, completions.pid, item.idx, updatedInsertText);
-                }
-            },
-            handlePartialAccept: async (completions, item, acceptedCharacters, info) => {
-                if (supportsHandleEvents) {
-                    await this._proxy.$handleInlineCompletionPartialAccept(handle, completions.pid, item.idx, acceptedCharacters, info);
-                }
-            },
-            handleEndOfLifetime: async (completions, item, reason, lifetimeSummary) => {
-                function mapReason(reason, f) {
-                    if (reason.kind === InlineCompletionEndOfLifeReasonKind.Ignored) {
-                        return {
-                            ...reason,
-                            supersededBy: reason.supersededBy ? f(reason.supersededBy) : undefined,
-                        };
-                    }
-                    return reason;
-                }
-                if (supportsHandleEvents) {
-                    await this._proxy.$handleInlineCompletionEndOfLifetime(handle, completions.pid, item.idx, mapReason(reason, i => ({ pid: completions.pid, idx: i.idx })));
-                }
-                if (reason.kind === InlineCompletionEndOfLifeReasonKind.Accepted) {
-                    this._instantiationService.invokeFunction(accessor => {
-                        const aiEditTelemetryService = accessor.getIfExists(IAiEditTelemetryService);
-                        if (item.suggestionId !== undefined) {
-                            aiEditTelemetryService?.handleCodeAccepted({
-                                suggestionId: item.suggestionId,
-                                feature: 'inlineSuggestion',
-                                source: providerId,
-                                languageId: completions.languageId,
-                                editDeltaInfo: EditDeltaInfo.tryCreate(lifetimeSummary.lineCountModified, lifetimeSummary.lineCountOriginal, lifetimeSummary.characterCountModified, lifetimeSummary.characterCountOriginal),
-                                modeId: undefined,
-                                modelId: undefined,
-                                presentation: item.isInlineEdit ? 'nextEditSuggestion' : 'inlineCompletion',
-                                acceptanceMethod: 'accept',
-                                applyCodeBlockSuggestionId: undefined,
-                            });
-                        }
-                    });
-                }
-                const endOfLifeSummary = {
-                    opportunityId: lifetimeSummary.requestUuid,
-                    correlationId: lifetimeSummary.correlationId,
-                    shown: lifetimeSummary.shown,
-                    shownDuration: lifetimeSummary.shownDuration,
-                    shownDurationUncollapsed: lifetimeSummary.shownDurationUncollapsed,
-                    timeUntilShown: lifetimeSummary.timeUntilShown,
-                    timeUntilProviderRequest: lifetimeSummary.timeUntilProviderRequest,
-                    timeUntilProviderResponse: lifetimeSummary.timeUntilProviderResponse,
-                    editorType: lifetimeSummary.editorType,
-                    viewKind: lifetimeSummary.viewKind,
-                    preceeded: lifetimeSummary.preceeded,
-                    requestReason: lifetimeSummary.requestReason,
-                    typingInterval: lifetimeSummary.typingInterval,
-                    typingIntervalCharacterCount: lifetimeSummary.typingIntervalCharacterCount,
-                    languageId: lifetimeSummary.languageId,
-                    cursorColumnDistance: lifetimeSummary.cursorColumnDistance,
-                    cursorLineDistance: lifetimeSummary.cursorLineDistance,
-                    lineCountOriginal: lifetimeSummary.lineCountOriginal,
-                    lineCountModified: lifetimeSummary.lineCountModified,
-                    characterCountOriginal: lifetimeSummary.characterCountOriginal,
-                    characterCountModified: lifetimeSummary.characterCountModified,
-                    disjointReplacements: lifetimeSummary.disjointReplacements,
-                    sameShapeReplacements: lifetimeSummary.sameShapeReplacements,
-                    selectedSuggestionInfo: lifetimeSummary.selectedSuggestionInfo,
-                    extensionId,
-                    extensionVersion,
-                    groupId,
-                    availableProviders: lifetimeSummary.availableProviders,
-                    partiallyAccepted: lifetimeSummary.partiallyAccepted,
-                    partiallyAcceptedCountSinceOriginal: lifetimeSummary.partiallyAcceptedCountSinceOriginal,
-                    partiallyAcceptedRatioSinceOriginal: lifetimeSummary.partiallyAcceptedRatioSinceOriginal,
-                    partiallyAcceptedCharactersSinceOriginal: lifetimeSummary.partiallyAcceptedCharactersSinceOriginal,
-                    superseded: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Ignored && !!reason.supersededBy,
-                    reason: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Accepted ? 'accepted'
-                        : reason.kind === InlineCompletionEndOfLifeReasonKind$1.Rejected ? 'rejected'
-                            : reason.kind === InlineCompletionEndOfLifeReasonKind$1.Ignored ? 'ignored' : undefined,
-                    noSuggestionReason: undefined,
-                    notShownReason: lifetimeSummary.notShownReason,
-                    ...forwardToChannelIf(isCopilotLikeExtension(extensionId)),
-                };
-                const dataChannelForwardingTelemetryService = this._instantiationService.createInstance(DataChannelForwardingTelemetryService);
-                sendInlineCompletionsEndOfLifeTelemetry(dataChannelForwardingTelemetryService, endOfLifeSummary);
-            },
-            disposeInlineCompletions: (completions, reason) => {
-                this._proxy.$freeInlineCompletionsList(handle, completions.pid, reason);
-            },
-            handleRejection: async (completions, item) => {
-                if (supportsHandleEvents) {
-                    await this._proxy.$handleInlineCompletionRejection(handle, completions.pid, item.idx);
-                }
-            },
-            groupId: groupId ?? extensionId,
-            providerId,
-            yieldsToGroupIds: yieldsToExtensionIds,
-            excludesGroupIds: excludesExtensionIds,
-            debounceDelayMs,
-            displayName,
-            toString() {
-                return `InlineCompletionsProvider(${extensionId})`;
-            },
-        };
-        if (typeof eventHandle === 'number') {
-            const emitter = ( new Emitter());
-            this._registrations.set(eventHandle, emitter);
-            provider.onDidChangeInlineCompletions = emitter.event;
-        }
-        this._registrations.set(handle, this._languageFeaturesService.inlineCompletionsProvider.register(selector, provider));
+        const provider = this._instantiationService.createInstance(ExtensionBackedInlineCompletionsProvider, handle, groupId ?? extensionId, providerId, yieldsToExtensionIds, excludesExtensionIds, debounceDelayMs, displayName, initialModelInfo, supportsHandleEvents, supportsSetModelId, supportsOnDidChange, supportsOnDidChangeModelInfo, selector, this._proxy);
+        this._registrations.set(handle, provider);
     }
     $emitInlineCompletionsChange(handle) {
         const obj = this._registrations.get(handle);
-        if (obj instanceof Emitter) {
-            obj.fire(undefined);
+        if (obj instanceof ExtensionBackedInlineCompletionsProvider) {
+            obj._emitDidChange();
+        }
+    }
+    $emitInlineCompletionModelInfoChange(handle, data) {
+        const obj = this._registrations.get(handle);
+        if (obj instanceof ExtensionBackedInlineCompletionsProvider) {
+            obj._setModelInfo(data);
         }
     }
     $registerSignatureHelpProvider(handle, selector, metadata) {
@@ -1161,5 +1039,187 @@ class MainThreadDocumentRangeSemanticTokensProvider {
         throw ( new Error(`Unexpected`));
     }
 }
+let ExtensionBackedInlineCompletionsProvider = class ExtensionBackedInlineCompletionsProvider extends Disposable {
+    constructor(handle, groupId, providerId, yieldsToGroupIds, excludesGroupIds, debounceDelayMs, displayName, modelInfo, _supportsHandleEvents, _supportsSetModelId, _supportsOnDidChange, _supportsOnDidChangeModelInfo, _selector, _proxy, _languageFeaturesService, _aiEditTelemetryService, _instantiationService) {
+        super();
+        this.handle = handle;
+        this.groupId = groupId;
+        this.providerId = providerId;
+        this.yieldsToGroupIds = yieldsToGroupIds;
+        this.excludesGroupIds = excludesGroupIds;
+        this.debounceDelayMs = debounceDelayMs;
+        this.displayName = displayName;
+        this.modelInfo = modelInfo;
+        this._supportsHandleEvents = _supportsHandleEvents;
+        this._supportsSetModelId = _supportsSetModelId;
+        this._supportsOnDidChange = _supportsOnDidChange;
+        this._supportsOnDidChangeModelInfo = _supportsOnDidChangeModelInfo;
+        this._selector = _selector;
+        this._proxy = _proxy;
+        this._languageFeaturesService = _languageFeaturesService;
+        this._aiEditTelemetryService = _aiEditTelemetryService;
+        this._instantiationService = _instantiationService;
+        this._onDidChangeEmitter = ( new Emitter());
+        this._onDidChangeModelInfoEmitter = ( new Emitter());
+        this.setModelId = this._supportsSetModelId ? async (modelId) => {
+            await this._proxy.$handleInlineCompletionSetCurrentModelId(this.handle, modelId);
+        } : undefined;
+        this.onDidChangeInlineCompletions = this._supportsOnDidChange ? this._onDidChangeEmitter.event : undefined;
+        this.onDidChangeModelInfo = this._supportsOnDidChangeModelInfo ? this._onDidChangeModelInfoEmitter.event : undefined;
+        this._register(this._languageFeaturesService.inlineCompletionsProvider.register(this._selector, this));
+    }
+    _setModelInfo(newModelInfo) {
+        this.modelInfo = newModelInfo;
+        if (this._supportsOnDidChangeModelInfo) {
+            this._onDidChangeModelInfoEmitter.fire();
+        }
+    }
+    _emitDidChange() {
+        if (this._supportsOnDidChange) {
+            this._onDidChangeEmitter.fire();
+        }
+    }
+    async provideInlineCompletions(model, position, context, token) {
+        const result = await this._proxy.$provideInlineCompletions(this.handle, model.uri, position, context, token);
+        return result;
+    }
+    async handleItemDidShow(completions, item, updatedInsertText, editDeltaInfo) {
+        if (item.suggestionId === undefined) {
+            item.suggestionId = this._aiEditTelemetryService.createSuggestionId({
+                applyCodeBlockSuggestionId: undefined,
+                feature: 'inlineSuggestion',
+                source: this.providerId,
+                languageId: completions.languageId,
+                editDeltaInfo: editDeltaInfo,
+                modeId: undefined,
+                modelId: undefined,
+                presentation: item.isInlineEdit ? 'nextEditSuggestion' : 'inlineCompletion',
+            });
+        }
+        if (this._supportsHandleEvents) {
+            await this._proxy.$handleInlineCompletionDidShow(this.handle, completions.pid, item.idx, updatedInsertText);
+        }
+    }
+    async handlePartialAccept(completions, item, acceptedCharacters, info) {
+        if (this._supportsHandleEvents) {
+            await this._proxy.$handleInlineCompletionPartialAccept(this.handle, completions.pid, item.idx, acceptedCharacters, info);
+        }
+    }
+    async handleEndOfLifetime(completions, item, reason, lifetimeSummary) {
+        function mapReason(reason, f) {
+            if (reason.kind === InlineCompletionEndOfLifeReasonKind.Ignored) {
+                return {
+                    ...reason,
+                    supersededBy: reason.supersededBy ? f(reason.supersededBy) : undefined,
+                };
+            }
+            return reason;
+        }
+        if (this._supportsHandleEvents) {
+            await this._proxy.$handleInlineCompletionEndOfLifetime(this.handle, completions.pid, item.idx, mapReason(reason, i => ({ pid: completions.pid, idx: i.idx })));
+        }
+        if (reason.kind === InlineCompletionEndOfLifeReasonKind.Accepted) {
+            if (item.suggestionId !== undefined) {
+                this._aiEditTelemetryService.handleCodeAccepted({
+                    suggestionId: item.suggestionId,
+                    feature: 'inlineSuggestion',
+                    source: this.providerId,
+                    languageId: completions.languageId,
+                    editDeltaInfo: EditDeltaInfo.tryCreate(lifetimeSummary.lineCountModified, lifetimeSummary.lineCountOriginal, lifetimeSummary.characterCountModified, lifetimeSummary.characterCountOriginal),
+                    modeId: undefined,
+                    modelId: undefined,
+                    presentation: item.isInlineEdit ? 'nextEditSuggestion' : 'inlineCompletion',
+                    acceptanceMethod: 'accept',
+                    applyCodeBlockSuggestionId: undefined,
+                });
+            }
+        }
+        const endOfLifeSummary = {
+            opportunityId: lifetimeSummary.requestUuid,
+            correlationId: lifetimeSummary.correlationId,
+            shown: lifetimeSummary.shown,
+            shownDuration: lifetimeSummary.shownDuration,
+            shownDurationUncollapsed: lifetimeSummary.shownDurationUncollapsed,
+            timeUntilShown: lifetimeSummary.timeUntilShown,
+            timeUntilProviderRequest: lifetimeSummary.timeUntilProviderRequest,
+            timeUntilProviderResponse: lifetimeSummary.timeUntilProviderResponse,
+            editorType: lifetimeSummary.editorType,
+            viewKind: lifetimeSummary.viewKind,
+            preceeded: lifetimeSummary.preceeded,
+            requestReason: lifetimeSummary.requestReason,
+            typingInterval: lifetimeSummary.typingInterval,
+            typingIntervalCharacterCount: lifetimeSummary.typingIntervalCharacterCount,
+            languageId: lifetimeSummary.languageId,
+            cursorColumnDistance: lifetimeSummary.cursorColumnDistance,
+            cursorLineDistance: lifetimeSummary.cursorLineDistance,
+            lineCountOriginal: lifetimeSummary.lineCountOriginal,
+            lineCountModified: lifetimeSummary.lineCountModified,
+            characterCountOriginal: lifetimeSummary.characterCountOriginal,
+            characterCountModified: lifetimeSummary.characterCountModified,
+            disjointReplacements: lifetimeSummary.disjointReplacements,
+            sameShapeReplacements: lifetimeSummary.sameShapeReplacements,
+            selectedSuggestionInfo: lifetimeSummary.selectedSuggestionInfo,
+            extensionId: this.providerId.extensionId,
+            extensionVersion: this.providerId.extensionVersion,
+            groupId: extractEngineFromCorrelationId(lifetimeSummary.correlationId) ?? this.groupId,
+            skuPlan: lifetimeSummary.skuPlan,
+            skuType: lifetimeSummary.skuType,
+            performanceMarkers: lifetimeSummary.performanceMarkers,
+            availableProviders: lifetimeSummary.availableProviders,
+            partiallyAccepted: lifetimeSummary.partiallyAccepted,
+            partiallyAcceptedCountSinceOriginal: lifetimeSummary.partiallyAcceptedCountSinceOriginal,
+            partiallyAcceptedRatioSinceOriginal: lifetimeSummary.partiallyAcceptedRatioSinceOriginal,
+            partiallyAcceptedCharactersSinceOriginal: lifetimeSummary.partiallyAcceptedCharactersSinceOriginal,
+            superseded: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Ignored && !!reason.supersededBy,
+            reason: reason.kind === InlineCompletionEndOfLifeReasonKind$1.Accepted ? 'accepted'
+                : reason.kind === InlineCompletionEndOfLifeReasonKind$1.Rejected ? 'rejected'
+                    : reason.kind === InlineCompletionEndOfLifeReasonKind$1.Ignored ? 'ignored' : undefined,
+            noSuggestionReason: undefined,
+            notShownReason: lifetimeSummary.notShownReason,
+            renameCreated: lifetimeSummary.renameCreated,
+            renameDuration: lifetimeSummary.renameDuration,
+            renameTimedOut: lifetimeSummary.renameTimedOut,
+            renameDroppedOtherEdits: lifetimeSummary.renameDroppedOtherEdits,
+            renameDroppedRenameEdits: lifetimeSummary.renameDroppedRenameEdits,
+            editKind: lifetimeSummary.editKind,
+            longDistanceHintVisible: lifetimeSummary.longDistanceHintVisible,
+            longDistanceHintDistance: lifetimeSummary.longDistanceHintDistance,
+            ...forwardToChannelIf(isCopilotLikeExtension(this.providerId.extensionId)),
+        };
+        const dataChannelForwardingTelemetryService = this._instantiationService.createInstance(DataChannelForwardingTelemetryService);
+        sendInlineCompletionsEndOfLifeTelemetry(dataChannelForwardingTelemetryService, endOfLifeSummary);
+    }
+    disposeInlineCompletions(completions, reason) {
+        this._proxy.$freeInlineCompletionsList(this.handle, completions.pid, reason);
+    }
+    async handleRejection(completions, item) {
+        if (this._supportsHandleEvents) {
+            await this._proxy.$handleInlineCompletionRejection(this.handle, completions.pid, item.idx);
+        }
+    }
+    toString() {
+        return `InlineCompletionsProvider(${( this.providerId.toString())})`;
+    }
+};
+ExtensionBackedInlineCompletionsProvider = ( __decorate([
+    ( __param(14, ILanguageFeaturesService)),
+    ( __param(15, IAiEditTelemetryService)),
+    ( __param(16, IInstantiationService))
+], ExtensionBackedInlineCompletionsProvider));
+function extractEngineFromCorrelationId(correlationId) {
+    if (!correlationId) {
+        return undefined;
+    }
+    try {
+        const parsed = JSON.parse(correlationId);
+        if (typeof parsed === 'object' && parsed !== null && typeof parsed.engine === 'string') {
+            return parsed.engine;
+        }
+        return undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 
 export { MainThreadDocumentRangeSemanticTokensProvider, MainThreadDocumentSemanticTokensProvider, MainThreadLanguageFeatures };

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

@@ -13,7 +13,7 @@ export declare class MainThreadLanguageModelTools extends Disposable implements
     constructor(extHostContext: IExtHostContext, _languageModelToolsService: ILanguageModelToolsService);
     private getToolDtos;
     $getTools(): Promise<IToolDataDto[]>;
-    $invokeTool(dto: IToolInvocation, token?: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>>;
+    $invokeTool(dto: Dto<IToolInvocation>, token?: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>>;
     $acceptToolProgress(callId: string, progress: IToolProgressStep): void;
     $countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;
     $registerTool(id: string): void;

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

@@ -24,6 +24,7 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
             id: tool.id,
             displayName: tool.displayName,
             toolReferenceName: tool.toolReferenceName,
+            legacyToolReferenceFullNames: tool.legacyToolReferenceFullNames,
             tags: tool.tags,
             userDescription: tool.userDescription,
             modelDescription: tool.modelDescription,
@@ -35,7 +36,7 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
         return this.getToolDtos();
     }
     async $invokeTool(dto, token) {
-        const result = await this._languageModelToolsService.invokeTool(dto, (input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token), token ?? CancellationToken.None);
+        const result = await this._languageModelToolsService.invokeTool(revive(dto), (input, token) => this._proxy.$countTokensForInvocation(dto.callId, input, token), token ?? CancellationToken.None);
         const out = {
             content: result.content,
             toolMetadata: result.toolMetadata

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-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { resizeImage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 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(2501, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(2514, '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(
-            2502,
+            2515,
             "The extension '{0}' wants to access the language models provided by {1}.",
             extensionName,
             this.label

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

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { SocketCloseEventType } from '@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc.net';
+import { SocketCloseEventType } from '@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc.net';
 import { ManagedSocket, connectManagedSocket } from '../../../platform/remote/common/managedSocket.js';
 import { RemoteConnectionType } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteAuthorityResolver';
 import { IRemoteSocketFactoryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteSocketFactoryService.service';

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

@@ -26,6 +26,7 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     private _serverIdCounter;
     private readonly _servers;
     private readonly _serverDefinitions;
+    private readonly _serverAuthTracking;
     private readonly _proxy;
     private readonly _collectionDefinitions;
     constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry, dialogService: IDialogService, _authenticationService: IAuthenticationService, authenticationMcpServersService: IAuthenticationMcpService, authenticationMCPServerAccessService: IAuthenticationMcpAccessService, authenticationMCPServerUsageService: IAuthenticationMcpUsageService, _dynamicAuthenticationProviderStorageService: IDynamicAuthenticationProviderStorageService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService);
@@ -34,8 +35,11 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     $onDidChangeState(id: number, update: McpConnectionState): void;
     $onDidPublishLog(id: number, level: LogLevel, log: string): void;
     $onDidReceiveMessage(id: number, message: string): void;
+    $getTokenForProviderId(id: number, providerId: string, scopes: string[], options?: IMcpAuthenticationOptions): Promise<string | undefined>;
     $getTokenFromServerMetadata(id: number, authDetails: IMcpAuthenticationDetails, { errorOnUserInteraction, forceNewRegistration }?: IMcpAuthenticationOptions): Promise<string | undefined>;
+    private _getSessionForProvider;
     private continueWithIncorrectAccountPrompt;
+    private _onDidChangeAuthSessions;
     private loginPrompt;
     dispose(): void;
 }