@codingame/monaco-vscode-api 31.0.0 → 32.0.0

package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.d.ts

@@ -8,6 +8,7 @@ import { IAnyWorkspaceIdentifier } from "../../workspace/common/workspace.js";
 import { IStringDictionary } from "../../../base/common/collections.js";
 import { IUriIdentityService } from "../../uriIdentity/common/uriIdentity.service.js";
 import { IUserDataProfilesService } from "./userDataProfile.service.js";
+export declare const AGENTS_WINDOW_PROFILE_ID = "agents";
 export declare enum ProfileResourceType {
     Settings = "settings",
     Keybindings = "keybindings",
@@ -41,9 +42,12 @@ export interface IUserDataProfile {
     readonly promptsHome: URI;
     readonly extensionsResource: URI;
     readonly mcpResource: URI;
+    readonly agentPluginsHome: URI;
     readonly cacheHome: URI;
     readonly useDefaultFlags?: UseDefaultProfileFlags;
+    readonly isInternal?: boolean;
     readonly isTransient?: boolean;
+    readonly isAgentsWindowProfile?: boolean;
     readonly workspaces?: readonly URI[];
 }
 export declare function isUserDataProfile(thing: unknown): thing is IUserDataProfile;
@@ -91,7 +95,6 @@ export type StoredUserDataProfile = {
     location: URI;
     icon?: string;
     useDefaultFlags?: UseDefaultProfileFlags;
-    isSystem?: boolean;
 };
 export type StoredProfileAssociations = {
     workspaces?: IStringDictionary<string>;
@@ -124,7 +127,28 @@ export declare class UserDataProfilesService extends Disposable implements IUser
     protected _profilesObject: UserDataProfilesObject | undefined;
     protected get profilesObject(): UserDataProfilesObject;
     private isInvalidProfile;
-    private createDefaultProfile;
+    protected createDefaultProfile(): {
+        extensionsResource: URI;
+        isDefault: boolean;
+        id: string;
+        name: string;
+        icon?: string;
+        location: URI;
+        globalStorageHome: URI;
+        settingsResource: URI;
+        keybindingsResource: URI;
+        tasksResource: URI;
+        snippetsHome: URI;
+        promptsHome: URI;
+        mcpResource: URI;
+        agentPluginsHome: URI;
+        cacheHome: URI;
+        useDefaultFlags?: UseDefaultProfileFlags;
+        isInternal?: boolean;
+        isTransient?: boolean;
+        isAgentsWindowProfile?: boolean;
+        workspaces?: readonly URI[];
+    };
     createTransientProfile(workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile>;
     createNamedProfile(name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile>;
     createProfile(id: string, name: string, options?: IUserDataProfileOptions, workspaceIdentifier?: IAnyWorkspaceIdentifier): Promise<IUserDataProfile>;

package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.js

@@ -17,6 +17,16 @@ import { generateUuid } from '../../../base/common/uuid.js';
 import { escapeRegExpCharacters } from '../../../base/common/strings.js';
 import { isString } from '../../../base/common/types.js';
 
+const AGENTS_WINDOW_PROFILE_ID = "agents";
+const AGENTS_WINDOW_PROFILE_FLAGS = {
+    settings: true,
+    keybindings: true,
+    prompts: true,
+    mcp: true,
+    snippets: true,
+    tasks: true,
+    extensions: true
+};
 var ProfileResourceType;
 (function(ProfileResourceType) {
     ProfileResourceType["Settings"] = "settings";
@@ -30,7 +40,7 @@ var ProfileResourceType;
 })(ProfileResourceType || (ProfileResourceType = {}));
 function isUserDataProfile(thing) {
     const candidate = thing;
-    return !!(candidate && typeof candidate === "object" && typeof candidate.id === "string" && typeof candidate.isDefault === "boolean" && typeof candidate.name === "string" && URI.isUri(candidate.location) && URI.isUri(candidate.globalStorageHome) && URI.isUri(candidate.settingsResource) && URI.isUri(candidate.keybindingsResource) && URI.isUri(candidate.tasksResource) && URI.isUri(candidate.snippetsHome) && URI.isUri(candidate.promptsHome) && URI.isUri(candidate.extensionsResource) && URI.isUri(candidate.mcpResource));
+    return !!(candidate && typeof candidate === "object" && typeof candidate.id === "string" && typeof candidate.isDefault === "boolean" && typeof candidate.name === "string" && URI.isUri(candidate.location) && URI.isUri(candidate.globalStorageHome) && URI.isUri(candidate.settingsResource) && URI.isUri(candidate.keybindingsResource) && URI.isUri(candidate.tasksResource) && URI.isUri(candidate.snippetsHome) && URI.isUri(candidate.promptsHome) && URI.isUri(candidate.extensionsResource) && URI.isUri(candidate.mcpResource) && URI.isUri(candidate.agentPluginsHome));
 }
 function reviveProfile(profile, scheme) {
     return {
@@ -65,15 +75,19 @@ function reviveProfile(profile, scheme) {
         mcpResource: URI.revive(profile.mcpResource).with({
             scheme
         }),
+        agentPluginsHome: URI.revive(profile.agentPluginsHome),
         cacheHome: URI.revive(profile.cacheHome).with({
             scheme
         }),
         useDefaultFlags: profile.useDefaultFlags,
         isTransient: profile.isTransient,
+        isInternal: profile.isInternal,
+        isAgentsWindowProfile: profile.isAgentsWindowProfile,
         workspaces: profile.workspaces?.map(w => URI.revive(w))
     };
 }
 function toUserDataProfile(id, name, location, profilesCacheHome, options, defaultProfile) {
+    const isAgentsWindowProfile = id === AGENTS_WINDOW_PROFILE_ID;
     return {
         id,
         name,
@@ -88,12 +102,16 @@ function toUserDataProfile(id, name, location, profilesCacheHome, options, defau
         promptsHome: defaultProfile && options?.useDefaultFlags?.prompts ? defaultProfile.promptsHome : joinPath(location, "prompts"),
         extensionsResource: defaultProfile && options?.useDefaultFlags?.extensions ? defaultProfile.extensionsResource : joinPath(location, "extensions.json"),
         mcpResource: defaultProfile && options?.useDefaultFlags?.mcp ? defaultProfile.mcpResource : joinPath(location, "mcp.json"),
+        agentPluginsHome: defaultProfile ? defaultProfile.agentPluginsHome : joinPath(location, "agent-plugins"),
         cacheHome: joinPath(profilesCacheHome, id),
         useDefaultFlags: options?.useDefaultFlags,
         isTransient: options?.transient,
+        isInternal: isAgentsWindowProfile || options?.transient,
+        isAgentsWindowProfile,
         workspaces: options?.workspaces
     };
 }
+const SYSTEM_PROFILES_HOME = "builtin";
 let UserDataProfilesService = class UserDataProfilesService extends Disposable {
     static {
         this.PROFILES_KEY = "userDataProfiles";
@@ -149,7 +167,7 @@ let UserDataProfilesService = class UserDataProfilesService extends Disposable {
                     profiles.push(
                         toUserDataProfile(id, storedProfile.name, storedProfile.location, this.profilesCacheHome, {
                             icon: storedProfile.icon,
-                            useDefaultFlags: storedProfile.useDefaultFlags
+                            useDefaultFlags: id === AGENTS_WINDOW_PROFILE_ID ? AGENTS_WINDOW_PROFILE_FLAGS : storedProfile.useDefaultFlags
                         }, defaultProfile)
                     );
                 }
@@ -200,16 +218,10 @@ let UserDataProfilesService = class UserDataProfilesService extends Disposable {
         if (!storedProfile.location) {
             return true;
         }
-        if (storedProfile.isSystem) {
-            return true;
-        }
-        if (this.uriIdentityService.extUri.basename(this.uriIdentityService.extUri.dirname(storedProfile.location)) === "builtin") {
-            return true;
-        }
         return false;
     }
     createDefaultProfile() {
-        const defaultProfile = toUserDataProfile("__default__profile__", ( localize(2504, "Default")), this.environmentService.userRoamingDataHome, this.profilesCacheHome);
+        const defaultProfile = toUserDataProfile("__default__profile__", ( localize(2522, "Default")), this.environmentService.userRoamingDataHome, this.profilesCacheHome);
         return {
             ...defaultProfile,
             extensionsResource: this.getDefaultProfileExtensionsLocation() ?? defaultProfile.extensionsResource,
@@ -246,7 +258,7 @@ let UserDataProfilesService = class UserDataProfilesService extends Disposable {
             profileCreationPromise = (async () => {
                 try {
                     const existing = this.profiles.find(
-                        p => p.id === id || (!p.isTransient && !options?.transient && p.name === name)
+                        p => p.id === id || (id !== AGENTS_WINDOW_PROFILE_ID && !p.isTransient && !options?.transient && p.name === name)
                     );
                     if (existing) {
                         throw ( new Error(`Profile with ${name} name already exists`));
@@ -258,14 +270,10 @@ let UserDataProfilesService = class UserDataProfilesService extends Disposable {
                             workspaces: [workspace]
                         };
                     }
-                    const profile = toUserDataProfile(
-                        id,
-                        name,
-                        this.uriIdentityService.extUri.joinPath(this.profilesHome, id),
-                        this.profilesCacheHome,
-                        options,
-                        this.defaultProfile
-                    );
+                    const profile = toUserDataProfile(id, name, this.uriIdentityService.extUri.joinPath(
+                        this.profilesHome,
+                        ...(id === AGENTS_WINDOW_PROFILE_ID ? [SYSTEM_PROFILES_HOME, id] : [id])
+                    ), this.profilesCacheHome, id === AGENTS_WINDOW_PROFILE_ID ? {} : options, this.defaultProfile);
                     await this.fileService.createFolder(profile.location);
                     const joiners = [];
                     this._onWillCreateProfile.fire({
@@ -279,7 +287,7 @@ let UserDataProfilesService = class UserDataProfilesService extends Disposable {
                         this.updateEmptyWindowAssociation(workspace, profile, !!profile.isTransient);
                     }
                     this.updateProfiles([profile], [], []);
-                    return profile;
+                    return this.profiles.find(p => p.id === profile.id) ?? profile;
                 } finally {
                     this.profileCreationPromises.delete(name);
                 }
@@ -289,6 +297,9 @@ let UserDataProfilesService = class UserDataProfilesService extends Disposable {
         return profileCreationPromise;
     }
     async updateProfile(profile, options) {
+        if (profile.isAgentsWindowProfile) {
+            throw ( new Error("Cannot update agents window profile"));
+        }
         const profilesToUpdate = [];
         for (const existing of this.profiles) {
             let profileToUpdate;
@@ -413,19 +424,9 @@ let UserDataProfilesService = class UserDataProfilesService extends Disposable {
     async cleanUp() {
         try {
             if (await this.fileService.exists(this.profilesHome)) {
-                const systemProfilesFolder = this.uriIdentityService.extUri.joinPath(this.profilesHome, "builtin");
-                if (await this.fileService.exists(systemProfilesFolder)) {
-                    try {
-                        await this.fileService.del(systemProfilesFolder, {
-                            recursive: true
-                        });
-                    } catch (error) {
-                        this.logService.error(error);
-                    }
-                }
                 const stat = await this.fileService.resolve(this.profilesHome);
                 await Promise.all(( (stat.children || []).filter(
-                    child => child.isDirectory && this.profiles.every(p => !this.uriIdentityService.extUri.isEqual(p.location, child.resource))
+                    child => child.isDirectory && child.name !== SYSTEM_PROFILES_HOME && this.profiles.every(p => !this.uriIdentityService.extUri.isEqual(p.location, child.resource))
                 ).map(child => this.fileService.del(child.resource, {
                     recursive: true
                 }))));
@@ -456,6 +457,9 @@ let UserDataProfilesService = class UserDataProfilesService extends Disposable {
     }
     getProfileForWorkspace(workspaceIdentifier) {
         const workspace = this.getWorkspace(workspaceIdentifier);
+        if (URI.isUri(workspace) && this.uriIdentityService.extUri.isEqual(workspace, this.environmentService.agentSessionsWorkspace)) {
+            return this.profiles.find(p => p.isAgentsWindowProfile);
+        }
         return URI.isUri(workspace) ? this.profiles.find(
             p => p.workspaces?.some(w => this.uriIdentityService.extUri.isEqual(w, workspace))
         ) : (this.profilesObject.emptyWindows.get(workspace) ?? this.transientProfilesObject.emptyWindows.get(workspace));
@@ -601,4 +605,4 @@ let UserDataProfilesService = class UserDataProfilesService extends Disposable {
 };
 UserDataProfilesService = ( __decorate([( __param(0, IEnvironmentService)), ( __param(1, IFileService)), ( __param(2, IUriIdentityService)), ( __param(3, ILogService))], UserDataProfilesService));
 
-export { ProfileResourceType, UserDataProfilesService, isUserDataProfile, reviveProfile, toUserDataProfile };
+export { AGENTS_WINDOW_PROFILE_ID, ProfileResourceType, UserDataProfilesService, isUserDataProfile, reviveProfile, toUserDataProfile };

package/vscode/src/vs/platform/userDataProfile/common/userDataProfileStorageService.service.d.ts

@@ -1,5 +1,5 @@
 import { Event } from "../../../base/common/event.js";
-import { StorageTarget } from "../../storage/common/storage.js";
+import { StorageTarget, StorageScope } from "../../storage/common/storage.js";
 import { IStorageService } from "../../storage/common/storage.service.js";
 import { IUserDataProfile } from "./userDataProfile.js";
 import { IProfileStorageChanges, IStorageValue } from "@codingame/monaco-vscode-user-data-profile-service-override/vscode/vs/platform/userDataProfile/common/userDataProfileStorageService";
@@ -20,8 +20,9 @@ export interface IUserDataProfileStorageService {
     * @param profile The profile to which the data has to be written to
     * @param data Data that has to be updated
     * @param target Storage target of the data
+    * @param scope Storage scope of the data (defaults to PROFILE)
     */
-    updateStorageData(profile: IUserDataProfile, data: Map<string, string | undefined | null>, target: StorageTarget): Promise<void>;
+    updateStorageData(profile: IUserDataProfile, data: Map<string, string | undefined | null>, target: StorageTarget, scope?: StorageScope): Promise<void>;
     /**
     * Calls a function with a storage service scoped to given profile.
     */

package/vscode/src/vs/platform/userDataSync/common/abstractSynchronizer.js

@@ -283,7 +283,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
     async performSync(remoteUserData, lastSyncUserData, strategy, userDataSyncConfiguration) {
         if (remoteUserData.syncData && remoteUserData.syncData.version > this.version) {
             throw ( new UserDataSyncError(( localize(
-                2505,
+                2523,
                 "Cannot sync {0} as its local version {1} is not compatible with its remote version {2}",
                 this.resource,
                 this.version,
@@ -720,7 +720,7 @@ let AbstractSynchroniser = class AbstractSynchroniser extends Disposable {
             this.logService.error(error);
         }
         throw ( new UserDataSyncError(( localize(
-            2506,
+            2524,
             "Cannot parse sync data as it is not compatible with the current version."
         )), UserDataSyncErrorCode.IncompatibleRemoteContent, this.resource));
     }

package/vscode/src/vs/platform/userDataSync/common/globalStateSync.js

@@ -369,7 +369,8 @@ let LocalGlobalStateProvider = class LocalGlobalStateProvider {
             if (value.value && value.target === StorageTarget.USER) {
                 storage[key] = {
                     version: 1,
-                    value: value.value
+                    value: value.value,
+                    scope: value.scope
                 };
             }
         }
@@ -404,7 +405,8 @@ let LocalGlobalStateProvider = class LocalGlobalStateProvider {
     ) {
         const syncResourceLogLabel = getSyncResourceLogLabel(SyncResource.GlobalState, profile);
         const argv = {};
-        const updatedStorage = ( new Map());
+        const updatedProfileStorage = ( new Map());
+        const updatedSharedStorage = profile.isDefault ? ( new Map()) : undefined;
         const storageData = await this.userDataProfileStorageService.readStorageData(profile);
         const handleUpdatedStorage = (keys, storage) => {
             for (const key of keys) {
@@ -415,11 +417,13 @@ let LocalGlobalStateProvider = class LocalGlobalStateProvider {
                 if (storage) {
                     const storageValue = storage[key];
                     if (storageValue.value !== storageData.get(key)?.value) {
-                        updatedStorage.set(key, storageValue.value);
+                        const targetMap = updatedSharedStorage && storageValue.scope === StorageScope.APPLICATION_SHARED ? updatedSharedStorage : updatedProfileStorage;
+                        targetMap.set(key, storageValue.value);
                     }
                 } else {
                     if (storageData.get(key) !== undefined) {
-                        updatedStorage.set(key, undefined);
+                        const targetMap = updatedSharedStorage && storageData.get(key)?.scope === StorageScope.APPLICATION_SHARED ? updatedSharedStorage : updatedProfileStorage;
+                        targetMap.set(key, undefined);
                     }
                 }
             }
@@ -441,10 +445,23 @@ let LocalGlobalStateProvider = class LocalGlobalStateProvider {
             }
             this.logService.info(`${syncResourceLogLabel}: Updated locale`);
         }
-        if (updatedStorage.size) {
+        if (updatedProfileStorage.size) {
             this.logService.trace(`${syncResourceLogLabel}: Updating global state...`);
-            await this.userDataProfileStorageService.updateStorageData(profile, updatedStorage, StorageTarget.USER);
-            this.logService.info(`${syncResourceLogLabel}: Updated global state`, [...( updatedStorage.keys())]);
+            await this.userDataProfileStorageService.updateStorageData(profile, updatedProfileStorage, StorageTarget.USER);
+            this.logService.info(`${syncResourceLogLabel}: Updated global state`, [...( updatedProfileStorage.keys())]);
+        }
+        if (updatedSharedStorage?.size) {
+            this.logService.trace(`${syncResourceLogLabel}: Updating application shared state...`);
+            await this.userDataProfileStorageService.updateStorageData(
+                profile,
+                updatedSharedStorage,
+                StorageTarget.USER,
+                StorageScope.APPLICATION_SHARED
+            );
+            this.logService.info(
+                `${syncResourceLogLabel}: Updated application shared state`,
+                [...( updatedSharedStorage.keys())]
+            );
         }
     }
 };
@@ -477,13 +494,22 @@ let GlobalStateInitializer = class GlobalStateInitializer extends AbstractInitia
             return;
         }
         const argv = {};
+        const isDefaultProfile = this.storageService.hasScope(this.userDataProfilesService.defaultProfile);
         const storage = {};
         for (const key of ( Object.keys(remoteGlobalState.storage))) {
             if (key.startsWith(argvStoragePrefx)) {
                 argv[key.substring(argvStoragePrefx.length)] = remoteGlobalState.storage[key].value;
             } else {
-                if (this.storageService.get(key, StorageScope.PROFILE) === undefined) {
-                    storage[key] = remoteGlobalState.storage[key].value;
+                const isSharedScope = remoteGlobalState.storage[key].scope === StorageScope.APPLICATION_SHARED;
+                if (isSharedScope && !isDefaultProfile) {
+                    continue;
+                }
+                const scope = isSharedScope ? StorageScope.APPLICATION_SHARED : StorageScope.PROFILE;
+                if (this.storageService.get(key, scope) === undefined) {
+                    storage[key] = {
+                        value: remoteGlobalState.storage[key].value,
+                        scope
+                    };
                 }
             }
         }
@@ -503,8 +529,8 @@ let GlobalStateInitializer = class GlobalStateInitializer extends AbstractInitia
             for (const key of ( Object.keys(storage))) {
                 storageEntries.push({
                     key,
-                    value: storage[key],
-                    scope: StorageScope.PROFILE,
+                    value: storage[key].value,
+                    scope: storage[key].scope,
                     target: StorageTarget.USER
                 });
             }

package/vscode/src/vs/platform/userDataSync/common/keybindingsSync.js

@@ -106,7 +106,7 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
             localContent = localContent || "[]";
             if (this.hasErrors(localContent, true)) {
                 throw ( new UserDataSyncError(( localize(
-                    2507,
+                    2525,
                     "Unable to sync keybindings because the content in the file is not valid. Please open the file and correct it."
                 )), UserDataSyncErrorCode.LocalInvalidContent, this.resource));
             }
@@ -230,7 +230,7 @@ let KeybindingsSynchroniser = class KeybindingsSynchroniser extends AbstractJson
             content = content || "[]";
             if (this.hasErrors(content, true)) {
                 throw ( new UserDataSyncError(( localize(
-                    2507,
+                    2525,
                     "Unable to sync keybindings because the content in the file is not valid. Please open the file and correct it."
                 )), UserDataSyncErrorCode.LocalInvalidContent, this.resource));
             }

package/vscode/src/vs/platform/userDataSync/common/settingsSync.js

@@ -348,7 +348,7 @@ let SettingsSynchroniser = class SettingsSynchroniser extends AbstractJsonFileSy
     validateContent(content) {
         if (this.hasErrors(content, false)) {
             throw ( new UserDataSyncError(( localize(
-                2508,
+                2526,
                 "Unable to sync settings as there are errors/warning in settings file."
             )), UserDataSyncErrorCode.LocalInvalidContent, this.resource));
         }

package/vscode/src/vs/platform/userDataSync/common/userDataSync.d.ts

@@ -7,6 +7,7 @@ import { IHeaders } from "../../../base/parts/request/common/request.js";
 import { IEnvironmentService } from "../../environment/common/environment.service.js";
 import { IExtensionIdentifier } from "../../extensionManagement/common/extensionManagement.js";
 import { IExtensionManifest } from "../../extensions/common/extensions.js";
+import { StorageScope } from "../../storage/common/storage.js";
 import { IUserDataProfile, UseDefaultProfileFlags } from "../../userDataProfile/common/userDataProfile.js";
 export declare function getDisallowedIgnoredSettings(): string[];
 export declare function getDefaultIgnoredSettings(excludeExtensions?: boolean): string[];
@@ -184,6 +185,7 @@ export interface IRemoteSyncExtension {
 export interface IStorageValue {
     version: number;
     value: string;
+    scope?: StorageScope;
 }
 export interface IGlobalState {
     storage: IStringDictionary<IStorageValue>;

package/vscode/src/vs/platform/userDataSync/common/userDataSync.js

@@ -49,12 +49,12 @@ function registerConfiguration() {
     configurationRegistry.registerConfiguration({
         id: "settingsSync",
         order: 30,
-        title: ( localize(2514, "Settings Sync")),
+        title: ( localize(2532, "Settings Sync")),
         type: "object",
         properties: {
             [CONFIG_SYNC_KEYBINDINGS_PER_PLATFORM]: {
                 type: "boolean",
-                description: ( localize(2515, "Synchronize keybindings for each platform.")),
+                description: ( localize(2533, "Synchronize keybindings for each platform.")),
                 default: true,
                 scope: ConfigurationScope.APPLICATION,
                 tags: ["sync", "usesOnlineServices"]
@@ -62,13 +62,13 @@ function registerConfiguration() {
             "settingsSync.ignoredExtensions": {
                 "type": "array",
                 markdownDescription: ( localize(
-                    2516,
+                    2534,
                     "List of extensions to be ignored while synchronizing. The identifier of an extension is always `${publisher}.${name}`. For example: `vscode.csharp`."
                 )),
                 items: [{
                     type: "string",
                     pattern: EXTENSION_IDENTIFIER_PATTERN,
-                    errorMessage: ( localize(2517, "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."))
+                    errorMessage: ( localize(2535, "Expected format '${publisher}.${name}'. Example: 'vscode.csharp'."))
                 }],
                 "default": [],
                 "scope": ConfigurationScope.APPLICATION,
@@ -78,7 +78,7 @@ function registerConfiguration() {
             },
             "settingsSync.ignoredSettings": {
                 "type": "array",
-                description: ( localize(2518, "Configure settings to be ignored while synchronizing.")),
+                description: ( localize(2536, "Configure settings to be ignored while synchronizing.")),
                 "default": [],
                 "scope": ConfigurationScope.APPLICATION,
                 $ref: ignoredSettingsSchemaId,

package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js

@@ -171,7 +171,7 @@ let UserDataSyncMachinesService = class UserDataSyncMachinesService extends Disp
         const machinesData = this.parse(this.userData);
         if (machinesData.version !== UserDataSyncMachinesService_1.VERSION) {
             throw ( new Error(( localize(
-                2520,
+                2538,
                 "Cannot read machines data as the current version is incompatible. Please update {0} and try again.",
                 this.productService.nameLong
             ))));

package/vscode/src/vs/platform/webWorker/browser/webWorkerServiceImpl.d.ts

@@ -18,7 +18,7 @@ export declare class WebWorker extends Disposable implements IWebWorker {
     private readonly _onMessage;
     readonly onMessage: import("../../../base/common/event.js").Event<Message>;
     private readonly _onError;
-    readonly onError: import("../../../base/common/event.js").Event<MessageEvent<any> | ErrorEvent>;
+    readonly onError: import("../../../base/common/event.js").Event<ErrorEvent | MessageEvent<any>>;
     constructor(worker: Promise<Worker>, id: number);
     getId(): number;
     postMessage(message: unknown, transfer: Transferable[]): void;

package/vscode/src/vs/platform/workspace/common/workspace.d.ts

@@ -99,6 +99,10 @@ export interface IWorkspace {
      * the location of the workspace configuration
      */
     readonly configuration?: URI | null;
+    /**
+     * Optional display name for the workspace.
+     */
+    readonly name?: string;
 }
 export declare function isWorkspace(thing: unknown): thing is IWorkspace;
 export interface IWorkspaceFolderData {
@@ -128,16 +132,18 @@ export declare class Workspace implements IWorkspace {
     private _transient;
     private _configuration;
     private ignorePathCasing;
+    private _workspaceName?;
     private foldersMap;
     private _folders;
     get folders(): WorkspaceFolder[];
     set folders(folders: WorkspaceFolder[]);
-    constructor(_id: string, folders: WorkspaceFolder[], _transient: boolean, _configuration: URI | null, ignorePathCasing: (key: URI) => boolean);
+    constructor(_id: string, folders: WorkspaceFolder[], _transient: boolean, _configuration: URI | null, ignorePathCasing: (key: URI) => boolean, _workspaceName?: string | undefined);
     update(workspace: Workspace): void;
     get id(): string;
     get transient(): boolean;
     get configuration(): URI | null;
     set configuration(configuration: URI | null);
+    get name(): string | undefined;
     getFolder(resource: URI): IWorkspaceFolder | null;
     private updateFoldersMap;
     toJSON(): IWorkspace;

package/vscode/src/vs/platform/workspace/common/workspace.js

@@ -69,11 +69,12 @@ let Workspace$1 = class Workspace {
         this._folders = folders;
         this.updateFoldersMap();
     }
-    constructor(_id, folders, _transient, _configuration, ignorePathCasing) {
+    constructor(_id, folders, _transient, _configuration, ignorePathCasing, _workspaceName) {
         this._id = _id;
         this._transient = _transient;
         this._configuration = _configuration;
         this.ignorePathCasing = ignorePathCasing;
+        this._workspaceName = _workspaceName;
         this.foldersMap = TernarySearchTree.forUris(this.ignorePathCasing, () => true);
         this.folders = folders;
     }
@@ -81,6 +82,7 @@ let Workspace$1 = class Workspace {
         this._id = workspace.id;
         this._configuration = workspace.configuration;
         this._transient = workspace.transient;
+        this._workspaceName = workspace.name;
         this.ignorePathCasing = workspace.ignorePathCasing;
         this.folders = workspace.folders;
     }
@@ -96,6 +98,9 @@ let Workspace$1 = class Workspace {
     set configuration(configuration) {
         this._configuration = configuration;
     }
+    get name() {
+        return this._workspaceName;
+    }
     getFolder(resource) {
         if (!resource) {
             return null;
@@ -113,7 +118,8 @@ let Workspace$1 = class Workspace {
             id: this.id,
             folders: this.folders,
             transient: this.transient,
-            configuration: this.configuration
+            configuration: this.configuration,
+            name: this.name
         };
     }
 };
@@ -150,7 +156,7 @@ function toWorkspaceFolder(resource) {
 const WORKSPACE_EXTENSION = "code-workspace";
 const WORKSPACE_SUFFIX = `.${WORKSPACE_EXTENSION}`;
 const WORKSPACE_FILTER = [{
-    name: ( localize(2522, "Code Workspace")),
+    name: ( localize(2540, "Code Workspace")),
     extensions: [WORKSPACE_EXTENSION]
 }];
 const UNTITLED_WORKSPACE_NAME = "workspace.json";

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

@@ -23,49 +23,49 @@ const statusBarItemSchema = {
         id: {
             type: "string",
             markdownDescription: ( localize(
-                2615,
+                2654,
                 "The identifier of the status bar entry. Must be unique within the extension. The same value must be used when calling the `vscode.window.createStatusBarItem(id, ...)`-API"
             ))
         },
         name: {
             type: "string",
             description: ( localize(
-                2616,
+                2655,
                 "The name of the entry, like 'Python Language Indicator', 'Git Status' etc. Try to keep the length of the name short, yet descriptive enough that users can understand what the status bar item is about."
             ))
         },
         text: {
             type: "string",
             description: ( localize(
-                2617,
+                2656,
                 "The text to show for the entry. You can embed icons in the text by leveraging the `$(<name>)`-syntax, like 'Hello {0}!'",
                 "$(globe)"
             ))
         },
         tooltip: {
             type: "string",
-            description: ( localize(2618, "The tooltip text for the entry."))
+            description: ( localize(2657, "The tooltip text for the entry."))
         },
         command: {
             type: "string",
-            description: ( localize(2619, "The command to execute when the status bar entry is clicked."))
+            description: ( localize(2658, "The command to execute when the status bar entry is clicked."))
         },
         alignment: {
             type: "string",
             enum: ["left", "right"],
-            description: ( localize(2620, "The alignment of the status bar entry."))
+            description: ( localize(2659, "The alignment of the status bar entry."))
         },
         priority: {
             type: "number",
             description: ( localize(
-                2621,
+                2660,
                 "The priority of the status bar entry. Higher value means the item should be shown more to the left."
             ))
         },
         accessibilityInformation: {
             type: "object",
             description: ( localize(
-                2622,
+                2661,
                 "Defines the role and aria label to be used when the status bar entry is focused."
             )),
             required: ["label"],
@@ -73,14 +73,14 @@ const statusBarItemSchema = {
                 role: {
                     type: "string",
                     description: ( localize(
-                        2623,
+                        2662,
                         "The role of the status bar entry which defines how a screen reader interacts with it. More about aria roles can be found here https://w3c.github.io/aria/#widget_roles"
                     ))
                 },
                 label: {
                     type: "string",
                     description: ( localize(
-                        2624,
+                        2663,
                         "The aria label of the status bar entry. Defaults to the entry's text."
                     ))
                 }
@@ -89,7 +89,7 @@ const statusBarItemSchema = {
     }
 };
 const statusBarItemsSchema = {
-    description: ( localize(2625, "Contributes items to the status bar.")),
+    description: ( localize(2664, "Contributes items to the status bar.")),
     oneOf: [statusBarItemSchema, {
         type: "array",
         items: statusBarItemSchema
@@ -115,7 +115,7 @@ let StatusBarItemsExtensionPoint = class StatusBarItemsExtensionPoint {
                 } = entry;
                 for (const candidate of Iterable.wrap(value)) {
                     if (!isUserFriendlyStatusItemEntry(candidate)) {
-                        collector.error(( localize(2626, "Invalid status bar item contribution.")));
+                        collector.error(( localize(2665, "Invalid status bar item contribution.")));
                         continue;
                     }
                     const fullItemId = asStatusBarItemIdentifier(entry.description.identifier, candidate.id);