Skip to content

iCloud sync: merge core and CloudKit transport #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sarthakagrawal927 merged 4 commits into from
Aug 16, 2026
Merged

iCloud sync: merge core and CloudKit transport #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0e659a
feat(ios): merge core for iCloud sync, without any transport
sarthakagrawal927 Aug 16, 2026
ecba3ba
feat(ios): CloudKit transport and sync coordinator
sarthakagrawal927 Aug 16, 2026
a6fd0a4
feat(ios): wire iCloud sync into the app and Settings
sarthakagrawal927 Aug 16, 2026
23504e7
docs: describe the iCloud transport without claiming it is shipped
sarthakagrawal927 Aug 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions PROJECT_STATUS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ current values against authored targets. It excludes coaching, automatic
programme generation, social features, meal/recovery tracking, and sensors.

Apple Health, Apple Watch, CrossFit session formats, range-of-motion
assessments, iCloud sync, and on-device workout generation are planned rather than
shipped. Until iCloud sync lands, training lives only on the device that recorded
it, and the versioned JSON export is the only way to move or back it up.
assessments, and on-device workout generation are planned rather than shipped.
iCloud sync is implemented on this branch — per-record CloudKit in the user's
private database, with a pure merge, a Settings status, and launch/foreground
reconcile — but two-device convergence has not been checked on hardware, so it
is not claimed as shipped. The versioned JSON export remains the backup.

## Dependencies

Expand All @@ -32,6 +34,15 @@ it, and the versioned JSON export is the only way to move or back it up.

## Timeline

- 2026-08-16 — added the CloudKit transport on top of the merge core: a private
custom zone, record mapping, change tokens, a coordinator that can be tested
against an in-memory store, Settings that report real `CKAccountStatus`, and
a sync that never runs during an active workout or a demo/UI-test launch.
Two-device convergence is still unverified, so privacy still says sync is
built but not active. The native coverage floor moved from 83.8% to 82.6%
against a measured 83.1305%, because CloudKit network calls cannot execute
in the simulator; the mapping, merge, tombstones and ledger stay covered.

