@mentra/engine 0.1.0-dev.0 → 3.1.0-dev.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mentra/engine",
-  "version": "0.1.0-dev.0",
+  "version": "3.1.0-dev.10",
   "description": "Mentra Engine — miniapp registry, WebView bridge, and miniapp store",
   "main": "build/index.js",
   "react-native": "src/index.ts",
@@ -11,15 +11,35 @@
       "react-native": "./src/index.ts",
       "default": "./build/index.js"
     },
-    "./internal": {
-      "types": "./build/internal.d.ts",
-      "react-native": "./src/internal.ts",
-      "default": "./build/internal.js"
+    "./ota": {
+      "types": "./build/react/index.d.ts",
+      "react-native": "./src/react/index.ts",
+      "default": "./build/react/index.js"
     },
-    "./devtools": {
-      "types": "./build/devtools.d.ts",
-      "react-native": "./src/devtools.ts",
-      "default": "./build/devtools.js"
+    "./bluetooth-sdk": {
+      "types": "./build/bluetooth-sdk/index.d.ts",
+      "react-native": "./src/bluetooth-sdk/index.ts",
+      "default": "./build/bluetooth-sdk/index.js"
+    },
+    "./bluetooth-sdk/react": {
+      "types": "./build/bluetooth-sdk/react.d.ts",
+      "react-native": "./src/bluetooth-sdk/react.ts",
+      "default": "./build/bluetooth-sdk/react.js"
+    },
+    "./bluetooth-sdk/types": {
+      "types": "./build/bluetooth-sdk/types.d.ts",
+      "react-native": "./src/bluetooth-sdk/types.ts",
+      "default": "./build/bluetooth-sdk/types.js"
+    },
+    "./bluetooth-sdk/photo-receiver": {
+      "types": "./build/bluetooth-sdk/photo-receiver.d.ts",
+      "react-native": "./src/bluetooth-sdk/photo-receiver.ts",
+      "default": "./build/bluetooth-sdk/photo-receiver.js"
+    },
+    "./bluetooth-sdk/debug": {
+      "types": "./build/bluetooth-sdk/debug.d.ts",
+      "react-native": "./src/bluetooth-sdk/debug.ts",
+      "default": "./build/bluetooth-sdk/debug.js"
     },
     "./build/*": null,
     "./src/*": null,
@@ -29,6 +49,10 @@
     "build",
     "README.md",
     "src",
+    "!build/devtools.*",
+    "!build/internal.*",
+    "!src/devtools.ts",
+    "!src/internal.ts",
     "!src/**/__tests__",
     "!src/**/*.test.ts"
   ],
@@ -36,7 +60,10 @@
     "build": "expo-module build",
     "clean": "expo-module clean",
     "lint": "expo-module lint",
-    "test": "bun test src",
+    "test": "./scripts/test.sh && node --test scripts/*.test.mjs",
+    "write:release-metadata": "node scripts/write-release-metadata.mjs",
+    "verify:release-package": "node scripts/verify-release-package.mjs",
+    "test:public-api": "bun test src/bluetooth-sdk/__tests__/publicApi.test.ts",
     "build:module": "expo-module prepare",
     "prepublishOnly": "expo-module prepublishOnly",
     "expo-module": "expo-module"
@@ -64,16 +91,17 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
+    "@mentra/bluetooth-sdk": "3.1.0-dev.10",
+    "@mentra/cloud-client": "3.1.0-dev.10",
+    "@mentra/cloud-protocol": "3.1.0-dev.10",
+    "@mentra/crust": "3.1.0-dev.10",
+    "@mentra/miniapp": "3.1.0-dev.10",
     "buffer": "^6.0.3",
     "events": "^3.3.0",
     "semver": "^7.7.4",
     "typesafe-ts": "^1.7.1"
   },
   "devDependencies": {
-    "@mentra/bluetooth-sdk": "workspace:*",
-    "@mentra/cloud-client": "workspace:*",
-    "@mentra/cloud-protocol": "workspace:*",
-    "@mentra/miniapp": "workspace:*",
     "@types/semver": "^7.7.1",
     "expo-module-scripts": "^55.0.2",
     "expo-modules-core": "55.0.25",
@@ -81,26 +109,31 @@
     "typescript": "~5.9.2"
   },
   "peerDependencies": {
-    "expo": "*",
-    "expo-modules-core": "*",
+    "expo": "~55.0.24",
+    "expo-modules-core": "~55.0.25",
     "react": "*",
     "react-native": "*",
+    "react-native-safe-area-context": "*",
+    "react-native-svg": "*",
     "react-native-udp": "*",
     "@types/react": "*",
     "react-native-mmkv": "*",
     "react-native-nitro-bg-timer": "*",
     "react-native-nitro-modules": "*",
-    "react-native-reanimated": "*",
-    "expo-file-system": "*",
+    "react-native-reanimated": "4.2.1",
+    "react-native-worklets": "0.7.4",
+    "expo-file-system": "~55.0.20",
     "react-native-zip-archive": "*",
     "zustand": "*",
-    "expo-battery": "*",
-    "expo-audio": "*",
-    "expo-clipboard": "*",
-    "expo-constants": "*",
-    "expo-location": "*",
-    "expo-task-manager": "*",
-    "expo-notifications": "*",
+    "expo-battery": "^55.0.13",
+    "expo-audio": "~55.0.14",
+    "expo-clipboard": "~55.0.13",
+    "expo-calendar": "~55.0.14",
+    "expo-constants": "~55.0.16",
+    "expo-device": "~55.0.17",
+    "expo-location": "~55.1.10",
+    "expo-task-manager": "~55.0.16",
+    "expo-notifications": "~55.0.23",
     "react-native-share": "*",
     "react-native-localize": "*",
     "react-native-ble-manager": "*",
@@ -109,11 +142,6 @@
     "@react-native-community/netinfo": "*",
     "@dr.pogodin/react-native-fs": "*",
     "@craftzdog/react-native-buffer": "*",
-    "axios": "*",
-    "@mentra/bluetooth-sdk": "*",
-    "@mentra/crust": "^0.1.0-dev.0",
-    "@mentra/cloud-client": "^0.1.0-dev.0",
-    "@mentra/miniapp": "^0.3.0-dev.0",
-    "@mentra/cloud-protocol": "^0.1.0-dev.0"
+    "axios": "*"
   }
 }

