craft-native 0.0.87 → 0.0.88

package/dist/ios/templates/CraftApp.swift

@@ -338,6 +338,12 @@ struct CraftWebView: UIViewRepresentable {
         webView.navigationDelegate = context.coordinator
         webView.isOpaque = false
 
+        // Before any message can be offered. Zig evaluates every reply against
+        // this webview, and without it an action would run, succeed, and reach
+        // `error.NoWebView` on the way back — the page hearing nothing while
+        // the work happened.
+        CraftZigRuntime.attach(webView)
+
         // Register with DeepLinkManager
         DeepLinkManager.shared.setWebView(webView)
 
@@ -363,6 +369,13 @@ struct CraftWebView: UIViewRepresentable {
 
     func updateUIView(_ webView: WKWebView, context: Context) {}
 
+    /// The teardown half of `CraftZigRuntime.attach`, called by SwiftUI when
+    /// this representable goes away. Without it Zig keeps an unretained
+    /// pointer to a deallocated webview and answers into freed memory.
+    static func dismantleUIView(_ uiView: WKWebView, coordinator: Coordinator) {
+        CraftZigRuntime.detach(uiView)
+    }
+
     func makeCoordinator() -> Coordinator {
         let coordinator = Coordinator(config: config)
         // The Zig dispatcher finds CraftSwiftShim by class name; the shim finds
@@ -444,7 +457,12 @@ struct CraftWebView: UIViewRepresentable {
                 locationManager?.desiredAccuracy = kCLLocationAccuracyBest
                 locationManager?.activityType = .fitness
                 locationManager?.pausesLocationUpdatesAutomatically = false
-                restoreLocationRecordingState()
+                // Zig owns the recorder when it is linked, including the
+                // relaunch restore — see `CraftZigRuntime.adoptLocationRecording`.
+                // Running both would leave two managers appending to one track.
+                if !CraftZigRuntime.adoptLocationRecording() {
+                    restoreLocationRecordingState()
+                }
             }
             if config.enableContacts {
                 contactStore = CNContactStore()
@@ -516,7 +534,24 @@ struct CraftWebView: UIViewRepresentable {
             guard let body = message.body as? [String: Any],
                   let action = body["action"] as? String else { return }
 
-            dispatch(action: action, body: body, callbackId: body["callbackId"] as? String)
+            let callbackId = body["callbackId"] as? String
+
+            // The Zig runtime first, when there is one.
+            //
+            // `offer` returns true when Zig has taken responsibility for the
+            // call — served it, or refused it and settled the page's promise
+            // on the way. Either way the answer is on its way and this method
+            // must not produce a second one. False means no Zig module
+            // recognised the action, which is every action still listed in the
+            // switch below and nothing else.
+            //
+            // In an app with no Zig runtime linked, `offer` is a `dlsym` miss
+            // that answers false for everything, and the switch serves the
+            // whole surface exactly as it did before. That is why this is one
+            // line and not a build flag.
+            if CraftZigRuntime.offer(action: action, body: body, callbackId: callbackId) { return }
+
+            dispatch(action: action, body: body, callbackId: callbackId)
         }
 
         /// The action switch, reachable from two directions: the
@@ -531,13 +566,19 @@ struct CraftWebView: UIViewRepresentable {
         func dispatch(action: String, body: [String: Any], callbackId: String?) {
             switch action {
             case "startListening":
-                if config.enableSpeechRecognition { startSpeechRecognition() }
+                if config.enableSpeechRecognition {
+                    startSpeechRecognition()
+                } else {
+                    rejectCallback(callbackId, error: "Speech recognition is disabled", code: "CAPABILITY_DISABLED")
+                }
             case "stopListening":
                 stopSpeechRecognition()
             case "haptic":
                 if config.enableHaptics {
                     let style = body["style"] as? String ?? "medium"
                     triggerHaptic(style: style)
+                } else {
+                    rejectCallback(callbackId, error: "Haptics is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "share":
                 if config.enableShare {
@@ -555,39 +596,62 @@ struct CraftWebView: UIViewRepresentable {
                 if config.enableCamera {
                     pendingCallbackId = callbackId
                     openCamera()
+                } else {
+                    rejectCallback(callbackId, error: "Camera is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "pickImage":
                 if config.enableCamera {
                     pendingCallbackId = callbackId
                     pickImage()
+                } else {
+                    rejectCallback(callbackId, error: "Camera is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "authenticate":
                 if config.enableBiometric {
                     let reason = body["reason"] as? String ?? "Authenticate to continue"
                     authenticate(reason: reason, callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Biometric authentication is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "registerPush":
                 if config.enablePushNotifications {
                     registerPushNotifications(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Push notifications are disabled", code: "CAPABILITY_DISABLED")
                 }
             case "secureSet":
-                if config.enableSecureStorage,
-                   let key = body["key"] as? String,
-                   let value = body["value"] as? String {
-                    let success = secureStore(key: key, value: value)
-                    resolveCallback(callbackId, result: success)
+                if config.enableSecureStorage {
+                    if let key = body["key"] as? String,
+                       let value = body["value"] as? String {
+                        let success = secureStore(key: key, value: value)
+                        resolveCallback(callbackId, result: success)
+                    } else {
+                        rejectCallback(callbackId, error: "secureSet was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Secure storage is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "secureGet":
-                if config.enableSecureStorage,
-                   let key = body["key"] as? String {
-                    let value = secureRetrieve(key: key)
-                    resolveCallback(callbackId, result: value as Any)
+                if config.enableSecureStorage {
+                    if let key = body["key"] as? String {
+                        let value = secureRetrieve(key: key)
+                        resolveCallback(callbackId, result: value as Any)
+                    } else {
+                        rejectCallback(callbackId, error: "secureGet was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Secure storage is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "secureRemove":
-                if config.enableSecureStorage,
-                   let key = body["key"] as? String {
-                    let success = secureRemove(key: key)
-                    resolveCallback(callbackId, result: success)
+                if config.enableSecureStorage {
+                    if let key = body["key"] as? String {
+                        let success = secureRemove(key: key)
+                        resolveCallback(callbackId, result: success)
+                    } else {
+                        rejectCallback(callbackId, error: "secureRemove was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Secure storage is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "secureClear":
                 if config.enableSecureStorage {
@@ -650,14 +714,22 @@ struct CraftWebView: UIViewRepresentable {
                 readLocationRecording(callbackId: callbackId)
             // Clipboard
             case "clipboardWrite":
-                if config.enableClipboard, let text = body["text"] as? String {
-                    UIPasteboard.general.string = text
-                    resolveCallback(callbackId, result: true)
-                }
+            if config.enableClipboard {
+                    if let text = body["text"] as? String {
+                            UIPasteboard.general.string = text
+                            resolveCallback(callbackId, result: true)
+                    } else {
+                        rejectCallback(callbackId, error: "clipboardWrite was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+            } else {
+                rejectCallback(callbackId, error: "Clipboard is disabled", code: "CAPABILITY_DISABLED")
+            }
             case "clipboardRead":
                 if config.enableClipboard {
                     let text = UIPasteboard.general.string ?? ""
                     resolveCallback(callbackId, result: text)
+                } else {
+                    rejectCallback(callbackId, error: "Clipboard is disabled", code: "CAPABILITY_DISABLED")
                 }
             // Device Info
             case "getDeviceInfo":
@@ -705,49 +777,80 @@ struct CraftWebView: UIViewRepresentable {
             case "getContacts":
                 if config.enableContacts {
                     getContacts(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Contacts access is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "addContact":
-                if config.enableContacts,
-                   let contactData = body["contact"] as? [String: Any] {
-                    addContact(contactData, callbackId: callbackId)
+                if config.enableContacts {
+                    if let contactData = body["contact"] as? [String: Any] {
+                        addContact(contactData, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "addContact was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Contacts access is disabled", code: "CAPABILITY_DISABLED")
                 }
-
             // MARK: - Calendar
             case "getCalendarEvents":
                 if config.enableCalendar {
                     let startDate = body["startDate"] as? Double
                     let endDate = body["endDate"] as? Double
                     getCalendarEvents(startDate: startDate, endDate: endDate, callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Calendar access is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "createCalendarEvent":
-                if config.enableCalendar,
-                   let eventData = body["event"] as? [String: Any] {
-                    createCalendarEvent(eventData, callbackId: callbackId)
+                if config.enableCalendar {
+                    if let eventData = body["event"] as? [String: Any] {
+                        createCalendarEvent(eventData, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "createCalendarEvent was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Calendar access is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "deleteCalendarEvent":
-                if config.enableCalendar,
-                   let eventId = body["eventId"] as? String {
-                    deleteCalendarEvent(eventId, callbackId: callbackId)
+                if config.enableCalendar {
+                    if let eventId = body["eventId"] as? String {
+                        deleteCalendarEvent(eventId, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "deleteCalendarEvent was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Calendar access is disabled", code: "CAPABILITY_DISABLED")
                 }
-
             // MARK: - Local Notifications
             case "scheduleNotification":
-                if config.enableLocalNotifications,
-                   let notifData = body["notification"] as? [String: Any] {
-                    scheduleLocalNotification(notifData, callbackId: callbackId)
+                if config.enableLocalNotifications {
+                    if let notifData = body["notification"] as? [String: Any] {
+                        scheduleLocalNotification(notifData, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "scheduleNotification was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Local notifications are disabled", code: "CAPABILITY_DISABLED")
                 }
             case "cancelNotification":
-                if config.enableLocalNotifications,
-                   let notifId = body["id"] as? String {
-                    cancelLocalNotification(notifId, callbackId: callbackId)
+                if config.enableLocalNotifications {
+                    if let notifId = body["id"] as? String {
+                        cancelLocalNotification(notifId, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "cancelNotification was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Local notifications are disabled", code: "CAPABILITY_DISABLED")
                 }
             case "cancelAllNotifications":
                 if config.enableLocalNotifications {
                     cancelAllLocalNotifications(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Local notifications are disabled", code: "CAPABILITY_DISABLED")
                 }
             case "getPendingNotifications":
                 if config.enableLocalNotifications {
                     getPendingNotifications(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Local notifications are disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - Deep Links
@@ -755,6 +858,8 @@ struct CraftWebView: UIViewRepresentable {
                 if config.enableDeepLinks {
                     // Handler is registered in JS
                     resolveCallback(callbackId, result: true)
+                } else {
+                    rejectCallback(callbackId, error: "Deep links are disabled", code: "CAPABILITY_DISABLED")
                 }
             case "getInitialURL":
                 if config.enableDeepLinks {
@@ -769,46 +874,73 @@ struct CraftWebView: UIViewRepresentable {
                     } else {
                         resolveCallback(callbackId, result: NSNull())
                     }
+                } else {
+                    rejectCallback(callbackId, error: "Deep links are disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - In-App Purchase
             case "getProducts":
-                if config.enableInAppPurchase,
-                   let productIds = body["productIds"] as? [String] {
-                    getProducts(productIds, callbackId: callbackId)
+                if config.enableInAppPurchase {
+                    if let productIds = body["productIds"] as? [String] {
+                        getProducts(productIds, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "getProducts was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "In-app purchase is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "purchase":
-                if config.enableInAppPurchase,
-                   let productId = body["productId"] as? String {
-                    purchaseProduct(productId, callbackId: callbackId)
+                if config.enableInAppPurchase {
+                    if let productId = body["productId"] as? String {
+                        purchaseProduct(productId, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "purchase was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "In-app purchase is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "restorePurchases":
                 if config.enableInAppPurchase {
                     restorePurchases(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "In-app purchase is disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - Keep Awake
             case "setKeepAwake":
-                if config.enableKeepAwake,
-                   let enabled = body["enabled"] as? Bool {
-                    setKeepAwake(enabled, callbackId: callbackId)
+                if config.enableKeepAwake {
+                    if let enabled = body["enabled"] as? Bool {
+                        setKeepAwake(enabled, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "setKeepAwake was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Keep awake is disabled", code: "CAPABILITY_DISABLED")
                 }
-
             // MARK: - Orientation Lock
             case "lockOrientation":
-                if config.enableOrientationLock,
-                   let orientation = body["orientation"] as? String {
-                    lockOrientation(orientation, callbackId: callbackId)
+                if config.enableOrientationLock {
+                    if let orientation = body["orientation"] as? String {
+                        lockOrientation(orientation, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "lockOrientation was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Orientation lock is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "unlockOrientation":
                 if config.enableOrientationLock {
                     unlockOrientation(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Orientation lock is disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - QR/Barcode Scanner
             case "scanQRCode":
                 if config.enableQRScanner {
                     scanQRCode(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "QR scanning is disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - File Picker
@@ -816,42 +948,59 @@ struct CraftWebView: UIViewRepresentable {
                 if config.enableFilePicker {
                     let types = body["types"] as? [String]
                     pickFile(types: types, callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "File picker is disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - File Download
             case "downloadFile":
-                if config.enableFileDownload,
-                   let url = body["url"] as? String,
-                   let filename = body["filename"] as? String {
-                    downloadFile(url: url, filename: filename, callbackId: callbackId)
-                }
+            if config.enableFileDownload {
+                    if let url = body["url"] as? String, let filename = body["filename"] as? String {
+                            downloadFile(url: url, filename: filename, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "downloadFile was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+            } else {
+                rejectCallback(callbackId, error: "File download is disabled", code: "CAPABILITY_DISABLED")
+            }
             case "saveFile":
-                if config.enableFileDownload,
-                   let data = body["data"] as? String,
-                   let filename = body["filename"] as? String {
-                    saveFile(data: data, filename: filename, callbackId: callbackId)
-                }
-
+            if config.enableFileDownload {
+                    if let data = body["data"] as? String, let filename = body["filename"] as? String {
+                            saveFile(data: data, filename: filename, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "saveFile was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+            } else {
+                rejectCallback(callbackId, error: "File download is disabled", code: "CAPABILITY_DISABLED")
+            }
             // MARK: - Social Auth
             case "signInWithApple":
                 if config.enableSocialAuth {
                     signInWithApple(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Social sign-in is disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - Audio Recording
             case "startAudioRecording":
                 if config.enableAudioRecording {
                     startAudioRecording(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Audio recording is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "stopAudioRecording":
                 if config.enableAudioRecording {
                     stopAudioRecording(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Audio recording is disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - Video Recording
             case "startVideoRecording":
                 if config.enableVideoRecording {
                     startVideoRecording(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Video recording is disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - Motion Sensors
@@ -859,6 +1008,8 @@ struct CraftWebView: UIViewRepresentable {
                 if config.enableMotionSensors {
                     let interval = body["interval"] as? Double ?? 100
                     startMotionUpdates(interval: interval, callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Motion sensors are disabled", code: "CAPABILITY_DISABLED")
                 }
             case "stopMotionUpdates":
                 stopMotionUpdates()
@@ -866,22 +1017,33 @@ struct CraftWebView: UIViewRepresentable {
 
             // MARK: - Local Database
             case "dbExecute":
-                if config.enableLocalDatabase,
-                   let sql = body["sql"] as? String {
-                    let params = body["params"] as? [Any]
-                    dbExecute(sql: sql, params: params, callbackId: callbackId)
+                if config.enableLocalDatabase {
+                    if let sql = body["sql"] as? String {
+                        let params = body["params"] as? [Any]
+                        dbExecute(sql: sql, params: params, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "dbExecute was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Local database is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "dbQuery":
-                if config.enableLocalDatabase,
-                   let sql = body["sql"] as? String {
-                    let params = body["params"] as? [Any]
-                    dbQuery(sql: sql, params: params, callbackId: callbackId)
+                if config.enableLocalDatabase {
+                    if let sql = body["sql"] as? String {
+                        let params = body["params"] as? [Any]
+                        dbQuery(sql: sql, params: params, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "dbQuery was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Local database is disabled", code: "CAPABILITY_DISABLED")
                 }
-
             // MARK: - Bluetooth
             case "startBluetoothScan":
                 if config.enableBluetooth {
                     startBluetoothScan(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Bluetooth is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "stopBluetoothScan":
                 stopBluetoothScan()
@@ -891,6 +1053,8 @@ struct CraftWebView: UIViewRepresentable {
             case "scanNFC":
                 if config.enableNFC {
                     scanNFC(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "NFC is disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - Health
@@ -898,13 +1062,20 @@ struct CraftWebView: UIViewRepresentable {
                 if config.enableHealthKit {
                     let types = body["types"] as? [String] ?? []
                     requestHealthAuthorization(types: types, callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "HealthKit is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "getHealthData":
-                if config.enableHealthKit,
-                   let dataType = body["type"] as? String {
-                    let startDate = body["startDate"] as? Double
-                    let endDate = body["endDate"] as? Double
-                    getHealthData(type: dataType, startDate: startDate, endDate: endDate, callbackId: callbackId)
+                if config.enableHealthKit {
+                    if let dataType = body["type"] as? String {
+                        let startDate = body["startDate"] as? Double
+                        let endDate = body["endDate"] as? Double
+                        getHealthData(type: dataType, startDate: startDate, endDate: endDate, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "getHealthData was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "HealthKit is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "saveHealthWorkout":
                 if config.enableHealthKit {
@@ -929,38 +1100,62 @@ struct CraftWebView: UIViewRepresentable {
             case "takeScreenshot":
                 if config.enableScreenCapture {
                     takeScreenshot(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Screen capture is disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - Background Tasks
             case "registerBackgroundTask":
-                if config.enableBackgroundTasks,
-                   let taskId = body["taskId"] as? String {
-                    registerBackgroundTask(taskId: taskId, callbackId: callbackId)
+                if config.enableBackgroundTasks {
+                    if let taskId = body["taskId"] as? String {
+                        registerBackgroundTask(taskId: taskId, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "registerBackgroundTask was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Background tasks are disabled", code: "CAPABILITY_DISABLED")
                 }
             case "scheduleBackgroundTask":
-                if config.enableBackgroundTasks,
-                   let taskId = body["taskId"] as? String {
-                    let delay = body["delay"] as? Double ?? 900 // 15 minutes default
-                    let requiresNetwork = body["requiresNetwork"] as? Bool ?? false
-                    let requiresCharging = body["requiresCharging"] as? Bool ?? false
-                    scheduleBackgroundTask(taskId: taskId, delay: delay, requiresNetwork: requiresNetwork, requiresCharging: requiresCharging, callbackId: callbackId)
+                if config.enableBackgroundTasks {
+                    if let taskId = body["taskId"] as? String {
+                        let delay = body["delay"] as? Double ?? 900 // 15 minutes default
+                        let requiresNetwork = body["requiresNetwork"] as? Bool ?? false
+                        let requiresCharging = body["requiresCharging"] as? Bool ?? false
+                        scheduleBackgroundTask(taskId: taskId, delay: delay, requiresNetwork: requiresNetwork, requiresCharging: requiresCharging, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "scheduleBackgroundTask was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Background tasks are disabled", code: "CAPABILITY_DISABLED")
                 }
             case "cancelBackgroundTask":
-                if config.enableBackgroundTasks,
-                   let taskId = body["taskId"] as? String {
-                    cancelBackgroundTask(taskId: taskId, callbackId: callbackId)
+                if config.enableBackgroundTasks {
+                    if let taskId = body["taskId"] as? String {
+                        cancelBackgroundTask(taskId: taskId, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "cancelBackgroundTask was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Background tasks are disabled", code: "CAPABILITY_DISABLED")
                 }
             case "cancelAllBackgroundTasks":
                 if config.enableBackgroundTasks {
                     cancelAllBackgroundTasks(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Background tasks are disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - PDF Viewer
             case "openPDF":
-                if config.enablePDFViewer,
-                   let source = body["source"] as? String {
-                    let page = body["page"] as? Int ?? 0
-                    openPDF(source: source, page: page, callbackId: callbackId)
+                if config.enablePDFViewer {
+                    if let source = body["source"] as? String {
+                        let page = body["page"] as? Int ?? 0
+                        openPDF(source: source, page: page, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "openPDF was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "PDF viewing is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "closePDF":
                 closePDF(callbackId: callbackId)
@@ -970,6 +1165,8 @@ struct CraftWebView: UIViewRepresentable {
                 if config.enableContacts {
                     let multiple = body["multiple"] as? Bool ?? false
                     pickContact(multiple: multiple, callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "Contacts access is disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - App Shortcuts
@@ -1014,44 +1211,74 @@ struct CraftWebView: UIViewRepresentable {
                 if config.enableAR {
                     let options = body["options"] as? [String: Any] ?? [:]
                     startAR(options: options, callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "AR is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "stopAR":
                 if config.enableAR {
                     stopAR(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "AR is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "placeARObject":
-                if config.enableAR,
-                   let model = body["model"] as? String {
-                    let position = body["position"] as? [String: Double]
-                    placeARObject(model: model, position: position, callbackId: callbackId)
+                if config.enableAR {
+                    if let model = body["model"] as? String {
+                        let position = body["position"] as? [String: Double]
+                        placeARObject(model: model, position: position, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "placeARObject was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "AR is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "removeARObject":
-                if config.enableAR,
-                   let objectId = body["objectId"] as? String {
-                    removeARObject(objectId: objectId, callbackId: callbackId)
+                if config.enableAR {
+                    if let objectId = body["objectId"] as? String {
+                        removeARObject(objectId: objectId, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "removeARObject was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "AR is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "getARPlanes":
                 if config.enableAR {
                     getARPlanes(callbackId: callbackId)
+                } else {
+                    rejectCallback(callbackId, error: "AR is disabled", code: "CAPABILITY_DISABLED")
                 }
 
             // MARK: - ML (Core ML / Vision)
             case "classifyImage":
-                if config.enableMLKit,
-                   let imageBase64 = body["image"] as? String {
-                    classifyImage(imageBase64: imageBase64, callbackId: callbackId)
+                if config.enableMLKit {
+                    if let imageBase64 = body["image"] as? String {
+                        classifyImage(imageBase64: imageBase64, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "classifyImage was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Vision is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "detectObjects":
-                if config.enableMLKit,
-                   let imageBase64 = body["image"] as? String {
-                    detectObjects(imageBase64: imageBase64, callbackId: callbackId)
+                if config.enableMLKit {
+                    if let imageBase64 = body["image"] as? String {
+                        detectObjects(imageBase64: imageBase64, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "detectObjects was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Vision is disabled", code: "CAPABILITY_DISABLED")
                 }
             case "recognizeText":
-                if config.enableMLKit,
-                   let imageBase64 = body["image"] as? String {
-                    recognizeText(imageBase64: imageBase64, callbackId: callbackId)
+                if config.enableMLKit {
+                    if let imageBase64 = body["image"] as? String {
+                        recognizeText(imageBase64: imageBase64, callbackId: callbackId)
+                    } else {
+                        rejectCallback(callbackId, error: "recognizeText was called without the values it needs", code: "INVALID_ARGUMENT")
+                    }
+                } else {
+                    rejectCallback(callbackId, error: "Vision is disabled", code: "CAPABILITY_DISABLED")
                 }
-
             // MARK: - Widget
             case "updateWidget":
                 if let data = body["data"] as? [String: Any] {
@@ -1063,11 +1290,11 @@ struct CraftWebView: UIViewRepresentable {
             // MARK: - Siri Shortcuts
             case "registerSiriShortcut":
                 if let phrase = body["phrase"] as? String,
-                   let action = body["action"] as? String {
+                   let action = body["shortcutAction"] as? String {
                     registerSiriShortcut(phrase: phrase, action: action, callbackId: callbackId)
                 }
             case "removeSiriShortcut":
-                if let action = body["action"] as? String {
+                if let action = body["shortcutAction"] as? String {
                     removeSiriShortcut(action: action, callbackId: callbackId)
                 }
 
@@ -2164,7 +2391,15 @@ struct CraftWebView: UIViewRepresentable {
                     register: function(phrase, action) {
                         var self = window.craft;
                         var id = 'cb_' + (++self._callbackId);
-                        window.webkit.messageHandlers.craft.postMessage({action: 'registerSiriShortcut', phrase: phrase, action: action, callbackId: id});
+                        // `shortcutAction`, not `action`. This object had two
+                        // keys called `action` — the message's own, and the
+                        // shortcut's — and the later one wins, so every call
+                        // arrived labelled with the shortcut's identifier
+                        // instead of 'registerSiriShortcut'. No switch arm
+                        // matched, nothing answered, and these wrappers park in
+                        // `_callbacks` with no timeout: the promise never
+                        // settled at all.
+                        window.webkit.messageHandlers.craft.postMessage({action: 'registerSiriShortcut', phrase: phrase, shortcutAction: action, callbackId: id});
                         return new Promise(function(resolve, reject) {
                             self._callbacks[id] = {resolve: resolve, reject: reject};
                         });
@@ -2172,7 +2407,8 @@ struct CraftWebView: UIViewRepresentable {
                     remove: function(action) {
                         var self = window.craft;
                         var id = 'cb_' + (++self._callbackId);
-                        window.webkit.messageHandlers.craft.postMessage({action: 'removeSiriShortcut', action: action, callbackId: id});
+                        // The same duplicate key as `register` above.
+                        window.webkit.messageHandlers.craft.postMessage({action: 'removeSiriShortcut', shortcutAction: action, callbackId: id});
                         return new Promise(function(resolve, reject) {
                             self._callbacks[id] = {resolve: resolve, reject: reject};
                         });
@@ -2421,6 +2657,27 @@ struct CraftWebView: UIViewRepresentable {
                 }
             })(window.craft);
 
+            // The reply route for actions the Zig runtime serves.
+            //
+            // Zig owns one wire format and calls these two functions by name;
+            // this page owns `_callbacks`, keyed by the 'cb_<n>' ids `_invoke`
+            // hands out. The whole adaptation is turning the numeric id Zig
+            // carries back into that key. Nothing else is translated, because
+            // nothing else differs: `craftSpeechStart` and friends already
+            // arrive as plain CustomEvents from both sides.
+            //
+            // A null id means the page sent no callback — the tray-style
+            // fire-and-forget posts — so there is nothing to settle and
+            // dropping it is correct rather than lossy.
+            window.__craftBridgeResult = function (action, result, id) {
+                if (id === null || id === undefined) return;
+                window.craft._resolveCallback('cb_' + id, result);
+            };
+            window.__craftBridgeError = function (ctx) {
+                if (!ctx || ctx.id === null || ctx.id === undefined) return;
+                window.craft._rejectCallback('cb_' + ctx.id, ctx.message, ctx.code);
+            };
+
             // Dispatch ready event
             window.dispatchEvent(new CustomEvent('craftReady', {detail: window.craft}));
             console.log('Craft iOS bridge initialized');
@@ -5193,6 +5450,147 @@ extension CraftWebView.Coordinator: WCSessionDelegate {
 
 // MARK: - Zig hand-off shim
 
+/// The seam the page's messages reach the Zig runtime through.
+///
+/// The opposite direction from `CraftSwiftShim` below, and the two together
+/// are the whole hand-off: this class offers each message to Zig, Zig serves
+/// what it has migrated and declines the rest, and for anything Zig *did*
+/// take that needs Swift work, `CraftSwiftShim` is how it comes back.
+///
+/// Discovery is `dlsym`, exactly as the shim's is, and for the same reason:
+/// neither side links the other. An app built without the Zig static library
+/// finds nothing here, `offer` answers false for every action, and the
+/// coordinator's switch serves the entire surface as it always has. There is
+/// no build flag and no second code path — the absence of a symbol is the
+/// off switch.
+@objc(CraftZigRuntime)
+final class CraftZigRuntime: NSObject {
+    private typealias SetWebViewFn = @convention(c) (UnsafeMutableRawPointer?) -> Void
+    private typealias ClearWebViewFn = @convention(c) (UnsafeMutableRawPointer?) -> Void
+    private typealias HandleActionFn = @convention(c) (
+        UnsafePointer<CChar>, UInt, UnsafePointer<CChar>, UInt, Int64
+    ) -> Bool
+    private typealias AdoptLocationRecordingFn = @convention(c) () -> Bool
+
+    private static let image: UnsafeMutableRawPointer? = dlopen(nil, RTLD_NOW)
+
+    private static let setWebViewFn: SetWebViewFn? = {
+        guard let sym = dlsym(image, "craft_ios_set_webview") else { return nil }
+        return unsafeBitCast(sym, to: SetWebViewFn.self)
+    }()
+
+    private static let clearWebViewFn: ClearWebViewFn? = {
+        guard let sym = dlsym(image, "craft_ios_clear_webview") else { return nil }
+        return unsafeBitCast(sym, to: ClearWebViewFn.self)
+    }()
+
+    private static let handleActionFn: HandleActionFn? = {
+        guard let sym = dlsym(image, "craft_ios_handle_action") else { return nil }
+        return unsafeBitCast(sym, to: HandleActionFn.self)
+    }()
+
+    private static let adoptLocationRecordingFn: AdoptLocationRecordingFn? = {
+        guard let sym = dlsym(image, "craft_ios_adopt_location_recording") else { return nil }
+        return unsafeBitCast(sym, to: AdoptLocationRecordingFn.self)
+    }()
+
+    /// Whether this build has a Zig runtime at all. Read by nothing here; kept
+    /// because "is Zig linked" is the first question to ask when an action
+    /// behaves like the Swift one after a migration was supposed to move it.
+    @objc static var isLinked: Bool { handleActionFn != nil }
+
+    /// Give Zig the webview its replies are evaluated against.
+    ///
+    /// Unretained on purpose, on both sides: this is the app's own root view
+    /// and it outlives the runtime. A retain here would be a cycle with
+    /// nothing to break it.
+    static func attach(_ webView: WKWebView) {
+        setWebViewFn?(Unmanaged.passUnretained(webView).toOpaque())
+    }
+
+    /// Hand a recording that outlived the last launch to whichever runtime owns
+    /// the recorder.
+    ///
+    /// Returns true when Zig took it, and the caller must then *not* run
+    /// `restoreLocationRecordingState()`. This is the one place the usual
+    /// "offer it to Zig, fall back on false" pattern cannot be used through
+    /// `handleAction`: there is no page message at launch, and the restore
+    /// happens in `Coordinator.init` — before `attach`, because SwiftUI builds
+    /// the coordinator before the view. Whoever restores first owns the
+    /// `CLLocationManager` for the rest of the launch, so the decision has to
+    /// be made here rather than at the first `stopLocationRecording`.
+    ///
+    /// False in a build with no Zig runtime, which is exactly when Swift's own
+    /// restore is still the right thing to run.
+    static func adoptLocationRecording() -> Bool {
+        adoptLocationRecordingFn?() ?? false
+    }
+
+    /// Forget this webview, if Zig is still holding it.
+    ///
+    /// `attach` hands over an unretained pointer, so the moment SwiftUI
+    /// deallocates the view Zig is holding freed memory and every later reply
+    /// is an `objc_msgSend` into it. Nothing called this before, and nothing
+    /// had to while the app had exactly one webview for its whole life — but
+    /// a `UIViewRepresentable` is rebuilt whenever its identity changes, and
+    /// the second rebuild is where that assumption stops holding.
+    ///
+    /// The webview is passed rather than implied: Zig clears only if this is
+    /// still the pointer it has, so a rebuild that makes the replacement
+    /// before dismantling the original cannot blank the live one.
+    static func detach(_ webView: WKWebView) {
+        clearWebViewFn?(Unmanaged.passUnretained(webView).toOpaque())
+    }
+
+    /// Offer one page message to the Zig dispatcher.
+    ///
+    /// Returns true when Zig has taken responsibility — the caller must not
+    /// answer as well. False when no Zig module recognised the action, or when
+    /// there is no runtime to ask.
+    static func offer(action: String, body: [String: Any], callbackId: String?) -> Bool {
+        guard let handleActionFn else { return false }
+
+        // `_invoke` flattens the payload into the message —
+        // `Object.assign({}, payload, {action, callbackId})` — so the payload
+        // Zig's handlers parse is the message minus the two envelope keys.
+        // This is the exact inverse of what `CraftSwiftShim.handleAction` does
+        // when a call travels the other way, and the two must stay inverses:
+        // leaving `action` in would put a key in the payload no handler
+        // expects, and dropping a real field would hand a handler defaults the
+        // page never asked for.
+        var payload = body
+        payload.removeValue(forKey: "action")
+        payload.removeValue(forKey: "callbackId")
+
+        // A payload that will not serialise is not offered. Falling through to
+        // the Swift switch is the safe direction: it reads `body` directly and
+        // never needs the round trip through JSON that just failed.
+        guard JSONSerialization.isValidJSONObject(payload),
+              let data = try? JSONSerialization.data(withJSONObject: payload),
+              let json = String(data: data, encoding: .utf8)
+        else { return false }
+
+        return action.withCString { a in
+            json.withCString { p in
+                handleActionFn(a, UInt(strlen(a)), p, UInt(strlen(p)), requestId(from: callbackId))
+            }
+        }
+    }
+
+    /// "cb_7" -> 7, and -1 for a message with no callback waiting on it.
+    ///
+    /// -1 rather than 0, matching what `craft_ios_deliver_result` already
+    /// treats as "no id": zero is a perfectly good callback number, and a
+    /// sentinel that collides with a real id would deliver one caller's answer
+    /// to another.
+    private static func requestId(from callbackId: String?) -> Int64 {
+        guard let callbackId, callbackId.hasPrefix("cb_"),
+              let n = Int64(callbackId.dropFirst(3))
+        else { return -1 }
+        return n
+    }
+}
+
 /// The seam the Zig dispatcher hands unmigrated actions through.
 ///
 /// Discovery is symmetric and both directions are runtime-only. Zig finds this