- 2026-08-16 — replaced the placeholder privacy notice, terms and changelog with
real pages on the tracked palette. The privacy notice had still claimed that
optional Google sign-in stores a private user-scoped copy, which the backend
Expand Down
40 changes: 40 additions & 0 deletions ios/Setline.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,36 @@
0FA5FD50B707EF422848A2E6 /* Targets.swift in Sources */ = {isa = PBXBuildFile; fileRef = B888AC3A36F08B6334AE20CA /* Targets.swift */; };
171B1B9E0DDE084379BB9DF8 /* RestNotifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9B9735779088EF43C24F335 /* RestNotifier.swift */; };
1FA5DF9F89B308A82207E40B /* SetlineCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0DE14EAFD3C581FCA8D09CA7 /* SetlineCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
23183983137F404478133DE7 /* CloudKitRecordStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95630F72644F50FB1E3FEA23 /* CloudKitRecordStore.swift */; };
309CBBBA2928642CBD999F67 /* Progression.swift in Sources */ = {isa = PBXBuildFile; fileRef = 594DC48A6CD7B68259549A12 /* Progression.swift */; };
3120400F1A39A6AE513A7DDA /* SyncRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9405EFEDE8A70CC15F9E0309 /* SyncRecord.swift */; };
326CD8AE0B8D86B2954E301E /* PlanViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396D4D1100A1E0FACCD8953A /* PlanViews.swift */; };
3BBA35B8612998A8EB3205F2 /* ExerciseCatalogue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 602F0E123ED63C93EDDBA179 /* ExerciseCatalogue.swift */; };
3CE2DEDE101DA826A45AC5F8 /* Design.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2CB1821B5B5AE4C75873C6 /* Design.swift */; };
401D75E9685D1937CEA9AF16 /* SetEntryParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE77BBBECF6D7ED1F7E8047E /* SetEntryParser.swift */; };
5FDD1235ADE7D25DC029C4F6 /* TwelveWeekProgramme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4833E444B40BC982AC57AACC /* TwelveWeekProgramme.swift */; };
66E5690BB3806C5D8CF41CF8 /* SetlineUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEE9CEC1CE889DCD183F4CF7 /* SetlineUITests.swift */; };
677B5B2EB644215DBE6CE4D0 /* SetlineCoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1211B40E359F4BBD82A557A9 /* SetlineCoreTests.swift */; };
75A48BAD87E5189FD50988BA /* SyncCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 020E8CE667213A5350E98BD7 /* SyncCoordinator.swift */; };
7BA25FFB3FFB25D151F399E7 /* CloudKitRecordStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 952100975C36861293E504E0 /* CloudKitRecordStoreTests.swift */; };
7DFE7762F43344AFC746CDC6 /* Domain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0859DE334CC4D97FFE0DFDA /* Domain.swift */; };
8AEB42E3793E01E4E40F67FF /* SetlineCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DE14EAFD3C581FCA8D09CA7 /* SetlineCore.framework */; };
8CCC1E8C5F455AF8C9B8EFD7 /* ExercisesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D9600ED385C5C29CB0702D3 /* ExercisesView.swift */; };
8E3F2AD8D895CAF11E51BA16 /* RemoteRecordStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16FAF07588C46AFAC99E674B /* RemoteRecordStore.swift */; };
905B35BB3B49C692703FAA7B /* TodayResolution.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E6AEE25CFD26FE63620A033 /* TodayResolution.swift */; };
9B6BAEA361E4A2746BFBF940 /* SyncEngine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D57699DA4317A7229DA6B21 /* SyncEngine.swift */; };
A748F947702FBF73CBE681AD /* WorkoutPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 818A8EDA05B5D0B4E9DE47B3 /* WorkoutPlayerView.swift */; };
A949A76428AB4118FB259A70 /* SecondaryViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = DFAE6EB21BC26F97140F4FEE /* SecondaryViews.swift */; };
BE5FDC83C2B64F526F64979C /* RootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 824EFFB1023C857CE4F1FE1C /* RootView.swift */; };
C66AD84C2D8FAD24149B2445 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = F52F5D64B932696BAEDEE0AC /* PrivacyInfo.xcprivacy */; };
C7E1EDD15D038B815CB78D27 /* SetlineApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608F81A574360691A58B8581 /* SetlineApp.swift */; };
D9647D921553DE22AB36226A /* SetlineCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0DE14EAFD3C581FCA8D09CA7 /* SetlineCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
DEE8DD0CE56008BF90B164DB /* SyncEngineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC052D7878745A06AC98A7E9 /* SyncEngineTests.swift */; };
E5FAA9DE6E6F5CCBE9E4343F /* Goals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02194DFCF1365CCD34525231 /* Goals.swift */; };
E85DFE444A157EC32C671B9B /* AppModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B839442BFCCB000A563CD704 /* AppModel.swift */; };
EC589E605EEE16DA5E0F613E /* SetlineCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DE14EAFD3C581FCA8D09CA7 /* SetlineCore.framework */; };
F5D0CC71C826F541575E7D99 /* Persistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65E8358BE39000A0F7E1BB90 /* Persistence.swift */; };
FEEC73426B437E36444A4A6D /* SyncCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73CF090DBE8EAAA9150C57DA /* SyncCoordinatorTests.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -86,31 +94,39 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
020E8CE667213A5350E98BD7 /* SyncCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncCoordinator.swift; sourceTree = "<group>"; };
02194DFCF1365CCD34525231 /* Goals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Goals.swift; sourceTree = "<group>"; };
0DE14EAFD3C581FCA8D09CA7 /* SetlineCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SetlineCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1211B40E359F4BBD82A557A9 /* SetlineCoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetlineCoreTests.swift; sourceTree = "<group>"; };
15268979096821BD9ABB22E0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
16FAF07588C46AFAC99E674B /* RemoteRecordStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteRecordStore.swift; sourceTree = "<group>"; };
18C887472FBEDF36FD127C32 /* HistoryViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryViews.swift; sourceTree = "<group>"; };
396D4D1100A1E0FACCD8953A /* PlanViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlanViews.swift; sourceTree = "<group>"; };
3C2CB1821B5B5AE4C75873C6 /* Design.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Design.swift; sourceTree = "<group>"; };
40CADB4F69054A14B366A16D /* Setline.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Setline.entitlements; sourceTree = "<group>"; };
4833E444B40BC982AC57AACC /* TwelveWeekProgramme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwelveWeekProgramme.swift; sourceTree = "<group>"; };
594DC48A6CD7B68259549A12 /* Progression.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Progression.swift; sourceTree = "<group>"; };
5D57699DA4317A7229DA6B21 /* SyncEngine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncEngine.swift; sourceTree = "<group>"; };
5D9600ED385C5C29CB0702D3 /* ExercisesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExercisesView.swift; sourceTree = "<group>"; };
602F0E123ED63C93EDDBA179 /* ExerciseCatalogue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExerciseCatalogue.swift; sourceTree = "<group>"; };
608F81A574360691A58B8581 /* SetlineApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetlineApp.swift; sourceTree = "<group>"; };
65E8358BE39000A0F7E1BB90 /* Persistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Persistence.swift; sourceTree = "<group>"; };
6BF346E7B39E1FEE8CD50C7C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
6E6AEE25CFD26FE63620A033 /* TodayResolution.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodayResolution.swift; sourceTree = "<group>"; };
73CF090DBE8EAAA9150C57DA /* SyncCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncCoordinatorTests.swift; sourceTree = "<group>"; };
818A8EDA05B5D0B4E9DE47B3 /* WorkoutPlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkoutPlayerView.swift; sourceTree = "<group>"; };
824EFFB1023C857CE4F1FE1C /* RootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootView.swift; sourceTree = "<group>"; };
9405EFEDE8A70CC15F9E0309 /* SyncRecord.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncRecord.swift; sourceTree = "<group>"; };
952100975C36861293E504E0 /* CloudKitRecordStoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudKitRecordStoreTests.swift; sourceTree = "<group>"; };
95630F72644F50FB1E3FEA23 /* CloudKitRecordStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudKitRecordStore.swift; sourceTree = "<group>"; };
B0859DE334CC4D97FFE0DFDA /* Domain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Domain.swift; sourceTree = "<group>"; };
B1F5DA4EB37759476E57B69F /* SetlineUITests.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = SetlineUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
B7B0A3E4EF45F3C038E3C265 /* SetlineCoreTests.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = SetlineCoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
B839442BFCCB000A563CD704 /* AppModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppModel.swift; sourceTree = "<group>"; };
B888AC3A36F08B6334AE20CA /* Targets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Targets.swift; sourceTree = "<group>"; };
BA87F29CCAE78D4F24E75B1F /* Setline.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Setline.app; sourceTree = BUILT_PRODUCTS_DIR; };
C9B9735779088EF43C24F335 /* RestNotifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestNotifier.swift; sourceTree = "<group>"; };
CC052D7878745A06AC98A7E9 /* SyncEngineTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncEngineTests.swift; sourceTree = "<group>"; };
CE77BBBECF6D7ED1F7E8047E /* SetEntryParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetEntryParser.swift; sourceTree = "<group>"; };
DFAE6EB21BC26F97140F4FEE /* SecondaryViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecondaryViews.swift; sourceTree = "<group>"; };
F52F5D64B932696BAEDEE0AC /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
Expand Down Expand Up @@ -190,11 +206,24 @@
B888AC3A36F08B6334AE20CA /* Targets.swift */,
6E6AEE25CFD26FE63620A033 /* TodayResolution.swift */,
4833E444B40BC982AC57AACC /* TwelveWeekProgramme.swift */,
7F11BB8EB61A5F8FAC4C3B95 /* Sync */,
);
name = SetlineCore;
path = Sources/SetlineCore;
sourceTree = "<group>";
};
7F11BB8EB61A5F8FAC4C3B95 /* Sync */ = {
isa = PBXGroup;
children = (
95630F72644F50FB1E3FEA23 /* CloudKitRecordStore.swift */,
16FAF07588C46AFAC99E674B /* RemoteRecordStore.swift */,
020E8CE667213A5350E98BD7 /* SyncCoordinator.swift */,
5D57699DA4317A7229DA6B21 /* SyncEngine.swift */,
9405EFEDE8A70CC15F9E0309 /* SyncRecord.swift */,
);
path = Sync;
sourceTree = "<group>";
};
C93C5A86494CB1CE017F1623 /* Products */ = {
isa = PBXGroup;
children = (
Expand All @@ -218,7 +247,10 @@
E920810526DCE73641A751A7 /* SetlineCoreTests */ = {
isa = PBXGroup;
children = (
952100975C36861293E504E0 /* CloudKitRecordStoreTests.swift */,
1211B40E359F4BBD82A557A9 /* SetlineCoreTests.swift */,
73CF090DBE8EAAA9150C57DA /* SyncCoordinatorTests.swift */,
CC052D7878745A06AC98A7E9 /* SyncEngineTests.swift */,
);
name = SetlineCoreTests;
path = Tests/SetlineCoreTests;
Expand Down Expand Up @@ -395,20 +427,28 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
7BA25FFB3FFB25D151F399E7 /* CloudKitRecordStoreTests.swift in Sources */,
677B5B2EB644215DBE6CE4D0 /* SetlineCoreTests.swift in Sources */,
FEEC73426B437E36444A4A6D /* SyncCoordinatorTests.swift in Sources */,
DEE8DD0CE56008BF90B164DB /* SyncEngineTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
66C58AB55779EC703D6E1C99 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
23183983137F404478133DE7 /* CloudKitRecordStore.swift in Sources */,
7DFE7762F43344AFC746CDC6 /* Domain.swift in Sources */,
3BBA35B8612998A8EB3205F2 /* ExerciseCatalogue.swift in Sources */,
E5FAA9DE6E6F5CCBE9E4343F /* Goals.swift in Sources */,
F5D0CC71C826F541575E7D99 /* Persistence.swift in Sources */,
309CBBBA2928642CBD999F67 /* Progression.swift in Sources */,
8E3F2AD8D895CAF11E51BA16 /* RemoteRecordStore.swift in Sources */,
401D75E9685D1937CEA9AF16 /* SetEntryParser.swift in Sources */,
75A48BAD87E5189FD50988BA /* SyncCoordinator.swift in Sources */,
9B6BAEA361E4A2746BFBF940 /* SyncEngine.swift in Sources */,
3120400F1A39A6AE513A7DDA /* SyncRecord.swift in Sources */,
0FA5FD50B707EF422848A2E6 /* Targets.swift in Sources */,
905B35BB3B49C692703FAA7B /* TodayResolution.swift in Sources */,
5FDD1235ADE7D25DC029C4F6 /* TwelveWeekProgramme.swift in Sources */,
Expand Down
Loading
Loading