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.

refactor: simplify sync architecture, remove dead code, fix efficiency

libokai82c59ce8053b
diff --git a/Codync-iOS/App/AppDelegate.swift b/Codync-iOS/App/AppDelegate.swift
index e6097c6c..ae213038 100644
--- a/Codync-iOS/App/AppDelegate.swift
+++ b/Codync-iOS/App/AppDelegate.swift
@@ -44,8 +44,8 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
guard subID == "session-zone-changes" || subID == "session-changes" else {
return .noData
}
- logger.debug("CloudKit push received")
- await receiver.fetch()
+ logger.info("CloudKit push received")
+ await receiver.fetch(source: "silent-push")
liveActivityManager.updateSessions(receiver.sessions)
return .newData
}
diff --git a/Codync-iOS/Services/CloudKitReceiver.swift b/Codync-iOS/Services/CloudKitReceiver.swift
index a261aefd..ccde747f 100644
--- a/Codync-iOS/Services/CloudKitReceiver.swift
+++ b/Codync-iOS/Services/CloudKitReceiver.swift
@@ -8,7 +8,6 @@ private let logger = Logger(subsystem: "com.pokai.Codync.ios", category: "CloudK
@MainActor
final class CloudKitReceiver: ObservableObject {
@Published var sessions: [SessionState] = []
- private var pollTimer: Timer?
private var isFetching = false
func start() async {
@@ -24,40 +23,18 @@ final class CloudKitReceiver: ObservableObject {
} catch {
logger.error("Failed to subscribe to CloudKit: \(error.localizedDescription)")
}
- await fetch()
- startPolling()
+ await fetch(source: "initial")
}
- func fetch() async {
+ func fetch(source: String = "unknown") async {
guard !isFetching else { return }
isFetching = true
defer { isFetching = false }
do {
sessions = try await CloudKitManager.shared.fetchAll()
- logger.debug("Fetched \(self.sessions.count) sessions")
+ logger.info("Fetched \(self.sessions.count) sessions (source: \(source))")
} catch {
logger.error("CloudKit fetch failed: \(error.localizedDescription)")
}
}
-
- func onRemoteNotification() async {
- logger.debug("Remote notification received")
- await fetch()
- }
-
- func startPolling() {
- guard pollTimer == nil else { return }
- logger.info("Starting CloudKit polling (5s interval)")
- pollTimer = Timer.scheduledTimer(withTimeInterval: 5, repeats: true) { [weak self] _ in
- Task { @MainActor in
- await self?.fetch()
- }
- }
- }
-
- func stopPolling() {
- pollTimer?.invalidate()
- pollTimer = nil
- logger.info("Stopped CloudKit polling")
- }
}
diff --git a/Codync-iOS/Services/LiveActivityManager.swift b/Codync-iOS/Services/LiveActivityManager.swift
index bc36621f..86bfae43 100644
--- a/Codync-iOS/Services/LiveActivityManager.swift
+++ b/Codync-iOS/Services/LiveActivityManager.swift
@@ -77,6 +77,8 @@ final class LiveActivityManager: ObservableObject {
// MARK: - Unified Update
func updateSessions(_ sessions: [SessionState]) {
+ let statuses = sessions.map { "\($0.projectName):\($0.status.rawValue)" }.joined(separator: ", ")
+ logger.debug("updateSessions: \(statuses)")
sessionsByID = Dictionary(sessions.map { ($0.sessionId, $0) }, uniquingKeysWith: { _, last in last })
// 1. Clean up completed/dead sessions
@@ -240,14 +242,32 @@ final class LiveActivityManager: ObservableObject {
}
}
- /// Push an activity update only if the content state actually changed.
+ /// Push an activity update only if non-time fields changed.
+ /// durationSec changes every second — comparing it would cause constant updates.
private func pushUpdateIfChanged(_ session: SessionState) {
guard let activity = activities[session.sessionId] else { return }
let state = contentState(from: session)
- guard state != lastPushedState[session.sessionId] else { return }
+
+ let prev = lastPushedState[session.sessionId]
+ let meaningfulChange = prev == nil
+ || prev?.status != state.status
+ || prev?.model != state.model
+ || prev?.completedCount != state.completedCount
+ || prev?.totalCount != state.totalCount
+ || prev?.currentTask != state.currentTask
+ || prev?.contextPct != state.contextPct
+ || prev?.costUSD != state.costUSD
+
+ guard meaningfulChange else { return }
+
+ if let prev, prev.status != state.status {
+ logger.info("[\(session.projectName)] status changed: \(prev.status) → \(state.status)")
+ }
lastPushedState[session.sessionId] = state
+ // Pinned sessions get highest relevance → iOS shows them in Dynamic Island
+ let score: Double = pinnedSessionIds.contains(session.sessionId) ? 100 : 25
Task {
- await activity.update(.init(state: state, staleDate: nil))
+ await activity.update(.init(state: state, staleDate: nil, relevanceScore: score))
}
}
diff --git a/Codync-iOS/Views/IOSRootView.swift b/Codync-iOS/Views/IOSRootView.swift
index 53e355cd..56c7e62a 100644
--- a/Codync-iOS/Views/IOSRootView.swift
+++ b/Codync-iOS/Views/IOSRootView.swift
@@ -34,6 +34,7 @@ struct IOSRootView: View {
// Initialize with current sessions
displayedSessions = sortSessions(receiver.sessions)
// Start 5-second reorder timer
+ reorderTimer?.invalidate()
reorderTimer = Timer.scheduledTimer(withTimeInterval: 5, repeats: true) { _ in
Task { @MainActor in
let sorted = sortSessions(receiver.sessions)
diff --git a/Codync-macOS/Services/APNsPushService.swift b/Codync-macOS/Services/APNsPushService.swift
index 305903c0..c1734f58 100644
--- a/Codync-macOS/Services/APNsPushService.swift
+++ b/Codync-macOS/Services/APNsPushService.swift
@@ -18,21 +18,13 @@ final class APNsPushService {
private init() {
logger.info("APNs push service ready (Worker relay)")
- Self.log("APNs push service initialized")
- }
-
- private static func log(_ msg: String) {
- let url = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".codync/apns.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) }
}
// MARK: - Public API
func sendUpdate(session: SessionState) async {
guard let tokenHex = pushTokens[session.sessionId] else {
- Self.log("SKIP update \(session.sessionId.prefix(8))… — no push token (have \(pushTokens.count) tokens: \(pushTokens.keys.map { String($0.prefix(8)) }))")
+ logger.debug("SKIP update \(session.sessionId.prefix(8))… — no push token")
return
}
@@ -42,7 +34,7 @@ final class APNsPushService {
"event": "update",
"contentState": contentState
]
- Self.log("SENDING update \(session.sessionId.prefix(8))… status=\(session.status.rawValue) token=\(tokenHex.prefix(8))…")
+ logger.info("Sending update \(session.sessionId.prefix(8))… status=\(session.status.rawValue)")
await post(payload: payload, label: "update \(session.sessionId)")
}
@@ -80,16 +72,14 @@ final class APNsPushService {
}
if tokens != pushTokens {
pushTokens = tokens
- Self.log("Fetched \(tokens.count) push tokens: \(tokens.keys.map { String($0.prefix(8)) })")
if !tokens.isEmpty {
logger.info("Fetched \(tokens.count) push tokens from CloudKit")
}
}
} catch let error as CKError where error.code == .unknownItem {
// PushToken record type doesn't exist yet — iOS hasn't saved any tokens
- Self.log("No PushToken record type in CloudKit (iOS hasn't registered any)")
+ logger.debug("No PushToken record type in CloudKit yet")
} catch {
- Self.log("ERROR fetching tokens: \(error)")
logger.warning("Failed to fetch push tokens: \(error)")
}
}
@@ -111,16 +101,14 @@ final class APNsPushService {
do {
let (data, response) = try await URLSession.shared.data(for: request)
if let http = response as? HTTPURLResponse {
- let reason = String(data: data, encoding: .utf8) ?? ""
if http.statusCode == 200 {
- Self.log("Worker OK for \(label)")
+ logger.debug("Worker OK for \(label)")
} else {
- Self.log("Worker \(http.statusCode) for \(label): \(reason)")
+ let reason = String(data: data, encoding: .utf8) ?? ""
logger.warning("Worker \(http.statusCode) for \(label): \(reason)")
}
}
} catch {
- Self.log("Worker POST failed for \(label): \(error.localizedDescription)")
logger.error("Worker POST failed for \(label): \(error.localizedDescription)")
}
}
diff --git a/Codync-macOS/Services/CloudKitSync.swift b/Codync-macOS/Services/CloudKitSync.swift
index 039a932f..fcc333f0 100644
--- a/Codync-macOS/Services/CloudKitSync.swift
+++ b/Codync-macOS/Services/CloudKitSync.swift
@@ -15,13 +15,6 @@ final class CloudKitSync {
private var isSyncing = false
private var quotaBackoffUntil: Date?
- private static func log(_ msg: String) {
- let url = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".codync/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
@@ -29,9 +22,9 @@ final class CloudKitSync {
Task {
do {
try await CloudKitManager.shared.ensureZoneExists()
- Self.log("Custom zone ready")
+ logger.info("Custom zone ready")
} catch {
- Self.log("Zone creation failed: \(error) — will retry on next save")
+ logger.warning("Zone creation failed: \(error) — will retry on next save")
}
}
@@ -85,40 +78,29 @@ final class CloudKitSync {
}
do {
- // Send end push BEFORE deleting (tokens still needed)
- for id in toDelete {
- await APNsPushService.shared.sendEnd(sessionId: id)
- }
-
if !toDelete.isEmpty {
- Self.log("deleteByIds \(toDelete.count) sessions (PID dead)")
+ logger.info("deleteByIds \(toDelete.count) sessions (PID dead)")
try await CloudKitManager.shared.deleteByIds(toDelete)
- Self.log("SUCCESS: deleted \(toDelete.count)")
+ logger.info("Deleted \(toDelete.count) sessions")
for id in toDelete {
previousStates.removeValue(forKey: id)
}
}
if !toSave.isEmpty {
- Self.log("saveBatch \(toSave.count) sessions")
+ logger.info("saveBatch \(toSave.count) sessions")
try await CloudKitManager.shared.saveBatch(toSave)
- Self.log("SUCCESS: saved \(toSave.count)")
+ logger.info("Saved \(toSave.count) sessions")
for session in toSave {
previousStates[session.sessionId] = session
}
-
- // Push to APNs via Worker relay for Live Activity background updates
- await APNsPushService.shared.fetchPushTokens()
- for session in toSave {
- await APNsPushService.shared.sendUpdate(session: session)
- }
}
} catch let error as CKError where error.code == .quotaExceeded || error.code == .requestRateLimited {
let retryAfter = error.retryAfterSeconds ?? 600
- Self.log("QUOTA: backoff \(Int(retryAfter * 2))s")
+ logger.warning("QUOTA: backoff \(Int(retryAfter * 2))s")
quotaBackoffUntil = Date().addingTimeInterval(retryAfter * 2)
} catch {
- Self.log("ERROR: \(error)")
+ logger.error("CloudKit sync error: \(error)")
quotaBackoffUntil = Date().addingTimeInterval(300)
}
}
diff --git a/Codync-macOS/Views/SessionListView.swift b/Codync-macOS/Views/SessionListView.swift
index b4e9823e..c53c28e2 100644
--- a/Codync-macOS/Views/SessionListView.swift
+++ b/Codync-macOS/Views/SessionListView.swift
@@ -34,6 +34,7 @@ struct SessionListView: View {
.preferredColorScheme(theme.isDark ? .dark : .light)
.task {
displayedSessions = stateManager.sessions
+ reorderTimer?.invalidate()
reorderTimer = Timer.scheduledTimer(withTimeInterval: 5, repeats: true) { _ in
Task { @MainActor in
let sorted = stateManager.sessions
@@ -87,7 +88,7 @@ struct SessionListView: View {
cardStyles = newStyles
previousOrder = newOrder
- // Reset after 0.8s
+ // Reset after animation completes
Task {
try? await Task.sleep(for: .seconds(2.0))
withAnimation(.easeOut(duration: 0.3)) { cardStyles = [:] }