@mentra/bluetooth-sdk 3.3.0-dev.775 → 3.3.0-dev.784

package/android/src/main/java/com/mentra/bluetoothsdk/BluetoothSdkModule.kt

@@ -617,7 +617,7 @@ class BluetoothSdkModule : Module() {
         // MARK: - Incident Reporting
 
         SdkAsyncFunction("sendIncidentId") { incidentId: String, apiBaseUrl: String? ->
-            sdk?.sendIncidentId(incidentId, apiBaseUrl)
+            requireSdk().sendIncidentId(incidentId, apiBaseUrl)
         }
 
         // MARK: - Native Notification Centre

package/android/src/main/java/com/mentra/bluetoothsdk/DeviceManager.kt

@@ -1989,8 +1989,11 @@ class DeviceManager internal constructor(initializeHardware: Boolean) {
         sgc?.requestSavedWifiNetworks(requestId, sid) ?: false
 
     fun sendIncidentId(incidentId: String, apiBaseUrl: String? = null) {
+        val driver = sgc ?: throw BluetoothSdkException(
+            "glasses_not_connected", "Cannot request incident logs because glasses are not connected.",
+        )
         Bridge.log("MAN: Sending incidentId to glasses for log upload: $incidentId")
-        sgc?.sendIncidentId(incidentId, apiBaseUrl)
+        driver.sendIncidentId(incidentId, apiBaseUrl)
     }
 
     /** Push a notification into the glasses' own notification centre; rejects unsupported or disconnected devices. */

package/android/src/main/java/com/mentra/bluetoothsdk/GeneratedReleaseMetadata.kt

@@ -3,9 +3,9 @@ package com.mentra.bluetoothsdk
 /** Generated by release CI. Do not edit in a release checkout. */
 internal object GeneratedReleaseMetadata {
     const val FAMILY_BASE_VERSION: String = "3.3.0"
-    const val RELEASE_IDENTITY: String = "3.3.0-dev.775"
-    const val RELEASE_SET_ID: String = "mentra-3.3.0-dev.775"
-    const val SOURCE_COMMIT: String = "f74b4870eb081f496cbfe2442111ac1b7779a8f2"
-    const val OTA_MANIFEST_URL: String = "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.775.json"
-    const val OTA_MANIFEST_SHA256: String = "d6f34112823147203720d8fd99fc010ae6751ea2109542315f4b425b393f282a"
+    const val RELEASE_IDENTITY: String = "3.3.0-dev.784"
+    const val RELEASE_SET_ID: String = "mentra-3.3.0-dev.784"
+    const val SOURCE_COMMIT: String = "7537129fe1722c047fff1b29e0fbccb83a832ea2"
+    const val OTA_MANIFEST_URL: String = "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.784.json"
+    const val OTA_MANIFEST_SHA256: String = "6c1f8f02cd7defbb485ee267ecc015ab0791322faa53e87c344bf345c60e5644"
 }

package/android/src/main/java/com/mentra/bluetoothsdk/sgcs/MentraLive.kt

@@ -34,6 +34,7 @@ import android.os.SystemClock
 import com.mentra.bluetoothsdk.utils.NativeLog as Log
 import androidx.core.app.ActivityCompat
 import com.mentra.bluetoothsdk.BluetoothSdkDefaults
+import com.mentra.bluetoothsdk.BluetoothSdkException
 import com.mentra.bluetoothsdk.Bridge
 import com.mentra.bluetoothsdk.DeviceManager
 import com.mentra.bluetoothsdk.PhotoRequest
@@ -3371,10 +3372,12 @@ class MentraLive : SGCManager() {
         sendJson(json, wakeup, true)
     }
 
-    private fun sendJson(json: JSONObject?, wakeup: Boolean, bridgeLogging: Boolean): Boolean {
+    private fun sendJson(
+            json: JSONObject?, wakeup: Boolean, bridgeLogging: Boolean,
+            sessionGeneration: Long = bleSessionGeneration.get(),
+    ): Boolean {
         if (json != null) {
             try {
-                val sessionGeneration = bleSessionGeneration.get()
                 if (buildNumberInt < 5) {
                     val jsonStr = json.toString()
                     // Bridge.log("LIVE: 📤 Sending JSON with esoteric message ID: " + jsonStr);
@@ -6075,6 +6078,17 @@ class MentraLive : SGCManager() {
     }
 
     override fun sendIncidentId(incidentId: String, apiBaseUrl: String?) {
+        if (!isConnected || bluetoothGatt == null || txCharacteristic == null) {
+            throw BluetoothSdkException(
+                "glasses_not_connected", "Cannot request incident logs because the glasses BLE link is not ready.",
+            )
+        }
+        // The JS token sync may happen after glasses_ready. Use only its current native store value.
+        val coreToken = DeviceStore.get("bluetooth", "core_token") as? String
+        if (coreToken.isNullOrBlank()) {
+            throw BluetoothSdkException("core_token_unavailable", "Cannot request incident logs without the current Core access token.")
+        }
+        val sessionGeneration = bleSessionGeneration.get()
         try {
             var base = if (apiBaseUrl != null) apiBaseUrl.trim() else ""
             if (base.isEmpty()) {
@@ -6087,13 +6101,25 @@ class MentraLive : SGCManager() {
             bleIncidentLogRelays[lKey] =
                     BleIncidentLogRelay(lKey, incidentId, base, BleIncidentLogKind.LOGCAT)
 
+            val auth = JSONObject()
+            auth.put("type", "auth_token")
+            auth.put("coreToken", coreToken)
+            auth.put("timestamp", System.currentTimeMillis())
             val json = JSONObject()
             json.put("type", "upload_incident_logs")
             json.put("incidentId", incidentId)
             json.put("apiBaseUrl", base)
-            sendJson(json, true)
+            // Wake ASG with its current token before the upload command enters the same FIFO.
+            if (!sendJson(auth, true, true, sessionGeneration) ||
+                    sessionGeneration != bleSessionGeneration.get() ||
+                    !isConnected || bluetoothGatt == null || txCharacteristic == null ||
+                    !sendJson(json, true, true, sessionGeneration) || sessionGeneration != bleSessionGeneration.get()) {
+                bleIncidentLogRelays.remove(bKey)
+                bleIncidentLogRelays.remove(lKey)
+                throw BluetoothSdkException("incident_dispatch_failed", "Could not queue the glasses incident-log request.")
+            }
             Bridge.log(
-                    "LIVE: Sent incidentId to glasses for log upload: " +
+                    "LIVE: Queued incidentId to glasses for log upload: " +
                             incidentId +
                             " (BLE relay keys " +
                             bKey +
@@ -6102,7 +6128,7 @@ class MentraLive : SGCManager() {
                             ")"
             )
         } catch (e: JSONException) {
-            Log.e(TAG, "Error creating upload_incident_logs command", e)
+            throw BluetoothSdkException("incident_dispatch_failed", "Could not create the glasses incident-log request.", e)
         }
     }
 
@@ -9804,12 +9830,12 @@ class MentraLive : SGCManager() {
     }
 
     /**
-     * Wi-Fi credentials are sent unchanged but never logged; the BLE trace records the command
-     * with the password redacted.
+     * Credentials are sent unchanged but never logged; the BLE trace redacts their fields.
      */
     private fun loggableOutgoingPayload(payload: String, commandType: String): String =
             try {
-                if (JSONObject(payload).has("password")) "<$commandType with credentials omitted>"
+                val json = JSONObject(payload)
+                if (json.has("password") || json.has("coreToken")) "<$commandType with credentials omitted>"
                 else payload
             } catch (_: JSONException) {
                 payload

package/android/src/test/java/com/mentra/bluetoothsdk/sgcs/MentraLiveIncidentDispatchTest.kt

@@ -0,0 +1,126 @@
+package com.mentra.bluetoothsdk.sgcs
+
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothGattCallback
+import android.bluetooth.BluetoothGattCharacteristic
+import android.os.Looper
+import androidx.test.core.app.ApplicationProvider
+import com.mentra.bluetoothsdk.BluetoothSdkException
+import com.mentra.bluetoothsdk.Bridge
+import com.mentra.bluetoothsdk.DeviceStore
+import java.nio.charset.StandardCharsets
+import java.time.Duration
+import java.util.UUID
+import java.util.concurrent.atomic.AtomicLong
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.LooperMode
+import org.robolectric.shadows.ShadowLog
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [33], shadows = [G1PairingTest.ShadowLc3Cpp::class], instrumentedPackages = ["com.mentra.lc3Lib"])
+@LooperMode(LooperMode.Mode.PAUSED)
+class MentraLiveIncidentDispatchTest {
+    private val incident = "rep_01M4HBVT88DFSN8TYNZ1WTV4PB"
+    private val apiBase = "https://core.dev.us-west-2.mentraglass.com"
+
+    @Test fun `missing native BLE link rejects even when cached status is connected`() = withLive { live ->
+        DeviceStore.set("glasses", "connected", true)
+        expectCode("glasses_not_connected") { live.sendIncidentId(incident, apiBase) }
+        assertTrue(queuedWrites(live).isEmpty())
+    }
+
+    @Test fun `missing current token does not fall back to old stored credentials`() = withLive { live ->
+        ready(live)
+        DeviceStore.set("bluetooth", "core_token", "")
+        val context = ApplicationProvider.getApplicationContext<android.content.Context>()
+        val prefs = context.getSharedPreferences("augmentos_auth_prefs", android.content.Context.MODE_PRIVATE)
+        prefs.edit().putString("core_token", "stale-synthetic-token").commit()
+        expectCode("core_token_unavailable") { live.sendIncidentId(incident, apiBase) }
+        assertTrue(queuedWrites(live).isEmpty())
+        prefs.edit().remove("core_token").commit()
+    }
+
+    @Test fun `current token is queued before upload and never logged`() = withLive { live ->
+        ready(live)
+        val token = "synthetic-${UUID.randomUUID()}"
+        DeviceStore.set("bluetooth", "core_token", token)
+        ShadowLog.clear()
+        live.sendIncidentId(incident, apiBase)
+        val writes = queuedWrites(live)
+        val wire = writes.joinToString("") { String(it, StandardCharsets.UTF_8) }
+        assertEquals(2, writes.size)
+        assertTrue(wire.indexOf("auth_token") < wire.indexOf("upload_incident_logs"))
+        assertTrue(wire.contains(token))
+        assertTrue(wire.contains(incident))
+        assertFalse("token logged", ShadowLog.getLogs().any { it.msg.contains(token) })
+    }
+
+    @Test fun `link losing TX characteristic rejects instead of retaining incident relay`() = withLive { live ->
+        ready(live)
+        DeviceStore.set("bluetooth", "core_token", "synthetic")
+        set(live, "txCharacteristic", null)
+        expectCode("glasses_not_connected") { live.sendIncidentId(incident, apiBase) }
+        assertTrue(queuedWrites(live).isEmpty())
+        val relays = get(live, "bleIncidentLogRelays") as Map<*, *>
+        assertTrue(relays.isEmpty())
+    }
+
+    @Test fun `session loss during token serialization cannot queue an upload into the next session`() = withLive { live ->
+        ready(live)
+        DeviceStore.set("bluetooth", "core_token", "synthetic-token")
+        val generation = get(live, "bleSessionGeneration") as AtomicLong
+        val sink = Bridge.addEventSink { type, body ->
+            if (type == "log" && body["message"].toString().contains("<auth_token with credentials omitted>")) {
+                generation.incrementAndGet()
+            }
+        }
+        try {
+            expectCode("incident_dispatch_failed") { live.sendIncidentId(incident, apiBase) }
+            val wire = queuedWrites(live).joinToString("") { String(it, StandardCharsets.UTF_8) }
+            assertFalse(wire.contains("upload_incident_logs"))
+            assertTrue((get(live, "bleIncidentLogRelays") as Map<*, *>).isEmpty())
+        } finally { Bridge.removeEventSink(sink) }
+    }
+
+    private fun ready(live: MentraLive) {
+        val context = ApplicationProvider.getApplicationContext<android.content.Context>()
+        val gatt = BluetoothAdapter.getDefaultAdapter().getRemoteDevice("AA:BB:CC:DD:EE:FF")
+            .connectGatt(context, false, object : BluetoothGattCallback() {})
+        set(live, "isConnected", true)
+        set(live, "bluetoothGatt", gatt)
+        set(live, "txCharacteristic", BluetoothGattCharacteristic(UUID.randomUUID(), 0, 0))
+    }
+
+    private fun withLive(body: (MentraLive) -> Unit) {
+        Bridge.initialize(ApplicationProvider.getApplicationContext())
+        val live = MentraLive()
+        val token = DeviceStore.get("bluetooth", "core_token")
+        val connected = DeviceStore.get("glasses", "connected")
+        try { body(live) } finally {
+            DeviceStore.set("bluetooth", "core_token", token ?: "")
+            DeviceStore.set("glasses", "connected", connected ?: false)
+            live.destroy()
+            shadowOf(Looper.getMainLooper()).idleFor(Duration.ofSeconds(2))
+        }
+    }
+
+    private fun expectCode(code: String, body: () -> Unit) {
+        try { body(); fail("Expected $code") } catch (error: BluetoothSdkException) { assertEquals(code, error.code) }
+    }
+
+    private fun get(live: MentraLive, name: String): Any? =
+        MentraLive::class.java.getDeclaredField(name).apply { isAccessible = true }.get(live)
+
+    private fun set(live: MentraLive, name: String, value: Any?) {
+        MentraLive::class.java.getDeclaredField(name).apply { isAccessible = true }.set(live, value)
+    }
+
+    private fun queuedWrites(live: MentraLive): List<ByteArray> = (get(live, "sendQueue") as Iterable<*>).map { write ->
+        write!!.javaClass.getDeclaredField("data").apply { isAccessible = true }.get(write) as ByteArray
+    }
+}

package/build/generated/releaseMetadata.js

@@ -1,10 +1,10 @@
 export const BLUETOOTH_SDK_RELEASE_METADATA = Object.freeze({
     "schemaVersion": 1,
     "familyBaseVersion": "3.3.0",
-    "releaseIdentity": "3.3.0-dev.775",
-    "releaseSetId": "mentra-3.3.0-dev.775",
-    "sourceCommit": "f74b4870eb081f496cbfe2442111ac1b7779a8f2",
-    "otaManifestUrl": "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.775.json",
-    "otaManifestSha256": "d6f34112823147203720d8fd99fc010ae6751ea2109542315f4b425b393f282a"
+    "releaseIdentity": "3.3.0-dev.784",
+    "releaseSetId": "mentra-3.3.0-dev.784",
+    "sourceCommit": "7537129fe1722c047fff1b29e0fbccb83a832ea2",
+    "otaManifestUrl": "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.784.json",
+    "otaManifestSha256": "6c1f8f02cd7defbb485ee267ecc015ab0791322faa53e87c344bf345c60e5644"
 });
 //# sourceMappingURL=releaseMetadata.js.map

package/build/generated/releaseMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,sBAAsB;IACtC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,iIAAiI;IACnJ,mBAAmB,EAAE,kEAAkE;CACxF,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"3.3.0\",\n  \"releaseIdentity\": \"3.3.0-dev.775\",\n  \"releaseSetId\": \"mentra-3.3.0-dev.775\",\n  \"sourceCommit\": \"f74b4870eb081f496cbfe2442111ac1b7779a8f2\",\n  \"otaManifestUrl\": \"https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.775.json\",\n  \"otaManifestSha256\": \"d6f34112823147203720d8fd99fc010ae6751ea2109542315f4b425b393f282a\"\n})\n"]}
+{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,sBAAsB;IACtC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,iIAAiI;IACnJ,mBAAmB,EAAE,kEAAkE;CACxF,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"3.3.0\",\n  \"releaseIdentity\": \"3.3.0-dev.784\",\n  \"releaseSetId\": \"mentra-3.3.0-dev.784\",\n  \"sourceCommit\": \"7537129fe1722c047fff1b29e0fbccb83a832ea2\",\n  \"otaManifestUrl\": \"https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.784.json\",\n  \"otaManifestSha256\": \"6c1f8f02cd7defbb485ee267ecc015ab0791322faa53e87c344bf345c60e5644\"\n})\n"]}

package/ios/BluetoothSdkModule.swift

@@ -368,8 +368,8 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
         // MARK: - Incident Reporting
 
         AsyncFunction("sendIncidentId") { (incidentId: String, apiBaseUrl: String?) in
-            await MainActor.run {
-                self.bluetoothSdk().sendIncidentId(incidentId, apiBaseUrl: apiBaseUrl)
+            try await MainActor.run {
+                try self.bluetoothSdk().sendIncidentId(incidentId, apiBaseUrl: apiBaseUrl)
             }
         }
 

package/ios/Source/BluetoothSdkDefaults.swift

@@ -16,7 +16,7 @@ enum BluetoothSdkDefaults {
     /// silently disable it on every pair the app touches.
     static let autoPowerOffEnabled = false
     private static let infoSdkVersionKey = "MentraBluetoothSdkVersion"
-    private static let swiftPackageSdkVersion = "3.3.0-dev.775"
+    private static let swiftPackageSdkVersion = "3.3.0-dev.784"
     private static let swiftPackageSdkVersionPlaceholder = "__MENTRA" + "_BLUETOOTH_SDK_VERSION__"
 
     private static func normalizedSdkVersion(_ value: String?) -> String? {

package/ios/Source/DeviceManager.swift

@@ -1518,9 +1518,12 @@ struct ViewState {
         sgc?.requestSavedWifiNetworks(requestId: requestId, sid: sid) ?? false
     }
 
-    func sendIncidentId(_ incidentId: String, apiBaseUrl: String? = nil) {
+    func sendIncidentId(_ incidentId: String, apiBaseUrl: String? = nil) throws {
+        guard let driver = sgc else {
+            throw BluetoothSdkError(code: "glasses_not_connected", message: "Cannot request incident logs because glasses are not connected.")
+        }
         Bridge.log("MAN: Sending incidentId to glasses for log upload: \(incidentId)")
-        sgc?.sendIncidentId(incidentId, apiBaseUrl: apiBaseUrl)
+        try driver.sendIncidentId(incidentId, apiBaseUrl: apiBaseUrl)
     }
 
     func sendWifiCredentials(_ ssid: String, _ password: String) {

package/ios/Source/GeneratedReleaseMetadata.swift

@@ -3,9 +3,9 @@ import Foundation
 /// Generated by release CI. Do not edit in a release checkout.
 enum GeneratedReleaseMetadata {
     static let familyBaseVersion = "3.3.0"
-    static let releaseIdentity = "3.3.0-dev.775"
-    static let releaseSetId = "mentra-3.3.0-dev.775"
-    static let sourceCommit = "f74b4870eb081f496cbfe2442111ac1b7779a8f2"
-    static let otaManifestUrl = "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.775.json"
-    static let otaManifestSha256 = "d6f34112823147203720d8fd99fc010ae6751ea2109542315f4b425b393f282a"
+    static let releaseIdentity = "3.3.0-dev.784"
+    static let releaseSetId = "mentra-3.3.0-dev.784"
+    static let sourceCommit = "7537129fe1722c047fff1b29e0fbccb83a832ea2"
+    static let otaManifestUrl = "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.784.json"
+    static let otaManifestSha256 = "6c1f8f02cd7defbb485ee267ecc015ab0791322faa53e87c344bf345c60e5644"
 }

package/ios/Source/MentraBluetoothSDK.swift

@@ -1667,8 +1667,8 @@ public final class MentraBluetoothSDK {
         DeviceManager.shared.sendReboot()
     }
 
-    func sendIncidentId(_ incidentId: String, apiBaseUrl: String? = nil) {
-        DeviceManager.shared.sendIncidentId(incidentId, apiBaseUrl: apiBaseUrl)
+    func sendIncidentId(_ incidentId: String, apiBaseUrl: String? = nil) throws {
+        try DeviceManager.shared.sendIncidentId(incidentId, apiBaseUrl: apiBaseUrl)
     }
 
     public func invalidate() {

package/ios/Source/sgcs/MentraLive.swift

@@ -1349,7 +1349,7 @@ class MentraLive: NSObject, SGCManager {
             // 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() }
+            commandQueue.removeAll()
             stopSignalStrengthPolling()
             DeviceStore.shared.apply("glasses", "signalStrength", -1)
             DeviceStore.shared.apply("glasses", "signalStrengthUpdatedAt", 0)
@@ -2123,8 +2123,7 @@ class MentraLive: NSObject, SGCManager {
         /// 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.
+        /// the deterministic guard if a consumer already dequeued a previous-session write.
         let generation: Int
     }
 
@@ -2166,7 +2165,7 @@ class MentraLive: NSObject, SGCManager {
         Bridge.log("LIVE: Cleared pending ACK mId \(pendingMessage.id) because \(reason)")
     }
 
-    actor CommandQueue {
+    @MainActor final class CommandQueue {
         private var commands: [PendingMessage] = []
 
         func enqueue(_ command: PendingMessage) -> Int {
@@ -2282,15 +2281,11 @@ class MentraLive: NSObject, SGCManager {
             )
 
             // Push to front of queue for immediate retry
-            Task {
-                let queueSize = await self.commandQueue.pushToFront(retryMessage)
-                await MainActor.run {
-                    self.logBleWriteTrace("retry_queued", retryMessage.trace, extra: [
-                        "retryDelayMs": 0,
-                        "queueSizeAfterAdd": queueSize,
-                    ])
-                }
-            }
+            let queueSize = commandQueue.pushToFront(retryMessage)
+            logBleWriteTrace("retry_queued", retryMessage.trace, extra: [
+                "retryDelayMs": 0,
+                "queueSizeAfterAdd": queueSize,
+            ])
 
             Bridge.log(
                 "🔄 Retrying message mId: \(pendingMessage.id) (attempt \(retryMessage.retries)/3)"
@@ -3714,7 +3709,19 @@ class MentraLive: NSObject, SGCManager {
         sendJson(json, wakeUp: true)
     }
 
-    func sendIncidentId(_ incidentId: String, apiBaseUrl: String?) {
+    var incidentLogTransportReady: Bool {
+        connectedPeripheral?.state == .connected && txCharacteristic != nil
+    }
+
+    func sendIncidentId(_ incidentId: String, apiBaseUrl: String?) throws {
+        guard incidentLogTransportReady else {
+            throw BluetoothSdkError(code: "glasses_not_connected", message: "Cannot request incident logs because the glasses BLE link is not ready.")
+        }
+        // Token sync may happen after glasses_ready; never rely on the last pairing's token.
+        let coreToken = DeviceStore.shared.get("bluetooth", "core_token") as? String ?? ""
+        guard !coreToken.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
+            throw BluetoothSdkError(code: "core_token_unavailable", message: "Cannot request incident logs without the current Core access token.")
+        }
         var base = (apiBaseUrl ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
         if base.isEmpty {
             base = "https://api.mentra.glass"
@@ -3731,10 +3738,20 @@ class MentraLive: NSObject, SGCManager {
             fileBaseKey: lKey, incidentId: incidentId, apiBaseUrl: base, kind: .logcat
         )
 
-        Bridge.log(
-            "LIVE: Sending incidentId to glasses for log upload: \(incidentId) (BLE relay \(bKey), \(lKey))"
-        )
-        sendJson(["type": "upload_incident_logs", "incidentId": incidentId, "apiBaseUrl": base], wakeUp: true)
+        let auth: [String: Any] = [
+            "type": "auth_token", "coreToken": coreToken,
+            "timestamp": Int64(Date().timeIntervalSince1970 * 1000),
+        ]
+        // MainActor queue insertion preserves auth-before-upload order, including all fragments.
+        guard sendJson(auth, wakeUp: true, requireAck: true, bridgeLogging: true),
+              sendJson(["type": "upload_incident_logs", "incidentId": incidentId, "apiBaseUrl": base],
+                       wakeUp: true, requireAck: true, bridgeLogging: true)
+        else {
+            bleIncidentLogRelays.removeValue(forKey: bKey)
+            bleIncidentLogRelays.removeValue(forKey: lKey)
+            throw BluetoothSdkError(code: "incident_dispatch_failed", message: "Could not queue the glasses incident-log request.")
+        }
+        Bridge.log("LIVE: Queued incidentId to glasses for log upload: \(incidentId) (BLE relay \(bKey), \(lKey))")
     }
 
     private static func incidentBleFileBase(incidentId: String, prefix: Character) -> String {
@@ -4671,20 +4688,13 @@ 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.
+        // Insert synchronously on MainActor so fragments and dependent commands retain call order.
         let generation = wireSessionGeneration
-        Task {
-            let queueSize = await commandQueue.enqueue(PendingMessage(data: data, id: id, retries: 0, trace: trace, generation: generation))
-            guard trace != nil, queueSize >= significantQueueSize else {
-                return
-            }
-            await MainActor.run {
-                self.logBleChunkTrace("queued", trace, extra: [
-                    "queueSizeAfterAdd": queueSize,
-                ])
-            }
+        let queueSize = commandQueue.enqueue(PendingMessage(data: data, id: id, retries: 0, trace: trace, generation: generation))
+        if trace != nil, queueSize >= significantQueueSize {
+            logBleChunkTrace("queued", trace, extra: [
+                "queueSizeAfterAdd": queueSize,
+            ])
         }
     }
 
@@ -5201,9 +5211,8 @@ class MentraLive: NSObject, SGCManager {
                             bridgeLogging: bridgeLogging
                         )
                     }
-                    // Wi-Fi credentials are sent unchanged but never logged; the BLE trace
-                    // above records this command with the password redacted.
-                    let loggedPayload = json["password"] == nil
+                    // Credentials reach the wire unchanged; diagnostic logs omit their values.
+                    let loggedPayload = json["password"] == nil && json["coreToken"] == nil
                         ? jsonString : "<\(commandInfo.commandType) with credentials omitted>"
                     transportLog("LIVE: Sending data to glasses: \(loggedPayload)", bridgeLogging: bridgeLogging)
                     let packedData =
@@ -6000,7 +6009,7 @@ class MentraLive: NSObject, SGCManager {
         // Stop all timers
         stopAllTimers()
         resetWireNegotiationState()
-        Task { await commandQueue.removeAll() } // stale writes die with the session
+        commandQueue.removeAll() // stale writes die with the session
         closeL2capFileChannel()
 
         // Disconnect BLE

package/ios/Source/sgcs/SGCManager.swift

@@ -217,7 +217,7 @@ protocol SGCManager {
 
     // MARK: - Incident Reporting
 
-    func sendIncidentId(_ incidentId: String, apiBaseUrl: String?)
+    func sendIncidentId(_ incidentId: String, apiBaseUrl: String?) throws
 
     // MARK: - Gallery
 

package/ios/Tests/IncidentLogDispatchTests.swift

@@ -0,0 +1,111 @@
+@testable import MentraBluetoothSDK
+import XCTest
+
+/// Keep native admission, serialization and fragment packing; replace only the radio writes.
+@MainActor
+private final class IncidentLogTransport: MentraLive {
+    var ready = true
+    var writes: [(Data, BleWriteTrace?)] = []
+
+    override var incidentLogTransportReady: Bool {
+        ready
+    }
+
+    override func queueSend(_ data: Data, id _: String, trace: BleWriteTrace?) {
+        writes.append((data, trace))
+    }
+}
+
+@MainActor
+final class IncidentLogDispatchTests: XCTestCase {
+    private let incident = "rep_01M4HBVT88DFSN8TYNZ1WTV4PB"
+    private let apiBase = "https://core.dev.us-west-2.mentraglass.com"
+
+    func testMissingNativeLinkRejectsDespiteCachedConnectedStatus() {
+        let live = MentraLive()
+        let store = DeviceStore.shared.store
+        let saved = store.getCategory("glasses")["connected"]
+        store.set("glasses", "connected", true)
+        defer {
+            if let saved { store.set("glasses", "connected", saved) }
+            else { store.remove("glasses", "connected") }
+        }
+        XCTAssertThrowsError(try live.sendIncidentId(incident, apiBaseUrl: apiBase)) { error in
+            XCTAssertEqual((error as? BluetoothSdkError)?.code, "glasses_not_connected")
+        }
+    }
+
+    func testNoDriverRejectsThroughDeviceManager() {
+        let manager = DeviceManager()
+        manager.sgc = nil
+        XCTAssertThrowsError(try manager.sendIncidentId(incident, apiBaseUrl: apiBase)) { error in
+            XCTAssertEqual((error as? BluetoothSdkError)?.code, "glasses_not_connected")
+        }
+    }
+
+    func testMissingCurrentTokenDoesNotQueueAnUpload() throws {
+        try withToken("") {
+            let live = IncidentLogTransport()
+            XCTAssertThrowsError(try live.sendIncidentId(incident, apiBaseUrl: apiBase)) { error in
+                XCTAssertEqual((error as? BluetoothSdkError)?.code, "core_token_unavailable")
+            }
+            XCTAssertTrue(live.writes.isEmpty)
+        }
+    }
+
+    func testCurrentTokenPrecedesUploadAndNeverAppearsInLogs() throws {
+        let token = "synthetic-\(UUID().uuidString)"
+        try withToken(token) {
+            let live = IncidentLogTransport()
+            let manager = DeviceManager()
+            manager.sgc = live
+            var logs: [String] = []
+            let sink = Bridge.addEventSink { event, body in
+                if event == "log", let message = body["message"] as? String { logs.append(message) }
+            }
+            defer { Bridge.removeEventSink(sink) }
+
+            try manager.sendIncidentId(incident, apiBaseUrl: apiBase)
+
+            XCTAssertEqual(live.writes.compactMap { $0.1?.commandType }, ["auth_token", "upload_incident_logs"])
+            XCTAssertTrue(live.writes.allSatisfy { $0.1?.wakeup == true })
+            let wire = live.writes.map { String(decoding: $0.0, as: UTF8.self) }.joined()
+            XCTAssertTrue(wire.contains(token), "The current token must reach the glasses")
+            XCTAssertTrue(wire.contains(incident))
+            XCTAssertFalse(logs.contains { $0.contains(token) }, "Tokens must stay out of native and incident logs")
+        }
+    }
+
+    func testAllTokenFragmentsPrecedeUpload() throws {
+        try withToken(String(repeating: "synthetic", count: 120)) {
+            let live = IncidentLogTransport()
+            try live.sendIncidentId(incident, apiBaseUrl: apiBase)
+            let types = live.writes.compactMap { $0.1?.commandType }
+            XCTAssertGreaterThan(types.filter { $0 == "auth_token" }.count, 1)
+            XCTAssertEqual(types.last, "upload_incident_logs")
+            XCTAssertTrue(types.dropLast().allSatisfy { $0 == "auth_token" })
+        }
+    }
+
+    func testCommandQueueInsertionAndSessionClearAreSynchronous() {
+        let queue = MentraLive.CommandQueue()
+        let first = MentraLive.PendingMessage(data: Data([1]), id: "auth", retries: 0)
+        let second = MentraLive.PendingMessage(data: Data([2]), id: "upload", retries: 0)
+        XCTAssertEqual(queue.enqueue(first), 1)
+        XCTAssertEqual(queue.enqueue(second), 2)
+        XCTAssertEqual(queue.dequeue()?.id, "auth")
+        queue.removeAll()
+        XCTAssertNil(queue.dequeue())
+    }
+
+    private func withToken<T>(_ value: String, body: () throws -> T) rethrows -> T {
+        let store = DeviceStore.shared.store
+        let saved = store.getCategory("bluetooth")["core_token"]
+        store.set("bluetooth", "core_token", value)
+        defer {
+            if let saved { store.set("bluetooth", "core_token", saved) }
+            else { store.remove("bluetooth", "core_token") }
+        }
+        return try body()
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mentra/bluetooth-sdk",
-  "version": "3.3.0-dev.775",
+  "version": "3.3.0-dev.784",
   "description": "SDK for communicating with smart glasses",
   "main": "build/index.js",
   "react-native": "src/index.ts",
@@ -114,7 +114,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@mentra/cloud-protocol": "3.3.0-dev.775"
+    "@mentra/cloud-protocol": "3.3.0-dev.784"
   },
   "devDependencies": {
     "@types/node": "^25.9.3",

package/src/generated/releaseMetadata.ts

@@ -12,9 +12,9 @@ export interface BluetoothSdkReleaseMetadata {
 export const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({
   "schemaVersion": 1,
   "familyBaseVersion": "3.3.0",
-  "releaseIdentity": "3.3.0-dev.775",
-  "releaseSetId": "mentra-3.3.0-dev.775",
-  "sourceCommit": "f74b4870eb081f496cbfe2442111ac1b7779a8f2",
-  "otaManifestUrl": "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.775.json",
-  "otaManifestSha256": "d6f34112823147203720d8fd99fc010ae6751ea2109542315f4b425b393f282a"
+  "releaseIdentity": "3.3.0-dev.784",
+  "releaseSetId": "mentra-3.3.0-dev.784",
+  "sourceCommit": "7537129fe1722c047fff1b29e0fbccb83a832ea2",
+  "otaManifestUrl": "https://artifactscdn.mentraglass.com/Mentra-Community/MentraOS/releases/mentra-builds-v3.3.0/mentra-live-ota-3.3.0-dev.784.json",
+  "otaManifestSha256": "6c1f8f02cd7defbb485ee267ecc015ab0791322faa53e87c344bf345c60e5644"
 })