@codingame/monaco-vscode-api 1.82.6 → 1.83.0-next.0

package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js

@@ -5,6 +5,7 @@ import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
 import * as performance from 'monaco-editor/esm/vs/base/common/performance.js';
+import { isCI } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { isEqualOrParent } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { StopWatch } from 'monaco-editor/esm/vs/base/common/stopwatch.js';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
@@ -109,10 +110,16 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                     toRemove.push(extension);
                 }
             }
+            if (isCI) {
+                this._logService.info(`AbstractExtensionService.onEnablementChanged fired for ${( ( extensions.map(e => e.identifier.id))).join(', ')}`);
+            }
             this._handleDeltaExtensions(( (new DeltaExtensionsQueueItem(toAdd, toRemove))));
         }));
         this._register(this._extensionManagementService.onDidChangeProfile(({ added, removed }) => {
             if (added.length || removed.length) {
+                if (isCI) {
+                    this._logService.info(`AbstractExtensionService.onDidChangeProfile fired`);
+                }
                 this._handleDeltaExtensions(( (new DeltaExtensionsQueueItem(added, removed))));
             }
         }));
@@ -124,11 +131,17 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
                 }
             }
             if (extensions.length) {
+                if (isCI) {
+                    this._logService.info(`AbstractExtensionService.onDidInstallExtensions fired for ${( ( extensions.map(e => e.identifier.id))).join(', ')}`);
+                }
                 this._handleDeltaExtensions(( (new DeltaExtensionsQueueItem(extensions, []))));
             }
         }));
         this._register(this._extensionManagementService.onDidUninstallExtension((event) => {
             if (!event.error) {
+                if (isCI) {
+                    this._logService.info(`AbstractExtensionService.onDidUninstallExtension fired for ${event.identifier.id}`);
+                }
                 this._handleDeltaExtensions(( (new DeltaExtensionsQueueItem([], [event.identifier.id]))));
             }
         }));
@@ -170,6 +183,9 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         }
     }
     async _deltaExtensions(lock, _toAdd, _toRemove) {
+        if (isCI) {
+            this._logService.info(`AbstractExtensionService._deltaExtensions: toAdd: [${( ( _toAdd.map(e => e.identifier.id))).join(',')}] toRemove: [${( ( _toRemove.map(e => typeof e === 'string' ? e : e.identifier.id))).join(',')}]`);
+        }
         let toRemove = [];
         for (let i = 0, len = _toRemove.length; i < len; i++) {
             const extensionOrId = _toRemove[i];
@@ -216,23 +232,28 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
             });
         }
         this._doHandleExtensionPoints([].concat(toAdd).concat(toRemove));
-        await this._updateExtensionsOnExtHosts(toAdd, ( (toRemove.map(e => e.identifier))));
+        await this._updateExtensionsOnExtHosts(result.versionId, toAdd, ( (toRemove.map(e => e.identifier))));
         for (let i = 0; i < toAdd.length; i++) {
             this._activateAddedExtensionIfNeeded(toAdd[i]);
         }
     }
