@craft-native/ios 0.0.276 → 0.0.290

package/README.md

@@ -594,6 +594,28 @@ stopListening()
 // sends a made-up watch reading every 5 s instead: someone settling into slow
 // breathing, from about 72 toward 60 bpm.
 
+// Live workout sessions (iOS 26+, requires enableHealthKit: true). The OS
+// keeps the session alive while the app is backgrounded; samples arrive as
+// typed craftHealthWorkout events. Ask for the workout/heart-rate grants before
+// starting a session.
+await health.requestAuthorization(['workouts', 'heartRate', 'activeEnergy', 'distance'], { write: true })
+const stopWorkout = health.onWorkout(event => {
+  if (event.event === 'metrics') showMetrics(event.heartRateBpm, event.activeEnergyCalories, event.distanceMeters)
+  if (event.event === 'state') showWorkoutState(event.state)
+  if (event.event === 'error') showWorkoutError(event.message)
+})
+const live = await health.startWorkout({ type: 'running', location: 'outdoor' })
+await health.pauseWorkout()
+await health.resumeWorkout()
+const saved = await health.endWorkout() // { id, workoutId, endDate, durationSeconds }
+stopWorkout()
+
+`startWorkout`, `pauseWorkout`, `resumeWorkout`, and `endWorkout` reject with
+`Live workouts are unavailable` when the build does not include HealthKit or
+when the OS is older than iOS 26. `onWorkout` receives lifecycle events plus
+live `heartRateBpm`, `activeEnergyCalories`, and `distanceMeters` metrics; the
+existing post-hoc `saveWorkout` API remains separate.
+
 // Screen Capture
 const screenshotBase64 = await window.craft.takeScreenshot();
 
@@ -841,6 +863,14 @@ if (await window.craft.scheduledWorkouts.isSupported()) {
 // FormData through fetch, or hand its path to the share sheet.
 const photo = await craft.files.pickImage({ maxPixels: 2048, quality: 0.85 });
 // { path, name: 'IMG_1234.jpg', type: 'image/jpeg', size, width, height }
+// General documents use the same owned-file path and can be selected more
+// than one at a time. Filters are MIME types, UTIs, or filename extensions.
+const attachments = await craft.files.pickFile({
+  contentTypes: ['application/pdf', 'csv', 'gpx', 'fit'],
+  maxSelections: 4,
+  maxBytes: 20 * 1024 * 1024,
+});
+// [{ path, name, type, size }], or [] when the picker is dismissed.
 const form = new FormData();
 form.append('photo', photo);                      // multipart, built natively
 await fetch('https://example.com/upload', { method: 'POST', body: form });
@@ -1004,6 +1034,26 @@ await window.craft.watch.updateContext({
   status: 'active'
 });
 
+// A planned workout is delivered through application context, so the latest
+// plan replaces an older one while the watch is offline and is replayed when
+// the companion launches. The watch persists its current plan and metrics in
+// its own UserDefaults store, then publishes a `watch-state` context back.
+await window.craft.watch.updateContext({
+  type: 'planned-session',
+  plan: {
+    id: 'morning-run',
+    activity: 'running',
+    startDate: Date.now() + 60 * 60 * 1000,
+    targetDistanceMeters: 5000,
+  },
+});
+
+// Watch controls include a protocol version and requestId. Use requestId for
+// idempotency when a queued command arrives after a reconnect. The watch's
+// `watch-state` context includes a monotonically increasing stateVersion; use
+// the highest version when a queued command and a reconnect snapshot cross.
+await window.craft.watch.send({ type: 'recording-control', action: 'start' });
+
 // Listen for messages from watch
 window.craft.watch.onMessage((message) => {
   console.log('Watch message:', message);

package/dist/cli.js

@@ -589,12 +589,15 @@ function renderWatchEntitlements(config) {
     <array>
 ${plistArray(config.appGroups)}
     </array>
+` : "";
+  const healthKit = config.enableHealthKit ? `    <key>com.apple.developer.healthkit</key>
+    <true/>
 ` : "";
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-${appGroups}</dict>
+${appGroups}${healthKit}</dict>
 </plist>
 `;
 }
@@ -995,7 +998,7 @@ function writeShell(output, config) {
     if (!enabled)
       continue;
     mkdirSync(join3(output, folder), { recursive: true });
-    const source = readFileSync(join3(TEMPLATES_DIR, template), "utf8").replace(/\{\{APP_NAME\}\}/g, name);
+    const source = readFileSync(join3(TEMPLATES_DIR, template), "utf8").replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{HEALTH_KIT_ENABLED\}\}/g, config.enableHealthKit ? "true" : "false");
     writeFileSync(join3(output, folder, filename), source);
   }
 }
