rzen/workouts
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Save workouts to Apple Health with live watch metrics and a post-workout summary

Browse Source 
Watch sessions now run an HKLiveWorkoutBuilder: heart rate and active
energy are collected live (shown in an in-workout HUD), saved to Health
as a real HKWorkout on completion, and carried back to the phone as
WorkoutMetrics on the workout document. Phone-only workouts get an
estimated Health workout (MET x bodyweight x duration) after a 10s
debounce that a late-arriving watch session cancels; a launch sweep
backfills workouts completed within the last day. Dedupe is keyed on
metrics.healthKitWorkoutUUID plus the metrics source.

Splits gain an activity type (strength, functional, HIIT, core, cardio,
cycling) that categorizes the Health workout and picks the MET value.
A post-workout summary sheet (duration, calories, avg/max HR, HR zones,
total volume) fills in live and is also shown on completed workouts.
Weights can now display in lb or kg (display-only relabel), synced to
the watch over the existing application context.

WorkoutDocument schema 1->2 (metrics are irreplaceable, so older apps
must quarantine rather than strip them); cache schema 2 rebuilds the
SwiftData store with the new metric columns. Deleting a workout in the
app intentionally leaves its Health record in place.
This commit is contained in:
rzen
2026-07-05 07:46:35 -04:00
parent c96b1a288b
commit 0ad93a09da
33 changed files with 950 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Workouts Watch App/WorkoutSessionManager.swift
+151 -14
View File
@@ -9,26 +9,50 @@ import Foundation
import HealthKit
import Observation
/// Runs an `HKWorkoutSession` for the duration of a watch workout.
/// Runs an `HKWorkoutSession` (with a live builder) for the duration of a watch
/// workout.
///
/// When the phone launches us via `startWatchApp(toHandle:)`, watchOS hands the app
/// delegate a workout configuration; starting a session with it is what grants the
/// delegate a workout configuration; starting a session with it grants the
/// freshly-launched app foreground runtime (and keeps it alive while the wrist is
/// down). We don't record samples — the session exists purely to host the UI.
/// down). The attached `HKLiveWorkoutBuilder` makes watchOS collect heart rate and
/// active energy from the sensors, so finishing the session saves a real `HKWorkout`
/// that feeds the Activity rings — and gives us the live HUD values and the metrics
/// we send back to the phone.
@Observable
@MainActor
final class WorkoutSessionManager: NSObject {
private let healthStore = HKHealthStore()
private var session: HKWorkoutSession?
private var builder: HKLiveWorkoutBuilder?
private(set) var isRunning = false
/// Prompt for workout-sharing authorization. Called once at launch so a later
/// phone-initiated launch can start a session without first hitting a permission
/// wall.
/// Live values for the in-workout HUD. Nil until the first sample arrives (or if
/// the corresponding read authorization was denied).
private(set) var currentHeartRate: Double?
private(set) var currentActiveEnergyKcal: Double?
/// Seconds accumulated in each of 5 heart-rate zones (low→high). Built on the
/// watch because it's the only place with the full HR stream. Empty/ignored when
/// the user's age (hence max HR) is unknown.
private var hrZoneSeconds = [Double](repeating: 0, count: 5)
private var lastHRSampleDate: Date?
private var maxHeartRate: Double?
/// Guards the terminal paths so a late delegate callback can't double-finish.
private var isFinishing = false
/// Prompt for the authorization the live session needs: share workouts + active
/// energy (so the session can write them), read heart rate + active energy (to
/// surface them), and read date of birth (to derive HR zones). Called once at
/// launch so a later phone-initiated launch starts cleanly.
func requestAuthorization() {
guard HKHealthStore.isHealthDataAvailable() else { return }
healthStore.requestAuthorization(toShare: [.workoutType()], read: []) { _, _ in }
healthStore.requestAuthorization(
toShare: WorkoutHealthAuthorization.watchShare,
read: WorkoutHealthAuthorization.watchRead
) { _, _ in }
}
/// Start the session for a phone-launched workout. Idempotent — a second launch
@@ -37,25 +61,126 @@ final class WorkoutSessionManager: NSObject {
guard HKHealthStore.isHealthDataAvailable(), session == nil else { return }
do {
let session = try HKWorkoutSession(healthStore: healthStore, configuration: configuration)
let builder = session.associatedWorkoutBuilder()
builder.dataSource = HKLiveWorkoutDataSource(healthStore: healthStore, workoutConfiguration: configuration)
session.delegate = self
builder.delegate = self
self.session = session
session.startActivity(with: Date())
self.builder = builder
resetMetricAccumulators()
maxHeartRate = computeMaxHeartRate()
let startDate = Date()
session.startActivity(with: startDate)
Task { try? await builder.beginCollection(at: startDate) }
isRunning = true
} catch {
session = nil
isRunning = false
clear()
}
}
/// End the session — called when the workout finishes (no active workout remains).
func end() {
session?.end()
/// Finish the session and save it to Health, returning the captured metrics so the
/// caller can attach them to the workout and forward to the phone. `totalVolume`
/// is left nil here — the caller fills it from the workout's logs.
func finishAndSave() async -> WorkoutMetrics? {
guard let session, let builder, !isFinishing else { clear(); return nil }
isFinishing = true
let endDate = Date()
session.end()
do {
try await builder.endCollection(at: endDate)
let saved = try await builder.finishWorkout()
let metrics = makeMetrics(savedWorkout: saved, endDate: endDate)
clear()
return metrics
} catch {
clear()
return nil
}
}
/// End the session and throw the data away — nothing is saved to Health. Used when
/// the workout was discarded rather than completed.
func discard() {
guard let session, let builder, !isFinishing else { clear(); return }
isFinishing = true
session.end()
builder.discardWorkout()
clear()
}
// MARK: - Metric helpers
private func makeMetrics(savedWorkout: HKWorkout?, endDate: Date) -> WorkoutMetrics {
let hrUnit = HKUnit.count().unitDivided(by: .minute())
let energy = builder?.statistics(for: HKQuantityType(.activeEnergyBurned))?
.sumQuantity()?.doubleValue(for: .kilocalorie())
let hr = builder?.statistics(for: HKQuantityType(.heartRate))
let zones = (maxHeartRate != nil && hrZoneSeconds.contains { $0 > 0 }) ? hrZoneSeconds : nil
return WorkoutMetrics(
activeEnergyKcal: energy,
avgHeartRate: hr?.averageQuantity()?.doubleValue(for: hrUnit),
maxHeartRate: hr?.maximumQuantity()?.doubleValue(for: hrUnit),
minHeartRate: hr?.minimumQuantity()?.doubleValue(for: hrUnit),
totalVolume: nil,
hrZoneSeconds: zones,
healthKitWorkoutUUID: savedWorkout?.uuid.uuidString,
source: .watch,
recordedAt: endDate
)
}
/// Pull the latest live stats off the builder for the HUD, and fold the elapsed
/// time into the right HR zone.
private func refreshLiveStats() {
let hrUnit = HKUnit.count().unitDivided(by: .minute())
let newHR = builder?.statistics(for: HKQuantityType(.heartRate))?
.mostRecentQuantity()?.doubleValue(for: hrUnit)
let now = Date()
if let maxHeartRate, let prevHR = currentHeartRate, let last = lastHRSampleDate {
let dt = now.timeIntervalSince(last)
if dt > 0, dt < 60 { hrZoneSeconds[zoneIndex(for: prevHR, maxHR: maxHeartRate)] += dt }
}
if let newHR { currentHeartRate = newHR }
lastHRSampleDate = now
currentActiveEnergyKcal = builder?.statistics(for: HKQuantityType(.activeEnergyBurned))?
.sumQuantity()?.doubleValue(for: .kilocalorie())
}
private func zoneIndex(for hr: Double, maxHR: Double) -> Int {
let ratio = hr / maxHR
let thresholds = [0.6, 0.7, 0.8, 0.9]
return thresholds.reduce(0) { $0 + (ratio >= $1 ? 1 : 0) }
}
/// Max HR ≈ 220 − age, from the user's date of birth. Nil when unavailable (read
/// denied or DOB not set), which suppresses zone tracking rather than faking it.
private func computeMaxHeartRate() -> Double? {
guard let comps = try? healthStore.dateOfBirthComponents(), let birthYear = comps.year else { return nil }
let thisYear = Calendar.current.component(.year, from: Date())
let age = thisYear - birthYear
guard age > 0, age < 120 else { return nil }
return Double(220 - age)
}
private func resetMetricAccumulators() {
currentHeartRate = nil
currentActiveEnergyKcal = nil
hrZoneSeconds = [Double](repeating: 0, count: 5)
lastHRSampleDate = nil
maxHeartRate = nil
}
private func clear() {
session = nil
builder = nil
isRunning = false
isFinishing = false
resetMetricAccumulators()
}
}
@@ -69,10 +194,22 @@ extension WorkoutSessionManager: HKWorkoutSessionDelegate {
date: Date
) {
guard toState == .ended || toState == .stopped else { return }
Task { @MainActor in self.clear() }
// Only reset if we didn't drive the end ourselves (finishAndSave/discard set
// `isFinishing` and clear on their own); this catches system-ended sessions.
Task { @MainActor in if !self.isFinishing { self.clear() } }
}
nonisolated func workoutSession(_ workoutSession: HKWorkoutSession, didFailWithError error: Error) {
Task { @MainActor in self.clear() }
}
}
// MARK: - HKLiveWorkoutBuilderDelegate
extension WorkoutSessionManager: HKLiveWorkoutBuilderDelegate {
nonisolated func workoutBuilder(_ workoutBuilder: HKLiveWorkoutBuilder, didCollectDataOf collectedTypes: Set<HKSampleType>) {
Task { @MainActor in self.refreshLiveStats() }
}
nonisolated func workoutBuilderDidCollectEvent(_ workoutBuilder: HKLiveWorkoutBuilder) {}
}