SportMode: Loop changes needed to run autonomously on the watch

Common/FeatureFlags.swift

@@ -40,6 +40,7 @@ struct FeatureFlagConfiguration: Decodable {
     let allowAlgorithmExperiments: Bool
     let isInvestigationalDevice: Bool
     let devBranchWarningEnabled: Bool
+    let sportModeEnabled: Bool
 
     fileprivate init() {
         // Swift compiler config is inverse, since the default state is enabled.
@@ -239,6 +240,12 @@ struct FeatureFlagConfiguration: Decodable {
         #else
         self.devBranchWarningEnabled = true
         #endif
+
+        #if SPORT_MODE_ENABLED
+        self.sportModeEnabled = true
+        #else
+        self.sportModeEnabled = false
+        #endif
     }
 }
 
@@ -260,6 +267,7 @@ extension FeatureFlagConfiguration : CustomDebugStringConvertible {
             "* observeHealthKitGlucoseSamplesFromOtherApps: \(observeHealthKitGlucoseSamplesFromOtherApps)",
             "* predictedGlucoseChartClampEnabled: \(predictedGlucoseChartClampEnabled)",
             "* remoteCommandsEnabled: \(remoteCommandsEnabled)",
+            "* sportModeEnabled: \(sportModeEnabled)",
             "* scenariosEnabled: \(scenariosEnabled)",
             "* showEventualBloodGlucoseOnWatchEnabled: \(showEventualBloodGlucoseOnWatchEnabled)",
             "* simulatedCoreDataEnabled: \(simulatedCoreDataEnabled)",

Common/Models/BuildDetails+SportMode.swift

@@ -0,0 +1,26 @@
+//
+//  BuildDetails+SportMode.swift
+//  Loop
+//
+//  Copyright © 2026 LoopKit Authors. All rights reserved.
+//
+//  Sport Mode's build identity, shown on both devices and sent with a loan request.
+//
+
+import Foundation
+
+extension BuildDetails {
+    /// The workspace commit plus build date and time: the same on phone and watch when built
+    /// together. CFBundleVersion is pinned, so it cannot tell builds apart.
+    var codeIdentity: String {
+        let sha = (dict["com-loopkit-Loop-commit-sha"] as? String)
+            ?? (dict["com-loopkit-LoopWorkspace-git-revision"] as? String)
+            ?? gitRevision
+        guard let sha else { return "sha?" }
+        // "Wed Aug 19 15:59:38 EDT 2026" -> "Aug19 15:59".
+        let parts = (dict["com-loopkit-Loop-build-date"] as? String)?
+            .split(separator: " ").map(String.init) ?? []
+        let stamp = parts.count >= 4 ? " \(parts[1])\(parts[2]) \(parts[3].prefix(5))" : ""
+        return sha + stamp
+    }
+}

Loop.xcconfig

@@ -27,6 +27,10 @@ LOOP_LOCAL_CACHE_DURATION_DAYS = 90
 
 // Entitlements [DEFAULT]
 LOOP_ENTITLEMENTS = Loop/Loop.entitlements
+// The watch signs with none, as stock. Sport Mode builds set it to
+// "WatchApp Extension/SportMode.entitlements" (HealthKit for the workout session,
+// time-sensitive notifications for wrist alarms), next to SPORT_MODE_ENABLED.
+LOOP_WATCH_ENTITLEMENTS =
 
 // Code signing and provisioning [DEFAULT]
 LOOP_DEVELOPMENT_TEAM =

Loop.xcodeproj/xcshareddata/xcschemes/WatchAppTests.xcscheme

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "43A943711B926B7B0051FA24"
+               BuildableName = "WatchApp.app"
+               BlueprintName = "WatchApp"
+               ReferencedContainer = "container:Loop.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9A7CE001302D82A800A03F53"
+               BuildableName = "WatchAppTests.xctest"
+               BlueprintName = "WatchAppTests"
+               ReferencedContainer = "container:Loop.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "9A7CE001302D82A800A03F53"
+               BuildableName = "WatchAppTests.xctest"
+               BlueprintName = "WatchAppTests"
+               ReferencedContainer = "container:Loop.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Loop/Extensions/DeviceDataManager+DeviceStatus.swift

@@ -44,6 +44,8 @@ extension DeviceDataManager {
             return DeviceDataManager.resumeOnboardingStatusHighlight
         } else if pumpManager == nil {
             return DeviceDataManager.addPumpStatusHighlight
+        } else if let podLoanStatusHighlight {
+            return podLoanStatusHighlight
         } else {
             return (pumpManager as? PumpManagerUI)?.pumpStatusHighlight
         }
@@ -54,6 +56,7 @@ extension DeviceDataManager {
     }
 
     var pumpLifecycleProgress: DeviceLifecycleProgress? {
+        if let podLoanProgress = podLoanLifecycleProgress { return podLoanProgress }
         return (pumpManager as? PumpManagerUI)?.pumpLifecycleProgress
     }
 

Loop/Extensions/DoseStore+SimulatedCoreData.swift

@@ -109,7 +109,7 @@ fileprivate extension PersistedPumpEvent {
                                          endDate: date.addingTimeInterval(duration),
                                          value: rate,
                                          unit: .unitsPerHour,
-                                         decisionId: nil,
+                                         doseId: nil,
                                          deliveredUnits: rate * duration / .hours(1)))
     }
 
@@ -119,7 +119,7 @@ fileprivate extension PersistedPumpEvent {
                                          endDate: date.addingTimeInterval(.minutes(1)),
                                          value: amount,
                                          unit: .units,
-                                         decisionId: nil))
+                                         doseId: nil))
     }
 
     static func simulatedPrime(date: Date) -> PersistedPumpEvent {
@@ -144,7 +144,7 @@ fileprivate extension PersistedPumpEvent {
                                          endDate: date.addingTimeInterval(duration),
                                          value: rate,
                                          unit: .unitsPerHour,
-                                         decisionId: nil,
+                                         doseId: nil,
                                          deliveredUnits: rate * duration / .hours(1),
                                          scheduledBasalRate: LoopQuantity(unit: .internationalUnitsPerHour, doubleValue: scheduledRate)))
     }