Add Apple Watch app with complications, haptic alerts, and remote commands

- Add LoopFollowWatch target: glucose display, trend arrow, IOB/COB/TDD data page,
  haptic alert system with snooze, Watch complications (CLKComplication provider),
  in-memory snapshot fallback, and complication cache to fix background reloadTimeline
- Add Watch remote commands via LoopAPNS relay: bolus, meal, override/preset selection;
  includes WatchCommandDispatcher, haptic confirmation, and local success notification
- Add WatchConnectivityManager: send glucose snapshots to Watch on each refresh,
  cancel stale transfers to reduce latency, auto-sync APNS credentials on change,
  forward Loop command return notifications to Watch with haptic feedback
- Extend LAAppGroupSettings and StorageCurrentGlucoseStateProvider for Watch app group
- Add Trio preset support in Watch preset sync via ProfileManager
- No hardcoded development team in project.pbxproj

https://claude.ai/code/session_01DGCES9o6CLpeAmfe7tMoR6

Author: claude

LoopFollow.xcodeproj/project.pbxproj

@@ -40,6 +40,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         _ = BLEManager.shared
         // Ensure VolumeButtonHandler is initialized so it can receive alarm notifications
         _ = VolumeButtonHandler.shared
+        
+        WatchConnectivityManager.shared.activate()
 
         // Register for remote notifications
         DispatchQueue.main.async {
@@ -123,6 +125,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             }
         }
 
+        // Forward Loop command return notifications to the Watch
+        WatchConnectivityManager.shared.forwardCommandReturnToWatch(userInfo: userInfo)
+
         // Call completion handler
         completionHandler(.newData)
     }

LoopFollow/Application/AppDelegate.swift

@@ -268,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/Controllers/Nightscout/BGData.swift

@@ -94,8 +94,8 @@ final class ProfileManager {
             loopOverrides = []
         }
 
