Merge remote-tracking branch 'origin/dev' into fix/alarm-audio-session-activation

Author: bjorkert

.github/workflows/lint.yml

@@ -0,0 +1,37 @@
+name: Lint
+run-name: Lint (${{ github.head_ref || github.ref_name }})
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: lint-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  swiftformat:
+    name: SwiftFormat
+    runs-on: ubuntu-latest
+    container: swift:6.0
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Cache SwiftFormat build
+        uses: actions/cache@v4
+        with:
+          path: BuildTools/.build
+          key: ${{ runner.os }}-swiftformat-${{ hashFiles('BuildTools/Package.resolved', 'BuildTools/Package.swift') }}
+          restore-keys: |
+            ${{ runner.os }}-swiftformat-
+
+      - name: SwiftFormat --lint
+        run: |
+          swift run -c release --package-path BuildTools swiftformat . \
+            --lint \
+            --header "LoopFollow\n{file}" \
+            --exclude Pods,Generated,R.generated.swift,fastlane/swift,Dependencies,dexcom-share-client-swift

.github/workflows/warn_main_pr.yml

@@ -0,0 +1,27 @@
+name: Warn PR targets main
+
+on:
+  pull_request_target:
+    types: [opened, edited]
+    branches:
+      - main
+
+jobs:
+  warn:
+    if: github.repository_owner == 'loopandlearn'
+    runs-on: ubuntu-latest
+
+    permissions:
+      pull-requests: write
+
+    steps:
+      - name: Comment on PR
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              body: '⚠️ This PR targets the `main` branch. We do not accept PRs directly to `main` — please retarget your PR to the `dev` branch instead.'
+            });

.gitignore

@@ -80,4 +80,11 @@ fastlane/test_output
 fastlane/FastlaneRunner
 
 LoopFollowConfigOverride.xcconfig
-.history
+.history*.xcuserstate
+docs/PR_configurable_slots.md
+docs/LiveActivityTestPlan.md
+
+# Claude
+CLAUDE.md
+
+node_modules/

Config.xcconfig

@@ -6,4 +6,4 @@
 unique_id = ${DEVELOPMENT_TEAM}
 
 //Version (DEFAULT)
-LOOP_FOLLOW_MARKETING_VERSION = 5.0.9
+LOOP_FOLLOW_MARKETING_VERSION = 6.0.8

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.8)
     abbrev (0.1.2)
-    addressable (2.8.8)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
     artifactory (3.0.17)
     atomos (0.1.3)

LoopFollow.xcodeproj/project.pbxproj

@@ -107,6 +107,7 @@ struct Alarm: Identifiable, Codable, Equatable {
         case missedBolusPrebolusWindow, missedBolusIgnoreSmallBolusUnits
         case missedBolusIgnoreUnderGrams, missedBolusIgnoreUnderBG
         case bolusCountThreshold, bolusWindowMinutes
+        case sensorLifetimeDays
     }
 
     init(from decoder: Decoder) throws {
@@ -137,6 +138,7 @@ struct Alarm: Identifiable, Codable, Equatable {
         missedBolusIgnoreUnderBG = try container.decodeIfPresent(Double.self, forKey: .missedBolusIgnoreUnderBG)
         bolusCountThreshold = try container.decodeIfPresent(Int.self, forKey: .bolusCountThreshold)
         bolusWindowMinutes = try container.decodeIfPresent(Int.self, forKey: .bolusWindowMinutes)
+        sensorLifetimeDays = try container.decodeIfPresent(Int.self, forKey: .sensorLifetimeDays)
     }
 
     func encode(to encoder: Encoder) throws {
@@ -165,6 +167,7 @@ struct Alarm: Identifiable, Codable, Equatable {
         try container.encodeIfPresent(missedBolusIgnoreUnderBG, forKey: .missedBolusIgnoreUnderBG)
         try container.encodeIfPresent(bolusCountThreshold, forKey: .bolusCountThreshold)
         try container.encodeIfPresent(bolusWindowMinutes, forKey: .bolusWindowMinutes)
+        try container.encodeIfPresent(sensorLifetimeDays, forKey: .sensorLifetimeDays)
     }
 
     // ─────────────────────────────────────────────────────────────
@@ -191,6 +194,12 @@ struct Alarm: Identifiable, Codable, Equatable {
     /// ...within this many minutes
     var bolusWindowMinutes: Int?
 
+    // ─────────────────────────────────────────────────────────────
+    // Sensor‑Change fields ─
+    // ─────────────────────────────────────────────────────────────
+    /// CGM sensor lifetime in days (e.g. 10 for Dexcom G6, 15 for G7 15-day)
+    var sensorLifetimeDays: Int?
+
     /// Function for when the alarm is triggered.
     /// If this alarm, all alarms is disabled or snoozed, then should not be called. This or all alarmd could be muted, then this function will just generate a notification.
     func trigger(config: AlarmConfiguration, now: Date) {
@@ -318,6 +327,7 @@ struct Alarm: Identifiable, Codable, Equatable {
         case .sensorChange:
             soundFile = .wakeUpWillYou
             threshold = 12
+            sensorLifetimeDays = 10
         case .pumpChange:
             soundFile = .wakeUpWillYou
             threshold = 12

LoopFollow.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -22,7 +22,7 @@ struct PumpChangeCondition: AlarmCondition {
     func evaluate(alarm: Alarm, data: AlarmData, now _: Date) -> Bool {
         // 0. sanity guards
         guard let warnAheadHrs = alarm.threshold, warnAheadHrs > 0 else { return false }
-        guard let insertTS = data.pumpInsertTime else { return false }
+        guard let insertTS = data.pumpInsertTime, insertTS > 0 else { return false }
 
         // convert UNIX timestamp → Date
         let insertedAt = Date(timeIntervalSince1970: insertTS)

LoopFollow/Alarm/Alarm.swift

@@ -3,24 +3,23 @@
 
 import Foundation
 
-/// Fires once when we are **≤ threshold hours** away from the
-/// Dexcom 10-day hard-stop.  No repeats once triggered.
+/// Fires when we are **≤ threshold hours** away from the
+/// sensor's configured lifetime.
 struct SensorAgeCondition: AlarmCondition {
     static let type: AlarmType = .sensorChange
     init() {}
 
-    /// Dexcom hard-stop = 10 days = 240 h
-    private let lifetime: TimeInterval = 10 * 24 * 60 * 60
-
     func evaluate(alarm: Alarm, data: AlarmData, now _: Date) -> Bool {
         // 0. basic guards
         guard let warnAheadHrs = alarm.threshold, warnAheadHrs > 0 else { return false }
-        guard let insertTS = data.sageInsertTime else { return false }
+        guard let insertTS = data.sageInsertTime, insertTS > 0 else { return false }
 
         // convert UNIX timestamp to Date
         let insertedAt = Date(timeIntervalSince1970: insertTS)
 
-        // 1. compute trigger moment
+        // 1. compute trigger moment using configurable lifetime (default 10 days)
+        let lifetimeDays = alarm.sensorLifetimeDays ?? 10
+        let lifetime: TimeInterval = Double(lifetimeDays) * 24 * 60 * 60
         let expiry = insertedAt.addingTimeInterval(lifetime)
         let trigger = expiry.addingTimeInterval(-warnAheadHrs * 3600)