Apple Watch app: complications, data grid, background delivery

LoopFollow/Application/AppDelegate.swift

@@ -41,19 +41,28 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Ensure VolumeButtonHandler is initialized so it can receive alarm notifications
         _ = VolumeButtonHandler.shared
 
+        WatchConnectivityManager.shared.activate()
+
         // Register for remote notifications
         DispatchQueue.main.async {
             UIApplication.shared.registerForRemoteNotifications()
         }
 
         BackgroundRefreshManager.shared.register()
 
-        // Detect Before-First-Unlock launch. If protected data is unavailable here,
-        // StorageValues were cached from encrypted UserDefaults and need a reload
-        // on the first foreground after the user unlocks.
-        let bfu = !UIApplication.shared.isProtectedDataAvailable
+        // Detect Before-First-Unlock launch. isProtectedDataAvailable returns false
+        // for ANY locked-screen background launch, not only post-reboot. Standard
+        // UserDefaults use NSFileProtectionCompleteUntilFirstUserAuthentication —
+        // they stay readable after the first unlock even when the screen is locked.
+        // True BFU (boot before first unlock) is the only case where UserDefaults
+        // is actually inaccessible; in that state every StorageValue reads as its
+        // default — including migrationStep, which is always ≥ 1 for existing users.
+        // Guard against false positives by checking that migrationStep is still 0
+        // (its default), meaning the real value couldn't be read from disk.
+        let protectedDataUnavailable = !UIApplication.shared.isProtectedDataAvailable
+        let bfu = protectedDataUnavailable && Storage.shared.migrationStep.value == 0
         Storage.shared.needsBFUReload = bfu
-        LogManager.shared.log(category: .general, message: "BFU check: isProtectedDataAvailable=\(!bfu), needsBFUReload=\(bfu)")
+        LogManager.shared.log(category: .general, message: "BFU check: isProtectedDataAvailable=\(!protectedDataUnavailable), migrationStep=\(Storage.shared.migrationStep.value), needsBFUReload=\(bfu)")
 
         return true
     }

LoopFollow/Contact/ContactImageUpdater.swift

