@codingame/monaco-vscode-user-data-sync-service-override 19.1.3 → 20.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-user-data-sync-service-override",
-  "version": "19.1.3",
+  "version": "20.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - user-data-sync service-override",
   "keywords": [],
@@ -15,19 +15,19 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "19.1.3",
-    "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common": "19.1.3",
-    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "19.1.3",
-    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "19.1.3",
-    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "19.1.3",
-    "@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common": "19.1.3",
-    "@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common": "19.1.3",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "19.1.3",
-    "@codingame/monaco-vscode-api": "19.1.3",
-    "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "19.1.3",
-    "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "19.1.3",
-    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "19.1.3",
-    "@codingame/monaco-vscode-user-data-profile-service-override": "19.1.3"
+    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "20.0.0",
+    "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common": "20.0.0",
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "20.0.0",
+    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "20.0.0",
+    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "20.0.0",
+    "@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common": "20.0.0",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "20.0.0",
+    "@codingame/monaco-vscode-api": "20.0.0",
+    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.0.0",
+    "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "20.0.0",
+    "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "20.0.0",
+    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "20.0.0",
+    "@codingame/monaco-vscode-user-data-profile-service-override": "20.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -406,28 +406,28 @@ class AutoSync extends Disposable {
         if (this.manifest === null && (await this.userDataSyncService.hasPreviouslySynced())) {
             if (this.hasSyncServiceChanged()) {
                 if (await this.hasDefaultServiceChanged()) {
-                    throw ( new UserDataAutoSyncError(( localize(2390, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2406, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
                 }
                 else {
-                    throw ( new UserDataAutoSyncError(( localize(2391, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2407, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
                 }
             }
             else {
-                throw ( new UserDataAutoSyncError(( localize(2392, "Cannot sync because syncing is turned off in the cloud")), UserDataSyncErrorCode.TurnedOff));
+                throw ( new UserDataAutoSyncError(( localize(2408, "Cannot sync because syncing is turned off in the cloud")), UserDataSyncErrorCode.TurnedOff));
             }
         }
         const sessionId = this.storageService.get(sessionIdKey, StorageScope.APPLICATION);
         if (sessionId && this.manifest && sessionId !== this.manifest.session) {
             if (this.hasSyncServiceChanged()) {
                 if (await this.hasDefaultServiceChanged()) {
-                    throw ( new UserDataAutoSyncError(( localize(2390, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2406, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
                 }
                 else {
-                    throw ( new UserDataAutoSyncError(( localize(2391, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2407, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
                 }
             }
             else {
-                throw ( new UserDataAutoSyncError(( localize(2393, "Cannot sync because current session is expired")), UserDataSyncErrorCode.SessionExpired));
+                throw ( new UserDataAutoSyncError(( localize(2409, "Cannot sync because current session is expired")), UserDataSyncErrorCode.SessionExpired));
             }
         }
         const machines = await this.userDataSyncMachinesService.getMachines(this.manifest || undefined);
@@ -437,7 +437,7 @@ class AutoSync extends Disposable {
         const currentMachine = machines.find(machine => machine.isCurrent);
         if (currentMachine?.disabled) {
             throw ( new UserDataAutoSyncError(( localize(
-                2394,
+                2410,
                 "Cannot sync because syncing is turned off on this machine from another machine."
             )), UserDataSyncErrorCode.TurnedOff));
         }

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

@@ -9,7 +9,7 @@ import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { IUserDataProfile } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile";
 import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
 import { AbstractSynchroniser, IAcceptResult, IMergeResult, IResourcePreview } from "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer";
-import { IRemoteUserData, ISyncData, ISyncUserDataProfile, IUserDataResourceManifest, IUserDataSynchroniser } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync";
+import { IRemoteUserData, ISyncData, ISyncUserDataProfile, IUserData, IUserDataSynchroniser } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync";
 import { IUserDataSyncLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
 import { IUserDataSyncEnablementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
 import { IUserDataSyncLocalStoreService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
@@ -40,7 +40,7 @@ export declare class UserDataProfilesManifestSynchroniser extends AbstractSynchr
     readonly acceptedResource: URI;
     constructor(profile: IUserDataProfile, collection: string | undefined, userDataProfilesService: IUserDataProfilesService, fileService: IFileService, environmentService: IEnvironmentService, storageService: IStorageService, userDataSyncStoreService: IUserDataSyncStoreService, userDataSyncLocalStoreService: IUserDataSyncLocalStoreService, logService: IUserDataSyncLogService, configurationService: IConfigurationService, userDataSyncEnablementService: IUserDataSyncEnablementService, telemetryService: ITelemetryService, uriIdentityService: IUriIdentityService);
     getLastSyncedProfiles(): Promise<ISyncUserDataProfile[] | null>;
-    getRemoteSyncedProfiles(manifest: IUserDataResourceManifest | null): Promise<ISyncUserDataProfile[] | null>;
+    getRemoteSyncedProfiles(refOrLatestData: string | IUserData | null): Promise<ISyncUserDataProfile[] | null>;
     protected generateSyncPreview(remoteUserData: IRemoteUserData, lastSyncUserData: IRemoteUserData | null, isRemoteDataFromCurrentMachine: boolean): Promise<IUserDataProfilesManifestResourcePreview[]>;
     protected hasRemoteChanged(lastSyncUserData: IRemoteUserData): Promise<boolean>;
     protected getMergeResult(resourcePreview: IUserDataProfilesManifestResourcePreview, token: CancellationToken): Promise<IMergeResult>;

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

@@ -29,9 +29,9 @@ let UserDataProfilesManifestSynchroniser = class UserDataProfilesManifestSynchro
         const lastSyncUserData = await this.getLastSyncUserData();
         return lastSyncUserData?.syncData ? parseUserDataProfilesManifest(lastSyncUserData.syncData) : null;
     }
-    async getRemoteSyncedProfiles(manifest) {
+    async getRemoteSyncedProfiles(refOrLatestData) {
         const lastSyncUserData = await this.getLastSyncUserData();
-        const remoteUserData = await this.getLatestRemoteUserData(manifest, lastSyncUserData);
+        const remoteUserData = await this.getLatestRemoteUserData(refOrLatestData, lastSyncUserData);
         return remoteUserData?.syncData ? parseUserDataProfilesManifest(remoteUserData.syncData) : null;
     }
     async generateSyncPreview(remoteUserData, lastSyncUserData, isRemoteDataFromCurrentMachine) {

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

@@ -10,7 +10,7 @@ import { USER_DATA_SYNC_LOG_ID } from '@codingame/monaco-vscode-api/vscode/vs/pl
 let UserDataSyncLogService = class UserDataSyncLogService extends AbstractLogger {
     constructor(loggerService, environmentService) {
         super();
-        this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${USER_DATA_SYNC_LOG_ID}.log`), { id: USER_DATA_SYNC_LOG_ID, name: ( localize(2400, "Settings Sync")) }));
+        this.logger = this._register(loggerService.createLogger(joinPath(environmentService.logsHome, `${USER_DATA_SYNC_LOG_ID}.log`), { id: USER_DATA_SYNC_LOG_ID, name: ( localize(2416, "Settings Sync")) }));
     }
     trace(message, ...args) {
         this.logger.trace(message, ...args);

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

@@ -459,7 +459,7 @@ let UserDataSyncResourceProviderService = class UserDataSyncResourceProviderServ
             this.logService.error(error);
         }
         throw ( new UserDataSyncError(( localize(
-            2402,
+            2418,
             "Cannot parse sync data as it is not compatible with the current version."
         )), UserDataSyncErrorCode.IncompatibleRemoteContent, syncResource));
     }

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

@@ -10,7 +10,7 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IUserDataProfile } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile";
 import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
-import { IUserDataManualSyncTask, IUserDataSyncResourceConflicts, IUserDataSyncResourceError, IUserDataSyncResource, ISyncResourceHandle, IUserDataSyncTask, ISyncUserDataProfile, IUserDataManifest, IUserDataSynchroniser, SyncResource, SyncStatus, UserDataSyncError } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync";
+import { IUserDataManualSyncTask, IUserDataSyncResourceConflicts, IUserDataSyncResourceError, IUserDataSyncResource, ISyncResourceHandle, IUserDataSyncTask, ISyncUserDataProfile, IUserDataManifest, IUserDataSynchroniser, SyncResource, SyncStatus, UserDataSyncError, IUserDataSyncLatestData } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync";
 import { IUserDataSyncLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
 import { IUserDataSyncResourceProviderService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
 import { IUserDataSyncService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
@@ -113,7 +113,7 @@ declare class ProfileSynchronizer extends Disposable {
     protected registerSynchronizer(syncResource: SyncResource): void;
     private deRegisterSynchronizer;
     createSynchronizer(syncResource: Exclude<SyncResource, SyncResource.WorkspaceState>): IUserDataSynchroniser & IDisposable;
-    sync(manifest: IUserDataManifest | null, preview: boolean, executionId: string, token: CancellationToken): Promise<[
+    sync(manifestOrLatestData: IUserDataManifest | IUserDataSyncLatestData | null, preview: boolean, executionId: string, token: CancellationToken): Promise<[
         SyncResource,
         UserDataSyncError
     ][]>;

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

@@ -26,7 +26,7 @@ import { SnippetsSynchroniser } from '@codingame/monaco-vscode-a022e9a8-b522-5ea
 import { TasksSynchroniser } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/tasksSync';
 import { McpSynchroniser } from './mcpSync.js';
 import { UserDataProfilesManifestSynchroniser } from './userDataProfilesManifestSync.js';
-import { SyncStatus, createSyncHeaders, UserDataSyncError, UserDataSyncErrorCode, SyncResource, ALL_SYNC_RESOURCES, USER_DATA_SYNC_CONFIGURATION_SCOPE, UserDataSyncStoreError } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync';
+import { SyncStatus, createSyncHeaders, UserDataSyncError, UserDataSyncErrorCode, UserDataSyncStoreError, SyncResource, ALL_SYNC_RESOURCES, USER_DATA_SYNC_CONFIGURATION_SCOPE, isUserDataManifest } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncStoreService, IUserDataSyncStoreManagementService, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncResourceProviderService, IUserDataSyncLocalStoreService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service';
 
 const LAST_SYNC_TIME_KEY = 'sync.lastSyncTime';
@@ -116,14 +116,28 @@ let UserDataSyncService = class UserDataSyncService extends Disposable {
         const startTime = ( new Date()).getTime();
         const executionId = generateUuid();
         const syncHeaders = createSyncHeaders(executionId);
-        let manifest;
+        let latestUserDataOrManifest;
         try {
-            manifest = await this.userDataSyncStoreService.manifest(null, syncHeaders);
+            latestUserDataOrManifest = await this.userDataSyncStoreService.getLatestData(syncHeaders);
         }
         catch (error) {
             const userDataSyncError = UserDataSyncError.toUserDataSyncError(error);
-            reportUserDataSyncError(userDataSyncError, executionId, this.userDataSyncStoreManagementService, this.telemetryService);
-            throw userDataSyncError;
+            this.telemetryService.publicLog2('sync.download.latest', {
+                code: userDataSyncError.code,
+                serverCode: userDataSyncError instanceof UserDataSyncStoreError ? String(userDataSyncError.serverCode) : undefined,
+                url: userDataSyncError instanceof UserDataSyncStoreError ? userDataSyncError.url : undefined,
+                resource: userDataSyncError.resource,
+                executionId,
+                service: ( this.userDataSyncStoreManagementService.userDataSyncStore.url.toString())
+            });
+            try {
+                latestUserDataOrManifest = await this.userDataSyncStoreService.manifest(null, syncHeaders);
+            }
+            catch (error) {
+                const userDataSyncError = UserDataSyncError.toUserDataSyncError(error);
+                reportUserDataSyncError(userDataSyncError, executionId, this.userDataSyncStoreManagementService, this.telemetryService);
+                throw userDataSyncError;
+            }
         }
         await this.resetLocal();
         const that = this;
@@ -131,19 +145,19 @@ let UserDataSyncService = class UserDataSyncService extends Disposable {
         return {
             id: executionId,
             async merge() {
-                return that.sync(manifest, true, executionId, cancellableToken.token);
+                return that.sync(latestUserDataOrManifest, true, executionId, cancellableToken.token);
             },
             async apply() {
                 try {
                     try {
-                        await that.applyManualSync(manifest, executionId, cancellableToken.token);
+                        await that.applyManualSync(latestUserDataOrManifest, executionId, cancellableToken.token);
                     }
                     catch (error) {
                         if (UserDataSyncError.toUserDataSyncError(error).code === UserDataSyncErrorCode.MethodNotFound) {
                             that.logService.info('Client is making invalid requests. Cleaning up data...');
                             await that.cleanUpRemoteData();
                             that.logService.info('Applying manual sync again...');
-                            await that.applyManualSync(manifest, executionId, cancellableToken.token);
+                            await that.applyManualSync(latestUserDataOrManifest, executionId, cancellableToken.token);
                         }
                         else {
                             throw error;
@@ -164,21 +178,21 @@ let UserDataSyncService = class UserDataSyncService extends Disposable {
             }
         };
     }
-    async sync(manifest, preview, executionId, token) {
+    async sync(manifestOrLatestData, preview, executionId, token) {
         this._syncErrors = [];
         try {
             if (this.status !== SyncStatus.HasConflicts) {
                 this.setStatus(SyncStatus.Syncing);
             }
             const defaultProfileSynchronizer = this.getOrCreateActiveProfileSynchronizer(this.userDataProfilesService.defaultProfile, undefined);
-            this._syncErrors.push(...(await this.syncProfile(defaultProfileSynchronizer, manifest, preview, executionId, token)));
+            this._syncErrors.push(...(await this.syncProfile(defaultProfileSynchronizer, manifestOrLatestData, preview, executionId, token)));
             const userDataProfileManifestSynchronizer = defaultProfileSynchronizer.enabled.find(s => s.resource === SyncResource.Profiles);
             if (userDataProfileManifestSynchronizer) {
                 const syncProfiles = (await userDataProfileManifestSynchronizer.getLastSyncedProfiles()) || [];
                 if (token.isCancellationRequested) {
                     return;
                 }
-                await this.syncRemoteProfiles(syncProfiles, manifest, preview, executionId, token);
+                await this.syncRemoteProfiles(syncProfiles, manifestOrLatestData, preview, executionId, token);
             }
         }
         finally {
@@ -211,7 +225,7 @@ let UserDataSyncService = class UserDataSyncService extends Disposable {
             this.activeProfileSynchronizers.delete(key);
         }
     }
-    async applyManualSync(manifest, executionId, token) {
+    async applyManualSync(manifestOrLatestData, executionId, token) {
         try {
             this.setStatus(SyncStatus.Syncing);
             const profileSynchronizers = this.getActiveProfileSynchronizers();
@@ -229,18 +243,18 @@ let UserDataSyncService = class UserDataSyncService extends Disposable {
             if (!userDataProfileManifestSynchronizer) {
                 return;
             }
-            const remoteProfiles = (await userDataProfileManifestSynchronizer.getRemoteSyncedProfiles(manifest?.latest ?? null)) || [];
+            const remoteProfiles = (await userDataProfileManifestSynchronizer.getRemoteSyncedProfiles(getRefOrUserData(manifestOrLatestData, undefined, SyncResource.Profiles) ?? null)) || [];
             const remoteProfilesToSync = remoteProfiles.filter(remoteProfile => profileSynchronizers.every(s => s.profile.id !== remoteProfile.id));
             if (remoteProfilesToSync.length) {
-                await this.syncRemoteProfiles(remoteProfilesToSync, manifest, false, executionId, token);
+                await this.syncRemoteProfiles(remoteProfilesToSync, manifestOrLatestData, false, executionId, token);
             }
         }
         finally {
             this.setStatus(SyncStatus.Idle);
         }
     }
-    async syncProfile(profileSynchronizer, manifest, preview, executionId, token) {
-        const errors = await profileSynchronizer.sync(manifest, preview, executionId, token);
+    async syncProfile(profileSynchronizer, manifestOrLatestData, preview, executionId, token) {
+        const errors = await profileSynchronizer.sync(manifestOrLatestData, preview, executionId, token);
         return ( errors.map(
             ([syncResource, error]) => ({ profile: profileSynchronizer.profile, syncResource, error })
         ));
@@ -453,7 +467,7 @@ let UserDataSyncService = class UserDataSyncService extends Disposable {
             }
             const userDataProfileManifestSynchronizer = disposables.add(this.instantiationService.createInstance(UserDataProfilesManifestSynchroniser, profile, undefined));
             const manifest = await this.userDataSyncStoreService.manifest(null);
-            const syncProfiles = (await userDataProfileManifestSynchronizer.getRemoteSyncedProfiles(manifest?.latest ?? null)) || [];
+            const syncProfiles = (await userDataProfileManifestSynchronizer.getRemoteSyncedProfiles(manifest?.latest?.profiles ?? null)) || [];
             const syncProfile = syncProfiles.find(syncProfile => syncProfile.id === profile.id);
             if (syncProfile) {
                 const profileSynchronizer = disposables.add(this.instantiationService.createInstance(ProfileSynchronizer, profile, syncProfile.collection));
@@ -644,7 +658,7 @@ let ProfileSynchronizer = class ProfileSynchronizer extends Disposable {
             case SyncResource.Profiles: return this.instantiationService.createInstance(UserDataProfilesManifestSynchroniser, this.profile, this.collection);
         }
     }
-    async sync(manifest, preview, executionId, token) {
+    async sync(manifestOrLatestData, preview, executionId, token) {
         if (token.isCancellationRequested) {
             return [];
         }
@@ -655,8 +669,7 @@ let ProfileSynchronizer = class ProfileSynchronizer extends Disposable {
         try {
             const syncErrors = [];
             const syncHeaders = createSyncHeaders(executionId);
-            const resourceManifest = (this.collection ? manifest?.collections?.[this.collection]?.latest : manifest?.latest) ?? null;
-            const userDataSyncConfiguration = preview ? await this.getUserDataSyncConfiguration(resourceManifest) : this.getLocalUserDataSyncConfiguration();
+            const userDataSyncConfiguration = preview ? await this.getUserDataSyncConfiguration(manifestOrLatestData) : this.getLocalUserDataSyncConfiguration();
             for (const synchroniser of synchronizers) {
                 if (token.isCancellationRequested) {
                     return [];
@@ -665,7 +678,8 @@ let ProfileSynchronizer = class ProfileSynchronizer extends Disposable {
                     return [];
                 }
                 try {
-                    await synchroniser.sync(resourceManifest, preview, userDataSyncConfiguration, syncHeaders);
+                    const refOrUserData = getRefOrUserData(manifestOrLatestData, this.collection, synchroniser.resource) ?? null;
+                    await synchroniser.sync(refOrUserData, preview, userDataSyncConfiguration, syncHeaders);
                 }
                 catch (e) {
                     const userDataSyncError = UserDataSyncError.toUserDataSyncError(e);
@@ -727,14 +741,14 @@ let ProfileSynchronizer = class ProfileSynchronizer extends Disposable {
             }
         }
     }
-    async getUserDataSyncConfiguration(manifest) {
+    async getUserDataSyncConfiguration(manifestOrLatestData) {
         if (!this.profile.isDefault) {
             return {};
         }
         const local = this.getLocalUserDataSyncConfiguration();
         const settingsSynchronizer = this.enabled.find(synchronizer => synchronizer instanceof SettingsSynchroniser);
         if (settingsSynchronizer) {
-            const remote = await settingsSynchronizer.getRemoteUserDataSyncConfiguration(manifest);
+            const remote = await settingsSynchronizer.getRemoteUserDataSyncConfiguration(getRefOrUserData(manifestOrLatestData, this.collection, SyncResource.Settings) ?? null);
             return { ...local, ...remote };
         }
         return local;
@@ -819,5 +833,17 @@ function reportUserDataSyncError(userDataSyncError, executionId, userDataSyncSto
         service: ( userDataSyncStoreManagementService.userDataSyncStore.url.toString())
     });
 }
+function getRefOrUserData(manifestOrLatestData, collection, resource) {
+    if (isUserDataManifest(manifestOrLatestData)) {
+        if (collection) {
+            return manifestOrLatestData?.collections?.[collection]?.latest?.[resource];
+        }
+        return manifestOrLatestData?.latest?.[resource];
+    }
+    if (collection) {
+        return manifestOrLatestData?.collections?.[collection]?.resources?.[resource];
+    }
+    return manifestOrLatestData?.resources?.[resource];
+}
 
 export { UserDataSyncService };

package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSync.contribution.js

@@ -32,12 +32,12 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
         switch (error.code) {
             case UserDataSyncErrorCode.LocalTooManyRequests: {
                 const message = isWeb ? ( localize(
-                    11913,
+                    12163,
                     "Settings sync is suspended temporarily because the current device is making too many requests. Please reload {0} to resume.",
                     this.productService.nameLong
                 ))
                     : ( localize(
-                    11914,
+                    12164,
                     "Settings sync is suspended temporarily because the current device is making too many requests. Please restart {0} to resume.",
                     this.productService.nameLong
                 ));
@@ -48,12 +48,12 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
                         primary: [
                             toAction({
                                 id: 'Show Sync Logs',
-                                label: ( localize(11915, "Show Log")),
+                                label: ( localize(12165, "Show Log")),
                                 run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
                             }),
                             toAction({
                                 id: 'Restart',
-                                label: isWeb ? ( localize(11916, "Reload")) : ( localize(11917, "Restart")),
+                                label: isWeb ? ( localize(12166, "Reload")) : ( localize(12167, "Restart")),
                                 run: () => this.hostService.restart()
                             })
                         ]
@@ -62,20 +62,20 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
                 return;
             }
             case UserDataSyncErrorCode.TooManyRequests: {
-                const operationId = error.operationId ? ( localize(11918, "Operation Id: {0}", error.operationId)) : undefined;
+                const operationId = error.operationId ? ( localize(12168, "Operation Id: {0}", error.operationId)) : undefined;
                 const message = ( localize(
-                    11919,
+                    12169,
                     "Settings sync is disabled because the current device is making too many requests. Please wait for 10 minutes and turn on sync."
                 ));
                 this.notificationService.notify({
                     severity: Severity.Error,
                     message: operationId ? `${message} ${operationId}` : message,
-                    source: error.operationId ? ( localize(11920, "Settings Sync. Operation Id: {0}", error.operationId)) : undefined,
+                    source: error.operationId ? ( localize(12170, "Settings Sync. Operation Id: {0}", error.operationId)) : undefined,
                     actions: {
                         primary: [
                             toAction({
                                 id: 'Show Sync Logs',
-                                label: ( localize(11915, "Show Log")),
+                                label: ( localize(12165, "Show Log")),
                                 run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
                             })
                         ]