package/src/bluetooth-sdk/debug.ts

@@ -0,0 +1 @@
+export * from "@mentra/bluetooth-sdk/debug"

package/src/bluetooth-sdk/index.ts

@@ -0,0 +1,2 @@
+export {default} from "@mentra/bluetooth-sdk"
+export * from "@mentra/bluetooth-sdk"

package/src/bluetooth-sdk/photo-receiver.ts

@@ -0,0 +1,2 @@
+export {default} from "@mentra/bluetooth-sdk/photo-receiver"
+export * from "@mentra/bluetooth-sdk/photo-receiver"

package/src/bluetooth-sdk/react.ts

@@ -0,0 +1 @@
+export * from "@mentra/bluetooth-sdk/react"

package/src/bluetooth-sdk/types.ts

@@ -0,0 +1 @@
+export * from "@mentra/bluetooth-sdk/types"

package/src/engine.ts

@@ -5,16 +5,17 @@
  * name stays `engine` in code; the public API surface is `engine`.)
  *
  * It grows one facade at a time. The migration-era flat store/service exports
- * live on the `@mentra/engine/internal` entry (and the debug singletons on
- * `@mentra/engine/devtools`); they shrink as screens move onto `engine.*`.
+ * remain in a private MentraOS host package; they shrink as screens move onto
+ * `engine.*`.
  */
-import {configure, start as bootstrapStart, stop as bootstrapStop} from "./runtime/bootstrap"
+import {configure, start as bootstrapStart, stop as bootstrapStop, updateUiSeams} from "./runtime/bootstrap"
 import {cloudClientService} from "./services/CloudClientService"
 import {hydrateDeviceStore, demoteOrphanedDefaultWearable} from "./services/DeviceStoreHydration"
 import {startGlassesSettingsSync, stopGlassesSettingsSync} from "./services/GlassesSettingsSync"
 import {startGlassesStatusProjection, stopGlassesStatusProjection} from "./services/GlassesStatusProjection"
 import {startOtaService, stopOtaService} from "./services/OtaService"
 import {startAudioCloudUplink, stopAudioCloudUplink} from "./services/AudioCloudUplink"
