@mentra/bluetooth-sdk 0.1.20 → 0.1.21-beta.1

package/ios/Source/sgcs/MentraLive.swift

@@ -163,7 +163,7 @@ class BlePhotoUploadService {
         let bytes = [UInt8](data.prefix(12))
         if bytes.count >= 2, bytes[0] == 0xFF, bytes[1] == 0xD8 { return "jpeg" }
         if bytes.count >= 12, bytes[4] == 0x66, bytes[5] == 0x74, bytes[6] == 0x79, bytes[7] == 0x70 {
-            let brand = String(bytes: bytes[8..<12], encoding: .ascii) ?? "?"
+            let brand = String(bytes: bytes[8 ..< 12], encoding: .ascii) ?? "?"
             return "iso_bmff/ftyp=\(brand)"
         }
         return "unknown"
@@ -173,8 +173,8 @@ class BlePhotoUploadService {
         let marker: [UInt8] = [0x45, 0x78, 0x69, 0x66, 0, 0]
         let bytes = [UInt8](data)
         guard bytes.count >= marker.count else { return false }
-        for i in 0...(bytes.count - marker.count) {
-            if Array(bytes[i..<(i + marker.count)]) == marker { return true }
+        for i in 0 ... (bytes.count - marker.count) {
+            if Array(bytes[i ..< (i + marker.count)]) == marker { return true }
         }
         return false
     }
@@ -182,7 +182,7 @@ class BlePhotoUploadService {
     private static func readImuJsonFromImageData(_ imageData: Data) -> String? {
         // Primary: ImageIO EXIF (works for JPEG and well-formed AVIF)
         if let source = CGImageSourceCreateWithData(imageData as CFData, nil),
-            let properties = CGImageSourceCopyPropertiesAtIndex(source, 0, nil) as? [String: Any]
+           let properties = CGImageSourceCopyPropertiesAtIndex(source, 0, nil) as? [String: Any]
         {
             let exif = properties[kCGImagePropertyExifDictionary as String] as? [String: Any]
             let userComment = exif?[kCGImagePropertyExifUserComment as String] as? String
@@ -223,8 +223,8 @@ class BlePhotoUploadService {
             guard magic == 0x002A else { searchFrom = exifOff + 1; continue }
             let ifd0Off = Int(readU32(bytes, at: tiff + 4, le: littleEndian))
             if let result = readTagFromIfd(
-                bytes, tiff: tiff, ifdOff: tiff + ifd0Off, tag: 0x9286, le: littleEndian)
-            {
+                bytes, tiff: tiff, ifdOff: tiff + ifd0Off, tag: 0x9286, le: littleEndian
+            ) {
                 return result
             }
             searchFrom = exifOff + 1
@@ -238,7 +238,7 @@ class BlePhotoUploadService {
         guard ifdOff + 2 <= bytes.count else { return nil }
         let count = Int(readU16(bytes, at: ifdOff, le: le))
         var off = ifdOff + 2
-        for _ in 0..<count {
+        for _ in 0 ..< count {
             guard off + 12 <= bytes.count else { break }
             let entryTag = readU16(bytes, at: off, le: le)
             let type = readU16(bytes, at: off + 2, le: le)
@@ -255,7 +255,7 @@ class BlePhotoUploadService {
                 let startOff = (tag == 0x9286 && byteLen > 8) ? valueOff + 8 : valueOff
                 let len = (tag == 0x9286 && byteLen > 8) ? byteLen - 8 : byteLen
                 guard startOff + len <= bytes.count else { return nil }
-                return String(bytes: Array(bytes[startOff..<startOff + len]), encoding: .utf8)?
+                return String(bytes: Array(bytes[startOff ..< startOff + len]), encoding: .utf8)?
                     .trimmingCharacters(in: .init(charactersIn: "\0"))
             }
             // Follow Exif IFD pointer
@@ -272,8 +272,8 @@ class BlePhotoUploadService {
 
     private static func findBytes(_ needle: [UInt8], in haystack: [UInt8], from: Int) -> Int? {
         guard haystack.count >= needle.count else { return nil }
-        for i in from...(haystack.count - needle.count) {
-            if Array(haystack[i..<i + needle.count]) == needle { return i }
+        for i in from ... (haystack.count - needle.count) {
+            if Array(haystack[i ..< i + needle.count]) == needle { return i }
         }
         return nil
     }
@@ -298,8 +298,8 @@ class BlePhotoUploadService {
 
     private static func writeImuJsonToJpegData(_ jpegData: Data, imuJson: String) throws -> Data {
         guard let source = CGImageSourceCreateWithData(jpegData as CFData, nil),
-            let imageType = CGImageSourceGetType(source),
-            let cgImage = CGImageSourceCreateImageAtIndex(source, 0, nil)
+              let imageType = CGImageSourceGetType(source),
+              let cgImage = CGImageSourceCreateImageAtIndex(source, 0, nil)
         else {
             throw PhotoUploadError.decodingFailed
         }
@@ -373,8 +373,8 @@ class BlePhotoUploadService {
 
         // Find last Exif marker
         var lastExif = -1
-        for i in 0...(bytes.count - marker.count) {
-            if Array(bytes[i..<i + marker.count]) == marker { lastExif = i }
+        for i in 0 ... (bytes.count - marker.count) {
+            if Array(bytes[i ..< i + marker.count]) == marker { lastExif = i }
         }
         guard lastExif >= 0 else { return data }
 
@@ -383,7 +383,7 @@ class BlePhotoUploadService {
         while off + 8 <= bytes.count {
             let boxSize = Int(readU32BE(bytes, at: off))
             guard boxSize >= 8, off + boxSize <= bytes.count else { break }
-            let boxType = String(bytes: Array(bytes[off + 4..<off + 8]), encoding: .ascii) ?? ""
+            let boxType = String(bytes: Array(bytes[off + 4 ..< off + 8]), encoding: .ascii) ?? ""
             if boxType == "mdat" {
                 let payloadStart = off + 8
                 let payloadEnd = off + boxSize
@@ -393,7 +393,7 @@ class BlePhotoUploadService {
 
                 var result = Data()
                 // Everything up to mdat header
-                result.append(contentsOf: bytes[0..<off])
+                result.append(contentsOf: bytes[0 ..< off])
                 // New mdat box header with updated size
                 let newMdatSize = UInt32(8 + newPayloadLen)
                 result.append(UInt8((newMdatSize >> 24) & 0xFF))
@@ -401,7 +401,7 @@ class BlePhotoUploadService {
                 result.append(UInt8((newMdatSize >> 8) & 0xFF))
                 result.append(UInt8(newMdatSize & 0xFF))
                 result.append(contentsOf: [0x6D, 0x64, 0x61, 0x74]) // "mdat"
-                result.append(contentsOf: bytes[payloadStart..<payloadStart + newPayloadLen])
+                result.append(contentsOf: bytes[payloadStart ..< payloadStart + newPayloadLen])
                 return result
             }
             off += boxSize
@@ -824,7 +824,7 @@ private final class BleIncidentLogRelayEntry {
 // MARK: - CBCentralManagerDelegate
 
 extension MentraLive: CBCentralManagerDelegate {
-    // CoreBluetooth delivers these callbacks on `bluetoothQueue`; hop back before touching MainActor state.
+    /// CoreBluetooth delivers these callbacks on `bluetoothQueue`; hop back before touching MainActor state.
     nonisolated func centralManagerDidUpdateState(_ central: CBCentralManager) {
         let state = central.state
         DispatchQueue.main.async { [weak self] in
@@ -926,6 +926,18 @@ extension MentraLive: CBCentralManagerDelegate {
         }
     }
 
+    nonisolated func centralManager(
+        _: CBCentralManager, didUpdateANCSAuthorizationFor peripheral: CBPeripheral
+    ) {
+        DispatchQueue.main.async { [weak self] in
+            guard let self, peripheral === self.connectedPeripheral else { return }
+            Bridge.log(
+                "LIVE: ANCS authorization updated: \(peripheral.ancsAuthorized ? "authorized" : "not authorized")"
+            )
+            self.enableAncsRelayIfAuthorized()
+        }
+    }
+
     nonisolated func centralManager(
         _: CBCentralManager, didDisconnectPeripheral _: CBPeripheral, error _: Error?
     ) {
@@ -938,6 +950,8 @@ extension MentraLive: CBCentralManagerDelegate {
             self.connectedPeripheral = nil
             self.fullyBooted = false
             self.connected = false
+            self.glassesSessionId = nil // Fresh BLE session starts with no sid known
+            self.readinessCompletedThisBleSession = false
             self.updateConnectionState(ConnTypes.DISCONNECTED)
             self.rgbLedAuthorityClaimed = false
 
@@ -1095,6 +1109,10 @@ extension MentraLive: CBPeripheralDelegate {
                     Bridge.log("LIVE: 🎤 Enabled LC3 audio notifications")
                 }
 
+                // Authorization may complete before or after service discovery.
+                // This covers the former; the central-manager callback covers the latter.
+                self.enableAncsRelayIfAuthorized()
+
                 // Start readiness check loop
                 self.startSignalStrengthPolling()
                 self.startReadinessCheckLoop()
@@ -1213,6 +1231,7 @@ extension MentraLive: CBPeripheralDelegate {
 
                 if uuid == self.RX_CHAR_UUID, isNotifying {
                     Bridge.log("LIVE: 🔔 Ready to receive data via notifications")
+                    self.enableAncsRelayIfAuthorized()
                 }
             }
         }
@@ -1256,25 +1275,33 @@ class MentraLive: NSObject, SGCManager {
     // to avoid overloading the MCU. Set to false to allow simultaneous A2DP + LC3 mic.
     private let BLOCK_AUDIO_DUPLEX = false
     private static let voiceActivityDetectionSwitchType = 8
+    private static let loudnessGateSwitchType = 10
 
     var connectionState: String = ConnTypes.DISCONNECTED
 
     /// Mirrors Android `updateConnectionState` — RN home reads `glasses.connectionState` for reconnecting UI.
     private func updateConnectionState(_ state: String) {
+        if state == ConnTypes.DISCONNECTED {
+            // A manufacturing serial is session-bound. Clear it on disconnect so a previous
+            // pair's serial cannot be associated with the next connection. Connect must NOT
+            // clear it: DeviceManager.disconnect already wipes it before any new connection, and
+            // clearing on CONNECTED would wipe a still-valid serial mid-session when a same-link
+            // glasses_ready (e.g. ASG restart) re-publishes CONNECTED (iOS has no equal-state
+            // early return, unlike Android).
+            DeviceStore.shared.apply("glasses", "serialNumber", "")
+        }
         connectionState = state
         DeviceStore.shared.apply("glasses", "connectionState", state)
         // Drop OTA caches when fully disconnected — avoids leaking session/step state from
         // a previous pairing into the next one (would otherwise surface as wrong overall_percent
         // or stale lastBesOtaProgress on the next OTA).
         if state == ConnTypes.DISCONNECTED {
-            incomingChunkReassembler.clear()
-            peerWireProtocolVersion = 0
-            useBinaryWireProtocol = false
-            wireHandshakeQueued = false
-            peerK900Le = false
-            peerWireCapsBinary = false
-            peerFilePayloadV2 = false
-            BleJsonCompact.resetSession()
+            resetWireNegotiationState()
+            resetAncsRelayState()
+            // Queued writes are session-bound: transmitting them into the NEXT session
+            // (e.g. a stale handshake whose reply activates v2 before the new session
+            // negotiated) is the bug class this clear removes.
+            Task { await commandQueue.removeAll() }
             stopSignalStrengthPolling()
             DeviceStore.shared.apply("glasses", "signalStrength", -1)
             DeviceStore.shared.apply("glasses", "signalStrengthUpdatedAt", 0)
@@ -1298,6 +1325,7 @@ class MentraLive: NSObject, SGCManager {
     func sendText(_ text: String) async {
         await sendTextWall(text)
     }
+
     func sendTextWall(_: String) async {}
     func ping() {
         Bridge.log("LIVE: ping()")
@@ -1410,6 +1438,10 @@ class MentraLive: NSObject, SGCManager {
     // So we temporarily suspend the LC3 mic during phone audio playback
     private var micIntentEnabled = false // User/system WANTS mic enabled
     private var micSuspendedForAudio = false // Mic temporarily suspended due to phone audio
+    var isMicSuspendedForAudio: Bool {
+        micSuspendedForAudio
+    }
+
     private var phoneAudioMonitor: PhoneAudioMonitor?
 
     // Timing Constants
@@ -1453,12 +1485,36 @@ class MentraLive: NSObject, SGCManager {
     private var peerWireProtocolVersion = 0
     private var useBinaryWireProtocol = false
     private var wireHandshakeQueued = false
+    private var wireHandshakeAttempts = 0
+    /// Session generation in which the LAST outgoing v2 handshake was sent; a reply only
+    /// activates v2 when it answers a handshake from the CURRENT epoch (see PendingMessage
+    /// .generation for the queue-side guard).
+    private var wireHandshakeSentGeneration = -1
+    /// Bumped on every BLE session reset; scheduled handshake-retry callbacks capture it
+    /// and no-op if the session changed, so a timer from a dead session can't poke a new one.
+    private var wireSessionGeneration = 0
+    // Grace period before an unanswered BLE wire v2 handshake is re-armed for retry,
+    // and the per-session cap on automatic retries (see sendWireHandshake).
+    private static let wireHandshakeRetryGraceSeconds: TimeInterval = 5
+    private static let wireHandshakeMaxAttempts = 3
     // Negotiated K900 STRING length endianness for the phone<->glasses BLE link. Defaults to legacy
     // big-endian; upgraded to little-endian only when the glasses advertise wire_caps.k900_le (or a
     // v2 binary handshake succeeds, which implies wire-v2 LE).
     private var peerK900Le = false
+    private var ancsAppIdentifiers: [UInt32: String] = [:]
+    private var ancsRelayEnableRequested = false
     private var peerWireCapsBinary = false
     private var peerFilePayloadV2 = false
+    /// Last observed glasses process session id (`sid` in glasses_ready / version_info_1).
+    /// The BES keeps the BLE link alive across asg_client restarts, so transport state
+    /// cannot signal a restart - a CHANGED (or newly appearing) sid is the restart signal.
+    /// Nil = no sid observed this BLE session (legacy glasses, or none seen yet).
+    private var glassesSessionId: String?
+    // True once a glasses_ready completed on THIS physical BLE session. Unlike
+    // fullyBooted, this never flaps on sr_hrt ready=0 heartbeats — it only resets with
+    // the physical connection — so a first-seen sid after an upgrade OTA cannot be
+    // mistaken for a fresh pairing just because a not-ready heartbeat slipped in first.
+    private var readinessCompletedThisBleSession = false
     private var globalMessageId = 0
     private var lastReceivedMessageId = 0
     private var bleWriteTraceSequence = 0
@@ -1705,7 +1761,7 @@ class MentraLive: NSObject, SGCManager {
         let bleImgId =
             "I" + String(format: "%09d", Int(Date().timeIntervalSince1970 * 1000) % 100_000_000)
         json["bleImgId"] = bleImgId
-        json["transferMethod"] = "auto"
+        json["transferMethod"] = request.transferMethod
 
         if let webhookUrl = request.webhookUrl, !webhookUrl.isEmpty {
             json["webhookUrl"] = webhookUrl
@@ -1746,7 +1802,9 @@ class MentraLive: NSObject, SGCManager {
         }
         request.appendScanFields(to: &json)
 
-        Bridge.log("LIVE: PHOTO PIPELINE [5b/6] take_photo JSON ready bleImgId=\(bleImgId) transferMethod=auto")
+        Bridge.log(
+            "LIVE: PHOTO PIPELINE [5b/6] take_photo JSON ready bleImgId=\(bleImgId) transferMethod=\(request.transferMethod)"
+        )
         Bridge.log("LIVE: PHOTO PIPELINE [6/6] Dispatching take_photo to sendJson()")
 
         sendJson(json, wakeUp: true)
@@ -1755,11 +1813,14 @@ class MentraLive: NSObject, SGCManager {
     func warmUpCamera(
         requestId: String,
         size: PhotoSize,
+        mode: PhotoMode = .photo,
         exposureTimeNs: Double?,
-        durationMs: Int
+        durationMs: Int,
+        zsl: Bool? = nil,
+        mfnr: Bool? = nil
     ) {
         Bridge.log(
-            "LIVE: warmUpCamera() entry requestId=\(requestId) size=\(size.rawValue) durationMs=\(durationMs)"
+            "LIVE: warmUpCamera() entry requestId=\(requestId) size=\(size.rawValue) mode=\(mode.rawValue) durationMs=\(durationMs)"
         )
 
         let allowedSizes = ["low", "medium", "high", "max"]
@@ -1768,16 +1829,30 @@ class MentraLive: NSObject, SGCManager {
             "type": "camera_warm_up",
             "requestId": requestId,
             "size": allowedSizes.contains(sizeRaw) ? sizeRaw : "medium",
+            "mode": mode.rawValue,
             "durationMs": durationMs > 0 ? durationMs : 15000,
         ]
 
         if let e = exposureTimeNs, e.isFinite, e > 0, e <= Double(Int64.max) {
             json["exposureTimeNs"] = Int64(e)
         }
+        if let mfnr {
+            json["mfnr"] = mfnr
+        }
+        if let zsl {
+            json["zsl"] = zsl
+        }
 
         sendJson(json, wakeUp: true)
     }
 
+    func stopCameraWarmUp(requestId: String) {
+        sendJson(
+            ["type": "camera_warm_up_stop", "requestId": requestId],
+            wakeUp: true
+        )
+    }
+
     func startStream(_ message: [String: Any]) {
         Bridge.log("Starting stream")
         var json = message
@@ -1819,17 +1894,24 @@ class MentraLive: NSObject, SGCManager {
     // MARK: - Command Queue
 
     class PendingMessage {
-        init(data: Data, id: String, retries: Int, trace: BleWriteTrace? = nil) {
+        init(data: Data, id: String, retries: Int, trace: BleWriteTrace? = nil, generation: Int = 0) {
             self.data = data
             self.id = id
             self.retries = retries
             self.trace = trace
+            self.generation = generation
         }
 
         let data: Data
         let retries: Int
         let id: String
         let trace: BleWriteTrace?
+        /// Wire-session generation at enqueue time; the drain loop drops entries from a
+        /// previous session so a stale write (worst case: an old handshake whose reply
+        /// would activate v2 pre-negotiation) can never cross a session boundary. This is
+        /// the deterministic guard - the async removeAll() on disconnect is best-effort
+        /// cleanup that may land after a reconnect has already resumed the drain loop.
+        let generation: Int
     }
 
     struct OutgoingBleCommandTraceInfo {
@@ -1875,6 +1957,10 @@ class MentraLive: NSObject, SGCManager {
             guard !commands.isEmpty else { return nil }
             return commands.removeFirst()
         }
+
+        func removeAll() {
+            commands.removeAll()
+        }
     }
 
     private func setupCommandQueue() {
@@ -1884,7 +1970,12 @@ class MentraLive: NSObject, SGCManager {
                 let pendingIsNil = await MainActor.run { self.pending == nil }
                 if pendingIsNil {
                     if let command = await self.commandQueue.dequeue() {
-                        await self.processSendQueue(command)
+                        let currentGeneration = await MainActor.run { self.wireSessionGeneration }
+                        if command.generation != currentGeneration {
+                            Bridge.log("LIVE: Dropping stale queued write from a previous session epoch (id: \(command.id))")
+                        } else {
+                            await self.processSendQueue(command)
+                        }
                     }
                 }
                 try? await Task.sleep(nanoseconds: 100_000_000) // 100ms
@@ -1960,7 +2051,8 @@ class MentraLive: NSObject, SGCManager {
                 data: pendingMessage.data,
                 id: pendingMessage.id,
                 retries: pendingMessage.retries + 1,
-                trace: pendingMessage.trace
+                trace: pendingMessage.trace,
+                generation: pendingMessage.generation
             )
 
             // Push to front of queue for immediate retry
@@ -2054,7 +2146,36 @@ class MentraLive: NSObject, SGCManager {
         // Set connection timeout
         startConnectionTimeout()
 
-        centralManager?.connect(peripheral, options: nil)
+        // ANCS is hosted by iOS and is only exposed to authorized accessories.
+        // Requiring it at connect time lets the system complete that authorization
+        // flow before the glasses subscribe to the ANCS characteristics.
+        centralManager?.connect(
+            peripheral,
+            options: [CBConnectPeripheralOptionRequiresANCS: true]
+        )
+    }
+
+    /// Opt the firmware into ANCS only after iOS has authorized this accessory.
+    /// Old firmware safely ignores the command, while new firmware stays inert
+    /// for old mobile clients that never send it.
+    private func enableAncsRelayIfAuthorized() {
+        guard !ancsRelayEnableRequested,
+              let peripheral = connectedPeripheral,
+              txCharacteristic != nil,
+              rxCharacteristic?.isNotifying == true,
+              peripheral.ancsAuthorized
+        else {
+            return
+        }
+
+        let command: [String: Any] = [
+            "C": "cs_ancs",
+            "B": ["enabled": 1],
+        ]
+        if sendRawK900Command(command) {
+            ancsRelayEnableRequested = true
+            Bridge.log("LIVE: Requested ANCS relay from compatible firmware")
+        }
     }
 
     private func handleReconnection() {
@@ -2070,6 +2191,10 @@ class MentraLive: NSObject, SGCManager {
             updateConnectionState(ConnTypes.DISCONNECTED)
             connected = false
             fullyBooted = false
+            glassesSessionId = nil
+            readinessCompletedThisBleSession = false
+            readinessCompletedThisBleSession = false // Fresh BLE session starts with no sid known
+            readinessCompletedThisBleSession = false
             return
         }
 
@@ -2320,7 +2445,19 @@ class MentraLive: NSObject, SGCManager {
 
         switch type {
         case "glasses_ready":
+            // glasses_ready is a REMOTE wire-session reset: the glasses ran
+            // onTransportReset() before sending it, so their side is back on legacy
+            // framing regardless of what this side negotiated earlier. Start a fresh
+            // wire epoch (clears v2-active state that would otherwise gate the
+            // handshake off), then negotiate from the caps this message advertises.
+            resetWireNegotiationState()
             parsePeerWireCaps(json)
+            maybeSendWireHandshake()
+            // Record the session id BEFORE marking ready: an unsolicited glasses_ready
+            // already runs this full remote-reset flow, so recording (not re-triggering)
+            // is correct here; version_info detection covers the restart case.
+            if let sid = json["sid"] as? String, !sid.isEmpty { glassesSessionId = sid }
+            readinessCompletedThisBleSession = true
             handleGlassesReady()
 
         case "battery_status":
@@ -2355,7 +2492,7 @@ class MentraLive: NSObject, SGCManager {
             } else if connected {
                 DeviceStore.shared.apply("glasses", "wifiError", "")
             }
-            updateWifiStatus(connected: connected, ssid: ssid, ip: ip)
+            updateWifiStatus(connected: connected, ssid: ssid, ip: ip, error: wifiError.isEmpty ? nil : wifiError)
 
         case "hotspot_status_update":
             let enabled = json["hotspot_enabled"] as? Bool ?? false
@@ -2582,7 +2719,7 @@ class MentraLive: NSObject, SGCManager {
         default:
             // Flexible version_info parsing - handle any version_info* message
             if type.hasPrefix("version_info") {
-                Bridge.log("LIVE: Received \(type): \(json)")
+                Bridge.log("LIVE: Received \(type)")
 
                 // Extract all fields from JSON (except "type")
                 var fields: [String: Any] = [:]
@@ -2599,8 +2736,6 @@ class MentraLive: NSObject, SGCManager {
                 if let buildNumber = fields["build_number"] as? String {
                     isNewVersion = (Int(buildNumber) ?? 0) >= 5
                     DeviceStore.shared.apply("glasses", "buildNumber", buildNumber)
-                    parsePeerWireCaps(json)
-                    maybeSendWireHandshake()
                 }
                 if let deviceModel = fields["device_model"] as? String {
                     DeviceStore.shared.apply("glasses", "deviceModel", deviceModel)
@@ -2628,10 +2763,24 @@ class MentraLive: NSObject, SGCManager {
                 if let bluetoothMacAddress = fields["bt_mac_address"] as? String {
                     DeviceStore.shared.apply("glasses", "bluetoothMacAddress", bluetoothMacAddress)
                 }
+                if let serialNumber = fields["serial_number"] as? String, !serialNumber.isEmpty {
+                    DeviceStore.shared.apply("glasses", "serialNumber", serialNumber)
+                }
                 if let systemTimeMs = fields["system_time_ms"] as? NSNumber {
                     DeviceStore.shared.apply("glasses", "systemTimeMs", systemTimeMs.int64Value)
                 }
 
+                // Negotiate wire caps from ANY version_info chunk, not only the one
+                // carrying build_number: the glasses put wire_caps in version_info_3
+                // (firmware chunk) while build_number travels in version_info_1, so
+                // gating negotiation on build_number silently discards the caps.
+                // parsePeerWireCaps no-ops without a wire_caps key and
+                // maybeSendWireHandshake gates on caps + build + not-yet-queued, so
+                // running them per chunk is safe.
+                parsePeerWireCaps(json)
+                maybeSendWireHandshake()
+                handleGlassesSessionId(json)
+
                 Bridge.sendVersionInfo(fields)
             } else {
                 Bridge.log("Unhandled message type: \(type)")
@@ -2729,6 +2878,11 @@ class MentraLive: NSObject, SGCManager {
         }
 
         switch command {
+        case "sr_ancs":
+            if let body = k900ParseBody(json["B"]) {
+                processAncsRelay(body)
+            }
+
         case "sr_hrt":
             if let bodyObj = json["B"] as? [String: Any] {
                 let readyResponse = bodyObj["ready"] as? Int ?? 0
@@ -2885,7 +3039,17 @@ class MentraLive: NSObject, SGCManager {
 
                 let syntheticStatus: String
                 if besOtaStatus == "FINISHED" {
-                    syntheticStatus = "step_complete"
+                    // The glasses power-cycle right after the final BES tick, so a session
+                    // whose BES step is the LAST step never gets a follow-up ota_status from
+                    // the glasses — consumers mapping on this synthetic status would otherwise
+                    // never see a terminal state. Emit "complete" for the final step;
+                    // mid-session BES steps keep "step_complete" so session-level trackers
+                    // advance normally. Unknown sessions (cachedOtaTotalSteps == 0, e.g.
+                    // legacy glasses that never sent an ota_status) conservatively keep
+                    // "step_complete".
+                    syntheticStatus = (cachedOtaTotalSteps > 0 && cachedOtaCurrentStep >= cachedOtaTotalSteps)
+                        ? "complete"
+                        : "step_complete"
                 } else if besOtaStatus == "FAILED" {
                     syntheticStatus = "failed"
                 } else {
@@ -2933,11 +3097,87 @@ class MentraLive: NSObject, SGCManager {
         }
     }
 
+    /// Convert a Mentra Live firmware ANCS relay packet into the same native
+    /// events used by Android's NotificationListenerService.
+    private func processAncsRelay(_ body: [String: Any]) {
+        guard let event = body["event"] as? String,
+              let uid = (body["uid"] as? NSNumber)?.uint32Value
+        else {
+            Bridge.log("LIVE: Ignoring malformed ANCS relay packet")
+            return
+        }
+
+        let notificationId = "ancs-\(uid)"
+        let appIdentifier = body["appIdentifier"] as? String ?? ""
+
+        if event == "removed" {
+            let removedAppIdentifier = ancsAppIdentifiers.removeValue(forKey: uid) ?? appIdentifier
+            Bridge.sendTypedMessage(
+                "phone_notification_dismissed",
+                body: [
+                    "notificationId": notificationId,
+                    "notificationKey": notificationId,
+                    "packageName": removedAppIdentifier,
+                    "timestamp": Int64(Date().timeIntervalSince1970 * 1000),
+                ]
+            )
+            return
+        }
+
+        guard event == "added" || event == "modified" else {
+            Bridge.log("LIVE: Ignoring unknown ANCS event: \(event)")
+            return
+        }
+
+        let title = body["title"] as? String ?? ""
+        let subtitle = body["subtitle"] as? String ?? ""
+        let message = body["message"] as? String ?? ""
+        let content = [subtitle, message]
+            .filter { !$0.isEmpty }
+            .joined(separator: "\n")
+        let flags = (body["flags"] as? NSNumber)?.uint8Value ?? 0
+        if !appIdentifier.isEmpty {
+            ancsAppIdentifiers[uid] = appIdentifier
+        }
+
+        Bridge.sendTypedMessage(
+            "phone_notification",
+            body: [
+                "notificationId": notificationId,
+                "app": appIdentifier,
+                "title": title,
+                "content": content,
+                "priority": (flags & 0x02) != 0 ? "1" : "0",
+                "timestamp": ancsTimestamp(body["date"] as? String),
+                "packageName": appIdentifier,
+            ]
+        )
+    }
+
+    private func ancsTimestamp(_ value: String?) -> Int64 {
+        guard let value, !value.isEmpty else {
+            return Int64(Date().timeIntervalSince1970 * 1000)
+        }
+
+        let formatter = DateFormatter()
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.calendar = Calendar(identifier: .gregorian)
+        formatter.timeZone = .current
+        formatter.dateFormat = "yyyyMMdd'T'HHmmss"
+        guard let date = formatter.date(from: value) else {
+            return Int64(Date().timeIntervalSince1970 * 1000)
+        }
+        return Int64(date.timeIntervalSince1970 * 1000)
+    }
+
     // commands to send to the glasses:
 
-    func requestWifiScan() {
+    func requestWifiScan(scanId: String?) {
         Bridge.log("LIVE: Requesting WiFi scan from glasses")
-        let json: [String: Any] = ["type": "request_wifi_scan"]
+        var json: [String: Any] = ["type": "request_wifi_scan"]
+        if let scanId, !scanId.isEmpty {
+            json["scanId"] = scanId
+        }
         sendJson(json, wakeUp: true)
     }
 
@@ -3084,7 +3324,8 @@ class MentraLive: NSObject, SGCManager {
             "timestamp": Int(Date().timeIntervalSince1970 * 1000),
         ]
         if let otaVersionUrl = otaVersionUrl?.trimmingCharacters(in: .whitespacesAndNewlines),
-           !otaVersionUrl.isEmpty {
+           !otaVersionUrl.isEmpty
+        {
             json["ota_version_url"] = otaVersionUrl
         }
 
@@ -3129,6 +3370,10 @@ class MentraLive: NSObject, SGCManager {
         DeviceStore.shared.apply("glasses", "appVersion", "")
         DeviceStore.shared.apply("glasses", "besFirmwareVersion", "")
         DeviceStore.shared.apply("glasses", "mtkFirmwareVersion", "")
+        // Modern ASG builds omit ota_version_url entirely (the phone owns manifest selection),
+        // and the chunked parser only writes present fields — clear it here so a URL reported
+        // by a previous build cannot leak into this session.
+        DeviceStore.shared.apply("glasses", "otaVersionUrl", "")
         Bridge.log("LIVE: Cleared cached version_info fields before refresh")
 
         // Perform SOC-dependent initialization
@@ -3177,7 +3422,8 @@ class MentraLive: NSObject, SGCManager {
         }
 
         let scanComplete = json["scan_complete"] as? Bool ?? json["scanComplete"] as? Bool ?? false
-        Bridge.updateWifiScanResults(networks, scanComplete: scanComplete)
+        let scanId = (json["scanId"] as? String).flatMap { $0.isEmpty ? nil : $0 }
+        Bridge.updateWifiScanResults(networks, scanComplete: scanComplete, scanId: scanId)
     }
 
     private func handleButtonPress(_ json: [String: Any]) {
@@ -3196,12 +3442,16 @@ class MentraLive: NSObject, SGCManager {
         let otaVersionUrl = json["ota_version_url"] as? String ?? ""
         let firmwareVersion = json["firmware_version"] as? String ?? ""
         let bluetoothMacAddress = json["bt_mac_address"] as? String ?? ""
+        let serialNumber = json["serial_number"] as? String ?? ""
 
         DeviceStore.shared.apply("glasses", "appVersion", appVersion)
         DeviceStore.shared.apply("glasses", "buildNumber", buildNumber)
         DeviceStore.shared.apply("glasses", "otaVersionUrl", otaVersionUrl)
         DeviceStore.shared.apply("glasses", "firmwareVersion", firmwareVersion)
         DeviceStore.shared.apply("glasses", "bluetoothMacAddress", bluetoothMacAddress)
+        if !serialNumber.isEmpty {
+            DeviceStore.shared.apply("glasses", "serialNumber", serialNumber)
+        }
         isNewVersion = (Int(buildNumber) ?? 0) >= 5
         maybeSendWireHandshake()
         DeviceStore.shared.apply("glasses", "deviceModel", deviceModel)
@@ -3803,8 +4053,8 @@ class MentraLive: NSObject, SGCManager {
         responseBody: String
     ) {
         guard !responseBody.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty,
-            let data = responseBody.data(using: .utf8),
-            let response = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
+              let data = responseBody.data(using: .utf8),
+              let response = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
         else {
             return
         }
@@ -3861,8 +4111,12 @@ class MentraLive: NSObject, SGCManager {
 
     func queueSend(_ data: Data, id: String, trace: BleWriteTrace?) {
         let significantQueueSize = SIGNIFICANT_BLE_TRACE_QUEUE_SIZE
+        // Capture the epoch at enqueue-request time: the Task body may run after a
+        // session reset, and a pre-reset payload stamped with the new generation would
+        // defeat the stale-write guard in the drain loop.
+        let generation = wireSessionGeneration
         Task {
-            let queueSize = await commandQueue.enqueue(PendingMessage(data: data, id: id, retries: 0, trace: trace))
+            let queueSize = await commandQueue.enqueue(PendingMessage(data: data, id: id, retries: 0, trace: trace, generation: generation))
             guard trace != nil, queueSize >= significantQueueSize else {
                 return
             }
@@ -4092,19 +4346,47 @@ class MentraLive: NSObject, SGCManager {
         }
         Bridge.log("LIVE: Sending BLE wire v2 handshake")
         wireHandshakeQueued = true
+        wireHandshakeSentGeneration = wireSessionGeneration
         queueSend(packed, id: "-1")
+        // The handshake and its reply are fire-and-forget binary frames with no ACK
+        // tracking; if either is lost, wireHandshakeQueued would block every future
+        // attempt and the session would silently stay on the legacy string wire.
+        // Re-arm after a grace period so negotiation can retry, bounded per session
+        // so a peer that advertises binary but never answers doesn't get pinged
+        // forever (later caps/version triggers may still retry explicitly).
+        wireHandshakeAttempts += 1
+        let scheduledGeneration = wireSessionGeneration
+        DispatchQueue.main.asyncAfter(deadline: .now() + Self.wireHandshakeRetryGraceSeconds) { [weak self] in
+            guard let self else { return }
+            guard scheduledGeneration == self.wireSessionGeneration else { return }
+            if self.wireHandshakeQueued, self.peerWireProtocolVersion < BleWireProtocol.protocolV2 {
+                Bridge.log(
+                    "LIVE: BLE wire v2 handshake unanswered after \(Self.wireHandshakeRetryGraceSeconds)s " +
+                        "(attempt \(self.wireHandshakeAttempts)/\(Self.wireHandshakeMaxAttempts)) - re-arming"
+                )
+                self.wireHandshakeQueued = false
+                if self.wireHandshakeAttempts < Self.wireHandshakeMaxAttempts {
+                    self.maybeSendWireHandshake()
+                }
+            }
+        }
     }
 
     private func activateBinaryWireV2Session(logMessage: String) {
         peerWireProtocolVersion = BleWireProtocol.protocolV2
         useBinaryWireProtocol = true
         wireHandshakeQueued = false
+        wireHandshakeAttempts = 0
         peerK900Le = true
         BleJsonCompact.markSessionConnected(epochMs: Int64(Date().timeIntervalSince1970 * 1000))
         Bridge.log(logMessage)
     }
 
     private func handlePeerWireHandshake() {
+        if wireHandshakeSentGeneration != wireSessionGeneration {
+            Bridge.log("LIVE: Ignoring wire v2 handshake reply from a previous session epoch")
+            return
+        }
         activateBinaryWireV2Session(logMessage: "LIVE: Peer confirmed BLE wire protocol v2")
     }
 
@@ -4624,12 +4906,12 @@ class MentraLive: NSObject, SGCManager {
         }
     }
 
-    private func updateWifiStatus(connected: Bool, ssid: String, ip: String) {
+    private func updateWifiStatus(connected: Bool, ssid: String, ip: String, error: String? = nil) {
         Bridge.log("LIVE: 🌐 Updating WiFi status - connected: \(connected), ssid: \(ssid)")
         DeviceStore.shared.apply("glasses", "wifiConnected", connected)
         DeviceStore.shared.apply("glasses", "wifiSsid", ssid)
         DeviceStore.shared.apply("glasses", "wifiLocalIp", ip)
-        emitWifiStatusChange()
+        emitWifiStatusChange(error: error)
     }
 
     private func updateHotspotStatus(enabled: Bool, ssid: String, password: String, ip: String) {
@@ -4815,6 +5097,7 @@ class MentraLive: NSObject, SGCManager {
         readinessCheckCounter = 0
         fullyBooted = false
         connected = false
+        glassesSessionId = nil
 
         Bridge.log("LIVE: 🔄 Starting glasses SOC readiness check loop")
 
@@ -4923,8 +5206,8 @@ class MentraLive: NSObject, SGCManager {
     //   emitEvent("BatteryLevelEvent", body: eventBody)
     // }
 
-    private func emitWifiStatusChange() {
-        Bridge.sendWifiStatusChange(connected: wifiConnected, ssid: wifiSsid, localIp: wifiLocalIp)
+    private func emitWifiStatusChange(error: String? = nil) {
+        Bridge.sendWifiStatusChange(connected: wifiConnected, ssid: wifiSsid, localIp: wifiLocalIp, error: error)
     }
 
     private func emitHotspotStatusChange() {
@@ -5006,14 +5289,8 @@ class MentraLive: NSObject, SGCManager {
 
         // Stop all timers
         stopAllTimers()
-        incomingChunkReassembler.clear()
-        peerWireProtocolVersion = 0
-        useBinaryWireProtocol = false
-        wireHandshakeQueued = false
-        peerK900Le = false
-        peerWireCapsBinary = false
-        peerFilePayloadV2 = false
-        BleJsonCompact.resetSession()
+        resetWireNegotiationState()
+        Task { await commandQueue.removeAll() } // stale writes die with the session
         closeL2capFileChannel()
 
         // Disconnect BLE
@@ -5106,6 +5383,77 @@ extension MentraLive {
      * per-link endianness and binary support. Missing wire_caps leaves the legacy defaults (BE, no
      * binary) untouched so older glasses keep working.
      */
+    /// Drop every negotiated wire-session artifact and bump the session generation so
+    /// scheduled callbacks from the old session stand down. Called on BLE disconnect and on
+    /// glasses_ready: the glasses run onTransportReset() before sending glasses_ready, so a
+    /// mid-link ASG restart (no BLE disconnect) resets THEIR side to legacy framing - the
+    /// phone must treat every glasses_ready as a new wire epoch and renegotiate (bounded by
+    /// the per-session handshake attempt cap) instead of trusting stale v2-active state.
+    private func resetWireNegotiationState() {
+        incomingChunkReassembler.clear()
+        peerWireProtocolVersion = 0
+        useBinaryWireProtocol = false
+        wireHandshakeQueued = false
+        wireHandshakeAttempts = 0
+        wireSessionGeneration += 1
+        peerK900Le = false
+        peerWireCapsBinary = false
+        peerFilePayloadV2 = false
+        BleJsonCompact.resetSession()
+        wireHandshakeSentGeneration = -1
+    }
+
+    /// ANCS notification IDs live for the BLE link, not the wire epoch. A
+    /// glasses_ready message may reset wire negotiation without disconnecting,
+    /// so clear this state only when the BLE session itself ends.
+    private func resetAncsRelayState() {
+        ancsAppIdentifiers.removeAll()
+        ancsRelayEnableRequested = false
+    }
+
+    /// Sends phone_ready to (re)start the glasses-driven readiness flow.
+    private func sendPhoneReady(reason: String) {
+        Bridge.log("LIVE: 📱 Sending phone_ready to glasses (\(reason)) - waiting for glasses_ready response")
+        let readyMsg: [String: Any] = [
+            "type": "phone_ready",
+            "timestamp": Int64(Date().timeIntervalSince1970 * 1000),
+        ]
+        sendJson(readyMsg, wakeUp: true)
+    }
+
+    /// Tracks the glasses process session id (`sid`) and re-runs the phone-driven readiness
+    /// flow when it changes under a live BLE link. The BES holds the link across asg_client
+    /// restarts (APK OTA, crash recovery), so a restarted glasses process is invisible to
+    /// transport state; the sid is the explicit protocol signal.
+    ///
+    /// Tri-state by design (retro-compat with pre-sid glasses builds): no `sid` key = legacy
+    /// glasses, do nothing; sid appearing on an ESTABLISHED session (upgrade OTA from a
+    /// pre-sid build) or differing from the recorded one = restart; same sid = no action.
+    /// A restart is a LOGICAL session reset: send phone_ready immediately (bypassing the
+    /// sr_hrt heartbeat's stale-readiness suppression); the returning glasses_ready runs
+    /// the full existing remote-wire-reset flow. fullyBooted is deliberately untouched -
+    /// the physical link never dropped, so the connection UI must not flap.
+    private func handleGlassesSessionId(_ json: [String: Any]) {
+        guard let sid = json["sid"] as? String, !sid.isEmpty else { return }
+        let previous = glassesSessionId
+        if sid == previous { return }
+        glassesSessionId = sid
+        if previous == nil, !readinessCompletedThisBleSession {
+            // First sid of a fresh BLE session before readiness completes: the normal
+            // pairing/readiness flow is already running - just record it.
+            return
+        }
+        Bridge.log(
+            "LIVE: 🔁 Glasses session changed (\(previous ?? "<pre-sid build>") -> \(sid)) - " +
+                "asg restarted under a live link, re-running readiness"
+        )
+        sendPhoneReady(reason: "glasses session changed")
+        Bridge.sendTypedMessage(
+            "glasses_session_changed",
+            body: ["previous_sid": previous ?? "", "sid": sid]
+        )
+    }
+
     private func parsePeerWireCaps(_ json: [String: Any]) {
         guard let caps = json["wire_caps"] as? [String: Any] else { return }
         if (caps["k900_le"] as? Bool) == true {
@@ -5778,6 +6126,9 @@ extension MentraLive {
 
         // Send glasses-side Voice Activity Detection setting.
         sendVoiceActivityDetectionSetting()
+
+        // Send glasses-side loudness / Barrier gate setting.
+        sendLoudnessGateSetting()
     }
 
     func sendVoiceActivityDetectionSetting() {
@@ -5814,6 +6165,38 @@ extension MentraLive {
         }
     }
 
+    func sendLoudnessGateSetting() {
+        let enabled = DeviceStore.shared.get("bluetooth", "loudness_gate_enabled") as? Bool
+            ?? BluetoothSdkDefaults.loudnessGateEnabled
+        Bridge.log("LIVE: 🎚️ Sending loudness/Barrier gate setting to glasses: \(enabled)")
+
+        guard connectedPeripheral != nil, txCharacteristic != nil else {
+            Bridge.log("Cannot send loudness gate setting - BLE write path not ready")
+            return
+        }
+
+        do {
+            let bodyData = try JSONSerialization.data(withJSONObject: [
+                "type": Self.loudnessGateSwitchType,
+                "switch": enabled ? 1 : 0,
+            ])
+            guard let bodyString = String(data: bodyData, encoding: .utf8) else {
+                Bridge.log("LIVE: Failed to encode loudness gate payload")
+                return
+            }
+            let command: [String: Any] = [
+                "C": "cs_swit",
+                "V": 1,
+                "B": bodyString,
+            ]
+            if !sendRawK900Command(command, wakeUp: true) {
+                Bridge.log("LIVE: Failed to send loudness gate setting command")
+            }
+        } catch {
+            Bridge.log("LIVE: Error encoding loudness gate payload: \(error)")
+        }
+    }
+
     func sendButtonVideoRecordingSettings() {
         let settings =
             DeviceStore.shared.get("bluetooth", "button_video_settings") as? [String: Any] ?? [
@@ -5879,11 +6262,12 @@ extension MentraLive {
     }
 
     func sendButtonPhotoSettings() {
+        let legacyZslMfnr = DeviceStore.shared.get("bluetooth", "button_photo_zsl_mfnr") as? Bool
         let size = (DeviceStore.shared.get("bluetooth", "button_photo_size") as? String).flatMap { rawSize in
             rawSize.isEmpty ? nil : PhotoSize(normalizedRawValue: rawSize)
         }
-        let mfnr = DeviceStore.shared.get("bluetooth", "button_photo_mfnr") as? Bool
-        let zsl = DeviceStore.shared.get("bluetooth", "button_photo_zsl") as? Bool
+        let mfnr = DeviceStore.shared.get("bluetooth", "button_photo_mfnr") as? Bool ?? legacyZslMfnr
+        let zsl = DeviceStore.shared.get("bluetooth", "button_photo_zsl") as? Bool ?? legacyZslMfnr
         let noiseReduction = DeviceStore.shared.get("bluetooth", "button_photo_noise_reduction") as? Bool
         let edgeEnhancement = DeviceStore.shared.get("bluetooth", "button_photo_edge_enhancement") as? Bool
         let ispDigitalGain = DeviceStore.shared.get("bluetooth", "button_photo_isp_digital_gain") as? Int
@@ -6001,7 +6385,7 @@ extension MentraLive {
 
     func sendCameraFovSetting() {
         let settings = DeviceStore.shared.get("bluetooth", "camera_fov") as? [String: Any] ?? ["fov": 118, "roi_position": 0]
-        let fov = settings["fov"] as? Int ?? 118
+        let fov = settings["fov"] as? Int ?? CameraFov.defaultFov
         let roiPosition = settings["roi_position"] as? Int ?? 0
         sendCameraFovSetting(requestId: nil, fov: fov, roiPosition: roiPosition)
     }
@@ -6027,6 +6411,39 @@ extension MentraLive {
         sendJson(json, wakeUp: true)
     }
 
+    func sendCameraFovOverride(
+        requestId: String,
+        leaseId: String,
+        fov: Int,
+        roiPosition: Int,
+        ttlMs: Int
+    ) {
+        sendJson(
+            [
+                "type": "camera_fov_override",
+                "request_id": requestId,
+                "params": [
+                    "lease_id": leaseId,
+                    "fov": fov,
+                    "roi_position": roiPosition,
+                    "ttl_ms": ttlMs,
+                ],
+            ],
+            wakeUp: true
+        )
+    }
+
+    func releaseCameraFovOverride(requestId: String, leaseId: String) {
+        sendJson(
+            [
+                "type": "camera_fov_override_release",
+                "request_id": requestId,
+                "params": ["lease_id": leaseId],
+            ],
+            wakeUp: true
+        )
+    }
+
     func sendCameraTuningConfig(requestId: String?, anrOn: Bool, gainOn: Bool) {
         Bridge.log("Sending camera tuning config: anr=\(anrOn), gain=\(gainOn)")