Tag bolus origin and show it in Nightscout

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "LoopKit"]
 	path = LoopKit
-	url = https://github.com/loopandlearn/LoopKit.git
+	url = https://github.com/bjorkert/LoopKit.git
 [submodule "CGMBLEKit"]
 	path = CGMBLEKit
 	url = https://github.com/loopandlearn/CGMBLEKit.git
@@ -30,4 +30,4 @@
 	url = https://github.com/loopandlearn/MedtrumKit
 [submodule "OmnipodKit"]
 	path = OmnipodKit
-	url = https://github.com/loopandlearn/OmnipodKit
+	url = https://github.com/bjorkert/OmnipodKit.git

Model/Classes+Properties/BolusStored+CoreDataProperties.swift

@@ -7,6 +7,7 @@ public extension BolusStored {
     }
 
     @NSManaged var amount: NSDecimalNumber?
+    @NSManaged var bolusOrigin: String?
     @NSManaged var isExternal: Bool
     @NSManaged var isSMB: Bool
     @NSManaged var pumpEvent: PumpEventStored?

Model/TrioCoreDataPersistentContainer.xcdatamodeld/TrioCoreDataPersistentContainer.xcdatamodel/contents

@@ -2,6 +2,7 @@
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23788.4" systemVersion="25B78" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
     <entity name="BolusStored" representedClassName="BolusStored" syncable="YES">
         <attribute name="amount" optional="YES" attributeType="Decimal" defaultValueString="0"/>
+        <attribute name="bolusOrigin" optional="YES" attributeType="String"/>
         <attribute name="isExternal" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="isSMB" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
         <relationship name="pumpEvent" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PumpEventStored" inverseName="bolus" inverseEntity="PumpEventStored"/>

Trio/Sources/APS/APSManager.swift

