@codingame/monaco-vscode-user-data-sync-service-override 18.4.0 → 19.0.0

package/package.json

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

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

@@ -0,0 +1,24 @@
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { IUserDataProfile } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile";
+import { AbstractJsonSynchronizer } from "@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/abstractJsonSynchronizer";
+import { 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";
+import { IUserDataSyncStoreService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service";
+interface IMcpSyncContent {
+    mcp?: string;
+}
+export declare function getMcpContentFromSyncContent(syncContent: string, logService: ILogService): string | null;
+export declare class McpSynchroniser extends AbstractJsonSynchronizer implements IUserDataSynchroniser {
+    constructor(profile: IUserDataProfile, collection: string | undefined, userDataSyncStoreService: IUserDataSyncStoreService, userDataSyncLocalStoreService: IUserDataSyncLocalStoreService, logService: IUserDataSyncLogService, configurationService: IConfigurationService, userDataSyncEnablementService: IUserDataSyncEnablementService, fileService: IFileService, environmentService: IEnvironmentService, storageService: IStorageService, telemetryService: ITelemetryService, uriIdentityService: IUriIdentityService);
+    protected getContentFromSyncContent(syncContent: string): string | null;
+    protected toSyncContent(mcp: string | null): IMcpSyncContent;
+}
+export {};

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

@@ -0,0 +1,47 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { AbstractJsonSynchronizer } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/abstractJsonSynchronizer';
+import { SyncResource } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync';
+import { IUserDataSyncStoreService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service';
+
+function getMcpContentFromSyncContent(syncContent, logService) {
+    try {
+        const parsed = JSON.parse(syncContent);
+        return parsed.mcp ?? null;
+    }
+    catch (e) {
+        logService.error(e);
+        return null;
+    }
+}
+let McpSynchroniser = class McpSynchroniser extends AbstractJsonSynchronizer {
+    constructor(profile, collection, userDataSyncStoreService, userDataSyncLocalStoreService, logService, configurationService, userDataSyncEnablementService, fileService, environmentService, storageService, telemetryService, uriIdentityService) {
+        super(profile.mcpResource, { syncResource: SyncResource.Mcp, profile }, collection, 'mcp.json', fileService, environmentService, storageService, userDataSyncStoreService, userDataSyncLocalStoreService, userDataSyncEnablementService, telemetryService, logService, configurationService, uriIdentityService);
+    }
+    getContentFromSyncContent(syncContent) {
+        return getMcpContentFromSyncContent(syncContent, this.logService);
+    }
+    toSyncContent(mcp) {
+        return mcp ? { mcp } : {};
+    }
+};
+McpSynchroniser = ( __decorate([
+    ( __param(2, IUserDataSyncStoreService)),
+    ( __param(3, IUserDataSyncLocalStoreService)),
+    ( __param(4, IUserDataSyncLogService)),
+    ( __param(5, IConfigurationService)),
+    ( __param(6, IUserDataSyncEnablementService)),
+    ( __param(7, IFileService)),
+    ( __param(8, IEnvironmentService)),
+    ( __param(9, IStorageService)),
+    ( __param(10, ITelemetryService)),
+    ( __param(11, IUriIdentityService))
+], McpSynchroniser));
+
+export { McpSynchroniser, getMcpContentFromSyncContent };

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

@@ -7,7 +7,6 @@ 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 { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
-import { isPromptOrInstructionsFile } from '@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/platform/prompts/common/prompts';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { merge, areSame } from './promptsMerge.js';
 import { AbstractSynchroniser } from '@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
@@ -411,12 +410,12 @@ let PromptsSynchronizer = class PromptsSynchronizer extends AbstractSynchroniser
         }
         for (const entry of stat.children || []) {
             const resource = entry.resource;
-            if (isPromptOrInstructionsFile(resource) === false) {
-                continue;
+            const path = resource.path;
+            if (( ['.prompt.md', '.instructions.md', '.chatmode.md'].some(ext => path.endsWith(ext)))) {
+                const key = this.extUri.relativePath(this.promptsFolder, resource);
+                const content = await this.fileService.readFile(resource);
+                prompts[key] = content;
             }
-            const key = this.extUri.relativePath(this.promptsFolder, resource);
-            const content = await this.fileService.readFile(resource);
-            prompts[key] = content;
         }
         return prompts;
     }

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(2373, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2390, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
                 }
                 else {
-                    throw ( new UserDataAutoSyncError(( localize(2374, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2391, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
                 }
             }
             else {
-                throw ( new UserDataAutoSyncError(( localize(2375, "Cannot sync because syncing is turned off in the cloud")), UserDataSyncErrorCode.TurnedOff));
+                throw ( new UserDataAutoSyncError(( localize(2392, "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(2373, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2390, "Cannot sync because default service has changed")), UserDataSyncErrorCode.DefaultServiceChanged));
                 }
                 else {
-                    throw ( new UserDataAutoSyncError(( localize(2374, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
+                    throw ( new UserDataAutoSyncError(( localize(2391, "Cannot sync because sync service has changed")), UserDataSyncErrorCode.ServiceChanged));
                 }
             }
             else {
-                throw ( new UserDataAutoSyncError(( localize(2376, "Cannot sync because current session is expired")), UserDataSyncErrorCode.SessionExpired));
+                throw ( new UserDataAutoSyncError(( localize(2393, "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(
-                2377,
+                2394,
                 "Cannot sync because syncing is turned off on this machine from another machine."
             )), UserDataSyncErrorCode.TurnedOff));
         }

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(2383, "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(2400, "Settings Sync")) }));
     }
     trace(message, ...args) {
         this.logger.trace(message, ...args);

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

@@ -66,4 +66,6 @@ export declare class UserDataSyncResourceProviderService implements IUserDataSyn
     private resolveUri;
     private parseSyncData;
     private getUserData;
+    private getMcpAssociatedResources;
+    private resolveMcpNodeContent;
 }

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

@@ -16,6 +16,7 @@ import { parseSettingsSyncContent } from '@codingame/monaco-vscode-a022e9a8-b522
 import { getKeybindingsContentFromSyncContent } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/keybindingsSync';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { getTasksContentFromSyncContent } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/tasksSync';
+import { getMcpContentFromSyncContent } from './mcpSync.js';
 import { stringify, parseExtensions, LocalExtensionsProvider } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/extensionsSync';
 import { stringify as stringify$1, LocalGlobalStateProvider } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/globalStateSync';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -117,6 +118,7 @@ let UserDataSyncResourceProviderService = class UserDataSyncResourceProviderServ
             case SyncResource.Settings: return this.getSettingsAssociatedResources(uri, profile);
             case SyncResource.Keybindings: return this.getKeybindingsAssociatedResources(uri, profile);
             case SyncResource.Tasks: return this.getTasksAssociatedResources(uri, profile);
+            case SyncResource.Mcp: return this.getMcpAssociatedResources(uri, profile);
             case SyncResource.Snippets: return this.getSnippetsAssociatedResources(uri, profile);
             case SyncResource.Prompts: return this.getPromptsAssociatedResources(uri, profile);
             case SyncResource.GlobalState: return this.getGlobalStateAssociatedResources(uri, profile);
@@ -185,6 +187,7 @@ let UserDataSyncResourceProviderService = class UserDataSyncResourceProviderServ
             case SyncResource.Settings: return this.resolveSettingsNodeContent(syncData, node);
             case SyncResource.Keybindings: return this.resolveKeybindingsNodeContent(syncData, node);
             case SyncResource.Tasks: return this.resolveTasksNodeContent(syncData, node);
+            case SyncResource.Mcp: return this.resolveMcpNodeContent(syncData, node);
             case SyncResource.Snippets: return this.resolveSnippetsNodeContent(syncData, node);
             case SyncResource.Prompts: return this.resolvePromptsNodeContent(syncData, node);
             case SyncResource.GlobalState: return this.resolveGlobalStateNodeContent(syncData, node);
@@ -205,6 +208,7 @@ let UserDataSyncResourceProviderService = class UserDataSyncResourceProviderServ
             case SyncResource.Settings: return null;
             case SyncResource.Keybindings: return null;
             case SyncResource.Tasks: return null;
+            case SyncResource.Mcp: return null;
             case SyncResource.Snippets: return null;
             case SyncResource.Prompts: return null;
             case SyncResource.WorkspaceState: return null;
@@ -455,7 +459,7 @@ let UserDataSyncResourceProviderService = class UserDataSyncResourceProviderServ
             this.logService.error(error);
         }
         throw ( new UserDataSyncError(( localize(
-            2385,
+            2402,
             "Cannot parse sync data as it is not compatible with the current version."
         )), UserDataSyncErrorCode.IncompatibleRemoteContent, syncResource));
     }
@@ -463,6 +467,18 @@ let UserDataSyncResourceProviderService = class UserDataSyncResourceProviderServ
         const content = await this.userDataSyncStoreService.resolveResourceContent(syncResource, ref, collection);
         return { ref, content };
     }
+    getMcpAssociatedResources(uri, profile) {
+        const resource = this.extUri.joinPath(uri, 'mcp.json');
+        const comparableResource = profile ? profile.mcpResource : this.extUri.joinPath(uri, UserDataSyncResourceProviderService_1.NOT_EXISTING_RESOURCE);
+        return [{ resource, comparableResource }];
+    }
+    resolveMcpNodeContent(syncData, node) {
+        switch (node) {
+            case 'mcp.json':
+                return getMcpContentFromSyncContent(syncData.content, this.logService);
+        }
+        return null;
+    }
 };
 UserDataSyncResourceProviderService = UserDataSyncResourceProviderService_1 = ( __decorate([
     ( __param(0, IUserDataSyncStoreService)),

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

@@ -24,6 +24,7 @@ import { PromptsSynchronizer } from './promptsSync/promptsSync.js';
 import { SettingsSynchroniser } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/settingsSync';
 import { SnippetsSynchroniser } from '@codingame/monaco-vscode-a022e9a8-b522-5ea2-97c7-f3dda2b0b597-common/vscode/vs/platform/userDataSync/common/snippetsSync';
 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 { IUserDataSyncStoreService, IUserDataSyncStoreManagementService, IUserDataSyncLogService, IUserDataSyncEnablementService, IUserDataSyncResourceProviderService, IUserDataSyncLocalStoreService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service';
@@ -637,6 +638,7 @@ let ProfileSynchronizer = class ProfileSynchronizer extends Disposable {
             case SyncResource.Snippets: return this.instantiationService.createInstance(SnippetsSynchroniser, this.profile, this.collection);
             case SyncResource.Prompts: return this.instantiationService.createInstance(PromptsSynchronizer, this.profile, this.collection);
             case SyncResource.Tasks: return this.instantiationService.createInstance(TasksSynchroniser, this.profile, this.collection);
+            case SyncResource.Mcp: return this.instantiationService.createInstance(McpSynchroniser, this.profile, this.collection);
             case SyncResource.GlobalState: return this.instantiationService.createInstance(GlobalStateSynchroniser, this.profile, this.collection);
             case SyncResource.Extensions: return this.instantiationService.createInstance(ExtensionsSynchroniser, this.profile, this.collection);
             case SyncResource.Profiles: return this.instantiationService.createInstance(UserDataProfilesManifestSynchroniser, this.profile, this.collection);
@@ -771,11 +773,12 @@ let ProfileSynchronizer = class ProfileSynchronizer extends Disposable {
             case SyncResource.Keybindings: return 1;
             case SyncResource.Snippets: return 2;
             case SyncResource.Tasks: return 3;
-            case SyncResource.GlobalState: return 4;
-            case SyncResource.Extensions: return 5;
-            case SyncResource.Prompts: return 6;
-            case SyncResource.Profiles: return 7;
-            case SyncResource.WorkspaceState: return 8;
+            case SyncResource.Mcp: return 4;
+            case SyncResource.GlobalState: return 5;
+            case SyncResource.Extensions: return 6;
+            case SyncResource.Prompts: return 7;
+            case SyncResource.Profiles: return 8;
+            case SyncResource.WorkspaceState: return 9;
         }
     }
 };

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(
-                    11641,
+                    11913,
                     "Settings sync is suspended temporarily because the current device is making too many requests. Please reload {0} to resume.",
                     this.productService.nameLong
                 ))
                     : ( localize(
-                    11642,
+                    11914,
                     "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(11643, "Show Log")),
+                                label: ( localize(11915, "Show Log")),
                                 run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
                             }),
                             toAction({
                                 id: 'Restart',
-                                label: isWeb ? ( localize(11644, "Reload")) : ( localize(11645, "Restart")),
+                                label: isWeb ? ( localize(11916, "Reload")) : ( localize(11917, "Restart")),
                                 run: () => this.hostService.restart()
                             })
                         ]
@@ -62,20 +62,20 @@ let UserDataSyncReportIssueContribution = class UserDataSyncReportIssueContribut
                 return;
             }
             case UserDataSyncErrorCode.TooManyRequests: {
-                const operationId = error.operationId ? ( localize(11646, "Operation Id: {0}", error.operationId)) : undefined;
+                const operationId = error.operationId ? ( localize(11918, "Operation Id: {0}", error.operationId)) : undefined;
                 const message = ( localize(
-                    11647,
+                    11919,
                     "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(11648, "Settings Sync. Operation Id: {0}", error.operationId)) : undefined,
+                    source: error.operationId ? ( localize(11920, "Settings Sync. Operation Id: {0}", error.operationId)) : undefined,
                     actions: {
                         primary: [
                             toAction({
                                 id: 'Show Sync Logs',
-                                label: ( localize(11643, "Show Log")),
+                                label: ( localize(11915, "Show Log")),
                                 run: () => this.commandService.executeCommand(SHOW_SYNC_LOG_COMMAND_ID)
                             })
                         ]

package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSync.d.ts

@@ -23,7 +23,6 @@ import { IUserDataSyncWorkbenchService } from "@codingame/monaco-vscode-api/vsco
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 import { IWorkbenchIssueService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/issue/common/issue.service";
 import { IUserDataProfileService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export declare class UserDataSyncWorkbenchContribution extends Disposable implements IWorkbenchContribution {
     private readonly userDataSyncEnablementService;
     private readonly userDataSyncService;
@@ -45,11 +44,10 @@ export declare class UserDataSyncWorkbenchContribution extends Disposable implem
     private readonly hostService;
     private readonly commandService;
     private readonly workbenchIssueService;
-    private readonly configService;
     private readonly turningOnSyncContext;
     private readonly globalActivityBadgeDisposable;
     private readonly accountBadgeDisposable;
-    constructor(userDataSyncEnablementService: IUserDataSyncEnablementService, userDataSyncService: IUserDataSyncService, userDataSyncWorkbenchService: IUserDataSyncWorkbenchService, contextKeyService: IContextKeyService, activityService: IActivityService, notificationService: INotificationService, editorService: IEditorService, userDataProfileService: IUserDataProfileService, dialogService: IDialogService, quickInputService: IQuickInputService, instantiationService: IInstantiationService, outputService: IOutputService, userDataAutoSyncService: IUserDataAutoSyncService, textModelResolverService: ITextModelService, preferencesService: IPreferencesService, telemetryService: ITelemetryService, productService: IProductService, openerService: IOpenerService, authenticationService: IAuthenticationService, userDataSyncStoreManagementService: IUserDataSyncStoreManagementService, hostService: IHostService, commandService: ICommandService, workbenchIssueService: IWorkbenchIssueService, configService: IConfigurationService);
+    constructor(userDataSyncEnablementService: IUserDataSyncEnablementService, userDataSyncService: IUserDataSyncService, userDataSyncWorkbenchService: IUserDataSyncWorkbenchService, contextKeyService: IContextKeyService, activityService: IActivityService, notificationService: INotificationService, editorService: IEditorService, userDataProfileService: IUserDataProfileService, dialogService: IDialogService, quickInputService: IQuickInputService, instantiationService: IInstantiationService, outputService: IOutputService, userDataAutoSyncService: IUserDataAutoSyncService, textModelResolverService: ITextModelService, preferencesService: IPreferencesService, telemetryService: ITelemetryService, productService: IProductService, openerService: IOpenerService, authenticationService: IAuthenticationService, userDataSyncStoreManagementService: IUserDataSyncStoreManagementService, hostService: IHostService, commandService: ICommandService, workbenchIssueService: IWorkbenchIssueService);
     private get turningOnSync();
     private set turningOnSync(value);
     private toKey;