@codingame/monaco-vscode-extensions-service-override 20.5.0 → 21.0.1

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(
-                    2450,
+                    2454,
                     "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: [( new Action('reload', ( localize(2451, "Reload Window")), '', true, () => this._hostService.reload()))]
+                    primary: [( new Action('reload', ( localize(2455, "Reload Window")), '', true, () => this._hostService.reload()))]
                 }
             });
         }
@@ -105,7 +105,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2452,
+                        2456,
                         "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(
-                        2453,
+                        2457,
                         "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: [( new Action('manageWorkspaceTrust', ( localize(2454, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage')))]
+                        primary: [( new Action('manageWorkspaceTrust', ( localize(2458, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage')))]
                     }
                 });
             }
@@ -130,13 +130,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2455,
+                        2459,
                         "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: [( new Action('enable', ( localize(2456, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
+                        primary: [( new Action('enable', ( localize(2460, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
                                 .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
                     }
                 });
@@ -145,7 +145,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2457,
+                        2461,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -166,21 +166,21 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2458,
+                    2462,
                     "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,
                     dependencyExtension.publisherDisplayName
                 )),
                 actions: {
-                    primary: [( new Action('install', ( localize(2459, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
+                    primary: [( new Action('install', ( localize(2463, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
                             .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
                 }
             });
         }
         else {
             this._notificationService.error(( localize(
-                2460,
+                2464,
                 "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(
-                                2461,
+                                2465,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2462,
+                                2466,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2463,
+                                2467,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2464,
+                                2468,
                                 "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(
-                                2465,
+                                2469,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2466,
+                                2470,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2467,
+                                2471,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2468,
+                                2472,
                                 "{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(2469, "Show &&Preview")),
-                            cancelButton: ( localize(2470, "Skip Changes"))
+                            primaryButton: ( localize(2473, "Show &&Preview")),
+                            cancelButton: ( localize(2474, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -156,19 +156,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localize(2471, "&&OK")),
+                                    label: ( localize(2475, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localize(2469, "Show &&Preview")),
+                                    label: ( localize(2473, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localize(2470, "Skip Changes")),
+                                label: ( localize(2474, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localize(2472, "Do not ask me again")) }
+                            checkbox: { label: ( localize(2476, "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(2473, "Running 'File Create' participants...");
+                        return localize(2477, "Running 'File Create' participants...");
                     case FileOperation.MOVE:
-                        return localize(2474, "Running 'File Rename' participants...");
+                        return localize(2478, "Running 'File Rename' participants...");
                     case FileOperation.COPY:
-                        return localize(2475, "Running 'File Copy' participants...");
+                        return localize(2479, "Running 'File Copy' participants...");
                     case FileOperation.DELETE:
-                        return localize(2476, "Running 'File Delete' participants...");
+                        return localize(2480, "Running 'File Delete' participants...");
                     case FileOperation.WRITE:
-                        return localize(2477, "Running 'File Write' participants...");
+                        return localize(2481, "Running 'File Write' participants...");
                 }
             }
         });
@@ -264,7 +264,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localize(2478, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2482, "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.d.ts

@@ -13,15 +13,17 @@ import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/plat
 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 { 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 {
     private readonly _languageService;
     private readonly _languageConfigurationService;
     private readonly _languageFeaturesService;
     private readonly _uriIdentService;
     private readonly _instantiationService;
+    private readonly _inlineCompletionsUnificationService;
     private readonly _proxy;
     private readonly _registrations;
-    constructor(extHostContext: IExtHostContext, _languageService: ILanguageService, _languageConfigurationService: ILanguageConfigurationService, _languageFeaturesService: ILanguageFeaturesService, _uriIdentService: IUriIdentityService, _instantiationService: IInstantiationService);
+    constructor(extHostContext: IExtHostContext, _languageService: ILanguageService, _languageConfigurationService: ILanguageConfigurationService, _languageFeaturesService: ILanguageFeaturesService, _uriIdentService: IUriIdentityService, _instantiationService: IInstantiationService, _inlineCompletionsUnificationService: IInlineCompletionsUnificationService);
     $unregister(handle: number): void;
     private static _reviveLocationDto;
     private static _reviveLocationLinkDto;
@@ -60,7 +62,7 @@ export declare class MainThreadLanguageFeatures extends Disposable implements Ma
     $registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend): 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, 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[], eventHandle: number | undefined): void;
     $emitInlineCompletionsChange(handle: number): void;
     $registerSignatureHelpProvider(handle: number, selector: IDocumentFilterDto[], metadata: ISignatureHelpProviderMetadataDto): void;
     $registerInlayHintsProvider(handle: number, selector: IDocumentFilterDto[], supportsResolve: boolean, eventHandle: number | undefined, displayName: string | undefined): void;

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

@@ -19,23 +19,27 @@ 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 { WorkspaceSymbolProviderRegistry } from '@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-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 { 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';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { DataChannelForwardingTelemetryService } from '../../contrib/editTelemetry/browser/telemetry/forwardingTelemetryService.js';
+import { forwardToChannelIf, isCopilotLikeExtension, DataChannelForwardingTelemetryService } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/forwardingTelemetryService';
+import { IAiEditTelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryService.service';
+import { EditDeltaInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource';
+import { IInlineCompletionsUnificationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.service';
 
 var MainThreadLanguageFeatures_1;
 let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThreadLanguageFeatures extends Disposable {
-    constructor(extHostContext, _languageService, _languageConfigurationService, _languageFeaturesService, _uriIdentService, _instantiationService) {
+    constructor(extHostContext, _languageService, _languageConfigurationService, _languageFeaturesService, _uriIdentService, _instantiationService, _inlineCompletionsUnificationService) {
         super();
         this._languageService = _languageService;
         this._languageConfigurationService = _languageConfigurationService;
         this._languageFeaturesService = _languageFeaturesService;
         this._uriIdentService = _uriIdentService;
         this._instantiationService = _instantiationService;
+        this._inlineCompletionsUnificationService = _inlineCompletionsUnificationService;
         this._registrations = this._register(( new DisposableMap()));
         this._pasteEditProviders = ( new Map());
         this._documentOnDropEditProviders = ( new Map());
@@ -68,6 +72,12 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
             }));
             updateAllWordDefinitions();
         }
+        if (this._inlineCompletionsUnificationService) {
+            this._register(this._inlineCompletionsUnificationService.onDidStateChange(() => {
+                this._proxy.$acceptInlineCompletionsUnificationState(this._inlineCompletionsUnificationService.state);
+            }));
+            this._proxy.$acceptInlineCompletionsUnificationState(this._inlineCompletionsUnificationService.state);
+        }
     }
     $unregister(handle) {
         this._registrations.deleteAndDispose(handle);
@@ -155,7 +165,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
             },
             resolveCodeLens: async (model, codeLens, token) => {
                 const result = await this._proxy.$resolveCodeLens(handle, codeLens, token);
-                if (!result) {
+                if (!result || token.isCancellationRequested) {
                     return undefined;
                 }
                 return {
@@ -500,12 +510,25 @@ 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, eventHandle) {
+    $registerInlineCompletionsSupport(handle, selector, supportsHandleEvents, extensionId, extensionVersion, groupId, yieldsToExtensionIds, displayName, debounceDelayMs, excludesExtensionIds, eventHandle) {
         const provider = {
             provideInlineCompletions: async (model, position, context, token) => {
-                return this._proxy.$provideInlineCompletions(handle, model.uri, position, context, token);
+                const result = await this._proxy.$provideInlineCompletions(handle, model.uri, position, context, token);
+                return result;
             },
             handleItemDidShow: async (completions, item, updatedInsertText) => {
+                this._instantiationService.invokeFunction(accessor => {
+                    const aiEditTelemetryService = accessor.getIfExists(IAiEditTelemetryService);
+                    item.suggestionId = aiEditTelemetryService?.createSuggestionId({
+                        applyCodeBlockSuggestionId: undefined,
+                        editDeltaInfo: ( new EditDeltaInfo(1, 1, -1, -1)),
+                        feature: 'inlineSuggestion',
+                        languageId: completions.languageId,
+                        modeId: undefined,
+                        modelId: undefined,
+                        presentation: 'inlineSuggestion',
+                    });
+                });
                 if (supportsHandleEvents) {
                     await this._proxy.$handleInlineCompletionDidShow(handle, completions.pid, item.idx, updatedInsertText);
                 }
@@ -528,12 +551,32 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
                 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);
+                        aiEditTelemetryService?.handleCodeAccepted({
+                            suggestionId: item.suggestionId,
+                            editDeltaInfo: EditDeltaInfo.tryCreate(lifetimeSummary.lineCountModified, lifetimeSummary.lineCountOriginal, lifetimeSummary.characterCountModified, lifetimeSummary.characterCountOriginal),
+                            feature: 'inlineSuggestion',
+                            languageId: completions.languageId,
+                            modeId: undefined,
+                            modelId: undefined,
+                            presentation: 'inlineSuggestion',
+                            acceptanceMethod: 'accept',
+                            applyCodeBlockSuggestionId: undefined,
+                        });
+                    });
+                }
                 const endOfLifeSummary = {
                     id: lifetimeSummary.requestUuid,
+                    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,
@@ -552,11 +595,16 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
                     sameShapeReplacements: lifetimeSummary.sameShapeReplacements,
                     extensionId,
                     extensionVersion,
+                    groupId,
                     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'
-                            : 'ignored'
+                            : 'ignored',
+                    ...forwardToChannelIf(isCopilotLikeExtension(extensionId)),
                 };
                 const telemetryService = this._instantiationService.createInstance(DataChannelForwardingTelemetryService);
                 telemetryService.publicLog2('inlineCompletion.endOfLife', endOfLifeSummary);
@@ -572,6 +620,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
             groupId: groupId ?? extensionId,
             providerId: new ProviderId(extensionId, extensionVersion, groupId),
             yieldsToGroupIds: yieldsToExtensionIds,
+            excludesGroupIds: excludesExtensionIds,
             debounceDelayMs,
             displayName,
             toString() {
@@ -888,7 +937,8 @@ MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = __decorate([
     ( __param(2, ILanguageConfigurationService)),
     ( __param(3, ILanguageFeaturesService)),
     ( __param(4, IUriIdentityService)),
-    ( __param(5, IInstantiationService))
+    ( __param(5, IInstantiationService)),
+    ( __param(6, IInlineCompletionsUnificationService))
 ], MainThreadLanguageFeatures);
 let MainThreadPasteEditProvider = class MainThreadPasteEditProvider {
     constructor(_handle, _proxy, metadata, _uriIdentService) {

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

@@ -4,7 +4,7 @@ import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/commo
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { ILanguageModelIgnoredFilesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service";
-import { IChatMessage, IChatResponseFragment, ILanguageModelChatSelector } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
+import { IChatMessage, IChatResponsePart, ILanguageModelChatSelector } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
 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";
 import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
@@ -29,7 +29,7 @@ export declare class MainThreadLanguageModels implements MainThreadLanguageModel
     dispose(): void;
     $registerLanguageModelProvider(vendor: string): void;
     $onLMProviderChange(vendor: string): void;
-    $reportResponsePart(requestId: number, chunk: IChatResponseFragment | IChatResponseFragment[]): Promise<void>;
+    $reportResponsePart(requestId: number, chunk: SerializableObjectWithBuffers<IChatResponsePart | IChatResponsePart[]>): Promise<void>;
     $reportResponseDone(requestId: number, err: SerializedError | undefined): Promise<void>;
     $unregisterProvider(vendor: string): void;
     $selectChatModels(selector: ILanguageModelChatSelector): Promise<string[]>;

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

@@ -46,8 +46,8 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         const dipsosables = ( new DisposableStore());
         dipsosables.add(this._chatProviderService.registerLanguageModelProvider(vendor, {
             onDidChange: Event.filter(this._lmProviderChange.event, e => e.vendor === vendor, dipsosables),
-            prepareLanguageModelChat: async (options, token) => {
-                const modelsAndIdentifiers = await this._proxy.$prepareLanguageModelProvider(vendor, options, token);
+            provideLanguageModelChatInfo: async (options, token) => {
+                const modelsAndIdentifiers = await this._proxy.$provideLanguageModelChatInfo(vendor, options, token);
                 modelsAndIdentifiers.forEach(m => {
                     if (m.metadata.auth) {
                         dipsosables.add(this._registerAuthenticationProvider(m.metadata.extension, m.metadata.auth));
@@ -90,7 +90,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         const data = this._pendingProgress.get(requestId);
         this._logService.trace('[LM] report response PART', Boolean(data), requestId, chunk);
         if (data) {
-            data.stream.emitOne(chunk);
+            data.stream.emitOne(chunk.value);
         }
     }
     async $reportResponseDone(requestId, err) {
@@ -129,7 +129,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
             try {
                 for await (const part of response.stream) {
                     this._logService.trace('[CHAT] request PART', extension.value, requestId, part);
-                    await this._proxy.$acceptResponsePart(requestId, part);
+                    await this._proxy.$acceptResponsePart(requestId, ( new SerializableObjectWithBuffers(part)));
                 }
                 this._logService.trace('[CHAT] request DONE', extension.value, requestId);
             }
@@ -154,7 +154,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2479, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(2483, 'Language Models'));
         const disposables = ( new DisposableStore());
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel)));
         disposables.add(toDisposable(() => {
@@ -230,7 +230,7 @@ class LanguageModelAccessAuthProvider {
     }
     confirmation(extensionName, _recreatingSession) {
         return localize(
-            2480,
+            2484,
             "The extension '{0}' wants to access the language models provided by {1}.",
             extensionName,
             this.label

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

@@ -177,9 +177,9 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2481, "Incorrect account detected")),
+            message: ( localize(2485, "Incorrect account detected")),
             detail: ( localize(
-                2482,
+                2486,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -188,11 +188,11 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2483, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2487, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2484, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2488, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -205,20 +205,20 @@ let MainThreadMcp = class MainThreadMcp extends Disposable {
     async loginPrompt(mcpLabel, providerLabel, recreatingSession) {
         const message = recreatingSession
             ? ( localize(
-            2485,
+            2489,
             "The MCP Server Definition '{0}' wants you to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ))
             : ( localize(
-            2486,
+            2490,
             "The MCP Server Definition '{0}' wants to authenticate to {1}.",
             mcpLabel,
             providerLabel
         ));
         const buttons = [
             {
-                label: ( localize(2487, "&&Allow")),
+                label: ( localize(2491, "&&Allow")),
                 run() {
                     return true;
                 },

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

@@ -60,13 +60,13 @@ let MainThreadMessageService = class MainThreadMessageService {
                 sourceIsUrgent = MainThreadMessageService_1.URGENT_NOTIFICATION_SOURCES.includes(source.id);
             }
             if (!source) {
-                source = ( localize(2488, "Extension"));
+                source = ( localize(2492, "Extension"));
             }
             const secondaryActions = [];
             if (options.source) {
                 secondaryActions.push(toAction({
                     id: options.source.identifier.value,
-                    label: ( localize(2489, "Manage Extension")),
+                    label: ( localize(2493, "Manage Extension")),
                     run: () => {
                         return this._commandService.executeCommand('_extensions.manage', options.source.identifier.value);
                     }
@@ -103,13 +103,13 @@ let MainThreadMessageService = class MainThreadMessageService {
         if (!cancelButton) {
             if (buttons.length > 0) {
                 cancelButton = {
-                    label: ( localize(2490, "Cancel")),
+                    label: ( localize(2494, "Cancel")),
                     run: () => undefined
                 };
             }
             else {
                 cancelButton = {
-                    label: ( localize(2491, "&&OK")),
+                    label: ( localize(2495, "&&OK")),
                     run: () => undefined
                 };
             }

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

@@ -18,6 +18,7 @@ import { SerializableObjectWithBuffers } from '@codingame/monaco-vscode-api/vsco
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { FileOperationError } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 
 let MainThreadNotebooks = class MainThreadNotebooks {
     constructor(extHostContext, _notebookService, _cellStatusBarService, _logService) {
@@ -64,6 +65,9 @@ let MainThreadNotebooks = class MainThreadNotebooks {
             },
             save: async (uri, versionId, options, token) => {
                 const stat = await this._proxy.$saveNotebook(handle, uri, versionId, options, token);
+                if (isFileOperationError(stat)) {
+                    throw ( new FileOperationError(stat.message, stat.fileOperationResult, stat.options));
+                }
                 return {
                     ...stat,
                     children: undefined,
@@ -192,5 +196,8 @@ CommandsRegistry.registerCommand('_executeNotebookToData', async (accessor, ...a
     const bytes = await info.serializer.notebookToData(data);
     return bytes;
 });
+function isFileOperationError(error) {
+    return typeof error.fileOperationResult === 'number' && typeof error.message === 'string';
+}
 
 export { MainThreadNotebooks };

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

@@ -8,7 +8,7 @@ import { MainThreadNotebookDocuments } from './mainThreadNotebookDocuments.js';
 import { NotebookDto } from './mainThreadNotebookDto.js';
 import { MainThreadNotebookEditors } from './mainThreadNotebookEditors.js';
 import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { editorGroupToColumn } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
 import { INotebookService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service';

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

@@ -7,7 +7,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
 import { getNotebookEditorFromEditorPane } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { INotebookEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/services/notebookEditorService.service';
-import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ExtHostContext, NotebookEditorRevealType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';

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

@@ -6,7 +6,7 @@ import { extHostCustomer } from '../../services/extensions/common/extHostCustome
 import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { raceCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { IWorkingCopyFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyFileService.service';
-import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
+import { NotebookFileWorkingCopyModel } from '@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorModel';
 
 class ExtHostNotebookDocumentSaveParticipant {
     constructor(extHostContext) {
@@ -18,7 +18,7 @@ class ExtHostNotebookDocumentSaveParticipant {
         }
         let _warningTimeout;
         const p = ( new Promise((resolve, reject) => {
-            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2492, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
+            _warningTimeout = setTimeout(() => reject(( new Error(( localize(2496, "Aborted onWillSaveNotebookDocument-event after 1750ms"))))), 1750);
             this._proxy.$participateInSave(workingCopy.resource, context.reason, token).then(_ => {
                 clearTimeout(_warningTimeout);
                 return undefined;