-        if let trioOverrides = profileData.trioOverrides {
-            self.trioOverrides = trioOverrides.map { entry in
+        if let trioPresets = profileData.trioOverrides {
+            self.trioOverrides = trioPresets.map { entry in
                 let targetQuantity = entry.target != nil ? HKQuantity(unit: .milligramsPerDeciliter, doubleValue: entry.target!) : nil
                 return TrioOverride(
                     name: entry.name,
@@ -108,6 +108,28 @@ final class ProfileManager {
             trioOverrides = []
         }
 
+        // Write presets to the shared App Group for the Watch remote commands view.
+        // Prefer Loop override presets; fall back to Trio presets for Trio users.
+        let watchPresets: [WatchOverridePreset]
+        if !loopOverrides.isEmpty {
+            watchPresets = loopOverrides.map {
+                WatchOverridePreset(
+                    name: $0.name,
+                    symbol: $0.symbol.isEmpty ? nil : $0.symbol,
+                    durationSeconds: TimeInterval($0.duration ?? 0)
+                )
+            }
+        } else {
+            watchPresets = trioOverrides.map {
+                WatchOverridePreset(
+                    name: $0.name,
+                    symbol: nil,
+                    durationSeconds: $0.duration.map { TimeInterval($0) } ?? 0
+                )
+            }
+        }
+        LAAppGroupSettings.setWatchOverridePresets(watchPresets)
+
         Storage.shared.deviceToken.value = profileData.deviceToken ?? profileData.loopSettings?.deviceToken ?? ""
 
         if let expirationDate = profileData.expirationDate {

LoopFollow/Controllers/Nightscout/ProfileManager.swift

@@ -0,0 +1,17 @@
+import Foundation
+
+enum APNsCredentialValidator {
+    static func isValidKeyId(_ keyId: String) -> Bool {
+        let pattern = "^[A-Z0-9]{10}$"
+        return keyId.range(of: pattern, options: .regularExpression) != nil
+    }
+
+    static func isValidApnsKey(_ apnsKey: String) -> Bool {
+        apnsKey.contains("-----BEGIN PRIVATE KEY-----") &&
+            apnsKey.contains("-----END PRIVATE KEY-----")
+    }
+
+    static func isFullyConfigured(keyId: String, apnsKey: String) -> Bool {
+        isValidKeyId(keyId) && isValidApnsKey(apnsKey)
+    }
+}

LoopFollow/LiveActivity/APNsCredentialValidator.swift

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

LoopFollow/LiveActivity/AppGroupID.swift

@@ -117,6 +117,9 @@ struct GlucoseSnapshot: Codable, Equatable, Hashable {
     /// True when LoopFollow detects the loop has not reported in 15+ minutes (Nightscout only).
     let isNotLooping: Bool
 
+    /// Unix epoch seconds of the last successful Loop run (nil if never received).
+    let loopLastRunAt: TimeInterval?
+
     // MARK: - Renewal
 
     /// True when the Live Activity is within renewalWarning seconds of its renewal deadline.
@@ -154,6 +157,7 @@ struct GlucoseSnapshot: Codable, Equatable, Hashable {
         maxBgMgdl: Double? = nil,
         unit: Unit,
         isNotLooping: Bool,
+        loopLastRunAt: TimeInterval? = nil,
         showRenewalOverlay: Bool = false,
     ) {
         self.glucose = glucose
@@ -184,6 +188,7 @@ struct GlucoseSnapshot: Codable, Equatable, Hashable {
         self.maxBgMgdl = maxBgMgdl
         self.unit = unit
         self.isNotLooping = isNotLooping
+        self.loopLastRunAt = loopLastRunAt
         self.showRenewalOverlay = showRenewalOverlay
     }
 
@@ -194,6 +199,12 @@ struct GlucoseSnapshot: Codable, Equatable, Hashable {
         Date().timeIntervalSince(updatedAt)
     }
 
+    /// Delta expressed as mg/dL per minute.
+    /// `delta` is a 5-minute total, so divide by 5.0.
+    var deltaRate: Double? {
+        return delta / 5.0
+    }
+
     /// Returns a copy of this snapshot with `showRenewalOverlay` set to the given value.
     /// All other fields are preserved exactly. Use this instead of manually copying
     /// every field when only the overlay flag needs to change.
@@ -227,6 +238,7 @@ struct GlucoseSnapshot: Codable, Equatable, Hashable {
             maxBgMgdl: maxBgMgdl,
             unit: unit,
             isNotLooping: isNotLooping,
+            loopLastRunAt: loopLastRunAt,
             showRenewalOverlay: value,
         )
     }
@@ -263,6 +275,7 @@ struct GlucoseSnapshot: Codable, Equatable, Hashable {
         try container.encodeIfPresent(maxBgMgdl, forKey: .maxBgMgdl)
         try container.encode(unit, forKey: .unit)
         try container.encode(isNotLooping, forKey: .isNotLooping)
+        try container.encodeIfPresent(loopLastRunAt, forKey: .loopLastRunAt)
         try container.encode(showRenewalOverlay, forKey: .showRenewalOverlay)
     }
 
@@ -296,6 +309,7 @@ struct GlucoseSnapshot: Codable, Equatable, Hashable {
         maxBgMgdl = try container.decodeIfPresent(Double.self, forKey: .maxBgMgdl)
         unit = try container.decode(Unit.self, forKey: .unit)
         isNotLooping = try container.decodeIfPresent(Bool.self, forKey: .isNotLooping) ?? false
+        loopLastRunAt = try container.decodeIfPresent(Double.self, forKey: .loopLastRunAt)
         showRenewalOverlay = try container.decodeIfPresent(Bool.self, forKey: .showRenewalOverlay) ?? false
     }
 
@@ -305,7 +319,7 @@ struct GlucoseSnapshot: Codable, Equatable, Hashable {
         case override, recBolus, battery, pumpBattery, basalRate, pumpReservoirU
         case autosens, tdd, targetLowMgdl, targetHighMgdl, isfMgdlPerU, carbRatio, carbsToday
         case profileName, sageInsertTime, cageInsertTime, iageInsertTime, minBgMgdl, maxBgMgdl
-        case unit, isNotLooping, showRenewalOverlay
+        case unit, isNotLooping, loopLastRunAt, showRenewalOverlay
     }
 }
 

LoopFollow/LiveActivity/GlucoseSnapshot.swift

@@ -92,6 +92,9 @@ protocol CurrentGlucoseStateProviding {
     /// True when LoopFollow detects the loop has not reported in 15+ minutes.
     var isNotLooping: Bool { get }
 
+    /// Unix epoch seconds of the last successful Loop run (nil if never received).
+    var loopLastRunAt: TimeInterval? { get }
+
     // MARK: - Renewal
 
     /// True when the Live Activity is within renewalWarning seconds of its deadline.
@@ -161,6 +164,7 @@ enum GlucoseSnapshotBuilder {
             maxBgMgdl: provider.maxBgMgdl,
             unit: preferredUnit,
             isNotLooping: provider.isNotLooping,
+            loopLastRunAt: provider.loopLastRunAt,
             showRenewalOverlay: provider.showRenewalOverlay,
         )
     }

LoopFollow/LiveActivity/GlucoseSnapshotBuilder.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,37 @@ 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()
                 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)
             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/GlucoseSnapshotStore.swift

@@ -135,6 +135,16 @@ enum LiveActivitySlotDefaults {
     }
 }
 
+// MARK: - Watch remote preset
+
+/// Lightweight override preset transferred via App Group for Watch remote commands.
+struct WatchOverridePreset: Codable, Identifiable {
+    var id: String { name }
+    var name: String
+    var symbol: String?
+    var durationSeconds: TimeInterval  // 0 = indefinite
+}
+
 // MARK: - App Group settings
 
 /// Minimal App Group settings needed by the Live Activity UI.
@@ -149,6 +159,12 @@ enum LAAppGroupSettings {
         static let smallWidgetSlot = "la.smallWidgetSlot"
         static let displayName = "la.displayName"
         static let showDisplayName = "la.showDisplayName"
+        static let watchSlots = "watch.slots"
+        static let watchSelectedSlots = "watch.selectedSlots"
+        static let watchOverridePresets = "watch.overridePresets"
+        static let watchRemoteEnabled = "watch.remoteEnabled"
+        static let watchMaxBolus = "watch.maxBolus"
+        static let watchMaxCarbs = "watch.maxCarbs"
     }
 
     private static var defaults: UserDefaults? {
@@ -206,6 +222,40 @@ enum LAAppGroupSettings {
         return LiveActivitySlotOption(rawValue: raw) ?? LiveActivitySlotDefaults.smallWidgetSlot
     }
 
+    // MARK: - Watch slots (Write)
+
+    /// Persists the 4-position Watch data card slot configuration.
+    static func setWatchSlots(_ slots: [LiveActivitySlotOption]) {
+        let raw = slots.prefix(4).map(\.rawValue)
+        defaults?.set(raw, forKey: Keys.watchSlots)
+    }
+
+    // MARK: - Watch slots (Read)
+
+    static func watchSlots() -> [LiveActivitySlotOption] {
+        guard let raw = defaults?.stringArray(forKey: Keys.watchSlots), raw.count == 4 else {
+            return [.iob, .cob, .projectedBG, .battery]
+        }
+        return raw.map { LiveActivitySlotOption(rawValue: $0) ?? .none }
+    }
+
+    // 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) {
@@ -220,4 +270,42 @@ enum LAAppGroupSettings {
     static func showDisplayName() -> Bool {
         defaults?.bool(forKey: Keys.showDisplayName) ?? false
     }
+
+    // MARK: - Watch Remote Commands
+
+    static func setWatchOverridePresets(_ presets: [WatchOverridePreset]) {
+        guard let data = try? JSONEncoder().encode(presets) else { return }
+        defaults?.set(data, forKey: Keys.watchOverridePresets)
+    }
+
+    static func watchOverridePresets() -> [WatchOverridePreset] {
+        guard let data = defaults?.data(forKey: Keys.watchOverridePresets),
+              let presets = try? JSONDecoder().decode([WatchOverridePreset].self, from: data)
+        else { return [] }
+        return presets
+    }
+
+    static func setWatchRemoteEnabled(_ enabled: Bool) {
+        defaults?.set(enabled, forKey: Keys.watchRemoteEnabled)
+    }
+
+    static func isWatchRemoteEnabled() -> Bool {
+        defaults?.bool(forKey: Keys.watchRemoteEnabled) ?? false
+    }
+
+    static func setWatchMaxBolus(_ maxBolus: Double) {
+        defaults?.set(maxBolus, forKey: Keys.watchMaxBolus)
+    }
+
+    static func watchMaxBolus() -> Double {
+        defaults?.object(forKey: Keys.watchMaxBolus) as? Double ?? 10.0
+    }
+
+    static func setWatchMaxCarbs(_ maxCarbs: Double) {
+        defaults?.set(maxCarbs, forKey: Keys.watchMaxCarbs)
+    }
+
+    static func watchMaxCarbs() -> Double {
+        defaults?.object(forKey: Keys.watchMaxCarbs) as? Double ?? 150.0
+    }
 }