+import {startSupportProfileSync, stopSupportProfileSync} from "./services/SupportProfileSync"
 import {startDeviceEventRouter, stopDeviceEventRouter} from "./services/DeviceEventRouter"
 import {startPhoneNotificationsSync, stopPhoneNotificationsSync} from "./services/PhoneNotificationsSync"
 import {startCaptionsTesterReportService, stopCaptionsTesterReportService} from "./services/CaptionsTesterReportService"
@@ -45,6 +46,8 @@ import {logBuffer} from "./utils/devLogging"
 export const engine = {
   /** Front door — hand engine auth + config, then start/stop the runtime. */
   configure,
+  /** Merge host-UI seams on a running runtime (scan overlay, wifi setup, …). */
+  updateUiSeams,
   /** Start the runtime: mark started + construct/connect the cloud client + begin
    * syncing device settings to the glasses. */
   async start() {
@@ -59,7 +62,7 @@ export const engine = {
     // Project native device status -> the engine stores (the inbound feed the rest
     // of the runtime reads). Established first so the stores are live before the
     // syncs below react to them.
-    startGlassesStatusProjection()
+    startGlassesStatusProjection((changed) => localMiniappRuntime.forwardEvent("glasses_connection_state", changed))
     // Route the rest of the inbound device events (wifi/hotspot/gallery -> stores+bus,
     // photo/stream -> coordinators, button/touch/accel/head -> miniapps, save_setting ->
     // store, miniapp_selected -> launcher) so a bare OEM gets device data, not just the
@@ -96,6 +99,7 @@ export const engine = {
         error instanceof Error ? error.message : error,
       )
     }
+    startSupportProfileSync()
     // Push device-setting changes to the glasses for ANY host, so
     // engine.glasses.settings.set() reaches the device (not just the Mentra app).
     startGlassesSettingsSync()
@@ -135,6 +139,7 @@ export const engine = {
     await safely("device event router", stopDeviceEventRouter)
     await safely("ota service", stopOtaService)
     await safely("audio cloud uplink", stopAudioCloudUplink)
+    await safely("support profile sync", stopSupportProfileSync)
     await safely("phone notifications sync", stopPhoneNotificationsSync)
     await safely("captions tester report service", stopCaptionsTesterReportService)
     await safely("mentrajs crashloop report service", stopMentraJSCrashloopReportService)

package/src/facades/dev.ts

@@ -125,8 +125,9 @@ export const dev = {
   /**
    * Side-load a miniapp being served from a dev machine (the `mentra dev` / CLI
    * flow) by its URL: probes `<url>/miniapp.json`, and on a reachable manifest
-   * registers it into the single dev slot so it appears in `engine.miniapps`
-   * and can be started. This is the OEM-host equivalent of the first-party
+   * registers it under its manifest package so it appears in `engine.miniapps`
+   * and can coexist with other dev miniapps. This is the OEM-host equivalent
+   * of the first-party
    * developer-URL screen — the registration itself is engine-internal, so a
    * host reaches it here rather than the internal registry. Rendering still
    * flows through the normal display path once the miniapp is started.
@@ -142,25 +143,29 @@ export const dev = {
       return {ok: false, error: "dev server unreachable, or no miniapp.json served there"}
     }
     const manifest = result.manifest
+    const appName = name ?? manifest.name ?? "Dev Miniapp"
+    const packageName = (manifest.packageName as string | undefined) ?? DEV_APP_PACKAGE_NAME
+    // Persist the host that answered — not the stale input IP — so home-tile
+    // relaunches skip a dead LAN address after mDNS/Metro failover.
+    const resolvedUrl = result.resolvedUrl || devUrl
     // The `mentra-miniapp dev` server puts the hot-reload/log sidecar on the
     // user port PLUS ONE — same convention as the first-party developer-URL
     // screen's deriveDevPort.
     let devPort: number | undefined
     try {
-      const parsed = Number(new URL(devUrl).port)
+      const parsed = Number(new URL(resolvedUrl).port)
       devPort = Number.isFinite(parsed) && parsed > 0 ? parsed + 1 : undefined
     } catch {
       devPort = undefined
     }
-    const appName = name ?? manifest.name ?? "Dev Miniapp"
-    registerDevApp({
-      // The REAL manifest package: registerDevApp preserves it as
-      // sourcePackageName (miniapp auth + dev-slot cleanup key off it) before
-      // forcing packageName to the single dev slot.
-      packageName: (manifest.packageName as string | undefined) ?? DEV_APP_PACKAGE_NAME,
+    const existing = useAppStatusStore.getState().apps.find((app) => app.packageName === packageName)
+    if (existing?.running) await useAppStatusStore.getState().stop(packageName)
+    await registerDevApp({
+      packageName,
       name: appName,
-      iconUrl: manifest.icon ? new URL(manifest.icon, `${devUrl}/`).toString() : `${devUrl}/icon.png`,
-      devUrl,
+      iconUrl: manifest.icon ? new URL(manifest.icon, `${resolvedUrl}/`).toString() : `${resolvedUrl}/icon.png`,
+      // Persist the host that answered — not the stale input IP.
+      devUrl: resolvedUrl,
       devPort,
       type: manifest.type as DevAppRecord["type"],
       permissions: manifest.permissions as DevAppRecord["permissions"],
@@ -168,7 +173,7 @@ export const dev = {
       actions: manifest.actions as DevAppRecord["actions"],
     })
     await useAppStatusStore.getState().refresh()
-    return {ok: true, packageName: DEV_APP_PACKAGE_NAME, name: appName}
+    return {ok: true, packageName, name: appName}
   },
 
   /** Current engine runtime status for engine-owned debug surfaces. */

package/src/facades/display.ts

@@ -4,7 +4,7 @@
  * glasses display for dev tools and escape-hatch use (normal rendering goes through
  * the engine DisplayProcessor / layout system, not these).
  */
-import BluetoothSdk from "@mentra/bluetooth-sdk/internal"
+import BluetoothSdk from "@mentra/bluetooth-sdk"
 import {displayMirror} from "./displayMirror"
 
 export const display = {

package/src/facades/gallery.ts

@@ -22,7 +22,7 @@ function projectStatus() {
     processingFiles: Array.from(progress.processingFiles),
     processedFiles: s.processedFiles,
     isSyncing: selectIssyncing(s),
-    isStarting: gallerySyncService.isSyncStarting(),
+    isStarting: s.syncStarting,
     glassesGallery: selectGlassesGalleryStatus(s),
     // Copy: the snapshot must not hand callers a mutable reference into the store
     // (each queue item is copied too — callers must not mutate them in place).

package/src/facades/glasses.ts

@@ -11,13 +11,14 @@
 // surface, not the public entry. Relative path (the alias doesn't resolve in engine's
 // standalone build); jest moduleNameMapper + tsconfig both resolve it.
 import BluetoothSdk from "@mentra/bluetooth-sdk/internal"
-import type {ButtonPressEvent, TouchEvent} from "@mentra/bluetooth-sdk/internal"
+import type {ButtonPressEvent, ConnectOptions, Device, TouchEvent} from "@mentra/bluetooth-sdk"
 import {useGlassesStore} from "../stores/glasses"
 import {useSettingsStore, SETTINGS} from "../stores/settings"
 import {hasDefaultDevice} from "../services/DeviceStoreHydration"
 import {projectPairingIdentity} from "../services/PairingIdentity"
 import {isGlassesConnected, isGlassesReady} from "../services/GlassesReadiness"
 import {pushAllBluetoothSettings} from "../services/GlassesSettingsSync"
+import {recordSupportProfileConnectionFailure} from "../services/SupportProfileSync"
 import {getModelCapabilities, type DeviceTypes} from "../types"
 import {glassesWifi} from "./glassesWifi"
 import {glassesSettings} from "./glassesSettings"
@@ -62,6 +63,7 @@ function projectInfo() {
     serialNumber: s.serialNumber,
     buildNumber: s.buildNumber,
     btMac: s.bluetoothMacAddress,
+    wifiMac: s.wifiMacAddress,
     leftMac: s.leftMacAddress,
     rightMac: s.rightMacAddress,
     // Copy: the snapshot must not hand callers a mutable reference into the store.
@@ -81,20 +83,30 @@ export const glasses = {
    * the glasses (this used to be a host-side step before `connectDefault`).
    */
   connectDefault: async (): Promise<void> => {
-    await pushAllBluetoothSettings()
-    return BluetoothSdk.connectDefault()
+    try {
+      await pushAllBluetoothSettings()
+      await BluetoothSdk.connectDefault()
+    } catch (error) {
+      recordSupportProfileConnectionFailure(error, "connect_default")
+      throw error
+    }
   },
   disconnect: (): Promise<void> => BluetoothSdk.disconnect(),
   forget: (): Promise<void> => BluetoothSdk.forget(),
   /** Connect to a specific (discovered) device. */
-  connect: async (...args: Parameters<typeof BluetoothSdk.connect>): Promise<void> => {
-    await pushAllBluetoothSettings()
-    return BluetoothSdk.connect(...args)
+  connect: async (device: Device, options?: ConnectOptions): Promise<void> => {
+    try {
+      await pushAllBluetoothSettings()
+      await BluetoothSdk.connect(device, options)
+    } catch (error) {
+      recordSupportProfileConnectionFailure(error, "connect")
+      throw error
+    }
   },
   /** Connect the built-in simulated glasses (dev/testing). */
   connectSimulated: (): Promise<void> => BluetoothSdk.connectSimulated(),
   /** Set a device as the `connectDefault()` target. */
-  setDefault: (...args: Parameters<typeof BluetoothSdk.setDefaultDevice>) => BluetoothSdk.setDefaultDevice(...args),
+  setDefault: (device: Device | null): Promise<void> => BluetoothSdk.setDefaultDevice(device),
   /**
    * Reconnect to the saved default glasses. Resolves `false` when there's nothing to
    * reconnect to (no default paired) or the connect attempt fails (e.g. BLE powered
@@ -110,6 +122,7 @@ export const glasses = {
       await pushAllBluetoothSettings()
       await BluetoothSdk.connectDefault()
     } catch (error) {
+      recordSupportProfileConnectionFailure(error, "reconnect")
       console.warn("engine.glasses.reconnect failed:", error)
       return false
     }

package/src/facades/glassesSettings.ts

@@ -22,6 +22,7 @@ const INTERNAL_KEYS = new Set<string>([
   SETTINGS.default_wearable.key,
   SETTINGS.device_name.key,
   SETTINGS.device_address.key,
+  SETTINGS.project_name.key,
   SETTINGS.pending_controller.key,
   SETTINGS.default_controller.key,
   SETTINGS.controller_device_name.key,
@@ -54,3 +55,7 @@ export const glassesSettings = {
   // Copy: callers must not be able to mutate the module-level key list.
   available: (): string[] => [...DEVICE_KEYS],
 }
+
+
+
+

package/src/facades/miniapps.ts

@@ -9,6 +9,7 @@
  * `<WebView>` wired to them. This facade is the lifecycle half.
  */
 import {useAppStatusStore} from "../stores/apps"
+import localMiniappRuntime from "../services/LocalMiniappRuntime"
 import type {ClientApp} from "../types"
 
 type AppsState = ReturnType<typeof useAppStatusStore.getState>
@@ -29,6 +30,12 @@ export const miniapps = {
     })
   },
 
+  /** Miniapps actively subscribed to Mentra Live hardware-button events. */
+  buttonPressSubscribers: (): string[] => localMiniappRuntime.getButtonPressSubscribers(),
+  /** Observe the active Mentra Live hardware-button subscriber set. */
+  onButtonPressSubscribersChanged: (cb: (packageNames: string[]) => void): (() => void) =>
+    localMiniappRuntime.onButtonPressSubscribersChanged(cb),
+
   /** Re-fetch the installed-app list from the backend. */
   refresh: () => useAppStatusStore.getState().refresh(),
   /** Start (foreground) a miniapp. */

package/src/facades/ota.ts

@@ -1,18 +1,20 @@
 /**
  * ota facade — `engine.ota`: the OEM-facing OTA read/observe surface. Engine's
  * OtaService projects the glasses' OTA BLE events into the engine store; this facade
- * exposes the snapshot + change subscriptions the host renders its update prompt and
- * progress UI from. No host-injected UI — the host owns all alerts/navigation/i18n.
+ * exposes the snapshot + change subscriptions behind the shared OTA flow exported by
+ * `@mentra/engine/ota`. Hosts retain only their surrounding navigation and theme/i18n adapters.
  *
  * Availability checks live in engine. Install orchestration lives in engine too:
  * `installSession` fronts the OtaInstallCoordinator state machine (WP 8B) — the host
  * progress screen is a pure renderer over its snapshot + attach/detach/retry/finish.
  */
 import BluetoothSdk from "@mentra/bluetooth-sdk/internal"
-import type {OtaProgress, OtaProgressStatus, OtaStatus, OtaUpdateInfo} from "@mentra/bluetooth-sdk/internal"
+import type {OtaProgress, OtaProgressStatus, OtaStartAckEvent, OtaStatus, OtaUpdateInfo} from "@mentra/bluetooth-sdk"
 import {isGlassesConnected, useGlassesStore} from "../stores/glasses"
-import {getAsgOtaVersionUrl} from "../services/asgOtaVersionUrl"
+import {resolveOtaManifestUrl} from "../services/otaManifestUrl"
 import {otaInstallCoordinator, type OtaInstallSnapshot} from "../services/OtaInstallCoordinator"
+import {startGlassesStatusProjection} from "../services/GlassesStatusProjection"
+import {startOtaService} from "../services/OtaService"
 import {
   checkCurrentGlassesForUpdate,
   type OtaCheckCurrentGlassesOptions,
@@ -26,9 +28,10 @@ function projectSnapshot() {
     buildNumber: s.buildNumber || null,
     mtkFirmwareVersion: s.mtkFirmwareVersion || null,
     besFirmwareVersion: s.besFirmwareVersion || null,
+    hotspotOtaVersion: s.hotspotOtaVersion ?? 0,
     wifiConnected: s.wifi.state === "connected",
     wifiStatusKnown: s.wifiStatusKnown,
-    manifestUrl: getAsgOtaVersionUrl(s.otaVersionUrl, s.buildNumber),
+    manifestUrl: resolveOtaManifestUrl(s.otaVersionUrl, s.buildNumber),
     updateAvailable: s.otaUpdateAvailable,
     status: s.otaStatus,
     legacyProgress: s.otaProgress,
@@ -50,13 +53,23 @@ export type {
 
 export const ota = {
   // --- actions ---
+  /**
+   * Start the device-status and OTA projections without starting the authenticated
+   * cloud/miniapp runtime. This is the explicit entry point for Bluetooth-only hosts.
+   * Idempotent and safe when the full engine runtime is already running.
+   */
+  initialize: async () => {
+    const hydrated = startGlassesStatusProjection()
+    startOtaService()
+    await hydrated
+  },
   /**
    * Start the firmware install with the resolved OTA manifest URL. Progress lands on
-   * `status()`/`onStatus()`. (The host resolves the manifest URL — dev-override/env/prod
-   * resolution stays with the OTA config; the host-side stuck/retry watchdog is its own
+   * `status()`/`onStatus()`. (The host resolves the manifest URL — developer override,
+   * host pin, or Engine release pin resolution stays with the OTA config; the stuck/retry watchdog is its own
    * resilience layer on top of this command.)
    */
-  install: (...args: Parameters<typeof BluetoothSdk.startOtaUpdate>) => BluetoothSdk.startOtaUpdate(...args),
+  install: (otaVersionUrl?: string | null): Promise<OtaStartAckEvent> => BluetoothSdk.startOtaUpdate(otaVersionUrl),
   // Deferred: this facade entry was intended to become the engine-owned retry/check
   // action, but BluetoothSdk.checkForOtaUpdate() only returns a boolean. Exposing it
   // here would make callers think the rich otaUpdateAvailable read model is refreshed,
@@ -115,6 +128,8 @@ export const ota = {
    * the snapshot; every watchdog/retry/reconnect rule lives in the coordinator.
    */
   installSession: {
+    /** Select Wi-Fi or capability-gated hotspot transport for this checked manifest. */
+    prepare: (result: OtaCheckCurrentGlassesResult) => otaInstallCoordinator.prepare(result),
     /** Bind the machine to the mounted progress screen. Idempotent per attach/detach cycle. */
     attach: () => otaInstallCoordinator.attach(),
     /** Unbind on unmount: clears all timers/listeners and resets session state. */

package/src/facades/pairing.ts

@@ -10,7 +10,7 @@
 // target hint) lives on the full surface, not the public entry (same reason
 // the glasses facade imports internal).
 import BluetoothSdk from "@mentra/bluetooth-sdk/internal"
-import type {ConnectOptions, Device, PairFailureEvent, GlassesNotReadyEvent} from "@mentra/bluetooth-sdk"
+import type {ConnectOptions, Device, DeviceModel, PairFailureEvent, GlassesNotReadyEvent} from "@mentra/bluetooth-sdk"
 import {useCoreStore} from "../stores/core"
 import {useGlassesStore} from "../stores/glasses"
 import {hasDefaultDevice} from "../services/DeviceStoreHydration"
@@ -206,7 +206,7 @@ export const pairing = {
   markPendingSelection: (model: string) => markPendingSelection(model),
 
   /** Start scanning for nearby glasses. Results land on `searchResults()`/`onFound()`. */
-  scan: (...args: Parameters<typeof BluetoothSdk.startScan>) => BluetoothSdk.startScan(...args),
+  scan: (model: DeviceModel): Promise<void> => BluetoothSdk.startScan(model),
   /** Whether a scan is currently in progress. */
   scanning: (): boolean => useCoreStore.getState().searching,
   /** Subscribe to scan-in-progress changes; fires only when it changes. Returns an unsubscribe. */
@@ -226,7 +226,7 @@ export const pairing = {
   // leak as mutable references into the store.
   searchResults: () => useCoreStore.getState().searchResults.map((result) => ({...result})),
   /** Subscribe to scan-result changes; fires only when they change. Returns an unsubscribe. */
-  onFound: (cb: (results: ReturnType<typeof useCoreStore.getState>["searchResults"]) => void): (() => void) => {
+  onFound: (cb: (results: Device[]) => void): (() => void) => {
     let last = JSON.stringify(useCoreStore.getState().searchResults)
     return useCoreStore.subscribe(() => {
       const results = useCoreStore.getState().searchResults
@@ -250,7 +250,7 @@ export const pairing = {
     return BluetoothSdk.connect(device, {...options, saveAsDefault: false})
   },
   /** Set a device as the default for subsequent `glasses.connectDefault()`. */
-  setDefault: (...args: Parameters<typeof BluetoothSdk.setDefaultDevice>) => BluetoothSdk.setDefaultDevice(...args),
+  setDefault: (device: Device | null): Promise<void> => BluetoothSdk.setDefaultDevice(device),
   /**
    * Prime the native Bluetooth Classic audio watcher with the picked device.
    * The iOS Mentra Live flow pairs Classic audio BEFORE any BLE connect
@@ -291,25 +291,29 @@ export const pairing = {
       await BluetoothSdk.stopScan()
       return
     }
-    await BluetoothSdk.disconnect()
     if (projectPairingIdentity().kind === "paired") {
       // The persisted settings describe a COMPLETE pairing: restore it to
       // native (the attempt's connect-by-name overwrote the native
       // device_name; and if native somehow lost its default entirely, this
       // repairs the divergence instead of forgetting a real pairing).
       console.log("PairingIdentity: abandonAttempt — preserving pairing; attempt cancelled, native identity re-seeded")
+      await BluetoothSdk.disconnect()
       await pushAllBluetoothSettings()
-    } else if (nativeHasDefault) {
+      return
+    }
+    if (nativeHasDefault) {
       // Mid-relay: native promoted and its echoes are still landing — the
       // incomplete JS snapshot must not be pushed over the fresher native
       // identity (the on-connect replay's race). Native holds the truth.
       console.log("PairingIdentity: abandonAttempt — preserving pairing; JS identity mid-relay, native kept as-is")
-    } else {
-      // Forgetting requires CONSENSUS: no native default AND no complete
-      // persisted pairing — a genuinely partial attempt.
-      console.log("PairingIdentity: abandonAttempt — no pairing on either layer; forgetting the partial attempt")
-      await BluetoothSdk.forget()
+      await BluetoothSdk.disconnect()
+      return
     }
+    // Partial attempt: forget owns teardown. Do NOT disconnect() first — that
+    // nulls the MentraLive SGC and used to skip Classic removeBond, leaving
+    // IBRT ACL up so glasses never re-advertise for the next scan.
+    console.log("PairingIdentity: abandonAttempt — no pairing on either layer; forgetting the partial attempt")
+    await BluetoothSdk.forget()
   },
 
   /** Subscribe to pairing failures; returns an unsubscribe. */

package/src/facades/permissions.ts

@@ -17,6 +17,7 @@ export const PermissionFeatures = {
   CAMERA: "camera",
   CALENDAR: "calendar",
   LOCATION: "location",
+  LOCAL_WIFI: "local_wifi",
   BACKGROUND_LOCATION: "background_location",
   BLUETOOTH: "bluetooth",
   PHONE_STATE: "phone_state",
@@ -27,6 +28,13 @@ const ANDROID = PermissionsAndroid.PERMISSIONS
 const apiLevel = typeof Platform.Version === "number" ? Platform.Version : parseInt(String(Platform.Version), 10)
 const requiresSeparateAndroidBackgroundLocation = apiLevel >= 29
 
+export function localWifiPermissionForAndroid(
+  androidApiLevel: number,
+  androidPermissions: typeof PermissionsAndroid.PERMISSIONS = ANDROID,
+): AndroidPermission {
+  return androidApiLevel >= 33 ? androidPermissions.NEARBY_WIFI_DEVICES : androidPermissions.ACCESS_FINE_LOCATION
+}
+
 async function areAndroidPermissionsGranted(perms: AndroidPermission[]): Promise<boolean> {
   for (const p of perms) {
     if (!(await PermissionsAndroid.check(p))) return false
@@ -66,6 +74,8 @@ function iosPerms(feature: string): Permission[] {
       return [PERMISSIONS.IOS.CALENDARS]
     case PermissionFeatures.LOCATION:
       return [PERMISSIONS.IOS.LOCATION_WHEN_IN_USE]
+    case PermissionFeatures.LOCAL_WIFI:
+      return []
     case PermissionFeatures.BACKGROUND_LOCATION:
       // iOS won't grant ALWAYS without WHEN_IN_USE first — request both (matches
       // the host PermissionsUtils mapping), else a cold request can't escalate.
@@ -84,10 +94,14 @@ function androidPerms(feature: string): AndroidPermission[] {
     case PermissionFeatures.CAMERA:
       return [ANDROID.CAMERA]
     case PermissionFeatures.CALENDAR:
+      // Expo Calendar requires both grants on Android, including for read APIs.
+      // The miniapp-facing calendar API remains read-only.
       return [ANDROID.READ_CALENDAR, ANDROID.WRITE_CALENDAR]
     case PermissionFeatures.LOCATION:
     case PermissionFeatures.BACKGROUND_LOCATION:
       return [ANDROID.ACCESS_FINE_LOCATION]
+    case PermissionFeatures.LOCAL_WIFI:
+      return [localWifiPermissionForAndroid(apiLevel)]
     case PermissionFeatures.PHONE_STATE:
       return [ANDROID.READ_PHONE_STATE]
     case PermissionFeatures.BLUETOOTH:

package/src/facades/phoneNotifications.ts

@@ -3,25 +3,16 @@
  * notifications to the glasses, with a per-app blocklist. Android-only (the
  * NotificationListenerService); the getters return sensible defaults on iOS.
  *
- * Enabled-state + blocklist are engine settings (auto-synced to the native
- * listener); the installed-apps list + the listener permission are CrustModule.
+ * The per-app blocklist is an engine setting (auto-synced to the native
+ * listener); the installed-apps list + listener permission are CrustModule.
+ * Capture itself is controlled only by Android notification access and the
+ * hidden operational kill switch.
  */
 import {Platform} from "react-native"
 import CrustModule from "@mentra/crust"
 import {useSettingsStore, SETTINGS} from "../stores/settings"
 
 export const phoneNotifications = {
-  /** Is phone-notification forwarding enabled? (false on iOS) */
-  enabled: (): boolean => {
-    if (Platform.OS !== "android") return false
-    return useSettingsStore.getState().getSetting(SETTINGS.notifications_enabled.key) ?? true
-  },
-  /** Enable/disable phone-notification forwarding. (no-op on iOS) */
-  setEnabled: (enabled: boolean) => {
-    if (Platform.OS !== "android") return
-    return useSettingsStore.getState().setSetting(SETTINGS.notifications_enabled.key, enabled)
-  },
-
   /** The phone's installed apps (package, name, icon). (empty on iOS) */
   installedApps: (): Promise<Array<{packageName: string; appName: string; icon: string | null}>> => {
     if (Platform.OS !== "android") return Promise.resolve([])