Refactor cloud sync state ownership

src/hooks/useAutoCloudSync.ts

@@ -30,7 +30,7 @@ import {
 import {
   getPersistedLocalChangeAt,
   setPersistedLocalChangeAt,
-} from "@/utils/cloudSyncLocalChangeState";
+} from "@/utils/sync/engine/state/syncStateAdapter";
 import {
   fetchPhysicalCloudSyncMetadata,
   individualBlobDomainNeedsLocalReconcile,
@@ -56,7 +56,8 @@ import {
   getLatestSettingsSectionTimestamp,
   isApplyingRemoteSettingsSection,
   markSettingsSectionChanged,
-} from "@/utils/cloudSyncSettingsState";
+  setCloudSyncLanguageInitialized,
+} from "@/utils/sync/engine/state/syncStateAdapter";
 import { isApplyingRemoteDomain } from "@/utils/cloudSyncRemoteApplyState";
 import {
   CLOUD_SYNC_DOMAINS,
@@ -1267,6 +1268,7 @@ export function useAutoCloudSync() {
     const languageUnsubscribe = useLanguageStore.subscribe((state, prevState) => {
       if (state.current !== prevState.current) {
         if (isApplyingRemoteSettingsSection("language")) return;
+        setCloudSyncLanguageInitialized(true);
         markSettingsSectionChanged("language");
         queueUpload("settings");
       }

src/lib/languageConfig.ts

@@ -163,11 +163,20 @@ const readPersistedLanguageState = (): PersistedLanguageState => {
   };
 };
 
+export const getPersistedLanguageInitializationState = (): boolean =>
+  readPersistedLanguageState().isInitialized;
+
+export const setPersistedLanguageInitializationState = (
+  isInitialized: boolean
+): void => {
+  writeStorageValue(LANGUAGE_INITIALIZED_KEY, isInitialized ? "true" : "false");
+  removeStorageValue(LEGACY_LANGUAGE_INITIALIZED_KEY);
+};
+
 export const persistLanguageSelection = (language: SupportedLanguage): void => {
   writeStorageValue(LANGUAGE_KEY, language);
-  writeStorageValue(LANGUAGE_INITIALIZED_KEY, "true");
+  setPersistedLanguageInitializationState(true);
   removeStorageValue(LEGACY_LANGUAGE_KEY);
-  removeStorageValue(LEGACY_LANGUAGE_INITIALIZED_KEY);
 };
 
 /**

src/stores/useCloudSyncStore.ts

@@ -12,6 +12,11 @@ import {
   mergeDeletionMarkerMaps,
   type DeletionMarkerMap,
 } from "@/utils/cloudSyncDeletionMarkers";
+import {
+  createEmptyCloudSyncPersistedMetadataState,
+  normalizeCloudSyncPersistedMetadataState,
+  type CloudSyncPersistedMetadataState,
+} from "@/utils/sync/engine/state/syncStateSchema";
 
 interface CloudSyncDomainStatus {
   lastUploadedAt: string | null;
@@ -77,6 +82,7 @@ interface CloudSyncStoreState {
   remoteMetadata: CloudSyncMetadataMap;
   domainStatus: CloudSyncDomainStatusMap;
   deletionMarkers: CloudSyncDeletionMarkerState;
+  persistedMetadata: CloudSyncPersistedMetadataState;
   setAutoSyncEnabled: (enabled: boolean) => void;
   setDomainEnabled: (domain: CloudSyncDomain, enabled: boolean) => void;
   isDomainEnabled: (domain: CloudSyncDomain) => boolean;
@@ -116,6 +122,11 @@ interface CloudSyncStoreState {
     bucket: CloudSyncDeletionBucket,
     markers: DeletionMarkerMap
   ) => void;
+  updatePersistedMetadata: (
+    updater: (
+      current: CloudSyncPersistedMetadataState
+    ) => CloudSyncPersistedMetadataState
+  ) => void;
 }
 
 function createInitialDomainStatus(): CloudSyncDomainStatusMap {
@@ -144,7 +155,7 @@ function createInitialDomainStatus(): CloudSyncDomainStatusMap {
 }
 
 const STORE_NAME = "ryos:cloud-sync";
-const STORE_VERSION = 8;
+const STORE_VERSION = 9;
 
 export const useCloudSyncStore = create<CloudSyncStoreState>()(
   persist(
@@ -163,6 +174,7 @@ export const useCloudSyncStore = create<CloudSyncStoreState>()(
       remoteMetadata: createEmptyCloudSyncMetadataMap(),
       domainStatus: createInitialDomainStatus(),
       deletionMarkers: createEmptyDeletionMarkers(),
+      persistedMetadata: createEmptyCloudSyncPersistedMetadataState(),
 
       setAutoSyncEnabled: (enabled) => set({ autoSyncEnabled: enabled }),
 
@@ -408,6 +420,11 @@ export const useCloudSyncStore = create<CloudSyncStoreState>()(
             },
           };
         }),
+
+      updatePersistedMetadata: (updater) =>
+        set((state) => ({
+          persistedMetadata: updater(state.persistedMetadata),
+        })),
     }),
     {
       name: STORE_NAME,
@@ -424,6 +441,7 @@ export const useCloudSyncStore = create<CloudSyncStoreState>()(
         syncContacts: state.syncContacts,
         lastCheckedAt: state.lastCheckedAt,
         deletionMarkers: state.deletionMarkers,
+        persistedMetadata: state.persistedMetadata,
         domainStatus: Object.fromEntries(
           Object.entries(state.domainStatus).map(([domain, status]) => [
             domain,
@@ -513,6 +531,13 @@ export const useCloudSyncStore = create<CloudSyncStoreState>()(
           syncContacts: (candidate as Record<string, unknown>).syncContacts as boolean ?? true,
           lastCheckedAt: candidate.lastCheckedAt ?? null,
           deletionMarkers,
+          persistedMetadata: normalizeCloudSyncPersistedMetadataState(
+            (
+              candidate as Partial<{
+                persistedMetadata: CloudSyncPersistedMetadataState;
+              }>
+            ).persistedMetadata
+          ),
           domainStatus,
         };
       },