@@ -8,7 +8,7 @@ import Swinject
 
 protocol APSManager {
     func heartbeat(date: Date)
-    func enactBolus(amount: Double, isSMB: Bool, callback: ((Bool, String) -> Void)?) async
+    func enactBolus(amount: Double, isSMB: Bool, origin: BolusOrigin?, callback: ((Bool, String) -> Void)?) async
     var pumpManager: PumpManagerUI? { get set }
     var bluetoothManager: BluetoothStateManager? { get }
     var pumpDisplayState: CurrentValueSubject<PumpDisplayState?, Never> { get }
@@ -36,6 +36,13 @@ protocol APSManager {
     var iobFileDidUpdate: PassthroughSubject<Void, Never> { get }
 }
 
+extension APSManager {
+    /// Convenience for callers that do not tag a bolus origin.
+    func enactBolus(amount: Double, isSMB: Bool, callback: ((Bool, String) -> Void)?) async {
+        await enactBolus(amount: amount, isSMB: isSMB, origin: nil, callback: callback)
+    }
+}
+
 enum APSError: LocalizedError {
     case pumpError(Error)
     case invalidPumpState(message: String)
@@ -550,7 +557,7 @@ final class BaseAPSManager: APSManager, Injectable {
         return min(rounded, maxBolus)
     }
 
-    func enactBolus(amount: Double, isSMB: Bool, callback: ((Bool, String) -> Void)?) async {
+    func enactBolus(amount: Double, isSMB: Bool, origin: BolusOrigin?, callback: ((Bool, String) -> Void)?) async {
         if amount <= 0 {
             return
         }
@@ -575,10 +582,14 @@ final class BaseAPSManager: APSManager, Injectable {
 
         let roundedAmount = pump.roundToSupportedBolusVolume(units: amount)
 
+        // Mint the correlation reference only once the command is actually going to the pump, so none of the
+        // early returns above can leave an orphaned origin mapping behind.
+        let bolusReference = origin.map { BolusOriginStore.shared.makeReference(for: $0) }
+
         debug(.apsManager, "Enact bolus \(roundedAmount), manual \(!isSMB)")
 
         do {
-            try await pump.enactBolus(units: roundedAmount, automatic: isSMB)
+            try await pump.enactBolus(units: roundedAmount, automatic: isSMB, bolusReference: bolusReference)
             debug(.apsManager, "Bolus succeeded")
             bolusProgress.send(0)
             callback?(true, String(localized: "Bolus enacted successfully.", comment: "Success message for enacting a bolus"))
@@ -594,6 +605,11 @@ final class BaseAPSManager: APSManager, Injectable {
             }
         } catch {
             warning(.apsManager, "Bolus failed with error: \(error)")
+            // Drop the origin mapping on a definite failure. On uncertain delivery we keep it, because the
+            // dose may still be reported (and reconciled) later and should still resolve its origin.
+            if let bolusReference = bolusReference, !error.isUncertainDelivery {
+                BolusOriginStore.shared.remove(reference: bolusReference)
+            }
             processError(APSError.pumpError(error))
             if !isSMB {
                 // Use MainActor to handle broadcaster notification
@@ -755,6 +771,7 @@ final class BaseAPSManager: APSManager, Injectable {
     }
 
     private func performBolus(pump: PumpManager, smbToDeliver: NSDecimalNumber) async throws {
+        // SMB is not origin-tagged: it is already distinguishable in Nightscout via eventType "SMB".
         try await pump.enactBolus(units: Double(truncating: smbToDeliver), automatic: true)
         bolusProgress.send(0)
     }
@@ -1245,11 +1262,11 @@ private extension PumpManager {
         }
     }
 
-    func enactBolus(units: Double, automatic: Bool) async throws {
+    func enactBolus(units: Double, automatic: Bool, bolusReference: UUID? = nil) async throws {
         try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, Error>) in
             let automaticValue = automatic ? BolusActivationType.automatic : BolusActivationType.manualRecommendationAccepted
 
-            self.enactBolus(units: units, activationType: automaticValue) { error in
+            self.enactBolus(units: units, activationType: automaticValue, bolusReference: bolusReference) { error in
                 if let error = error {
                     debug(.apsManager, "Bolus failed: \(units)")
                     continuation.resume(throwing: error)
@@ -1358,3 +1375,13 @@ extension PumpManagerStatus {
         return PumpStatus(status: type, bolusing: bolusing, suspended: suspended, timestamp: Date())
     }
 }
+
+private extension Error {
+    /// True when a bolus command failed with uncertain delivery — the pump may still report the dose later,
+    /// so any correlation state (e.g. the bolus-origin mapping) must be kept rather than cleaned up.
+    var isUncertainDelivery: Bool {
+        guard let pumpError = self as? PumpManagerError else { return false }
+        if case .uncertainDelivery = pumpError { return true }
+        return false
+    }
+}

Trio/Sources/APS/Storage/PumpHistoryStorage.swift

@@ -48,6 +48,10 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
 
     func storePumpEvents(_ events: [NewPumpEvent]) async throws {
         try await context.perform {
+            // Origin mappings consumed while tagging boluses below; removed from the store only after the
+            // context saves, so a failed save leaves them resolvable when the pump re-delivers the events.
+            var consumedBolusReferences: [UUID] = []
+
             for event in events {
                 let existingEvents: [PumpEventStored] = try CoreDataStack.shared.fetchEntities(
                     ofType: PumpEventStored.self,
@@ -103,6 +107,18 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
                     newBolusEntry.isExternal = dose.manuallyEntered
                     newBolusEntry.isSMB = dose.automatic ?? true
 
+                    // Record the finer origin of a user-initiated bolus (remote/watch/manual/shortcut) resolved
+                    // from the reference the pump echoed back. SMB is not tagged here — it is already conveyed by
+                    // isSMB / the SMB event type. The machine value goes to `bolusOrigin`, the display to `note`.
+                    if let reference = dose.bolusReference,
+                       let resolved = BolusOriginStore.shared.origin(forReference: reference)
+                    {
+                        newBolusEntry.bolusOrigin = resolved.rawValue
+                        newPumpEvent.note = resolved.displayName
+                        consumedBolusReferences.append(reference)
+                        debug(.coreData, "Tagged bolus origin: \(resolved.displayName)")
+                    }
+
                 case .tempBasal:
                     guard let dose = event.dose else { continue }
 
@@ -229,6 +245,10 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
                 guard self.context.hasChanges else { return }
                 try self.context.save()
 
+                for reference in consumedBolusReferences {
+                    BolusOriginStore.shared.remove(reference: reference)
+                }
+
                 self.updateSubject.send(())
                 debug(.coreData, "\(DebuggingIdentifiers.succeeded) stored pump events in Core Data")
             } catch let error as NSError {
@@ -348,7 +368,8 @@ final class BasePumpHistoryStorage: PumpHistoryStorage, Injectable {
                         enteredBy: NightscoutTreatment.local,
                         bolus: nil,
                         insulin: event.bolus?.amount as Decimal?,
-                        notes: nil,
+                        notes: event.note,
+                        bolusOrigin: event.bolus?.bolusOrigin,
                         carbs: nil,
                         fat: nil,
                         protein: nil,

Trio/Sources/Models/NightscoutTreatment.swift

@@ -12,6 +12,8 @@ struct NightscoutTreatment: JSON, Hashable, Equatable {
     var bolus: PumpHistoryEvent?
     var insulin: Decimal?
     var notes: String?
+    /// Machine-readable bolus origin, stable across locales (`notes` carries the human-readable label).
+    var bolusOrigin: String?
     var carbs: Decimal?
     var fat: Decimal?
     var protein: Decimal?
@@ -50,6 +52,7 @@ extension NightscoutTreatment {
         case bolus
         case insulin
         case notes
+        case bolusOrigin
         case carbs
         case fat
         case protein

Trio/Sources/Modules/Treatments/TreatmentsStateModel.swift

@@ -577,7 +577,7 @@ extension Treatments {
                     await MainActor.run {
                         self.isAwaitingDeterminationResult = true
                     }
-                    await apsManager.enactBolus(amount: maxAmount, isSMB: false, callback: nil)
+                    await apsManager.enactBolus(amount: maxAmount, isSMB: false, origin: .manual, callback: nil)
                 }
             } catch {
                 debug(.bolusState, "Authentication error for pump bolus: \(error)")

Trio/Sources/Services/RemoteControl/TrioRemoteControl+Bolus.swift

@@ -1,5 +1,6 @@
 import Foundation
 import HealthKit
+import LoopKit
 
 extension TrioRemoteControl {
     func handleBolusCommand(_ payload: CommandPayload) async throws {
@@ -41,7 +42,11 @@ extension TrioRemoteControl {
         }
 
         await apsManager
-            .enactBolus(amount: Double(truncating: bolusAmount as NSNumber), isSMB: false) { [weak self] success, message in
+            .enactBolus(
+                amount: Double(truncating: bolusAmount as NSNumber),
+                isSMB: false,
+                origin: .remote
+            ) { [weak self] success, message in
                 guard let self = self else { return }
                 Task {
                     if success {

Trio/Sources/Services/WatchManager/AppleWatchManager.swift

@@ -1,6 +1,7 @@
 import Combine
 import CoreData
 import Foundation
+import LoopKit
 import Swinject
 import UIKit
 import WatchConnectivity
@@ -728,14 +729,15 @@ final class BaseWatchManager: NSObject, WCSessionDelegate, Injectable, WatchMana
     /// - Parameter amount: The requested bolus amount in units
     private func handleBolusRequest(_ amount: Decimal) {
         Task {
-            await apsManager.enactBolus(amount: Double(amount), isSMB: false) { success, message in
-                // Acknowledge success or error of bolus
-                self.sendAcknowledgment(
-                    toWatch: success,
-                    message: message,
-                    ackCode: success == true ? .genericSuccess : .genericFailure
-                )
-            }
+            await apsManager
+                .enactBolus(amount: Double(amount), isSMB: false, origin: .watch) { success, message in
+                    // Acknowledge success or error of bolus
+                    self.sendAcknowledgment(
+                        toWatch: success,
+                        message: message,
+                        ackCode: success == true ? .genericSuccess : .genericFailure
+                    )
+                }
             debug(.watchManager, "📱 Enacted bolus via APS Manager: \(amount)U")
         }
     }
@@ -848,14 +850,15 @@ final class BaseWatchManager: NSObject, WCSessionDelegate, Injectable, WatchMana
 
                 // Enact bolus via APS Manager
                 let bolusDouble = NSDecimalNumber(decimal: bolusAmount).doubleValue
-                await apsManager.enactBolus(amount: bolusDouble, isSMB: false) { success, message in
-                    // Acknowledge success or error of bolus
-                    self.sendAcknowledgment(
-                        toWatch: success,
-                        message: message,
-                        ackCode: success == true ? .genericSuccess : .genericFailure
-                    )
-                }
+                await apsManager
+                    .enactBolus(amount: bolusDouble, isSMB: false, origin: .watch) { success, message in
+                        // Acknowledge success or error of bolus
+                        self.sendAcknowledgment(
+                            toWatch: success,
+                            message: message,
+                            ackCode: success == true ? .genericSuccess : .genericFailure
+                        )
+                    }
                 debug(.watchManager, "📱 Enacted bolus from watch via APS Manager: \(bolusDouble) U")
                 // Notify Watch: "Carbs and bolus logged successfully"
                 sendAcknowledgment(

Trio/Sources/Shortcuts/Bolus/BolusIntentRequest.swift

@@ -1,6 +1,7 @@
 import Combine
 import CoreData
 import Foundation
+import LoopKit
 
 final class BolusIntentRequest: BaseIntentsRequest {
     func bolus(_ bolusAmount: Double) async throws -> String {
@@ -23,7 +24,12 @@ final class BolusIntentRequest: BaseIntentsRequest {
             }
 
             let bolusQuantity = apsManager.roundBolus(amount: requestedAmount)
-            await apsManager.enactBolus(amount: Double(bolusQuantity), isSMB: false, callback: nil)
+            await apsManager.enactBolus(
+                amount: Double(bolusQuantity),
+                isSMB: false,
+                origin: .shortcut,
+                callback: nil
+            )
             return String(
                 localized:
                 "A bolus command of \(bolusQuantity.formatted()) U of insulin was sent."