Skip to content

Open source Grok Bot alternative, Bring your own agent and subscription: message Claude Code, Codex, Gemini CLI, Cursor, Copilot and 40+ AI agents as bots on your own computer, from iPhone, Mac, Windows, Linux or terminal. Agent-agnostic and free. Also a Muse and Dots alternative. Built in Rust.

fix: migrate CloudKit to custom zone for reliable silent push

libokai06d9d8a14b82
diff --git a/Codync-iOS/App/AppDelegate.swift b/Codync-iOS/App/AppDelegate.swift
index 0c498c3b..e6097c6c 100644
--- a/Codync-iOS/App/AppDelegate.swift
+++ b/Codync-iOS/App/AppDelegate.swift
@@ -40,7 +40,8 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
didReceiveRemoteNotification userInfo: [AnyHashable: Any]
) async -> UIBackgroundFetchResult {
let notification = CKNotification(fromRemoteNotificationDictionary: userInfo)
- guard notification?.subscriptionID == "session-changes" else {
+ let subID = notification?.subscriptionID
+ guard subID == "session-zone-changes" || subID == "session-changes" else {
return .noData
}
logger.debug("CloudKit push received")
diff --git a/Codync-iOS/Services/CloudKitReceiver.swift b/Codync-iOS/Services/CloudKitReceiver.swift
index 5bc427b6..720d83e1 100644
--- a/Codync-iOS/Services/CloudKitReceiver.swift
+++ b/Codync-iOS/Services/CloudKitReceiver.swift
@@ -12,9 +12,15 @@ final class CloudKitReceiver: ObservableObject {
private var isFetching = false
func start() async {
+ // Ensure custom zone exists before subscribing
+ do {
+ try await CloudKitManager.shared.ensureZoneExists()
+ } catch {
+ logger.warning("Zone creation failed: \(error.localizedDescription)")
+ }
do {
try await CloudKitManager.shared.subscribeToChanges()
- logger.info("CloudKit subscription active")
+ logger.info("CloudKit zone subscription active")
} catch {
logger.error("Failed to subscribe to CloudKit: \(error.localizedDescription)")
}
diff --git a/Codync-macOS/Services/CloudKitSync.swift b/Codync-macOS/Services/CloudKitSync.swift
index 00c1c91a..3c521781 100644
--- a/Codync-macOS/Services/CloudKitSync.swift
+++ b/Codync-macOS/Services/CloudKitSync.swift
@@ -24,6 +24,17 @@ final class CloudKitSync {
init(stateManager: SessionStateManager) {
self.stateManager = stateManager
+
+ // Ensure custom zone exists before any saves
+ Task {
+ do {
+ try await CloudKitManager.shared.ensureZoneExists()
+ Self.log("Custom zone ready")
+ } catch {
+ Self.log("Zone creation failed: \(error) — will retry on next save")
+ }
+ }
+
stateManager.$sessions
.throttle(for: .milliseconds(500), scheduler: RunLoop.main, latest: true)
.sink { [weak self] sessions in
diff --git a/CodyncShared/Sources/CloudKit/CloudKitManager.swift b/CodyncShared/Sources/CloudKit/CloudKitManager.swift
index b86fb36c..034c9947 100644
--- a/CodyncShared/Sources/CloudKit/CloudKitManager.swift
+++ b/CodyncShared/Sources/CloudKit/CloudKitManager.swift
@@ -9,16 +9,27 @@ public final class CloudKitManager: Sendable {
private let container = CKContainer(identifier: "iCloud.com.pokai.Codync")
public var database: CKDatabase { container.privateCloudDatabase }
+ /// Custom zone — required for reliable silent push notifications.
+ /// Default zone does not support CKRecordZoneSubscription or change tokens.
+ public static let zoneID = CKRecordZone.ID(zoneName: "Sessions", ownerName: CKCurrentUserDefaultName)
+
private init() {}
+ // MARK: - Zone Setup
+
+ /// Create the custom zone if it doesn't exist. Idempotent — safe to call on every launch.
+ public func ensureZoneExists() async throws {
+ let zone = CKRecordZone(zoneID: Self.zoneID)
+ _ = try await database.save(zone)
+ }
+
// MARK: - Write (macOS)
- /// Save sessions to CloudKit. Fetches existing records first to avoid conflicts.
+ /// Save sessions to CloudKit custom zone. Fetches existing records first to avoid conflicts.
public func saveBatch(_ sessions: [SessionState]) async throws {
guard !sessions.isEmpty else { return }
- // Fetch existing records to get change tags
- let recordIDs = sessions.map { CKRecord.ID(recordName: $0.sessionId) }
+ let recordIDs = sessions.map { CKRecord.ID(recordName: $0.sessionId, zoneID: Self.zoneID) }
var existing: [String: CKRecord] = [:]
let results = (try? await database.records(for: recordIDs)) ?? [:]
for (id, result) in results {
@@ -34,7 +45,7 @@ public final class CloudKitManager: Sendable {
CKRecordMapper.updateRecord(server, with: session)
record = server
} else {
- record = CKRecordMapper.toRecord(session)
+ record = CKRecordMapper.toRecord(session, zoneID: Self.zoneID)
}
_ = try await database.save(record)
savedCount += 1
@@ -47,7 +58,9 @@ public final class CloudKitManager: Sendable {
public func fetchAll() async throws -> [SessionState] {
let query = CKQuery(recordType: CKRecordMapper.recordType, predicate: NSPredicate(value: true))
query.sortDescriptors = [NSSortDescriptor(key: "updatedAt", ascending: false)]
- let (results, _) = try await database.records(matching: query, resultsLimit: 20)
+ let (results, _) = try await database.records(
+ matching: query, inZoneWith: Self.zoneID, resultsLimit: 20
+ )
let sessions = results.compactMap { _, result in
guard case .success(let record) = result else { return nil as SessionState? }
return CKRecordMapper.fromRecord(record)
@@ -58,55 +71,54 @@ public final class CloudKitManager: Sendable {
// MARK: - Subscribe (iOS)
- private static let subscriptionKey = "codync_ck_subscription_created"
+ private static let subscriptionKey = "codync_ck_zone_subscription_v2"
public func subscribeToChanges() async throws {
- let subscriptionID = "session-changes"
+ let subscriptionID = "session-zone-changes"
- // Skip network call if we already created the subscription in a previous launch
if UserDefaults.standard.bool(forKey: Self.subscriptionKey) {
- logger.info("CloudKit subscription already created (cached)")
+ logger.info("CloudKit zone subscription already created (cached)")
return
}
- // Check server — only needed on first launch or after reinstall
+ // Delete old default-zone subscription if it exists
+ try? await database.deleteSubscription(withID: "session-changes")
+
if (try? await database.subscription(for: subscriptionID)) != nil {
UserDefaults.standard.set(true, forKey: Self.subscriptionKey)
- logger.info("CloudKit subscription already exists")
+ logger.info("CloudKit zone subscription already exists")
return
}
- let subscription = CKQuerySubscription(
- recordType: CKRecordMapper.recordType,
- predicate: NSPredicate(value: true),
- subscriptionID: subscriptionID,
- options: [.firesOnRecordCreation, .firesOnRecordUpdate, .firesOnRecordDeletion]
+ // CKRecordZoneSubscription on custom zone — this is the reliable pattern
+ let subscription = CKRecordZoneSubscription(
+ zoneID: Self.zoneID,
+ subscriptionID: subscriptionID
)
let info = CKSubscription.NotificationInfo()
info.shouldSendContentAvailable = true
subscription.notificationInfo = info
_ = try await database.save(subscription)
UserDefaults.standard.set(true, forKey: Self.subscriptionKey)
- logger.info("Created CloudKit subscription")
+ logger.info("Created CloudKit zone subscription")
}
// MARK: - Delete
- /// Delete specific session records by ID (called when sessions complete on macOS)
public func deleteByIds(_ sessionIds: [String]) async throws {
guard !sessionIds.isEmpty else { return }
- let recordIDs = sessionIds.map { CKRecord.ID(recordName: $0) }
+ let recordIDs = sessionIds.map { CKRecord.ID(recordName: $0, zoneID: Self.zoneID) }
for id in recordIDs {
try? await database.deleteRecord(withID: id)
}
logger.info("Deleted \(sessionIds.count) session records from CloudKit")
}
- /// Delete all CloudKit records whose sessionId is NOT in the active set.
- /// Called once on macOS app launch to clean up stale records from prior crashes.
public func deleteOrphans(activeSessionIds: Set<String>) async throws {
let query = CKQuery(recordType: CKRecordMapper.recordType, predicate: NSPredicate(value: true))
- let (results, _) = try await database.records(matching: query, resultsLimit: 50)
+ let (results, _) = try await database.records(
+ matching: query, inZoneWith: Self.zoneID, resultsLimit: 50
+ )
var deletedCount = 0
for (id, result) in results {
guard case .success = result else { continue }