-    async _updateExtensionsOnExtHosts(toAdd, toRemove) {
+    async _updateExtensionsOnExtHosts(versionId, toAdd, toRemove) {
         const removedRunningLocation = this._runningLocations.deltaExtensions(toAdd, toRemove);
         const promises = ( (this._extensionHostManagers.map(
-            extHostManager => this._updateExtensionsOnExtHost(extHostManager, toAdd, toRemove, removedRunningLocation)
+            extHostManager => this._updateExtensionsOnExtHost(extHostManager, versionId, toAdd, toRemove, removedRunningLocation)
         )));
         await Promise.all(promises);
     }
-    async _updateExtensionsOnExtHost(extensionHostManager, toAdd, toRemove, removedRunningLocation) {
+    async _updateExtensionsOnExtHost(extensionHostManager, versionId, toAdd, toRemove, removedRunningLocation) {
         const myToAdd = this._runningLocations.filterByExtensionHostManager(toAdd, extensionHostManager);
         const myToRemove = filterExtensionIdentifiers(toRemove, removedRunningLocation, extRunningLocation => extensionHostManager.representsRunningLocation(extRunningLocation));
         const addActivationEvents = ImplicitActivationEvents.createActivationEventsMap(toAdd);
-        await extensionHostManager.deltaExtensions({ toRemove, toAdd, addActivationEvents, myToRemove, myToAdd: ( (myToAdd.map(extension => extension.identifier))) });
+        if (isCI) {
+            const printExtIds = (extensions) => ( (extensions.map(e => e.identifier.value))).join(',');
+            const printIds = (extensions) => ( (extensions.map(e => e.value))).join(',');
+            this._logService.info(`AbstractExtensionService: Calling deltaExtensions: toRemove: [${printIds(toRemove)}], toAdd: [${printExtIds(toAdd)}], myToRemove: [${printIds(myToRemove)}], myToAdd: [${printExtIds(myToAdd)}],`);
+        }
+        await extensionHostManager.deltaExtensions({ versionId, toRemove, toAdd, addActivationEvents, myToRemove, myToAdd: ( (myToAdd.map(extension => extension.identifier))) });
     }
     canAddExtension(extension) {
         return this._canAddExtension(extension, []);
@@ -324,11 +345,11 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         try {
             const resolvedExtensions = await this._resolveExtensions();
             this._processExtensions(lock, resolvedExtensions);
-            const allExtensions = this._registry.getAllExtensionDescriptions();
+            const snapshot = this._registry.getSnapshot();
             for (const extHostManager of this._extensionHostManagers) {
                 if (extHostManager.startup !== 1 ) {
-                    const extensions = this._runningLocations.filterByExtensionHostManager(allExtensions, extHostManager);
-                    extHostManager.start(allExtensions, ( (extensions.map(extension => extension.identifier))));
+                    const extensions = this._runningLocations.filterByExtensionHostManager(snapshot.extensions, extHostManager);
+                    extHostManager.start(snapshot.versionId, snapshot.extensions, ( (extensions.map(extension => extension.identifier))));
                 }
             }
         }
@@ -341,8 +362,8 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
     }
     _processExtensions(lock, resolvedExtensions) {
         const { allowRemoteExtensionsInLocalWebWorker, hasLocalProcess } = resolvedExtensions;
-        const localExtensions = checkEnabledAndProposedAPI(this._extensionEnablementService, this._extensionsProposedApi, resolvedExtensions.local, false);
-        let remoteExtensions = checkEnabledAndProposedAPI(this._extensionEnablementService, this._extensionsProposedApi, resolvedExtensions.remote, false);
+        const localExtensions = checkEnabledAndProposedAPI(this._logService, this._extensionEnablementService, this._extensionsProposedApi, resolvedExtensions.local, false);
+        let remoteExtensions = checkEnabledAndProposedAPI(this._logService, this._extensionEnablementService, this._extensionsProposedApi, resolvedExtensions.remote, false);
         this._runningLocations.initializeRunningLocation(localExtensions, remoteExtensions);
         this._startExtensionHostsIfNecessary(true, []);
         const remoteExtensionsThatNeedToRunLocally = (allowRemoteExtensionsInLocalWebWorker ? this._runningLocations.filterByExtensionHostKind(remoteExtensions, 2 ) : []);
@@ -386,8 +407,14 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
         let exitCode;
         try {
             exitCode = await extensionHostManager.extensionTestsExecute();
+            if (isCI) {
+                this._logService.info(`Extension host test runner exit code: ${exitCode}`);
+            }
         }
         catch (err) {
+            if (isCI) {
+                this._logService.error(`Extension host test runner error`, err);
+            }
             console.error(err);
             exitCode = 1 ;
         }
@@ -746,8 +773,8 @@ let AbstractExtensionService = AbstractExtensionService_1 = class AbstractExtens
     get extensions() {
         return this._registry.getAllExtensionDescriptions();
     }
-    _getExtensions() {
-        return this._installedExtensionsReady.wait().then(() => this.extensions);
+    _getExtensionRegistrySnapshotWhenReady() {
+        return this._installedExtensionsReady.wait().then(() => this._registry.getSnapshot());
     }
     getExtension(id) {
         return this._installedExtensionsReady.wait().then(() => {
@@ -951,10 +978,10 @@ class DeltaExtensionsQueueItem {
         this.toRemove = toRemove;
     }
 }
-function checkEnabledAndProposedAPI(extensionEnablementService, extensionsProposedApi, extensions, ignoreWorkspaceTrust) {
-    return filterEnabledExtensions(extensionEnablementService, extensions, ignoreWorkspaceTrust);
+function checkEnabledAndProposedAPI(logService, extensionEnablementService, extensionsProposedApi, extensions, ignoreWorkspaceTrust) {
+    return filterEnabledExtensions(logService, extensionEnablementService, extensions, ignoreWorkspaceTrust);
 }
-function filterEnabledExtensions(extensionEnablementService, extensions, ignoreWorkspaceTrust) {
+function filterEnabledExtensions(logService, extensionEnablementService, extensions, ignoreWorkspaceTrust) {
     const enabledExtensions = [], extensionsToCheck = [], mappedExtensions = [];
     for (const extension of extensions) {
         if (extension.isUnderDevelopment) {
@@ -970,6 +997,11 @@ function filterEnabledExtensions(extensionEnablementService, extensions, ignoreW
         if (extensionEnablementService.isEnabledEnablementState(enablementStates[index])) {
             enabledExtensions.push(extensionsToCheck[index]);
         }
+        else {
+            if (isCI) {
+                logService.info(`filterEnabledExtensions: extension '${extensionsToCheck[index].identifier.value}' is disabled`);
+            }
+        }
     }
     return enabledExtensions;
 }

package/vscode/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.d.ts

@@ -1,9 +1,10 @@
 import { Event } from '../../../../base/common/event.js';
-import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IExtensionDescription, ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 
 declare class DeltaExtensionsResult {
+    readonly versionId: number;
     readonly removedDueToLooping: IExtensionDescription[];
-    constructor(removedDueToLooping: IExtensionDescription[]);
+    constructor(versionId: number, removedDueToLooping: IExtensionDescription[]);
 }
 interface IReadOnlyExtensionDescriptionRegistry {
     containsActivationEvent(activationEvent: string): boolean;
@@ -19,25 +20,34 @@ declare class ExtensionDescriptionRegistry implements IReadOnlyExtensionDescript
     static isHostExtension(extensionId: ExtensionIdentifier | string, myRegistry: ExtensionDescriptionRegistry, globalRegistry: ExtensionDescriptionRegistry): boolean;
     private readonly _onDidChange;
     readonly onDidChange: Event<void>;
+    private _versionId;
     private _extensionDescriptions;
     private _extensionsMap;
     private _extensionsArr;
     private _activationMap;
     constructor(_activationEventsReader: IActivationEventsReader, extensionDescriptions: IExtensionDescription[]);
     private _initialize;
-    set(extensionDescriptions: IExtensionDescription[]): void;
+    set(extensionDescriptions: IExtensionDescription[]): {
+        versionId: number;
+    };
     deltaExtensions(toAdd: IExtensionDescription[], toRemove: ExtensionIdentifier[]): DeltaExtensionsResult;
     private static _findLoopingExtensions;
     containsActivationEvent(activationEvent: string): boolean;
     containsExtension(extensionId: ExtensionIdentifier): boolean;
     getExtensionDescriptionsForActivationEvent(activationEvent: string): IExtensionDescription[];
     getAllExtensionDescriptions(): IExtensionDescription[];
+    getSnapshot(): ExtensionDescriptionRegistrySnapshot;
     getExtensionDescription(extensionId: ExtensionIdentifier | string): IExtensionDescription | undefined;
     getExtensionDescriptionByUUID(uuid: string): IExtensionDescription | undefined;
     getExtensionDescriptionByIdOrUUID(extensionId: ExtensionIdentifier | string, uuid: string | undefined): IExtensionDescription | undefined;
 }
+declare class ExtensionDescriptionRegistrySnapshot {
+    readonly versionId: number;
+    readonly extensions: readonly IExtensionDescription[];
+    constructor(versionId: number, extensions: readonly IExtensionDescription[]);
+}
 interface IActivationEventsReader {
     readActivationEvents(extensionDescription: IExtensionDescription): string[] | undefined;
 }
 
-export { DeltaExtensionsResult, ExtensionDescriptionRegistry, type IActivationEventsReader, type IReadOnlyExtensionDescriptionRegistry };
+export { DeltaExtensionsResult, ExtensionDescriptionRegistry, ExtensionDescriptionRegistrySnapshot, type IActivationEventsReader, type IReadOnlyExtensionDescriptionRegistry };

package/vscode/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.js

@@ -3,7 +3,8 @@ import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import * as path from 'monaco-editor/esm/vs/base/common/path.js';
 import { Disposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 class DeltaExtensionsResult {
-    constructor(removedDueToLooping) {
+    constructor(versionId, removedDueToLooping) {
+        this.versionId = versionId;
         this.removedDueToLooping = removedDueToLooping;
     }
 }
@@ -25,6 +26,7 @@ class ExtensionDescriptionRegistry {
         this._activationEventsReader = _activationEventsReader;
         this._onDidChange = ( new Emitter());
         this.onDidChange = this._onDidChange.event;
+        this._versionId = 0;
         this._extensionDescriptions = extensionDescriptions;
         this._initialize();
     }
@@ -57,7 +59,11 @@ class ExtensionDescriptionRegistry {
     set(extensionDescriptions) {
         this._extensionDescriptions = extensionDescriptions;
         this._initialize();
+        this._versionId++;
         this._onDidChange.fire(undefined);
+        return {
+            versionId: this._versionId
+        };
     }
     deltaExtensions(toAdd, toRemove) {
         this._extensionDescriptions = removeExtensions(this._extensionDescriptions, toRemove);
@@ -65,8 +71,9 @@ class ExtensionDescriptionRegistry {
         const looping = ExtensionDescriptionRegistry._findLoopingExtensions(this._extensionDescriptions);
         this._extensionDescriptions = removeExtensions(this._extensionDescriptions, ( looping.map(ext => ext.identifier)));
         this._initialize();
+        this._versionId++;
         this._onDidChange.fire(undefined);
-        return ( new DeltaExtensionsResult(looping));
+        return ( new DeltaExtensionsResult(this._versionId, looping));
     }
     static _findLoopingExtensions(extensionDescriptions) {
         const G = new (class {
@@ -150,6 +157,9 @@ class ExtensionDescriptionRegistry {
     getAllExtensionDescriptions() {
         return this._extensionsArr.slice(0);
     }
+    getSnapshot() {
+        return ( new ExtensionDescriptionRegistrySnapshot(this._versionId, this.getAllExtensionDescriptions()));
+    }
     getExtensionDescription(extensionId) {
         const extension = this._extensionsMap.get(extensionId);
         return extension ? extension : undefined;
@@ -167,6 +177,12 @@ class ExtensionDescriptionRegistry {
             ?? (uuid ? this.getExtensionDescriptionByUUID(uuid) : undefined));
     }
 }
+class ExtensionDescriptionRegistrySnapshot {
+    constructor(versionId, extensions) {
+        this.versionId = versionId;
+        this.extensions = extensions;
+    }
+}
 class LockableExtensionDescriptionRegistry {
     constructor(activationEventsReader) {
         this._lock = ( new Lock());
@@ -194,6 +210,9 @@ class LockableExtensionDescriptionRegistry {
     getAllExtensionDescriptions() {
         return this._actual.getAllExtensionDescriptions();
     }
+    getSnapshot() {
+        return this._actual.getSnapshot();
+    }
     getExtensionDescription(extensionId) {
         return this._actual.getExtensionDescription(extensionId);
     }
@@ -284,4 +303,4 @@ function removeExtensions(arr, toRemove) {
     const toRemoveSet = ( new ExtensionIdentifierSet(toRemove));
     return arr.filter(extension => !( toRemoveSet.has(extension.identifier)));
 }
-export { DeltaExtensionsResult, ExtensionDescriptionRegistry, ExtensionDescriptionRegistryLock, LockableExtensionDescriptionRegistry };
+export { DeltaExtensionsResult, ExtensionDescriptionRegistry, ExtensionDescriptionRegistryLock, ExtensionDescriptionRegistrySnapshot, LockableExtensionDescriptionRegistry };

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.d.ts

@@ -27,7 +27,7 @@ interface IExtensionHostManager {
      * Returns `null` if no resolver for `remoteAuthority` is found.
      */
     getCanonicalURI(remoteAuthority: string, uri: URI): Promise<URI | null>;
-    start(allExtensions: IExtensionDescription[], myExtensions: ExtensionIdentifier[]): Promise<void>;
+    start(extensionRegistryVersionId: number, allExtensions: readonly IExtensionDescription[], myExtensions: ExtensionIdentifier[]): Promise<void>;
     extensionTestsExecute(): Promise<number>;
     setRemoteEnvironment(env: {
         [key: string]: string | null;

package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js

@@ -312,12 +312,12 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
         }
         return proxy.getCanonicalURI(remoteAuthority, uri);
     }
-    async start(allExtensions, myExtensions) {
+    async start(extensionRegistryVersionId, allExtensions, myExtensions) {
         const proxy = await this._proxy;
         if (!proxy) {
             return;
         }
-        const deltaExtensions = this._extensionHost.extensions.set(allExtensions, myExtensions);
+        const deltaExtensions = this._extensionHost.extensions.set(extensionRegistryVersionId, allExtensions, myExtensions);
         return proxy.startExtensionHost(deltaExtensions);
     }
     async extensionTestsExecute() {
@@ -330,16 +330,19 @@ let ExtensionHostManager = ExtensionHostManager_1 = class ExtensionHostManager e
     representsRunningLocation(runningLocation) {
         return this._extensionHost.runningLocation.equals(runningLocation);
     }
-    async deltaExtensions(extensionsDelta) {
+    async deltaExtensions(incomingExtensionsDelta) {
         const proxy = await this._proxy;
         if (!proxy) {
             return;
         }
-        this._extensionHost.extensions.delta(extensionsDelta);
-        return proxy.deltaExtensions(extensionsDelta);
+        const outgoingExtensionsDelta = this._extensionHost.extensions.delta(incomingExtensionsDelta);
+        if (!outgoingExtensionsDelta) {
+            return;
+        }
+        return proxy.deltaExtensions(outgoingExtensionsDelta);
     }
     containsExtension(extensionId) {
-        return this._extensionHost.extensions.containsExtension(extensionId);
+        return this._extensionHost.extensions?.containsExtension(extensionId) ?? false;
     }
     async setRemoteEnvironment(env) {
         const proxy = await this._proxy;
@@ -386,7 +389,7 @@ let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extend
             return this._actual;
         }
         const actual = this._createActual(reason);
-        await actual.start([], []);
+        await actual.start(this._lazyStartExtensions.versionId, this._lazyStartExtensions.allExtensions, this._lazyStartExtensions.myExtensions);
         return actual;
     }
     async ready() {
@@ -406,13 +409,12 @@ let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extend
         this._lazyStartExtensions.delta(extensionsDelta);
         if (extensionsDelta.myToAdd.length > 0) {
             const actual = this._createActual(`contains ${extensionsDelta.myToAdd.length} new extension(s) (installed or enabled): ${( ( extensionsDelta.myToAdd.map(extId => extId.value)))}`);
-            const { toAdd, myToAdd } = this._lazyStartExtensions.toDelta();
-            actual.start(toAdd, myToAdd);
+            await actual.start(this._lazyStartExtensions.versionId, this._lazyStartExtensions.allExtensions, this._lazyStartExtensions.myExtensions);
             return;
         }
     }
     containsExtension(extensionId) {
-        return this._extensionHost.extensions.containsExtension(extensionId);
+        return this._extensionHost.extensions?.containsExtension(extensionId) ?? false;
     }
     async activate(extension, reason) {
         await this._startCalled.wait();
@@ -470,15 +472,14 @@ let LazyCreateExtensionHostManager = class LazyCreateExtensionHostManager extend
         }
         throw new Error(`Cannot resolve canonical URI`);
     }
-    async start(allExtensions, myExtensions) {
+    async start(extensionRegistryVersionId, allExtensions, myExtensions) {
         if (myExtensions.length > 0) {
             const actual = this._createActual(`contains ${myExtensions.length} extension(s): ${( ( myExtensions.map(extId => extId.value)))}.`);
-            const result = actual.start(allExtensions, myExtensions);
+            const result = actual.start(extensionRegistryVersionId, allExtensions, myExtensions);
             this._startCalled.open();
             return result;
         }
-        this._lazyStartExtensions = ( (new ExtensionHostExtensions()));
-        this._lazyStartExtensions.set(allExtensions, myExtensions);
+        this._lazyStartExtensions = ( (new ExtensionHostExtensions(extensionRegistryVersionId, allExtensions, myExtensions)));
         this._startCalled.open();
     }
     async extensionTestsExecute() {

package/vscode/src/vs/workbench/services/extensions/common/extensionHostProtocol.d.ts

@@ -1,9 +1,18 @@
 import { URI, UriDto, UriComponents } from '../../../../base/common/uri.js';
-import { ExtensionIdentifier, IExtensionDescription } from '../../../../platform/extensions/common/extensions.js';
+import { IExtensionDescription, ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { LogLevel, ILoggerResource } from '../../../../platform/log/common/log.js';
 import { IRemoteConnectionData } from '../../../../platform/remote/common/remoteAuthorityResolver.js';
 
+interface IExtensionDescriptionSnapshot {
+    readonly versionId: number;
+    readonly allExtensions: IExtensionDescription[];
+    readonly activationEvents: {
+        [extensionId: string]: string[];
+    };
+    readonly myExtensions: ExtensionIdentifier[];
+}
 interface IExtensionDescriptionDelta {
+    readonly versionId: number;
     readonly toRemove: ExtensionIdentifier[];
     readonly toAdd: IExtensionDescription[];
     readonly addActivationEvents: {
@@ -22,11 +31,7 @@ interface IExtensionHostInitData {
     parentPid: number | 0;
     environment: IEnvironment;
     workspace?: IStaticWorkspaceData | null;
-    activationEvents: {
-        [extensionId: string]: string[];
-    };
-    allExtensions: IExtensionDescription[];
-    myExtensions: ExtensionIdentifier[];
+    extensions: IExtensionDescriptionSnapshot;
     nlsBaseUrl?: URI;
     telemetryInfo: {
         readonly sessionId: string;
@@ -85,4 +90,4 @@ declare enum UIKind {
     Web = 2
 }
 
-export { type IEnvironment, type IExtensionDescriptionDelta, type IExtensionHostInitData, type IStaticWorkspaceData, type MessagePortLike, UIKind };
+export { type IEnvironment, type IExtensionDescriptionDelta, type IExtensionDescriptionSnapshot, type IExtensionHostInitData, type IStaticWorkspaceData, type MessagePortLike, UIKind };

package/vscode/src/vs/workbench/services/extensions/common/extensions.d.ts

@@ -4,7 +4,7 @@ import { Event } from '../../../../base/common/event.js';
 import Severity from '../../../../base/common/severity.js';
 import { IMessagePassingProtocol } from '../../../../base/parts/ipc/common/ipc.js';
 import { ExtensionHostKind } from './extensionHostKind.js';
-import { IExtensionDescriptionDelta } from './extensionHostProtocol.js';
+import { IExtensionDescriptionSnapshot, IExtensionDescriptionDelta } from './extensionHostProtocol.js';
 import { ExtensionRunningLocation } from './extensionRunningLocation.js';
 import { IExtensionPoint } from './extensionsRegistry.js';
 
@@ -49,7 +49,7 @@ interface IExtensionHost {
      * extension will execute or is executing on this extension host.
      * **NOTE**: this will reflect extensions correctly only after `start()` resolves.
      */
-    readonly extensions: ExtensionHostExtensions;
+    readonly extensions: ExtensionHostExtensions | null;
     readonly onExit: Event<[number, string | null]>;
     start(): Promise<IMessagePassingProtocol>;
     getInspectPort(): number | undefined;
@@ -57,12 +57,16 @@ interface IExtensionHost {
     dispose(): void;
 }
 declare class ExtensionHostExtensions {
+    private _versionId;
     private _allExtensions;
     private _myExtensions;
-    constructor();
-    toDelta(): IExtensionDescriptionDelta;
-    set(allExtensions: IExtensionDescription[], myExtensions: ExtensionIdentifier[]): IExtensionDescriptionDelta;
-    delta(extensionsDelta: IExtensionDescriptionDelta): void;
+    get versionId(): number;
+    get allExtensions(): IExtensionDescription[];
+    get myExtensions(): ExtensionIdentifier[];
+    constructor(versionId: number, allExtensions: readonly IExtensionDescription[], myExtensions: ExtensionIdentifier[]);
+    toSnapshot(): IExtensionDescriptionSnapshot;
+    set(versionId: number, allExtensions: IExtensionDescription[], myExtensions: ExtensionIdentifier[]): IExtensionDescriptionDelta;
+    delta(extensionsDelta: IExtensionDescriptionDelta): IExtensionDescriptionDelta | null;
     containsExtension(extensionId: ExtensionIdentifier): boolean;
 }
 interface ExtensionActivationReason {

package/vscode/src/vs/workbench/services/extensions/common/extensions.js

@@ -23,20 +23,32 @@ class MissingExtensionDependency {
     }
 }
 class ExtensionHostExtensions {
-    constructor() {
-        this._allExtensions = [];
-        this._myExtensions = [];
+    get versionId() {
+        return this._versionId;
+    }
+    get allExtensions() {
+        return this._allExtensions;
+    }
+    get myExtensions() {
+        return this._myExtensions;
     }
-    toDelta() {
+    constructor(versionId, allExtensions, myExtensions) {
+        this._versionId = versionId;
+        this._allExtensions = allExtensions.slice(0);
+        this._myExtensions = myExtensions.slice(0);
+    }
+    toSnapshot() {
         return {
-            toRemove: [],
-            toAdd: this._allExtensions,
-            addActivationEvents: ImplicitActivationEvents.createActivationEventsMap(this._allExtensions),
-            myToRemove: [],
-            myToAdd: this._myExtensions
+            versionId: this._versionId,
+            allExtensions: this._allExtensions,
+            myExtensions: this._myExtensions,
+            activationEvents: ImplicitActivationEvents.createActivationEventsMap(this._allExtensions)
         };
     }
-    set(allExtensions, myExtensions) {
+    set(versionId, allExtensions, myExtensions) {
+        if (this._versionId > versionId) {
+            throw new Error(`ExtensionHostExtensions: invalid versionId ${versionId} (current: ${this._versionId})`);
+        }
         const toRemove = [];
         const toAdd = [];
         const myToRemove = [];
@@ -86,11 +98,14 @@ class ExtensionHostExtensions {
             }
         }
         const addActivationEvents = ImplicitActivationEvents.createActivationEventsMap(toAdd);
-        const delta = { toRemove, toAdd, addActivationEvents, myToRemove, myToAdd };
+        const delta = { versionId, toRemove, toAdd, addActivationEvents, myToRemove, myToAdd };
         this.delta(delta);
         return delta;
     }
     delta(extensionsDelta) {
+        if (this._versionId >= extensionsDelta.versionId) {
+            return null;
+        }
         const { toRemove, toAdd, myToRemove, myToAdd } = extensionsDelta;
         const toRemoveSet = ( new ExtensionIdentifierSet(toRemove));
         const myToRemoveSet = ( new ExtensionIdentifierSet(myToRemove));
@@ -112,6 +127,7 @@ class ExtensionHostExtensions {
         for (const extensionId of myToAdd) {
             this._myExtensions.push(extensionId);
         }
+        return extensionsDelta;
     }
     containsExtension(extensionId) {
         for (const myExtensionId of this._myExtensions) {

package/vscode/src/vs/workbench/services/extensions/common/extensionsApiProposals.js

@@ -4,6 +4,7 @@ const allApiProposals = ( Object.freeze({
     authSession: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.authSession.d.ts',
     canonicalUriProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.canonicalUriProvider.d.ts',
     chat: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chat.d.ts',
+    chatAgents: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatAgents.d.ts',
     chatProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',
     chatRequestAccess: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatRequestAccess.d.ts',
     chatSlashCommands: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatSlashCommands.d.ts',
@@ -33,7 +34,6 @@ const allApiProposals = ( Object.freeze({
     dropMetadata: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.dropMetadata.d.ts',
     editSessionIdentityProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editSessionIdentityProvider.d.ts',
     editorInsets: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.editorInsets.d.ts',
-    envShellEvent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.envShellEvent.d.ts',
     extensionRuntime: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionRuntime.d.ts',
     extensionsAny: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.extensionsAny.d.ts',
     externalUriOpener: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.externalUriOpener.d.ts',
@@ -43,16 +43,13 @@ const allApiProposals = ( Object.freeze({
     fsChunks: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.fsChunks.d.ts',
     handleIssueUri: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.handleIssueUri.d.ts',
     idToken: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.idToken.d.ts',
-    indentSize: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.indentSize.d.ts',
     inlineCompletionsAdditions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts',
     interactive: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactive.d.ts',
     interactiveUserActions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactiveUserActions.d.ts',
     interactiveWindow: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.interactiveWindow.d.ts',
     ipc: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.ipc.d.ts',
-    languageConfigurationAutoClosingPairs: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageConfigurationAutoClosingPairs.d.ts',
     mappedEditsProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts',
     notebookCellExecutionState: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCellExecutionState.d.ts',
-    notebookCodeActions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookCodeActions.d.ts',
     notebookControllerAffinityHidden: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookControllerAffinityHidden.d.ts',
     notebookDeprecated: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookDeprecated.d.ts',
     notebookExecution: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.notebookExecution.d.ts',
@@ -69,6 +66,7 @@ const allApiProposals = ( Object.freeze({
     resolvers: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.resolvers.d.ts',
     saveEditor: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.saveEditor.d.ts',
     scmActionButton: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmActionButton.d.ts',
+    scmHistoryProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts',
     scmSelectedProvider: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmSelectedProvider.d.ts',
     scmTextDocument: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmTextDocument.d.ts',
     scmValidation: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.scmValidation.d.ts',
@@ -77,7 +75,6 @@ const allApiProposals = ( Object.freeze({
     tabInputTextMerge: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.tabInputTextMerge.d.ts',
     taskPresentationGroup: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskPresentationGroup.d.ts',
     telemetry: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.telemetry.d.ts',
-    terminalContextMenu: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalContextMenu.d.ts',
     terminalDataWriteEvent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalDataWriteEvent.d.ts',
     terminalDimensions: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalDimensions.d.ts',
     terminalExecuteCommandEvent: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalExecuteCommandEvent.d.ts',