Files
workouts/Workouts Watch App/Views/ActiveWorkoutGateView.swift
T
rzen 04523c875a End the watch workout session from durable state, not a view
The HKWorkoutSession that keeps the watch app foregrounded was ended only
by ActiveWorkoutGateView's onChange(of: activeWorkouts) — a view-level side
effect. When a run ended from the phone while the watch app was
backgrounded (kept alive only by the session) or torn down and rebuilt with
an already-empty list, that onChange never fired: the session leaked (the
app kept re-foregrounding on every wrist raise) and finishAndSave() never
ran, so the HR/energy summary was neither saved to Health nor forwarded.

Move session-end off the view into a long-lived WorkoutSessionCoordinator
owned by WatchAppServices, driven by a new bridge.onWorkoutsChanged
callback fired after every authoritative cache mutation (phone push or the
watch's own optimistic edit). The decision is a pure SessionEndPlanner
seam (mirrors WatchCacheApplier): a running session ends only on a genuine
non-empty -> empty transition of the active set, so the launch race (session
running before the run doc syncs) resolves to .none and never discards a
run we haven't heard about yet. Same move as the live-mirror's
repairFromDurable, one layer down.

Watch-only; no schema or wire change. SessionEndPlannerTests pins the
decision table; the OS-initiated-end path (system ends the session itself)
stays a documented residual in PLAN-watch-session-end.md.
2026-07-09 08:12:06 -04:00

167 lines
6.6 KiB
Swift

//
// ActiveWorkoutGateView.swift
// Workouts Watch App
//
// Copyright 2025 Rouslan Zenetl. All Rights Reserved.
//
import SwiftUI
import SwiftData
/// Root of the watch app. The watch only runs the workouts that are currently
/// active on the phone — there's no history browsing here. An "active" workout is a
/// cached one that isn't finished (`notStarted` or `inProgress`); a workout is
/// created on the phone as `notStarted` the moment a split is picked, and flips to
/// `completed` once every exercise is done, at which point it drops off this list.
///
/// The root shows every active workout (most-recent first); picking one opens its
/// exercise list.
struct ActiveWorkoutGateView: View {
@Environment(WatchConnectivityBridge.self) private var bridge
@Query(sort: \Workout.start, order: .reverse) private var workouts: [Workout]
@Query private var splits: [Split]
/// Navigated workouts (depth 1). Held here — rather than relying on implicit
/// `NavigationLink` destinations — so we can pop back to the gate the moment the phone
/// takes over editing the run we're inside.
@State private var path: [ActiveWorkoutRoute] = []
private var activeWorkouts: [Workout] {
workouts.filter { $0.status == .inProgress || $0.status == .notStarted }
}
private func split(for workout: Workout) -> Split? {
guard let id = workout.splitID else { return nil }
return splits.first { $0.id == id }
}
/// True while the phone has this workout's exercise — or the split it came from — open
/// in an editor. The watch parks such a run and blocks re-entry so the phone owns the
/// edit and the watch can't forward a stale optimistic write over it.
private func isLockedForEditing(_ workout: Workout) -> Bool {
if let id = bridge.editingWorkoutID, id == workout.id { return true }
if let splitID = bridge.editingSplitID, splitID == workout.splitID { return true }
return false
}
var body: some View {
NavigationStack(path: $path) {
Group {
if activeWorkouts.isEmpty {
emptyState
} else {
List {
ForEach(activeWorkouts) { workout in
row(for: workout)
}
}
.navigationTitle("In Progress")
}
}
.navigationDestination(for: ActiveWorkoutRoute.self) { route in
// Resolve from the full set (not just active) so a run that finishes while
// you're inside it still renders rather than blanking.
if let workout = workouts.first(where: { $0.id == route.workoutID }) {
WorkoutLogListView(workout: workout)
}
}
}
.task {
// Nothing to run yet — pull fresh state in case the phone just started one.
if activeWorkouts.isEmpty { bridge.requestSync() }
}
// The phone just entered (or left) an editor — if we're inside the now-locked run,
// pop back to the gate so re-entry rebuilds a fresh working copy. Also pop if the run
// we're inside was pruned (discarded/deleted on the phone, or aged out of the push).
.onChange(of: bridge.editingWorkoutID) { _, _ in popIfNavigatedRunUnavailable() }
.onChange(of: bridge.editingSplitID) { _, _ in popIfNavigatedRunUnavailable() }
.onChange(of: workouts.map(\.id)) { _, _ in popIfNavigatedRunUnavailable() }
}
@ViewBuilder
private func row(for workout: Workout) -> some View {
if isLockedForEditing(workout) {
ActiveWorkoutRow(workout: workout, split: split(for: workout), editingOnPhone: true)
} else {
NavigationLink(value: ActiveWorkoutRoute(workoutID: workout.id)) {
ActiveWorkoutRow(workout: workout, split: split(for: workout))
}
}
}
/// If the run we're currently navigated into is no longer available — pruned from the
/// cache (discarded/deleted on the phone, or aged out of the pushed set), or locked
/// because the phone took over editing it — pop back to the gate.
private func popIfNavigatedRunUnavailable() {
guard let route = path.last else { return }
guard let workout = workouts.first(where: { $0.id == route.workoutID }) else {
path.removeAll()
return
}
if isLockedForEditing(workout) { path.removeAll() }
}
private var emptyState: some View {
ContentUnavailableView {
Label("Start a Workout", systemImage: "iphone")
} description: {
Text("Begin a workout on your iPhone to run it here.")
} actions: {
Button {
bridge.requestSync()
} label: {
Label("Refresh", systemImage: "arrow.triangle.2.circlepath")
}
}
}
}
// MARK: - Active Workout Row
private struct ActiveWorkoutRow: View {
let workout: Workout
let split: Split?
/// When true, the phone is editing this run — render it dimmed and non-tappable.
var editingOnPhone: Bool = false
private var logs: [WorkoutLog] { workout.logsArray }
private var doneCount: Int { logs.filter { $0.status == .completed }.count }
var body: some View {
HStack(spacing: 10) {
Image(systemName: editingOnPhone ? "pencil" : (split?.systemImage ?? "figure.strengthtraining.traditional"))
.font(.title3)
.foregroundStyle(split.map { Color.color(from: $0.color) } ?? .workTint)
.frame(width: 26)
VStack(alignment: .leading, spacing: 2) {
Text(workout.splitName ?? Split.unnamed)
.font(.headline)
.lineLimit(1)
Text(subtitle)
.font(.caption2)
.foregroundStyle(.secondary)
}
}
.opacity(editingOnPhone ? 0.5 : 1)
}
private var subtitle: String {
if editingOnPhone { return "Editing on iPhone…" }
guard !logs.isEmpty else { return workout.start.formattedDate() }
if doneCount == 0 { return "Not started · \(logs.count) exercises" }
return "\(doneCount) of \(logs.count) done"
}
}
// MARK: - Navigation
/// Stable, hashable handle for a navigated run. Keyed by id (not the `Workout` object) so
/// the path survives cache rebuilds, and a distinct type so it never collides with the
/// log-id destination inside `WorkoutLogListView`.
private struct ActiveWorkoutRoute: Hashable {
let workoutID: String
}