@@ -119,15 +119,18 @@ class ContactImageUpdater {
     private func getIncludedFields(for contactType: ContactType) -> [ContactType] {
         var included: [ContactType] = []
         if Storage.shared.contactTrend.value == .include,
-           Storage.shared.contactTrendTarget.value == contactType {
+           Storage.shared.contactTrendTarget.value == contactType
+        {
             included.append(.Trend)
         }
         if Storage.shared.contactDelta.value == .include,
-           Storage.shared.contactDeltaTarget.value == contactType {
+           Storage.shared.contactDeltaTarget.value == contactType
+        {
             included.append(.Delta)
         }
         if Storage.shared.contactIOB.value == .include,
-           Storage.shared.contactIOBTarget.value == contactType {
+           Storage.shared.contactIOBTarget.value == contactType
+        {
             included.append(.IOB)
         }
         return included

LoopFollow/Controllers/Nightscout/BGData.swift

@@ -236,6 +236,7 @@ extension MainViewController {
             let latestBG = entries[latestEntryIndex].sgv
             let priorBG = entries[latestEntryIndex - 1].sgv
             let deltaBG = latestBG - priorBG
+            let lastBGTime = entries[latestEntryIndex].date
 
             self.updateServerText(with: sourceName)
 
@@ -267,6 +268,7 @@ extension MainViewController {
 
             // Live Activity storage
             Storage.shared.lastBgReadingTimeSeconds.value = lastBGTime
+            Storage.shared.lastBgMgdl.value = Double(latestBG)
             Storage.shared.lastDeltaMgdl.value = Double(deltaBG)
             Storage.shared.lastTrendCode.value = entries[latestEntryIndex].direction
 

LoopFollow/LiveActivity/AppGroupID.swift

@@ -58,6 +58,7 @@ enum AppGroupID {
             ".WidgetExtension",
             ".Widgets",
             ".WidgetsExtension",
+            ".watchkitapp",
             ".Watch",
             ".WatchExtension",
             ".CarPlay",

LoopFollow/LiveActivity/GlucoseSnapshotStore.swift

@@ -2,6 +2,9 @@
 // GlucoseSnapshotStore.swift
 
 import Foundation
+import os.log
+
+private let storeLog = OSLog(subsystem: Bundle.main.bundleIdentifier ?? "com.loopfollow", category: "GlucoseSnapshotStore")
 
 /// Persists the latest GlucoseSnapshot into the App Group container so that:
 /// - the Live Activity extension can read it
@@ -17,31 +20,39 @@ final class GlucoseSnapshotStore {
 
     // MARK: - Public API
 
-    func save(_ snapshot: GlucoseSnapshot) {
+    func save(_ snapshot: GlucoseSnapshot, completion: (() -> Void)? = nil) {
         queue.async {
             do {
                 let url = try self.fileURL()
+                // GlucoseSnapshot writes `updatedAt` as a Double via its custom
+                // encoder, so no JSONEncoder date strategy is required.
                 let encoder = JSONEncoder()
-                encoder.dateEncodingStrategy = .iso8601
                 let data = try encoder.encode(snapshot)
                 try data.write(to: url, options: [.atomic])
+                os_log("GlucoseSnapshotStore: saved snapshot g=%d to %{public}@", log: storeLog, type: .debug, Int(snapshot.glucose), url.lastPathComponent)
             } catch {
-                // Intentionally silent (extension-safe, no dependencies).
+                os_log("GlucoseSnapshotStore: save failed — %{public}@", log: storeLog, type: .error, error.localizedDescription)
             }
+            completion?()
         }
     }
 
     func load() -> GlucoseSnapshot? {
         do {
             let url = try fileURL()
-            guard FileManager.default.fileExists(atPath: url.path) else { return nil }
+            guard FileManager.default.fileExists(atPath: url.path) else {
+                os_log("GlucoseSnapshotStore: file not found at %{public}@", log: storeLog, type: .debug, url.lastPathComponent)
+                return nil
+            }
 
             let data = try Data(contentsOf: url)
+            // GlucoseSnapshot reads `updatedAt` as a Double via its custom decoder,
+            // so no JSONDecoder date strategy is required.
             let decoder = JSONDecoder()
-            decoder.dateDecodingStrategy = .iso8601
-            return try decoder.decode(GlucoseSnapshot.self, from: data)
+            let snapshot = try decoder.decode(GlucoseSnapshot.self, from: data)
+            return snapshot
         } catch {
-            // Intentionally silent (extension-safe, no dependencies).
+            os_log("GlucoseSnapshotStore: load failed — %{public}@", log: storeLog, type: .error, error.localizedDescription)
             return nil
         }
     }

LoopFollow/LiveActivity/LAAppGroupSettings.swift

@@ -149,6 +149,7 @@ enum LAAppGroupSettings {
         static let smallWidgetSlot = "la.smallWidgetSlot"
         static let displayName = "la.displayName"
         static let showDisplayName = "la.showDisplayName"
+        static let watchSelectedSlots = "watch.selectedSlots"
     }
 
     private static var defaults: UserDefaults? {
@@ -206,6 +207,22 @@ enum LAAppGroupSettings {
         return LiveActivitySlotOption(rawValue: raw) ?? LiveActivitySlotDefaults.smallWidgetSlot
     }
 
+    // MARK: - Watch selected slots (ordered, variable-length)
+
+    /// Persists the user's ordered list of selected Watch data slots.
+    static func setWatchSelectedSlots(_ slots: [LiveActivitySlotOption]) {
+        defaults?.set(slots.map(\.rawValue), forKey: Keys.watchSelectedSlots)
+    }
+
+    /// Returns the ordered list of selected Watch data slots.
+    /// Falls back to a sensible default if nothing is saved.
+    static func watchSelectedSlots() -> [LiveActivitySlotOption] {
+        guard let raw = defaults?.stringArray(forKey: Keys.watchSelectedSlots) else {
+            return [.iob, .cob, .projectedBG, .battery]
+        }
+        return raw.compactMap { LiveActivitySlotOption(rawValue: $0) }
+    }
+
     // MARK: - Display Name
 
     static func setDisplayName(_ name: String, show: Bool) {

LoopFollow/LiveActivity/LALivenessMarker.swift

@@ -1,11 +1,5 @@
-//
-//  LALivenessMarker.swift
-//  LoopFollow
-//
-//  Created by Philippe Achkar on 2026-04-01.
-//  Copyright © 2026 Jon Fawcett. All rights reserved.
-//
-
+// LoopFollow
+// LALivenessMarker.swift
 
 import SwiftUI
 
@@ -24,4 +18,4 @@ struct LALivenessMarker: View {
     private var markerID: String {
         "\(seq)-\(producedAt.timeIntervalSince1970)"
     }
-}
+}

LoopFollow/LiveActivity/LALivenessStore.swift

@@ -1,11 +1,5 @@
-//
-//  LALivenessStore.swift
-//  LoopFollow
-//
-//  Created by Philippe Achkar on 2026-04-01.
-//  Copyright © 2026 Jon Fawcett. All rights reserved.
-//
-
+// LoopFollow
+// LALivenessStore.swift
 
 import Foundation
 

LoopFollow/LiveActivity/LiveActivityManager.swift

@@ -150,7 +150,7 @@ final class LiveActivityManager {
                 message: "[LA] foreground restart: current=nil (old activity not bound locally), ending all existing LAs before restart"
             )
             current = nil
-        
+
             Task {
                 for activity in Activity<GlucoseLiveActivityAttributes>.activities {
                     await activity.end(nil, dismissalPolicy: .immediate)
@@ -178,7 +178,7 @@ final class LiveActivityManager {
             }
         }
     }
-    
+
     @objc private func handleBackgroundAudioFailed() {
         guard Storage.shared.laEnabled.value, current != nil else { return }
         // The background audio session has permanently failed — the app will lose its
@@ -188,7 +188,7 @@ final class LiveActivityManager {
         Storage.shared.laRenewBy.value = Date().timeIntervalSince1970
         refreshFromCurrentState(reason: "audio-session-failed")
     }
-    
+
     private func shouldRestartBecauseExtensionLooksStuck() -> Bool {
         guard Storage.shared.laEnabled.value else { return false }
         guard !dismissedByUser else { return false }
@@ -554,7 +554,7 @@ final class LiveActivityManager {
             highMgdl: Storage.shared.highLine.value,
         )
         GlucoseSnapshotStore.shared.save(snapshot)
-        //WatchConnectivityManager.shared.send(snapshot: snapshot)
+        WatchConnectivityManager.shared.send(snapshot: snapshot)
 
         // LA update: gated on LA being active, snapshot having changed, and activities enabled.
         guard Storage.shared.laEnabled.value, !dismissedByUser else { return }

LoopFollow/LiveActivity/StorageCurrentGlucoseStateProvider.swift

@@ -10,8 +10,8 @@ struct StorageCurrentGlucoseStateProvider: CurrentGlucoseStateProviding {
     // MARK: - Core Glucose
 
     var glucoseMgdl: Double? {
-        guard let bg = Observable.shared.bg.value, bg > 0 else { return nil }
-        return Double(bg)
+        guard let bg = Storage.shared.lastBgMgdl.value, bg > 0 else { return nil }
+        return bg
     }
 
     var deltaMgdl: Double? {