diff --git a/Config.xcconfig b/Config.xcconfig
index ec5f4a80f..3ff1066f3 100644
--- a/Config.xcconfig
+++ b/Config.xcconfig
@@ -6,4 +6,4 @@
 unique_id = ${DEVELOPMENT_TEAM}
 
 //Version (DEFAULT)
-LOOP_FOLLOW_MARKETING_VERSION = 6.0.8
+LOOP_FOLLOW_MARKETING_VERSION = 6.1.0
diff --git a/Gemfile b/Gemfile
index 2d6cd6e10..1a3b246f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,4 @@
 source "https://rubygems.org"
-gem "fastlane", "2.232.2"
+gem "fastlane", "2.233.1"
+gem "json", ">=2.19.2"
+gem "addressable", ">=2.9.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 54a0a20a8..25ea69c8c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.232.2)
+    fastlane (2.233.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       abbrev (~> 0.1.2)
       addressable (>= 2.8, < 3.0.0)
@@ -92,7 +92,7 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
-      fastlane-sirp (>= 1.0.0)
+      fastlane-sirp (>= 1.1.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
@@ -122,8 +122,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-sirp (1.0.0)
-      sysrandom (~> 1.0)
+    fastlane-sirp (1.1.0)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
@@ -203,7 +202,6 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -232,7 +230,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  fastlane (= 2.232.2)
+  addressable (>= 2.9.0)
+  fastlane (= 2.233.1)
+  json (>= 2.19.2)
 
 BUNDLED WITH
   4.0.6
diff --git a/LoopFollow.xcodeproj/project.pbxproj b/LoopFollow.xcodeproj/project.pbxproj
index 4c2444734..c882ae3d5 100644
--- a/LoopFollow.xcodeproj/project.pbxproj
+++ b/LoopFollow.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		2D8068C66833EEAED7B4BEB8 /* FutureCarbsCondition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EBAB9EECE7095238A558060 /* FutureCarbsCondition.swift */; };
 		374A77992F5BD8B200E96858 /* APNSClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374A77982F5BD8AB00E96858 /* APNSClient.swift */; };
+		F77D52D003E24351AF2D53AC /* APNsCredentialValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 100F72B12B2E40828D4ED0BD /* APNsCredentialValidator.swift */; };
 		374A77A52F5BE17000E96858 /* AppGroupID.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374A779F2F5BE17000E96858 /* AppGroupID.swift */; };
 		374A77A62F5BE17000E96858 /* GlucoseSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374A77A12F5BE17000E96858 /* GlucoseSnapshot.swift */; };
 		374A77A72F5BE17000E96858 /* LAAppGroupSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374A77A32F5BE17000E96858 /* LAAppGroupSettings.swift */; };
@@ -24,6 +25,18 @@
 		374A77B92F5BE1AC00E96858 /* PreferredGlucoseUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374A77B22F5BE1AC00E96858 /* PreferredGlucoseUnit.swift */; };
 		379BECAA2F6588300069DC62 /* RestartLiveActivityIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379BECA92F6588300069DC62 /* RestartLiveActivityIntent.swift */; };
 		379BECB02F65DA4B0069DC62 /* LiveActivitySettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 379BECAF2F65DA4B0069DC62 /* LiveActivitySettingsView.swift */; };
+		37989DBF2F609B0E0004BD8B /* LoopFollowWatch Watch App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 37989DB52F609B0C0004BD8B /* LoopFollowWatch Watch App.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		37989DC52F609C550004BD8B /* GlucoseSnapshot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374A77A12F5BE17000E96858 /* GlucoseSnapshot.swift */; };
+		37989DC62F609C5E0004BD8B /* GlucoseSnapshotStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374A77AF2F5BE1AC00E96858 /* GlucoseSnapshotStore.swift */; };
+		37989DC72F609C730004BD8B /* AppGroupID.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374A779F2F5BE17000E96858 /* AppGroupID.swift */; };
+		37989DC82F609C7A0004BD8B /* LAAppGroupSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 374A77A32F5BE17000E96858 /* LAAppGroupSettings.swift */; };
+		37989DCE2F609ED40004BD8B /* WatchComplicationProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37989DCC2F609DAE0004BD8B /* WatchComplicationProvider.swift */; };
+		37989DD02F609F570004BD8B /* ComplicationEntryBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37989DCF2F609F570004BD8B /* ComplicationEntryBuilder.swift */; };
+		37989DDC2F60A2010004BD8B /* WatchFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37989DDB2F60A2000004BD8B /* WatchFormat.swift */; };
+		37989DDD2F60A2020004BD8B /* GlucoseConversion.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD91E4DC2BDEC3F8002D9E97 /* GlucoseConversion.swift */; };
+		37989DD22F60A0ED0004BD8B /* WatchConnectivity.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37989DD12F60A0ED0004BD8B /* WatchConnectivity.framework */; };
+		37989DD42F60A11E0004BD8B /* WatchConnectivityManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37989DD32F60A11E0004BD8B /* WatchConnectivityManager.swift */; };
+		37989DD62F60A15E0004BD8B /* WatchSessionReceiver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37989DD52F60A15E0004BD8B /* WatchSessionReceiver.swift */; };
 		37A4BDDB2F5B6B4A00EEB289 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37A4BDDA2F5B6B4A00EEB289 /* WidgetKit.framework */; };
 		37A4BDDD2F5B6B4A00EEB289 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 37A4BDDC2F5B6B4A00EEB289 /* SwiftUI.framework */; };
 		37A4BDE82F5B6B4C00EEB289 /* LoopFollowLAExtensionExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 37A4BDD92F5B6B4A00EEB289 /* LoopFollowLAExtensionExtension.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -59,6 +72,8 @@
 		6589CC6F2E9E7D1600BB18FE /* AdvancedSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6589CC572E9E7D1600BB18FE /* AdvancedSettingsViewModel.swift */; };
 		6589CC712E9E814F00BB18FE /* AlarmSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6589CC702E9E814F00BB18FE /* AlarmSelectionView.swift */; };
 		6589CC752E9EAFB700BB18FE /* SettingsMigrationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6589CC742E9EAFB700BB18FE /* SettingsMigrationManager.swift */; };
+		65A100012F5AA00000AA1001 /* UnitsSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A100002F5AA00000AA1001 /* UnitsSettingsView.swift */; };
+		65A100032F5AA00000AA1002 /* UnitsConfigurationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65A100022F5AA00000AA1002 /* UnitsConfigurationView.swift */; };
 		65E153C32E4BB69100693A4F /* URLTokenValidationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65E153C22E4BB69100693A4F /* URLTokenValidationView.swift */; };
 		65E8A2862E44B0300065037B /* VolumeButtonHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65E8A2852E44B0300065037B /* VolumeButtonHandler.swift */; };
 		66E3D12E66AA4534A144A54B /* BackgroundRefreshManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8CA8BE0B3D247408FE088B4 /* BackgroundRefreshManager.swift */; };
@@ -248,6 +263,7 @@
 		DDD10F0B2C54192A00D76A8E /* TemporaryTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD10F0A2C54192A00D76A8E /* TemporaryTarget.swift */; };
 		DDDB86F12DF7223C00AADDAC /* DeleteAlarmSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDDB86F02DF7223C00AADDAC /* DeleteAlarmSection.swift */; };
 		DDDC01DD2E244B3100D9975C /* JWTManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDDC01DC2E244B3100D9975C /* JWTManager.swift */; };
+		A1A1A10002000000A0CFEED1 /* LogRedactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1A1A10002000000A0CFEED2 /* LogRedactor.swift */; };
 		DDDC31CC2E13A7DF009EA0F3 /* AddAlarmSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDDC31CB2E13A7DF009EA0F3 /* AddAlarmSheet.swift */; };
 		DDDC31CE2E13A811009EA0F3 /* AlarmTile.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDDC31CD2E13A811009EA0F3 /* AlarmTile.swift */; };
 		DDDF6F492D479AF000884336 /* NoRemoteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDDF6F482D479AEF00884336 /* NoRemoteView.swift */; };
@@ -260,6 +276,7 @@
 		DDEF503A2D31615000999A5D /* LogManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDEF50392D31614200999A5D /* LogManager.swift */; };
 		DDEF503C2D31BE2D00999A5D /* TaskScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDEF503B2D31BE2A00999A5D /* TaskScheduler.swift */; };
 		DDEF503F2D32754F00999A5D /* ProfileTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDEF503E2D32754A00999A5D /* ProfileTask.swift */; };
+		AA001002000000000000ABCD /* WatchCommandDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA001001000000000000ABCD /* WatchCommandDispatcher.swift */; };
 		DDEF50402D479B8A00884336 /* LoopAPNSService.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDEF503F2D479B8A00884336 /* LoopAPNSService.swift */; };
 		DDEF50422D479BAA00884336 /* LoopAPNSCarbsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDEF50412D479BAA00884336 /* LoopAPNSCarbsView.swift */; };
 		DDEF50432D479BBA00884336 /* LoopAPNSBolusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDEF50422D479BBA00884336 /* LoopAPNSBolusView.swift */; };
@@ -288,6 +305,7 @@
 		FC1BDD3224A2585C001B652C /* DataStructs.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC1BDD2E24A232A3001B652C /* DataStructs.swift */; };
 		FC3AE7B5249E8E0E00AAE1E0 /* LoopFollow.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = FC3AE7B3249E8E0E00AAE1E0 /* LoopFollow.xcdatamodeld */; };
 		FC3CAB022493B6220068A152 /* BackgroundTaskAudio.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCC688592489554800A0279D /* BackgroundTaskAudio.swift */; };
+		A1A1A10001000000A0CFEED1 /* APNsCredentialValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A1A1A10001000000A0CFEED2 /* APNsCredentialValidator.swift */; };
 		FC5A5C3D2497B229009C550E /* Config.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = FC5A5C3C2497B229009C550E /* Config.xcconfig */; };
 		FC7CE518248ABE37001F83B8 /* Siri_Alert_Calibration_Needed.caf in Resources */ = {isa = PBXBuildFile; fileRef = FC7CE4A9248ABE2B001F83B8 /* Siri_Alert_Calibration_Needed.caf */; };
 		FC7CE519248ABE37001F83B8 /* Rise_And_Shine.caf in Resources */ = {isa = PBXBuildFile; fileRef = FC7CE4AA248ABE2B001F83B8 /* Rise_And_Shine.caf */; };
@@ -420,6 +438,7 @@
 		FCC6886B24898FD800A0279D /* ObservationToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCC6886A24898FD800A0279D /* ObservationToken.swift */; };
 		FCC6886D2489909D00A0279D /* AnyConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCC6886C2489909D00A0279D /* AnyConvertible.swift */; };
 		FCC6886F2489A53800A0279D /* AppConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCC6886E2489A53800A0279D /* AppConstants.swift */; };
+		9C7FB98C98BE4FF98F4815EE /* Telemetry.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDFBE69CEF18416D84959974 /* Telemetry.swift */; };
 		FCD2A27D24C9D044009F7B7B /* Globals.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCD2A27C24C9D044009F7B7B /* Globals.swift */; };
 		FCE537BC249A4D7D00F80BF8 /* carbBolusArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCE537BB249A4D7D00F80BF8 /* carbBolusArrays.swift */; };
 		FCEF87AC24A141A700AE6FA0 /* Localizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = FCEF87AA24A1417900AE6FA0 /* Localizer.swift */; };
@@ -429,6 +448,13 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		37989DBD2F609B0E0004BD8B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = FC97880C2485969B00A7906C /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 37989DB42F609B0C0004BD8B;
+			remoteInfo = "LoopFollowWatch Watch App";
+		};
 		37A4BDE62F5B6B4C00EEB289 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = FC97880C2485969B00A7906C /* Project object */;
@@ -446,6 +472,17 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
+		37989DC32F609B0E0004BD8B /* Embed Watch Content */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "$(CONTENTS_FOLDER_PATH)/Watch";
+			dstSubfolderSpec = 16;
+			files = (
+				37989DBF2F609B0E0004BD8B /* LoopFollowWatch Watch App.app in Embed Watch Content */,
+			);
+			name = "Embed Watch Content";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		37A4BDED2F5B6B4C00EEB289 /* Embed Foundation Extensions */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -464,6 +501,7 @@
 		2B9BEC26E4E48EF9B811A372 /* PendingFutureCarb.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PendingFutureCarb.swift; sourceTree = "<group>"; };
 		2EBAB9EECE7095238A558060 /* FutureCarbsCondition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FutureCarbsCondition.swift; sourceTree = "<group>"; };
 		374A77982F5BD8AB00E96858 /* APNSClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APNSClient.swift; sourceTree = "<group>"; };
+		100F72B12B2E40828D4ED0BD /* APNsCredentialValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APNsCredentialValidator.swift; sourceTree = "<group>"; };
 		374A779F2F5BE17000E96858 /* AppGroupID.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppGroupID.swift; sourceTree = "<group>"; };
 		374A77A02F5BE17000E96858 /* GlucoseLiveActivityAttributes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlucoseLiveActivityAttributes.swift; sourceTree = "<group>"; };
 		374A77A12F5BE17000E96858 /* GlucoseSnapshot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GlucoseSnapshot.swift; sourceTree = "<group>"; };
@@ -476,6 +514,13 @@
 		374DAACA2F5B924B00BB663B /* LoopFollowLAExtensionExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LoopFollowLAExtensionExtension.entitlements; sourceTree = "<group>"; };
 		379BECA92F6588300069DC62 /* RestartLiveActivityIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestartLiveActivityIntent.swift; sourceTree = "<group>"; };
 		379BECAF2F65DA4B0069DC62 /* LiveActivitySettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveActivitySettingsView.swift; sourceTree = "<group>"; };
+		37989DB52F609B0C0004BD8B /* LoopFollowWatch Watch App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "LoopFollowWatch Watch App.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		37989DCC2F609DAE0004BD8B /* WatchComplicationProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchComplicationProvider.swift; sourceTree = "<group>"; };
+		37989DCF2F609F570004BD8B /* ComplicationEntryBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComplicationEntryBuilder.swift; sourceTree = "<group>"; };
+		37989DDB2F60A2000004BD8B /* WatchFormat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchFormat.swift; sourceTree = "<group>"; };
+		37989DD12F60A0ED0004BD8B /* WatchConnectivity.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WatchConnectivity.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX26.2.sdk/System/iOSSupport/System/Library/Frameworks/WatchConnectivity.framework; sourceTree = DEVELOPER_DIR; };
+		37989DD32F60A11E0004BD8B /* WatchConnectivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchConnectivityManager.swift; sourceTree = "<group>"; };
+		37989DD52F60A15E0004BD8B /* WatchSessionReceiver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchSessionReceiver.swift; sourceTree = "<group>"; };
 		37A4BDD92F5B6B4A00EEB289 /* LoopFollowLAExtensionExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = LoopFollowLAExtensionExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		37A4BDDA2F5B6B4A00EEB289 /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = /System/Library/Frameworks/WidgetKit.framework; sourceTree = "<absolute>"; };
 		37A4BDDC2F5B6B4A00EEB289 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = /System/Library/Frameworks/SwiftUI.framework; sourceTree = "<absolute>"; };
@@ -508,6 +553,8 @@
 		6589CC602E9E7D1600BB18FE /* TabCustomizationModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabCustomizationModal.swift; sourceTree = "<group>"; };
 		6589CC702E9E814F00BB18FE /* AlarmSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlarmSelectionView.swift; sourceTree = "<group>"; };
 		6589CC742E9EAFB700BB18FE /* SettingsMigrationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsMigrationManager.swift; sourceTree = "<group>"; };
+		65A100002F5AA00000AA1001 /* UnitsSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitsSettingsView.swift; sourceTree = "<group>"; };
+		65A100022F5AA00000AA1002 /* UnitsConfigurationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitsConfigurationView.swift; sourceTree = "<group>"; };
 		65E153C22E4BB69100693A4F /* URLTokenValidationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLTokenValidationView.swift; sourceTree = "<group>"; };
 		65E8A2852E44B0300065037B /* VolumeButtonHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VolumeButtonHandler.swift; sourceTree = "<group>"; };
 		A7D55B42A22051DAD69E89D0 /* Pods_LoopFollow.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LoopFollow.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -700,6 +747,7 @@
 		DDD10F0A2C54192A00D76A8E /* TemporaryTarget.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemporaryTarget.swift; sourceTree = "<group>"; };
 		DDDB86F02DF7223C00AADDAC /* DeleteAlarmSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteAlarmSection.swift; sourceTree = "<group>"; };
 		DDDC01DC2E244B3100D9975C /* JWTManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JWTManager.swift; sourceTree = "<group>"; };
+		A1A1A10002000000A0CFEED2 /* LogRedactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogRedactor.swift; sourceTree = "<group>"; };
 		DDDC31CB2E13A7DF009EA0F3 /* AddAlarmSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAlarmSheet.swift; sourceTree = "<group>"; };
 		DDDC31CD2E13A811009EA0F3 /* AlarmTile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlarmTile.swift; sourceTree = "<group>"; };
 		DDDF6F482D479AEF00884336 /* NoRemoteView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoRemoteView.swift; sourceTree = "<group>"; };
@@ -712,6 +760,7 @@
 		DDEF50392D31614200999A5D /* LogManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogManager.swift; sourceTree = "<group>"; };
 		DDEF503B2D31BE2A00999A5D /* TaskScheduler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskScheduler.swift; sourceTree = "<group>"; };
 		DDEF503E2D32754A00999A5D /* ProfileTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileTask.swift; sourceTree = "<group>"; };
+		AA001001000000000000ABCD /* WatchCommandDispatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchCommandDispatcher.swift; sourceTree = "<group>"; };
 		DDEF503F2D479B8A00884336 /* LoopAPNSService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoopAPNSService.swift; sourceTree = "<group>"; };
 		DDEF50412D479BAA00884336 /* LoopAPNSCarbsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoopAPNSCarbsView.swift; sourceTree = "<group>"; };
 		DDEF50422D479BBA00884336 /* LoopAPNSBolusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoopAPNSBolusView.swift; sourceTree = "<group>"; };
@@ -868,6 +917,7 @@
 		FCA2DDE52501095000254A8C /* Timers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Timers.swift; sourceTree = "<group>"; };
 		FCC0FAC124922A22003E610E /* DictionaryKeyPath.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DictionaryKeyPath.swift; sourceTree = "<group>"; };
 		FCC688592489554800A0279D /* BackgroundTaskAudio.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BackgroundTaskAudio.swift; sourceTree = "<group>"; };
+		A1A1A10001000000A0CFEED2 /* APNsCredentialValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APNsCredentialValidator.swift; sourceTree = "<group>"; };
 		FCC6885B2489559400A0279D /* blank.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = blank.wav; sourceTree = "<group>"; };
 		FCC6885D24896A6C00A0279D /* silence.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = silence.mp3; sourceTree = "<group>"; };
 		FCC6886624898F8000A0279D /* UserDefaultsValue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsValue.swift; sourceTree = "<group>"; };
@@ -875,6 +925,7 @@
 		FCC6886A24898FD800A0279D /* ObservationToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObservationToken.swift; sourceTree = "<group>"; };
 		FCC6886C2489909D00A0279D /* AnyConvertible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnyConvertible.swift; sourceTree = "<group>"; };
 		FCC6886E2489A53800A0279D /* AppConstants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppConstants.swift; sourceTree = "<group>"; };
+		BDFBE69CEF18416D84959974 /* Telemetry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Telemetry.swift; sourceTree = "<group>"; };
 		FCC688702489A57C00A0279D /* Loop Follow.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Loop Follow.entitlements"; sourceTree = "<group>"; };
 		FCD2A27C24C9D044009F7B7B /* Globals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Globals.swift; sourceTree = "<group>"; };
 		FCE537BB249A4D7D00F80BF8 /* carbBolusArrays.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = carbBolusArrays.swift; sourceTree = "<group>"; };
@@ -886,6 +937,7 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
+		37989DB62F609B0C0004BD8B /* LoopFollowWatch Watch App */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = "LoopFollowWatch Watch App"; sourceTree = "<group>"; };
 		37A4BDDE2F5B6B4A00EEB289 /* LoopFollowLAExtension */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = LoopFollowLAExtension; sourceTree = "<group>"; };
 		65AC25F52ECFD5E800421360 /* Stats */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Stats; sourceTree = "<group>"; };
 		65AC26702ED245DF00421360 /* Treatments */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Treatments; sourceTree = "<group>"; };
@@ -893,6 +945,13 @@
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		37989DB22F609B0C0004BD8B /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		37A4BDD62F5B6B4A00EEB289 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -915,6 +974,8 @@
 			files = (
 				FCFEEC9E2486E68E00402A7F /* WebKit.framework in Frameworks */,
 				3F1335F351590E573D8E6962 /* Pods_LoopFollow.framework in Frameworks */,
+				DD48781C2C7DAF140048F05C /* SwiftJWT in Frameworks */,
+				37989DD22F60A0ED0004BD8B /* WatchConnectivity.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -936,10 +997,22 @@
 				374A77A12F5BE17000E96858 /* GlucoseSnapshot.swift */,
 				374A77A32F5BE17000E96858 /* LAAppGroupSettings.swift */,
 				374A77982F5BD8AB00E96858 /* APNSClient.swift */,
+				100F72B12B2E40828D4ED0BD /* APNsCredentialValidator.swift */,
 			);
 			path = LiveActivity;
 			sourceTree = "<group>";
 		};
+		37989DCB2F609D9C0004BD8B /* WatchComplication */ = {
+			isa = PBXGroup;
+			children = (
+				37989DD52F60A15E0004BD8B /* WatchSessionReceiver.swift */,
+				37989DCF2F609F570004BD8B /* ComplicationEntryBuilder.swift */,
+				37989DCC2F609DAE0004BD8B /* WatchComplicationProvider.swift */,
+				37989DDB2F60A2000004BD8B /* WatchFormat.swift */,
+			);
+			path = WatchComplication;
+			sourceTree = "<group>";
+		};
 		6589CC552E9E7D1600BB18FE /* ImportExport */ = {
 			isa = PBXGroup;
 			children = (
@@ -968,6 +1041,8 @@
 				6589CC5E2E9E7D1600BB18FE /* GraphSettingsView.swift */,
 				657F98172F043D8100F732BD /* HomeContentView.swift */,
 				6589CC5F2E9E7D1600BB18FE /* SettingsMenuView.swift */,
+				65A100002F5AA00000AA1001 /* UnitsSettingsView.swift */,
+				65A100022F5AA00000AA1002 /* UnitsConfigurationView.swift */,
 				6589CC602E9E7D1600BB18FE /* TabCustomizationModal.swift */,
 			);
 			path = Settings;
@@ -976,6 +1051,7 @@
 		6A5880E0B811AF443B05AB02 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				37989DD12F60A0ED0004BD8B /* WatchConnectivity.framework */,
 				DDCC3ABF2DDE10B0006F1C10 /* Testing.framework */,
 				FCFEEC9D2486E68E00402A7F /* WebKit.framework */,
 				A7D55B42A22051DAD69E89D0 /* Pods_LoopFollow.framework */,
@@ -1036,12 +1112,21 @@
 			path = Metric;
 			sourceTree = "<group>";
 		};
+		AA001003000000000000ABCD /* Watch */ = {
+			isa = PBXGroup;
+			children = (
+				AA001001000000000000ABCD /* WatchCommandDispatcher.swift */,
+			);
+			path = Watch;
+			sourceTree = "<group>";
+		};
 		DD0C0C6E2C4AFFB800DBADDF /* Remote */ = {
 			isa = PBXGroup;
 			children = (
 				DDDF6F4A2D479B6A00884336 /* Nightscout */,
 				DDDF6F482D479AEF00884336 /* NoRemoteView.swift */,
 				DDEF503E2D479B8A00884336 /* LoopAPNS */,
+				AA001003000000000000ABCD /* Watch */,
 				DD4878112C7B74F90048F05C /* TRC */,
 				DD4878062C7B2E9E0048F05C /* Settings */,
 				DDF699972C5AA2E50058A8D9 /* TempTargetPreset */,
@@ -1590,6 +1675,7 @@
 			isa = PBXGroup;
 			children = (
 				379BECAF2F65DA4B0069DC62 /* LiveActivitySettingsView.swift */,
+				37989DCB2F609D9C0004BD8B /* WatchComplication */,
 				376310762F5CD65100656488 /* LiveActivity */,
 				6589CC612E9E7D1600BB18FE /* Settings */,
 				65AC26702ED245DF00421360 /* Treatments */,
@@ -1622,6 +1708,7 @@
 			isa = PBXGroup;
 			children = (
 				379BECA92F6588300069DC62 /* RestartLiveActivityIntent.swift */,
+				37989DD32F60A11E0004BD8B /* WatchConnectivityManager.swift */,
 				374DAACA2F5B924B00BB663B /* LoopFollowLAExtensionExtension.entitlements */,
 				DDF2C0132BEFD468007A20E6 /* blacklisted-versions.json */,
 				DDB0AF542BB1B24A00AFA48B /* BuildDetails.plist */,
@@ -1632,6 +1719,7 @@
 				FC8DEEE32485D1680075863F /* LoopFollow */,
 				DDCC3AD72DDE1790006F1C10 /* Tests */,
 				37A4BDDE2F5B6B4A00EEB289 /* LoopFollowLAExtension */,
+				37989DB62F609B0C0004BD8B /* LoopFollowWatch Watch App */,
 				FC9788152485969B00A7906C /* Products */,
 				8E32230C453C93FDCE59C2B9 /* Pods */,
 				6A5880E0B811AF443B05AB02 /* Frameworks */,
@@ -1644,6 +1732,7 @@
 				FC9788142485969B00A7906C /* Loop Follow.app */,
 				DDCC3AD62DDE1790006F1C10 /* Tests.xctest */,
 				37A4BDD92F5B6B4A00EEB289 /* LoopFollowLAExtensionExtension.appex */,
+				37989DB52F609B0C0004BD8B /* LoopFollowWatch Watch App.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1676,9 +1765,11 @@
 				DD7B0D432D730A320063DCB6 /* CycleHelper.swift */,
 				DDF6999C2C5AAA4C0058A8D9 /* Views */,
 				FCC6886E2489A53800A0279D /* AppConstants.swift */,
+				BDFBE69CEF18416D84959974 /* Telemetry.swift */,
 				FCC6886A24898FD800A0279D /* ObservationToken.swift */,
 				FCC6886C2489909D00A0279D /* AnyConvertible.swift */,
 				FCC688592489554800A0279D /* BackgroundTaskAudio.swift */,
+				A1A1A10001000000A0CFEED2 /* APNsCredentialValidator.swift */,
 				A8CA8BE0B3D247408FE088B4 /* BackgroundRefreshManager.swift */,
 				FCFEEC9F2488157B00402A7F /* Chart.swift */,
 				FCC0FAC124922A22003E610E /* DictionaryKeyPath.swift */,
@@ -1697,6 +1788,7 @@
 				DDF699952C5582290058A8D9 /* TextFieldWithToolBar.swift */,
 				DDC7E5372DBD887400EB1127 /* isOnPhoneCall.swift */,
 				DDDC01DC2E244B3100D9975C /* JWTManager.swift */,
+				A1A1A10002000000A0CFEED2 /* LogRedactor.swift */,
 				6541341B2E1DC28000BDBE08 /* DateExtensions.swift */,
 			);
 			path = Helpers;
@@ -1717,6 +1809,28 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
+		37989DB42F609B0C0004BD8B /* LoopFollowWatch Watch App */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 37989DC02F609B0E0004BD8B /* Build configuration list for PBXNativeTarget "LoopFollowWatch Watch App" */;
+			buildPhases = (
+				37989DB12F609B0C0004BD8B /* Sources */,
+				37989DB22F609B0C0004BD8B /* Frameworks */,
+				37989DB32F609B0C0004BD8B /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			fileSystemSynchronizedGroups = (
+				37989DB62F609B0C0004BD8B /* LoopFollowWatch Watch App */,
+			);
+			name = "LoopFollowWatch Watch App";
+			packageProductDependencies = (
+			);
+			productName = "LoopFollowWatch Watch App";
+			productReference = 37989DB52F609B0C0004BD8B /* LoopFollowWatch Watch App.app */;
+			productType = "com.apple.product-type.application";
+		};
 		37A4BDD82F5B6B4A00EEB289 /* LoopFollowLAExtensionExtension */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 37A4BDEA2F5B6B4C00EEB289 /* Build configuration list for PBXNativeTarget "LoopFollowLAExtensionExtension" */;
@@ -1774,11 +1888,13 @@
 				04DA71CCA0280FA5FA2DF7A6 /* [CP] Embed Pods Frameworks */,
 				DDB0AF532BB1AA0900AFA48B /* Capture Build Details */,
 				37A4BDED2F5B6B4C00EEB289 /* Embed Foundation Extensions */,
+				37989DC32F609B0E0004BD8B /* Embed Watch Content */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				37A4BDE72F5B6B4C00EEB289 /* PBXTargetDependency */,
+				37989DBE2F609B0E0004BD8B /* PBXTargetDependency */,
 			);
 			fileSystemSynchronizedGroups = (
 				65AC25F52ECFD5E800421360 /* Stats */,
@@ -1797,10 +1913,13 @@
 		FC97880C2485969B00A7906C /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 2620;
+				LastSwiftUpdateCheck = 2630;
 				LastUpgradeCheck = 1140;
 				ORGANIZATIONNAME = "Jon Fawcett";
 				TargetAttributes = {
+					37989DB42F609B0C0004BD8B = {
+						CreatedOnToolsVersion = 26.3;
+					};
 					37A4BDD82F5B6B4A00EEB289 = {
 						CreatedOnToolsVersion = 26.2;
 					};
@@ -1831,11 +1950,19 @@
 				FC9788132485969B00A7906C /* LoopFollow */,
 				DDCC3AD52DDE1790006F1C10 /* Tests */,
 				37A4BDD82F5B6B4A00EEB289 /* LoopFollowLAExtensionExtension */,
+				37989DB42F609B0C0004BD8B /* LoopFollowWatch Watch App */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
+		37989DB32F609B0C0004BD8B /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		37A4BDD72F5B6B4A00EEB289 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2066,6 +2193,22 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		37989DB12F609B0C0004BD8B /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				37989DC62F609C5E0004BD8B /* GlucoseSnapshotStore.swift in Sources */,
+				37989DD02F609F570004BD8B /* ComplicationEntryBuilder.swift in Sources */,
+				37989DC52F609C550004BD8B /* GlucoseSnapshot.swift in Sources */,
+				37989DC72F609C730004BD8B /* AppGroupID.swift in Sources */,
+				37989DD62F60A15E0004BD8B /* WatchSessionReceiver.swift in Sources */,
+				37989DC82F609C7A0004BD8B /* LAAppGroupSettings.swift in Sources */,
+				37989DCE2F609ED40004BD8B /* WatchComplicationProvider.swift in Sources */,
+				37989DDC2F60A2010004BD8B /* WatchFormat.swift in Sources */,
+				37989DDD2F60A2020004BD8B /* GlucoseConversion.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		37A4BDD52F5B6B4A00EEB289 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2106,6 +2249,7 @@
 				374A77B42F5BE1AC00E96858 /* StorageCurrentGlucoseStateProvider.swift in Sources */,
 				374A77B52F5BE1AC00E96858 /* GlucoseSnapshotBuilder.swift in Sources */,
 				374A77B72F5BE1AC00E96858 /* LiveActivityManager.swift in Sources */,
+				F77D52D003E24351AF2D53AC /* APNsCredentialValidator.swift in Sources */,
 				374A77B82F5BE1AC00E96858 /* GlucoseSnapshotStore.swift in Sources */,
 				374A77B92F5BE1AC00E96858 /* PreferredGlucoseUnit.swift in Sources */,
 				DDE75D232DE5E505007C1FC1 /* Glyph.swift in Sources */,
@@ -2143,6 +2287,7 @@
 				DD0650ED2DCE9371004D3B41 /* HighBgAlarmEditor.swift in Sources */,
 				DD7F4C172DD63FA700D449E9 /* RecBolusCondition.swift in Sources */,
 				FCC6886F2489A53800A0279D /* AppConstants.swift in Sources */,
+				9C7FB98C98BE4FF98F4815EE /* Telemetry.swift in Sources */,
 				DDE75D2D2DE71401007C1FC1 /* TogglableSecureInput.swift in Sources */,
 				DD7E19842ACDA50C00DBD158 /* Overrides.swift in Sources */,
 				DD0B9D562DE1EC8A0090C337 /* AlarmType+Snooze.swift in Sources */,
@@ -2232,6 +2377,7 @@
 				FC8589BF252B54F500C8FC73 /* Mobileprovision.swift in Sources */,
 				DD4878052C7B2C970048F05C /* Storage.swift in Sources */,
 				DD493AE12ACF22FE009A6922 /* Profile.swift in Sources */,
+				37989DD42F60A11E0004BD8B /* WatchConnectivityManager.swift in Sources */,
 				6589CC622E9E7D1600BB18FE /* ImportExportSettingsView.swift in Sources */,
 				6589CC632E9E7D1600BB18FE /* GeneralSettingsView.swift in Sources */,
 				5544D8C363FB5D3B9BF8CE4A /* APNSettingsView.swift in Sources */,
@@ -2247,6 +2393,8 @@
 				6589CC6C2E9E7D1600BB18FE /* GraphSettingsView.swift in Sources */,
 				6589CC6D2E9E7D1600BB18FE /* CalendarSettingsView.swift in Sources */,
 				6589CC6E2E9E7D1600BB18FE /* SettingsMenuView.swift in Sources */,
+				65A100012F5AA00000AA1001 /* UnitsSettingsView.swift in Sources */,
+				65A100032F5AA00000AA1002 /* UnitsConfigurationView.swift in Sources */,
 				657F98182F043D8100F732BD /* HomeContentView.swift in Sources */,
 				6589CC6F2E9E7D1600BB18FE /* AdvancedSettingsViewModel.swift in Sources */,
 				DD493ADF2ACF22BB009A6922 /* SAge.swift in Sources */,
@@ -2284,6 +2432,7 @@
 				DD4A407E2E6AFEE6007B318B /* AuthService.swift in Sources */,
 				654134182E1DC09700BDBE08 /* OverridePresetsView.swift in Sources */,
 				DDDC01DD2E244B3100D9975C /* JWTManager.swift in Sources */,
+				A1A1A10002000000A0CFEED1 /* LogRedactor.swift in Sources */,
 				DDD10F072C529DE800D76A8E /* Observable.swift in Sources */,
 				DDFF3D852D14279B00BF9D9E /* BackgroundRefreshSettingsView.swift in Sources */,
 				DDCF9A882D85FD33004DF4DD /* AlarmData.swift in Sources */,
@@ -2369,18 +2518,25 @@
 				DD493ADD2ACF21E0009A6922 /* Basals.swift in Sources */,
 				FC16A98124996C07003D6245 /* DateTime.swift in Sources */,
 				FC3CAB022493B6220068A152 /* BackgroundTaskAudio.swift in Sources */,
+				A1A1A10001000000A0CFEED1 /* APNsCredentialValidator.swift in Sources */,
 				DDCC3A582DDC9655006F1C10 /* MissedBolusAlarmEditor.swift in Sources */,
 				DDEF50402D479B8A00884336 /* LoopAPNSService.swift in Sources */,
 				DD485F142E454B2600CE8CBF /* SecureMessenger.swift in Sources */,
 				DDEF50422D479BAA00884336 /* LoopAPNSCarbsView.swift in Sources */,
 				DDEF50432D479BBA00884336 /* LoopAPNSBolusView.swift in Sources */,
 				DDEF50452D479BDA00884336 /* LoopAPNSRemoteView.swift in Sources */,
+				AA001002000000000000ABCD /* WatchCommandDispatcher.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		37989DBE2F609B0E0004BD8B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 37989DB42F609B0C0004BD8B /* LoopFollowWatch Watch App */;
+			targetProxy = 37989DBD2F609B0E0004BD8B /* PBXContainerItemProxy */;
+		};
 		37A4BDE72F5B6B4C00EEB289 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			platformFilter = ios;
@@ -2414,6 +2570,91 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
+		37989DC12F609B0E0004BD8B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_COMPLICATION_NAME = LoopFollow;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CODE_SIGN_ENTITLEMENTS = "LoopFollowWatch Watch App/LoopFollowWatch Watch App.entitlements";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = "$(LF_DEVELOPMENT_TEAM)";
+				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_CFBundleDisplayName = LoopFollowWatch;
+				INFOPLIST_KEY_CLKComplicationPrincipalClass = "$(PRODUCT_MODULE_NAME).WatchComplicationProvider";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
+				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = "com.$(unique_id).LoopFollow$(app_suffix)";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.$(unique_id).LoopFollow$(app_suffix).watchkitapp";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = watchos;
+				SKIP_INSTALL = YES;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 9.6;
+			};
+			name = Debug;
+		};
+		37989DC22F609B0E0004BD8B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_COMPLICATION_NAME = LoopFollow;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CODE_SIGN_ENTITLEMENTS = "LoopFollowWatch Watch App/LoopFollowWatch Watch App.entitlements";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = "$(LF_DEVELOPMENT_TEAM)";
+				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_KEY_CFBundleDisplayName = LoopFollowWatch;
+				INFOPLIST_KEY_CLKComplicationPrincipalClass = "$(PRODUCT_MODULE_NAME).WatchComplicationProvider";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
+				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = "com.$(unique_id).LoopFollow$(app_suffix)";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.$(unique_id).LoopFollow$(app_suffix).watchkitapp";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = watchos;
+				SKIP_INSTALL = YES;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 4;
+				WATCHOS_DEPLOYMENT_TARGET = 9.6;
+			};
+			name = Release;
+		};
 		37A4BDEB2F5B6B4C00EEB289 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -2755,6 +2996,15 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		37989DC02F609B0E0004BD8B /* Build configuration list for PBXNativeTarget "LoopFollowWatch Watch App" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				37989DC12F609B0E0004BD8B /* Debug */,
+				37989DC22F609B0E0004BD8B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		37A4BDEA2F5B6B4C00EEB289 /* Build configuration list for PBXNativeTarget "LoopFollowLAExtensionExtension" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
diff --git a/LoopFollow/Application/AppDelegate.swift b/LoopFollow/Application/AppDelegate.swift
index a6fd9f2b9..70b5a9dae 100644
--- a/LoopFollow/Application/AppDelegate.swift
+++ b/LoopFollow/Application/AppDelegate.swift
@@ -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 {
@@ -48,6 +50,21 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         BackgroundRefreshManager.shared.register()
 
+        // Telemetry: record this cold launch (used by the rolling
+        // coldLaunches7d signal). If the running build's SHA differs from
+        // the one we last sent for, fire an immediate ping — the scheduler
+        // alone can't notice an app update. Otherwise let the 24h scheduler
+        // handle cadence: its first run is lastSentAt + 24h, so a relaunch
+        // a few hours after the previous send simply waits out the
+        // remainder. See Helpers/Telemetry.swift.
+        TelemetryClient.shared.recordColdLaunch()
+        Task.detached {
+            if TelemetryClient.shared.buildShaChangedSinceLastSend() {
+                await TelemetryClient.shared.maybeSend()
+            }
+            TelemetryClient.shared.scheduleRecurring()
+        }
+
         // 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.
@@ -72,7 +89,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         Observable.shared.loopFollowDeviceToken.value = tokenString
 
-        LogManager.shared.log(category: .apns, message: "Successfully registered for remote notifications with token: \(tokenString)")
+        LogManager.shared.log(category: .apns, message: "Successfully registered for remote notifications with token: \(LogRedactor.tail(tokenString))")
     }
 
     /// Called when failed to register for remote notifications
@@ -82,7 +99,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     /// Called when a remote notification is received
     func application(_: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
-        LogManager.shared.log(category: .apns, message: "Received remote notification: \(userInfo)")
+        let userInfoKeys = userInfo.keys.compactMap { $0 as? String }.sorted()
+        LogManager.shared.log(category: .apns, message: "Received remote notification: keys=\(userInfoKeys)")
 
         // Check if this is a response notification from Loop or Trio
         if let aps = userInfo["aps"] as? [String: Any] {
@@ -107,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)
     }
@@ -217,7 +238,8 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
     {
         // Log the notification
         let userInfo = notification.request.content.userInfo
-        LogManager.shared.log(category: .general, message: "Will present notification: \(userInfo)")
+        let userInfoKeys = userInfo.keys.compactMap { $0 as? String }.sorted()
+        LogManager.shared.log(category: .general, message: "Will present notification: keys=\(userInfoKeys)")
 
         // Show the notification even when app is in foreground
         completionHandler([.banner, .sound, .badge])
diff --git a/LoopFollow/Application/Base.lproj/Main.storyboard b/LoopFollow/Application/Base.lproj/Main.storyboard
index 11e4b1a72..6441edc6c 100644
--- a/LoopFollow/Application/Base.lproj/Main.storyboard
+++ b/LoopFollow/Application/Base.lproj/Main.storyboard
@@ -223,7 +223,7 @@
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="xGF-Pj-QE0">
                                                                         <rect key="frame" x="102.66666666666666" y="0.0" width="92.666666666666657" height="45"/>
                                                                         <subviews>
-                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Est A1C:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WV0-Jy-FPs" userLabel="Est A1C:">
+                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Est. A1C:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WV0-Jy-FPs" userLabel="Est. A1C:">
                                                                                 <rect key="frame" x="18.333333333333346" y="0.0" width="56.333333333333343" height="18"/>
                                                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                                 <nil key="textColor"/>
@@ -306,11 +306,13 @@
                         <outlet property="smallGraphHeightConstraint" destination="qmO-ga-QWl" id="VsZ-zJ-LsJ"/>
                         <outlet property="statsAvgBG" destination="jpA-Nb-pU7" id="Uo8-a4-Aus"/>
                         <outlet property="statsEstA1C" destination="7Jx-XF-1vS" id="4RD-nm-JxO"/>
+                        <outlet property="statsEstA1CTitle" destination="WV0-Jy-FPs" id="WnU-h8-2hf"/>
                         <outlet property="statsHighPercent" destination="HON-rt-8pC" id="283-3S-PCR"/>
                         <outlet property="statsInRangePercent" destination="7mH-Np-j0L" id="vUp-Pv-Mva"/>
                         <outlet property="statsLowPercent" destination="TzL-hn-9qu" id="0QR-Mz-KJe"/>
                         <outlet property="statsPieChart" destination="Hhh-F1-s1p" id="Rhh-Up-Kr0"/>
                         <outlet property="statsStdDev" destination="wAI-Tp-784" id="BUZ-lS-JfA"/>
+                        <outlet property="statsStdDevTitle" destination="iXC-Mz-I09" id="QHf-Q8-J7B"/>
                         <outlet property="statsView" destination="ikj-at-auF" id="7AQ-VA-Pw2"/>
                     </connections>
                 </viewController>
diff --git a/LoopFollow/Application/SceneDelegate.swift b/LoopFollow/Application/SceneDelegate.swift
index 882db04e6..526eb7a78 100644
--- a/LoopFollow/Application/SceneDelegate.swift
+++ b/LoopFollow/Application/SceneDelegate.swift
@@ -2,12 +2,17 @@
 // SceneDelegate.swift
 
 import AVFoundation
+import SwiftUI
 import UIKit
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     var window: UIWindow?
     let synthesizer = AVSpeechSynthesizer()
 
+    /// One-shot guard so the consent prompt is only attempted once per
+    /// process lifetime even if the scene activates repeatedly.
+    private var consentPromptShownThisProcess = false
+
     func scene(_ scene: UIScene, willConnectTo _: UISceneSession, options _: UIScene.ConnectionOptions) {
         // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`.
         // If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
@@ -32,6 +37,37 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     func sceneDidBecomeActive(_: UIScene) {
         // Called when the scene has moved from an inactive state to an active state.
         // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive.
+        runTelemetryFirstForegroundHook()
+    }
+
+    /// Presents the one-time consent sheet on first foreground. Sending is
+    /// handled by AppDelegate at launch and by TaskScheduler thereafter —
+    /// firing maybeSend here would duplicate the launch-time send.
+    private func runTelemetryFirstForegroundHook() {
+        if !Storage.shared.telemetryConsentDecisionMade.value,
+           !consentPromptShownThisProcess
+        {
+            consentPromptShownThisProcess = true
+            presentTelemetryConsentSheet()
+        }
+    }
+
+    private func presentTelemetryConsentSheet() {
+        guard let root = window?.rootViewController else { return }
+        // Find the topmost presented controller so we don't try to present
+        // over a sheet that's already up.
+        var top = root
+        while let presented = top.presentedViewController {
+            top = presented
+        }
+
+        let host = UIHostingController(rootView: TelemetryConsentView())
+        host.isModalInPresentation = true // user must explicitly choose
+        // Defer to the next runloop so view hierarchy is settled when the
+        // scene first becomes active on a fresh install.
+        DispatchQueue.main.async {
+            top.present(host, animated: true)
+        }
     }
 
     func scene(_: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
diff --git a/LoopFollow/BackgroundRefresh/BackgroundRefreshType.swift b/LoopFollow/BackgroundRefresh/BackgroundRefreshType.swift
index 840fd4305..fd7c28e3e 100644
--- a/LoopFollow/BackgroundRefresh/BackgroundRefreshType.swift
+++ b/LoopFollow/BackgroundRefresh/BackgroundRefreshType.swift
@@ -61,8 +61,10 @@ enum BackgroundRefreshType: String, Codable, CaseIterable {
 
         case .omnipodDash:
             if let name = device.name {
-                // actual DASH or rPi DASH simulator
-                return name == "TWI BOARD" || name == " :: Fake POD ::"
+                // "TWI BOARD": original DASH pod
+                // "InPlay BLE": newer Atlas DASH pod
+                // " :: Fake POD ::": rPi DASH simulator
+                return name == "TWI BOARD" || name == "InPlay BLE" || name == " :: Fake POD ::"
             }
             return false
 
diff --git a/LoopFollow/Controllers/AlarmSound.swift b/LoopFollow/Controllers/AlarmSound.swift
index ba131bc4f..b83383185 100644
--- a/LoopFollow/Controllers/AlarmSound.swift
+++ b/LoopFollow/Controllers/AlarmSound.swift
@@ -88,8 +88,7 @@ class AlarmSound {
             audioPlayer = try AVAudioPlayer(contentsOf: soundURL)
             audioPlayer!.delegate = audioPlayerDelegate
 
-            try AVAudioSession.sharedInstance().setCategory(.playback, mode: .default, options: [])
-            try AVAudioSession.sharedInstance().setActive(true)
+            activateAudioSessionWithFallback()
 
             audioPlayer?.numberOfLoops = 0
 
@@ -116,8 +115,6 @@ class AlarmSound {
             return
         }
 
-        enableAudio()
-
         // If repeating with delay, we'll handle it manually via the delegate
         // Only set repeatDelay if both repeating and delay > 0
         repeatDelay = (repeating && delay > 0) ? TimeInterval(delay) : 0
@@ -126,8 +123,7 @@ class AlarmSound {
             audioPlayer = try AVAudioPlayer(contentsOf: soundURL)
             audioPlayer!.delegate = audioPlayerDelegate
 
-            try AVAudioSession.sharedInstance().setCategory(.playback, mode: .default, options: [])
-            try AVAudioSession.sharedInstance().setActive(true)
+            activateAudioSessionWithFallback()
 
             // Only use numberOfLoops if we're not using delay-based repeating
             // When repeatDelay > 0, we play once and then use the delegate to schedule the next play with delay
@@ -145,8 +141,7 @@ class AlarmSound {
             // First sound plays immediately - delay only applies between repeated sounds
             if audioPlayer!.play() {
                 if !isPlaying {
-                    LogManager.shared.log(category: .alarm, message: "AlarmSound - not playing after calling play")
-                    LogManager.shared.log(category: .alarm, message: "AlarmSound - rate value: \(audioPlayer!.rate)")
+                    LogManager.shared.log(category: .alarm, message: "AlarmSound - not playing after calling play (rate \(audioPlayer!.rate))")
                 } else {
                     Observable.shared.alarmSoundPlaying.value = true
                     if repeatDelay > 0 {
@@ -184,8 +179,7 @@ class AlarmSound {
                 audioPlayer = try AVAudioPlayer(contentsOf: soundURL)
                 audioPlayer!.delegate = audioPlayerDelegate
 
-                try AVAudioSession.sharedInstance().setCategory(.playback, mode: .default, options: [])
-                try AVAudioSession.sharedInstance().setActive(true)
+                activateAudioSessionWithFallback()
 
                 audioPlayer!.numberOfLoops = 0
 
@@ -213,8 +207,7 @@ class AlarmSound {
             audioPlayer = try AVAudioPlayer(contentsOf: soundURL)
             audioPlayer!.delegate = audioPlayerDelegate
 
-            try AVAudioSession.sharedInstance().setCategory(.playback, mode: .default, options: [])
-            try AVAudioSession.sharedInstance().setActive(true)
+            activateAudioSessionWithFallback()
 
             // Play endless loops
             audioPlayer!.numberOfLoops = 2
@@ -260,14 +253,35 @@ class AlarmSound {
         systemOutputVolumeBeforeOverride = nil
     }
 
-    fileprivate static func enableAudio() {
-        do {
-            try AVAudioSession.sharedInstance().setCategory(.playback, mode: .default, options: [])
-            try AVAudioSession.sharedInstance().setActive(true)
-            LogManager.shared.log(category: .alarm, message: "Audio session configured for alarm playback")
-        } catch {
-            LogManager.shared.log(category: .alarm, message: "Enable audio error: \(error)")
+    // Background activation of a non-mixable .playback session is denied by iOS
+    // (cannotInterruptOthers, 560557684) unless the app is already actively playing
+    // audio. In foreground, or with Silent Tune holding a mixable session alive,
+    // options: [] succeeds and lets the alarm dominate other audio. For
+    // Bluetooth-heartbeat users with no Silent Tune we skip [] (it would always
+    // be denied) and ladder through mixable options so activation is still
+    // permitted from background. Each attempt is logged so we can see in the
+    // field which fallback (if any) the user landed on.
+    fileprivate static func activateAudioSessionWithFallback() {
+        let isBackgroundWithoutSilentTune = UIApplication.shared.applicationState == .background
+            && Storage.shared.backgroundRefreshType.value != .silentTune
+
+        let dominate: (label: String, options: AVAudioSession.CategoryOptions) = ("[]", [])
+        let duck: (label: String, options: AVAudioSession.CategoryOptions) = (".duckOthers", .duckOthers)
+        let mix: (label: String, options: AVAudioSession.CategoryOptions) = (".mixWithOthers", .mixWithOthers)
+
+        let candidates = isBackgroundWithoutSilentTune ? [duck, mix] : [dominate, duck, mix]
+        for candidate in candidates {
+            do {
+                try AVAudioSession.sharedInstance().setCategory(.playback, mode: .default, options: candidate.options)
+                try AVAudioSession.sharedInstance().setActive(true)
+                LogManager.shared.log(category: .alarm, message: "AlarmSound - audio session active (options: \(candidate.label))")
+                return
+            } catch {
+                let nsError = error as NSError
+                LogManager.shared.log(category: .alarm, message: "AlarmSound - audio session activation failed (options: \(candidate.label)) [code \(nsError.code)]: \(error.localizedDescription)")
+            }
         }
+        LogManager.shared.log(category: .alarm, message: "AlarmSound - all audio session option fallbacks exhausted")
     }
 }
 
diff --git a/LoopFollow/Controllers/Graphs.swift b/LoopFollow/Controllers/Graphs.swift
index 7809bdba1..9789e9c46 100644
--- a/LoopFollow/Controllers/Graphs.swift
+++ b/LoopFollow/Controllers/Graphs.swift
@@ -211,6 +211,10 @@ class TempTargetRenderer: LineChartRenderer {
 
 let ScaleXMax: Double = 150.0
 extension MainViewController {
+    private func graphRangeThresholds() -> (low: Double, high: Double) {
+        UnitSettingsStore.shared.effectiveThresholds()
+    }
+
     func updateChartRenderers() {
         let tempTargetDataIndex = GraphDataIndex.tempTarget.rawValue
         let smbDataIndex = GraphDataIndex.smb.rawValue
@@ -627,15 +631,17 @@ extension MainViewController {
         // Clear limit lines so they don't add multiples when changing the settings
         BGChart.rightAxis.removeAllLimitLines()
 
-        // Add lower red line based on low alert value
+        let thresholds = graphRangeThresholds()
+
+        // Add lower red line
         let ll = ChartLimitLine()
-        ll.limit = Storage.shared.lowLine.value
+        ll.limit = thresholds.low
         ll.lineColor = NSUIColor.systemRed.withAlphaComponent(0.5)
         BGChart.rightAxis.addLimitLine(ll)
 
-        // Add upper yellow line based on low alert value
+        // Add upper yellow line
         let ul = ChartLimitLine()
-        ul.limit = Storage.shared.highLine.value
+        ul.limit = thresholds.high
         ul.lineColor = NSUIColor.systemYellow.withAlphaComponent(0.5)
         BGChart.rightAxis.addLimitLine(ul)
 
@@ -786,15 +792,17 @@ extension MainViewController {
         // Clear limit lines so they don't add multiples when changing the settings
         BGChart.rightAxis.removeAllLimitLines()
 
-        // Add lower red line based on low alert value
+        let thresholds = graphRangeThresholds()
+
+        // Add lower red line
         let ll = ChartLimitLine()
-        ll.limit = Storage.shared.lowLine.value
+        ll.limit = thresholds.low
         ll.lineColor = NSUIColor.systemRed.withAlphaComponent(0.5)
         BGChart.rightAxis.addLimitLine(ll)
 
-        // Add upper yellow line based on low alert value
+        // Add upper yellow line
         let ul = ChartLimitLine()
-        ul.limit = Storage.shared.highLine.value
+        ul.limit = thresholds.high
         ul.lineColor = NSUIColor.systemYellow.withAlphaComponent(0.5)
         BGChart.rightAxis.addLimitLine(ul)
 
@@ -824,6 +832,7 @@ extension MainViewController {
         var colors = [NSUIColor]()
 
         topBG = Storage.shared.minBGScale.value
+        let thresholds = graphRangeThresholds()
         for i in 0 ..< entries.count {
             // Clamp the plotted y-value to the same bounds the header text uses
             // (HIGH/LOW), so the graph stays consistent with the main display.
@@ -836,9 +845,9 @@ extension MainViewController {
             mainChart.append(value)
             smallChart.append(value)
 
-            if Double(entries[i].sgv) >= Storage.shared.highLine.value {
+            if Double(entries[i].sgv) >= thresholds.high {
                 colors.append(NSUIColor.systemYellow)
-            } else if Double(entries[i].sgv) <= Storage.shared.lowLine.value {
+            } else if Double(entries[i].sgv) <= thresholds.low {
                 colors.append(NSUIColor.systemRed)
             } else {
                 colors.append(NSUIColor.systemGreen)
diff --git a/LoopFollow/Controllers/MainViewController+updateStats.swift b/LoopFollow/Controllers/MainViewController+updateStats.swift
index 090f7925e..890307d4d 100644
--- a/LoopFollow/Controllers/MainViewController+updateStats.swift
+++ b/LoopFollow/Controllers/MainViewController+updateStats.swift
@@ -26,12 +26,25 @@ extension MainViewController {
             statsInRangePercent.text = String(format: "%.1f%%", stats.percentRange)
             statsHighPercent.text = String(format: "%.1f%%", stats.percentHigh)
             statsAvgBG.text = Localizer.toDisplayUnits(String(format: "%.0f", stats.avgBG))
-            if Storage.shared.useIFCC.value {
+            statsEstA1CTitle.text = UnitSettingsStore.shared.glycemicMetricMode == .gmi ? "GMI:" : "Est. A1C:"
+
+            if UnitSettingsStore.shared.glycemicOutputUnit == .mmolMol {
                 statsEstA1C.text = String(format: "%.0f", stats.a1C)
             } else {
                 statsEstA1C.text = String(format: "%.1f", stats.a1C)
             }
-            statsStdDev.text = String(format: "%.2f", stats.stdDev)
+
+            if UnitSettingsStore.shared.variabilityMetricMode == .stdDeviation {
+                statsStdDevTitle.text = "Std Dev:"
+                if UnitSettingsStore.shared.glucoseUnit == .mgdL {
+                    statsStdDev.text = String(format: "%.0f", stats.stdDev)
+                } else {
+                    statsStdDev.text = String(format: "%.1f", stats.stdDev)
+                }
+            } else {
+                statsStdDevTitle.text = "CV:"
+                statsStdDev.text = String(format: "%.1f%%", stats.coefficientOfVariation)
+            }
 
             createStatsPie(pieData: stats.pie)
         }
diff --git a/LoopFollow/Controllers/Nightscout/BGData.swift b/LoopFollow/Controllers/Nightscout/BGData.swift
index d97aba24c..12b9568cd 100644
--- a/LoopFollow/Controllers/Nightscout/BGData.swift
+++ b/LoopFollow/Controllers/Nightscout/BGData.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
 
diff --git a/LoopFollow/Controllers/Nightscout/ProfileManager.swift b/LoopFollow/Controllers/Nightscout/ProfileManager.swift
index 520afde88..0f8a5d82a 100644
--- a/LoopFollow/Controllers/Nightscout/ProfileManager.swift
+++ b/LoopFollow/Controllers/Nightscout/ProfileManager.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 {
diff --git a/LoopFollow/Controllers/Nightscout/Treatments.swift b/LoopFollow/Controllers/Nightscout/Treatments.swift
index 307a37e79..b628737b4 100644
--- a/LoopFollow/Controllers/Nightscout/Treatments.swift
+++ b/LoopFollow/Controllers/Nightscout/Treatments.swift
@@ -35,6 +35,13 @@ extension MainViewController {
 
     // Process and split out treatments to individual tasks
     func updateTreatments(entries: [[String: AnyObject]]) {
+        // Deduplicate entries by "id" field (Trio/Loop UUID)
+        var seenIDs = Set<String>()
+        let uniqueEntries = entries.filter { entry in
+            guard let id = entry["id"] as? String else { return true }
+            return seenIDs.insert(id).inserted
+        }
+
         var tempBasal: [[String: AnyObject]] = []
         var bolus: [[String: AnyObject]] = []
         var smb: [[String: AnyObject]] = []
@@ -49,7 +56,7 @@ extension MainViewController {
         var cgmSensorStart: [sageData] = []
         var insulinCartridge: [iageData] = []
 
-        for entry in entries {
+        for entry in uniqueEntries {
             guard let eventType = entry["eventType"] as? String else {
                 continue
             }
diff --git a/LoopFollow/Controllers/Stats.swift b/LoopFollow/Controllers/Stats.swift
index 768215e6c..15447db9d 100644
--- a/LoopFollow/Controllers/Stats.swift
+++ b/LoopFollow/Controllers/Stats.swift
@@ -14,6 +14,7 @@ class StatsData {
     var avgBG: Float
     var a1C: Float
     var stdDev: Float
+    var coefficientOfVariation: Float
     var bgDataCount: Int
     var pie: [DataStructs.pieData]
 
@@ -23,12 +24,17 @@ class StatsData {
         countHigh = 0
         totalGlucose = 0
         a1C = 0.0
+        coefficientOfVariation = 0.0
+
+        let thresholds = UnitSettingsStore.shared.effectiveThresholds()
+        let lowThreshold = thresholds.low
+        let highThreshold = thresholds.high
 
         for i in 0 ..< bgData.count {
             // Set low/range/high counts for pie chart and %'s
-            if Double(bgData[i].sgv) <= Storage.shared.lowLine.value {
+            if Double(bgData[i].sgv) < lowThreshold {
                 countLow += 1
-            } else if Double(bgData[i].sgv) >= Storage.shared.highLine.value {
+            } else if Double(bgData[i].sgv) > highThreshold {
                 countHigh += 1
             } else {
                 countRange += 1
@@ -60,15 +66,19 @@ class StatsData {
             partialSum += (Float(bgData[i].sgv) - avgBG) * (Float(bgData[i].sgv) - avgBG)
         }
 
-        stdDev = sqrt(partialSum / Float(bgData.count))
-        if Storage.shared.units.value != "mg/dL" {
-            stdDev = stdDev * Float(GlucoseConversion.mgDlToMmolL)
+        let stdDevMgdL = sqrt(partialSum / Float(bgData.count))
+        if avgBG > 0 {
+            coefficientOfVariation = (stdDevMgdL / avgBG) * 100.0
         }
+        stdDev = Float(UnitSettingsStore.shared.convertMgdlToDisplay(Double(stdDevMgdL)))
 
-        if Storage.shared.useIFCC.value {
-            a1C = (((46.7 + Float(avgBG)) / 28.7) - 2.152) / 0.09148
+        let avgBGDisplay = UnitSettingsStore.shared.convertMgdlToDisplay(Double(avgBG))
+        let metricValue: Double?
+        if UnitSettingsStore.shared.glycemicMetricMode == .gmi {
+            metricValue = GlycemicMetricCalculator.calculateGMI(avgGlucoseInDisplayUnits: avgBGDisplay)
         } else {
-            a1C = (46.7 + Float(avgBG)) / 28.7
+            metricValue = GlycemicMetricCalculator.calculateEhba1c(avgGlucoseInDisplayUnits: avgBGDisplay)
         }
+        a1C = Float(metricValue ?? 0.0)
     }
 }
diff --git a/LoopFollow/Helpers/APNsCredentialValidator.swift b/LoopFollow/Helpers/APNsCredentialValidator.swift
new file mode 100644
index 000000000..6eae74f81
--- /dev/null
+++ b/LoopFollow/Helpers/APNsCredentialValidator.swift
@@ -0,0 +1,32 @@
+// LoopFollow
+// APNsCredentialValidator.swift
+
+import Foundation
+
+/// Validation rules for the APNs credentials the user pastes in
+/// `APNSettingsView`. Used both by the settings UI to surface inline
+/// errors and by `LiveActivitySettingsView` to warn when push-based
+/// updates won't work.
+enum APNsCredentialValidator {
+    /// Apple Key IDs are exactly 10 uppercase alphanumeric characters.
+    static func isValidKeyId(_ keyId: String) -> Bool {
+        guard keyId.count == 10 else { return false }
+        return keyId.allSatisfy { $0.isASCII && ($0.isUppercase || $0.isNumber) }
+    }
+
+    /// A pasted .p8 must contain both PEM markers. We don't try to verify
+    /// the inner base64 here — `LoopAPNSService.validateAndFixAPNSKey`
+    /// already normalizes whitespace and logs deeper warnings, and we
+    /// don't want to reject keys that JWTManager would happily sign.
+    static func isValidApnsKey(_ key: String) -> Bool {
+        let trimmed = key.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return false }
+        return trimmed.contains("-----BEGIN PRIVATE KEY-----")
+            && trimmed.contains("-----END PRIVATE KEY-----")
+    }
+
+    /// Convenience for "is the user fully set up to send APNs pushes?"
+    static func isFullyConfigured(keyId: String, apnsKey: String) -> Bool {
+        isValidKeyId(keyId) && isValidApnsKey(apnsKey)
+    }
+}
diff --git a/LoopFollow/Helpers/BuildDetails.swift b/LoopFollow/Helpers/BuildDetails.swift
index 053466dba..a985d6dbd 100644
--- a/LoopFollow/Helpers/BuildDetails.swift
+++ b/LoopFollow/Helpers/BuildDetails.swift
@@ -31,9 +31,13 @@ class BuildDetails {
         return dict["com-LoopFollow-branch"] as? String
     }
 
+    var commitSha: String? {
+        return dict["com-LoopFollow-commit-sha"] as? String
+    }
+
     var branchAndSha: String {
         let branch = branch ?? "Unknown"
-        let sha = dict["com-LoopFollow-commit-sha"] as? String ?? "Unknown"
+        let sha = commitSha ?? "Unknown"
         return "\(branch) \(sha)"
     }
 
diff --git a/LoopFollow/Helpers/JWTManager.swift b/LoopFollow/Helpers/JWTManager.swift
index 3e847b999..53a4d233e 100644
--- a/LoopFollow/Helpers/JWTManager.swift
+++ b/LoopFollow/Helpers/JWTManager.swift
@@ -45,7 +45,7 @@ class JWTManager {
             let signedJWT = "\(signingInput).\(signatureBase64)"
 
             cache[cacheKey] = CachedToken(jwt: signedJWT, expiresAt: Date().addingTimeInterval(ttl))
-            LogManager.shared.log(category: .apns, message: "JWT generated for key \(keyId) (TTL 55 min)")
+            LogManager.shared.log(category: .apns, message: "JWT generated for key \(LogRedactor.keyId(keyId)) (TTL 55 min)")
             return signedJWT
         } catch {
             LogManager.shared.log(category: .apns, message: "Failed to sign JWT: \(error.localizedDescription)")
diff --git a/LoopFollow/Helpers/Localizer.swift b/LoopFollow/Helpers/Localizer.swift
index af55db290..b615a4cf6 100644
--- a/LoopFollow/Helpers/Localizer.swift
+++ b/LoopFollow/Helpers/Localizer.swift
@@ -4,13 +4,160 @@
 import Foundation
 import HealthKit
 
+enum GlucoseDisplayUnit: String, Codable, CaseIterable {
+    case mgdL = "mg/dL"
+    case mmolL = "mmol/L"
+
+    var fractionDigits: Int {
+        switch self {
+        case .mgdL:
+            return 0
+        case .mmolL:
+            return 1
+        }
+    }
+}
+
+enum TimeInRangeDisplayMode: String, Codable, CaseIterable {
+    case tir = "TIR"
+    case titr = "TITR"
+    case custom = "Custom"
+}
+
+enum GlycemicMetricMode: String, Codable, CaseIterable {
+    case ehba1c = "eHbA1c"
+    case gmi = "GMI"
+}
+
+enum GlycemicOutputUnit: String, Codable, CaseIterable {
+    case percent = "%"
+    case mmolMol = "mmol/mol"
+}
+
+enum VariabilityMetricMode: String, Codable, CaseIterable {
+    case stdDeviation = "Std Deviation"
+    case cv = "CV"
+}
+
+final class UnitSettingsStore {
+    static let shared = UnitSettingsStore()
+
+    private init() {}
+
+    var glucoseUnit: GlucoseDisplayUnit {
+        get {
+            GlucoseDisplayUnit(rawValue: Storage.shared.units.value) ?? .mgdL
+        }
+        set {
+            Storage.shared.units.value = newValue.rawValue
+        }
+    }
+
+    var timeInRangeMode: TimeInRangeDisplayMode {
+        get {
+            TimeInRangeDisplayMode(rawValue: Storage.shared.timeInRangeModeRaw.value) ?? .tir
+        }
+        set {
+            Storage.shared.timeInRangeModeRaw.value = newValue.rawValue
+        }
+    }
+
+    /// Returns the effective low/high thresholds (in mg/dL) for the current range mode.
+    func effectiveThresholds() -> (low: Double, high: Double) {
+        switch timeInRangeMode {
+        case .tir:
+            return (70.0, 180.0)
+        case .titr:
+            return (70.0, 140.0)
+        case .custom:
+            return (Storage.shared.lowLine.value, Storage.shared.highLine.value)
+        }
+    }
+
+    var glycemicMetricMode: GlycemicMetricMode {
+        get {
+            Storage.shared.showGMI.value ? .gmi : .ehba1c
+        }
+        set {
+            Storage.shared.showGMI.value = (newValue == .gmi)
+        }
+    }
+
+    var glycemicOutputUnit: GlycemicOutputUnit {
+        get {
+            Storage.shared.useIFCC.value ? .mmolMol : .percent
+        }
+        set {
+            Storage.shared.useIFCC.value = (newValue == .mmolMol)
+        }
+    }
+
+    var variabilityMetricMode: VariabilityMetricMode {
+        get {
+            Storage.shared.showStdDev.value ? .stdDeviation : .cv
+        }
+        set {
+            Storage.shared.showStdDev.value = (newValue == .stdDeviation)
+        }
+    }
+
+    func convertMgdlToDisplay(_ mgdl: Double) -> Double {
+        switch glucoseUnit {
+        case .mgdL:
+            return mgdl
+        case .mmolL:
+            return mgdl * GlucoseConversion.mgDlToMmolL
+        }
+    }
+
+    func convertDisplayToMgdl(_ value: Double) -> Double {
+        switch glucoseUnit {
+        case .mgdL:
+            return value
+        case .mmolL:
+            return value * GlucoseConversion.mmolToMgDl
+        }
+    }
+}
+
+enum GlycemicMetricCalculator {
+    static func calculateEhba1c(avgGlucoseInDisplayUnits: Double?) -> Double? {
+        guard let avgGlucoseInDisplayUnits else { return nil }
+
+        switch UnitSettingsStore.shared.glycemicOutputUnit {
+        case .mmolMol:
+            let avgMmolL = UnitSettingsStore.shared.glucoseUnit == .mmolL
+                ? avgGlucoseInDisplayUnits
+                : avgGlucoseInDisplayUnits * GlucoseConversion.mgDlToMmolL
+            return avgMmolL * 6.936514699616532 - 6.628248828291433
+        case .percent:
+            let avgMgdL = UnitSettingsStore.shared.convertDisplayToMgdl(avgGlucoseInDisplayUnits)
+            return (avgMgdL + 46.7) / 28.7
+        }
+    }
+
+    static func calculateGMI(avgGlucoseInDisplayUnits: Double?) -> Double? {
+        guard let avgGlucoseInDisplayUnits else { return nil }
+
+        switch UnitSettingsStore.shared.glycemicOutputUnit {
+        case .percent:
+            let avgMgdL = UnitSettingsStore.shared.convertDisplayToMgdl(avgGlucoseInDisplayUnits)
+            return 3.31 + (0.02392 * avgMgdL)
+        case .mmolMol:
+            let avgMmolL = UnitSettingsStore.shared.glucoseUnit == .mmolL
+                ? avgGlucoseInDisplayUnits
+                : avgGlucoseInDisplayUnits * GlucoseConversion.mgDlToMmolL
+            return 12.71 + (4.70587 * avgMmolL)
+        }
+    }
+}
+
 class Localizer {
     static func getPreferredUnit() -> HKUnit {
-        let unitString = Storage.shared.units.value
-        switch unitString {
-        case "mmol/L":
+        switch UnitSettingsStore.shared.glucoseUnit {
+        case .mmolL:
             return .millimolesPerLiter
-        default:
+        case .mgdL:
             return .milligramsPerDeciliter
         }
     }
@@ -50,14 +197,9 @@ class Localizer {
         let numberFormatter = NumberFormatter()
         numberFormatter.numberStyle = .decimal
 
-        let units = unit ?? Storage.shared.units.value
-
-        if units == "mg/dL" {
-            numberFormatter.maximumFractionDigits = 0 // No decimal places for mg/dL
-        } else {
-            numberFormatter.maximumFractionDigits = 1 // Always one decimal place for mmol/L
-            numberFormatter.minimumFractionDigits = 1 // This ensures even .0 is displayed
-        }
+        let units = GlucoseDisplayUnit(rawValue: unit ?? UnitSettingsStore.shared.glucoseUnit.rawValue) ?? .mgdL
+        numberFormatter.maximumFractionDigits = units.fractionDigits
+        numberFormatter.minimumFractionDigits = units.fractionDigits
 
         numberFormatter.locale = Locale.current
 
@@ -68,18 +210,14 @@ class Localizer {
     static func toDisplayUnits(_ value: String) -> String {
         let numberFormatter = NumberFormatter()
         numberFormatter.numberStyle = .decimal
-
-        if Storage.shared.units.value == "mg/dL" {
-            numberFormatter.maximumFractionDigits = 0 // No decimal places for mg/dL
-        } else {
-            numberFormatter.maximumFractionDigits = 1 // Always one decimal place for mmol/L
-            numberFormatter.minimumFractionDigits = 1 // This ensures even .0 is displayed
-        }
+        let units = UnitSettingsStore.shared.glucoseUnit
+        numberFormatter.maximumFractionDigits = units.fractionDigits
+        numberFormatter.minimumFractionDigits = units.fractionDigits
 
         numberFormatter.locale = Locale.current
 
         if let number = Float(value) {
-            if Storage.shared.units.value == "mg/dL" {
+            if units == .mgdL {
                 let numberValue = NSNumber(value: number)
                 return numberFormatter.string(from: numberValue) ?? value
             } else {
diff --git a/LoopFollow/Helpers/LogRedactor.swift b/LoopFollow/Helpers/LogRedactor.swift
new file mode 100644
index 000000000..be29edd2c
--- /dev/null
+++ b/LoopFollow/Helpers/LogRedactor.swift
@@ -0,0 +1,170 @@
+// LoopFollow
+// LogRedactor.swift
+
+import CryptoKit
+import Foundation
+
+/// Helpers for masking secrets before they hit the log file. The "share logs"
+/// feature exposes the on-disk log to the user, so anything sensitive that
+/// flows through `LogManager.log` must be reduced to a non-recoverable form
+/// while keeping enough signal (short suffix, host, fingerprint) to correlate
+/// events during debugging.
+enum LogRedactor {
+    /// Last `keep` characters of `secret`, prefixed with `…`. Matches the
+    /// existing `.suffix(8)` convention used in `LiveActivityManager`.
+    static func tail(_ secret: String, keep: Int = 8) -> String {
+        if secret.isEmpty { return "(empty)" }
+        if secret.count <= keep { return "(redacted)" }
+        return "…\(secret.suffix(keep))"
+    }
+
+    /// First `keep` characters of `secret`, suffixed with `…`. Matches the
+    /// existing `.prefix(8)` convention used in `LoopAPNSService`.
+    static func head(_ secret: String, keep: Int = 8) -> String {
+        if secret.isEmpty { return "(empty)" }
+        if secret.count <= keep { return "(redacted)" }
+        return "\(secret.prefix(keep))…"
+    }
+
+    /// Known managed-Nightscout host suffixes. When a URL's host ends in one
+    /// of these, the leading subdomain (which identifies the user) is masked
+    /// and the suffix is kept so engineers can tell which platform the user
+    /// is on. Anything else is treated as self-hosted and reduced to the TLD.
+    private static let knownHostSuffixes: [String] = [
+        "nightscoutpro.com",
+        "10be.de",
+        "herokuapp.com",
+    ]
+
+    /// Keep scheme + a redacted host hint, drop path and query. The Nightscout
+    /// token rides in `?token=` and the host itself identifies the user when
+    /// they're on a managed platform, so we mask the subdomain and keep only
+    /// the platform suffix (or just the TLD for self-hosted setups).
+    static func url(_ raw: String) -> String {
+        if raw.isEmpty { return "(empty)" }
+        if let u = URL(string: raw), let host = u.host {
+            let scheme = u.scheme.map { "\($0)://" } ?? ""
+            return "\(scheme)\(maskHost(host))/…"
+        }
+        return "(redacted)"
+    }
+
+    private static func maskHost(_ host: String) -> String {
+        // IPv4 / IPv6 / bracketed — drop entirely.
+        if host.range(of: "^\\d+\\.\\d+\\.\\d+\\.\\d+$", options: .regularExpression) != nil { return "***" }
+        if host.contains(":") || host.hasPrefix("[") { return "***" }
+
+        let lower = host.lowercased()
+        for suffix in knownHostSuffixes {
+            if lower == suffix || lower.hasSuffix("." + suffix) {
+                return "***." + suffix
+            }
+        }
+
+        let parts = host.split(separator: ".", omittingEmptySubsequences: false)
+        if parts.count >= 2, let tld = parts.last, !tld.isEmpty {
+            return "***." + String(tld)
+        }
+        return "***"
+    }
+
+    /// Apple Developer Key ID — 10-char uppercase alphanumeric. Reveals
+    /// last 2 chars only.
+    static func keyId(_ keyId: String) -> String {
+        if keyId.isEmpty { return "(empty)" }
+        if keyId.count <= 2 { return "(redacted)" }
+        return "…\(keyId.suffix(2))"
+    }
+
+    /// Apple Team ID — 10-char uppercase alphanumeric. Reveals last 2 chars.
+    static func teamId(_ teamId: String) -> String {
+        keyId(teamId)
+    }
+
+    /// App bundle id ("com.example.MyApp"). Mask the middle component(s) but
+    /// keep the leading TLD and trailing app name so suffixes like
+    /// `.watchkitapp` or `.push-type.liveactivity` remain visible.
+    static func bundleId(_ id: String) -> String {
+        if id.isEmpty { return "(empty)" }
+        let parts = id.split(separator: ".", omittingEmptySubsequences: false)
+        guard parts.count >= 3 else { return "(redacted)" }
+        var masked = [String]()
+        masked.append(String(parts[0]))
+        for _ in 1 ..< parts.count - 1 {
+            masked.append("***")
+        }
+        masked.append(String(parts[parts.count - 1]))
+        return masked.joined(separator: ".")
+    }
+
+    /// Username (Dexcom Share, etc.). Preserves first character and any
+    /// `@domain` suffix shape so engineers can tell email-shaped from not.
+    static func username(_ name: String) -> String {
+        if name.isEmpty { return "(empty)" }
+        if name.contains("@") {
+            let parts = name.split(separator: "@", maxSplits: 1).map(String.init)
+            let local = parts[0]
+            let domain = parts.count > 1 ? parts[1] : ""
+            let firstLocal = local.first.map(String.init) ?? "?"
+            let firstDomain = domain.first.map(String.init) ?? "?"
+            return "\(firstLocal)***@\(firstDomain)***"
+        }
+        let first = name.first.map(String.init) ?? "?"
+        return "\(first)***"
+    }
+
+    /// Sweep an arbitrary message string for high-confidence secret shapes.
+    /// Idempotent. Run by `LogManager.log` on every line before write.
+    static func sweep(_ message: String) -> String {
+        var out = message
+        out = redactPEM(out)
+        out = redactTokenQuery(out)
+        out = redactJWT(out)
+        return out
+    }
+
+    /// Replace any `?token=…` or `&token=…` value with `***` (case-insensitive).
+    private static func redactTokenQuery(_ s: String) -> String {
+        guard let regex = try? NSRegularExpression(
+            pattern: "([?&]token=)[^&\\s\"'<>]+",
+            options: [.caseInsensitive]
+        ) else { return s }
+        let range = NSRange(s.startIndex ..< s.endIndex, in: s)
+        return regex.stringByReplacingMatches(in: s, options: [], range: range, withTemplate: "$1***")
+    }
+
+    /// Collapse the body of a PEM PRIVATE KEY block to `(redacted)`.
+    private static func redactPEM(_ s: String) -> String {
+        guard let regex = try? NSRegularExpression(
+            pattern: "-----BEGIN [A-Z ]*PRIVATE KEY-----[\\s\\S]*?-----END [A-Z ]*PRIVATE KEY-----",
+            options: []
+        ) else { return s }
+        let range = NSRange(s.startIndex ..< s.endIndex, in: s)
+        return regex.stringByReplacingMatches(
+            in: s, options: [], range: range,
+            withTemplate: "-----BEGIN PRIVATE KEY----- (redacted) -----END PRIVATE KEY-----"
+        )
+    }
+
+    /// Collapse the middle segment of a JWT (`ey…\.ey…\.…`).
+    private static func redactJWT(_ s: String) -> String {
+        guard let regex = try? NSRegularExpression(
+            pattern: "ey[A-Za-z0-9_-]{8,}\\.ey[A-Za-z0-9_-]{8,}\\.[A-Za-z0-9_-]{8,}",
+            options: []
+        ) else { return s }
+        let range = NSRange(s.startIndex ..< s.endIndex, in: s)
+        return regex.stringByReplacingMatches(in: s, options: [], range: range, withTemplate: "ey…<jwt>…")
+    }
+
+    /// Non-reversible fingerprint for opaque blobs we can't safely log
+    /// (settings JSON, scanned QR code contents, etc.).
+    static func fingerprint(_ data: Data) -> String {
+        let digest = SHA256.hash(data: data)
+        let hex = digest.compactMap { String(format: "%02x", $0) }.joined()
+        return "\(data.count) bytes, sha256=\(hex.prefix(8))…"
+    }
+
+    static func fingerprint(_ string: String) -> String {
+        fingerprint(Data(string.utf8))
+    }
+}
diff --git a/LoopFollow/Helpers/NightscoutUtils.swift b/LoopFollow/Helpers/NightscoutUtils.swift
index 674de1923..34f8bcb08 100644
--- a/LoopFollow/Helpers/NightscoutUtils.swift
+++ b/LoopFollow/Helpers/NightscoutUtils.swift
@@ -86,25 +86,22 @@ class NightscoutUtils {
                     completion(.success(decodedObject))
                 }
             } catch let decodingError as DecodingError {
-                print("[ERROR] Failed to decode \(T.self):")
+                let typeName = String(describing: T.self)
                 switch decodingError {
                 case let .typeMismatch(type, context):
-                    print("Type mismatch for type \(type), context: \(context.debugDescription)")
-                    print("Coding path:", context.codingPath)
+                    LogManager.shared.log(category: .nightscout, message: "Decode \(typeName) typeMismatch: \(type) at \(context.codingPath.map { $0.stringValue }.joined(separator: "."))", isDebug: true)
                 case let .valueNotFound(type, context):
-                    print("Value not found for type \(type), context: \(context.debugDescription)")
-                    print("Coding path:", context.codingPath)
+                    LogManager.shared.log(category: .nightscout, message: "Decode \(typeName) valueNotFound: \(type) at \(context.codingPath.map { $0.stringValue }.joined(separator: "."))", isDebug: true)
                 case let .keyNotFound(key, context):
-                    print("Key '\(key.stringValue)' not found, context: \(context.debugDescription)")
-                    print("Coding path:", context.codingPath)
-                case let .dataCorrupted(context):
-                    print("Data corrupted, context: \(context.debugDescription)")
+                    LogManager.shared.log(category: .nightscout, message: "Decode \(typeName) keyNotFound: '\(key.stringValue)' at \(context.codingPath.map { $0.stringValue }.joined(separator: "."))", isDebug: true)
+                case .dataCorrupted:
+                    LogManager.shared.log(category: .nightscout, message: "Decode \(typeName) dataCorrupted", isDebug: true)
                 @unknown default:
-                    print("Unknown decoding error")
+                    LogManager.shared.log(category: .nightscout, message: "Decode \(typeName) unknown error", isDebug: true)
                 }
                 completion(.failure(decodingError))
             } catch {
-                print("[ERROR] General error:", error)
+                LogManager.shared.log(category: .nightscout, message: "Decode \(T.self) general error: \(String(describing: type(of: error)))", isDebug: true)
                 completion(.failure(error))
             }
         }
diff --git a/LoopFollow/Helpers/Telemetry.swift b/LoopFollow/Helpers/Telemetry.swift
new file mode 100644
index 000000000..26246a728
--- /dev/null
+++ b/LoopFollow/Helpers/Telemetry.swift
@@ -0,0 +1,400 @@
+// LoopFollow
+// Telemetry.swift
+
+import CryptoKit
+import Foundation
+import SwiftUI
+import UIKit
+
+// MARK: - TelemetryClient
+
+final class TelemetryClient {
+    static let shared = TelemetryClient()
+
+    private static let endpoint = URL(string: "https://lf.bjorkert.se/api/telemetry/checkin")!
+    private static let salt = "lf-telemetry"
+    private static let weeklyInterval: TimeInterval = 7 * 24 * 60 * 60
+    private static let dailyInterval: TimeInterval = 24 * 60 * 60
+
+    private init() {}
+
+    /// Records a cold launch in a sliding 7-day window of timestamps. Called
+    /// from AppDelegate.didFinishLaunchingWithOptions on every process start
+    /// (foreground or background). The count of entries in the window is sent
+    /// as `coldLaunches7d` in each ping, giving a "how often is iOS recycling
+    /// or killing this process" signal that's directly comparable across
+    /// pings regardless of the cadence between them.
+    func recordColdLaunch(now: Date = Date()) {
+        let cutoff = now.addingTimeInterval(-Self.weeklyInterval)
+        var recent = Storage.shared.telemetryColdLaunchTimes.value
+        recent.removeAll { $0 < cutoff }
+        recent.append(now)
+        Storage.shared.telemetryColdLaunchTimes.value = recent
+    }
+
+    /// Static write token, committed in source. The LoopFollow repo is public,
+    /// so this string is public too. The backend treats it as a "front door
+    /// sign" rather than a secret: TLS, NGINX rate limit (60 req/min/IP),
+    /// strict schema validation, and an insert+find-only MongoDB role bound
+    /// any abuse to harmless duplicate-row inserts.
+    private static let writeToken = "RsEDJ8RoOs7HHZ_XGOdI1sY3Yuv6iPnRRk7tg-NlCAg"
+
+    /// True when the running build's commit SHA differs from the SHA recorded
+    /// at the last successful send. Used at startup to fire one immediate
+    /// ping after an app update — the regular 24h scheduler can't tell that
+    /// the build changed and would otherwise wait out the previous interval.
+    func buildShaChangedSinceLastSend() -> Bool {
+        let currentSha = BuildDetails.default.commitSha ?? ""
+        return Storage.shared.telemetryLastSentSha.value != currentSha
+    }
+
+    /// Wires telemetry into TaskScheduler. Called once on app start (from
+    /// AppDelegate.didFinishLaunchingWithOptions) and again after each tick.
+    /// First run is computed from `telemetryLastSentAt`: a relaunch 6h after
+    /// the previous send waits 18h; a relaunch after 25h fires on the next
+    /// timer tick (TaskScheduler treats a past nextRun as "fire soon"). Each
+    /// fired tick reschedules itself for +24h, giving the steady-state
+    /// cadence while the app keeps running.
+    ///
+    /// Bails out without scheduling if the user hasn't decided on consent
+    /// yet or has opted out — there's nothing for the timer to do, and
+    /// scheduling for "now" with `lastSentAt` still nil would tight-loop
+    /// (fire → maybeSend bails → reschedule → fire …).
+    func scheduleRecurring() {
+        let storage = Storage.shared
+        guard storage.telemetryConsentDecisionMade.value,
+              storage.telemetryEnabled.value
+        else {
+            return
+        }
+
+        let nextRun: Date
+        if let last = storage.telemetryLastSentAt.value {
+            nextRun = last.addingTimeInterval(Self.dailyInterval)
+        } else {
+            // Consent given but we've never landed a successful send
+            // (network down at first launch, server hiccup, etc). Retry in
+            // a minute — bounded so a persistently failing send doesn't
+            // turn into a busy loop.
+            nextRun = Date().addingTimeInterval(60)
+        }
+
+        TaskScheduler.shared.scheduleTask(id: .telemetry, nextRun: nextRun) {
+            Task.detached {
+                await TelemetryClient.shared.maybeSend()
+                TelemetryClient.shared.scheduleRecurring()
+            }
+        }
+    }
+
+    /// Single entry point used by all callers (scheduler tick, consent-yes,
+    /// startup SHA-change). Gated only by consent + opt-in toggle; *when* to
+    /// send is the caller's decision (the scheduler handles the 24h cadence
+    /// by setting `nextRun`; startup handles the SHA-change shortcut).
+    func maybeSend() async {
+        let storage = Storage.shared
+        guard storage.telemetryConsentDecisionMade.value else { return }
+        guard storage.telemetryEnabled.value else { return }
+        await send()
+    }
+
+    /// The exact payload that would be POSTed right now. Pure function: useful
+    /// both for sending and for the "What's sent" preview UI.
+    func buildPayload() -> [String: Any] {
+        let storage = Storage.shared
+        let info = Bundle.main.infoDictionary ?? [:]
+        let bd = BuildDetails.default
+
+        var payload: [String: Any] = [:]
+
+        if let v = info["CFBundleShortVersionString"] as? String { payload["appVersion"] = v }
+
+        // Date-only (YYYY-MM-DD) prefix of the ISO8601 build date. Time is
+        // dropped to keep the payload to a low-resolution build identifier.
+        if let date = bd.buildDateString, date.count >= 10 {
+            payload["buildDate"] = String(date.prefix(10))
+        }
+
+        // Only signal we can actually verify: receipt-based TestFlight check.
+        // macCatalyst is covered by `platform`; simulator is covered by the
+        // `Simulator …` prefix on `device`. Anything else is a local Xcode
+        // build (browser-build), which is just "isTestFlight == false".
+        payload["isTestFlight"] = bd.isTestFlightBuild()
+
+        payload["instance"] = AppConstants.appInstanceId
+
+        if let idfv = UIDevice.current.identifierForVendor?.uuidString {
+            payload["idfv"] = idfv
+        }
+
+        payload["device"] = Self.hardwareIdentifier()
+        payload["platform"] = Self.detectPlatform()
+        payload["osVersion"] = UIDevice.current.systemVersion
+
+        let dexcomUser = storage.shareUserName.value.trimmingCharacters(in: .whitespacesAndNewlines)
+        payload["usesDexcom"] = !dexcomUser.isEmpty
+
+        let nsURLRaw = storage.url.value.trimmingCharacters(in: .whitespacesAndNewlines)
+        payload["usesNightscout"] = !nsURLRaw.isEmpty
+
+        // Which closed-loop app is being followed (Loop / Trio / …). Field
+        // omitted when device hasn't been detected yet; absence is the signal.
+        let device = storage.device.value.trimmingCharacters(in: .whitespacesAndNewlines)
+        if !device.isEmpty {
+            payload["followingApp"] = device
+        }
+
+        payload["backgroundRefreshMethod"] = storage.backgroundRefreshType.value.rawValue
+
+        // Selected user-preference fields. Picked for product-decision value;
+        // none reveal personal or health information.
+        payload["units"] = storage.units.value // "mg/dL" / "mmol/L"
+        payload["remoteType"] = storage.remoteType.value.rawValue // which remote-command path
+        payload["appearanceMode"] = storage.appearanceMode.value.rawValue // light / dark / system
+        payload["contactEnabled"] = storage.contactEnabled.value // Contacts integration on?
+        payload["calendarEnabled"] = !storage.calendarIdentifier.value.isEmpty // calendar selected?
+
+        payload["coldLaunches7d"] = storage.telemetryColdLaunchTimes.value.count
+
+        return payload
+    }
+
+    /// Build payload, POST it, update last-sent state on 2xx. Fire-and-forget;
+    /// errors are logged at debug level only and never surfaced to the UI.
+    func send() async {
+        let storage = Storage.shared
+        let payload = buildPayload()
+        guard let body = try? JSONSerialization.data(withJSONObject: payload, options: []) else {
+            LogManager.shared.log(category: .telemetry, message: "skip send: payload not JSON-serializable", isDebug: true)
+            return
+        }
+
+        var request = URLRequest(url: Self.endpoint)
+        request.httpMethod = "POST"
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.setValue("Bearer \(Self.writeToken)", forHTTPHeaderField: "Authorization")
+        request.httpBody = body
+        request.timeoutInterval = 15
+
+        do {
+            let (_, response) = try await URLSession.shared.data(for: request)
+            guard let http = response as? HTTPURLResponse else {
+                LogManager.shared.log(category: .telemetry, message: "send: non-HTTP response", isDebug: true)
+                return
+            }
+            if (200 ..< 300).contains(http.statusCode) {
+                let now = Date()
+                let sha = BuildDetails.default.commitSha ?? ""
+                storage.telemetryLastSentAt.value = now
+                storage.telemetryLastSentSha.value = sha
+                LogManager.shared.log(category: .telemetry, message: "send ok status=\(http.statusCode)", isDebug: true)
+            } else {
+                LogManager.shared.log(category: .telemetry, message: "send non-2xx status=\(http.statusCode)", isDebug: true)
+            }
+        } catch {
+            LogManager.shared.log(category: .telemetry, message: "send error: \(error.localizedDescription)", isDebug: true)
+        }
+    }
+
+    // MARK: - Helpers
+
+    /// Salted SHA-256, truncated to 16 hex chars (64 bits).
+    static func hashed(_ raw: String) -> String {
+        let canonical = raw.lowercased().trimmingCharacters(in: .whitespacesAndNewlines)
+        let input = Data((salt + canonical).utf8)
+        let digest = SHA256.hash(data: input)
+        return digest.prefix(8).map { String(format: "%02x", $0) }.joined()
+    }
+
+    /// `iPhone15,2`-style identifier from `utsname.machine`. Returns
+    /// `Simulator <SIMULATOR_MODEL_IDENTIFIER>` on the simulator so analysis
+    /// can ignore those rows.
+    static func hardwareIdentifier() -> String {
+        #if targetEnvironment(simulator)
+            let env = ProcessInfo.processInfo.environment["SIMULATOR_MODEL_IDENTIFIER"] ?? "Unknown"
+            return "Simulator \(env)"
+        #else
+            var sys = utsname()
+            uname(&sys)
+            let mirror = Mirror(reflecting: sys.machine)
+            let machine = mirror.children.reduce(into: "") { acc, child in
+                guard let v = child.value as? Int8, v != 0 else { return }
+                acc.append(Character(UnicodeScalar(UInt8(v))))
+            }
+            return machine.isEmpty ? "Unknown" : machine
+        #endif
+    }
+
+    static func detectPlatform() -> String {
+        #if targetEnvironment(macCatalyst)
+            return "macCatalyst"
+        #else
+            switch UIDevice.current.userInterfaceIdiom {
+            case .pad: return "iPadOS"
+            default: return "iOS"
+            }
+        #endif
+    }
+}
+
+// MARK: - TelemetryPreviewView
+
+/// Renders the exact payload that would be sent right now, with a copy
+/// button. Linked to from the Diagnostics section in Settings and from the
+/// consent sheet's "See exactly what's sent" button.
+struct TelemetryPreviewView: View {
+    @State private var jsonText: String = ""
+
+    var body: some View {
+        ScrollView {
+            VStack(alignment: .leading, spacing: 12) {
+                Text("Below is the exact JSON object that LoopFollow would send to lf.bjorkert.se right now.")
+                    .font(.subheadline)
+                    .foregroundColor(.secondary)
+                    .padding(.bottom, 4)
+
+                Text(jsonText)
+                    .font(.system(.footnote, design: .monospaced))
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .textSelection(.enabled)
+                    .padding(8)
+                    .background(Color(.secondarySystemBackground))
+                    .cornerRadius(6)
+
+                Button {
+                    UIPasteboard.general.string = jsonText
+                } label: {
+                    Label("Copy JSON", systemImage: "doc.on.doc")
+                }
+                .buttonStyle(.bordered)
+            }
+            .padding()
+        }
+        .navigationTitle("What's sent")
+        .navigationBarTitleDisplayMode(.inline)
+        .onAppear { jsonText = Self.renderPayload() }
+    }
+
+    private static func renderPayload() -> String {
+        let payload = TelemetryClient.shared.buildPayload()
+        guard let data = try? JSONSerialization.data(withJSONObject: payload, options: [.prettyPrinted, .sortedKeys]),
+              let text = String(data: data, encoding: .utf8)
+        else { return "Unable to render payload." }
+        return text
+    }
+}
+
+// MARK: - TelemetryPrivacyView
+
+/// In-app summary so users don't have to leave the app to understand
+/// what is collected.
+struct TelemetryPrivacyView: View {
+    var body: some View {
+        ScrollView {
+            VStack(alignment: .leading, spacing: 16) {
+                Group {
+                    Text("Endpoint")
+                        .font(.headline)
+                    Text("Once a day (or after a new build), the app sends a small JSON object to https://lf.bjorkert.se. The endpoint is self-hosted by the maintainer; no third-party analytics service is involved.")
+                }
+
+                Group {
+                    Text("What is sent")
+                        .font(.headline)
+                    Text("App version, build date, whether this is a TestFlight build, the install instance number, an Apple-supplied per-vendor identifier (IDFV) that resets when all this developer's apps are removed from the device, the hardware identifier (e.g. iPhone15,2), and iOS version. Whether Nightscout and Dexcom are configured (yes/no — no URLs or usernames). Which app you're following (Loop, Trio, etc), if known. A small set of preference flags (units, appearance mode, calendar/contact integration enabled, remote-command type, background refresh method). The full JSON is visible under Diagnostics → What's sent.")
+                }
+
+                Group {
+                    Text("What stays on your device")
+                        .font(.headline)
+                    Text("All glucose, insulin, and carb data. Your Nightscout URL and API token. Your Dexcom credentials. Remote-command secrets and APNS keys. Time zone. Location data. Logs — these are never sent automatically; the Settings → Logs sharing flow is unchanged and only triggered by you.")
+                }
+
+                Group {
+                    Text("Frequency")
+                        .font(.headline)
+                    Text("Once every 24 hours, plus once after installing a new build. The check runs in the background while the app is active or refreshing in the background.")
+                }
+
+                Group {
+                    Text("Opt out")
+                        .font(.headline)
+                    Text("Use the Send anonymous usage stats toggle above. Turning it off is immediate and persistent.")
+                }
+
+                Group {
+                    Text("Source")
+                        .font(.headline)
+                    Text("LoopFollow/Helpers/Telemetry.swift on GitHub.")
+                }
+            }
+            .padding()
+        }
+        .navigationTitle("Privacy")
+        .navigationBarTitleDisplayMode(.inline)
+    }
+}
+
+// MARK: - TelemetryConsentView
+
+/// One-time prompt shown the first time the app foregrounds after install
+/// or after an update from a pre-telemetry version.
+struct TelemetryConsentView: View {
+    @Environment(\.dismiss) private var dismiss
+
+    var body: some View {
+        NavigationView {
+            ScrollView {
+                VStack(alignment: .leading, spacing: 16) {
+                    Text("You can choose to share anonymous information with the developers to help improve LoopFollow—such as app and iOS version, device type, which app you're following, and a few settings. Your health data, credentials, time zone, and logs remain on your device.")
+
+                    Text("You can change this any time in Settings → Diagnostics.")
+                        .font(.subheadline)
+                        .foregroundColor(.secondary)
+
+                    NavigationLink {
+                        TelemetryPreviewView()
+                    } label: {
+                        Label("See exactly what's sent", systemImage: "doc.text.magnifyingglass")
+                    }
+                    .padding(.top, 4)
+                }
+                .padding()
+            }
+            .navigationTitle("Help us help you!")
+            .navigationBarTitleDisplayMode(.inline)
+            .safeAreaInset(edge: .bottom) {
+                VStack(spacing: 8) {
+                    Button {
+                        Storage.shared.telemetryEnabled.value = true
+                        Storage.shared.telemetryConsentDecisionMade.value = true
+                        // Fire the inaugural ping immediately, then start the
+                        // 24h scheduled cadence ticking from that send.
+                        Task.detached {
+                            await TelemetryClient.shared.maybeSend()
+                            TelemetryClient.shared.scheduleRecurring()
+                        }
+                        dismiss()
+                    } label: {
+                        Text("Yes, send anonymous stats")
+                            .frame(maxWidth: .infinity)
+                    }
+                    .buttonStyle(.borderedProminent)
+
+                    Button {
+                        Storage.shared.telemetryEnabled.value = false
+                        Storage.shared.telemetryConsentDecisionMade.value = true
+                        dismiss()
+                    } label: {
+                        Text("No thanks")
+                            .frame(maxWidth: .infinity)
+                    }
+                    .buttonStyle(.bordered)
+                }
+                .padding(.horizontal)
+                .padding(.bottom, 12)
+                .background(.bar)
+            }
+        }
+    }
+}
diff --git a/LoopFollow/LiveActivity/APNSClient.swift b/LoopFollow/LiveActivity/APNSClient.swift
index 8755b1b27..d4871f067 100644
--- a/LoopFollow/LiveActivity/APNSClient.swift
+++ b/LoopFollow/LiveActivity/APNSClient.swift
@@ -101,9 +101,135 @@ class APNSClient {
         }
     }
 
+    // MARK: - Send Live Activity Start (push-to-start, iOS 17.2+)
+
+    enum PushToStartResult {
+        case success
+        case rateLimited
+        case tokenInvalid
+        case failed
+    }
+
+    func sendLiveActivityStart(
+        pushToStartToken: String,
+        attributesTitle: String,
+        state: GlucoseLiveActivityAttributes.ContentState,
+        staleDate: Date,
+    ) async -> PushToStartResult {
+        guard let jwt = JWTManager.shared.getOrGenerateJWT(keyId: lfKeyId, teamId: lfTeamId, apnsKey: lfApnsKey) else {
+            LogManager.shared.log(category: .apns, message: "APNs failed to generate JWT for Live Activity push-to-start")
+            return .failed
+        }
+
+        let payload = buildStartPayload(attributesTitle: attributesTitle, state: state, staleDate: staleDate)
+
+        let host = apnsHost
+        guard let url = URL(string: "\(host)/3/device/\(pushToStartToken)") else {
+            LogManager.shared.log(category: .apns, message: "APNs invalid URL (push-to-start)", isDebug: true)
+            return .failed
+        }
+
+        let environment = BuildDetails.default.isTestFlightBuild() ? "production" : "sandbox"
+        LogManager.shared.log(
+            category: .apns,
+            message: "APNs push-to-start sending host=\(host) env=\(environment) tokenTail=…\(String(pushToStartToken.suffix(8)))"
+        )
+
+        var request = URLRequest(url: url)
+        request.httpMethod = "POST"
+        request.setValue("bearer \(jwt)", forHTTPHeaderField: "authorization")
+        request.setValue("application/json", forHTTPHeaderField: "content-type")
+        request.setValue("\(bundleID).push-type.liveactivity", forHTTPHeaderField: "apns-topic")
+        request.setValue("liveactivity", forHTTPHeaderField: "apns-push-type")
+        request.setValue("10", forHTTPHeaderField: "apns-priority")
+        // 10-minute expiry — long enough to survive a brief connectivity gap
+        // while the glucose reading in the payload is still clinically meaningful.
+        // The stale date (8 h) is too generous: delivering a start with hours-old
+        // glucose data is worse than not starting at all.
+        request.setValue("\(Int(Date().timeIntervalSince1970) + 10 * 60)", forHTTPHeaderField: "apns-expiration")
+        // Collapse key prevents duplicate LA creation if two sends race (e.g., a
+        // refresh tick and a user-initiated restart overlap).
+        request.setValue("\(bundleID).la.start", forHTTPHeaderField: "apns-collapse-id")
+        request.httpBody = payload
+
+        do {
+            let (data, response) = try await URLSession.shared.data(for: request)
+            guard let httpResponse = response as? HTTPURLResponse else {
+                LogManager.shared.log(category: .apns, message: "APNs push-to-start: no HTTP response")
+                return .failed
+            }
+            switch httpResponse.statusCode {
+            case 200:
+                LogManager.shared.log(category: .apns, message: "APNs push-to-start sent successfully")
+                return .success
+            case 403:
+                JWTManager.shared.invalidateCache()
+                LogManager.shared.log(category: .apns, message: "APNs push-to-start JWT rejected (403) — token cache cleared")
+                return .failed
+            case 404, 410:
+                // Push-to-start token rotated or invalid — caller should clear stored token
+                // so the next pushToStartTokenUpdates delivery overwrites it.
+                let reason = httpResponse.statusCode == 410 ? "expired (410)" : "not found (404)"
+                LogManager.shared.log(category: .apns, message: "APNs push-to-start token \(reason) — clearing stored token")
+                return .tokenInvalid
+            case 429:
+                LogManager.shared.log(category: .apns, message: "APNs push-to-start rate limited (429)")
+                return .rateLimited
+            default:
+                let responseBody = String(data: data, encoding: .utf8) ?? "empty"
+                LogManager.shared.log(category: .apns, message: "APNs push-to-start failed status=\(httpResponse.statusCode) body=\(responseBody)")
+                return .failed
+            }
+        } catch {
+            LogManager.shared.log(category: .apns, message: "APNs push-to-start error: \(error.localizedDescription)")
+            return .failed
+        }
+    }
+
+    // alert with empty title/body + interruption-level: passive is what
+    // keeps both phone and watch silent during adoption — iOS drops the
+    // start payload entirely if alert is missing, so the keys must be
+    // present even though the strings are empty.
+    private func buildStartPayload(
+        attributesTitle: String,
+        state: GlucoseLiveActivityAttributes.ContentState,
+        staleDate: Date,
+    ) -> Data? {
+        guard let contentStateDict = contentStateDictionary(state: state) else { return nil }
+
+        let payload: [String: Any] = [
+            "aps": [
+                "timestamp": Int(Date().timeIntervalSince1970),
+                "event": "start",
+                "stale-date": Int(staleDate.timeIntervalSince1970),
+                "attributes-type": "GlucoseLiveActivityAttributes",
+                "attributes": ["title": attributesTitle],
+                "content-state": contentStateDict,
+                "alert": [
+                    "title": "",
+                    "body": "",
+                ],
+                "interruption-level": "passive",
+            ],
+        ]
+        return try? JSONSerialization.data(withJSONObject: payload)
+    }
+
     // MARK: - Payload Builder
 
     private func buildPayload(state: GlucoseLiveActivityAttributes.ContentState) -> Data? {
+        guard let contentState = contentStateDictionary(state: state) else { return nil }
+        let payload: [String: Any] = [
+            "aps": [
+                "timestamp": Int(Date().timeIntervalSince1970),
+                "event": "update",
+                "content-state": contentState,
+            ],
+        ]
+        return try? JSONSerialization.data(withJSONObject: payload)
+    }
+
+    private func contentStateDictionary(state: GlucoseLiveActivityAttributes.ContentState) -> [String: Any]? {
         let snapshot = state.snapshot
 
         var snapshotDict: [String: Any] = [
@@ -139,22 +265,12 @@ class APNSClient {
         if let minBgMgdl = snapshot.minBgMgdl { snapshotDict["minBgMgdl"] = minBgMgdl }
         if let maxBgMgdl = snapshot.maxBgMgdl { snapshotDict["maxBgMgdl"] = maxBgMgdl }
 
-        let contentState: [String: Any] = [
+        return [
             "snapshot": snapshotDict,
             "seq": state.seq,
             "reason": state.reason,
             "producedAt": state.producedAt.timeIntervalSince1970,
         ]
-
-        let payload: [String: Any] = [
-            "aps": [
-                "timestamp": Int(Date().timeIntervalSince1970),
-                "event": "update",
-                "content-state": contentState,
-            ],
-        ]
-
-        return try? JSONSerialization.data(withJSONObject: payload)
     }
 }
 
diff --git a/LoopFollow/LiveActivity/APNsCredentialValidator.swift b/LoopFollow/LiveActivity/APNsCredentialValidator.swift
new file mode 100644
index 000000000..c080dbee8
--- /dev/null
+++ b/LoopFollow/LiveActivity/APNsCredentialValidator.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)
+    }
+}
diff --git a/LoopFollow/LiveActivity/AppGroupID.swift b/LoopFollow/LiveActivity/AppGroupID.swift
index 5eb1187b8..2ce09159c 100644
--- a/LoopFollow/LiveActivity/AppGroupID.swift
+++ b/LoopFollow/LiveActivity/AppGroupID.swift
@@ -58,6 +58,7 @@ enum AppGroupID {
             ".WidgetExtension",
             ".Widgets",
             ".WidgetsExtension",
+            ".watchkitapp",
             ".Watch",
             ".WatchExtension",
             ".CarPlay",
diff --git a/LoopFollow/LiveActivity/GlucoseSnapshot.swift b/LoopFollow/LiveActivity/GlucoseSnapshot.swift
index c5f5fffcc..5a3f38782 100644
--- a/LoopFollow/LiveActivity/GlucoseSnapshot.swift
+++ b/LoopFollow/LiveActivity/GlucoseSnapshot.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
     }
 }
 
diff --git a/LoopFollow/LiveActivity/GlucoseSnapshotBuilder.swift b/LoopFollow/LiveActivity/GlucoseSnapshotBuilder.swift
index 40ff076af..ca1e549ca 100644
--- a/LoopFollow/LiveActivity/GlucoseSnapshotBuilder.swift
+++ b/LoopFollow/LiveActivity/GlucoseSnapshotBuilder.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,
         )
     }
diff --git a/LoopFollow/LiveActivity/GlucoseSnapshotStore.swift b/LoopFollow/LiveActivity/GlucoseSnapshotStore.swift
index 7951e122a..17569c46f 100644
--- a/LoopFollow/LiveActivity/GlucoseSnapshotStore.swift
+++ b/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,7 +20,7 @@ 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()
@@ -25,23 +28,29 @@ final class GlucoseSnapshotStore {
                 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
         }
     }
diff --git a/LoopFollow/LiveActivity/LAAppGroupSettings.swift b/LoopFollow/LiveActivity/LAAppGroupSettings.swift
index 6359fe55e..1293fcfa9 100644
--- a/LoopFollow/LiveActivity/LAAppGroupSettings.swift
+++ b/LoopFollow/LiveActivity/LAAppGroupSettings.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
+    }
 }
diff --git a/LoopFollow/LiveActivity/LiveActivityManager.swift b/LoopFollow/LiveActivity/LiveActivityManager.swift
index 180fdc1c1..b62c64ffe 100644
--- a/LoopFollow/LiveActivity/LiveActivityManager.swift
+++ b/LoopFollow/LiveActivity/LiveActivityManager.swift
@@ -11,6 +11,18 @@ import UIKit
 import UserNotifications
 
 // Live Activity manager for LoopFollow.
+//
+// iOS 17.2+:        every LA creation (initial start, renewal, forced
+//                   restart) goes through APNs push-to-start. Updates
+//                   ride the same APNs transport. One transport, one
+//                   credential failure mode that surfaces in settings.
+//
+// iOS 16.6 – 17.1:  legacy Activity.request() for everything;
+//                   renewal-failed notification when backgrounded.
+//                   The entry-point `if #available(iOS 17.2, *)` checks
+//                   isolate every iOS 17.2 code path, so the legacy
+//                   helpers can be deleted in one commit when the
+//                   deployment target reaches 17.2.
 
 final class LiveActivityManager {
     static let shared = LiveActivityManager()
@@ -39,6 +51,130 @@ final class LiveActivityManager {
             name: .backgroundAudioFailed,
             object: nil,
         )
+        startPushToStartTokenObservation()
+        startActivityUpdatesObservation()
+    }
+
+    // MARK: - Push-to-start observation (iOS 17.2+)
+
+    /// Observes the type-level push-to-start token (iOS 17.2+) and persists it.
+    /// The token survives app relaunches but is reissued by iOS periodically or when
+    /// the user toggles LA permissions — each new delivery overwrites the stored value.
+    private func startPushToStartTokenObservation() {
+        if #available(iOS 17.2, *) {
+            pushToStartObservationTask?.cancel()
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] pushToStartTokenUpdates observation starting (iOS 17.2+)"
+            )
+            pushToStartObservationTask = Task {
+                var deliveries = 0
+                for await tokenData in Activity<GlucoseLiveActivityAttributes>.pushToStartTokenUpdates {
+                    deliveries += 1
+                    let token = tokenData.map { String(format: "%02x", $0) }.joined()
+                    let previousTail = Storage.shared.laPushToStartToken.value.isEmpty
+                        ? "nil"
+                        : String(Storage.shared.laPushToStartToken.value.suffix(8))
+                    let tail = String(token.suffix(8))
+                    let changed = tail != previousTail
+                    Storage.shared.laPushToStartToken.value = token
+                    LogManager.shared.log(
+                        category: .general,
+                        message: "[LA] push-to-start token received #\(deliveries) token=…\(tail) (prev=…\(previousTail))\(changed ? " CHANGED" : " same")"
+                    )
+                }
+                LogManager.shared.log(
+                    category: .general,
+                    message: "[LA] pushToStartTokenUpdates stream ended after \(deliveries) deliveries — no further tokens will arrive"
+                )
+            }
+        } else {
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] pushToStartTokenUpdates unavailable (iOS <17.2) — push-to-start will never fire"
+            )
+        }
+    }
+
+    /// Observes new Activity creations. When an activity is started by
+    /// push-to-start (iOS 17.2+), the app discovers it through this stream and
+    /// adopts it via the same bind/update path as an app-initiated start.
+    private func startActivityUpdatesObservation() {
+        activityUpdatesObservationTask?.cancel()
+        LogManager.shared.log(
+            category: .general,
+            message: "[LA] activityUpdates observation starting"
+        )
+        activityUpdatesObservationTask = Task { [weak self] in
+            var deliveries = 0
+            for await activity in Activity<GlucoseLiveActivityAttributes>.activityUpdates {
+                deliveries += 1
+                let incomingID = activity.id
+                LogManager.shared.log(
+                    category: .general,
+                    message: "[LA] activityUpdates delivery #\(deliveries) id=\(incomingID) — dispatching to MainActor"
+                )
+                await MainActor.run {
+                    self?.adoptPushToStartActivity(activity)
+                }
+            }
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] activityUpdates stream ended after \(deliveries) deliveries — push-to-start adoption will no longer work until app relaunch"
+            )
+        }
+    }
+
+    @MainActor
+    private func adoptPushToStartActivity(_ activity: Activity<GlucoseLiveActivityAttributes>) {
+        // Skip if it's the activity we already track (app-initiated path binds it directly).
+        if current?.id == activity.id {
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] activityUpdates: ignoring own activity id=\(activity.id) (already current)"
+            )
+            return
+        }
+
+        let adoptDelay = lastPushToStartSuccessAt.map { Int(Date().timeIntervalSince($0)) }
+        let delayDescription = adoptDelay.map { "\($0)s after last push-to-start success" } ?? "no prior push-to-start this session"
+        let totalActivities = Activity<GlucoseLiveActivityAttributes>.activities.count
+        let staleDate = activity.content.staleDate
+        let staleDesc = staleDate.map { String(format: "%.0f", $0.timeIntervalSinceNow) + "s" } ?? "nil"
+        let incomingSeq = activity.content.state.seq
+        LogManager.shared.log(
+            category: .general,
+            message: "[LA] adopt: id=\(activity.id) seq=\(incomingSeq) staleIn=\(staleDesc) totalActivities=\(totalActivities) (\(delayDescription))"
+        )
+        lastPushToStartSuccessAt = nil
+        pushToStartSendsWithoutAdoption = 0
+        // The new LA is confirmed — clear any post-send backoff so a legitimate
+        // near-term renewal isn't silently blocked by the 5-minute base interval.
+        Storage.shared.laPushToStartBackoff.value = 0
+
+        // If we already have a current activity and this is a different one, it's likely
+        // the new push-to-start LA replacing an old one. End the old, then bind the new.
+        if let old = current, old.id != activity.id {
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] activityUpdates: replacing old=\(old.id) with new=\(activity.id)"
+            )
+            let oldActivity = old
+            Task {
+                await oldActivity.end(nil, dismissalPolicy: .immediate)
+            }
+        } else {
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] activityUpdates: adopting new activity id=\(activity.id) (no prior current)"
+            )
+        }
+        // Fresh deadline — push-to-start-initiated LAs reset the 8-hour clock.
+        Storage.shared.laRenewBy.value = Date().timeIntervalSince1970 + LiveActivityManager.renewalThreshold
+        Storage.shared.laRenewalFailed.value = false
+        cancelRenewalFailedNotification()
+        dismissedByUser = false
+        bind(to: activity, logReason: "push-to-start-adopt")
     }
 
     /// Fires before the app loses focus (lock screen, home button, etc.).
@@ -87,12 +223,18 @@ final class LiveActivityManager {
 
     @objc private func handleDidBecomeActive() {
         guard Storage.shared.laEnabled.value else { return }
-        if skipNextDidBecomeActive {
-            LogManager.shared.log(category: .general, message: "[LA] didBecomeActive: skipped (handleForeground owns restart)", isDebug: true)
-            skipNextDidBecomeActive = false
+        let appState = UIApplication.shared.applicationState.rawValue
+        let existing = Activity<GlucoseLiveActivityAttributes>.activities.count
+        if pendingForegroundRestart {
+            pendingForegroundRestart = false
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] didBecomeActive: running deferred foreground restart (appState=\(appState), activities=\(existing))"
+            )
+            performForegroundRestart()
             return
         }
-        LogManager.shared.log(category: .general, message: "[LA] didBecomeActive: calling startFromCurrentState, dismissedByUser=\(dismissedByUser)", isDebug: true)
+        LogManager.shared.log(category: .general, message: "[LA] didBecomeActive: startFromCurrentState (appState=\(appState), activities=\(existing), current=\(current?.id ?? "nil"), dismissedByUser=\(dismissedByUser))", isDebug: true)
         Task { @MainActor in
             self.startFromCurrentState()
         }
@@ -105,24 +247,50 @@ final class LiveActivityManager {
         let renewBy = Storage.shared.laRenewBy.value
         let now = Date().timeIntervalSince1970
         let overlayIsShowing = renewBy > 0 && now >= renewBy - LiveActivityManager.renewalWarning
+        let stuckSends = pushToStartSendsWithoutAdoption
+        let pushToStartLooksStuck = stuckSends >= LiveActivityManager.pushToStartForceRestartThreshold
+        let appState = UIApplication.shared.applicationState.rawValue
+        let existing = Activity<GlucoseLiveActivityAttributes>.activities.count
 
         LogManager.shared.log(
             category: .general,
-            message: "[LA] foreground: renewalFailed=\(renewalFailed), overlayShowing=\(overlayIsShowing), current=\(current?.id ?? "nil"), dismissedByUser=\(dismissedByUser), renewBy=\(renewBy), now=\(now)"
+            message: "[LA] foreground: appState=\(appState), activities=\(existing), renewalFailed=\(renewalFailed), overlayShowing=\(overlayIsShowing), current=\(current?.id ?? "nil"), dismissedByUser=\(dismissedByUser), renewBy=\(renewBy), now=\(now), pushToStartSendsWithoutAdoption=\(stuckSends)"
         )
 
-        guard renewalFailed || overlayIsShowing else {
+        guard renewalFailed || overlayIsShowing || pushToStartLooksStuck else {
             LogManager.shared.log(category: .general, message: "[LA] foreground: no action needed (not in renewal window)")
             return
         }
 
+        if pushToStartLooksStuck {
+            // Reset the counter now so we don't re-trigger on every foreground
+            // entry until the next round of silently-failed sends actually
+            // builds up again. The restart itself ends the current LA and
+            // starts a fresh one, which (per Apple's docs) should cause iOS to
+            // emit a new pushToStartToken — the workaround for FB21158660.
+            pushToStartSendsWithoutAdoption = 0
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] foreground: push-to-start looks stuck (sendsWithoutAdoption=\(stuckSends) ≥ \(LiveActivityManager.pushToStartForceRestartThreshold)) — forcing local restart to nudge token rotation"
+            )
+        } else {
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] ending stale LA and restarting (renewalFailed=\(renewalFailed), overlayShowing=\(overlayIsShowing))"
+            )
+        }
+
+        // willEnterForegroundNotification fires before the scene reaches
+        // foregroundActive — Activity.request() returns `visibility` during
+        // this window. Defer the actual restart to didBecomeActive.
+        pendingForegroundRestart = true
         LogManager.shared.log(
             category: .general,
-            message: "[LA] ending stale LA and restarting (renewalFailed=\(renewalFailed), overlayShowing=\(overlayIsShowing))"
+            message: "[LA] foreground: scheduling restart on next didBecomeActive"
         )
+    }
 
-        skipNextDidBecomeActive = true
-
+    private func performForegroundRestart() {
         // Mark restart intent BEFORE clearing storage flags, so any late .dismissed
         // from the old activity is never misclassified as a user swipe.
         endingForRestart = true
@@ -231,6 +399,25 @@ final class LiveActivityManager {
     static let renewalWarning: TimeInterval = 30 * 60
     static let extensionLivenessGrace: TimeInterval = 15 * 60
 
+    /// Base backoff after a 429 for push-to-start; doubled on each subsequent 429,
+    /// capped at `pushToStartMaxBackoff`. Reset to base after a successful send.
+    private static let pushToStartBaseBackoff: TimeInterval = 300 // 5 min
+    private static let pushToStartMaxBackoff: TimeInterval = 3600 // 60 min
+    /// When a successful APNs push-to-start does not result in an `activityUpdates`
+    /// adoption, count those orphaned sends. After this threshold, the next
+    /// foreground entry forces a local restart to nudge iOS to issue a new
+    /// pushToStartToken — Apple FB21158660 workaround. Set to 4 (not 2) to avoid
+    /// false positives on slow connections where the activityUpdates delivery lags.
+    private static let pushToStartForceRestartThreshold: Int = 4
+    /// Polling timeout for the push-to-start token to arrive after a fresh install.
+    /// `pushToStartTokenUpdates` typically delivers within a couple of seconds.
+    private static let pushToStartTokenWaitTimeout: TimeInterval = 5
+    private static let pushToStartTokenPollInterval: TimeInterval = 0.5
+    /// Delay before the single automatic retry when the push-to-start token is not
+    /// yet available after the initial wait. The token is almost always en route
+    /// and arrives within a few seconds of the first request.
+    private static let pushToStartTokenRetryDelay: TimeInterval = 10
+
     private(set) var current: Activity<GlucoseLiveActivityAttributes>?
     private var stateObserverTask: Task<Void, Never>?
     private var updateTask: Task<Void, Never>?
@@ -249,18 +436,79 @@ final class LiveActivityManager {
     /// a .dismissed delivery triggered by our own end() call is never misclassified as a
     /// user swipe — regardless of the order in which the MainActor executes the two writes.
     private var endingForRestart = false
-    /// Set by handleForeground() when it takes ownership of the restart sequence.
-    /// Prevents handleDidBecomeActive() from racing with an in-flight end+restart.
-    private var skipNextDidBecomeActive = false
+    /// Set by handleForeground() when the renewal window has been detected.
+    /// The actual end+restart is run from handleDidBecomeActive() because
+    /// Activity.request() returns `visibility` during willEnterForeground.
+    private var pendingForegroundRestart = false
+    /// Observes `pushToStartTokenUpdates` (iOS 17.2+) and persists the token.
+    /// Long-lived — started once at init and never cancelled.
+    private var pushToStartObservationTask: Task<Void, Never>?
+    /// Observes `Activity<>.activityUpdates` so activities started out-of-band
+    /// (push-to-start) are adopted automatically.
+    private var activityUpdatesObservationTask: Task<Void, Never>?
+    /// Timestamp of the last successful push-to-start APNs dispatch. Used to log
+    /// the delay until iOS delivers the new activity via `activityUpdates`. If
+    /// adoption never happens, a growing gap here is the fingerprint.
+    private var lastPushToStartSuccessAt: Date?
+    /// Number of consecutive successful push-to-start APNs sends that have NOT
+    /// been followed by an `activityUpdates` adoption. When this reaches
+    /// `pushToStartForceRestartThreshold`, the next foreground entry forces a
+    /// local restart even outside the renewal window — ending the existing LA
+    /// and starting a fresh one is the only known way to nudge iOS to issue a
+    /// new `pushToStartToken` when the current one has gone silent
+    /// (Apple FB21158660).
+    private var pushToStartSendsWithoutAdoption: Int = 0
 
     // MARK: - Public API
 
+    @MainActor
     func startIfNeeded() {
-        guard ActivityAuthorizationInfo().areActivitiesEnabled else {
+        let authorized = ActivityAuthorizationInfo().areActivitiesEnabled
+        let existingCount = Activity<GlucoseLiveActivityAttributes>.activities.count
+        LogManager.shared.log(
+            category: .general,
+            message: "[LA] startIfNeeded: authorized=\(authorized), activities=\(existingCount), current=\(current?.id ?? "nil"), dismissedByUser=\(dismissedByUser), laEnabled=\(Storage.shared.laEnabled.value)",
+            isDebug: true
+        )
+        guard authorized else {
             LogManager.shared.log(category: .general, message: "Live Activity not authorized")
             return
         }
 
+        if #available(iOS 17.2, *) {
+            // iOS 17.2+ uses push-to-start for every creation path. If an
+            // activity is already running and not stale we adopt/reuse it
+            // (covers warm starts where the LA survived a relaunch); only
+            // truly new starts dispatch APNs.
+            if let existing = Activity<GlucoseLiveActivityAttributes>.activities.first {
+                let renewBy = Storage.shared.laRenewBy.value
+                let now = Date().timeIntervalSince1970
+                let staleDatePassed = existing.content.staleDate.map { $0 <= Date() } ?? false
+                let inRenewalWindow = renewBy > 0 && now >= renewBy - LiveActivityManager.renewalWarning
+                let needsRestart = Storage.shared.laRenewalFailed.value || inRenewalWindow || staleDatePassed
+                if !needsRestart {
+                    bind(to: existing, logReason: "reuse")
+                    Storage.shared.laRenewalFailed.value = false
+                    return
+                }
+                LogManager.shared.log(
+                    category: .general,
+                    message: "[LA] existing activity is stale on startIfNeeded (iOS 17.2+) — push-to-start replace (staleDatePassed=\(staleDatePassed), inRenewalWindow=\(inRenewalWindow))"
+                )
+                attemptPushToStartCreate(reason: "user-start", oldActivity: existing)
+                return
+            }
+            attemptPushToStartCreate(reason: "user-start", oldActivity: nil)
+        } else {
+            startIfNeededLegacy()
+        }
+    }
+
+    /// Pre-17.2 path (iOS 16.6 – 17.1). Identical to dev's `startIfNeeded` —
+    /// Activity.request() for everything. Removable when the deployment target
+    /// reaches 17.2.
+    @MainActor
+    private func startIfNeededLegacy() {
         if let existing = Activity<GlucoseLiveActivityAttributes>.activities.first {
             // Before reusing, check whether this activity needs a restart. This covers cold
             // starts (app was killed while the overlay was showing — willEnterForeground is
@@ -287,7 +535,7 @@ final class LiveActivityManager {
 
                 Task {
                     await existing.end(nil, dismissalPolicy: .immediate)
-                    await MainActor.run { self.startIfNeeded() }
+                    await MainActor.run { self.startIfNeededLegacy() }
                 }
                 return
             }
@@ -300,9 +548,6 @@ final class LiveActivityManager {
         do {
             let attributes = GlucoseLiveActivityAttributes(title: "LoopFollow")
 
-            // Prefer a freshly built snapshot so all extended fields are populated.
-            // Fall back to the persisted store (covers cold-start with real data),
-            // then to a zero seed (true first-ever launch with no data yet).
             let provider = StorageCurrentGlucoseStateProvider()
             let seedSnapshot = GlucoseSnapshotBuilder.build(from: provider)
                 ?? GlucoseSnapshotStore.shared.load()
@@ -335,7 +580,12 @@ final class LiveActivityManager {
             Storage.shared.laRenewalFailed.value = false
             LogManager.shared.log(category: .general, message: "Live Activity started id=\(activity.id)")
         } catch {
-            LogManager.shared.log(category: .general, message: "Live Activity failed to start: \(error)")
+            let ns = error as NSError
+            let scene = isAppVisibleForLiveActivityStart()
+            LogManager.shared.log(
+                category: .general,
+                message: "Live Activity failed to start: \(error) domain=\(ns.domain) code=\(ns.code) — authorized=\(ActivityAuthorizationInfo().areActivitiesEnabled), sceneActive=\(scene), activities=\(Activity<GlucoseLiveActivityAttributes>.activities.count)"
+            )
         }
     }
 
@@ -344,6 +594,10 @@ final class LiveActivityManager {
     /// Does not clear laEnabled — the user's preference is preserved for relaunch.
     func endOnTerminate() {
         guard let activity = current else { return }
+        // Flag the end as system-initiated so the state observer does not
+        // classify the resulting `.dismissed` as a user swipe (laRenewBy is
+        // cleared below, which would otherwise make pastDeadline=false).
+        endingForRestart = true
         current = nil
         Storage.shared.laRenewBy.value = 0
         LALivenessStore.clear()
@@ -399,9 +653,18 @@ final class LiveActivityManager {
     func forceRestart() {
         guard Storage.shared.laEnabled.value else { return }
         LogManager.shared.log(category: .general, message: "[LA] forceRestart called")
+        // Mark as system-initiated so any residual `.dismissed` delivered from
+        // the cancelled state observer stream cannot flip dismissedByUser=true
+        // and spoil the freshly started LA.
+        endingForRestart = true
         dismissedByUser = false
         Storage.shared.laRenewBy.value = 0
         Storage.shared.laRenewalFailed.value = false
+        // The user explicitly asked for a fresh LA — clear any push-to-start
+        // backoff that would otherwise rate-limit the Restart button silently.
+        Storage.shared.laLastPushToStartAt.value = 0
+        Storage.shared.laPushToStartBackoff.value = 0
+        pushToStartSendsWithoutAdoption = 0
         LALivenessStore.clear()
         cancelRenewalFailedNotification()
         current = nil
@@ -420,6 +683,7 @@ final class LiveActivityManager {
         }
     }
 
+    @MainActor
     func startFromCurrentState(cleanupOrphans: Bool = false) {
         guard Storage.shared.laEnabled.value, !dismissedByUser else { return }
 
@@ -457,8 +721,6 @@ final class LiveActivityManager {
 
     /// Requests a fresh Live Activity to replace the current one when the renewal
     /// deadline has passed, working around Apple's 8-hour maximum LA lifetime.
-    /// The new LA is requested FIRST — the old one is only ended if that succeeds,
-    /// so the user keeps live data if Activity.request() throws.
     /// Returns true if renewal was performed (caller should return early).
     private func renewIfNeeded(snapshot: GlucoseSnapshot) -> Bool {
         guard let oldActivity = current else { return false }
@@ -469,6 +731,27 @@ final class LiveActivityManager {
         let overdueBy = Date().timeIntervalSince1970 - renewBy
         LogManager.shared.log(category: .general, message: "[LA] renewal deadline passed by \(Int(overdueBy))s, requesting new LA")
 
+        if #available(iOS 17.2, *) {
+            // iOS 17.2+: renewal goes through push-to-start. The dispatch hops
+            // to MainActor and returns immediately; adoption (or failure) lands
+            // in the observer. Return true so performRefresh stops processing
+            // this tick.
+            Task { @MainActor [weak self] in
+                self?.attemptPushToStartCreate(reason: "renew", oldActivity: oldActivity, snapshot: snapshot)
+            }
+            return true
+        } else {
+            return attemptLegacyRenewal(snapshot: snapshot, oldActivity: oldActivity)
+        }
+    }
+
+    /// Pre-17.2 renewal (iOS 16.6 – 17.1): foreground Activity.request, mark
+    /// renewal-failed if it throws. Removable when the deployment target
+    /// reaches 17.2.
+    private func attemptLegacyRenewal(
+        snapshot: GlucoseSnapshot,
+        oldActivity: Activity<GlucoseLiveActivityAttributes>
+    ) -> Bool {
         let renewDeadline = Date().addingTimeInterval(LiveActivityManager.renewalThreshold)
         let attributes = GlucoseLiveActivityAttributes(title: "LoopFollow")
 
@@ -515,7 +798,11 @@ final class LiveActivityManager {
             // Renewal failed — deadline was never written, so no rollback needed.
             let isFirstFailure = !Storage.shared.laRenewalFailed.value
             Storage.shared.laRenewalFailed.value = true
-            LogManager.shared.log(category: .general, message: "[LA] renewal failed, keeping existing LA: \(error)")
+            let ns = error as NSError
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] renewal failed, keeping existing LA: \(error) domain=\(ns.domain) code=\(ns.code) — authorized=\(ActivityAuthorizationInfo().areActivitiesEnabled), activities=\(Activity<GlucoseLiveActivityAttributes>.activities.count)"
+            )
             if isFirstFailure {
                 scheduleRenewalFailedNotification()
             }
@@ -523,6 +810,242 @@ final class LiveActivityManager {
         }
     }
 
+    // MARK: - Push-to-start (iOS 17.2+)
+
+    /// Single creation path for iOS 17.2+. Handles initial start, renewal, and
+    /// forced restart. Verifies token + APNs credentials, applies backoff, then
+    /// dispatches the APNs push-to-start call. The old activity is only ended
+    /// after a confirmed successful send, preserving it if the send fails.
+    /// Adoption is delivered via the `activityUpdates` observer —
+    /// `handlePushToStartResult` only updates backoff/state.
+    @available(iOS 17.2, *)
+    @MainActor
+    private func attemptPushToStartCreate(
+        reason: String,
+        oldActivity: Activity<GlucoseLiveActivityAttributes>?,
+        snapshot: GlucoseSnapshot? = nil
+    ) {
+        // Validate APNs credentials up-front — push-to-start is the ONLY transport
+        // on iOS 17.2+, so missing/invalid creds mean the LA will never display.
+        let keyId = Storage.shared.lfKeyId.value
+        let apnsKey = Storage.shared.lfApnsKey.value
+        guard APNsCredentialValidator.isFullyConfigured(keyId: keyId, apnsKey: apnsKey) else {
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] push-to-start (\(reason)) blocked — APNs credentials missing or invalid (keyId valid=\(APNsCredentialValidator.isValidKeyId(keyId)), apnsKey valid=\(APNsCredentialValidator.isValidApnsKey(apnsKey)))"
+            )
+            scheduleApnsCredentialsMissingNotification()
+            return
+        }
+
+        let now = Date().timeIntervalSince1970
+        let lastAt = Storage.shared.laLastPushToStartAt.value
+        let backoff = Storage.shared.laPushToStartBackoff.value
+        if lastAt > 0, now < lastAt + backoff {
+            let wait = Int(lastAt + backoff - now)
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] push-to-start (\(reason)) rate-limited: next allowed in \(wait)s (backoff=\(Int(backoff))s)"
+            )
+            return
+        }
+
+        // Build snapshot if caller didn't supply one (initial start path).
+        let workingSnapshot: GlucoseSnapshot = {
+            if let snapshot { return snapshot }
+            let provider = StorageCurrentGlucoseStateProvider()
+            return GlucoseSnapshotBuilder.build(from: provider)
+                ?? GlucoseSnapshotStore.shared.load()
+                ?? GlucoseSnapshot(
+                    glucose: 0,
+                    delta: 0,
+                    trend: .unknown,
+                    updatedAt: Date(),
+                    iob: nil,
+                    cob: nil,
+                    projected: nil,
+                    unit: .mgdl,
+                    isNotLooping: false,
+                )
+        }()
+
+        Task { [weak self] in
+            guard let self else { return }
+            await self.dispatchPushToStart(
+                reason: reason,
+                oldActivity: oldActivity,
+                snapshot: workingSnapshot
+            )
+        }
+    }
+
+    @available(iOS 17.2, *)
+    private func dispatchPushToStart(
+        reason: String,
+        oldActivity: Activity<GlucoseLiveActivityAttributes>?,
+        snapshot: GlucoseSnapshot,
+        isRetry: Bool = false
+    ) async {
+        // Wait briefly for the push-to-start token to arrive — covers the
+        // fresh-install case where the user toggles LA on before iOS has
+        // delivered the first token via pushToStartTokenUpdates.
+        var token = Storage.shared.laPushToStartToken.value
+        if token.isEmpty {
+            let pollIntervalNs = UInt64(LiveActivityManager.pushToStartTokenPollInterval * 1_000_000_000)
+            let maxAttempts = Int(LiveActivityManager.pushToStartTokenWaitTimeout / LiveActivityManager.pushToStartTokenPollInterval)
+            for attempt in 1 ... maxAttempts {
+                try? await Task.sleep(nanoseconds: pollIntervalNs)
+                token = Storage.shared.laPushToStartToken.value
+                if !token.isEmpty {
+                    LogManager.shared.log(
+                        category: .general,
+                        message: "[LA] push-to-start (\(reason)) token arrived after \(attempt) poll(s)"
+                    )
+                    break
+                }
+            }
+        }
+        guard !token.isEmpty else {
+            if isRetry {
+                // Token still absent after retry — give up and notify the user.
+                LogManager.shared.log(
+                    category: .general,
+                    message: "[LA] push-to-start (\(reason)) aborted — no token after retry (iOS hasn't issued one yet)"
+                )
+                await MainActor.run { self.schedulePushToStartTokenMissingNotification() }
+            } else {
+                // Token likely en route — wait briefly and make a single automatic
+                // retry before surfacing an error to the user.
+                LogManager.shared.log(
+                    category: .general,
+                    message: "[LA] push-to-start (\(reason)) no token after \(Int(LiveActivityManager.pushToStartTokenWaitTimeout))s — retrying in \(Int(LiveActivityManager.pushToStartTokenRetryDelay))s"
+                )
+                try? await Task.sleep(nanoseconds: UInt64(LiveActivityManager.pushToStartTokenRetryDelay * 1_000_000_000))
+                await dispatchPushToStart(reason: reason, oldActivity: oldActivity, snapshot: snapshot, isRetry: true)
+            }
+            return
+        }
+
+        // Record attempt time up-front so two refresh ticks can't double-fire.
+        await MainActor.run {
+            Storage.shared.laLastPushToStartAt.value = Date().timeIntervalSince1970
+        }
+
+        let nextSeq = await MainActor.run { () -> Int in
+            self.seq += 1
+            return self.seq
+        }
+        let freshSnapshot = snapshot.withRenewalOverlay(false)
+        let state = GlucoseLiveActivityAttributes.ContentState(
+            snapshot: freshSnapshot,
+            seq: nextSeq,
+            reason: reason,
+            producedAt: Date(),
+        )
+        let staleDate = Date().addingTimeInterval(LiveActivityManager.renewalThreshold)
+
+        let tail = String(token.suffix(8))
+        LogManager.shared.log(
+            category: .general,
+            message: "[LA] push-to-start (\(reason)) firing token=…\(tail) seq=\(nextSeq) staleIn=\(Int(staleDate.timeIntervalSinceNow))s"
+        )
+
+        let sendStart = Date()
+        let result = await APNSClient.shared.sendLiveActivityStart(
+            pushToStartToken: token,
+            attributesTitle: "LoopFollow",
+            state: state,
+            staleDate: staleDate,
+        )
+        let elapsedMs = Int(Date().timeIntervalSince(sendStart) * 1000)
+        LogManager.shared.log(
+            category: .general,
+            message: "[LA] push-to-start (\(reason)) APNs round-trip result=\(result) elapsed=\(elapsedMs)ms"
+        )
+
+        // End the old activity only after a confirmed successful send — if the
+        // send fails the user keeps their existing LA rather than losing data
+        // with nothing to replace it.
+        if result == .success, let oldActivity {
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] push-to-start (\(reason)) send succeeded — ending oldActivity=\(oldActivity.id)"
+            )
+            await oldActivity.end(nil, dismissalPolicy: .immediate)
+        }
+
+        await MainActor.run {
+            self.handlePushToStartResult(result, reason: reason)
+        }
+    }
+
+    @available(iOS 17.2, *)
+    @MainActor
+    private func handlePushToStartResult(
+        _ result: APNSClient.PushToStartResult,
+        reason: String
+    ) {
+        switch result {
+        case .success:
+            // Adoption of the new LA runs via `activityUpdates` observation,
+            // which ends the old activity, resets the renewal deadline and
+            // clears `laRenewalFailed`. Apply base backoff so refresh ticks
+            // between now and adoption don't re-fire push-to-start.
+            Storage.shared.laPushToStartBackoff.value = LiveActivityManager.pushToStartBaseBackoff
+            lastPushToStartSuccessAt = Date()
+            pushToStartSendsWithoutAdoption += 1
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] push-to-start (\(reason)) succeeded — awaiting activityUpdates to adopt new LA (backoff=\(Int(LiveActivityManager.pushToStartBaseBackoff))s, sendsWithoutAdoption=\(pushToStartSendsWithoutAdoption))"
+            )
+        case .rateLimited:
+            let currentBackoff = Storage.shared.laPushToStartBackoff.value
+            let next = min(
+                LiveActivityManager.pushToStartMaxBackoff,
+                max(LiveActivityManager.pushToStartBaseBackoff, currentBackoff * 2)
+            )
+            Storage.shared.laPushToStartBackoff.value = next
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] push-to-start (\(reason)) 429 — backoff raised to \(Int(next))s"
+            )
+            if reason == "renew" { markRenewalFailedFromBackground() }
+        case .tokenInvalid:
+            // Clear the stored token so the next `pushToStartTokenUpdates`
+            // delivery overwrites it. Reset backoff — no point holding off
+            // while we wait for iOS to reissue.
+            Storage.shared.laPushToStartToken.value = ""
+            Storage.shared.laPushToStartBackoff.value = 0
+            LogManager.shared.log(
+                category: .general,
+                message: "[LA] push-to-start (\(reason)) token invalid — cleared, awaiting new token"
+            )
+            if reason == "renew" { markRenewalFailedFromBackground() }
+        case .failed:
+            let currentBackoff = Storage.shared.laPushToStartBackoff.value
+            if currentBackoff < LiveActivityManager.pushToStartBaseBackoff {
+                Storage.shared.laPushToStartBackoff.value = LiveActivityManager.pushToStartBaseBackoff
+            }
+            if reason == "renew" { markRenewalFailedFromBackground() }
+        }
+    }
+
+    /// Background renewal couldn't restart the LA via push-to-start (rate-limited,
+    /// invalid token, etc.). Mark the state so the renewal overlay shows on the
+    /// lock screen, and post a local notification on the first failure so the
+    /// user knows to foreground the app.
+    private func markRenewalFailedFromBackground() {
+        let isFirstFailure = !Storage.shared.laRenewalFailed.value
+        Storage.shared.laRenewalFailed.value = true
+        LogManager.shared.log(
+            category: .general,
+            message: "[LA] push-to-start renewal failed — renewal marked failed"
+        )
+        if isFirstFailure {
+            scheduleRenewalFailedNotification()
+        }
+    }
+
     private func performRefresh(reason: String) {
         let provider = StorageCurrentGlucoseStateProvider()
         guard let snapshot = GlucoseSnapshotBuilder.build(from: provider) else {
@@ -554,12 +1077,20 @@ 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 }
+        if !Storage.shared.laEnabled.value {
+            LogManager.shared.log(category: .general, message: "[LA] refresh: LA update skipped — laEnabled=false reason=\(reason)", isDebug: true)
+            return
+        }
+        if dismissedByUser {
+            LogManager.shared.log(category: .general, message: "[LA] refresh: LA update skipped — dismissedByUser=true reason=\(reason)")
+            return
+        }
         guard !snapshotUnchanged || forceRefreshNeeded else { return }
         guard ActivityAuthorizationInfo().areActivitiesEnabled else {
+            LogManager.shared.log(category: .general, message: "[LA] refresh: LA update skipped — areActivitiesEnabled=false reason=\(reason)")
             return
         }
         if current == nil, let existing = Activity<GlucoseLiveActivityAttributes>.activities.first {
@@ -570,9 +1101,11 @@ final class LiveActivityManager {
             return
         }
         if isAppVisibleForLiveActivityStart() {
-            startIfNeeded()
-            if current != nil {
-                update(snapshot: snapshot, reason: reason)
+            Task { @MainActor in
+                self.startIfNeeded()
+                if self.current != nil {
+                    self.update(snapshot: snapshot, reason: reason)
+                }
             }
         } else {
             LogManager.shared.log(category: .general, message: "LA start suppressed (not visible) reason=\(reason)", isDebug: true)
@@ -632,6 +1165,12 @@ final class LiveActivityManager {
 
             if isForeground {
                 await activity.update(content)
+            } else {
+                LogManager.shared.log(
+                    category: .general,
+                    message: "[LA] update seq=\(nextSeq) — app backgrounded, direct ActivityKit update skipped, relying on APNs",
+                    isDebug: true
+                )
             }
 
             if Task.isCancelled { return }
@@ -646,6 +1185,11 @@ final class LiveActivityManager {
 
             if let token = pushToken {
                 await APNSClient.shared.sendLiveActivityUpdate(pushToken: token, state: state)
+            } else {
+                LogManager.shared.log(
+                    category: .general,
+                    message: "[LA] update seq=\(nextSeq) reason=\(reason) — no push token yet, APNs skipped"
+                )
             }
         }
     }
@@ -668,25 +1212,45 @@ final class LiveActivityManager {
     private func bind(to activity: Activity<GlucoseLiveActivityAttributes>, logReason: String) {
         if current?.id == activity.id { return }
         current = activity
+        let wasEndingForRestart = endingForRestart
         dismissedByUser = false
         endingForRestart = false
         attachStateObserver(to: activity)
-        LogManager.shared.log(category: .general, message: "Live Activity bound id=\(activity.id) (\(logReason))", isDebug: true)
+        LogManager.shared.log(
+            category: .general,
+            message: "Live Activity bound id=\(activity.id) state=\(activity.activityState) (\(logReason)) — endingForRestart cleared (was \(wasEndingForRestart))",
+            isDebug: true
+        )
         observePushToken(for: activity)
     }
 
     private func observePushToken(for activity: Activity<GlucoseLiveActivityAttributes>) {
         tokenObservationTask?.cancel()
+        let activityID = activity.id
         tokenObservationTask = Task {
             for await tokenData in activity.pushTokenUpdates {
                 let token = tokenData.map { String(format: "%02x", $0) }.joined()
+                let previousTail = self.pushToken.map { String($0.suffix(8)) } ?? "nil"
+                let tail = String(token.suffix(8))
                 self.pushToken = token
-                LogManager.shared.log(category: .general, message: "Live Activity push token received", isDebug: true)
+                LogManager.shared.log(
+                    category: .general,
+                    message: "[LA] push token received id=\(activityID) token=…\(tail) (prev=…\(previousTail))"
+                )
             }
         }
     }
 
     func handleExpiredToken() {
+        let existing = Activity<GlucoseLiveActivityAttributes>.activities.count
+        LogManager.shared.log(
+            category: .general,
+            message: "[LA] handleExpiredToken: current=\(current?.id ?? "nil"), activities=\(existing), dismissedByUser=\(dismissedByUser) — marking endingForRestart and ending"
+        )
+        // Mark as system-initiated so the `.dismissed` delivered by end()
+        // is not classified as a user swipe — that would set dismissedByUser=true
+        // and block the auto-restart promised by the comment below.
+        endingForRestart = true
         end()
         // Activity will restart on next BG refresh via refreshFromCurrentState()
     }
@@ -694,6 +1258,8 @@ final class LiveActivityManager {
     // MARK: - Renewal Notifications
 
     private static let renewalNotificationID = "\(Bundle.main.bundleIdentifier ?? "loopfollow").la.renewal.failed"
+    private static let apnsCredentialsNotificationID = "\(Bundle.main.bundleIdentifier ?? "loopfollow").la.apns.missing"
+    private static let pushToStartTokenNotificationID = "\(Bundle.main.bundleIdentifier ?? "loopfollow").la.token.missing"
 
     private func scheduleRenewalFailedNotification() {
         let content = UNMutableNotificationContent()
@@ -720,6 +1286,32 @@ final class LiveActivityManager {
         UNUserNotificationCenter.current().removeDeliveredNotifications(withIdentifiers: [id])
     }
 
+    private func scheduleApnsCredentialsMissingNotification() {
+        let content = UNMutableNotificationContent()
+        content.title = "Live Activity Setup Needed"
+        content.body = "APNs credentials are missing or invalid. Configure them in Settings → APN."
+        content.sound = .default
+        let request = UNNotificationRequest(
+            identifier: LiveActivityManager.apnsCredentialsNotificationID,
+            content: content,
+            trigger: UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false),
+        )
+        UNUserNotificationCenter.current().add(request, withCompletionHandler: nil)
+    }
+
+    private func schedulePushToStartTokenMissingNotification() {
+        let content = UNMutableNotificationContent()
+        content.title = "Live Activity Could Not Start"
+        content.body = "Live Activity could not start — try again in a moment."
+        content.sound = .default
+        let request = UNNotificationRequest(
+            identifier: LiveActivityManager.pushToStartTokenNotificationID,
+            content: content,
+            trigger: UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false),
+        )
+        UNUserNotificationCenter.current().add(request, withCompletionHandler: nil)
+    }
+
     private func attachStateObserver(to activity: Activity<GlucoseLiveActivityAttributes>) {
         stateObserverTask?.cancel()
         stateObserverTask = Task {
diff --git a/LoopFollow/LiveActivity/StorageCurrentGlucoseStateProvider.swift b/LoopFollow/LiveActivity/StorageCurrentGlucoseStateProvider.swift
index 2ee27bd59..06b532a12 100644
--- a/LoopFollow/LiveActivity/StorageCurrentGlucoseStateProvider.swift
+++ b/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? {
@@ -128,15 +128,30 @@ struct StorageCurrentGlucoseStateProvider: CurrentGlucoseStateProviding {
         return Date().timeIntervalSince1970 - lastLoopTime >= 15 * 60
     }
 
+    var loopLastRunAt: TimeInterval? {
+        let t = Storage.shared.lastLoopTime.value
+        return t > 0 ? t : nil
+    }
+
     // MARK: - Renewal
 
     var showRenewalOverlay: Bool {
         #if targetEnvironment(macCatalyst)
             return false
         #else
-            let renewBy = Storage.shared.laRenewBy.value
-            let now = Date().timeIntervalSince1970
-            return renewBy > 0 && now >= renewBy - LiveActivityManager.renewalWarning
+            // iOS 17.2+ renews silently via push-to-start at the deadline, so the
+            // pre-emptive 30-minute "tap to update" overlay would be misleading
+            // during normal operation. Only show it once renewal has actually
+            // failed (no token, bad creds, rate-limited) — that is genuinely
+            // user-actionable. iOS 16.x keeps the time-based warning because
+            // renewal there requires the user to foreground the app.
+            if #available(iOS 17.2, *) {
+                return Storage.shared.laRenewalFailed.value
+            } else {
+                let renewBy = Storage.shared.laRenewBy.value
+                let now = Date().timeIntervalSince1970
+                return renewBy > 0 && now >= renewBy - LiveActivityManager.renewalWarning
+            }
         #endif
     }
 }
diff --git a/LoopFollow/LiveActivitySettingsView.swift b/LoopFollow/LiveActivitySettingsView.swift
index f10e3a07d..694e2779b 100644
--- a/LoopFollow/LiveActivitySettingsView.swift
+++ b/LoopFollow/LiveActivitySettingsView.swift
@@ -10,16 +10,37 @@
         @State private var restartConfirmed = false
         @State private var slots: [LiveActivitySlotOption] = LAAppGroupSettings.slots()
         @State private var smallWidgetSlot: LiveActivitySlotOption = LAAppGroupSettings.smallWidgetSlot()
+        @State private var keyId: String = Storage.shared.lfKeyId.value
+        @State private var apnsKey: String = Storage.shared.lfApnsKey.value
 
         private let slotLabels = ["Top left", "Top right", "Bottom left", "Bottom right"]
 
+        private var apnsConfigured: Bool {
+            APNsCredentialValidator.isFullyConfigured(keyId: keyId, apnsKey: apnsKey)
+        }
+
         var body: some View {
             Form {
-                Section(header: Text("Live Activity")) {
+                Section(
+                    header: Text("Live Activity"),
+                    footer: Text("Live Activity updates require APNs credentials. Configure them in Settings → APN.")
+                ) {
                     Toggle("Enable Live Activity", isOn: $laEnabled)
                 }
 
                 if laEnabled {
+                    if !apnsConfigured {
+                        Section {
+                            Label {
+                                Text("APNs credentials are missing or invalid — Live Activity updates will not work. Open Settings → APN to fix.")
+                                    .font(.callout)
+                            } icon: {
+                                Image(systemName: "exclamationmark.triangle.fill")
+                                    .foregroundColor(.orange)
+                            }
+                        }
+                    }
+
                     Section {
                         Button(restartConfirmed ? "Live Activity Restarted" : "Restart Live Activity") {
                             LiveActivityManager.shared.forceRestart()
@@ -63,6 +84,12 @@
             .onReceive(Storage.shared.laEnabled.$value) { newValue in
                 if newValue != laEnabled { laEnabled = newValue }
             }
+            .onReceive(Storage.shared.lfKeyId.$value) { newValue in
+                if newValue != keyId { keyId = newValue }
+            }
+            .onReceive(Storage.shared.lfApnsKey.$value) { newValue in
+                if newValue != apnsKey { apnsKey = newValue }
+            }
             .onChange(of: laEnabled) { newValue in
                 Storage.shared.laEnabled.value = newValue
                 if newValue {
diff --git a/LoopFollow/Log/LogManager.swift b/LoopFollow/Log/LogManager.swift
index 22403cd0f..c96e8f151 100644
--- a/LoopFollow/Log/LogManager.swift
+++ b/LoopFollow/Log/LogManager.swift
@@ -2,6 +2,7 @@
 // LogManager.swift
 
 import Foundation
+import UIKit
 
 class LogManager {
     static let shared = LogManager()
@@ -29,6 +30,8 @@ class LogManager {
         case calendar = "Calendar"
         case deviceStatus = "Device Status"
         case remote = "Remote"
+        case watch = "Watch"
+        case telemetry = "Telemetry"
     }
 
     init() {
@@ -55,7 +58,8 @@ class LogManager {
     ///   - limitIdentifier: Optional key to rate-limit similar log messages.
     ///   - limitInterval: Time interval (in seconds) to wait before logging the same type again.
     func log(category: Category, message: String, isDebug: Bool = false, limitIdentifier: String? = nil, limitInterval: TimeInterval = 300) {
-        let logMessage = formattedLogMessage(for: category, message: message)
+        let safeMessage = LogRedactor.sweep(message)
+        let logMessage = formattedLogMessage(for: category, message: safeMessage)
 
         consoleQueue.async {
             print(logMessage)
@@ -113,6 +117,16 @@ class LogManager {
             let expirationHeaderString = buildDetails.expirationHeaderString
             let isMacApp = buildDetails.isMacApp()
             let isSimulatorBuild = buildDetails.isSimulatorBuild()
+            let osLabel: String
+            let osVersion: String
+            if isMacApp {
+                osLabel = "macOS"
+                let v = ProcessInfo.processInfo.operatingSystemVersion
+                osVersion = "\(v.majorVersion).\(v.minorVersion).\(v.patchVersion)"
+            } else {
+                osLabel = "iOS"
+                osVersion = UIDevice.current.systemVersion
+            }
 
             // Assemble header information
             var headerLines = [String]()
@@ -122,6 +136,7 @@ class LogManager {
             }
             headerLines.append("Built: \(formattedBuildDate)")
             headerLines.append("Branch: \(branchAndSha)")
+            headerLines.append("\(osLabel): \(osVersion)")
 
             let headerMessage = headerLines.joined(separator: ", ") + "\n"
             let logMessage = formattedLogMessage(for: .general, message: headerMessage)
diff --git a/LoopFollow/Nightscout/NightscoutSettingsView.swift b/LoopFollow/Nightscout/NightscoutSettingsView.swift
index 7c08e756f..e1a9c00ef 100644
--- a/LoopFollow/Nightscout/NightscoutSettingsView.swift
+++ b/LoopFollow/Nightscout/NightscoutSettingsView.swift
@@ -5,21 +5,32 @@ import SwiftUI
 
 struct NightscoutSettingsView: View {
     @ObservedObject var viewModel: NightscoutSettingsViewModel
+    var usesModalCloseButton: Bool = false
+    var onContinueToUnits: (() -> Void)? = nil
+    var onImportSettings: (() -> Void)? = nil
+    @State private var showUnitsSetup = false
+    @Environment(\.dismiss) private var dismiss
 
     var body: some View {
-        NavigationView {
-            Form {
-                urlSection
-                tokenSection
-                statusSection
-                importSection
+        Form {
+            urlSection
+            tokenSection
+            statusSection
+
+            if viewModel.isFreshSetup {
+                continueSection
             }
-            .onDisappear {
-                viewModel.dismiss()
+
+            importSection
+        }
+        .navigationDestination(isPresented: $showUnitsSetup) {
+            UnitsOnboardingView {
+                dismiss()
             }
         }
-        .preferredColorScheme(Storage.shared.appearanceMode.value.colorScheme)
         .navigationBarTitle("Nightscout Settings", displayMode: .inline)
+        .navigationBarBackButtonHidden(usesModalCloseButton)
+        .preferredColorScheme(Storage.shared.appearanceMode.value.colorScheme)
     }
 
     // MARK: - Subviews / Computed Properties
@@ -52,17 +63,57 @@ struct NightscoutSettingsView: View {
 
     private var statusSection: some View {
         Section(header: Text("Status")) {
-            Text(viewModel.nightscoutStatus)
+            HStack {
+                Text(viewModel.nightscoutStatus)
+                if viewModel.isConnected {
+                    Spacer()
+                    Image(systemName: "checkmark.circle.fill")
+                        .foregroundColor(.green)
+                }
+            }
+        }
+    }
+
+    private var continueSection: some View {
+        Section {
+            Button(action: {
+                if let onContinueToUnits {
+                    onContinueToUnits()
+                } else {
+                    showUnitsSetup = true
+                }
+            }) {
+                HStack {
+                    Spacer()
+                    Text("Continue")
+                        .fontWeight(.semibold)
+                    Spacer()
+                }
+            }
+            .buttonStyle(.borderedProminent)
+            .disabled(!viewModel.isConnected)
+            .listRowBackground(Color.clear)
         }
     }
 
     private var importSection: some View {
         Section(header: Text("Import Settings")) {
-            NavigationLink(destination: ImportExportSettingsView()) {
-                HStack {
-                    Image(systemName: "square.and.arrow.down")
-                        .foregroundColor(.blue)
-                    Text("Import Settings from QR Code")
+            if let onImportSettings {
+                Button(action: onImportSettings) {
+                    HStack {
+                        Image(systemName: "square.and.arrow.down")
+                            .foregroundColor(.blue)
+                        Text("Import Settings from QR Code")
+                            .foregroundColor(.primary)
+                    }
+                }
+            } else {
+                NavigationLink(destination: ImportExportSettingsView()) {
+                    HStack {
+                        Image(systemName: "square.and.arrow.down")
+                            .foregroundColor(.blue)
+                        Text("Import Settings from QR Code")
+                    }
                 }
             }
         }
diff --git a/LoopFollow/Nightscout/NightscoutSettingsViewModel.swift b/LoopFollow/Nightscout/NightscoutSettingsViewModel.swift
index 299a73a7d..9b336be2b 100644
--- a/LoopFollow/Nightscout/NightscoutSettingsViewModel.swift
+++ b/LoopFollow/Nightscout/NightscoutSettingsViewModel.swift
@@ -14,6 +14,12 @@ class NightscoutSettingsViewModel: ObservableObject {
     private var initialURL: String
     private var initialToken: String
 
+    /// Whether the Nightscout connection is successfully verified
+    @Published var isConnected: Bool = false
+
+    /// Whether this is a fresh setup (URL was empty when view appeared)
+    private(set) var isFreshSetup: Bool = false
+
     @Published var nightscoutURL: String = Storage.shared.url.value {
         willSet {
             if newValue != nightscoutURL {
@@ -41,6 +47,7 @@ class NightscoutSettingsViewModel: ObservableObject {
     init() {
         initialURL = Storage.shared.url.value
         initialToken = Storage.shared.token.value
+        isFreshSetup = initialURL.isEmpty
 
         setupDebounce()
         checkNightscoutStatus()
@@ -107,6 +114,7 @@ class NightscoutSettingsViewModel: ObservableObject {
 
     func updateStatusLabel(error: NightscoutUtils.NightscoutError?) {
         if let error = error {
+            isConnected = false
             switch error {
             case .invalidURL:
                 nightscoutStatus = "Invalid URL"
@@ -124,6 +132,7 @@ class NightscoutSettingsViewModel: ObservableObject {
                 nightscoutStatus = "Address Empty"
             }
         } else {
+            isConnected = true
             let authStatus: String
             if Storage.shared.nsAdminAuth.value {
                 authStatus = "Admin"
diff --git a/LoopFollow/Remote/LoopAPNS/LoopAPNSService.swift b/LoopFollow/Remote/LoopAPNS/LoopAPNSService.swift
index feca46e0d..2a13dd081 100644
--- a/LoopFollow/Remote/LoopAPNS/LoopAPNSService.swift
+++ b/LoopFollow/Remote/LoopAPNS/LoopAPNSService.swift
@@ -162,7 +162,7 @@ class LoopAPNSService {
 
         // Encrypt and include return notification info using OTP
         if let returnInfo = createReturnNotificationInfo() {
-            LogManager.shared.log(category: .apns, message: "Created return notification info for carbs - deviceToken: \(returnInfo.deviceToken.prefix(8))..., bundleId: \(returnInfo.bundleId)")
+            LogManager.shared.log(category: .apns, message: "Created return notification info for carbs - deviceToken: \(LogRedactor.head(returnInfo.deviceToken)), bundleId: \(LogRedactor.bundleId(returnInfo.bundleId))")
             if let encryptedReturnInfo = encryptReturnNotificationInfo(returnInfo: returnInfo, otpCode: String(payload.otp)) {
                 finalPayload["encrypted_return_notification"] = encryptedReturnInfo
                 LogManager.shared.log(category: .apns, message: "Added encrypted_return_notification to carbs payload, length: \(encryptedReturnInfo.count)")
@@ -227,7 +227,7 @@ class LoopAPNSService {
 
         // Encrypt and include return notification info using OTP
         if let returnInfo = createReturnNotificationInfo() {
-            LogManager.shared.log(category: .apns, message: "Created return notification info for carbs - deviceToken: \(returnInfo.deviceToken.prefix(8))..., bundleId: \(returnInfo.bundleId)")
+            LogManager.shared.log(category: .apns, message: "Created return notification info for carbs - deviceToken: \(LogRedactor.head(returnInfo.deviceToken)), bundleId: \(LogRedactor.bundleId(returnInfo.bundleId))")
             if let encryptedReturnInfo = encryptReturnNotificationInfo(returnInfo: returnInfo, otpCode: String(payload.otp)) {
                 finalPayload["encrypted_return_notification"] = encryptedReturnInfo
                 LogManager.shared.log(category: .apns, message: "Added encrypted_return_notification to carbs payload, length: \(encryptedReturnInfo.count)")
diff --git a/LoopFollow/Remote/Settings/RemoteSettingsView.swift b/LoopFollow/Remote/Settings/RemoteSettingsView.swift
index c9d1878ba..532061013 100644
--- a/LoopFollow/Remote/Settings/RemoteSettingsView.swift
+++ b/LoopFollow/Remote/Settings/RemoteSettingsView.swift
@@ -71,13 +71,8 @@ struct RemoteSettingsView: View {
                         Image(systemName: "square.and.arrow.down")
                             .foregroundColor(.blue)
                         Text("Import/Export Settings")
-                        Spacer()
-                        Image(systemName: "chevron.right")
-                            .foregroundColor(.secondary)
-                            .font(.caption)
                     }
                 }
-                .buttonStyle(.plain)
             }
 
             // MARK: - Meal Section (for TRC only)
diff --git a/LoopFollow/Remote/Settings/RemoteSettingsViewModel.swift b/LoopFollow/Remote/Settings/RemoteSettingsViewModel.swift
index d5ea2fc4e..c05f041a2 100644
--- a/LoopFollow/Remote/Settings/RemoteSettingsViewModel.swift
+++ b/LoopFollow/Remote/Settings/RemoteSettingsViewModel.swift
@@ -201,7 +201,7 @@ class RemoteSettingsViewModel: ObservableObject {
                 self.remoteType = .loopAPNS
                 self.isLoopDevice = true
                 self.isTrioDevice = false
-                LogManager.shared.log(category: .apns, message: "Loop APNS QR code scanned: \(code)")
+                LogManager.shared.log(category: .apns, message: "Loop APNS QR code scanned: \(LogRedactor.fingerprint(code))")
             case let .failure(error):
                 self.loopAPNSErrorMessage = "Scanning failed: \(error.localizedDescription)"
             }
diff --git a/LoopFollow/Remote/TRC/PushNotificationManager.swift b/LoopFollow/Remote/TRC/PushNotificationManager.swift
index 04c9977c2..aa1f661a2 100644
--- a/LoopFollow/Remote/TRC/PushNotificationManager.swift
+++ b/LoopFollow/Remote/TRC/PushNotificationManager.swift
@@ -276,12 +276,11 @@ class PushNotificationManager {
                 }
 
                 if let httpResponse = response as? HTTPURLResponse {
-                    print("Push notification sent.")
-                    print("Status code: \(httpResponse.statusCode)")
+                    LogManager.shared.log(category: .apns, message: "Push notification sent. Status code: \(httpResponse.statusCode)", isDebug: true)
 
                     var responseBodyMessage = ""
                     if let data = data, let responseBody = String(data: data, encoding: .utf8) {
-                        print("Response body: \(responseBody)")
+                        LogManager.shared.log(category: .apns, message: "Response body: \(responseBody)", isDebug: true)
                         if let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                            let reason = json["reason"] as? String
                         {
diff --git a/LoopFollow/Remote/Watch/WatchCommandDispatcher.swift b/LoopFollow/Remote/Watch/WatchCommandDispatcher.swift
new file mode 100644
index 000000000..ac9cf433e
--- /dev/null
+++ b/LoopFollow/Remote/Watch/WatchCommandDispatcher.swift
@@ -0,0 +1,157 @@
+// LoopFollow
+// WatchCommandDispatcher.swift
+// Phone-side handler for Watch remote commands relayed via WCSession.
+
+import Foundation
+import HealthKit
+
+final class WatchCommandDispatcher {
+    static let shared = WatchCommandDispatcher()
+
+    private let apnsService = LoopAPNSService()
+
+    private init() {}
+
+    func handle(message: [String: Any], replyHandler: @escaping ([String: Any]) -> Void) {
+        guard let cmd = message["watchCmd"] as? String else {
+            replyHandler(["success": false, "error": "Unknown command"])
+            return
+        }
+        LogManager.shared.log(category: .apns, message: "WatchCommandDispatcher: handling command '\(cmd)'")
+        switch cmd {
+        case "carbs":
+            handleCarbs(message: message, replyHandler: replyHandler)
+        case "bolus":
+            handleBolus(message: message, replyHandler: replyHandler)
+        case "override", "preMealOverride":
+            handleOverride(message: message, replyHandler: replyHandler)
+        default:
+            replyHandler(["success": false, "error": "Unrecognised command: \(cmd)"])
+        }
+    }
+
+    // MARK: - Carbs
+
+    private func handleCarbs(message: [String: Any], replyHandler: @escaping ([String: Any]) -> Void) {
+        guard apnsService.validateSetup() else {
+            replyHandler(["success": false, "error": "LoopAPNS not configured"])
+            return
+        }
+        guard let otp = currentOTP() else {
+            replyHandler(["success": false, "error": "OTP unavailable — check QR code in settings"])
+            return
+        }
+        if isTOTPBlocked() {
+            replyHandler(["success": false, "totpBlocked": true, "error": "OTP already used — wait up to 30 seconds"])
+            return
+        }
+
+        let carbsAmount = message["carbsAmount"] as? Double ?? 0
+        let absorptionTime = message["absorptionTime"] as? Double ?? 3.0
+
+        guard carbsAmount > 0 else {
+            replyHandler(["success": false, "error": "Carbs amount must be greater than 0"])
+            return
+        }
+
+        let maxCarbs = Storage.shared.maxCarbs.value.doubleValue(for: .gram())
+        guard carbsAmount <= maxCarbs else {
+            replyHandler(["success": false, "error": "Carbs exceed maximum (\(Int(maxCarbs))g)"])
+            return
+        }
+
+        let consumedDate = Date().dateUsingCurrentSeconds()
+        let payload = LoopAPNSPayload(
+            type: .carbs,
+            carbsAmount: carbsAmount,
+            absorptionTime: absorptionTime,
+            consumedDate: consumedDate,
+            otp: otp
+        )
+
+        apnsService.sendCarbsViaAPNS(payload: payload) { [weak self] ok, err in
+            if ok {
+                TOTPService.shared.markTOTPAsUsed(qrCodeURL: Storage.shared.loopAPNSQrCodeURL.value)
+                LogManager.shared.log(category: .apns, message: "WatchCommandDispatcher: carbs sent — \(carbsAmount)g")
+            } else {
+                LogManager.shared.log(category: .apns, message: "WatchCommandDispatcher: carbs failed — \(err ?? "unknown")")
+            }
+            replyHandler(["success": ok, "error": err ?? ""])
+        }
+    }
+
+    // MARK: - Bolus
+
+    private func handleBolus(message: [String: Any], replyHandler: @escaping ([String: Any]) -> Void) {
+        guard apnsService.validateSetup() else {
+            replyHandler(["success": false, "error": "LoopAPNS not configured"])
+            return
+        }
+        guard let otp = currentOTP() else {
+            replyHandler(["success": false, "error": "OTP unavailable — check QR code in settings"])
+            return
+        }
+        if isTOTPBlocked() {
+            replyHandler(["success": false, "totpBlocked": true, "error": "OTP already used — wait up to 30 seconds"])
+            return
+        }
+
+        let bolusAmount = message["bolusAmount"] as? Double ?? 0
+        guard bolusAmount > 0 else {
+            replyHandler(["success": false, "error": "Bolus amount must be greater than 0"])
+            return
+        }
+
+        let maxBolus = Storage.shared.maxBolus.value.doubleValue(for: .internationalUnit())
+        guard bolusAmount <= maxBolus else {
+            replyHandler(["success": false, "error": "Bolus exceeds maximum (\(String(format: "%.2f", maxBolus))U)"])
+            return
+        }
+
+        let payload = LoopAPNSPayload(
+            type: .bolus,
+            bolusAmount: bolusAmount,
+            otp: otp
+        )
+
+        apnsService.sendBolusViaAPNS(payload: payload) { [weak self] ok, err in
+            if ok {
+                TOTPService.shared.markTOTPAsUsed(qrCodeURL: Storage.shared.loopAPNSQrCodeURL.value)
+                LogManager.shared.log(category: .apns, message: "WatchCommandDispatcher: bolus sent — \(bolusAmount)U")
+            } else {
+                LogManager.shared.log(category: .apns, message: "WatchCommandDispatcher: bolus failed — \(err ?? "unknown")")
+            }
+            replyHandler(["success": ok, "error": err ?? ""])
+        }
+    }
+
+    // MARK: - Override
+
+    private func handleOverride(message: [String: Any], replyHandler: @escaping ([String: Any]) -> Void) {
+        guard let name = message["overrideName"] as? String, !name.isEmpty else {
+            replyHandler(["success": false, "error": "No override name specified"])
+            return
+        }
+        let rawDuration = message["overrideDuration"] as? Double ?? 0
+        let duration: TimeInterval? = rawDuration > 0 ? rawDuration : nil
+
+        apnsService.sendOverrideNotification(presetName: name, duration: duration) { ok, err in
+            if ok {
+                LogManager.shared.log(category: .apns, message: "WatchCommandDispatcher: override '\(name)' sent")
+            } else {
+                LogManager.shared.log(category: .apns, message: "WatchCommandDispatcher: override '\(name)' failed — \(err ?? "unknown")")
+            }
+            replyHandler(["success": ok, "error": err ?? ""])
+        }
+    }
+
+    // MARK: - TOTP Helpers
+
+    private func currentOTP() -> String? {
+        TOTPGenerator.extractOTPFromURL(Storage.shared.loopAPNSQrCodeURL.value)
+    }
+
+    private func isTOTPBlocked() -> Bool {
+        TOTPService.shared.isTOTPBlocked(qrCodeURL: Storage.shared.loopAPNSQrCodeURL.value)
+    }
+}
diff --git a/LoopFollow/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/LoopFollow/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
index c928251a4..500362e57 100644
--- a/LoopFollow/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/LoopFollow/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,41 +1,46 @@
 {
-    "images" : [
+  "images" : [
+    {
+      "filename" : "1024.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
         {
-            "filename" : "1024.png",
-            "idiom" : "universal",
-            "platform" : "ios",
-            "scale" : "1x",
-            "size" : "1024x1024"
-        },
-        {
-            "appearances" : [
-                {
-                    "appearance" : "luminosity",
-                    "value" : "dark"
-                }
-            ],
-            "filename" : "1024-dark.png",
-            "idiom" : "universal",
-            "platform" : "ios",
-            "scale" : "1x",
-            "size" : "1024x1024"
-        },
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "1024-dark.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
         {
-            "appearances" : [
-                {
-                    "appearance" : "luminosity",
-                    "value" : "tinted"
-                }
-            ],
-            "filename" : "1024-tinted.png",
-            "idiom" : "universal",
-            "platform" : "ios",
-            "scale" : "1x",
-            "size" : "1024x1024"
+          "appearance" : "luminosity",
+          "value" : "tinted"
         }
-    ],
-    "info" : {
-        "author" : "xcode",
-        "version" : 1
+      ],
+      "filename" : "1024-tinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "watchos",
+      "size" : "1024x1024"
     }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
 }
diff --git a/LoopFollow/Settings/APNSettingsView.swift b/LoopFollow/Settings/APNSettingsView.swift
index 79b07e7cd..359664dbe 100644
--- a/LoopFollow/Settings/APNSettingsView.swift
+++ b/LoopFollow/Settings/APNSettingsView.swift
@@ -7,26 +7,59 @@ struct APNSettingsView: View {
     @State private var keyId: String = Storage.shared.lfKeyId.value
     @State private var apnsKey: String = Storage.shared.lfApnsKey.value
 
+    private var keyIdValid: Bool {
+        APNsCredentialValidator.isValidKeyId(keyId)
+    }
+
+    private var apnsKeyValid: Bool {
+        APNsCredentialValidator.isValidApnsKey(apnsKey)
+    }
+
     var body: some View {
         Form {
             Section(header: Text("LoopFollow APNs Credentials")) {
-                HStack {
-                    Text("APNS Key ID")
-                    TogglableSecureInput(
-                        placeholder: "Enter APNS Key ID",
-                        text: $keyId,
-                        style: .singleLine
-                    )
+                VStack(alignment: .leading, spacing: 4) {
+                    HStack {
+                        Text("APNS Key ID")
+                        TogglableSecureInput(
+                            placeholder: "Enter APNS Key ID",
+                            text: $keyId,
+                            style: .singleLine
+                        )
+                        if !keyId.isEmpty {
+                            Image(systemName: keyIdValid ? "checkmark.circle.fill" : "exclamationmark.triangle.fill")
+                                .foregroundColor(keyIdValid ? .green : .orange)
+                                .accessibilityLabel(keyIdValid ? "Valid Key ID" : "Invalid Key ID")
+                        }
+                    }
+                    if !keyId.isEmpty, !keyIdValid {
+                        Text("Key ID must be exactly 10 uppercase letters or digits.")
+                            .font(.caption)
+                            .foregroundColor(.orange)
+                    }
                 }
 
-                VStack(alignment: .leading) {
-                    Text("APNS Key")
+                VStack(alignment: .leading, spacing: 4) {
+                    HStack {
+                        Text("APNS Key")
+                        Spacer()
+                        if !apnsKey.isEmpty {
+                            Image(systemName: apnsKeyValid ? "checkmark.circle.fill" : "exclamationmark.triangle.fill")
+                                .foregroundColor(apnsKeyValid ? .green : .orange)
+                                .accessibilityLabel(apnsKeyValid ? "Valid APNs key" : "Invalid APNs key")
+                        }
+                    }
                     TogglableSecureInput(
                         placeholder: "Paste APNS Key",
                         text: $apnsKey,
                         style: .multiLine
                     )
                     .frame(minHeight: 110)
+                    if !apnsKey.isEmpty, !apnsKeyValid {
+                        Text("Paste the full .p8 contents — must include the BEGIN PRIVATE KEY and END PRIVATE KEY lines.")
+                            .font(.caption)
+                            .foregroundColor(.orange)
+                    }
                 }
             }
         }
@@ -35,7 +68,14 @@ struct APNSettingsView: View {
         }
         .onChange(of: apnsKey) { newValue in
             let apnsService = LoopAPNSService()
-            Storage.shared.lfApnsKey.value = apnsService.validateAndFixAPNSKey(newValue)
+            let normalized = apnsService.validateAndFixAPNSKey(newValue)
+            Storage.shared.lfApnsKey.value = normalized
+            // Reflect normalization (whitespace fixes etc.) in the field so the
+            // green badge appears when paste added stray whitespace around an
+            // otherwise-valid key.
+            if normalized != newValue {
+                apnsKey = normalized
+            }
         }
         .preferredColorScheme(Storage.shared.appearanceMode.value.colorScheme)
         .navigationTitle("APN")
diff --git a/LoopFollow/Settings/DexcomSettingsView.swift b/LoopFollow/Settings/DexcomSettingsView.swift
index c93b31855..99a4dc32b 100644
--- a/LoopFollow/Settings/DexcomSettingsView.swift
+++ b/LoopFollow/Settings/DexcomSettingsView.swift
@@ -5,40 +5,70 @@ import SwiftUI
 
 struct DexcomSettingsView: View {
     @ObservedObject var viewModel: DexcomSettingsViewModel
+    var usesModalCloseButton: Bool = false
+    var onContinueToUnits: (() -> Void)? = nil
+    @State private var showUnitsSetup = false
+    @Environment(\.dismiss) private var dismiss
 
     var body: some View {
-        NavigationView {
-            Form {
-                Section(header: Text("Dexcom Settings")) {
-                    HStack {
-                        Text("User Name")
-                        TextField("Enter User Name", text: $viewModel.userName)
-                            .autocapitalization(.none)
-                            .disableAutocorrection(true)
-                            .multilineTextAlignment(.trailing)
-                    }
+        Form {
+            Section(header: Text("Dexcom Settings")) {
+                HStack {
+                    Text("User Name")
+                    TextField("Enter User Name", text: $viewModel.userName)
+                        .autocapitalization(.none)
+                        .disableAutocorrection(true)
+                        .multilineTextAlignment(.trailing)
+                }
 
-                    HStack {
-                        Text("Password")
-                        TogglableSecureInput(
-                            placeholder: "Enter Password",
-                            text: $viewModel.password,
-                            style: .singleLine
-                        )
-                    }
+                HStack {
+                    Text("Password")
+                    TogglableSecureInput(
+                        placeholder: "Enter Password",
+                        text: $viewModel.password,
+                        style: .singleLine
+                    )
+                }
 
-                    Picker("Server", selection: $viewModel.server) {
-                        Text("US").tag("US")
-                        Text("NON-US").tag("NON-US")
+                Picker("Server", selection: $viewModel.server) {
+                    Text("US").tag("US")
+                    Text("NON-US").tag("NON-US")
+                }
+                .pickerStyle(SegmentedPickerStyle())
+            }
+
+            if viewModel.isFreshSetup {
+                Section {
+                    Button(action: {
+                        if let onContinueToUnits {
+                            onContinueToUnits()
+                        } else {
+                            showUnitsSetup = true
+                        }
+                    }) {
+                        HStack {
+                            Spacer()
+                            Text("Continue")
+                                .fontWeight(.semibold)
+                            Spacer()
+                        }
                     }
-                    .pickerStyle(SegmentedPickerStyle())
+                    .buttonStyle(.borderedProminent)
+                    .disabled(!viewModel.hasCredentials)
+                    .listRowBackground(Color.clear)
                 }
+            }
 
-                importSection
+            importSection
+        }
+        .navigationDestination(isPresented: $showUnitsSetup) {
+            UnitsOnboardingView {
+                dismiss()
             }
         }
         .preferredColorScheme(Storage.shared.appearanceMode.value.colorScheme)
         .navigationBarTitle("Dexcom Settings", displayMode: .inline)
+        .navigationBarBackButtonHidden(usesModalCloseButton)
     }
 
     private var importSection: some View {
diff --git a/LoopFollow/Settings/DexcomSettingsViewModel.swift b/LoopFollow/Settings/DexcomSettingsViewModel.swift
index 5e1af7aa1..8c7fd5324 100644
--- a/LoopFollow/Settings/DexcomSettingsViewModel.swift
+++ b/LoopFollow/Settings/DexcomSettingsViewModel.swift
@@ -5,6 +5,9 @@ import Combine
 import Foundation
 
 class DexcomSettingsViewModel: ObservableObject {
+    /// Whether this is a fresh setup (credentials were empty when view appeared)
+    private(set) var isFreshSetup: Bool = false
+
     @Published var userName: String = Storage.shared.shareUserName.value {
         willSet {
             if newValue != userName {
@@ -29,5 +32,12 @@ class DexcomSettingsViewModel: ObservableObject {
         }
     }
 
-    init() {}
+    /// Whether credentials are filled in
+    var hasCredentials: Bool {
+        !userName.isEmpty && !password.isEmpty
+    }
+
+    init() {
+        isFreshSetup = Storage.shared.shareUserName.value.isEmpty
+    }
 }
diff --git a/LoopFollow/Settings/GeneralSettingsView.swift b/LoopFollow/Settings/GeneralSettingsView.swift
index 93b7c8f4f..9949f3b93 100644
--- a/LoopFollow/Settings/GeneralSettingsView.swift
+++ b/LoopFollow/Settings/GeneralSettingsView.swift
@@ -8,7 +8,6 @@ struct GeneralSettingsView: View {
     @ObservedObject var appBadge = Storage.shared.appBadge
     @ObservedObject var appearanceMode = Storage.shared.appearanceMode
     @ObservedObject var showStats = Storage.shared.showStats
-    @ObservedObject var useIFCC = Storage.shared.useIFCC
     @ObservedObject var showSmallGraph = Storage.shared.showSmallGraph
     @ObservedObject var screenlockSwitchState = Storage.shared.screenlockSwitchState
     @ObservedObject var showDisplayName = Storage.shared.showDisplayName
@@ -29,6 +28,9 @@ struct GeneralSettingsView: View {
     @ObservedObject var speakHighBG = Storage.shared.speakHighBG
     @ObservedObject var speakHighBGLimit = Storage.shared.speakHighBGLimit
 
+    // Telemetry — see LoopFollow/Helpers/Telemetry.swift
+    @ObservedObject var telemetryEnabled = Storage.shared.telemetryEnabled
+
     var body: some View {
         NavigationView {
             Form {
@@ -44,7 +46,6 @@ struct GeneralSettingsView: View {
                         }
                     }
                     Toggle("Display Stats", isOn: $showStats.value)
-                    Toggle("Use IFCC A1C", isOn: $useIFCC.value)
                     Toggle("Display Small Graph", isOn: $showSmallGraph.value)
                     Toggle("Color BG Text", isOn: $colorBGText.value)
                     Toggle("Keep Screen Active", isOn: $screenlockSwitchState.value)
@@ -132,6 +133,17 @@ struct GeneralSettingsView: View {
                         }
                     }
                 }
+
+                Section("Diagnostics") {
+                    Toggle("Send anonymous usage stats", isOn: $telemetryEnabled.value)
+                        .onChange(of: telemetryEnabled.value) { newValue in
+                            if newValue {
+                                TelemetryClient.shared.scheduleRecurring()
+                            }
+                        }
+                    NavigationLink("What's sent") { TelemetryPreviewView() }
+                    NavigationLink("Privacy") { TelemetryPrivacyView() }
+                }
             }
         }
         .preferredColorScheme(Storage.shared.appearanceMode.value.colorScheme)
diff --git a/LoopFollow/Settings/GraphSettingsView.swift b/LoopFollow/Settings/GraphSettingsView.swift
index 81e2a074e..534e00698 100644
--- a/LoopFollow/Settings/GraphSettingsView.swift
+++ b/LoopFollow/Settings/GraphSettingsView.swift
@@ -19,8 +19,6 @@ struct GraphSettingsView: View {
     @ObservedObject private var predictionDisplayType = Storage.shared.predictionDisplayType
     @ObservedObject private var minBasalScale = Storage.shared.minBasalScale
     @ObservedObject private var minBGScale = Storage.shared.minBGScale
-    @ObservedObject private var lowLine = Storage.shared.lowLine
-    @ObservedObject private var highLine = Storage.shared.highLine
     @ObservedObject private var downloadDays = Storage.shared.downloadDays
 
     private var nightscoutEnabled: Bool { IsNightscoutEnabled() }
@@ -115,19 +113,6 @@ struct GraphSettingsView: View {
                     }
                 }
 
-                // ── Target lines ─────────────────────────────────────────────
-                Section("Target Lines") {
-                    BGPicker(title: "Low BG Line",
-                             range: 40 ... 120,
-                             value: $lowLine.value)
-                        .onChange(of: lowLine.value) { _ in markDirty() }
-
-                    BGPicker(title: "High BG Line",
-                             range: 120 ... 400,
-                             value: $highLine.value)
-                        .onChange(of: highLine.value) { _ in markDirty() }
-                }
-
                 // ── History window ───────────────────────────────────────────
                 if nightscoutEnabled {
                     Section("History") {
diff --git a/LoopFollow/Settings/ImportExport/ExportableSettings.swift b/LoopFollow/Settings/ImportExport/ExportableSettings.swift
index 0425528c9..a8c3fdd7a 100644
--- a/LoopFollow/Settings/ImportExport/ExportableSettings.swift
+++ b/LoopFollow/Settings/ImportExport/ExportableSettings.swift
@@ -11,14 +11,78 @@ struct NightscoutSettingsExport: Codable {
     let url: String
     let token: String
     let units: String
+    let glycemicMetricMode: String
+    let glycemicOutputUnit: String
+    let timeInRangeMode: String
+    let lowLine: Double?
+    let highLine: Double?
+    let variabilityMetricMode: String
+
+    enum CodingKeys: String, CodingKey {
+        case version
+        case url
+        case token
+        case units
+        case glycemicMetricMode
+        case glycemicOutputUnit
+        case timeInRangeMode
+        case lowLine
+        case highLine
+        case variabilityMetricMode
+    }
+
+    init(
+        version: String,
+        url: String,
+        token: String,
+        units: String,
+        glycemicMetricMode: String,
+        glycemicOutputUnit: String,
+        timeInRangeMode: String,
+        lowLine: Double?,
+        highLine: Double?,
+        variabilityMetricMode: String
+    ) {
+        self.version = version
+        self.url = url
+        self.token = token
+        self.units = units
+        self.glycemicMetricMode = glycemicMetricMode
+        self.glycemicOutputUnit = glycemicOutputUnit
+        self.timeInRangeMode = timeInRangeMode
+        self.lowLine = lowLine
+        self.highLine = highLine
+        self.variabilityMetricMode = variabilityMetricMode
+    }
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        version = try container.decode(String.self, forKey: .version)
+        url = try container.decode(String.self, forKey: .url)
+        token = try container.decode(String.self, forKey: .token)
+        units = try container.decodeIfPresent(String.self, forKey: .units) ?? GlucoseDisplayUnit.mgdL.rawValue
+        glycemicMetricMode = try container.decodeIfPresent(String.self, forKey: .glycemicMetricMode) ?? GlycemicMetricMode.gmi.rawValue
+        glycemicOutputUnit = try container.decodeIfPresent(String.self, forKey: .glycemicOutputUnit) ?? GlycemicOutputUnit.percent.rawValue
+        timeInRangeMode = try container.decodeIfPresent(String.self, forKey: .timeInRangeMode) ?? TimeInRangeDisplayMode.tir.rawValue
+        lowLine = try container.decodeIfPresent(Double.self, forKey: .lowLine)
+        highLine = try container.decodeIfPresent(Double.self, forKey: .highLine)
+        variabilityMetricMode = try container.decodeIfPresent(String.self, forKey: .variabilityMetricMode) ?? VariabilityMetricMode.stdDeviation.rawValue
+    }
 
     static func fromCurrentStorage() -> NightscoutSettingsExport {
         let storage = Storage.shared
+        let unitSettings = UnitSettingsStore.shared
         return NightscoutSettingsExport(
             version: AppVersionManager().version(),
             url: storage.url.value,
             token: storage.token.value,
-            units: storage.units.value
+            units: storage.units.value,
+            glycemicMetricMode: unitSettings.glycemicMetricMode.rawValue,
+            glycemicOutputUnit: unitSettings.glycemicOutputUnit.rawValue,
+            timeInRangeMode: unitSettings.timeInRangeMode.rawValue,
+            lowLine: storage.lowLine.value,
+            highLine: storage.highLine.value,
+            variabilityMetricMode: unitSettings.variabilityMetricMode.rawValue
         )
     }
 
@@ -27,6 +91,25 @@ struct NightscoutSettingsExport: Codable {
         storage.url.value = url
         storage.token.value = token
         storage.units.value = units
+
+        if let glycemicMetricMode = GlycemicMetricMode(rawValue: glycemicMetricMode) {
+            UnitSettingsStore.shared.glycemicMetricMode = glycemicMetricMode
+        }
+        if let glycemicOutputUnit = GlycemicOutputUnit(rawValue: glycemicOutputUnit) {
+            UnitSettingsStore.shared.glycemicOutputUnit = glycemicOutputUnit
+        }
+        if let timeInRangeMode = TimeInRangeDisplayMode(rawValue: timeInRangeMode) {
+            UnitSettingsStore.shared.timeInRangeMode = timeInRangeMode
+        }
+        if let lowLine = lowLine {
+            storage.lowLine.value = lowLine
+        }
+        if let highLine = highLine {
+            storage.highLine.value = highLine
+        }
+        if let variabilityMetricMode = VariabilityMetricMode(rawValue: variabilityMetricMode) {
+            UnitSettingsStore.shared.variabilityMetricMode = variabilityMetricMode
+        }
     }
 
     func encodeToJSON() -> String? {
diff --git a/LoopFollow/Settings/ImportExport/ImportExportSettingsViewModel.swift b/LoopFollow/Settings/ImportExport/ImportExportSettingsViewModel.swift
index f2eeb167f..cea659f85 100644
--- a/LoopFollow/Settings/ImportExport/ImportExportSettingsViewModel.swift
+++ b/LoopFollow/Settings/ImportExport/ImportExportSettingsViewModel.swift
@@ -66,7 +66,7 @@ class ImportExportSettingsViewModel: ObservableObject {
 
     private func processImportedSettings(_ jsonString: String) {
         do {
-            LogManager.shared.log(category: .general, message: "Processing QR code data: \(jsonString.prefix(200))...")
+            LogManager.shared.log(category: .general, message: "Processing QR code data: \(LogRedactor.fingerprint(jsonString))")
 
             guard let data = jsonString.data(using: .utf8) else {
                 qrCodeErrorMessage = "Invalid QR code data"
@@ -78,7 +78,8 @@ class ImportExportSettingsViewModel: ObservableObject {
             // Try to decode as JSON first to see what we get
             do {
                 let jsonObject = try JSONSerialization.jsonObject(with: data, options: [])
-                LogManager.shared.log(category: .general, message: "JSON parsing successful: \(jsonObject)")
+                let topLevelKeys = (jsonObject as? [String: Any]).map { Array($0.keys).sorted() } ?? []
+                LogManager.shared.log(category: .general, message: "JSON parsing successful: keys=\(topLevelKeys)")
             } catch {
                 LogManager.shared.log(category: .general, message: "JSON parsing failed: \(error.localizedDescription)")
             }
@@ -263,7 +264,7 @@ class ImportExportSettingsViewModel: ObservableObject {
             (remoteType != nil && !remoteType!.isEmpty && remoteType != "None") ||
             alarmCount > 0
 
-        LogManager.shared.log(category: .general, message: "Import preview check - nightscoutURL: \(nightscoutURL ?? "nil"), dexcomUsername: \(dexcomUsername ?? "nil"), remoteType: \(remoteType ?? "nil"), alarmCount: \(alarmCount), hasAnySettings: \(hasAnySettings)")
+        LogManager.shared.log(category: .general, message: "Import preview check - nightscoutURL: \(nightscoutURL.map { LogRedactor.url($0) } ?? "nil"), dexcomUsername: \(dexcomUsername.map { LogRedactor.username($0) } ?? "nil"), remoteType: \(remoteType ?? "nil"), alarmCount: \(alarmCount), hasAnySettings: \(hasAnySettings)")
 
         if hasAnySettings {
             LogManager.shared.log(category: .general, message: "Creating import preview with settings")
@@ -274,7 +275,7 @@ class ImportExportSettingsViewModel: ObservableObject {
                 alarmCount: alarmCount,
                 alarmNames: alarmNames
             )
-            LogManager.shared.log(category: .general, message: "Created importPreview - nightscoutURL: \(importPreview?.nightscoutURL ?? "nil"), remoteType: \(importPreview?.remoteType ?? "nil"), alarmCount: \(importPreview?.alarmCount ?? 0)")
+            LogManager.shared.log(category: .general, message: "Created importPreview - nightscoutURL: \(importPreview?.nightscoutURL.map { LogRedactor.url($0) } ?? "nil"), remoteType: \(importPreview?.remoteType ?? "nil"), alarmCount: \(importPreview?.alarmCount ?? 0)")
             showImportConfirmation = true
             LogManager.shared.log(category: .general, message: "Set showImportConfirmation = true")
         } else {
diff --git a/LoopFollow/Settings/ImportExport/SettingsMigrationManager.swift b/LoopFollow/Settings/ImportExport/SettingsMigrationManager.swift
index 188379f80..c4e2a6b20 100644
--- a/LoopFollow/Settings/ImportExport/SettingsMigrationManager.swift
+++ b/LoopFollow/Settings/ImportExport/SettingsMigrationManager.swift
@@ -14,11 +14,10 @@ class SettingsMigrationManager {
         // Try to decode with the current version
         do {
             let currentSettings = try JSONDecoder().decode(CombinedSettingsExport.self, from: data)
-            print("✅ Successfully decoded CombinedSettingsExport")
+            LogManager.shared.log(category: .general, message: "Successfully decoded CombinedSettingsExport", isDebug: true)
             return currentSettings
         } catch {
-            print("❌ Failed to decode CombinedSettingsExport: \(error)")
-            print("❌ Error details: \(error.localizedDescription)")
+            LogManager.shared.log(category: .general, message: "Failed to decode CombinedSettingsExport: \(String(describing: type(of: error)))", isDebug: true)
 
             // Try to decode as individual components
             return tryDecodeIndividualComponents(data)
@@ -28,7 +27,7 @@ class SettingsMigrationManager {
     private static func tryDecodeIndividualComponents(_ data: Data) -> CombinedSettingsExport? {
         // Try to decode as AlarmSettingsExport
         if let alarmSettings = try? JSONDecoder().decode(AlarmSettingsExport.self, from: data) {
-            print("✅ Successfully decoded as AlarmSettingsExport")
+            LogManager.shared.log(category: .general, message: "Successfully decoded as AlarmSettingsExport", isDebug: true)
             return CombinedSettingsExport(
                 alarms: alarmSettings,
                 exportType: "Alarm Settings"
@@ -37,7 +36,7 @@ class SettingsMigrationManager {
 
         // Try to decode as NightscoutSettingsExport
         if let nightscoutSettings = try? JSONDecoder().decode(NightscoutSettingsExport.self, from: data) {
-            print("✅ Successfully decoded as NightscoutSettingsExport")
+            LogManager.shared.log(category: .general, message: "Successfully decoded as NightscoutSettingsExport", isDebug: true)
             return CombinedSettingsExport(
                 nightscout: nightscoutSettings,
                 exportType: "Nightscout Settings"
@@ -46,7 +45,7 @@ class SettingsMigrationManager {
 
         // Try to decode as DexcomSettingsExport
         if let dexcomSettings = try? JSONDecoder().decode(DexcomSettingsExport.self, from: data) {
-            print("✅ Successfully decoded as DexcomSettingsExport")
+            LogManager.shared.log(category: .general, message: "Successfully decoded as DexcomSettingsExport", isDebug: true)
             return CombinedSettingsExport(
                 dexcom: dexcomSettings,
                 exportType: "Dexcom Settings"
@@ -55,14 +54,14 @@ class SettingsMigrationManager {
 
         // Try to decode as RemoteSettingsExport
         if let remoteSettings = try? JSONDecoder().decode(RemoteSettingsExport.self, from: data) {
-            print("✅ Successfully decoded as RemoteSettingsExport")
+            LogManager.shared.log(category: .general, message: "Successfully decoded as RemoteSettingsExport", isDebug: true)
             return CombinedSettingsExport(
                 remote: remoteSettings,
                 exportType: "Remote Settings"
             )
         }
 
-        print("❌ Failed to decode as any known component")
+        LogManager.shared.log(category: .general, message: "Failed to decode as any known component", isDebug: true)
         return nil
     }
 
diff --git a/LoopFollow/Settings/LiveActivitySettingsView.swift b/LoopFollow/Settings/LiveActivitySettingsView.swift
deleted file mode 100644
index bfe39b3ee..000000000
--- a/LoopFollow/Settings/LiveActivitySettingsView.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-// LoopFollow
-// LiveActivitySettingsView.swift
-
-import SwiftUI
-
-struct LiveActivitySettingsView: View {
-    @State private var laEnabled: Bool = Storage.shared.laEnabled.value
-    @State private var restartConfirmed = false
-
-    var body: some View {
-        Form {
-            Section(header: Text("Live Activity")) {
-                Toggle("Enable Live Activity", isOn: $laEnabled)
-            }
-
-            if laEnabled {
-                Section {
-                    Button(restartConfirmed ? "Live Activity Restarted" : "Restart Live Activity") {
-                        LiveActivityManager.shared.forceRestart()
-                        restartConfirmed = true
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
-                            restartConfirmed = false
-                        }
-                    }
-                    .disabled(restartConfirmed)
-                }
-            }
-        }
-        .onReceive(Storage.shared.laEnabled.$value) { newValue in
-            if newValue != laEnabled { laEnabled = newValue }
-        }
-        .onChange(of: laEnabled) { newValue in
-            Storage.shared.laEnabled.value = newValue
-            if !newValue {
-                LiveActivityManager.shared.end(dismissalPolicy: .immediate)
-            }
-        }
-        .preferredColorScheme(Storage.shared.appearanceMode.value.colorScheme)
-        .navigationTitle("Live Activity")
-        .navigationBarTitleDisplayMode(.inline)
-    }
-}
diff --git a/LoopFollow/Settings/SettingsMenuView.swift b/LoopFollow/Settings/SettingsMenuView.swift
index 5c0ade26f..548cd0964 100644
--- a/LoopFollow/Settings/SettingsMenuView.swift
+++ b/LoopFollow/Settings/SettingsMenuView.swift
@@ -31,6 +31,7 @@ struct SettingsMenuView: View {
                     {
                         settingsPath.value.append(Sheet.general)
                     }
+
                     NavigationRow(title: "Graph",
                                   icon: "chart.xyaxis.line")
                     {
@@ -44,6 +45,11 @@ struct SettingsMenuView: View {
                             settingsPath.value.append(Sheet.infoDisplay)
                         }
                     }
+                    NavigationRow(title: "Units and Metrics",
+                                  icon: "scalemass")
+                    {
+                        settingsPath.value.append(Sheet.units)
+                    }
 
                     NavigationRow(title: "Tabs",
                                   icon: "rectangle.3.group")
@@ -138,16 +144,6 @@ struct SettingsMenuView: View {
     @ViewBuilder
     private var dataSection: some View {
         Section("Data Settings") {
-            Picker("Units",
-                   selection: Binding(
-                       get: { Storage.shared.units.value },
-                       set: { Storage.shared.units.value = $0 }
-                   )) {
-                Text("mg/dL").tag("mg/dL")
-                Text("mmol/L").tag("mmol/L")
-            }
-            .pickerStyle(.segmented)
-
             NavigationRow(title: "Nightscout",
                           icon: "network")
             {
@@ -166,6 +162,7 @@ struct SettingsMenuView: View {
 // MARK: – Sheet routing
 
 private enum Sheet: Hashable, Identifiable {
+    case units
     case nightscout, dexcom
     case backgroundRefresh
     case general, graph
@@ -187,6 +184,7 @@ private enum Sheet: Hashable, Identifiable {
     @ViewBuilder
     var destination: some View {
         switch self {
+        case .units: UnitsSettingsView()
         case .nightscout: NightscoutSettingsView(viewModel: .init())
         case .dexcom: DexcomSettingsView(viewModel: .init())
         case .backgroundRefresh: BackgroundRefreshSettingsView(viewModel: .init())
diff --git a/LoopFollow/Settings/UnitsConfigurationView.swift b/LoopFollow/Settings/UnitsConfigurationView.swift
new file mode 100644
index 000000000..427c4e5bd
--- /dev/null
+++ b/LoopFollow/Settings/UnitsConfigurationView.swift
@@ -0,0 +1,120 @@
+// LoopFollow
+// UnitsConfigurationView.swift
+
+import SwiftUI
+
+/// Reusable view for configuring units and metrics.
+/// Can be embedded in Forms or used standalone during onboarding.
+struct UnitsConfigurationView: View {
+    @State private var rangeMode = UnitSettingsStore.shared.timeInRangeMode
+    @State private var glucoseUnit = UnitSettingsStore.shared.glucoseUnit
+    @State private var lowValue = Storage.shared.lowLine.value
+    @State private var highValue = Storage.shared.highLine.value
+
+    var body: some View {
+        Group {
+            Section("Glucose") {
+                Picker("Glucose Unit", selection: $glucoseUnit) {
+                    Text("mg/dL").tag(GlucoseDisplayUnit.mgdL)
+                    Text("mmol/L").tag(GlucoseDisplayUnit.mmolL)
+                }
+                .pickerStyle(.segmented)
+                .onChange(of: glucoseUnit) { newValue in
+                    UnitSettingsStore.shared.glucoseUnit = newValue
+                }
+            }
+
+            Section("Range") {
+                Picker("Range Mode", selection: $rangeMode) {
+                    Text("TIR").tag(TimeInRangeDisplayMode.tir)
+                    Text("TITR").tag(TimeInRangeDisplayMode.titr)
+                    Text("Custom").tag(TimeInRangeDisplayMode.custom)
+                }
+                .pickerStyle(.segmented)
+                .onChange(of: rangeMode) { newValue in
+                    UnitSettingsStore.shared.timeInRangeMode = newValue
+                    Observable.shared.chartSettingsChanged.value = true
+                }
+
+                if rangeMode == .custom {
+                    BGPicker(
+                        title: "Low",
+                        range: 40 ... 120,
+                        value: $lowValue
+                    )
+                    .id(glucoseUnit)
+                    .onChange(of: lowValue) { newValue in
+                        Storage.shared.lowLine.value = newValue
+                        Observable.shared.chartSettingsChanged.value = true
+                    }
+                    BGPicker(
+                        title: "High",
+                        range: 120 ... 400,
+                        value: $highValue
+                    )
+                    .id(glucoseUnit)
+                    .onChange(of: highValue) { newValue in
+                        Storage.shared.highLine.value = newValue
+                        Observable.shared.chartSettingsChanged.value = true
+                    }
+                }
+            }
+
+            Section("Glycemic Metrics") {
+                Picker("Metric", selection: Binding(
+                    get: { UnitSettingsStore.shared.glycemicMetricMode },
+                    set: { UnitSettingsStore.shared.glycemicMetricMode = $0 }
+                )) {
+                    Text("eHbA1c").tag(GlycemicMetricMode.ehba1c)
+                    Text("GMI").tag(GlycemicMetricMode.gmi)
+                }
+                .pickerStyle(.segmented)
+
+                Picker("Output Unit", selection: Binding(
+                    get: { UnitSettingsStore.shared.glycemicOutputUnit },
+                    set: { UnitSettingsStore.shared.glycemicOutputUnit = $0 }
+                )) {
+                    Text("%").tag(GlycemicOutputUnit.percent)
+                    Text("mmol/mol").tag(GlycemicOutputUnit.mmolMol)
+                }
+                .pickerStyle(.segmented)
+            }
+
+            Section("Variability") {
+                Picker("Metric", selection: Binding(
+                    get: { UnitSettingsStore.shared.variabilityMetricMode },
+                    set: { UnitSettingsStore.shared.variabilityMetricMode = $0 }
+                )) {
+                    Text("Std Dev").tag(VariabilityMetricMode.stdDeviation)
+                    Text("CV").tag(VariabilityMetricMode.cv)
+                }
+                .pickerStyle(.segmented)
+            }
+        }
+    }
+}
+
+/// Standalone page for units configuration during onboarding.
+/// Shows a checkmark button in the toolbar to complete setup.
+struct UnitsOnboardingView: View {
+    let onComplete: () -> Void
+
+    var body: some View {
+        Form {
+            UnitsConfigurationView()
+        }
+        .navigationTitle("Set Up Units")
+        .navigationBarTitleDisplayMode(.inline)
+        .toolbar {
+            ToolbarItem(placement: .navigationBarTrailing) {
+                Button(action: {
+                    Storage.shared.hasConfiguredUnits.value = true
+                    onComplete()
+                }) {
+                    Image(systemName: "checkmark")
+                        .fontWeight(.semibold)
+                }
+            }
+        }
+    }
+}
diff --git a/LoopFollow/Settings/UnitsSettingsView.swift b/LoopFollow/Settings/UnitsSettingsView.swift
new file mode 100644
index 000000000..396962c3e
--- /dev/null
+++ b/LoopFollow/Settings/UnitsSettingsView.swift
@@ -0,0 +1,14 @@
+// LoopFollow
+// UnitsSettingsView.swift
+
+import SwiftUI
+
+struct UnitsSettingsView: View {
+    var body: some View {
+        Form {
+            UnitsConfigurationView()
+        }
+        .navigationTitle("Units and Metrics")
+        .navigationBarTitleDisplayMode(.inline)
+    }
+}
diff --git a/LoopFollow/Stats/AggregatedStatsView.swift b/LoopFollow/Stats/AggregatedStatsView.swift
index 35dfeb29d..343831003 100644
--- a/LoopFollow/Stats/AggregatedStatsView.swift
+++ b/LoopFollow/Stats/AggregatedStatsView.swift
@@ -21,17 +21,12 @@ struct AggregatedStatsView: View {
     init(viewModel: AggregatedStatsViewModel, onDismiss: (() -> Void)? = nil) {
         self.viewModel = viewModel
         self.onDismiss = onDismiss
-        _showGMI = State(initialValue: Storage.shared.showGMI.value)
-        _showStdDev = State(initialValue: Storage.shared.showStdDev.value)
-
-        let calendar = dateTimeUtils.displayCalendar()
-        let startOfToday = calendar.startOfDay(for: Date())
-        let end = calendar.date(byAdding: .second, value: -1, to: startOfToday) ?? Date()
-        let endDay = calendar.startOfDay(for: end)
-        let startDay = calendar.date(byAdding: .day, value: -7, to: endDay) ?? endDay
-        let start = calendar.startOfDay(for: startDay)
-        _startDate = State(initialValue: start)
-        _endDate = State(initialValue: end)
+        _showGMI = State(initialValue: UnitSettingsStore.shared.glycemicMetricMode == .gmi)
+        _showStdDev = State(initialValue: UnitSettingsStore.shared.variabilityMetricMode == .stdDeviation)
+
+        let range = StatsDateRange.lastComplete(days: 7)
+        _startDate = State(initialValue: range.start)
+        _endDate = State(initialValue: range.end)
     }
 
     var body: some View {
@@ -162,11 +157,31 @@ struct AggregatedStatsView: View {
             timeoutTimer = nil
         }
         .onChange(of: showGMI) { newValue in
-            Storage.shared.showGMI.value = newValue
+            UnitSettingsStore.shared.glycemicMetricMode = newValue ? .gmi : .ehba1c
         }
         .onChange(of: showStdDev) { newValue in
-            Storage.shared.showStdDev.value = newValue
+            UnitSettingsStore.shared.variabilityMetricMode = newValue ? .stdDeviation : .cv
+        }
+        .onReceive(Storage.shared.showGMI.$value) { newValue in
+            showGMI = newValue
+        }
+        .onReceive(Storage.shared.showStdDev.$value) { newValue in
+            showStdDev = newValue
+        }
+        .onReceive(Storage.shared.units.$value) { _ in
+            refreshVisibleStats()
+        }
+        .onReceive(Storage.shared.useIFCC.$value) { _ in
+            refreshVisibleStats()
         }
+        .onReceive(Storage.shared.timeInRangeModeRaw.$value) { _ in
+            viewModel.tirStats.calculateTIR()
+        }
+    }
+
+    private func refreshVisibleStats() {
+        guard !isLoadingData else { return }
+        viewModel.calculateStats()
     }
 }
 
@@ -319,9 +334,9 @@ struct StatsGridView: View {
                     showGMI.toggle()
                 }) {
                     StatCard(
-                        title: showGMI ? "GMI" : "eHbA1c",
-                        value: showGMI ? formatGMI(simpleStats.gmi) : formatEhbA1c(simpleStats.avgGlucose),
-                        unit: showGMI ? "%" : (Storage.shared.units.value == "mg/dL" ? "%" : "mmol/mol"),
+                        title: showGMI ? "GMI" : "Est. A1C",
+                        value: showGMI ? formatGMI(simpleStats.avgGlucose) : formatEhbA1c(simpleStats.avgGlucose),
+                        unit: UnitSettingsStore.shared.glycemicOutputUnit.rawValue,
                         color: .blue,
                         isInteractive: true
                     )
@@ -331,7 +346,7 @@ struct StatsGridView: View {
                 StatCard(
                     title: "Avg Glucose",
                     value: formatGlucose(simpleStats.avgGlucose),
-                    unit: Storage.shared.units.value,
+                    unit: UnitSettingsStore.shared.glucoseUnit.rawValue,
                     color: Color(red: 0.20, green: 0.99, blue: 0.70)
                 )
 
@@ -341,7 +356,7 @@ struct StatsGridView: View {
                     StatCard(
                         title: showStdDev ? "Std Deviation" : "CV",
                         value: showStdDev ? formatStdDev(simpleStats.stdDeviation) : formatCV(simpleStats.coefficientOfVariation),
-                        unit: showStdDev ? Storage.shared.units.value : "%",
+                        unit: showStdDev ? UnitSettingsStore.shared.glucoseUnit.rawValue : "%",
                         color: .orange,
                         isInteractive: true
                     )
@@ -403,34 +418,25 @@ struct StatsGridView: View {
         }
     }
 
-    private func formatGMI(_ value: Double?) -> String {
-        guard let value = value else { return "---" }
+    private func formatGMI(_ avgGlucose: Double?) -> String {
+        guard let value = GlycemicMetricCalculator.calculateGMI(avgGlucoseInDisplayUnits: avgGlucose) else { return "---" }
+        if UnitSettingsStore.shared.glycemicOutputUnit == .mmolMol {
+            return String(format: "%.0f", value)
+        }
         return String(format: "%.1f", value)
     }
 
     private func formatEhbA1c(_ avgGlucose: Double?) -> String {
-        guard let avgGlucose = avgGlucose else { return "---" }
-
-        let avgGlucoseMgdL: Double
-        if Storage.shared.units.value == "mg/dL" {
-            avgGlucoseMgdL = avgGlucose
-        } else {
-            avgGlucoseMgdL = avgGlucose * 18.0182
-        }
-
-        let ehba1cPercent = (avgGlucoseMgdL + 46.7) / 28.7
-
-        if Storage.shared.units.value == "mg/dL" {
-            return String(format: "%.1f", ehba1cPercent)
-        } else {
-            let ehba1cMmolMol = (ehba1cPercent - 2.15) * 10.929
-            return String(format: "%.0f", ehba1cMmolMol)
+        guard let value = GlycemicMetricCalculator.calculateEhba1c(avgGlucoseInDisplayUnits: avgGlucose) else { return "---" }
+        if UnitSettingsStore.shared.glycemicOutputUnit == .mmolMol {
+            return String(format: "%.0f", value)
         }
+        return String(format: "%.1f", value)
     }
 
     private func formatGlucose(_ value: Double?) -> String {
         guard let value = value else { return "---" }
-        if Storage.shared.units.value == "mg/dL" {
+        if UnitSettingsStore.shared.glucoseUnit == .mgdL {
             return String(format: "%.0f", value)
         } else {
             return String(format: "%.1f", value)
@@ -439,7 +445,7 @@ struct StatsGridView: View {
 
     private func formatStdDev(_ value: Double?) -> String {
         guard let value = value else { return "---" }
-        if Storage.shared.units.value == "mg/dL" {
+        if UnitSettingsStore.shared.glucoseUnit == .mgdL {
             return String(format: "%.0f", value)
         } else {
             return String(format: "%.1f", value)
diff --git a/LoopFollow/Stats/AggregatedStatsViewModel.swift b/LoopFollow/Stats/AggregatedStatsViewModel.swift
index 005de2f41..253352e48 100644
--- a/LoopFollow/Stats/AggregatedStatsViewModel.swift
+++ b/LoopFollow/Stats/AggregatedStatsViewModel.swift
@@ -39,9 +39,8 @@ class AggregatedStatsViewModel: ObservableObject {
     }
 
     func updatePeriod(_ days: Int, completion: @escaping () -> Void = {}) {
-        let endDate = Date()
-        let startDate = dateTimeUtils.displayCalendar().date(byAdding: .day, value: -days, to: endDate) ?? endDate
-        updateDateRange(start: startDate, end: endDate, completion: completion)
+        let range = StatsDateRange.lastComplete(days: days)
+        updateDateRange(start: range.start, end: range.end, completion: completion)
     }
 
     func updateDateRange(start: Date, end: Date, completion: @escaping () -> Void = {}) {
diff --git a/LoopFollow/Stats/DateRangePicker.swift b/LoopFollow/Stats/DateRangePicker.swift
index 5bc9c334f..8b15e10d1 100644
--- a/LoopFollow/Stats/DateRangePicker.swift
+++ b/LoopFollow/Stats/DateRangePicker.swift
@@ -31,13 +31,13 @@ struct DateRangePicker: View {
 
     private var dayCount: Int {
         let calendar = dateTimeUtils.displayCalendar()
-        return calendar.dateComponents([.day], from: startDate, to: endDate).day ?? 0
+        let startDay = calendar.startOfDay(for: startDate)
+        let endDay = calendar.startOfDay(for: endDate)
+        return (calendar.dateComponents([.day], from: startDay, to: endDay).day ?? 0) + 1
     }
 
     private var lastFullDay: Date {
-        let calendar = dateTimeUtils.displayCalendar()
-        let startOfToday = calendar.startOfDay(for: Date())
-        return calendar.date(byAdding: .second, value: -1, to: startOfToday) ?? Date()
+        StatsDateRange.lastComplete(days: 1).end
     }
 
     var body: some View {
@@ -238,11 +238,9 @@ struct DateRangePicker: View {
     }
 
     private func setDateRange(days: Int) {
-        let calendar = dateTimeUtils.displayCalendar()
-        endDate = lastFullDay
-        let endDayStart = calendar.startOfDay(for: endDate)
-        let startDayStart = calendar.date(byAdding: .day, value: -days, to: endDayStart) ?? endDayStart
-        startDate = calendar.startOfDay(for: startDayStart)
+        let range = StatsDateRange.lastComplete(days: days)
+        startDate = range.start
+        endDate = range.end
         showStartDatePicker = false
         showEndDatePicker = false
         onDateChange()
diff --git a/LoopFollow/Stats/SimpleStatsViewModel.swift b/LoopFollow/Stats/SimpleStatsViewModel.swift
index 960e17c57..841f4ca2a 100644
--- a/LoopFollow/Stats/SimpleStatsViewModel.swift
+++ b/LoopFollow/Stats/SimpleStatsViewModel.swift
@@ -38,21 +38,22 @@ class SimpleStatsViewModel: ObservableObject {
     }
 
     func calculateStats() {
+        let unitSettings = UnitSettingsStore.shared
         let bgData = dataService.getBGData()
         guard !bgData.isEmpty else { return }
 
         let totalGlucose = bgData.reduce(0) { $0 + $1.sgv }
         let avgBGmgdL = Double(totalGlucose) / Double(bgData.count)
-        avgGlucose = Storage.shared.units.value == "mg/dL" ? avgBGmgdL : avgBGmgdL * GlucoseConversion.mgDlToMmolL
+        avgGlucose = unitSettings.convertMgdlToDisplay(avgBGmgdL)
 
         let variance = bgData.reduce(0.0) { sum, reading in
             let diff = Double(reading.sgv) - avgBGmgdL
             return sum + (diff * diff)
         }
         let stdDevMgdL = sqrt(variance / Double(bgData.count))
-        stdDeviation = Storage.shared.units.value == "mg/dL" ? stdDevMgdL : stdDevMgdL * GlucoseConversion.mgDlToMmolL
+        stdDeviation = unitSettings.convertMgdlToDisplay(stdDevMgdL)
 
-        gmi = 3.31 + (0.02392 * avgBGmgdL)
+        gmi = GlycemicMetricCalculator.calculateGMI(avgGlucoseInDisplayUnits: avgGlucose)
 
         if avgBGmgdL > 0 {
             coefficientOfVariation = (stdDevMgdL / avgBGmgdL) * 100.0
@@ -66,7 +67,7 @@ class SimpleStatsViewModel: ObservableObject {
         let smbTotal = smbInPeriod.reduce(0.0) { $0 + $1.value }
         let totalBolusInPeriod = bolusTotal + smbTotal
 
-        let cutoffTime = Date().timeIntervalSince1970 - (Double(dataService.daysToAnalyze) * 24 * 60 * 60)
+        let cutoffTime = dataService.startDate.timeIntervalSince1970
         let allBolusDates = (bolusesInPeriod + smbInPeriod).map { $0.date }.filter { $0 >= cutoffTime }
         let actualDays = calculateActualDaysCovered(dates: allBolusDates, requestedDays: dataService.daysToAnalyze)
 
@@ -93,7 +94,7 @@ class SimpleStatsViewModel: ObservableObject {
 
         let totalCarbsInPeriod = dailyCarbs.values.reduce(0.0, +)
 
-        let daysWithData = max(dailyCarbs.count, 1)
+        let daysWithData = dataService.daysToAnalyze
 
         if daysWithData > 0 {
             avgCarbs = totalCarbsInPeriod / Double(daysWithData)
@@ -295,7 +296,7 @@ class SimpleStatsViewModel: ObservableObject {
         guard !dates.isEmpty else { return requestedDays }
 
         let calendar = dateTimeUtils.displayCalendar()
-        let cutoffTime = Date().timeIntervalSince1970 - (Double(requestedDays) * 24 * 60 * 60)
+        let cutoffTime = dataService.startDate.timeIntervalSince1970
         let filteredDates = dates.filter { $0 >= cutoffTime }
 
         var uniqueDays = Set<Date>()
diff --git a/LoopFollow/Stats/StatsDataService.swift b/LoopFollow/Stats/StatsDataService.swift
index 80ea66b54..4aa5b7c7f 100644
--- a/LoopFollow/Stats/StatsDataService.swift
+++ b/LoopFollow/Stats/StatsDataService.swift
@@ -32,9 +32,11 @@ class StatsDataService {
     func updateDateRange(start: Date, end: Date) {
         startDate = start
         endDate = end
-        // Also update daysToAnalyze for compatibility with existing code
-        let daysBetween = dateTimeUtils.displayCalendar().dateComponents([.day], from: start, to: end).day ?? 14
-        daysToAnalyze = max(daysBetween, 1)
+        let calendar = dateTimeUtils.displayCalendar()
+        let startDay = calendar.startOfDay(for: start)
+        let endDay = calendar.startOfDay(for: end)
+        let daysBetween = calendar.dateComponents([.day], from: startDay, to: endDay).day ?? 13
+        daysToAnalyze = daysBetween + 1
     }
 
     func ensureDataAvailable(onProgress: @escaping () -> Void, completion: @escaping () -> Void) {
diff --git a/LoopFollow/Stats/StatsDateRange.swift b/LoopFollow/Stats/StatsDateRange.swift
new file mode 100644
index 000000000..e2e00458b
--- /dev/null
+++ b/LoopFollow/Stats/StatsDateRange.swift
@@ -0,0 +1,17 @@
+// LoopFollow
+// StatsDateRange.swift
+
+import Foundation
+
+enum StatsDateRange {
+    /// Returns start/end dates for the last complete N-day period.
+    /// End is 23:59:59 of yesterday; start is 00:00:00 of the day N days back.
+    static func lastComplete(days: Int) -> (start: Date, end: Date) {
+        let calendar = dateTimeUtils.displayCalendar()
+        let startOfToday = calendar.startOfDay(for: Date())
+        let end = calendar.date(byAdding: .second, value: -1, to: startOfToday) ?? Date()
+        let endDayStart = calendar.startOfDay(for: end)
+        let start = calendar.date(byAdding: .day, value: -(days - 1), to: endDayStart) ?? endDayStart
+        return (start: calendar.startOfDay(for: start), end: end)
+    }
+}
diff --git a/LoopFollow/Stats/TIR/TIRCalculator.swift b/LoopFollow/Stats/TIR/TIRCalculator.swift
index 9d29fb41f..b387b5702 100644
--- a/LoopFollow/Stats/TIR/TIRCalculator.swift
+++ b/LoopFollow/Stats/TIR/TIRCalculator.swift
@@ -4,12 +4,13 @@
 import Foundation
 
 class TIRCalculator {
-    static func calculate(bgData: [ShareGlucoseData], useTightRange: Bool = false) -> [TIRDataPoint] {
+    static func calculate(bgData: [ShareGlucoseData]) -> [TIRDataPoint] {
         guard !bgData.isEmpty else { return [] }
 
+        let thresholds = UnitSettingsStore.shared.effectiveThresholds()
         let veryLowThreshold = 54.0
-        let lowThreshold = 70.0
-        let highThreshold = useTightRange ? 140.0 : 180.0
+        let lowThreshold = thresholds.low
+        let highThreshold = thresholds.high
         let veryHighThreshold = 250.0
         var periodData: [TIRPeriod: [Double]] = [:]
         let calendar = dateTimeUtils.displayCalendar()
diff --git a/LoopFollow/Stats/TIR/TIRView.swift b/LoopFollow/Stats/TIR/TIRView.swift
index ac81c6880..fade4cc2e 100644
--- a/LoopFollow/Stats/TIR/TIRView.swift
+++ b/LoopFollow/Stats/TIR/TIRView.swift
@@ -13,7 +13,7 @@ struct TIRView: View {
             ZStack(alignment: .topTrailing) {
                 VStack(alignment: .leading, spacing: 12) {
                     HStack {
-                        Text(viewModel.showTITR ? "Time in Tight Range" : "Time in Range")
+                        Text(tirTitle)
                             .font(.caption)
                             .foregroundColor(.secondary)
                         Spacer()
@@ -32,7 +32,7 @@ struct TIRView: View {
 
                         VStack(alignment: .leading, spacing: 8) {
                             if let average = viewModel.tirData.first(where: { $0.period == .average }) {
-                                Text("Cutoffs in \(Storage.shared.units.value)")
+                                Text("Cutoffs in \(UnitSettingsStore.shared.glucoseUnit.rawValue)")
                                     .foregroundColor(.secondary)
 
                                 TIRLegendItem(
@@ -84,19 +84,41 @@ struct TIRView: View {
         .buttonStyle(PlainButtonStyle())
     }
 
-    private func formatRange(_: Double) -> String {
-        let lowThreshold: Double
-        let highThreshold: Double
-
-        if Storage.shared.units.value == "mg/dL" {
-            lowThreshold = 70.0
-            highThreshold = viewModel.showTITR ? 140.0 : 180.0
-        } else {
-            lowThreshold = 3.9
-            highThreshold = viewModel.showTITR ? 7.8 : 10.0
+    private var tirTitle: String {
+        switch UnitSettingsStore.shared.timeInRangeMode {
+        case .tir:
+            return "Time in Range"
+        case .titr:
+            return "Time in Tight Range"
+        case .custom:
+            return "Custom Range"
         }
+    }
+
+    private func formatRange(_: Double) -> String {
+        let thresholds = UnitSettingsStore.shared.effectiveThresholds()
+        let glucoseUnit = UnitSettingsStore.shared.glucoseUnit
+        let low = UnitSettingsStore.shared.convertMgdlToDisplay(thresholds.low)
+        let high = UnitSettingsStore.shared.convertMgdlToDisplay(thresholds.high)
+        let digits = glucoseUnit.fractionDigits
+        let fmt = "%.\(digits)f – %.\(digits)f %@"
+        return String(format: fmt, low, high, glucoseUnit.rawValue)
+    }
+
+    private var lowThreshold: Double {
+        UnitSettingsStore.shared.convertMgdlToDisplay(UnitSettingsStore.shared.effectiveThresholds().low)
+    }
 
-        return String(format: "%.1f – %.1f %@", lowThreshold, highThreshold, Storage.shared.units.value)
+    private var highThreshold: Double {
+        UnitSettingsStore.shared.convertMgdlToDisplay(UnitSettingsStore.shared.effectiveThresholds().high)
+    }
+
+    private var veryLowThreshold: Double {
+        UnitSettingsStore.shared.convertMgdlToDisplay(54.0)
+    }
+
+    private var veryHighThreshold: Double {
+        UnitSettingsStore.shared.convertMgdlToDisplay(250.0)
     }
 
     private var veryLowCutoffText: String {
@@ -119,30 +141,9 @@ struct TIRView: View {
         "> \(formatThreshold(veryHighThreshold))"
     }
 
-    private var lowThreshold: Double {
-        Storage.shared.units.value == "mg/dL" ? 70.0 : 3.9
-    }
-
-    private var highThreshold: Double {
-        if Storage.shared.units.value == "mg/dL" {
-            return viewModel.showTITR ? 140.0 : 180.0
-        }
-        return viewModel.showTITR ? 7.8 : 10.0
-    }
-
-    private var veryLowThreshold: Double {
-        Storage.shared.units.value == "mg/dL" ? 54.0 : 3.0
-    }
-
-    private var veryHighThreshold: Double {
-        Storage.shared.units.value == "mg/dL" ? 250.0 : 13.9
-    }
-
     private func formatThreshold(_ value: Double) -> String {
-        if Storage.shared.units.value == "mg/dL" {
-            return String(format: "%.0f", value)
-        }
-        return String(format: "%.1f", value)
+        let digits = UnitSettingsStore.shared.glucoseUnit.fractionDigits
+        return String(format: "%.\(digits)f", value)
     }
 }
 
diff --git a/LoopFollow/Stats/TIR/TIRViewModel.swift b/LoopFollow/Stats/TIR/TIRViewModel.swift
index eb13fbdcb..6f04bddec 100644
--- a/LoopFollow/Stats/TIR/TIRViewModel.swift
+++ b/LoopFollow/Stats/TIR/TIRViewModel.swift
@@ -6,27 +6,29 @@ import Foundation
 
 class TIRViewModel: ObservableObject {
     @Published var tirData: [TIRDataPoint] = []
-    @Published var showTITR: Bool {
-        didSet {
-            Storage.shared.showTITR.value = showTITR
-        }
-    }
 
     private let dataService: StatsDataService
 
     init(dataService: StatsDataService) {
         self.dataService = dataService
-        showTITR = Storage.shared.showTITR.value
         calculateTIR()
     }
 
     func calculateTIR() {
         let bgData = dataService.getBGData()
-        tirData = TIRCalculator.calculate(bgData: bgData, useTightRange: showTITR)
+        tirData = TIRCalculator.calculate(bgData: bgData)
     }
 
     func toggleTIRMode() {
-        showTITR.toggle()
+        let mode = UnitSettingsStore.shared.timeInRangeMode
+        switch mode {
+        case .tir:
+            UnitSettingsStore.shared.timeInRangeMode = .titr
+        case .titr:
+            UnitSettingsStore.shared.timeInRangeMode = .custom
+        case .custom:
+            UnitSettingsStore.shared.timeInRangeMode = .tir
+        }
         calculateTIR()
     }
 
diff --git a/LoopFollow/Storage/Framework/ObservableUserDefaultsValue.swift b/LoopFollow/Storage/Framework/ObservableUserDefaultsValue.swift
index b7d5982f6..bc2c1a98d 100644
--- a/LoopFollow/Storage/Framework/ObservableUserDefaultsValue.swift
+++ b/LoopFollow/Storage/Framework/ObservableUserDefaultsValue.swift
@@ -37,8 +37,6 @@ class ObservableUserDefaultsValue<T: AnyConvertible & Equatable>: ObservableObje
 
                 // Notify UserDefaultsValueGroups that value has changed
                 UserDefaultsValueGroups.valueChanged(self)
-
-                print("Value for \(self.key) changed to \(self.value)") // Logging
             }
         }
     }
diff --git a/LoopFollow/Storage/Framework/ObservableValue.swift b/LoopFollow/Storage/Framework/ObservableValue.swift
index c03448f1e..e690b4ac2 100644
--- a/LoopFollow/Storage/Framework/ObservableValue.swift
+++ b/LoopFollow/Storage/Framework/ObservableValue.swift
@@ -14,7 +14,6 @@ class ObservableValue<T>: ObservableObject {
     }
 
     func set(_ newValue: T) {
-        print("Setting new value: \(newValue)")
         DispatchQueue.main.async {
             self.value = newValue
         }
diff --git a/LoopFollow/Storage/Storage+Migrate.swift b/LoopFollow/Storage/Storage+Migrate.swift
index 70cd30dc1..d74fc0625 100644
--- a/LoopFollow/Storage/Storage+Migrate.swift
+++ b/LoopFollow/Storage/Storage+Migrate.swift
@@ -33,6 +33,18 @@ extension Storage {
         }
     }
 
+    func migrateStep8() {
+        // Migrate showTITR bool + custom lowLine/highLine into timeInRangeModeRaw.
+        LogManager.shared.log(category: .general, message: "Running migrateStep8 — timeInRangeMode migration")
+
+        if showTITR.value {
+            timeInRangeModeRaw.value = TimeInRangeDisplayMode.titr.rawValue
+        } else if lowLine.value != 70.0 || highLine.value != 180.0 {
+            timeInRangeModeRaw.value = TimeInRangeDisplayMode.custom.rawValue
+        }
+        // else: default "TIR" is already set
+    }
+
     func migrateStep7() {
         // Cancel notifications scheduled with old hardcoded identifiers.
         // Replaced with bundle-ID-scoped identifiers for multi-instance support.
diff --git a/LoopFollow/Storage/Storage.swift b/LoopFollow/Storage/Storage.swift
index 5dea5ebb1..9a35816cc 100644
--- a/LoopFollow/Storage/Storage.swift
+++ b/LoopFollow/Storage/Storage.swift
@@ -33,7 +33,7 @@ class Storage {
     var mealWithFatProtein = StorageValue<Bool>(key: "mealWithFatProtein", defaultValue: false)
 
     // TODO: This flag can be deleted in March 2027. Check the commit for other places to cleanup.
-    var hasSeenFatProteinOrderChange = StorageValue<Bool>(key: "hasSeenFatProteinOrderChange", defaultValue: false)
+    var hasSeenFatProteinOrderChange = StorageValue<Bool>(key: "hasSeenFatProteinOrderChange", defaultValue: true)
 
     var backgroundRefreshType = StorageValue<BackgroundRefreshType>(key: "backgroundRefreshType", defaultValue: .silentTune)
 
@@ -93,6 +93,7 @@ class Storage {
     var lastBgReadingTimeSeconds = StorageValue<TimeInterval?>(key: "lastBgReadingTimeSeconds", defaultValue: nil)
     var lastDeltaMgdl = StorageValue<Double?>(key: "lastDeltaMgdl", defaultValue: nil)
     var lastTrendCode = StorageValue<String?>(key: "lastTrendCode", defaultValue: nil)
+    var lastBgMgdl = StorageValue<Double?>(key: "lastBgMgdl", defaultValue: nil)
     var lastIOB = StorageValue<Double?>(key: "lastIOB", defaultValue: nil)
     var lastCOB = StorageValue<Double?>(key: "lastCOB", defaultValue: nil)
     var projectedBgMgdl = StorageValue<Double?>(key: "projectedBgMgdl", defaultValue: nil)
@@ -116,6 +117,9 @@ class Storage {
     var laEnabled = StorageValue<Bool>(key: "laEnabled", defaultValue: false)
     var laRenewBy = StorageValue<TimeInterval>(key: "laRenewBy", defaultValue: 0)
     var laRenewalFailed = StorageValue<Bool>(key: "laRenewalFailed", defaultValue: false)
+    var laPushToStartToken = StorageValue<String>(key: "laPushToStartToken", defaultValue: "")
+    var laLastPushToStartAt = StorageValue<TimeInterval>(key: "laLastPushToStartAt", defaultValue: 0)
+    var laPushToStartBackoff = StorageValue<TimeInterval>(key: "laPushToStartBackoff", defaultValue: 0)
 
     // Graph Settings [BEGIN]
     var showDots = StorageValue<Bool>(key: "showDots", defaultValue: true)
@@ -182,9 +186,22 @@ class Storage {
     var lastVersionUpdateNotificationShown = StorageValue<Date?>(key: "lastVersionUpdateNotificationShown", defaultValue: nil)
     var lastExpirationNotificationShown = StorageValue<Date?>(key: "lastExpirationNotificationShown", defaultValue: nil)
 
+    // MARK: - Telemetry -----------------------------------------------------------
+
+    // See LoopFollow/Helpers/Telemetry.swift.
+
+    var telemetryEnabled = StorageValue<Bool>(key: "telemetryEnabled", defaultValue: true)
+    var telemetryConsentDecisionMade = StorageValue<Bool>(key: "telemetryConsentDecisionMade", defaultValue: false)
+    var telemetryLastSentAt = StorageValue<Date?>(key: "telemetryLastSentAt", defaultValue: nil)
+    var telemetryLastSentSha = StorageValue<String>(key: "telemetryLastSentSha", defaultValue: "")
+
+    // Sliding 7-day window of cold-launch timestamps.
+    var telemetryColdLaunchTimes = StorageValue<[Date]>(key: "telemetryColdLaunchTimes", defaultValue: [])
+
     var hideInfoTable = StorageValue<Bool>(key: "hideInfoTable", defaultValue: false)
     var token = StorageValue<String>(key: "token", defaultValue: "")
     var units = StorageValue<String>(key: "units", defaultValue: "mg/dL")
+    var hasConfiguredUnits = StorageValue<Bool>(key: "hasConfiguredUnits", defaultValue: false)
 
     var infoSort = StorageValue<[Int]>(key: "infoSort", defaultValue: InfoType.allCases.map(\.sortOrder))
     var infoVisible = StorageValue<[Bool]>(key: "infoVisible", defaultValue: InfoType.allCases.map(\.defaultVisible))
@@ -194,7 +211,10 @@ class Storage {
     var nsWriteAuth = StorageValue<Bool>(key: "nsWriteAuth", defaultValue: false)
     var nsAdminAuth = StorageValue<Bool>(key: "nsAdminAuth", defaultValue: false)
 
-    var migrationStep = StorageValue<Int>(key: "migrationStep", defaultValue: 0)
+    // When adding a new migration step in `runMigrationsIfNeeded()`, bump this default
+    // to the new latest step number so fresh installs skip all migrations. Other defaults
+    // in this file must reflect the post-migration final state for a fresh install.
+    var migrationStep = StorageValue<Int>(key: "migrationStep", defaultValue: 7)
 
     var persistentNotification = StorageValue<Bool>(key: "persistentNotification", defaultValue: false)
     var persistentNotificationLastBGTime = StorageValue<Date>(key: "persistentNotificationLastBGTime", defaultValue: .distantPast)
@@ -206,9 +226,9 @@ class Storage {
     // Tab positions - which position each item is in (positions 1-4 are customizable, 5 is always Menu)
     var homePosition = StorageValue<TabPosition>(key: "homePosition", defaultValue: .position1)
     var alarmsPosition = StorageValue<TabPosition>(key: "alarmsPosition", defaultValue: .position2)
-    var snoozerPosition = StorageValue<TabPosition>(key: "snoozerPosition", defaultValue: .menu)
-    var nightscoutPosition = StorageValue<TabPosition>(key: "nightscoutPosition", defaultValue: .position3)
-    var remotePosition = StorageValue<TabPosition>(key: "remotePosition", defaultValue: .position4)
+    var snoozerPosition = StorageValue<TabPosition>(key: "snoozerPosition", defaultValue: .position3)
+    var nightscoutPosition = StorageValue<TabPosition>(key: "nightscoutPosition", defaultValue: .position4)
+    var remotePosition = StorageValue<TabPosition>(key: "remotePosition", defaultValue: .menu)
     var statisticsPosition = StorageValue<TabPosition>(key: "statisticsPosition", defaultValue: .menu)
     var treatmentsPosition = StorageValue<TabPosition>(key: "treatmentsPosition", defaultValue: .menu)
 
@@ -220,6 +240,7 @@ class Storage {
     var showGMI = StorageValue<Bool>(key: "showGMI", defaultValue: true)
     var showStdDev = StorageValue<Bool>(key: "showStdDev", defaultValue: true)
     var showTITR = StorageValue<Bool>(key: "showTITR", defaultValue: false)
+    var timeInRangeModeRaw = StorageValue<String>(key: "timeInRangeMode", defaultValue: "TIR")
 
     static let shared = Storage()
     private init() {}
@@ -233,8 +254,8 @@ class Storage {
     /// launch, where Storage was initialized while UserDefaults was encrypted and all values were
     /// cached as their defaults.
     ///
-    /// `migrationStep` is intentionally excluded: viewDidLoad writes it to 6 during the BFU
-    /// launch; if we reloaded it and the flush had somehow not landed yet, migrations would re-run.
+    /// `migrationStep` is intentionally excluded: viewDidLoad writes it to the latest step during
+    /// the BFU launch; if we reloaded it and the flush had somehow not landed yet, migrations would re-run.
     ///
     /// SecureStorageValue properties (maxBolus, maxCarbs, maxProtein, maxFat, bolusIncrement) are
     /// not covered here — SecureStorageValue does not implement reload() and Keychain has the same
@@ -325,6 +346,9 @@ class Storage {
         laEnabled.reload()
         laRenewBy.reload()
         laRenewalFailed.reload()
+        laPushToStartToken.reload()
+        laLastPushToStartAt.reload()
+        laPushToStartBackoff.reload()
 
         showDots.reload()
         showLines.reload()
@@ -409,6 +433,7 @@ class Storage {
         showGMI.reload()
         showStdDev.reload()
         showTITR.reload()
+        timeInRangeModeRaw.reload()
     }
 
     // MARK: - Tab Position Helpers
diff --git a/LoopFollow/Task/TaskScheduler.swift b/LoopFollow/Task/TaskScheduler.swift
index a18b92aa3..51588fb7a 100644
--- a/LoopFollow/Task/TaskScheduler.swift
+++ b/LoopFollow/Task/TaskScheduler.swift
@@ -12,6 +12,7 @@ enum TaskID: CaseIterable {
     case minAgoUpdate
     case calendarWrite
     case alarmCheck
+    case telemetry
 }
 
 struct ScheduledTask {
diff --git a/LoopFollow/ViewControllers/MainViewController.swift b/LoopFollow/ViewControllers/MainViewController.swift
index ddfb2f3f0..6abea5ab4 100644
--- a/LoopFollow/ViewControllers/MainViewController.swift
+++ b/LoopFollow/ViewControllers/MainViewController.swift
@@ -42,7 +42,9 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
     @IBOutlet var statsInRangePercent: UILabel!
     @IBOutlet var statsHighPercent: UILabel!
     @IBOutlet var statsAvgBG: UILabel!
+    @IBOutlet var statsEstA1CTitle: UILabel!
     @IBOutlet var statsEstA1C: UILabel!
+    @IBOutlet var statsStdDevTitle: UILabel!
     @IBOutlet var statsStdDev: UILabel!
     @IBOutlet var serverText: UILabel!
     @IBOutlet var statsView: UIView!
@@ -290,10 +292,23 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
             }
             .store(in: &cancellables)
 
-        Storage.shared.useIFCC.$value
+        Publishers.MergeMany(
+            Storage.shared.units.$value.map { _ in () }.eraseToAnyPublisher(),
+            Storage.shared.useIFCC.$value.map { _ in () }.eraseToAnyPublisher(),
+            Storage.shared.showGMI.$value.map { _ in () }.eraseToAnyPublisher(),
+            Storage.shared.showStdDev.$value.map { _ in () }.eraseToAnyPublisher()
+        )
+        .receive(on: DispatchQueue.main)
+        .sink { [weak self] _ in
+            self?.updateStats()
+        }
+        .store(in: &cancellables)
+
+        Storage.shared.timeInRangeModeRaw.$value
             .receive(on: DispatchQueue.main)
             .sink { [weak self] _ in
-                self?.updateStats()
+                self?.updateBGGraphSettings()
+                self?.updateBGGraph()
             }
             .store(in: &cancellables)
 
@@ -1015,6 +1030,12 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         // Capture before migrations run: true for existing users, false for fresh installs.
         let isExistingUser = Storage.shared.migrationStep.exists
 
+        // When adding a new migration step below:
+        //   1. Bump the `migrationStep` defaultValue in Storage.swift to the new latest step
+        //      number so fresh installs skip every migration.
+        //   2. Update any other StorageValue defaults in Storage.swift that this new step
+        //      mutates, so a fresh install ends up in the same state as a migrated user.
+
         // Step 1: Released in v3.0.0 (2025-07-07). Can be removed after 2026-07-07.
         if Storage.shared.migrationStep.value < 1 {
             Storage.shared.migrateStep1()
@@ -1056,6 +1077,11 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
             Storage.shared.migrateStep7()
             Storage.shared.migrationStep.value = 7
         }
+
+        if Storage.shared.migrationStep.value < 8 {
+            Storage.shared.migrateStep8()
+            Storage.shared.migrationStep.value = 8
+        }
     }
 
     @objc func appDidBecomeActive() {
@@ -1070,12 +1096,12 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
         // after a reboot), all StorageValues were cached from encrypted UserDefaults and hold
         // their defaults. Reload everything from disk now that the device is unlocked, firing
         // Combine observers only for values that actually changed.
-        LogManager.shared.log(category: .general, message: "appCameToForeground: needsBFUReload=\(Storage.shared.needsBFUReload), url='\(Storage.shared.url.value)'")
+        LogManager.shared.log(category: .general, message: "appCameToForeground: needsBFUReload=\(Storage.shared.needsBFUReload), url='\(LogRedactor.url(Storage.shared.url.value))'")
         if Storage.shared.needsBFUReload {
             Storage.shared.needsBFUReload = false
             LogManager.shared.log(category: .general, message: "BFU reload triggered — reloading all StorageValues")
             Storage.shared.reloadAll()
-            LogManager.shared.log(category: .general, message: "BFU reload complete: url='\(Storage.shared.url.value)'")
+            LogManager.shared.log(category: .general, message: "BFU reload complete: url='\(LogRedactor.url(Storage.shared.url.value))'")
             // Show the loading overlay so the user sees feedback during the 2-5s
             // while tasks re-run with the now-correct credentials.
             loadingStates = ["bg": false, "profile": false, "deviceStatus": false]
@@ -1224,10 +1250,11 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
             let latestBG = bgData[bgData.count - 1].sgv
             var color = NSUIColor.label
             if Storage.shared.colorBGText.value {
-                if Double(latestBG) >= Storage.shared.highLine.value {
+                let thresholds = UnitSettingsStore.shared.effectiveThresholds()
+                if Double(latestBG) >= thresholds.high {
                     color = NSUIColor.systemYellow
                     Observable.shared.bgTextColor.value = .yellow
-                } else if Double(latestBG) <= Storage.shared.lowLine.value {
+                } else if Double(latestBG) <= thresholds.low {
                     color = NSUIColor.systemRed
                     Observable.shared.bgTextColor.value = .red
                 } else {
@@ -1566,15 +1593,30 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
     }
 
     @objc private func setupNightscoutTapped() {
-        let nightscoutSettingsView = NightscoutSettingsView(viewModel: .init())
+        let navController = UINavigationController()
+        let nightscoutSettingsView = NightscoutSettingsView(viewModel: .init(), usesModalCloseButton: true, onContinueToUnits: { [weak navController] in
+            let unitsView = UnitsOnboardingView {
+                navController?.dismiss(animated: true)
+            }
+            let unitsController = UIHostingController(rootView: unitsView)
+            let style = Storage.shared.appearanceMode.value.userInterfaceStyle
+            unitsController.overrideUserInterfaceStyle = style
+            navController?.pushViewController(unitsController, animated: true)
+        }, onImportSettings: { [weak navController] in
+            let importSettingsView = ImportExportSettingsView()
+            let importSettingsController = UIHostingController(rootView: importSettingsView)
+            let style = Storage.shared.appearanceMode.value.userInterfaceStyle
+            importSettingsController.overrideUserInterfaceStyle = style
+            navController?.pushViewController(importSettingsController, animated: true)
+        })
         let hostingController = UIHostingController(rootView: nightscoutSettingsView)
-        let navController = UINavigationController(rootViewController: hostingController)
 
         // Apply appearance mode
         let style = Storage.shared.appearanceMode.value.userInterfaceStyle
         hostingController.overrideUserInterfaceStyle = style
         navController.overrideUserInterfaceStyle = style
 
+        navController.setViewControllers([hostingController], animated: false)
         hostingController.navigationItem.rightBarButtonItem = makeCloseBarButtonItem()
 
         navController.modalPresentationStyle = .pageSheet
@@ -1582,15 +1624,24 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
     }
 
     @objc private func setupDexcomTapped() {
-        let dexcomSettingsView = DexcomSettingsView(viewModel: .init())
+        let navController = UINavigationController()
+        let dexcomSettingsView = DexcomSettingsView(viewModel: .init(), usesModalCloseButton: true, onContinueToUnits: { [weak navController] in
+            let unitsView = UnitsOnboardingView {
+                navController?.dismiss(animated: true)
+            }
+            let unitsController = UIHostingController(rootView: unitsView)
+            let style = Storage.shared.appearanceMode.value.userInterfaceStyle
+            unitsController.overrideUserInterfaceStyle = style
+            navController?.pushViewController(unitsController, animated: true)
+        })
         let hostingController = UIHostingController(rootView: dexcomSettingsView)
-        let navController = UINavigationController(rootViewController: hostingController)
 
         // Apply appearance mode
         let style = Storage.shared.appearanceMode.value.userInterfaceStyle
         hostingController.overrideUserInterfaceStyle = style
         navController.overrideUserInterfaceStyle = style
 
+        navController.setViewControllers([hostingController], animated: false)
         hostingController.navigationItem.rightBarButtonItem = makeCloseBarButtonItem()
 
         navController.modalPresentationStyle = .pageSheet
diff --git a/LoopFollow/ViewControllers/NightScoutViewController.swift b/LoopFollow/ViewControllers/NightScoutViewController.swift
index cecb29c68..96a4b7f47 100644
--- a/LoopFollow/ViewControllers/NightScoutViewController.swift
+++ b/LoopFollow/ViewControllers/NightScoutViewController.swift
@@ -120,7 +120,7 @@ extension NightscoutViewController: WKNavigationDelegate, WKUIDelegate {
             return false
         }
 
-        NSLog("Should start: \(url.absoluteString)")
+        LogManager.shared.log(category: .nightscout, message: "Web shouldStart: \(LogRedactor.url(url.absoluteString))", isDebug: true)
         return true
     }
 
diff --git a/LoopFollow/WatchComplication/ComplicationEntryBuilder.swift b/LoopFollow/WatchComplication/ComplicationEntryBuilder.swift
new file mode 100644
index 000000000..8f045bf7a
--- /dev/null
+++ b/LoopFollow/WatchComplication/ComplicationEntryBuilder.swift
@@ -0,0 +1,227 @@
+// ComplicationEntryBuilder.swift
+// Philippe Achkar
+// 2026-03-25
+
+import ClockKit
+
+// MARK: - Complication identifiers
+
+enum ComplicationID {
+    /// graphicCircular + graphicCorner with gauge arc (Complication 1).
+    static let gaugeCorner = "LoopFollowGaugeCorner"
+    /// graphicCorner stacked text only (Complication 2).
+    static let stackCorner = "LoopFollowStackCorner"
+    // DEBUG COMPLICATION — enabled for pipeline diagnostics.
+    // Shows two timestamps to isolate pipeline failures:
+    //   outer (top):  HH:mm of snapshot.updatedAt — when CGM data last reached the Watch
+    //   inner (↺):    HH:mm when ClockKit last called getCurrentTimelineEntry
+    // If outer changes but inner is stale → reloadTimeline() not firing or ClockKit ignoring it.
+    // If inner changes but outer is stale → data delivery broken, complication rebuilding with old data.
+    static let debugCorner = "LoopFollowDebugCorner"
+}
+
+// MARK: - Entry builder
+
+enum ComplicationEntryBuilder {
+
+    // MARK: - Live template
+
+    static func template(
+        for family: CLKComplicationFamily,
+        snapshot: GlucoseSnapshot,
+        identifier: String
+    ) -> CLKComplicationTemplate? {
+        switch family {
+        case .graphicCircular:
+            return graphicCircularTemplate(snapshot: snapshot)
+        case .graphicCorner:
+            switch identifier {
+            case ComplicationID.stackCorner:  return graphicCornerStackTemplate(snapshot: snapshot)
+            case ComplicationID.debugCorner:  return graphicCornerDebugTemplate(snapshot: snapshot)
+            default:                          return graphicCornerGaugeTemplate(snapshot: snapshot)
+            }
+        default:
+            return nil
+        }
+    }
+
+    // MARK: - Stale template
+
+    static func staleTemplate(for family: CLKComplicationFamily, identifier: String) -> CLKComplicationTemplate? {
+        switch family {
+        case .graphicCircular:
+            return CLKComplicationTemplateGraphicCircularStackText(
+                line1TextProvider: CLKSimpleTextProvider(text: "--"),
+                line2TextProvider: CLKSimpleTextProvider(text: "")
+            )
+        case .graphicCorner:
+            switch identifier {
+            case ComplicationID.stackCorner:
+                return CLKComplicationTemplateGraphicCornerStackText(
+                    innerTextProvider: CLKSimpleTextProvider(text: ""),
+                    outerTextProvider: CLKSimpleTextProvider(text: "--")
+                )
+            case ComplicationID.debugCorner:
+                return CLKComplicationTemplateGraphicCornerStackText(
+                    innerTextProvider: CLKSimpleTextProvider(text: "STALE"),
+                    outerTextProvider: CLKSimpleTextProvider(text: "--:--")
+                )
+            default:
+                return staleGaugeTemplate()
+            }
+        default:
+            return nil
+        }
+    }
+
+    // MARK: - Placeholder template
+
+    static func placeholderTemplate(for family: CLKComplicationFamily, identifier: String) -> CLKComplicationTemplate? {
+        switch family {
+        case .graphicCircular:
+            return CLKComplicationTemplateGraphicCircularStackText(
+                line1TextProvider: CLKSimpleTextProvider(text: "---"),
+                line2TextProvider: CLKSimpleTextProvider(text: "→")
+            )
+        case .graphicCorner:
+            switch identifier {
+            case ComplicationID.stackCorner:
+                let outer = CLKSimpleTextProvider(text: "---")
+                outer.tintColor = .green
+                return CLKComplicationTemplateGraphicCornerStackText(
+                    innerTextProvider: CLKSimpleTextProvider(text: "→ --"),
+                    outerTextProvider: outer
+                )
+            case ComplicationID.debugCorner:
+                return CLKComplicationTemplateGraphicCornerStackText(
+                    innerTextProvider: CLKSimpleTextProvider(text: "DEBUG"),
+                    outerTextProvider: CLKSimpleTextProvider(text: "--:--")
+                )
+            default:
+                let outer = CLKSimpleTextProvider(text: "---")
+                outer.tintColor = .green
+                let gauge = CLKSimpleGaugeProvider(style: .fill, gaugeColor: .green, fillFraction: 0)
+                return CLKComplicationTemplateGraphicCornerGaugeText(
+                    gaugeProvider: gauge,
+                    leadingTextProvider: CLKSimpleTextProvider(text: "0"),
+                    trailingTextProvider: nil,
+                    outerTextProvider: outer
+                )
+            }
+        default:
+            return nil
+        }
+    }
+
+    // MARK: - Graphic Circular
+    // BG (top, colored) + trend arrow (bottom).
+
+    private static func graphicCircularTemplate(snapshot: GlucoseSnapshot) -> CLKComplicationTemplate {
+        let bgText = CLKSimpleTextProvider(text: WatchFormat.glucose(snapshot))
+        bgText.tintColor = thresholdColor(for: snapshot)
+
+        return CLKComplicationTemplateGraphicCircularStackText(
+            line1TextProvider: bgText,
+            line2TextProvider: CLKSimpleTextProvider(text: WatchFormat.trendArrow(snapshot))
+        )
+    }
+
+    // MARK: - Graphic Corner — Gauge Text (Complication 1)
+    // Gauge arc fills from 0 (fresh) to 100% (15 min stale).
+    // Outer text: BG (colored). Leading text: delta.
+    // Stale / isNotLooping → "⚠" in yellow, gauge full.
+
+    private static func graphicCornerGaugeTemplate(snapshot: GlucoseSnapshot) -> CLKComplicationTemplate {
+        guard snapshot.age < 900, !snapshot.isNotLooping else {
+            return staleGaugeTemplate()
+        }
+
+        let fraction = Float(min(snapshot.age / 900.0, 1.0))
+        let color = thresholdColor(for: snapshot)
+
+        let bgText = CLKSimpleTextProvider(text: WatchFormat.glucose(snapshot))
+        bgText.tintColor = color
+
+        let gauge = CLKSimpleGaugeProvider(style: .fill, gaugeColor: color, fillFraction: fraction)
+
+        return CLKComplicationTemplateGraphicCornerGaugeText(
+            gaugeProvider: gauge,
+            leadingTextProvider: CLKSimpleTextProvider(text: WatchFormat.delta(snapshot)),
+            trailingTextProvider: nil,
+            outerTextProvider: bgText
+        )
+    }
+
+    private static func staleGaugeTemplate() -> CLKComplicationTemplate {
+        let warnText = CLKSimpleTextProvider(text: "⚠")
+        warnText.tintColor = .yellow
+
+        let gauge = CLKSimpleGaugeProvider(style: .fill, gaugeColor: .yellow, fillFraction: 1.0)
+
+        return CLKComplicationTemplateGraphicCornerGaugeText(
+            gaugeProvider: gauge,
+            leadingTextProvider: nil,
+            trailingTextProvider: nil,
+            outerTextProvider: warnText
+        )
+    }
+
+    // MARK: - Graphic Corner — Stacked Text (Complication 2)
+    // Outer (top, large): BG value, colored.
+    // Inner (bottom, small): "→ projected" (falls back to delta if no projection).
+    // Stale / isNotLooping: outer = "--", inner = "".
+
+    private static func graphicCornerStackTemplate(snapshot: GlucoseSnapshot) -> CLKComplicationTemplate {
+        guard snapshot.age < 900, !snapshot.isNotLooping else {
+            return CLKComplicationTemplateGraphicCornerStackText(
+                innerTextProvider: CLKSimpleTextProvider(text: ""),
+                outerTextProvider: CLKSimpleTextProvider(text: "--")
+            )
+        }
+
+        let bgText = CLKSimpleTextProvider(text: WatchFormat.glucose(snapshot))
+        bgText.tintColor = thresholdColor(for: snapshot)
+
+        let bottomLabel: String
+        if let _ = snapshot.projected {
+            // ⇢ = dashed arrow (U+21E2); swap for ▸ (U+25B8) if it renders poorly on-device
+            bottomLabel = "\(WatchFormat.delta(snapshot)) | ⇢\(WatchFormat.projected(snapshot))"
+        } else {
+            bottomLabel = WatchFormat.delta(snapshot)
+        }
+
+        return CLKComplicationTemplateGraphicCornerStackText(
+            innerTextProvider: CLKSimpleTextProvider(text: bottomLabel),
+            outerTextProvider: bgText
+        )
+    }
+
+    // MARK: - Graphic Corner — Debug (Complication 3)
+    // Outer (top): HH:mm of the snapshot's updatedAt — when the CGM reading arrived.
+    // Inner (bottom): "↺ HH:mm" — when ClockKit last called getCurrentTimelineEntry.
+    //
+    // Reading the two times tells you:
+    //   outer changes  → Watch is receiving new data
+    //   inner changes  → ClockKit is refreshing the complication face
+    //   inner stale    → reloadTimeline is not being called or ClockKit is ignoring it
+
+    private static func graphicCornerDebugTemplate(snapshot: GlucoseSnapshot) -> CLKComplicationTemplate {
+        let dataTime  = WatchFormat.updateTime(snapshot)
+        let buildTime = WatchFormat.currentTime()
+
+        return CLKComplicationTemplateGraphicCornerStackText(
+            innerTextProvider: CLKSimpleTextProvider(text: "↺ \(buildTime)"),
+            outerTextProvider: CLKSimpleTextProvider(text: dataTime)
+        )
+    }
+
+    // MARK: - Threshold color
+
+    /// snapshot.glucose is always in mg/dL (builder stores canonical mg/dL).
+    static func thresholdColor(for snapshot: GlucoseSnapshot) -> UIColor {
+        let t = LAAppGroupSettings.thresholdsMgdl()
+        if snapshot.glucose < t.low  { return .red }
+        if snapshot.glucose > t.high { return .orange }
+        return .green
+    }
+}
diff --git a/LoopFollow/WatchComplication/WatchComplicationProvider.swift b/LoopFollow/WatchComplication/WatchComplicationProvider.swift
new file mode 100644
index 000000000..3e59c9d97
--- /dev/null
+++ b/LoopFollow/WatchComplication/WatchComplicationProvider.swift
@@ -0,0 +1,127 @@
+// WatchComplicationProvider.swift
+// Philippe Achkar
+// 2026-03-10
+
+import ClockKit
+import Foundation
+import os.log
+
+private let watchLog = OSLog(
+    subsystem: Bundle.main.bundleIdentifier ?? "com.loopfollow.watch",
+    category: "Watch"
+)
+
+final class WatchComplicationProvider: NSObject, CLKComplicationDataSource {
+
+    // MARK: - Complication Descriptors
+
+    func getComplicationDescriptors(handler: @escaping ([CLKComplicationDescriptor]) -> Void) {
+        let descriptors = [
+            // Complication 1: BG + gauge arc (graphicCircular + graphicCorner)
+            CLKComplicationDescriptor(
+                identifier: ComplicationID.gaugeCorner,
+                displayName: "LoopFollow",
+                supportedFamilies: [.graphicCircular, .graphicCorner]
+            ),
+            // Complication 2: BG + projected BG stacked text (graphicCorner only)
+            CLKComplicationDescriptor(
+                identifier: ComplicationID.stackCorner,
+                displayName: "LoopFollow Text",
+                supportedFamilies: [.graphicCorner]
+            ),
+            // DEBUG COMPLICATION — enabled for pipeline diagnostics.
+            CLKComplicationDescriptor(
+                identifier: ComplicationID.debugCorner,
+                displayName: "LoopFollow Debug",
+                supportedFamilies: [.graphicCorner]
+            )
+        ]
+        handler(descriptors)
+    }
+
+    // MARK: - Timeline
+
+    func getCurrentTimelineEntry(
+        for complication: CLKComplication,
+        withHandler handler: @escaping (CLKComplicationTimelineEntry?) -> Void
+    ) {
+        // Whenever ClockKit calls us it hands us the CLKComplication object.
+        // Cache it so WatchSessionReceiver can call reloadTimeline() even when
+        // activeComplications is nil (common during background execution on watchOS 9+).
+        WatchSessionReceiver.shared.cacheComplication(complication)
+
+        // Prefer the file store (persists across launches); fall back to the in-memory
+        // cache in case the file write hasn't completed or the store is unavailable.
+        guard let snapshot = GlucoseSnapshotStore.shared.load()
+                          ?? WatchSessionReceiver.shared.lastSnapshot
+        else {
+            os_log("WatchComplicationProvider: no snapshot available (store and cache both nil)", log: watchLog, type: .error)
+            handler(nil)
+            return
+        }
+
+        os_log("WatchComplicationProvider: getCurrentTimelineEntry g=%d age=%ds id=%{public}@", log: watchLog, type: .info, Int(snapshot.glucose), Int(snapshot.age), complication.identifier)
+
+        guard snapshot.age < 900 else {
+            os_log("WatchComplicationProvider: snapshot stale (%d s)", log: watchLog, type: .debug, Int(snapshot.age))
+            handler(staleEntry(for: complication))
+            return
+        }
+
+        let template = ComplicationEntryBuilder.template(
+            for: complication.family,
+            snapshot: snapshot,
+            identifier: complication.identifier
+        )
+        let entry = template.map {
+            CLKComplicationTimelineEntry(date: snapshot.updatedAt, complicationTemplate: $0)
+        }
+        handler(entry)
+    }
+
+    func getTimelineEndDate(
+        for complication: CLKComplication,
+        withHandler handler: @escaping (Date?) -> Void
+    ) {
+        WatchSessionReceiver.shared.cacheComplication(complication)
+        // Expire timeline 15 minutes after last reading
+        // so Watch does not display indefinitely stale data
+        if let snapshot = GlucoseSnapshotStore.shared.load() {
+            handler(snapshot.updatedAt.addingTimeInterval(900))
+        } else {
+            handler(nil)
+        }
+    }
+
+    func getPrivacyBehavior(
+        for complication: CLKComplication,
+        withHandler handler: @escaping (CLKComplicationPrivacyBehavior) -> Void
+    ) {
+        // Glucose is sensitive — hide on locked watch face
+        handler(.hideOnLockScreen)
+    }
+
+    // MARK: - Placeholder
+
+    func getLocalizableSampleTemplate(
+        for complication: CLKComplication,
+        withHandler handler: @escaping (CLKComplicationTemplate?) -> Void
+    ) {
+        handler(ComplicationEntryBuilder.placeholderTemplate(
+            for: complication.family,
+            identifier: complication.identifier
+        ))
+    }
+
+    // MARK: - Private
+
+    private func staleEntry(for complication: CLKComplication) -> CLKComplicationTimelineEntry? {
+        let template = ComplicationEntryBuilder.staleTemplate(
+            for: complication.family,
+            identifier: complication.identifier
+        )
+        return template.map {
+            CLKComplicationTimelineEntry(date: Date(), complicationTemplate: $0)
+        }
+    }
+}
diff --git a/LoopFollow/WatchComplication/WatchFormat.swift b/LoopFollow/WatchComplication/WatchFormat.swift
new file mode 100644
index 000000000..acc7e9ec2
--- /dev/null
+++ b/LoopFollow/WatchComplication/WatchFormat.swift
@@ -0,0 +1,197 @@
+// WatchFormat.swift
+// Philippe Achkar
+// 2026-03-25
+
+import Foundation
+
+/// Formatting helpers for Watch complications and Watch app UI.
+/// All glucose values in GlucoseSnapshot are stored in mg/dL; this module
+/// converts to mmol/L for display when snapshot.unit == .mmol.
+enum WatchFormat {
+
+    // MARK: - Glucose
+
+    static func glucose(_ s: GlucoseSnapshot) -> String {
+        formatGlucoseValue(s.glucose, unit: s.unit)
+    }
+
+    static func delta(_ s: GlucoseSnapshot) -> String {
+        switch s.unit {
+        case .mgdl:
+            let v = Int(round(s.delta))
+            if v == 0 { return "0" }
+            return v > 0 ? "+\(v)" : "\(v)"
+        case .mmol:
+            let mmol = GlucoseConversion.toMmol(s.delta)
+            let d = abs(mmol) < 0.05 ? 0.0 : mmol
+            if d == 0 { return "0.0" }
+            let str = String(format: "%.1f", abs(d))
+            return d > 0 ? "+\(str)" : "-\(str)"
+        }
+    }
+
+    static func projected(_ s: GlucoseSnapshot) -> String {
+        guard let v = s.projected else { return "—" }
+        return formatGlucoseValue(v, unit: s.unit)
+    }
+
+    static func trendArrow(_ s: GlucoseSnapshot) -> String {
+        switch s.trend {
+        case .upFast:     return "↑↑"
+        case .up:         return "↑"
+        case .upSlight:   return "↗"
+        case .flat:       return "→"
+        case .downSlight: return "↘"
+        case .down:       return "↓"
+        case .downFast:   return "↓↓"
+        case .unknown:    return "–"
+        }
+    }
+
+    // MARK: - Time
+
+    /// "Xm" from now, capped display at 99m
+    static func minAgo(_ s: GlucoseSnapshot) -> String {
+        let mins = Int(s.age / 60)
+        return "\(min(mins, 99))m"
+    }
+
+    /// Time of last update formatted as "HH:mm"
+    static func updateTime(_ s: GlucoseSnapshot) -> String {
+        let f = DateFormatter()
+        f.dateFormat = "HH:mm"
+        return f.string(from: s.updatedAt)
+    }
+
+    static func currentTime() -> String {
+        let f = DateFormatter()
+        f.dateFormat = "HH:mm"
+        return f.string(from: Date())
+    }
+
+    // MARK: - Secondary metrics
+
+    static func iob(_ s: GlucoseSnapshot) -> String {
+        guard let v = s.iob else { return "—" }
+        return String(format: "%.1f", v)
+    }
+
+    static func cob(_ s: GlucoseSnapshot) -> String {
+        guard let v = s.cob else { return "—" }
+        return "\(Int(round(v)))"
+    }
+
+    static func battery(_ s: GlucoseSnapshot) -> String {
+        guard let v = s.battery else { return "—" }
+        return String(format: "%.0f%%", v)
+    }
+
+    static func pumpBattery(_ s: GlucoseSnapshot) -> String {
+        guard let v = s.pumpBattery else { return "—" }
+        return String(format: "%.0f%%", v)
+    }
+
+    static func pump(_ s: GlucoseSnapshot) -> String {
+        guard let v = s.pumpReservoirU else { return "50+U" }
+        return "\(Int(round(v)))U"
+    }
+
+    static func recBolus(_ s: GlucoseSnapshot) -> String {
+        guard let v = s.recBolus else { return "—" }
+        return String(format: "%.2fU", v)
+    }
+
+    static func autosens(_ s: GlucoseSnapshot) -> String {
+        guard let v = s.autosens else { return "—" }
+        return String(format: "%.0f%%", v * 100)
+    }
+
+    static func tdd(_ s: GlucoseSnapshot) -> String {
+        guard let v = s.tdd else { return "—" }
+        return String(format: "%.1fU", v)
+    }
+
+    static func basal(_ s: GlucoseSnapshot) -> String {
+        s.basalRate.isEmpty ? "—" : s.basalRate
+    }
+
+    static func target(_ s: GlucoseSnapshot) -> String {
+        guard let low = s.targetLowMgdl, low > 0 else { return "—" }
+        let lowStr = formatGlucoseValue(low, unit: s.unit)
+        if let high = s.targetHighMgdl, high > 0, abs(high - low) > 0.5 {
+            return "\(lowStr)-\(formatGlucoseValue(high, unit: s.unit))"
+        }
+        return lowStr
+    }
+
+    static func isf(_ s: GlucoseSnapshot) -> String {
+        guard let v = s.isfMgdlPerU, v > 0 else { return "—" }
+        return formatGlucoseValue(v, unit: s.unit)
+    }
+
+    static func carbRatio(_ s: GlucoseSnapshot) -> String {
+        guard let v = s.carbRatio, v > 0 else { return "—" }
+        return String(format: "%.0fg", v)
+    }
+
+    static func carbsToday(_ s: GlucoseSnapshot) -> String {
+        guard let v = s.carbsToday else { return "—" }
+        return "\(Int(round(v)))g"
+    }
+
+    static func minMax(_ s: GlucoseSnapshot) -> String {
+        guard let mn = s.minBgMgdl, let mx = s.maxBgMgdl else { return "—" }
+        return "\(formatGlucoseValue(mn, unit: s.unit))/\(formatGlucoseValue(mx, unit: s.unit))"
+    }
+
+    static func age(insertTime: TimeInterval) -> String {
+        guard insertTime > 0 else { return "—" }
+        let secs = Date().timeIntervalSince1970 - insertTime
+        let days = Int(secs / 86400)
+        let hours = Int(secs.truncatingRemainder(dividingBy: 86400) / 3600)
+        return days > 0 ? "\(days)d\(hours)h" : "\(hours)h"
+    }
+
+    static func override(_ s: GlucoseSnapshot) -> String { s.override ?? "—" }
+    static func profileName(_ s: GlucoseSnapshot) -> String { s.profileName ?? "—" }
+
+    // MARK: - Slot dispatch
+
+    static func slotValue(option: LiveActivitySlotOption, snapshot s: GlucoseSnapshot) -> String {
+        switch option {
+        case .none:        return ""
+        case .delta:       return delta(s)
+        case .projectedBG: return projected(s)
+        case .minMax:      return minMax(s)
+        case .iob:         return iob(s)
+        case .cob:         return cob(s)
+        case .recBolus:    return recBolus(s)
+        case .autosens:    return autosens(s)
+        case .tdd:         return tdd(s)
+        case .basal:       return basal(s)
+        case .pump:        return pump(s)
+        case .pumpBattery: return pumpBattery(s)
+        case .battery:     return battery(s)
+        case .target:      return target(s)
+        case .isf:         return isf(s)
+        case .carbRatio:   return carbRatio(s)
+        case .sage:        return age(insertTime: s.sageInsertTime)
+        case .cage:        return age(insertTime: s.cageInsertTime)
+        case .iage:        return age(insertTime: s.iageInsertTime)
+        case .carbsToday:  return carbsToday(s)
+        case .override:    return override(s)
+        case .profile:     return profileName(s)
+        }
+    }
+
+    // MARK: - Private
+
+    private static func formatGlucoseValue(_ mgdl: Double, unit: GlucoseSnapshot.Unit) -> String {
+        switch unit {
+        case .mgdl:
+            return "\(Int(round(mgdl)))"
+        case .mmol:
+            return String(format: "%.1f", GlucoseConversion.toMmol(mgdl))
+        }
+    }
+}
diff --git a/LoopFollow/WatchComplication/WatchSessionReceiver.swift b/LoopFollow/WatchComplication/WatchSessionReceiver.swift
new file mode 100644
index 000000000..44795aa38
--- /dev/null
+++ b/LoopFollow/WatchComplication/WatchSessionReceiver.swift
@@ -0,0 +1,259 @@
+// WatchSessionReceiver.swift
+// Philippe Achkar
+// 2026-03-10
+
+import Foundation
+import UserNotifications
+import WatchConnectivity
+import ClockKit
+import WatchKit
+import os.log
+
+private let watchLog = OSLog(
+    subsystem: Bundle.main.bundleIdentifier ?? "com.loopfollow.watch",
+    category: "Watch"
+)
+
+final class WatchSessionReceiver: NSObject {
+
+    // MARK: - Shared Instance
+
+    static let shared = WatchSessionReceiver()
+
+    static let snapshotReceivedNotification = Notification.Name("WatchSnapshotReceived")
+    static let settingsRefreshedNotification = Notification.Name("WatchSettingsRefreshed")
+
+    /// Held open while WatchConnectivity delivers a pending transferUserInfo in the background.
+    /// Completed after the snapshot is saved to disk.
+    var pendingConnectivityTask: WKWatchConnectivityRefreshBackgroundTask?
+
+    /// In-memory cache of the last received snapshot. Used by WatchComplicationProvider as a
+    /// fallback when GlucoseSnapshotStore.load() returns nil (e.g. file write race or first launch).
+    /// Always reflects the most recently delivered snapshot regardless of file-store state.
+    private(set) var lastSnapshot: GlucoseSnapshot?
+
+    /// Cache of CLKComplication objects keyed by "<identifier>-<family.rawValue>".
+    /// Populated when ClockKit calls getCurrentTimelineEntry (complication is on an active face)
+    /// or when activeComplications is non-nil. Used as a fallback when activeComplications
+    /// returns nil/empty during background execution — a known watchOS 9+ limitation.
+    private var cachedComplications: [String: CLKComplication] = [:]
+
+    /// Called by WatchComplicationProvider whenever ClockKit passes a CLKComplication to us.
+    /// Must be called on the main thread (ClockKit callbacks are main-thread).
+    func cacheComplication(_ complication: CLKComplication) {
+        let key = "\(complication.identifier)-\(complication.family.rawValue)"
+        cachedComplications[key] = complication
+    }
+
+    // MARK: - Init
+
+    private override init() {
+        super.init()
+    }
+
+    // MARK: - Setup
+
+    /// Call once from the Watch extension entry point after launch.
+    func activate() {
+        guard WCSession.isSupported() else {
+            os_log("WatchSessionReceiver: WCSession not supported", log: watchLog, type: .debug)
+            return
+        }
+        WCSession.default.delegate = self
+        WCSession.default.activate()
+        os_log("WatchSessionReceiver: WCSession activation requested", log: watchLog, type: .debug)
+    }
+
+    /// Triggers a complication timeline reload. Called from background refresh tasks
+    /// after a snapshot has already been saved to GlucoseSnapshotStore.
+    func triggerComplicationReload() {
+        reloadComplications()
+    }
+}
+
+// MARK: - WCSessionDelegate
+
+extension WatchSessionReceiver: WCSessionDelegate {
+
+    func session(
+        _ session: WCSession,
+        activationDidCompleteWith activationState: WCSessionActivationState,
+        error: Error?
+    ) {
+        if let error = error {
+            os_log("WatchSessionReceiver: activation failed — %{public}@", log: watchLog, type: .error, error.localizedDescription)
+        } else {
+            os_log("WatchSessionReceiver: activation complete — state %d", log: watchLog, type: .debug, activationState.rawValue)
+            bootstrapFromApplicationContext(session)
+        }
+    }
+
+    /// Loads a snapshot from the last received applicationContext so the Watch app
+    /// has data immediately on launch without waiting for the next transferUserInfo.
+    private func bootstrapFromApplicationContext(_ session: WCSession) {
+        guard let data = session.receivedApplicationContext["snapshot"] as? Data else { return }
+        do {
+            let decoder = JSONDecoder()
+            decoder.dateDecodingStrategy = .iso8601
+            let snapshot = try decoder.decode(GlucoseSnapshot.self, from: data)
+            GlucoseSnapshotStore.shared.save(snapshot) { [weak self] in
+                os_log("WatchSessionReceiver: bootstrapped snapshot from applicationContext", log: watchLog, type: .debug)
+                self?.reloadComplications()
+                DispatchQueue.main.async {
+                    NotificationCenter.default.post(
+                        name: WatchSessionReceiver.snapshotReceivedNotification,
+                        object: nil,
+                        userInfo: ["snapshot": snapshot]
+                    )
+                }
+            }
+        } catch {
+            os_log("WatchSessionReceiver: failed to decode applicationContext snapshot — %{public}@", log: watchLog, type: .error, error.localizedDescription)
+        }
+    }
+
+    /// Handles immediate delivery when Watch app is in foreground (sendMessage path).
+    func session(
+        _ session: WCSession,
+        didReceiveMessage message: [String: Any]
+    ) {
+        process(payload: message, source: "sendMessage")
+    }
+
+    /// Handles queued background delivery (transferUserInfo path).
+    func session(
+        _ session: WCSession,
+        didReceiveUserInfo userInfo: [String: Any]
+    ) {
+        process(payload: userInfo, source: "userInfo")
+    }
+
+    func session(_ session: WCSession, didReceiveApplicationContext applicationContext: [String : Any]) {
+        process(payload: applicationContext, source: "applicationContext")
+    }
+    
+    // MARK: - Private
+
+    private func process(payload: [String: Any], source: String) {
+        if let _ = payload["watchLoopReturn"] {
+            let title = payload["title"] as? String ?? "Loop Confirmed ✓"
+            let body  = payload["body"]  as? String ?? "Command processed by Loop"
+            let task = pendingConnectivityTask
+            pendingConnectivityTask = nil
+            DispatchQueue.main.async {
+                self.showLoopReturnConfirmation(title: title, body: body)
+                task?.setTaskCompletedWithSnapshot(false)
+            }
+            return
+        }
+
+        if payload["watchSettingsRefresh"] != nil {
+            DispatchQueue.main.async {
+                NotificationCenter.default.post(name: WatchSessionReceiver.settingsRefreshedNotification, object: nil)
+            }
+            os_log("WatchSessionReceiver: settings refresh received", log: watchLog, type: .debug)
+            return
+        }
+        guard let data = payload["snapshot"] as? Data else {
+            os_log("WatchSessionReceiver: %{public}@ — no snapshot key", log: watchLog, type: .debug, source)
+            return
+        }
+        do {
+            let decoder = JSONDecoder()
+            decoder.dateDecodingStrategy = .iso8601
+            let snapshot = try decoder.decode(GlucoseSnapshot.self, from: data)
+            // Cache in memory immediately — complication provider can use this as a
+            // fallback if the App Group file store hasn't flushed yet.
+            lastSnapshot = snapshot
+            WatchAlertManager.shared.checkAndAlert(snapshot: snapshot)
+            os_log("WatchSessionReceiver: %{public}@ snapshot decoded g=%d, saving", log: watchLog, type: .debug, source, Int(snapshot.glucose))
+            GlucoseSnapshotStore.shared.save(snapshot) { [weak self] in
+                os_log("WatchSessionReceiver: %{public}@ snapshot saved, reloading complications", log: watchLog, type: .debug, source)
+                // ACK to iPhone so it can detect missed deliveries.
+                self?.sendAck(for: snapshot)
+                // Capture and clear the pending task before dispatching to main,
+                // then complete it AFTER reloadTimeline() so watchOS doesn't suspend
+                // the extension before ClockKit processes the reload request.
+                let task = self?.pendingConnectivityTask
+                self?.pendingConnectivityTask = nil
+                DispatchQueue.main.async { [weak self] in
+                    self?.reloadComplicationsOnMainThread()
+                    // Complete background task only after reloadTimeline() has been called.
+                    task?.setTaskCompletedWithSnapshot(false)
+                    NotificationCenter.default.post(
+                        name: WatchSessionReceiver.snapshotReceivedNotification,
+                        object: nil,
+                        userInfo: ["snapshot": snapshot]
+                    )
+                }
+            }
+        } catch {
+            os_log("WatchSessionReceiver: %{public}@ decode failed — %{public}@", log: watchLog, type: .error, source, error.localizedDescription)
+        }
+    }
+
+    private func showLoopReturnConfirmation(title: String, body: String) {
+        WKInterfaceDevice.current().play(.success)
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+            WKInterfaceDevice.current().play(.success)
+        }
+        let content = UNMutableNotificationContent()
+        content.title = title
+        content.body  = body
+        content.sound = .default
+        let request = UNNotificationRequest(
+            identifier: "loop-return-\(UUID().uuidString)",
+            content: content,
+            trigger: UNTimeIntervalNotificationTrigger(timeInterval: 0.5, repeats: false)
+        )
+        UNUserNotificationCenter.current().add(request)
+        os_log("WatchSessionReceiver: Loop return confirmation shown — %{public}@", log: watchLog, type: .info, title)
+    }
+
+    private func sendAck(for snapshot: GlucoseSnapshot) {
+        let session = WCSession.default
+        guard session.activationState == .activated else { return }
+        let ack: [String: Any] = ["watchAck": snapshot.updatedAt.timeIntervalSince1970]
+        if session.isReachable {
+            session.sendMessage(ack, replyHandler: nil, errorHandler: nil)
+        } else {
+            session.transferUserInfo(ack)
+        }
+        os_log("WatchSessionReceiver: ACK sent for snapshot at %f", log: watchLog, type: .debug, snapshot.updatedAt.timeIntervalSince1970)
+    }
+
+    /// Reloads all known complications. May be called from any thread.
+    func reloadComplications() {
+        DispatchQueue.main.async { self.reloadComplicationsOnMainThread() }
+    }
+
+    /// Must be called on the main thread. Used directly when already on main (e.g., from process()).
+    private func reloadComplicationsOnMainThread() {
+        let server = CLKComplicationServer.sharedInstance()
+
+        let complications: [CLKComplication]
+        if let active = server.activeComplications, !active.isEmpty {
+            // Update the cache whenever activeComplications is non-nil.
+            active.forEach { self.cacheComplication($0) }
+            complications = active
+            os_log("WatchSessionReceiver: reloading %d active complication(s)", log: watchLog, type: .info, complications.count)
+        } else if !cachedComplications.isEmpty {
+            // activeComplications is nil/empty — common during background execution on watchOS 9+.
+            // Use the cached CLKComplication objects from the last call where activeComplications was valid.
+            complications = Array(cachedComplications.values)
+            os_log("WatchSessionReceiver: activeComplications nil/empty — using %d cached complication(s)", log: watchLog, type: .info, complications.count)
+        } else {
+            os_log("WatchSessionReceiver: no active or cached complications — reloadTimeline skipped", log: watchLog, type: .error)
+            return
+        }
+
+        for complication in complications { server.reloadTimeline(for: complication) }
+        os_log("WatchSessionReceiver: reloadTimeline called for %d complication(s)", log: watchLog, type: .info, complications.count)
+    }
+
+    // NOTE: reloadComplications() is safe to call from any thread for foreground paths
+    // (bootstrap, reloadComplicationsIfNeeded). For background task paths (process()),
+    // setTaskCompletedWithSnapshot() must be called INSIDE DispatchQueue.main.async
+    // after reloadTimeline() — otherwise watchOS suspends the extension before ClockKit
+    // receives the reload request.
+}
diff --git a/LoopFollowWatch Watch App/Assets.xcassets/AccentColor.colorset/Contents.json b/LoopFollowWatch Watch App/Assets.xcassets/AccentColor.colorset/Contents.json
new file mode 100644
index 000000000..eb8789700
--- /dev/null
+++ b/LoopFollowWatch Watch App/Assets.xcassets/AccentColor.colorset/Contents.json	
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LoopFollowWatch Watch App/Assets.xcassets/AppIcon.appiconset/1024-dark.png b/LoopFollowWatch Watch App/Assets.xcassets/AppIcon.appiconset/1024-dark.png
new file mode 100644
index 000000000..0eaf8706b
Binary files /dev/null and b/LoopFollowWatch Watch App/Assets.xcassets/AppIcon.appiconset/1024-dark.png differ
diff --git a/LoopFollowWatch Watch App/Assets.xcassets/AppIcon.appiconset/1024-tinted.png b/LoopFollowWatch Watch App/Assets.xcassets/AppIcon.appiconset/1024-tinted.png
new file mode 100644
index 000000000..61aaa37f1
Binary files /dev/null and b/LoopFollowWatch Watch App/Assets.xcassets/AppIcon.appiconset/1024-tinted.png differ
diff --git a/LoopFollowWatch Watch App/Assets.xcassets/AppIcon.appiconset/1024.png b/LoopFollowWatch Watch App/Assets.xcassets/AppIcon.appiconset/1024.png
new file mode 100644
index 000000000..a975ee063
Binary files /dev/null and b/LoopFollowWatch Watch App/Assets.xcassets/AppIcon.appiconset/1024.png differ
diff --git a/LoopFollowWatch Watch App/Assets.xcassets/AppIcon.appiconset/Contents.json b/LoopFollowWatch Watch App/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 000000000..113d82165
--- /dev/null
+++ b/LoopFollowWatch Watch App/Assets.xcassets/AppIcon.appiconset/Contents.json	
@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "1024.png",
+      "idiom" : "universal",
+      "platform" : "watchos",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LoopFollowWatch Watch App/Assets.xcassets/Contents.json b/LoopFollowWatch Watch App/Assets.xcassets/Contents.json
new file mode 100644
index 000000000..73c00596a
--- /dev/null
+++ b/LoopFollowWatch Watch App/Assets.xcassets/Contents.json	
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/LoopFollowWatch Watch App/ContentView.swift b/LoopFollowWatch Watch App/ContentView.swift
new file mode 100644
index 000000000..580c2cc3a
--- /dev/null
+++ b/LoopFollowWatch Watch App/ContentView.swift	
@@ -0,0 +1,306 @@
+//
+//  ContentView.swift
+//  LoopFollowWatch Watch App
+//
+//  Created by Philippe Achkar on 2026-03-10.
+//  Copyright © 2026 Jon Fawcett. All rights reserved.
+//
+
+import Combine
+import SwiftUI
+import WatchConnectivity
+
+// MARK: - Root view
+
+struct ContentView: View {
+    @StateObject private var model = WatchViewModel()
+    @State private var showSettings = false
+    @State private var showRemote = false
+
+    var body: some View {
+        TabView {
+            GlucoseView(model: model)
+                .overlay(alignment: .topTrailing) {
+                    VStack(spacing: 8) {
+                        Button { showSettings = true } label: {
+                            Image(systemName: "gear")
+                                .font(.system(size: 14, weight: .medium))
+                                .foregroundColor(.secondary)
+                        }
+                        .buttonStyle(.plain)
+
+                        Button { showRemote = true } label: {
+                            Image(systemName: "antenna.radiowaves.left.and.right")
+                                .font(.system(size: 14, weight: .medium))
+                                .foregroundColor(.secondary)
+                        }
+                        .buttonStyle(.plain)
+                    }
+                    .padding([.top, .trailing], 4)
+                }
+                .sheet(isPresented: $showRemote) {
+                    NavigationStack { WatchRemoteCommandsView(snapshot: model.snapshot) }
+                }
+                .sheet(isPresented: $showSettings) {
+                    NavigationStack { WatchAlertSettingsView() }
+                }
+
+            ForEach(Array(model.pages.enumerated()), id: \.offset) { _, page in
+                DataGridPage(slots: page, snapshot: model.snapshot)
+            }
+
+            SlotSelectionView(model: model)
+        }
+        .tabViewStyle(.page)
+        .onAppear { model.refresh() }
+    }
+}
+
+// MARK: - View model
+
+final class WatchViewModel: ObservableObject {
+    @Published var snapshot: GlucoseSnapshot?
+    @Published var selectedSlots: [LiveActivitySlotOption] = LAAppGroupSettings.watchSelectedSlots()
+    @Published var showSnoozeSheet: Bool = false
+    @Published var pendingSnoozeType: WatchAlertType? = nil
+    @Published var isSnoozed: Bool = false
+    @Published var snoozeUntil: Date? = nil
+    @Published var hasActiveAlert: Bool = false
+
+    private var timer: Timer?
+    private var notificationObserver: Any?
+
+    init() {
+        snapshot = GlucoseSnapshotStore.shared.load()
+        timer = Timer.scheduledTimer(withTimeInterval: 60, repeats: true) { [weak self] _ in
+            self?.refresh()
+        }
+        notificationObserver = NotificationCenter.default.addObserver(
+            forName: WatchSessionReceiver.snapshotReceivedNotification,
+            object: nil,
+            queue: .main
+        ) { [weak self] notification in
+            if let s = notification.userInfo?["snapshot"] as? GlucoseSnapshot {
+                self?.update(snapshot: s)
+            } else {
+                self?.refresh()
+            }
+        }
+        NotificationCenter.default.addObserver(
+            forName: .showSnoozeSheet,
+            object: nil,
+            queue: .main
+        ) { [weak self] notification in
+            let typeRaw = notification.userInfo?["alertType"] as? String
+            self?.pendingSnoozeType = typeRaw.flatMap { WatchAlertType(rawValue: $0) }
+            self?.showSnoozeSheet = true
+        }
+    }
+
+    deinit {
+        timer?.invalidate()
+        if let obs = notificationObserver {
+            NotificationCenter.default.removeObserver(obs)
+        }
+    }
+
+    func refresh() {
+        if let loaded = GlucoseSnapshotStore.shared.load() {
+            snapshot = loaded
+        }
+        selectedSlots = LAAppGroupSettings.watchSelectedSlots()
+        isSnoozed      = WatchAlertManager.shared.isGloballySnoozed
+        snoozeUntil    = WatchAlertManager.shared.globalSnoozeExpiryDate
+        hasActiveAlert = snapshot.map { WatchAlertManager.shared.hasActiveAlert(for: $0) } ?? false
+    }
+
+    func update(snapshot: GlucoseSnapshot) {
+        self.snapshot = snapshot
+        selectedSlots  = LAAppGroupSettings.watchSelectedSlots()
+        hasActiveAlert = WatchAlertManager.shared.hasActiveAlert(for: snapshot)
+    }
+
+    /// Slots grouped into pages of 4 for the swipable grid tabs.
+    var pages: [[LiveActivitySlotOption]] {
+        guard !selectedSlots.isEmpty else { return [] }
+        return stride(from: 0, to: selectedSlots.count, by: 4).map {
+            Array(selectedSlots[$0..<min($0 + 4, selectedSlots.count)])
+        }
+    }
+
+    func isSelected(_ option: LiveActivitySlotOption) -> Bool {
+        selectedSlots.contains(option)
+    }
+
+    func toggleSlot(_ option: LiveActivitySlotOption) {
+        if let idx = selectedSlots.firstIndex(of: option) {
+            selectedSlots.remove(at: idx)
+        } else {
+            selectedSlots.append(option)
+        }
+        LAAppGroupSettings.setWatchSelectedSlots(selectedSlots)
+    }
+}
+
+// MARK: - Page 1: Glucose
+
+struct GlucoseView: View {
+    @ObservedObject var model: WatchViewModel
+
+    var body: some View {
+        Group {
+            if let s = model.snapshot, s.age < 900 {
+                VStack(alignment: .leading, spacing: 6) {
+                    Text("\(WatchFormat.glucose(s)) \(WatchFormat.trendArrow(s))")
+                        .font(.system(size: 56, weight: .bold, design: .rounded))
+                        .minimumScaleFactor(0.4)
+                        .lineLimit(1)
+                        .foregroundColor(ComplicationEntryBuilder.thresholdColor(for: s).swiftUIColor)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+
+                    VStack(alignment: .leading, spacing: 3) {
+                        Text("Delta: \(WatchFormat.delta(s)) \(s.unit.displayName)")
+                            .font(.system(size: 14))
+                            .foregroundColor(.white)
+
+                        if s.projected != nil {
+                            Text("Projected: \(WatchFormat.projected(s)) \(s.unit.displayName)")
+                                .font(.system(size: 14))
+                                .foregroundColor(.white)
+                        }
+
+                        Text("Last update: \(WatchFormat.updateTime(s))")
+                            .font(.system(size: 14))
+                            .foregroundColor(.white)
+
+                        if s.isNotLooping {
+                            Text("⚠ Loop inactive")
+                                .font(.system(size: 12))
+                                .foregroundColor(.yellow)
+                        }
+                    }
+
+                    VStack(spacing: 6) {
+                        if model.isSnoozed, let until = model.snoozeUntil {
+                            Text("Snoozed until \(until, style: .time)")
+                                .font(.system(size: 11))
+                                .foregroundColor(.orange)
+
+                            Button("Cancel Snooze") {
+                                WatchAlertManager.shared.cancelSnooze(type: nil)
+                                model.refresh()
+                            }
+                            .font(.system(size: 12))
+                            .foregroundColor(.orange)
+                        } else if model.hasActiveAlert {
+                            Button("Snooze…") {
+                                model.pendingSnoozeType = nil
+                                model.showSnoozeSheet = true
+                            }
+                            .font(.system(size: 12))
+                            .foregroundColor(.secondary)
+                        }
+                    }
+                }
+                .padding(.horizontal, 4)
+            } else {
+                VStack(spacing: 4) {
+                    Text("--")
+                        .font(.system(size: 44, weight: .semibold, design: .rounded))
+                        .foregroundColor(.secondary)
+                    Text(model.snapshot == nil ? "No data" : "Stale")
+                        .font(.caption)
+                        .foregroundColor(.secondary)
+                }
+            }
+        }
+        .sheet(isPresented: $model.showSnoozeSheet, onDismiss: { model.refresh() }) {
+            SnoozeView(isPresented: $model.showSnoozeSheet, alertType: model.pendingSnoozeType)
+        }
+    }
+}
+
+// MARK: - Data grid page (2×2, up to 4 slots)
+
+struct DataGridPage: View {
+    let slots: [LiveActivitySlotOption]
+    let snapshot: GlucoseSnapshot?
+
+    var body: some View {
+        LazyVGrid(
+            columns: [GridItem(.flexible()), GridItem(.flexible())],
+            spacing: 8
+        ) {
+            ForEach(0..<4, id: \.self) { i in
+                if i < slots.count {
+                    let option = slots[i]
+                    MetricCell(
+                        label: option.gridLabel,
+                        value: snapshot.map { WatchFormat.slotValue(option: option, snapshot: $0) } ?? "—"
+                    )
+                } else {
+                    Color.clear.frame(height: 52)
+                }
+            }
+        }
+        .padding(.horizontal, 4)
+    }
+}
+
+// MARK: - Metric cell
+
+struct MetricCell: View {
+    let label: String
+    let value: String
+
+    var body: some View {
+        VStack(spacing: 2) {
+            Text(label)
+                .font(.system(size: 10))
+                .foregroundColor(.secondary)
+                .lineLimit(1)
+            Text(value)
+                .font(.system(size: 15, weight: .medium, design: .rounded))
+                .lineLimit(1)
+                .minimumScaleFactor(0.6)
+        }
+        .frame(maxWidth: .infinity)
+        .padding(6)
+        .background(Color.secondary.opacity(0.15))
+        .cornerRadius(8)
+    }
+}
+
+// MARK: - Last tab: slot selection checklist
+
+struct SlotSelectionView: View {
+    @ObservedObject var model: WatchViewModel
+
+    var body: some View {
+        List {
+            ForEach(LiveActivitySlotOption.allCases.filter { $0 != .none && $0 != .delta && $0 != .projectedBG }, id: \.self) { option in
+                Button(action: { model.toggleSlot(option) }) {
+                    HStack {
+                        Text(option.displayName)
+                            .foregroundColor(.primary)
+                        Spacer()
+                        Image(
+                            systemName: model.isSelected(option)
+                                ? "checkmark.circle.fill"
+                                : "circle"
+                        )
+                        .foregroundColor(model.isSelected(option) ? .green : .secondary)
+                    }
+                }
+                .buttonStyle(.plain)
+            }
+        }
+        .navigationTitle("Data")
+    }
+}
+
+// MARK: - UIColor → SwiftUI Color bridge
+
+private extension UIColor {
+    var swiftUIColor: Color { Color(self) }
+}
diff --git a/LoopFollowWatch Watch App/LoopFollowWatch Watch App.entitlements b/LoopFollowWatch Watch App/LoopFollowWatch Watch App.entitlements
new file mode 100644
index 000000000..5b963cc90
--- /dev/null
+++ b/LoopFollowWatch Watch App/LoopFollowWatch Watch App.entitlements	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.com.$(unique_id).LoopFollow$(app_suffix)</string>
+	</array>
+</dict>
+</plist>
diff --git a/LoopFollowWatch Watch App/LoopFollowWatchApp.swift b/LoopFollowWatch Watch App/LoopFollowWatchApp.swift
new file mode 100644
index 000000000..2eaa10d61
--- /dev/null
+++ b/LoopFollowWatch Watch App/LoopFollowWatchApp.swift	
@@ -0,0 +1,107 @@
+// LoopFollowWatchApp.swift
+// Philippe Achkar
+// 2026-03-10
+
+import SwiftUI
+import WatchConnectivity
+import WatchKit
+import OSLog
+
+private let logger = Logger(
+    subsystem: Bundle.main.bundleIdentifier ?? "com.loopfollow.watch",
+    category: "Watch"
+)
+
+@main
+struct LoopFollowWatch_Watch_AppApp: App {
+
+    @WKApplicationDelegateAdaptor(WatchAppDelegate.self) var delegate
+
+    init() {
+        WatchSessionReceiver.shared.activate()
+    }
+
+    var body: some Scene {
+        WindowGroup {
+            ContentView()
+        }
+    }
+}
+
+// MARK: - App delegate for background tasks
+
+final class WatchAppDelegate: NSObject, WKApplicationDelegate {
+
+    func applicationDidFinishLaunching() {
+        WatchAlertManager.shared.setup()
+        WatchAppDelegate.scheduleNextRefresh()
+    }
+
+    func handle(_ backgroundTasks: Set<WKRefreshBackgroundTask>) {
+        for task in backgroundTasks {
+            switch task {
+            case let refreshTask as WKApplicationRefreshBackgroundTask:
+                handleRefresh(refreshTask)
+
+            case let connectivityTask as WKWatchConnectivityRefreshBackgroundTask:
+                // Hold the task open — WatchConnectivity will deliver the pending
+                // transferUserInfo to session(_:didReceiveUserInfo:) while the app
+                // is awake. WatchSessionReceiver completes it after saving the snapshot.
+                WatchSessionReceiver.shared.pendingConnectivityTask = connectivityTask
+
+            default:
+                task.setTaskCompletedWithSnapshot(false)
+            }
+        }
+    }
+
+    private func handleRefresh(_ task: WKApplicationRefreshBackgroundTask) {
+        // receivedApplicationContext always holds the last value the iPhone sent —
+        // no active Bluetooth or WKWatchConnectivityRefreshBackgroundTask needed.
+        // If it's newer than what's in the file store, persist it and reload complications.
+        let contextSnapshot = Self.decodeContextSnapshot()
+        let storeSnapshot = GlucoseSnapshotStore.shared.load()
+
+        if let ctx = contextSnapshot,
+           ctx.updatedAt > (storeSnapshot?.updatedAt ?? .distantPast) {
+            WatchAlertManager.shared.checkAndAlert(snapshot: ctx)
+            GlucoseSnapshotStore.shared.save(ctx) {
+                WatchSessionReceiver.shared.triggerComplicationReload()
+                WatchAppDelegate.scheduleNextRefresh()
+                task.setTaskCompletedWithSnapshot(false)
+            }
+        } else {
+            if storeSnapshot != nil {
+                WatchSessionReceiver.shared.triggerComplicationReload()
+            }
+            WatchAppDelegate.scheduleNextRefresh()
+            task.setTaskCompletedWithSnapshot(false)
+        }
+    }
+
+    static func decodeContextSnapshot() -> GlucoseSnapshot? {
+        guard let data = WCSession.default.receivedApplicationContext["snapshot"] as? Data else {
+            return nil
+        }
+
+        do {
+            let decoder = JSONDecoder()
+            decoder.dateDecodingStrategy = .iso8601
+            return try decoder.decode(GlucoseSnapshot.self, from: data)
+        } catch {
+            logger.error("WatchAppDelegate: failed to decode applicationContext snapshot — \(error.localizedDescription, privacy: .public)")
+            return nil
+        }
+    }
+
+    static func scheduleNextRefresh() {
+        WKApplication.shared().scheduleBackgroundRefresh(
+            withPreferredDate: Date(timeIntervalSinceNow: 2 * 60),
+            userInfo: nil
+        ) { _ in }
+    }
+
+    private func scheduleNextRefresh() {
+        WatchAppDelegate.scheduleNextRefresh()
+    }
+}
\ No newline at end of file
diff --git a/LoopFollowWatch Watch App/Remote/WatchBolusCommandView.swift b/LoopFollowWatch Watch App/Remote/WatchBolusCommandView.swift
new file mode 100644
index 000000000..776cea1ff
--- /dev/null
+++ b/LoopFollowWatch Watch App/Remote/WatchBolusCommandView.swift	
@@ -0,0 +1,191 @@
+// LoopFollow
+// WatchBolusCommandView.swift
+// Bolus remote command view for Watch with passcode authentication.
+
+import LocalAuthentication
+import SwiftUI
+import UserNotifications
+import WatchConnectivity
+import WatchKit
+
+struct WatchBolusCommandView: View {
+    let snapshot: GlucoseSnapshot?
+
+    @State private var bolusUnits: Double
+    @State private var showConfirm = false
+    @State private var isSending = false
+    @State private var alertMessage = ""
+    @State private var showAlert = false
+
+    private var maxBolus: Double { max(0.05, LAAppGroupSettings.watchMaxBolus()) }
+    private let step = 0.05
+
+    private var recBolus: Double? { snapshot?.recBolus }
+
+    private var recBolusAge: Int? {
+        guard let t = snapshot?.loopLastRunAt else { return nil }
+        let mins = Int(Date().timeIntervalSince1970 - t) / 60
+        return mins < 12 ? mins : nil
+    }
+
+    init(snapshot: GlucoseSnapshot?) {
+        self.snapshot = snapshot
+        let maxB = max(0.05, LAAppGroupSettings.watchMaxBolus())
+        let rec = snapshot?.recBolus ?? 0
+        _bolusUnits = State(initialValue: rec > 0 ? min(rec, maxB).rounded(toPlaces: 2) : 0.05)
+    }
+
+    var body: some View {
+        ScrollView {
+            VStack(spacing: 12) {
+                // Recommended bolus tap-to-set row
+                if let rec = recBolus, rec > 0, let age = recBolusAge {
+                    Button {
+                        bolusUnits = min(rec, maxBolus).rounded(toPlaces: 2)
+                    } label: {
+                        VStack(spacing: 2) {
+                            Text("Rec: \(String(format: "%.2f", rec))U")
+                                .font(.headline)
+                            Text("\(age)m ago\(age >= 5 ? " ⚠" : "")")
+                                .font(.caption2)
+                                .foregroundColor(age >= 5 ? .yellow : .secondary)
+                        }
+                        .frame(maxWidth: .infinity)
+                        .padding(8)
+                        .background(Color.blue.opacity(0.15))
+                        .cornerRadius(10)
+                    }
+                    .buttonStyle(.plain)
+                }
+
+                // Bolus amount stepper
+                VStack(spacing: 4) {
+                    Text(String(format: "%.2fU", bolusUnits))
+                        .font(.system(size: 32, weight: .bold, design: .rounded))
+
+                    HStack(spacing: 16) {
+                        Button {
+                            bolusUnits = max(0.05, (bolusUnits - step).rounded(toPlaces: 2))
+                        } label: {
+                            Image(systemName: "minus.circle.fill")
+                                .font(.title2)
+                                .foregroundColor(.blue)
+                        }
+                        .buttonStyle(.plain)
+
+                        Button {
+                            bolusUnits = min(maxBolus, (bolusUnits + step).rounded(toPlaces: 2))
+                        } label: {
+                            Image(systemName: "plus.circle.fill")
+                                .font(.title2)
+                                .foregroundColor(.blue)
+                        }
+                        .buttonStyle(.plain)
+                    }
+                }
+
+                // Send button
+                Button {
+                    showConfirm = true
+                } label: {
+                    Text("Send Bolus")
+                        .frame(maxWidth: .infinity)
+                }
+                .buttonStyle(.borderedProminent)
+                .tint(.red)
+                .disabled(isSending || bolusUnits <= 0)
+                .confirmationDialog("Send \(String(format: "%.2f", bolusUnits))U insulin?", isPresented: $showConfirm, titleVisibility: .visible) {
+                    Button("Authenticate & Send", role: .destructive) { authenticateAndSend() }
+                    Button("Cancel", role: .cancel) {}
+                }
+
+                if isSending {
+                    ProgressView("Sending…")
+                        .font(.caption2)
+                }
+            }
+            .padding(.horizontal, 4)
+        }
+        .navigationTitle("Bolus")
+        .onAppear {
+            UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound]) { _, _ in }
+        }
+        .alert(alertMessage, isPresented: $showAlert) {
+            Button("OK", role: .cancel) {}
+        }
+    }
+
+    private func authenticateAndSend() {
+        let context = LAContext()
+        var authError: NSError?
+        guard context.canEvaluatePolicy(.deviceOwnerAuthentication, error: &authError) else {
+            sendBolus()
+            return
+        }
+        context.evaluatePolicy(.deviceOwnerAuthentication,
+                                localizedReason: "Confirm identity to send \(String(format: "%.2f", bolusUnits))U insulin") { success, _ in
+            DispatchQueue.main.async {
+                if success { sendBolus() } else {
+                    alertMessage = "Authentication failed or cancelled"
+                    showAlert = true
+                }
+            }
+        }
+    }
+
+    private func sendBolus() {
+        guard WCSession.default.isReachable else {
+            alertMessage = "Phone not reachable. Bring your iPhone closer."
+            showAlert = true
+            return
+        }
+        isSending = true
+        let units = bolusUnits
+        let payload: [String: Any] = ["watchCmd": "bolus", "bolusAmount": units]
+        WCSession.default.sendMessage(payload) { reply in
+            DispatchQueue.main.async {
+                isSending = false
+                let ok = reply["success"] as? Bool ?? false
+                let totpBlocked = reply["totpBlocked"] as? Bool ?? false
+                if totpBlocked {
+                    alertMessage = "OTP code already used. Wait up to 30 seconds and try again."
+                    showAlert = true
+                } else if ok {
+                    scheduleSuccessNotification(units: units)
+                    alertMessage = "Bolus sent! (\(String(format: "%.2f", units))U)"
+                    showAlert = true
+                } else {
+                    alertMessage = reply["error"] as? String ?? "Failed to send bolus"
+                    showAlert = true
+                }
+            }
+        } errorHandler: { error in
+            DispatchQueue.main.async {
+                isSending = false
+                alertMessage = "Send error: \(error.localizedDescription)"
+                showAlert = true
+            }
+        }
+    }
+
+    private func scheduleSuccessNotification(units: Double) {
+        WKInterfaceDevice.current().play(.success)
+        let content = UNMutableNotificationContent()
+        content.title = "Bolus Sent ✓"
+        content.body = String(format: "%.2fU sent to Loop", units)
+        content.sound = .default
+        let request = UNNotificationRequest(
+            identifier: "bolus-\(UUID().uuidString)",
+            content: content,
+            trigger: UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false)
+        )
+        UNUserNotificationCenter.current().add(request)
+    }
+}
+
+private extension Double {
+    func rounded(toPlaces places: Int) -> Double {
+        let divisor = pow(10.0, Double(places))
+        return (self * divisor).rounded() / divisor
+    }
+}
diff --git a/LoopFollowWatch Watch App/Remote/WatchMealCommandView.swift b/LoopFollowWatch Watch App/Remote/WatchMealCommandView.swift
new file mode 100644
index 000000000..f23ec2a25
--- /dev/null
+++ b/LoopFollowWatch Watch App/Remote/WatchMealCommandView.swift	
@@ -0,0 +1,150 @@
+// LoopFollow
+// WatchMealCommandView.swift
+// Carbs remote command view for Watch.
+
+import SwiftUI
+import UserNotifications
+import WatchConnectivity
+import WatchKit
+
+struct WatchMealCommandView: View {
+    // Absorption presets: (emoji, hours)
+    private let foodPresets: [(String, Double)] = [("🍭", 0.5), ("🌮", 3.0), ("🍕", 5.0)]
+
+    @State private var carbsGrams: Int = 20
+    @State private var selectedFood: Int = 1  // default: taco (3 hr)
+    @State private var showConfirm = false
+    @State private var isSending = false
+    @State private var alertMessage = ""
+    @State private var showAlert = false
+    @State private var alertIsSuccess = false
+
+    private var maxCarbs: Int { max(5, Int(LAAppGroupSettings.watchMaxCarbs())) }
+
+    var body: some View {
+        ScrollView {
+            VStack(spacing: 12) {
+                // Carbs stepper
+                VStack(spacing: 4) {
+                    Text("\(carbsGrams)g")
+                        .font(.system(size: 36, weight: .bold, design: .rounded))
+
+                    HStack(spacing: 16) {
+                        Button { carbsGrams = max(5, carbsGrams - 5) } label: {
+                            Image(systemName: "minus.circle.fill")
+                                .font(.title2)
+                                .foregroundColor(.blue)
+                        }
+                        .buttonStyle(.plain)
+
+                        Button { carbsGrams = min(maxCarbs, carbsGrams + 5) } label: {
+                            Image(systemName: "plus.circle.fill")
+                                .font(.title2)
+                                .foregroundColor(.blue)
+                        }
+                        .buttonStyle(.plain)
+                    }
+                }
+
+                Divider()
+
+                // Food type selector
+                HStack(spacing: 8) {
+                    ForEach(0..<foodPresets.count, id: \.self) { idx in
+                        let (emoji, _) = foodPresets[idx]
+                        Button {
+                            selectedFood = idx
+                        } label: {
+                            Text(emoji)
+                                .font(.title3)
+                                .frame(width: 44, height: 44)
+                                .background(selectedFood == idx ? Color.blue.opacity(0.3) : Color.secondary.opacity(0.15))
+                                .cornerRadius(10)
+                        }
+                        .buttonStyle(.plain)
+                    }
+                }
+
+                Text("\(Int(foodPresets[selectedFood].1 * 60)) min absorption")
+                    .font(.caption2)
+                    .foregroundColor(.secondary)
+
+                // Send button
+                Button {
+                    showConfirm = true
+                } label: {
+                    Text("Send Carbs")
+                        .frame(maxWidth: .infinity)
+                }
+                .buttonStyle(.borderedProminent)
+                .disabled(isSending || carbsGrams <= 0)
+                .confirmationDialog("Send \(carbsGrams)g carbs?", isPresented: $showConfirm, titleVisibility: .visible) {
+                    Button("Send") { sendCarbs() }
+                    Button("Cancel", role: .cancel) {}
+                }
+
+                if isSending {
+                    ProgressView("Sending…")
+                        .font(.caption2)
+                }
+            }
+            .padding(.horizontal, 4)
+        }
+        .navigationTitle("Meal")
+        .onAppear {
+            UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound]) { _, _ in }
+        }
+        .alert(alertMessage, isPresented: $showAlert) {
+            Button("OK", role: .cancel) {}
+        }
+    }
+
+    private func sendCarbs() {
+        guard WCSession.default.isReachable else {
+            alertMessage = "Phone not reachable. Bring your iPhone closer."
+            showAlert = true
+            return
+        }
+        isSending = true
+        let (_, absorptionHours) = foodPresets[selectedFood]
+        let payload: [String: Any] = [
+            "watchCmd": "carbs",
+            "carbsAmount": Double(carbsGrams),
+            "absorptionTime": absorptionHours
+        ]
+        WCSession.default.sendMessage(payload) { reply in
+            DispatchQueue.main.async {
+                isSending = false
+                let ok = reply["success"] as? Bool ?? false
+                let totpBlocked = reply["totpBlocked"] as? Bool ?? false
+                if totpBlocked {
+                    alertMessage = "OTP code already used. Wait up to 30 seconds and try again."
+                } else {
+                    alertMessage = ok ? "Carbs sent! (\(carbsGrams)g)" : (reply["error"] as? String ?? "Failed to send carbs")
+                }
+                if ok { scheduleSuccessNotification(grams: carbsGrams) }
+                showAlert = true
+            }
+        } errorHandler: { error in
+            DispatchQueue.main.async {
+                isSending = false
+                alertMessage = "Send error: \(error.localizedDescription)"
+                showAlert = true
+            }
+        }
+    }
+
+    private func scheduleSuccessNotification(grams: Int) {
+        WKInterfaceDevice.current().play(.success)
+        let content = UNMutableNotificationContent()
+        content.title = "Carbs Logged ✓"
+        content.body = "\(grams)g sent to Loop"
+        content.sound = .default
+        let request = UNNotificationRequest(
+            identifier: "carbs-\(UUID().uuidString)",
+            content: content,
+            trigger: UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false)
+        )
+        UNUserNotificationCenter.current().add(request)
+    }
+}
diff --git a/LoopFollowWatch Watch App/Remote/WatchOverridePickerView.swift b/LoopFollowWatch Watch App/Remote/WatchOverridePickerView.swift
new file mode 100644
index 000000000..90ece84a2
--- /dev/null
+++ b/LoopFollowWatch Watch App/Remote/WatchOverridePickerView.swift	
@@ -0,0 +1,128 @@
+// LoopFollow
+// WatchOverridePickerView.swift
+// Override preset picker for Watch remote commands.
+
+import SwiftUI
+import UserNotifications
+import WatchConnectivity
+import WatchKit
+
+struct WatchOverridePickerView: View {
+    @State private var presets: [WatchOverridePreset] = []
+    @State private var selectedPreset: WatchOverridePreset? = nil
+    @State private var showConfirm = false
+    @State private var isSending = false
+    @State private var alertMessage = ""
+    @State private var showAlert = false
+
+    var body: some View {
+        List {
+            if presets.isEmpty {
+                Text("No override presets found.\nConfigure them in your Loop app.")
+                    .font(.footnote)
+                    .foregroundColor(.secondary)
+            } else {
+                ForEach(presets) { preset in
+                    Button {
+                        selectedPreset = preset
+                        showConfirm = true
+                    } label: {
+                        HStack {
+                            if let symbol = preset.symbol {
+                                Text(symbol)
+                                    .font(.title3)
+                            }
+                            VStack(alignment: .leading, spacing: 2) {
+                                Text(preset.name)
+                                    .font(.headline)
+                                    .foregroundColor(.primary)
+                                Text(preset.durationDescription)
+                                    .font(.caption2)
+                                    .foregroundColor(.secondary)
+                            }
+                            Spacer()
+                            if isSending && selectedPreset?.name == preset.name {
+                                ProgressView().scaleEffect(0.7)
+                            }
+                        }
+                    }
+                    .buttonStyle(.plain)
+                    .disabled(isSending)
+                }
+            }
+        }
+        .navigationTitle("Presets")
+        .onAppear {
+            presets = LAAppGroupSettings.watchOverridePresets()
+            UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound]) { _, _ in }
+        }
+        .confirmationDialog(
+            selectedPreset.map { "Activate \($0.name)?" } ?? "Activate override?",
+            isPresented: $showConfirm,
+            titleVisibility: .visible
+        ) {
+            if let preset = selectedPreset {
+                Button("Activate") { sendOverride(preset) }
+            }
+            Button("Cancel", role: .cancel) {}
+        }
+        .alert(alertMessage, isPresented: $showAlert) {
+            Button("OK", role: .cancel) {}
+        }
+    }
+
+    private func sendOverride(_ preset: WatchOverridePreset) {
+        guard WCSession.default.isReachable else {
+            alertMessage = "Phone not reachable. Bring your iPhone closer."
+            showAlert = true
+            return
+        }
+        isSending = true
+        let payload: [String: Any] = [
+            "watchCmd": "override",
+            "overrideName": preset.name,
+            "overrideDuration": preset.durationSeconds
+        ]
+        WCSession.default.sendMessage(payload) { reply in
+            DispatchQueue.main.async {
+                isSending = false
+                let ok = reply["success"] as? Bool ?? false
+                alertMessage = ok
+                    ? "\(preset.name) activated!"
+                    : (reply["error"] as? String ?? "Failed to activate override")
+                if ok { scheduleSuccessNotification(name: preset.name) }
+                showAlert = true
+            }
+        } errorHandler: { error in
+            DispatchQueue.main.async {
+                isSending = false
+                alertMessage = "Send error: \(error.localizedDescription)"
+                showAlert = true
+            }
+        }
+    }
+
+    private func scheduleSuccessNotification(name: String) {
+        WKInterfaceDevice.current().play(.success)
+        let content = UNMutableNotificationContent()
+        content.title = "Override Activated ✓"
+        content.body = "\(name) sent to Loop"
+        content.sound = .default
+        let request = UNNotificationRequest(
+            identifier: "override-\(UUID().uuidString)",
+            content: content,
+            trigger: UNTimeIntervalNotificationTrigger(timeInterval: 1, repeats: false)
+        )
+        UNUserNotificationCenter.current().add(request)
+    }
+}
+
+private extension WatchOverridePreset {
+    var durationDescription: String {
+        if durationSeconds == 0 { return "Indefinite" }
+        let h = Int(durationSeconds) / 3600
+        let m = Int(durationSeconds) % 3600 / 60
+        if h > 0 { return m > 0 ? "\(h)h \(m)m" : "\(h)h" }
+        return "\(m)m"
+    }
+}
diff --git a/LoopFollowWatch Watch App/Remote/WatchRemoteCommandsView.swift b/LoopFollowWatch Watch App/Remote/WatchRemoteCommandsView.swift
new file mode 100644
index 000000000..60cb54354
--- /dev/null
+++ b/LoopFollowWatch Watch App/Remote/WatchRemoteCommandsView.swift	
@@ -0,0 +1,32 @@
+// LoopFollow
+// WatchRemoteCommandsView.swift
+// Root remote commands tab on the Watch.
+
+import SwiftUI
+
+struct WatchRemoteCommandsView: View {
+    let snapshot: GlucoseSnapshot?
+
+    var body: some View {
+        List {
+            NavigationLink {
+                WatchMealCommandView()
+            } label: {
+                Label("Meal", systemImage: "fork.knife")
+            }
+
+            NavigationLink {
+                WatchOverridePickerView()
+            } label: {
+                Label("Presets", systemImage: "list.bullet")
+            }
+
+            NavigationLink {
+                WatchBolusCommandView(snapshot: snapshot)
+            } label: {
+                Label("Bolus", systemImage: "syringe")
+            }
+        }
+        .navigationTitle("Remote")
+    }
+}
diff --git a/LoopFollowWatch Watch App/SnoozeView.swift b/LoopFollowWatch Watch App/SnoozeView.swift
new file mode 100644
index 000000000..c9ed5a51b
--- /dev/null
+++ b/LoopFollowWatch Watch App/SnoozeView.swift	
@@ -0,0 +1,80 @@
+// SnoozeView.swift
+// LoopFollowWatch Watch App
+//
+// Snooze sheet presented from GlucoseView or via notification action.
+// alertType: nil when opened manually (global snooze implied, no scope toggle shown).
+// alertType: non-nil when opened from a specific notification action (scope toggle shown).
+
+import SwiftUI
+
+struct SnoozeView: View {
+    @Binding var isPresented: Bool
+    let alertType: WatchAlertType?
+
+    @StateObject private var settings = WatchAppSettings.shared
+    @State private var snoozeMinutes: Double
+    @State private var snoozeAll: Bool
+
+    private let step: Double = 30
+    private let range: ClosedRange<Double> = 30...720   // 30 min – 12 hr
+
+    init(isPresented: Binding<Bool>, alertType: WatchAlertType?) {
+        self._isPresented = isPresented
+        self.alertType    = alertType
+        let s = WatchAppSettings.shared
+        self._snoozeMinutes = State(initialValue: Double(s.defaultSnoozeMinutes))
+        self._snoozeAll     = State(initialValue: s.snoozeAllByDefault)
+    }
+
+    var body: some View {
+        ScrollView {
+            VStack(spacing: 10) {
+                Text("Snooze Alerts")
+                    .font(.headline)
+
+                Text(formattedDuration)
+                    .font(.system(size: 32, weight: .bold, design: .rounded))
+                    .foregroundColor(.orange)
+                    .monospacedDigit()
+
+                Slider(value: $snoozeMinutes, in: range, step: step)
+                    .tint(.orange)
+
+                // Scope toggle only shown when a specific alert type is known.
+                // When opened manually (alertType == nil), snooze is always global.
+                if alertType != nil {
+                    Toggle("Snooze all alerts", isOn: $snoozeAll)
+                        .font(.system(size: 13))
+                        .toggleStyle(.switch)
+                }
+
+                HStack(spacing: 16) {
+                    Button("Cancel") {
+                        isPresented = false
+                    }
+                    .foregroundColor(.secondary)
+
+                    Button("Snooze") {
+                        let target: WatchAlertType? = (snoozeAll || alertType == nil) ? nil : alertType
+                        WatchAlertManager.shared.snooze(minutes: Int(snoozeMinutes), type: target)
+                        isPresented = false
+                    }
+                    .foregroundColor(.orange)
+                    .fontWeight(.semibold)
+                }
+            }
+            .padding(.horizontal, 4)
+        }
+        .onAppear {
+            snoozeMinutes = Double(settings.defaultSnoozeMinutes)
+            snoozeAll     = settings.snoozeAllByDefault
+        }
+    }
+
+    private var formattedDuration: String {
+        let mins = Int(snoozeMinutes)
+        if mins < 60 { return "\(mins)m" }
+        let h = mins / 60, m = mins % 60
+        return m == 0 ? "\(h)h" : "\(h)h \(m)m"
+    }
+}
diff --git a/LoopFollowWatch Watch App/WatchAlertManager.swift b/LoopFollowWatch Watch App/WatchAlertManager.swift
new file mode 100644
index 000000000..ebd753e1d
--- /dev/null
+++ b/LoopFollowWatch Watch App/WatchAlertManager.swift	
@@ -0,0 +1,303 @@
+// WatchAlertManager.swift
+// LoopFollowWatch Watch App
+//
+// Haptic alert manager for the Apple Watch extension.
+// See DESIGN.md for rationale and CHANGES.md for injection points.
+
+import Foundation
+import UserNotifications
+import os.log
+
+private let alertLog = OSLog(
+    subsystem: Bundle.main.bundleIdentifier ?? "com.loopfollow.watch",
+    category: "WatchAlert"
+)
+
+extension Notification.Name {
+    static let showSnoozeSheet = Notification.Name("WatchShowSnoozeSheet")
+}
+
+// MARK: - Alert type
+
+enum WatchAlertType: String, CaseIterable {
+    case lowBG, urgentLow, highBG, fastDrop, fastRise
+
+    var title: String {
+        switch self {
+        case .lowBG:     return "⚠️ Low BG"
+        case .urgentLow: return "🚨 Urgent Low"
+        case .highBG:    return "⚠️ High BG"
+        case .fastDrop:  return "⬇️ Dropping Fast"
+        case .fastRise:  return "⬆️ Rising Fast"
+        }
+    }
+
+    var displayName: String {
+        switch self {
+        case .lowBG:     return "Low BG"
+        case .urgentLow: return "Urgent Low"
+        case .highBG:    return "High BG"
+        case .fastDrop:  return "Fast Drop"
+        case .fastRise:  return "Fast Rise"
+        }
+    }
+
+    func body(bg: Double, delta: Double?) -> String {
+        let bgStr = "\(Int(bg))"
+        switch self {
+        case .lowBG, .urgentLow, .highBG: return bgStr
+        case .fastDrop: return delta.map { "\(bgStr) · \(Int($0))/min" } ?? bgStr
+        case .fastRise: return delta.map { "\(bgStr) · +\(Int($0))/min" } ?? bgStr
+        }
+    }
+
+    var cooldownKey: String    { "watchAlertCooldown_\(rawValue)" }
+    var snoozeKey: String      { "watchSnoozeUntil_\(rawValue)" }
+    var notificationID: String { "lf-alert-\(rawValue)" }
+}
+
+// MARK: - Thresholds
+// TODO: Wire to LAAppGroupSettings or App Group shared container to mirror iPhone settings.
+
+private struct WatchThresholds {
+    var low: Double       = 70
+    var urgentLow: Double = 55
+    var high: Double      = 180
+    var dropRate: Double  = 2.0   // mg/dL per minute
+    var riseRate: Double  = 2.0
+}
+
+// MARK: - Manager
+
+final class WatchAlertManager: NSObject {
+
+    static let shared = WatchAlertManager()
+    private override init() { super.init() }
+
+    private let thresholds  = WatchThresholds()
+    private let settings    = WatchAppSettings.shared
+    private let alertQueue  = DispatchQueue(label: "com.loopfollow.watch.alertManager")
+
+    private let globalSnoozeKey = "watchGlobalSnoozeUntil"
+
+    /// App Group defaults — shared with main app target.
+    private let defaults = UserDefaults(suiteName: AppGroupID.current()) ?? .standard
+
+    // MARK: - Snooze
+
+    /// Returns true if this alert type is currently suppressed (global OR per-type snooze active).
+    func isSnoozed(for type: WatchAlertType) -> Bool {
+        let now     = Date().timeIntervalSince1970
+        let global  = defaults.double(forKey: globalSnoozeKey)
+        let perType = defaults.double(forKey: type.snoozeKey)
+        return now < global || now < perType
+    }
+
+    /// Returns the latest active snooze expiry for this type (global or per-type), or nil.
+    func snoozeUntil(for type: WatchAlertType) -> Date? {
+        let now     = Date().timeIntervalSince1970
+        let global  = defaults.double(forKey: globalSnoozeKey)
+        let perType = defaults.double(forKey: type.snoozeKey)
+        let until   = max(global, perType)
+        return until > now ? Date(timeIntervalSince1970: until) : nil
+    }
+
+    /// True only if the global (all-types) snooze is currently active.
+    var isGloballySnoozed: Bool {
+        defaults.double(forKey: globalSnoozeKey) > Date().timeIntervalSince1970
+    }
+
+    /// Expiry date of the global snooze, or nil if not active.
+    var globalSnoozeExpiryDate: Date? {
+        let until = defaults.double(forKey: globalSnoozeKey)
+        let now   = Date().timeIntervalSince1970
+        return until > now ? Date(timeIntervalSince1970: until) : nil
+    }
+
+    /// Snooze. Pass nil type for global snooze; pass a specific type for per-type snooze.
+    func snooze(minutes: Int, type: WatchAlertType?) {
+        let until = Date().timeIntervalSince1970 + Double(minutes * 60)
+        if let type = type {
+            defaults.set(until, forKey: type.snoozeKey)
+            os_log("WatchAlertManager: snoozed %{public}@ for %d min",
+                   log: alertLog, type: .info, type.rawValue, minutes)
+        } else {
+            defaults.set(until, forKey: globalSnoozeKey)
+            os_log("WatchAlertManager: snoozed all for %d min", log: alertLog, type: .info, minutes)
+        }
+        UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
+    }
+
+    /// Cancel snooze. Nil clears only the global snooze; specific type clears only that type.
+    /// Per-type snoozes set from notification actions are not affected by a nil cancel.
+    func cancelSnooze(type: WatchAlertType?) {
+        if let type = type {
+            defaults.set(0, forKey: type.snoozeKey)
+        } else {
+            defaults.set(0, forKey: globalSnoozeKey)
+        }
+        os_log("WatchAlertManager: snooze cancelled", log: alertLog, type: .info)
+    }
+
+    // MARK: - Dismiss
+
+    /// Dismiss = remove delivered notification banner. No cooldown change. Alert will re-fire on normal schedule.
+    func dismiss(type: WatchAlertType) {
+        UNUserNotificationCenter.current()
+            .removeDeliveredNotifications(withIdentifiers: [type.notificationID])
+        os_log("WatchAlertManager: dismissed %{public}@", log: alertLog, type: .info, type.rawValue)
+    }
+
+    // MARK: - Setup (call once from applicationDidFinishLaunching)
+
+    func setup() {
+        UNUserNotificationCenter.current().delegate = self
+        registerNotificationCategories()
+        UNUserNotificationCenter.current().requestAuthorization(
+            options: [.alert, .badge]
+        ) { granted, _ in
+            os_log("WatchAlertManager: permission granted=%d", log: alertLog, type: .info, granted)
+        }
+    }
+
+    private func registerNotificationCategories() {
+        let dismiss = UNNotificationAction(
+            identifier: "DISMISS_ALERT",
+            title: "Dismiss",
+            options: [.destructive]
+        )
+        let snooze = UNNotificationAction(
+            identifier: "SNOOZE_ALERT",
+            title: "Snooze…",
+            options: [.foreground]
+        )
+        let category = UNNotificationCategory(
+            identifier: "GLUCOSE_ALERT",
+            actions: [snooze, dismiss],
+            intentIdentifiers: [],
+            options: []
+        )
+        UNUserNotificationCenter.current().setNotificationCategories([category])
+    }
+
+    // MARK: - Active alert query
+
+    /// Returns true if any alert threshold is currently met for the snapshot,
+    /// regardless of cooldown or snooze state. Used to decide whether to show the Snooze button.
+    func hasActiveAlert(for snapshot: GlucoseSnapshot) -> Bool {
+        guard snapshot.updatedAt > Date(timeIntervalSinceNow: -15 * 60) else { return false }
+        let bg    = snapshot.glucose
+        let delta = snapshot.deltaRate
+        return bg <= thresholds.urgentLow
+            || bg < thresholds.low
+            || bg > thresholds.high
+            || delta.map { $0 < -thresholds.dropRate } ?? false
+            || delta.map { $0 > thresholds.riseRate } ?? false
+    }
+
+    // MARK: - Check (main entry point — call from both WC and background refresh paths)
+
+    func checkAndAlert(snapshot: GlucoseSnapshot) {
+        // Staleness gate: cheap read with no shared state — keep outside the serial queue.
+        guard snapshot.updatedAt > Date(timeIntervalSinceNow: -15 * 60) else {
+            os_log("WatchAlertManager: snapshot too stale, skipping", log: alertLog, type: .debug)
+            return
+        }
+
+        alertQueue.sync {
+            let bg    = snapshot.glucose
+            let delta = snapshot.deltaRate
+
+            // UrgentLow takes full priority — nothing else fires this cycle if triggered.
+            let urgentTriggered = bg <= thresholds.urgentLow   // inclusive: BG == threshold fires
+            evaluate(.urgentLow, bg: bg, delta: delta, triggered: urgentTriggered)
+            guard !urgentTriggered else { return }
+
+            // lowBG suppresses fastDrop — if lowBG threshold is met, fastDrop is skipped.
+            let lowTriggered = bg < thresholds.low
+            evaluate(.lowBG, bg: bg, delta: delta, triggered: lowTriggered)
+            guard !lowTriggered else { return }   // lowBG suppresses fastDrop
+
+            evaluate(.highBG,   bg: bg, delta: delta, triggered: bg > thresholds.high)
+            evaluate(.fastDrop, bg: bg, delta: delta, triggered: delta.map { $0 < -thresholds.dropRate } ?? false)
+            evaluate(.fastRise, bg: bg, delta: delta, triggered: delta.map { $0 > thresholds.riseRate } ?? false)
+        }
+    }
+
+    // MARK: - Private
+
+    private func evaluate(_ type: WatchAlertType, bg: Double, delta: Double?, triggered: Bool) {
+        guard triggered, !isSnoozed(for: type) else { return }
+
+        let now       = Date().timeIntervalSince1970
+        let lastFired = defaults.double(forKey: type.cooldownKey)
+        guard now - lastFired >= settings.cooldown(for: type) else { return }
+
+        fire(type: type, bg: bg, delta: delta)
+        defaults.set(now, forKey: type.cooldownKey)
+    }
+
+    private func fire(type: WatchAlertType, bg: Double, delta: Double?) {
+        let content = UNMutableNotificationContent()
+        content.title              = type.title
+        content.body               = type.body(bg: bg, delta: delta)
+        content.sound              = nil          // haptic only — no audio
+        content.interruptionLevel  = (type == .urgentLow) ? .timeSensitive : .active
+        content.categoryIdentifier = "GLUCOSE_ALERT"
+
+        let request = UNNotificationRequest(
+            identifier: type.notificationID,   // stable ID — replaces any pending same-type alert
+            content: content,
+            trigger: nil                        // immediate delivery
+        )
+        UNUserNotificationCenter.current().add(request) { error in
+            if let error = error {
+                os_log("WatchAlertManager: failed %{public}@ — %{public}@",
+                       log: alertLog, type: .error, type.rawValue, error.localizedDescription)
+            } else {
+                os_log("WatchAlertManager: fired %{public}@ bg=%d",
+                       log: alertLog, type: .info, type.rawValue, Int(bg))
+            }
+        }
+    }
+}
+
+// MARK: - UNUserNotificationCenterDelegate
+
+extension WatchAlertManager: UNUserNotificationCenterDelegate {
+
+    func userNotificationCenter(
+        _ center: UNUserNotificationCenter,
+        didReceive response: UNNotificationResponse,
+        withCompletionHandler completionHandler: @escaping () -> Void
+    ) {
+        let typeRaw   = response.notification.request.identifier
+            .replacingOccurrences(of: "lf-alert-", with: "")
+        let alertType = WatchAlertType(rawValue: typeRaw)
+
+        switch response.actionIdentifier {
+        case "DISMISS_ALERT":
+            if let type = alertType { dismiss(type: type) }
+
+        case "SNOOZE_ALERT":
+            DispatchQueue.main.async {
+                NotificationCenter.default.post(
+                    name: .showSnoozeSheet,
+                    object: nil,
+                    userInfo: alertType.map { ["alertType": $0.rawValue] }
+                )
+            }
+        default:
+            break
+        }
+        completionHandler()
+    }
+
+    func userNotificationCenter(
+        _ center: UNUserNotificationCenter,
+        willPresent notification: UNNotification,
+        withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
+    ) {
+        completionHandler([.banner, .badge])
+    }
+}
diff --git a/LoopFollowWatch Watch App/WatchAlertSettingsView.swift b/LoopFollowWatch Watch App/WatchAlertSettingsView.swift
new file mode 100644
index 000000000..d275c43a6
--- /dev/null
+++ b/LoopFollowWatch Watch App/WatchAlertSettingsView.swift	
@@ -0,0 +1,145 @@
+// WatchAlertSettingsView.swift
+// LoopFollowWatch Watch App
+//
+// Alert settings tab. Presented inside a NavigationStack as the last tab in ContentView.
+// TODO: Add per-type enabled/disabled toggle when surfacing WatchAlertConfig.enabled.
+
+import SwiftUI
+
+struct WatchAlertSettingsView: View {
+    @StateObject private var settings = WatchAppSettings.shared
+
+    private let snoozeOptions = stride(from: 30, through: 720, by: 30).map { $0 }
+
+    var body: some View {
+        List {
+            Section("Snooze Defaults") {
+                Toggle("Snooze all by default", isOn: Binding(
+                    get: { settings.snoozeAllByDefault },
+                    set: { settings.snoozeAllByDefault = $0 }
+                ))
+
+                NavigationLink {
+                    SnoozeDefaultPickerView(settings: settings, options: snoozeOptions)
+                } label: {
+                    HStack {
+                        Text("Default duration")
+                        Spacer()
+                        Text(formattedMinutes(settings.defaultSnoozeMinutes))
+                            .foregroundColor(.secondary)
+                    }
+                }
+            }
+
+            Section("Alert Cooldowns") {
+                ForEach(WatchAlertType.allCases, id: \.self) { type in
+                    NavigationLink {
+                        CooldownPickerView(type: type, settings: settings)
+                    } label: {
+                        HStack {
+                            Text(type.displayName)
+                            Spacer()
+                            Text(formattedSeconds(settings.cooldown(for: type)))
+                                .foregroundColor(.secondary)
+                        }
+                    }
+                }
+            }
+
+            Section {
+                HStack {
+                    Text("Version")
+                    Spacer()
+                    Text(appVersion)
+                        .foregroundColor(.secondary)
+                }
+                HStack {
+                    Text("Build")
+                    Spacer()
+                    Text(appBuild)
+                        .foregroundColor(.secondary)
+                }
+            }
+        }
+        .navigationTitle("Alert Settings")
+    }
+
+    private var appVersion: String {
+        Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "?"
+    }
+
+    private var appBuild: String {
+        Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String ?? "?"
+    }
+
+
+    private func formattedMinutes(_ mins: Int) -> String {
+        mins < 60 ? "\(mins)m" : (mins % 60 == 0 ? "\(mins/60)h" : "\(mins/60)h \(mins%60)m")
+    }
+
+    private func formattedSeconds(_ secs: TimeInterval) -> String {
+        formattedMinutes(Int(secs) / 60)
+    }
+}
+
+// MARK: - Snooze default duration picker
+
+private struct SnoozeDefaultPickerView: View {
+    @ObservedObject var settings: WatchAppSettings
+    let options: [Int]
+
+    var body: some View {
+        List(options, id: \.self) { mins in
+            Button {
+                settings.defaultSnoozeMinutes = mins
+            } label: {
+                HStack {
+                    Text(label(for: mins))
+                    Spacer()
+                    if settings.defaultSnoozeMinutes == mins {
+                        Image(systemName: "checkmark").foregroundColor(.orange)
+                    }
+                }
+            }
+            .buttonStyle(.plain)
+        }
+        .navigationTitle("Default Duration")
+    }
+
+    private func label(for mins: Int) -> String {
+        mins < 60 ? "\(mins) min" : (mins % 60 == 0 ? "\(mins/60) hr" : "\(mins/60)h \(mins%60)m")
+    }
+}
+
+// MARK: - Per-type cooldown picker
+
+private struct CooldownPickerView: View {
+    let type: WatchAlertType
+    @ObservedObject var settings: WatchAppSettings
+
+    // Available cooldown values in seconds: 1–5 min (fine), 10–60 min (coarse)
+    private let options: [TimeInterval] = [1,2,3,4,5,10,15,20,30,45,60].map { Double($0) * 60 }
+
+    var body: some View {
+        List(options, id: \.self) { secs in
+            Button {
+                settings.setCooldown(secs, for: type)
+            } label: {
+                HStack {
+                    Text(label(for: secs))
+                    Spacer()
+                    if settings.cooldown(for: type) == secs {
+                        Image(systemName: "checkmark").foregroundColor(.orange)
+                    }
+                }
+            }
+            .buttonStyle(.plain)
+        }
+        .navigationTitle("\(type.displayName) Cooldown")
+    }
+
+    private func label(for secs: TimeInterval) -> String {
+        let mins = Int(secs) / 60
+        return mins < 60 ? "\(mins) min" : "\(mins/60) hr"
+    }
+}
diff --git a/LoopFollowWatch Watch App/WatchAppSettings.swift b/LoopFollowWatch Watch App/WatchAppSettings.swift
new file mode 100644
index 000000000..10a63b9f0
--- /dev/null
+++ b/LoopFollowWatch Watch App/WatchAppSettings.swift	
@@ -0,0 +1,60 @@
+// WatchAppSettings.swift
+// LoopFollowWatch Watch App
+//
+// Single source of truth for all editable alert settings.
+// Backed by the shared App Group container so settings survive
+// Watch app reinstalls and are accessible from both app and extension.
+
+import Foundation
+import Combine
+
+final class WatchAppSettings: ObservableObject {
+
+    static let shared = WatchAppSettings()
+    private init() {}
+
+    // MARK: - App Group defaults
+
+    private static let defaults = UserDefaults(suiteName: AppGroupID.current()) ?? .standard
+
+    // MARK: - UserDefaults keys
+
+    private enum Key {
+        static let snoozeAllByDefault   = "watchSnoozeAllByDefault"
+        static let defaultSnoozeMinutes = "watchDefaultSnoozeMinutes"
+        static func cooldown(_ type: WatchAlertType) -> String { "watchCooldown_\(type.rawValue)" }
+    }
+
+    // MARK: - Snooze defaults
+
+    var snoozeAllByDefault: Bool {
+        get { Self.defaults.object(forKey: Key.snoozeAllByDefault) as? Bool ?? true }
+        set { Self.defaults.set(newValue, forKey: Key.snoozeAllByDefault); objectWillChange.send() }
+    }
+
+    var defaultSnoozeMinutes: Int {
+        get { Self.defaults.object(forKey: Key.defaultSnoozeMinutes) as? Int ?? 60 }
+        set { Self.defaults.set(newValue, forKey: Key.defaultSnoozeMinutes); objectWillChange.send() }
+    }
+
+    // MARK: - Cooldowns
+
+    /// Default cooldowns in seconds. Used when no persisted value exists.
+    static let defaultCooldowns: [WatchAlertType: TimeInterval] = [
+        .lowBG:     15 * 60,
+        .urgentLow:  5 * 60,
+        .highBG:    15 * 60,
+        .fastDrop:  10 * 60,
+        .fastRise:  10 * 60,
+    ]
+
+    func cooldown(for type: WatchAlertType) -> TimeInterval {
+        let stored = Self.defaults.double(forKey: Key.cooldown(type))
+        return stored > 0 ? stored : (Self.defaultCooldowns[type] ?? 10 * 60)
+    }
+
+    func setCooldown(_ seconds: TimeInterval, for type: WatchAlertType) {
+        Self.defaults.set(seconds, forKey: Key.cooldown(type))
+        objectWillChange.send()
+    }
+}
diff --git a/WatchConnectivityManager.swift b/WatchConnectivityManager.swift
new file mode 100644
index 000000000..b92248e68
--- /dev/null
+++ b/WatchConnectivityManager.swift
@@ -0,0 +1,249 @@
+//  WatchConnectivityManager.swift
+//  LoopFollow
+//
+//  Copyright © 2026 Jon Fawcett. All rights reserved.
+//
+
+
+// WatchConnectivityManager.swift
+// Philippe Achkar
+// 2026-03-10
+
+import Combine
+import Foundation
+import WatchConnectivity
+
+final class WatchConnectivityManager: NSObject {
+
+    // MARK: - Shared Instance
+
+    static let shared = WatchConnectivityManager()
+
+    // MARK: - Init
+
+    /// Timestamp of the last snapshot the Watch ACK'd via sendAck().
+    private var lastWatchAckTimestamp: TimeInterval = 0
+    /// Timestamp of the last remote command received from the Watch.
+    private var lastWatchCommandDate: Date = .distantPast
+    private var cancellables = Set<AnyCancellable>()
+
+    private override init() {
+        super.init()
+    }
+
+    // MARK: - Setup
+
+    /// Call once from AppDelegate after app launch.
+    func activate() {
+        guard WCSession.isSupported() else {
+            LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: WCSession not supported on this device")
+            return
+        }
+        WCSession.default.delegate = self
+        WCSession.default.activate()
+        observeLoopAPNSSettings()
+        LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: WCSession activation requested")
+    }
+
+    // MARK: - Send Snapshot
+
+    /// Sends the latest GlucoseSnapshot to the Watch via transferUserInfo.
+    /// Safe to call from any thread.
+    /// No-ops silently if Watch is not paired or reachable.
+    func send(snapshot: GlucoseSnapshot) {
+        guard WCSession.isSupported() else { return }
+
+        let session = WCSession.default
+
+        guard session.activationState == .activated else {
+            LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: session not activated, skipping send")
+            return
+        }
+
+        guard session.isPaired else {
+            LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: no paired Watch, skipping send")
+            return
+        }
+
+        do {
+            let encoder = JSONEncoder()
+            encoder.dateEncodingStrategy = .iso8601
+            let data = try encoder.encode(snapshot)
+            let payload: [String: Any] = ["snapshot": data]
+
+            // Warn if Watch hasn't ACK'd this or a recent snapshot.
+            let behindBy = snapshot.updatedAt.timeIntervalSince1970 - lastWatchAckTimestamp
+            if lastWatchAckTimestamp > 0, behindBy > 600 {
+                LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: Watch ACK is \(Int(behindBy))s behind — Watch may be missing deliveries")
+            }
+
+            // sendMessage: immediate delivery when Watch app is in foreground.
+            if session.isReachable {
+                session.sendMessage(payload, replyHandler: nil, errorHandler: nil)
+                LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: snapshot sent via sendMessage (reachable)")
+            }
+
+            // Cancel outstanding transfers before queuing — only the latest snapshot matters.
+            session.outstandingUserInfoTransfers.forEach { $0.cancel() }
+
+            // transferUserInfo: guaranteed queued delivery for background wakes.
+            session.transferUserInfo(payload)
+            
+            // applicationContext: latest-state mirror for next launch / scheduled refresh.
+            do {
+                try session.updateApplicationContext(payload)
+            } catch {
+                LogManager.shared.log(
+                    category: .watch,
+                    message: "WatchConnectivityManager: failed to update applicationContext — \(error)"
+                )
+            }
+            
+            LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: snapshot queued via transferUserInfo")
+        } catch {
+            LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: failed to encode snapshot — \(error)")
+        }
+    }
+}
+
+// MARK: - WCSessionDelegate
+
+extension WatchConnectivityManager: WCSessionDelegate {
+
+    func session(
+        _ session: WCSession,
+        activationDidCompleteWith activationState: WCSessionActivationState,
+        error: Error?
+    ) {
+        if let error = error {
+            LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: activation failed — \(error)")
+        } else {
+            LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: activation complete — state \(activationState.rawValue)")
+            syncWatchAppGroupSettings()
+            notifyWatchSettingsChanged()
+        }
+    }
+
+    /// When the Watch app comes to the foreground, send the latest snapshot immediately
+    /// so the Watch app has fresh data without waiting for the next BG poll.
+    /// Receives ACKs from the Watch (sent after each snapshot is saved).
+    func session(_ session: WCSession, didReceiveMessage message: [String: Any]) {
+        if let ackTimestamp = message["watchAck"] as? TimeInterval {
+            lastWatchAckTimestamp = ackTimestamp
+            LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: Watch ACK received for snapshot at \(ackTimestamp)")
+        }
+    }
+
+    /// Handles remote command messages sent from the Watch with a reply handler.
+    func session(_ session: WCSession, didReceiveMessage message: [String: Any],
+                 replyHandler: @escaping ([String: Any]) -> Void) {
+        LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: received Watch command — \(message["watchCmd"] as? String ?? "unknown")")
+        lastWatchCommandDate = Date()
+        WatchCommandDispatcher.shared.handle(message: message, replyHandler: replyHandler)
+    }
+
+    func session(_ session: WCSession, didReceiveUserInfo userInfo: [String: Any]) {
+        if let ackTimestamp = userInfo["watchAck"] as? TimeInterval {
+            lastWatchAckTimestamp = ackTimestamp
+            LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: Watch ACK (userInfo) received for snapshot at \(ackTimestamp)")
+        }
+    }
+
+    func sessionReachabilityDidChange(_ session: WCSession) {
+        guard session.isReachable else { return }
+        syncWatchAppGroupSettings()
+        notifyWatchSettingsChanged()
+        if let snapshot = GlucoseSnapshotStore.shared.load() {
+            send(snapshot: snapshot)
+            LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: Watch became reachable — snapshot pushed")
+        }
+    }
+
+    func sessionDidBecomeInactive(_ session: WCSession) {
+        LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: session became inactive")
+    }
+
+    func sessionDidDeactivate(_ session: WCSession) {
+        LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: session deactivated — reactivating")
+        WCSession.default.activate()
+    }
+
+    // MARK: - App Group sync
+
+    private func syncWatchAppGroupSettings() {
+        LAAppGroupSettings.setWatchRemoteEnabled(LoopAPNSService().validateSetup())
+        LAAppGroupSettings.setWatchMaxBolus(Storage.shared.maxBolus.value.doubleValue(for: .internationalUnit()))
+        LAAppGroupSettings.setWatchMaxCarbs(Storage.shared.maxCarbs.value.doubleValue(for: .gram()))
+    }
+
+    /// Notifies the Watch to re-read App Group settings (e.g. after LoopAPNS is configured).
+    private func notifyWatchSettingsChanged() {
+        let session = WCSession.default
+        guard session.activationState == .activated, session.isPaired, session.isReachable else { return }
+        session.sendMessage(["watchSettingsRefresh": true], replyHandler: nil, errorHandler: nil)
+        LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: settings refresh sent to Watch")
+    }
+
+    /// Forwards a Loop command return notification to the Watch as a local notification trigger.
+    /// Called from AppDelegate when a remote notification arrives. Forwards if:
+    ///   - the notification contains command_status/command_type (Loop explicit fields), OR
+    ///   - a Watch command was dispatched within the last 2 minutes (time-window correlation).
+    func forwardCommandReturnToWatch(userInfo: [AnyHashable: Any]) {
+        guard WCSession.isSupported() else { return }
+        let session = WCSession.default
+        guard session.activationState == .activated, session.isPaired else { return }
+
+        let hasCommandFields = userInfo["command_status"] != nil || userInfo["command_type"] != nil
+        let recentWatchCommand = Date().timeIntervalSince(lastWatchCommandDate) < 120
+        let hasAlert: Bool = {
+            guard let aps = userInfo["aps"] as? [String: Any] else { return false }
+            return aps["alert"] != nil
+        }()
+
+        guard hasCommandFields || (recentWatchCommand && hasAlert) else { return }
+
+        var title = "Loop Confirmed ✓"
+        var body = "Command processed by Loop"
+
+        if let commandType = userInfo["command_type"] as? String {
+            switch commandType.lowercased() {
+            case "bolus":    title = "Bolus Confirmed ✓"
+            case "carbs":    title = "Carbs Confirmed ✓"
+            case "override": title = "Override Confirmed ✓"
+            default: break
+            }
+        }
+
+        if let aps = userInfo["aps"] as? [String: Any] {
+            if let alert = aps["alert"] as? [String: Any] {
+                title = alert["title"] as? String ?? title
+                body  = alert["body"]  as? String ?? body
+            } else if let alertStr = aps["alert"] as? String {
+                body = alertStr
+            }
+        }
+
+        let payload: [String: Any] = ["watchLoopReturn": true, "title": title, "body": body]
+        if session.isReachable {
+            session.sendMessage(payload, replyHandler: nil, errorHandler: nil)
+        } else {
+            session.transferUserInfo(payload)
+        }
+        LogManager.shared.log(category: .watch, message: "WatchConnectivityManager: forwarded Loop return to Watch — \(title)")
+    }
+
+    /// Observes LoopAPNS-relevant storage values and syncs to App Group whenever they change.
+    private func observeLoopAPNSSettings() {
+        Publishers.MergeMany(
+            Storage.shared.deviceToken.$value.dropFirst().map { _ in () }.eraseToAnyPublisher(),
+            Storage.shared.loopAPNSQrCodeURL.$value.dropFirst().map { _ in () }.eraseToAnyPublisher(),
+            Storage.shared.remoteApnsKey.$value.dropFirst().map { _ in () }.eraseToAnyPublisher()
+        )
+        .debounce(for: .milliseconds(300), scheduler: DispatchQueue.main)
+        .sink { [weak self] in
+            self?.syncWatchAppGroupSettings()
+            self?.notifyWatchSettingsChanged()
+        }
+        .store(in: &cancellables)
+    }
+}
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 120b9f061..f3cee05b8 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -56,7 +56,8 @@ platform :ios do
       git_basic_authorization: Base64.strict_encode64("#{GITHUB_REPOSITORY_OWNER}:#{GH_PAT}"),
       app_identifier: [
         "com.#{TEAMID}.LoopFollow",
-        "com.#{TEAMID}.LoopFollow.LoopFollowLAExtension"
+        "com.#{TEAMID}.LoopFollow.LoopFollowLAExtension",
+        "com.#{TEAMID}.LoopFollow.watchkitapp"
       ]
     )
 
@@ -72,12 +73,19 @@ platform :ios do
     )
 
     update_code_signing_settings(
-      path: "#{GITHUB_WORKSPACE}/LoopFollow.xcodeproj",    
+      path: "#{GITHUB_WORKSPACE}/LoopFollow.xcodeproj",
       profile_name: mapping["com.#{TEAMID}.LoopFollow.LoopFollowLAExtension"],
       code_sign_identity: "iPhone Distribution",
       targets: ["LoopFollowLAExtensionExtension"]
     )
 
+    update_code_signing_settings(
+      path: "#{GITHUB_WORKSPACE}/LoopFollow.xcodeproj",
+      profile_name: mapping["com.#{TEAMID}.LoopFollow.watchkitapp"],
+      code_sign_identity: "iPhone Distribution",
+      targets: ["LoopFollowWatch Watch App"]
+    )
+
     gym(
       export_method: "app-store",
       scheme: "LoopFollow",
@@ -88,9 +96,10 @@ platform :ios do
       export_options: {
         provisioningProfiles: {
           "com.#{TEAMID}.LoopFollow" => mapping["com.#{TEAMID}.LoopFollow"],
-          "com.#{TEAMID}.LoopFollow.LoopFollowLAExtension" => mapping["com.#{TEAMID}.LoopFollow.LoopFollowLAExtension"]
+          "com.#{TEAMID}.LoopFollow.LoopFollowLAExtension" => mapping["com.#{TEAMID}.LoopFollow.LoopFollowLAExtension"],
+          "com.#{TEAMID}.LoopFollow.watchkitapp" => mapping["com.#{TEAMID}.LoopFollow.watchkitapp"]
         }
-      }	
+      }
     )
 
     copy_artifacts(
@@ -142,11 +151,13 @@ platform :ios do
       Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS,
       Spaceship::ConnectAPI::BundleIdCapability::Type::PUSH_NOTIFICATIONS
     ])
-    
+
     configure_bundle_id("LoopFollow Live Activity Extension", "com.#{TEAMID}.LoopFollow.LoopFollowLAExtension", [
       Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
     ])
 
+    configure_bundle_id("LoopFollow Watch App", "com.#{TEAMID}.LoopFollow.watchkitapp", [])
+
   end
 
   desc "Provision Certificates"
@@ -167,7 +178,8 @@ platform :ios do
       git_basic_authorization: Base64.strict_encode64("#{GITHUB_REPOSITORY_OWNER}:#{GH_PAT}"),
       app_identifier: [
         "com.#{TEAMID}.LoopFollow",
-	"com.#{TEAMID}.LoopFollow.LoopFollowLAExtension"
+        "com.#{TEAMID}.LoopFollow.LoopFollowLAExtension",
+        "com.#{TEAMID}.LoopFollow.watchkitapp"
       ]
     )
   end