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.

feat: switch CloudKit from private to public database

libokaie938d2d05f2a
diff --git a/CodePulse-macOS/Services/CloudKitSync.swift b/CodePulse-macOS/Services/CloudKitSync.swift
index f9a243e6..013802e3 100644
--- a/CodePulse-macOS/Services/CloudKitSync.swift
+++ b/CodePulse-macOS/Services/CloudKitSync.swift
@@ -14,6 +14,13 @@ final class CloudKitSync {
private var isSyncing = false
private var quotaBackoffUntil: Date?
+ private static func log(_ msg: String) {
+ let url = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".codepulse/sync.log")
+ let line = "[\(Date())] \(msg)\n"
+ if let h = try? FileHandle(forWritingTo: url) { h.seekToEndOfFile(); h.write(line.data(using: .utf8)!); try? h.close() }
+ else { try? line.write(to: url, atomically: false, encoding: .utf8) }
+ }
+
init(stateManager: SessionStateManager) {
self.stateManager = stateManager
stateManager.$sessions
@@ -43,16 +50,18 @@ final class CloudKitSync {
defer { isSyncing = false }
do {
+ Self.log("saveBatch \(changed.count) sessions")
try await CloudKitManager.shared.saveBatch(changed)
+ Self.log("SUCCESS: saved \(changed.count)")
for session in changed {
previousStates[session.sessionId] = session
}
} catch let error as CKError where error.code == .quotaExceeded || error.code == .requestRateLimited {
let retryAfter = error.retryAfterSeconds ?? 600
- // Double the backoff to be safe
+ Self.log("QUOTA: backoff \(Int(retryAfter * 2))s")
quotaBackoffUntil = Date().addingTimeInterval(retryAfter * 2)
} catch {
- // Unknown error — backoff 5 minutes
+ Self.log("ERROR: \(error)")
quotaBackoffUntil = Date().addingTimeInterval(300)
}
}
diff --git a/CodePulseShared/Sources/CloudKit/CloudKitManager.swift b/CodePulseShared/Sources/CloudKit/CloudKitManager.swift
index 7bb7b68e..769b0ae2 100644
--- a/CodePulseShared/Sources/CloudKit/CloudKitManager.swift
+++ b/CodePulseShared/Sources/CloudKit/CloudKitManager.swift
@@ -7,90 +7,32 @@ private let logger = Logger(subsystem: "com.pokai.CodePulse", category: "CloudKi
public final class CloudKitManager: Sendable {
public static let shared = CloudKitManager()
private let container = CKContainer(identifier: "iCloud.com.pokai.CodePulse")
- public var database: CKDatabase { container.privateCloudDatabase }
+ public var database: CKDatabase { container.publicCloudDatabase }
private init() {}
// MARK: - Write (macOS)
- /// Batch save sessions using CKModifyRecordsOperation with .allKeys (force overwrite).
- /// This uses 1 CloudKit request for all records instead of N individual saves.
+ /// Save sessions to CloudKit. Uses individual saves (simple + reliable).
public func saveBatch(_ sessions: [SessionState]) async throws {
guard !sessions.isEmpty else { return }
-
- // First, try to fetch existing records to get their change tags
- let recordIDs = sessions.map { CKRecord.ID(recordName: $0.sessionId) }
- var existingRecords: [String: CKRecord] = [:]
-
- // Fetch existing records to get change tags (ignore errors for new records)
- let fetchResults = try? await database.records(for: recordIDs)
- if let fetchResults {
- for (recordID, result) in fetchResults {
- switch result {
- case .success(let record):
- existingRecords[recordID.recordName] = record
- logger.debug("Fetched existing record: \(recordID.recordName.prefix(8))")
- case .failure(let error):
- logger.debug("Record \(recordID.recordName.prefix(8)) not found: \(error.localizedDescription)")
- }
- }
- }
- logger.info("Fetch phase: \(existingRecords.count) existing, \(sessions.count - existingRecords.count) new")
-
- // Build records: update existing or create new
- let records: [CKRecord] = sessions.map { session in
- if let existing = existingRecords[session.sessionId] {
- // Update existing record (preserves change tag)
- CKRecordMapper.updateRecord(existing, with: session)
- return existing
- } else {
- // Create new record
- return CKRecordMapper.toRecord(session)
- }
- }
-
- let operation = CKModifyRecordsOperation(recordsToSave: records)
- operation.savePolicy = .allKeys
- operation.qualityOfService = .utility
-
- return try await withCheckedThrowingContinuation { continuation in
- var perRecordErrors: [String] = []
- var savedCount = 0
-
- operation.perRecordSaveBlock = { recordID, result in
- switch result {
- case .success:
- savedCount += 1
- case .failure(let error):
- perRecordErrors.append("\(recordID.recordName.prefix(8)): \(error.localizedDescription)")
- }
- }
-
- operation.modifyRecordsResultBlock = { result in
- if !perRecordErrors.isEmpty {
- logger.error("Per-record errors: \(perRecordErrors.joined(separator: "; "))")
- }
- logger.info("Batch save: \(savedCount)/\(sessions.count) succeeded")
-
- switch result {
- case .success:
- if savedCount > 0 {
- continuation.resume()
- } else {
- continuation.resume(throwing: CKError(.partialFailure))
- }
- case .failure(let error):
- continuation.resume(throwing: error)
- }
- }
- self.database.add(operation)
+ var savedCount = 0
+ for session in sessions {
+ let record = CKRecordMapper.toRecord(session)
+ _ = try await database.save(record)
+ savedCount += 1
}
+ logger.info("Saved \(savedCount)/\(sessions.count) sessions to CloudKit")
}
// MARK: - Read (iOS)
public func fetchAll() async throws -> [SessionState] {
- let query = CKQuery(recordType: CKRecordMapper.recordType, predicate: NSPredicate(value: true))
+ // Fetch only current user's records
+ let userID = try await container.userRecordID()
+ let ownerRef = CKRecord.Reference(recordID: userID, action: .none)
+ let predicate = NSPredicate(format: "creatorUserRecordID == %@", ownerRef)
+ let query = CKQuery(recordType: CKRecordMapper.recordType, predicate: predicate)
query.sortDescriptors = [NSSortDescriptor(key: "updatedAt", ascending: false)]
let (results, _) = try await database.records(matching: query, resultsLimit: 20)
let sessions = results.compactMap { _, result in
@@ -121,7 +63,10 @@ public final class CloudKitManager: Sendable {
public func deleteCompleted(olderThan hours: Int = 24) async throws {
let cutoff = Date().addingTimeInterval(TimeInterval(-hours * 3600))
+ let userID = try await container.userRecordID()
+ let ownerRef = CKRecord.Reference(recordID: userID, action: .none)
let predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [
+ NSPredicate(format: "creatorUserRecordID == %@", ownerRef),
NSPredicate(format: "status == %@", "completed"),
NSPredicate(format: "updatedAt < %@", cutoff as NSDate),
])