@@ -1128,7 +1131,8 @@ ${nativeDependencies.join(`
     const watchInfo = readFileSync(join3(TEMPLATES_DIR, "WatchApp.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
     writeFileSync(join3(output, "WatchApp", "Info.plist"), watchInfo);
     writeFileSync(join3(output, "WatchApp", "Watch.entitlements"), renderWatchEntitlements(config));
-    const watchExtensionInfo = readFileSync(join3(TEMPLATES_DIR, "WatchExtension.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
+    const watchExtensionInfo = readFileSync(join3(TEMPLATES_DIR, "WatchExtension.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId).replace(/\{\{HEALTH_USAGE_DESCRIPTIONS\}\}/g, config.enableHealthKit ? `${plistString("NSHealthShareUsageDescription", `${displayName} reads health data you choose to share.`)}
+${plistString("NSHealthUpdateUsageDescription", `${displayName} writes health data only with your permission.`)}` : "");
     writeFileSync(join3(output, "WatchExtension", "Info.plist"), watchExtensionInfo);
     writeFileSync(join3(output, "WatchExtension", "Watch.entitlements"), renderWatchEntitlements(config));
   }

package/dist/index.js

@@ -776,12 +776,15 @@ function renderWatchEntitlements(config) {
     <array>
 ${plistArray(config.appGroups)}
     </array>
+` : "";
+  const healthKit = config.enableHealthKit ? `    <key>com.apple.developer.healthkit</key>
+    <true/>
 ` : "";
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-${appGroups}</dict>
+${appGroups}${healthKit}</dict>
 </plist>
 `;
 }
@@ -1195,7 +1198,7 @@ function writeShell(output, config) {
     if (!enabled)
       continue;
     mkdirSync2(join3(output, folder), { recursive: true });
-    const source = readFileSync2(join3(TEMPLATES_DIR, template), "utf8").replace(/\{\{APP_NAME\}\}/g, name);
+    const source = readFileSync2(join3(TEMPLATES_DIR, template), "utf8").replace(/\{\{APP_NAME\}\}/g, name).replace(/\{\{HEALTH_KIT_ENABLED\}\}/g, config.enableHealthKit ? "true" : "false");
     writeFileSync2(join3(output, folder, filename), source);
   }
 }
@@ -1328,7 +1331,8 @@ ${nativeDependencies.join(`
     const watchInfo = readFileSync2(join3(TEMPLATES_DIR, "WatchApp.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
     writeFileSync2(join3(output, "WatchApp", "Info.plist"), watchInfo);
     writeFileSync2(join3(output, "WatchApp", "Watch.entitlements"), renderWatchEntitlements(config));
-    const watchExtensionInfo = readFileSync2(join3(TEMPLATES_DIR, "WatchExtension.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId);
+    const watchExtensionInfo = readFileSync2(join3(TEMPLATES_DIR, "WatchExtension.Info.plist.template"), "utf8").replace(/\{\{APP_NAME\}\}/g, xmlEscape(displayName)).replace(/\{\{BUNDLE_ID\}\}/g, finalBundleId).replace(/\{\{HEALTH_USAGE_DESCRIPTIONS\}\}/g, config.enableHealthKit ? `${plistString("NSHealthShareUsageDescription", `${displayName} reads health data you choose to share.`)}
+${plistString("NSHealthUpdateUsageDescription", `${displayName} writes health data only with your permission.`)}` : "");
     writeFileSync2(join3(output, "WatchExtension", "Info.plist"), watchExtensionInfo);
     writeFileSync2(join3(output, "WatchExtension", "Watch.entitlements"), renderWatchEntitlements(config));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/ios",
-  "version": "0.0.276",
+  "version": "0.0.290",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/ios#readme",
   "repository": {
     "type": "git",

package/templates/CraftApp.swift

@@ -903,6 +903,9 @@ final class CraftChrome: ObservableObject {
     func tap(_ tab: Tab) {
         let reselect = tab.id == selected
         if !reselect {
+            // A tab's screen not made yet is made first, so the pill moves on
+            // a free main thread rather than stalling behind its mount.
+            CraftHybrid.shared.mountTabBeforeSelecting(tab.id)
             withAnimation(Self.motion(.spring(response: 0.32, dampingFraction: 0.86))) { selected = tab.id }
         }
         // A hybrid app shows the tab's own stack first; the page hears the
@@ -1162,11 +1165,7 @@ struct CraftTabBarView: View {
                     VStack(spacing: 3) {
                         ZStack(alignment: .topTrailing) {
                             if let image = tab.image, let url = URL(string: image) {
-                                AsyncImage(url: url) { image in
-                                    image.resizable().scaledToFill()
-                                } placeholder: {
-                                    Image(systemName: symbol(tab.symbol, selected: isSelected))
-                                }
+                                CraftTabPicture(url: url, placeholder: symbol(tab.symbol, selected: isSelected))
                                 .frame(width: iconSize + 4, height: iconSize + 4)
                                 .clipShape(Circle())
                                 .frame(height: iconSize + 6)
@@ -1258,6 +1257,46 @@ struct CraftTabBarView: View {
     }
 }
 
+/// A tab's picture (HQ's Me: the account's photo). It is kept once loaded,
+/// so a tab item drawn again (its screen mounting, the bar coming back) shows
+/// it at once: AsyncImage keeps nothing, so the photo went back to the
+/// person symbol, loaded again and arrived inside whatever animation was
+/// running, sliding in from the side on the first visit to Me.
+private struct CraftTabPicture: View {
+    let url: URL
+    let placeholder: String
+    @State private var image: UIImage?
+
+    private static let cache: NSCache<NSURL, UIImage> = {
+        let cache = NSCache<NSURL, UIImage>()
+        cache.countLimit = 16
+        return cache
+    }()
+
+    var body: some View {
+        Group {
+            if let shown = image ?? Self.cache.object(forKey: url as NSURL) {
+                Image(uiImage: shown).resizable().scaledToFill()
+            } else {
+                Image(systemName: placeholder)
+            }
+        }
+        // A picture arriving never animates, whatever transaction it lands in.
+        .transaction { $0.animation = nil }
+        .task(id: url) {
+            if let cached = Self.cache.object(forKey: url as NSURL) {
+                image = cached
+                return
+            }
+            guard let (data, response) = try? await URLSession.shared.data(from: url),
+                  (response as? HTTPURLResponse).map({ (200..<300).contains($0.statusCode) }) ?? true,
+                  let loaded = UIImage(data: data) else { return }
+            Self.cache.setObject(loaded, forKey: url as NSURL)
+            image = loaded
+        }
+    }
+}
+
 private struct CraftTabSelectionShape: Shape {
     let cornerRadius: CGFloat?
 

package/templates/CraftHybrid.swift

@@ -880,6 +880,13 @@ final class CraftHybrid: NSObject {
         return controller.tabTapped(id, reselect: reselect)
     }
 
+    /// A native tab not prepared yet mounts its screen now, hidden, before
+    /// the bar's selection moves (CraftChrome.tap).
+    func mountTabBeforeSelecting(_ id: String) {
+        guard isEnabled else { return }
+        controller?.mountTabBeforeSelecting(id)
+    }
+
     /// The page chose a tab itself (its `selectTab`, or a tab link).
     func pageSelectedTab(_ id: String) {
         guard isEnabled else { return }
@@ -1731,6 +1738,20 @@ final class CraftHybridController: UIViewController, UINavigationControllerDeleg
 
     private var preparation: Timer?
 
+    /// A native tab tapped before the shell prepared it (HQ's Me, prepared
+    /// last, tapped right after launch) mounts its screen hidden first. Mounted
+    /// in the tap's own turn after the selection began, it held the main
+    /// thread while SwiftUI's spring should have moved the pill, which then
+    /// stalled and jumped in from the side.
+    func mountTabBeforeSelecting(_ id: String) {
+        guard stacks[id] == nil, id != currentTab, activeTabSwipeTarget == nil,
+              hybrid.tabIds.contains(id), hybrid.routes.match(id) != nil, view.window != nil else { return }
+        let nav = makeStack(tab: id, rootPath: id, hidden: true)
+        nav.view.layoutIfNeeded()
+        Self.drawContents(of: nav.view.layer)
+        (visibleStack?.topViewController as? CraftNativeScreenController)?.screenVisibilityChanged(true)
+    }
+
     /// When the shell last moved between screens: a tab, a push or a pop.
     private var lastNavigation: CFTimeInterval = 0
 

package/templates/CraftNativeActions.swift

@@ -253,6 +253,12 @@ enum CraftNativeActions {
                 CraftNativeFiles.pickVideo(options) { complete(requestToken, $0, completion) }
             }
             return
+        case ("Files", "pickFile"):
+            let options = args.first as? [String: Any] ?? [:]
+            DispatchQueue.main.async {
+                CraftNativeFiles.pickFile(options) { complete(requestToken, $0, completion) }
+            }
+            return
         case ("Files", "download"):
             download(requestToken: requestToken, args: args, completion: completion)
             return

package/templates/CraftNativeFiles.swift

@@ -328,6 +328,142 @@ enum CraftNativeFiles {
         }
     }
 
+    // MARK: Picking a general file
+
+    /// Pick one or more documents and copy them into app-owned storage while
+    /// the security-scoped URLs are valid. `contentTypes` accepts MIME types,
+    /// UTIs, or filename extensions; an empty list means any document.
+    static func pickFile(_ options: [String: Any], done: @escaping (Result<Any, CraftNativeActionError>) -> Void) {
+        guard activePicker == nil else {
+            done(.failure(CraftNativeActionError(code: "BUSY", message: "A picker is already open")))
+            return
+        }
+        let limit = craftNativeNumber(options["maxBytes"])
+            .map { $0.doubleValue }
+            .flatMap { value in
+                guard value.isFinite else { return nil }
+                return Int(max(1, min(Double(512 * 1024 * 1024), value)))
+            } ?? 512 * 1024 * 1024
+        let selectionLimit = craftNativeNumber(options["maxSelections"])
+            .map { $0.intValue }
+            .map { max(1, min(20, $0)) } ?? 1
+        let types: [UTType]
+        do {
+            types = try documentTypes(options["contentTypes"])
+        } catch let error as CraftNativeActionError {
+            done(.failure(error))
+            return
+        } catch {
+            done(.failure(CraftNativeActionError(code: "INVALID_ARGUMENT", message: "files.pickFile contentTypes are invalid")))
+            return
+        }
+        let finish: (Result<Any, CraftNativeActionError>) -> Void = { result in
+            DispatchQueue.main.async { activePicker = nil; done(result) }
+        }
+        let delegate = FileDocumentDelegate(limit: limit, done: finish)
+        let picker = UIDocumentPickerViewController(forOpeningContentTypes: types, asCopy: true)
+        picker.allowsMultipleSelection = selectionLimit > 1
+        picker.delegate = delegate
+        activePicker = delegate
+        if !CraftPresenter.present(picker, from: nil) {
+            activePicker = nil
+            done(.failure(CraftNativeActionError(code: "PICKER_ERROR", message: "Unable to present the file picker")))
+        }
+    }
+
+    /// Resolve an app-supplied content filter without silently broadening it.
+    /// A MIME type, UTI, or extension is enough for `UTType`; applications can
+    /// therefore ask for `application/pdf`, `com.adobe.pdf`, or `pdf` alike.
+    private static func documentTypes(_ value: Any?) throws -> [UTType] {
+        guard let value else { return [.item] }
+        guard let entries = value as? [Any] else {
+            throw CraftNativeActionError(code: "INVALID_ARGUMENT", message: "files.pickFile contentTypes must be an array")
+        }
+        guard !entries.isEmpty else { return [.item] }
+        var types: [UTType] = []
+        for entry in entries {
+            guard let raw = entry as? String else {
+                throw CraftNativeActionError(code: "INVALID_ARGUMENT", message: "files.pickFile contentTypes must be strings")
+            }
+            let name = raw.trimmingCharacters(in: .whitespacesAndNewlines)
+            guard !name.isEmpty,
+                  let type = UTType(mimeType: name) ?? UTType(name) ?? UTType(filenameExtension: name.trimmingCharacters(in: CharacterSet(charactersIn: "."))) else {
+                throw CraftNativeActionError(code: "INVALID_ARGUMENT", message: "files.pickFile contentType is not a MIME type, UTI, or extension: \(raw)")
+            }
+            types.append(type)
+        }
+        return types
+    }
+
+    /// Copy an arbitrary selected document into Craft's private file area and
+    /// return the same descriptor used by downloads, writes, and uploads.
+    static func copyFile(_ source: URL, limit: Int) -> Result<Any, CraftNativeActionError> {
+        do {
+            let values = try source.resourceValues(forKeys: [.fileSizeKey, .contentTypeKey])
+            let size: Int
+            if let fileSize = values.fileSize {
+                size = fileSize
+            } else {
+                size = ((try? FileManager.default.attributesOfItem(atPath: source.path))?[.size] as? NSNumber)?.intValue ?? 0
+            }
+            guard size > 0, size <= limit else {
+                return .failure(CraftNativeActionError(code: "FILE_TOO_LARGE", message: "Choose a nonempty file under \(limit / 1024 / 1024)MB."))
+            }
+            let destination = try newFile(named: source.lastPathComponent)
+            do { try FileManager.default.copyItem(at: source, to: destination) }
+            catch { try? FileManager.default.removeItem(at: destination.deletingLastPathComponent()); throw error }
+            let type = mimeType(for: source, contentType: values.contentType)
+            return .success(describe(destination, type: type))
+        } catch {
+            return .failure(CraftNativeActionError(code: "READ_ERROR", message: error.localizedDescription))
+        }
+    }
+
+    private static func mimeType(for source: URL, contentType: UTType?) -> String {
+        let generic = "application/octet-stream"
+        if let preferred = contentType?.preferredMIMEType, preferred != generic { return preferred }
+        if let preferred = UTType(filenameExtension: source.pathExtension)?.preferredMIMEType, preferred != generic {
+            return preferred
+        }
+        switch source.pathExtension.lowercased() {
+        case "gpx": return "application/gpx+xml"
+        case "tcx": return "application/vnd.garmin.tcx+xml"
+        case "fit": return "application/vnd.ant.fit"
+        case "csv": return "text/csv"
+        case "json": return "application/json"
+        case "txt": return "text/plain"
+        default: return generic
+        }
+    }
+
+    private final class FileDocumentDelegate: NSObject, UIDocumentPickerDelegate {
+        let limit: Int
+        let done: (Result<Any, CraftNativeActionError>) -> Void
+        init(limit: Int, done: @escaping (Result<Any, CraftNativeActionError>) -> Void) { self.limit = limit; self.done = done }
+        func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) { done(.success([])) }
+        func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
+            guard !urls.isEmpty else { done(.success([])); return }
+            let (limit, done) = (self.limit, self.done)
+            DispatchQueue.global(qos: .userInitiated).async {
+                var results: [[String: Any]] = []
+                for url in urls {
+                    let granted = url.startAccessingSecurityScopedResource()
+                    defer { if granted { url.stopAccessingSecurityScopedResource() } }
+                    switch CraftNativeFiles.copyFile(url, limit: limit) {
+                    case .success(let value):
+                        guard let info = value as? [String: Any] else { done(.failure(CraftNativeActionError(code: "READ_ERROR", message: "The selected file could not be described"))); return }
+                        results.append(info)
+                    case .failure(let error):
+                        results.compactMap { $0["path"] as? String }.forEach { CraftNativeFiles.remove($0) }
+                        done(.failure(error))
+                        return
+                    }
+                }
+                done(.success(results))
+            }
+        }
+    }
+
     static func copyVideo(_ source: URL, limit: Int) -> Result<Any, CraftNativeActionError> {
         let ext = source.pathExtension.lowercased()
         let types = ["mp4": "video/mp4", "m4v": "video/x-m4v", "mov": "video/quicktime", "webm": "video/webm"]

package/templates/CraftNativeMutation.swift

@@ -115,6 +115,9 @@ final class CraftNativeMutationDocument {
                     // A child crossing parents needs the committed tree to be
                     // reconciled so the host can move its existing native view.
                     requiresFullRender = true
+                case "replaceChildren":
+                    let parentId = try replaceChildren(operation, nodes: &candidateNodes)
+                    appendUnique(parentId, to: &affectedNodeIds)
                 case "removeNode":
                     if let id = operation["id"] as? String, let parent = candidateNodes[id]?.parent {
                         appendUnique(parent, to: &affectedNodeIds)
@@ -287,6 +290,54 @@ final class CraftNativeMutationDocument {
         return previousParentId
     }
 
+    /// Replaces a container's ordered child snapshot in one atomic mutation.
+    ///
+    /// The list protocol uses this operation when a keyed `:for` expansion
+    /// produces a new row set. Existing nodes may stay attached to the same
+    /// parent; removed children become detached and can be reused or removed
+    /// by later operations in the same batch.
+    private func replaceChildren(_ operation: [String: Any], nodes: inout [String: Node]) throws -> String {
+        let parentId = try requiredId(operation, field: "parentId", name: "replaceChildren")
+        guard var parent = nodes[parentId] else {
+            throw CraftNativeMutationFailure("UNKNOWN_PARENT", "node \(parentId) does not exist")
+        }
+        guard acceptsChildren(parent.type) else {
+            throw CraftNativeMutationFailure("INVALID_PARENT", "node \(parentId) cannot contain child nodes")
+        }
+        guard let values = operation["children"] as? [Any] else {
+            throw CraftNativeMutationFailure("INVALID_CHILDREN", "replaceChildren.children must be an array")
+        }
+        var childIds: [String] = []
+        for value in values {
+            guard let childId = value as? String, !childId.isEmpty else {
+                throw CraftNativeMutationFailure("INVALID_CHILDREN", "replaceChildren.children must contain non-empty ids")
+            }
+            guard !childIds.contains(childId) else {
+                throw CraftNativeMutationFailure("DUPLICATE_CHILD", "child \(childId) appears more than once")
+            }
+            guard let child = nodes[childId] else {
+                throw CraftNativeMutationFailure("UNKNOWN_NODE", "node \(childId) does not exist")
+            }
+            guard childId != parentId, !descendants(of: childId, nodes: nodes).contains(parentId) else {
+                throw CraftNativeMutationFailure("CYCLE", "attaching node \(childId) would create a cycle")
+            }
+            guard child.parent == nil || child.parent == parentId else {
+                throw CraftNativeMutationFailure("NODE_ATTACHED", "node \(childId) already has a parent")
+            }
+            childIds.append(childId)
+        }
+        let removedChildIds = parent.children.filter { !childIds.contains($0) }
+        for oldChildId in removedChildIds {
+            for descendant in descendants(of: oldChildId, nodes: nodes).union([oldChildId]) {
+                nodes.removeValue(forKey: descendant)
+            }
+        }
+        parent.children = childIds
+        nodes[parentId] = parent
+        for childId in childIds { nodes[childId]?.parent = parentId }
+        return parentId
+    }
+
     private func removeNode(
         _ operation: [String: Any],
         nodes: inout [String: Node],

package/templates/CraftNativeScreen.swift

@@ -5101,6 +5101,17 @@ private final class CraftNativeTextView: UITextView {
 
     override func layoutSubviews() {
         super.layoutSubviews()
+        // A multiline input grows with its text up to its `maxHeight`, then
+        // scrolls inside itself. Never scrolling, the text past that height
+        // was cut off and could not be reached (a long workout comment).
+        // With scrolling off, contentSize is the view's own height: measure
+        // the text itself.
+        let needed = isEditable ? sizeThatFits(CGSize(width: bounds.width, height: .greatestFiniteMagnitude)).height : 0
+        let overflows = isEditable && bounds.height > 0 && needed > bounds.height + 1
+        if isScrollEnabled != overflows {
+            isScrollEnabled = overflows
+            if overflows, isFirstResponder { scrollRangeToVisible(selectedRange) }
+        }
         let inset = textContainerInset
         let padding = textContainer.lineFragmentPadding
         placeholderLabel.frame = CGRect(
@@ -5117,6 +5128,7 @@ private final class CraftNativeTextView: UITextView {
     }
 
     private func configurePlaceholder() {
+        isScrollEnabled = false
         placeholderLabel.numberOfLines = 0
         placeholderLabel.font = font
         placeholderLabel.textColor = .placeholderText
@@ -5623,6 +5635,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         // A tab prepared in a hidden stack "appears" to UIKit as well; the
         // shell says when it really shows (screenVisibilityChanged).
         if isShownOnScreen {
+            hasAppeared = true
             screenVisibilityChanged(true)
             // A navigation breadcrumb for the crash reporter: the trail a
             // crash report carries is the screens that led to it.
@@ -5694,6 +5707,14 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         // preview also restores a screen that never lost focus, so restore its
         // chrome even when no new SCREEN_FOCUS event is needed.
         if visible { restoreShellChrome() }
+        // A prepared tab the shell now shows has appeared once its frame is
+        // drawn; what its script asks for until then is there from the start.
+        if visible, !hasAppeared {
+            DispatchQueue.main.async { [weak self] in
+                guard let self, self.isViewLoaded, self.isShownOnScreen else { return }
+                self.hasAppeared = true
+            }
+        }
         if visible, frameWanted { CraftNativeFrameClock.shared.request(self) { [weak self] in self?.fireFrame() } }
         if !visible { CraftNativeFrameClock.shared.cancel(self) }
         guard visible != reportedVisible else { return }
@@ -5780,6 +5801,27 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         super.viewDidLayoutSubviews()
         positionModals()
         emitLayoutEvents()
+        sendViewportIfChanged()
+    }
+
+    /// The width the bundle last heard, so a layout pass at the same size says nothing.
+    private var reportedViewportWidth: CGFloat = -1
+
+    /// The screen's own width once laid out, else its window's: what a web
+    /// page's media queries would measure.
+    private func currentViewportWidth() -> CGFloat {
+        let width = view.bounds.width > 0 ? view.bounds.width : (view.window ?? CraftPresenter.keyWindow())?.bounds.width ?? 0
+        reportedViewportWidth = width
+        return width
+    }
+
+    /// A rotation, iPad split view or a resized Stage Manager window: the
+    /// bundle's width classes (`md:`, `lg:`) follow the screen's new width.
+    private func sendViewportIfChanged() {
+        let width = view.bounds.width
+        guard width > 0, abs(width - reportedViewportWidth) >= 0.5 else { return }
+        reportedViewportWidth = width
+        send(type: "VIEWPORT", payload: ["width": Double(width), "height": Double(view.bounds.height)])
     }
 
     /// Modals cover the screen; their content starts below its bars (the
@@ -5864,6 +5906,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let appearanceJSON: String
         let sessionTokenKey: String
         let focused: Bool?
+        /// The screen's width in points, for the bundle's `sm:`/`md:`/`lg:` classes.
+        let viewportWidth: Double
     }
 
     private func scriptInputs() -> ScriptInputs {
@@ -5875,7 +5919,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             colorScheme: colorScheme,
             appearanceJSON: appearanceJSON(),
             sessionTokenKey: Self.jsonString(CraftSession.tokenKey(config)),
-            focused: reportedVisible
+            focused: reportedVisible,
+            viewportWidth: Double(currentViewportWidth())
         )
     }
 
@@ -5977,6 +6022,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 capabilities: \(capabilityJSON),
                 initialAppState: "\(inputs.appState)",
                 colorScheme: "\(inputs.colorScheme)",
+                viewportWidth: \(inputs.viewportWidth),
                 appearance: \(inputs.appearanceJSON),
                 appURL: \(appURL),
                 appVersion: \(appVersion),
@@ -6546,6 +6592,14 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     /// own horizontal pager or chart gesture.
     private(set) var tabSwipeEnabled = true
     private var prefersLargeTitle: Bool?
+    /// Whether the screen has been on screen. Until then, a bar its script
+    /// asks for is simply there in its first frame: a tab opened for the
+    /// first time (HQ's Me) mounts in the window, and its bar and large title
+    /// slid in from the side as the screen appeared.
+    private var hasAppeared = false
+    /// A bar shown or hidden after the screen has appeared animates; before,
+    /// it is in place from the start.
+    var animatesNavigationBarChanges: Bool { hasAppeared && view.window != nil }
     /// Whether this screen opts into an opaque navigation bar filled with its
     /// own background colour. The default keeps UIKit's material appearance.
     private var navigationBarSolid = false
@@ -6624,7 +6678,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         if let hidden = options["hidden"] as? Bool {
             navigationBarHidden = hidden
             if navigationController?.topViewController === self {
-                navigationController?.setNavigationBarHidden(hidden, animated: view.window != nil)
+                navigationController?.setNavigationBarHidden(hidden, animated: animatesNavigationBarChanges)
             }
         }
         if options.keys.contains("leftButtons") {
@@ -6642,7 +6696,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         // Asked for after the bar was hidden for a bare root screen.
         if navigationBarHidden == nil, wantsNavigationBar, navigationController?.topViewController === self,
            navigationController?.isNavigationBarHidden == true {
-            navigationController?.setNavigationBarHidden(false, animated: view.window != nil)
+            navigationController?.setNavigationBarHidden(false, animated: animatesNavigationBarChanges)
         }
     }
 
@@ -7104,13 +7158,39 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     /// `input`, scrolled into the visible part of the scroll view it is in.
     /// Internal for XCTest.
     func scrollIntoView(_ input: UIView, animated: Bool) {
-        var ancestor = input.superview
-        while let current = ancestor, !(current is CraftNativeScrollView) { ancestor = current.superview }
-        guard let scroll = ancestor as? CraftNativeScrollView, scroll.isVertical else { return }
-        let rect = input.convert(input.bounds, to: scroll).insetBy(dx: 0, dy: -16)
+        guard let scroll = enclosingVerticalScroll(of: input) else { return }
+        var rect = input.convert(input.bounds, to: scroll).insetBy(dx: 0, dy: -16)
+        // A field taller than the part the keyboard leaves (a long comment
+        // with no max height) shows its caret rather than its top: scrolled
+        // to its top, the caret at the end of the text stayed under the
+        // keyboard with no way to scroll it out.
+        let visible = scroll.bounds.inset(by: scroll.adjustedContentInset)
+        if rect.height > visible.height, let caret = caretRect(of: input, in: scroll) { rect = caret }
         scroll.scrollRectToVisible(rect, animated: animated)
     }
 
+    /// The vertical scroll view `view` sits in, if any.
+    private func enclosingVerticalScroll(of view: UIView) -> CraftNativeScrollView? {
+        var ancestor = view.superview
+        while let current = ancestor, !(current is CraftNativeScrollView) { ancestor = current.superview }
+        guard let scroll = ancestor as? CraftNativeScrollView, scroll.isVertical else { return nil }
+        return scroll
+    }
+
+    /// A focused input's caret in `scroll`'s coordinates, with a little room
+    /// around it, kept within the input (one scrolling inside itself has its
+    /// caret beyond its own frame until it scrolls to it).
+    private func caretRect(of input: UIView, in scroll: UIScrollView) -> CGRect? {
+        guard input.isFirstResponder, let text = input as? UITextInput,
+              let end = text.selectedTextRange?.end else { return nil }
+        let caret = text.caretRect(for: end)
+        guard caret.minY.isFinite, caret.height > 0 else { return nil }
+        let frame = input.convert(input.bounds, to: scroll)
+        var rect = input.convert(caret, to: scroll)
+        rect.origin.y = min(max(rect.minY, frame.minY), max(frame.minY, frame.maxY - rect.height))
+        return rect.insetBy(dx: 0, dy: -16)
+    }
+
     private func sendAppState(_ state: String) {
         // A screen hears it while it is on top of its stack; the app script,
         // which is on no stack, always.
@@ -8977,7 +9057,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             if textView.textContainerInset != padding { textView.textContainerInset = padding }
             textView.textContainer.lineFragmentPadding = 0
         }
-        textView.isScrollEnabled = false
+        // An input's own scrolling follows its height (CraftNativeTextView).
+        if !(textView is CraftNativeTextView) { textView.isScrollEnabled = false }
         let numberOfLines = Int(number(props["numberOfLines"]) ?? 0)
         if numberOfLines > 0 {
             textView.textContainer.maximumNumberOfLines = numberOfLines
@@ -9846,11 +9927,38 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let id = ObjectIdentifier(textView)
         inputIdentities[id].map { inputDrafts[$0] = textView.text ?? "" }
         (textView as? CraftNativeTextView)?.refreshPlaceholder()
+        keepCaretVisible(in: textView)
         guard let handler = handlers[id] else { return }
         noteSentText(textView.text ?? "", for: textView)
         send(type: "EVENT", payload: ["handlerName": handler, "nativeEvent": ["text": textView.text ?? ""]])
     }
 
+    func textViewDidChangeSelection(_ textView: UITextView) {
+        guard textView.isFirstResponder else { return }
+        keepCaretVisible(in: textView)
+    }
+
+    /// The caret, kept where it can be seen as a multiline input grows or the
+    /// caret moves: in the part of the screen's scroll view the keyboard
+    /// leaves. Only the field was scrolled into view, when editing began, so
+    /// a long comment typed at the bottom of a screen went under the keyboard.
+    private func keepCaretVisible(in textView: UITextView) {
+        DispatchQueue.main.async { [weak self, weak textView] in
+            guard let self, let textView, textView.isFirstResponder else { return }
+            // The input grows with its text first: a text view's new lines
+            // are news to the flex layout around it, which sized the scroll
+            // view's content to the old height.
+            textView.invalidateIntrinsicContentSize()
+            CraftNativeFlexLayout.invalidateAncestors(of: textView)
+            self.view.layoutIfNeeded()
+            guard let scroll = self.enclosingVerticalScroll(of: textView),
+                  let rect = self.caretRect(of: textView, in: scroll) else { return }
+            let visible = scroll.bounds.inset(by: scroll.adjustedContentInset)
+            guard !visible.contains(rect) else { return }
+            scroll.scrollRectToVisible(rect, animated: false)
+        }
+    }
+
     func textViewDidBeginEditing(_ textView: UITextView) {
         lastFocusedInput = textView
         if keyboardScreenFrame != nil { DispatchQueue.main.async { self.scrollFocusedInputIntoView(animated: true) } }

package/templates/CraftWatchApp.swift.template

@@ -1,4 +1,5 @@
 import SwiftUI
+import HealthKit
 import WatchConnectivity
 
 @main
@@ -15,14 +16,28 @@ struct {{APP_NAME}}WatchApp: App {
 
 @MainActor
 final class CraftWatchSession: NSObject, ObservableObject {
+    private static let protocolVersion = 1
+    private static let persistedStateKey = "craft.watch.state.v1"
+    private static let healthKitEnabled = {{HEALTH_KIT_ENABLED}}
+
     @Published private(set) var isPhoneReachable = false
     @Published private(set) var isRecording = false
     @Published private(set) var isPaused = false
     @Published private(set) var distanceMeters = 0.0
     @Published private(set) var durationSeconds = 0.0
     @Published private(set) var status = "Ready"
+    @Published private(set) var plannedSession: [String: Any]?
+    @Published private(set) var heartRateBpm: Double?
+    @Published private(set) var heartRateZone: Int?
+    @Published private(set) var lastWorkout: [String: Any]?
 
     private let session: WCSession?
+    private let healthStore = HKHealthStore()
+    private var stateVersion = 0
+    private var workoutSession: HKWorkoutSession?
+    private var workoutBuilder: HKLiveWorkoutBuilder?
+    private var workoutId: String?
+    private var workoutStartedAt: Date?
 
     override init() {
         if WCSession.isSupported() {
@@ -32,49 +47,320 @@ final class CraftWatchSession: NSObject, ObservableObject {
         }
         super.init()
         session?.delegate = self
+        restoreState()
         session?.activate()
     }
 
     func toggleRecording() {
-        let action: String
         if !isRecording {
-            action = "start"
+            if Self.healthKitEnabled {
+                startHealthWorkout { [weak self] started in
+                    if started { self?.send(action: "start") }
+                }
+            } else {
+                send(action: "start")
+            }
         } else if isPaused {
-            action = "resume"
+            resumeHealthWorkout()
+            send(action: "resume")
         } else {
-            action = "pause"
+            pauseHealthWorkout()
+            send(action: "pause")
         }
-        send(action: action)
     }
 
     func finishRecording() {
-        send(action: "finish")
+        if Self.healthKitEnabled, workoutSession != nil {
+            endHealthWorkout { [weak self] _ in self?.send(action: "finish") }
+        } else {
+            send(action: "finish")
+        }
+    }
+
+    /// The phone sends a planned session through application context. Context
+    /// is the right transport here: it replaces stale plans while the watch is
+    /// offline and is replayed when the app launches again.
+    func clearPlannedSession() {
+        plannedSession = nil
+        persistState()
+        publishState()
     }
 
     private func send(action: String) {
         guard let session, session.activationState == .activated else {
             status = "Open WildLoop on iPhone"
+            persistState()
             return
         }
-        let message: [String: Any] = ["type": "recording-control", "action": action]
+        let message: [String: Any] = [
+            "protocolVersion": Self.protocolVersion,
+            "requestId": UUID().uuidString,
+            "type": "recording-control",
+            "action": action,
+        ]
         if session.isReachable {
             session.sendMessage(message, replyHandler: { [weak self] reply in
                 Task { @MainActor in self?.apply(reply) }
             }, errorHandler: { [weak self] _ in
-                Task { @MainActor in self?.status = "Could not reach iPhone" }
+                Task { @MainActor in
+                    self?.status = "Could not reach iPhone"
+                    self?.persistState()
+                    self?.publishState()
+                }
             })
         } else {
             session.transferUserInfo(message)
             status = "Command queued"
+            persistState()
+            publishState()
         }
     }
 
     private func apply(_ payload: [String: Any]) {
+        if let plan = payload["plan"] as? [String: Any], payload["type"] as? String == "planned-session" {
+            plannedSession = plan
+            status = "Plan ready"
+        } else if let plan = payload["plannedSession"] as? [String: Any] {
+            plannedSession = plan
+        }
         if let recording = payload["recording"] as? Bool { isRecording = recording }
         if let paused = payload["paused"] as? Bool { isPaused = paused }
         if let distance = payload["distanceMeters"] as? Double { distanceMeters = max(distance, 0) }
         if let duration = payload["durationSeconds"] as? Double { durationSeconds = max(duration, 0) }
         if let value = payload["status"] as? String { status = value }
+        if let heartRate = payload["heartRateBpm"] as? Double, heartRate.isFinite { heartRateBpm = max(heartRate, 0) }
+        if let zone = payload["heartRateZone"] as? Int { heartRateZone = min(max(zone, 1), 5) }
+        if let workout = payload["workout"] as? [String: Any] { lastWorkout = workout }
+        persistState()
+        publishState()
+    }
+
+    private func restoreState() {
+        guard let state = UserDefaults.standard.dictionary(forKey: Self.persistedStateKey) else { return }
+        if let recording = state["recording"] as? Bool { isRecording = recording }
+        if let paused = state["paused"] as? Bool { isPaused = paused }
+        if let distance = state["distanceMeters"] as? Double { distanceMeters = max(distance, 0) }
+        if let duration = state["durationSeconds"] as? Double { durationSeconds = max(duration, 0) }
+        if let value = state["status"] as? String { status = value }
+        if let version = state["stateVersion"] as? Int { stateVersion = max(version, stateVersion) }
+        plannedSession = state["plannedSession"] as? [String: Any]
+        if let heartRate = state["heartRateBpm"] as? Double { heartRateBpm = max(heartRate, 0) }
+        if let zone = state["heartRateZone"] as? Int { heartRateZone = min(max(zone, 1), 5) }
+        lastWorkout = state["lastWorkout"] as? [String: Any]
+    }
+
+    private func persistState() {
+        stateVersion += 1
+        var state: [String: Any] = [
+            "protocolVersion": Self.protocolVersion,
+            "stateVersion": stateVersion,
+            "recording": isRecording,
+            "paused": isPaused,
+            "distanceMeters": distanceMeters,
+            "durationSeconds": durationSeconds,
+            "status": status,
+        ]
+        if let plannedSession { state["plannedSession"] = plannedSession }
+        if let heartRateBpm { state["heartRateBpm"] = heartRateBpm }
+        if let heartRateZone { state["heartRateZone"] = heartRateZone }
+        if let lastWorkout { state["lastWorkout"] = lastWorkout }
+        UserDefaults.standard.set(state, forKey: Self.persistedStateKey)
+    }
+
+    private func publishState() {
+        guard let session, session.activationState == .activated else { return }
+        var state: [String: Any] = [
+            "protocolVersion": Self.protocolVersion,
+            "stateVersion": stateVersion,
+            "type": "watch-state",
+            "recording": isRecording,
+            "paused": isPaused,
+            "distanceMeters": distanceMeters,
+            "durationSeconds": durationSeconds,
+            "status": status,
+        ]
+        if let plannedSession { state["plannedSession"] = plannedSession }
+        if let heartRateBpm { state["heartRateBpm"] = heartRateBpm }
+        if let heartRateZone { state["heartRateZone"] = heartRateZone }
+        if let lastWorkout { state["workout"] = lastWorkout }
+        try? session.updateApplicationContext(state)
+    }
+
+    private func startHealthWorkout(completion: @escaping (Bool) -> Void) {
+        guard HKHealthStore.isHealthDataAvailable() else {
+            status = "HealthKit unavailable"
+            persistState()
+            completion(false)
+            return
+        }
+        let shareTypes: Set<HKSampleType> = [HKObjectType.workoutType()]
+        var readTypes: Set<HKObjectType> = [HKObjectType.workoutType()]
+        if let heartRate = HKQuantityType.quantityType(forIdentifier: .heartRate) { readTypes.insert(heartRate) }
+        if let distance = HKQuantityType.quantityType(forIdentifier: .distanceWalkingRunning) { readTypes.insert(distance) }
+        if let energy = HKQuantityType.quantityType(forIdentifier: .activeEnergyBurned) { readTypes.insert(energy) }
+        healthStore.requestAuthorization(toShare: shareTypes, read: readTypes) { [weak self] success, error in
+            DispatchQueue.main.async {
+                guard let self else { return completion(false) }
+                guard success else {
+                    self.status = error?.localizedDescription ?? "HealthKit authorization denied"
+                    self.persistState()
+                    return completion(false)
+                }
+                self.beginHealthWorkout(completion: completion)
+            }
+        }
+    }
+
+    private func beginHealthWorkout(completion: @escaping (Bool) -> Void) {
+        guard workoutSession == nil else { completion(true); return }
+        let configuration = HKWorkoutConfiguration()
+        configuration.activityType = .running
+        configuration.locationType = .outdoor
+        do {
+            let session = try HKWorkoutSession(healthStore: healthStore, configuration: configuration)
+            let builder = session.associatedWorkoutBuilder()
+            session.delegate = self
+            builder.delegate = self
+            builder.shouldCollectWorkoutEvents = true
+            builder.dataSource = HKLiveWorkoutDataSource(healthStore: healthStore, workoutConfiguration: configuration)
+            workoutSession = session
+            workoutBuilder = builder
+            workoutId = UUID().uuidString.lowercased()
+            let start = Date()
+            workoutStartedAt = start
+            session.startActivity(with: start)
+            builder.beginCollection(withStart: start) { [weak self] success, error in
+                DispatchQueue.main.async {
+                    guard let self else { return completion(false) }
+                    guard success else {
+                        self.clearHealthWorkout()
+                        self.status = error?.localizedDescription ?? "Workout could not start"
+                        self.persistState()
+                        return completion(false)
+                    }
+                    self.isRecording = true
+                    self.isPaused = false
+                    self.status = "Recording"
+                    self.persistState()
+                    self.publishState()
+                    completion(true)
+                }
+            }
+        } catch {
+            status = error.localizedDescription
+            persistState()
+            completion(false)
+        }
+    }
+
+    private func pauseHealthWorkout() {
+        guard let workoutSession else { return }
+        workoutSession.pause()
+        isPaused = true
+        status = "Paused"
+        persistState()
+        publishState()
+    }
+
+    private func resumeHealthWorkout() {
+        guard let workoutSession else { return }
+        workoutSession.resume()
+        isPaused = false
+        status = "Recording"
+        persistState()
+        publishState()
+    }
+
+    private func endHealthWorkout(completion: @escaping ([String: Any]?) -> Void) {
+        guard let workoutSession, let workoutBuilder, let id = workoutId else {
+            completion(nil)
+            return
+        }
+        let end = Date()
+        workoutSession.end()
+        workoutBuilder.endCollection(withEnd: end) { [weak self] success, error in
+            guard let self else { return }
+            guard success else {
+                DispatchQueue.main.async {
+                    self.status = error?.localizedDescription ?? "Workout could not finish"
+                    self.persistState()
+                    completion(nil)
+                }
+                return
+            }
+            workoutBuilder.finishWorkout { [weak self] workout, finishError in
+                DispatchQueue.main.async {
+                    guard let self else { return completion(nil) }
+                    guard let workout else {
+                        self.status = finishError?.localizedDescription ?? "Workout could not be saved"
+                        self.persistState()
+                        return completion(nil)
+                    }
+                    let result: [String: Any] = [
+                        "id": id,
+                        "workoutId": workout.uuid.uuidString,
+                        "startDate": (self.workoutStartedAt ?? workout.startDate).timeIntervalSince1970 * 1000,
+                        "endDate": end.timeIntervalSince1970 * 1000,
+                        "durationSeconds": workout.duration,
+                        "distanceMeters": self.distanceMeters,
+                    ]
+                    self.lastWorkout = result
+                    self.isRecording = false
+                    self.isPaused = false
+                    self.status = "Saved to Apple Health"
+                    self.clearHealthWorkout()
+                    self.persistState()
+                    self.publishState()
+                    completion(result)
+                }
+            }
+        }
+    }
+
+    private func clearHealthWorkout() {
+        workoutSession = nil
+        workoutBuilder = nil
+        workoutId = nil
+        workoutStartedAt = nil
+    }
+
+    private func updateHealthMetrics(_ builder: HKLiveWorkoutBuilder) {
+        if let heartRate = HKQuantityType.quantityType(forIdentifier: .heartRate),
+           let value = builder.statistics(for: heartRate)?.mostRecentQuantity()?.doubleValue(for: HKUnit.count().unitDivided(by: .minute())),
+           value.isFinite {
+            heartRateBpm = max(value, 0)
+            let maximum = (plannedSession?["maxHeartRateBpm"] as? Double) ?? 190
+            heartRateZone = min(max(Int(ceil(value / maximum * 5)), 1), 5)
+        }
+        if let distance = HKQuantityType.quantityType(forIdentifier: .distanceWalkingRunning),
+           let value = builder.statistics(for: distance)?.sumQuantity()?.doubleValue(for: .meter()),
+           value.isFinite {
+            distanceMeters = max(value, 0)
+        }
+        if let start = workoutStartedAt { durationSeconds = max(Date().timeIntervalSince(start), 0) }
+        persistState()
+        publishState()
+    }
+}
+
+extension CraftWatchSession: HKWorkoutSessionDelegate, HKLiveWorkoutBuilderDelegate {
+    nonisolated func workoutSession(_ workoutSession: HKWorkoutSession, didChangeTo toState: HKWorkoutSessionState, from fromState: HKWorkoutSessionState, date: Date) {}
+
+    nonisolated func workoutSession(_ workoutSession: HKWorkoutSession, didFailWithError error: Error) {
+        Task { @MainActor in
+            status = error.localizedDescription
+            isRecording = false
+            isPaused = false
+            clearHealthWorkout()
+            persistState()
+            publishState()
+        }
+    }
+
+    nonisolated func workoutBuilderDidCollectEvent(_ workoutBuilder: HKLiveWorkoutBuilder) {}
+
+    nonisolated func workoutBuilder(_ workoutBuilder: HKLiveWorkoutBuilder, didCollectDataOf types: Set<HKSampleType>) {
+        Task { @MainActor in updateHealthMetrics(workoutBuilder) }
     }
 }
 
@@ -84,11 +370,15 @@ extension CraftWatchSession: WCSessionDelegate {
             isPhoneReachable = session.isReachable
             status = error == nil ? "Ready" : "Connection unavailable"
             apply(session.receivedApplicationContext)
+            publishState()
         }
     }
 
     nonisolated func sessionReachabilityDidChange(_ session: WCSession) {
-        Task { @MainActor in isPhoneReachable = session.isReachable }
+        Task { @MainActor in
+            isPhoneReachable = session.isReachable
+            if session.isReachable { publishState() }
+        }
     }
 
     nonisolated func session(_ session: WCSession, didReceiveApplicationContext applicationContext: [String: Any]) {
@@ -129,6 +419,10 @@ struct CraftWatchRecordingView: View {
                     metric(distance, label: "Distance")
                     metric(duration, label: "Time")
                 }
+                if let heartRate = session.heartRateBpm {
+                    metric(String(format: "%.0f bpm", heartRate), label: "Heart rate")
+                    if let zone = session.heartRateZone { Text("Zone \(zone) of 5").font(.caption2).foregroundStyle(.secondary) }
+                }
                 Button(session.isRecording && !session.isPaused ? "Pause" : session.isPaused ? "Resume" : "Start") {
                     session.toggleRecording()
                 }

package/templates/WatchExtension.Info.plist.template

@@ -30,5 +30,6 @@
         <key>NSExtensionPointIdentifier</key>
         <string>com.apple.watchkit</string>
     </dict>
+    {{HEALTH_USAGE_DESCRIPTIONS}}
 </dict>
 </plist>