@mentra/engine 3.2.0-dev.200 → 3.2.0-dev.208

package/build/services/slimStreamStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slimStreamStatus.d.ts","sourceRoot":"","sources":["../../src/services/slimStreamStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAA;AAErE;;;;;;;;GAQG;AACH,eAAO,MAAM,6BAA6B,QAAQ,CAAA;AAElD,+EAA+E;AAC/E,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,iBAAiB,EACxB,OAAO,GAAE;IAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAM,GAC5E,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiBzB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAE9E"}
+{"version":3,"file":"slimStreamStatus.d.ts","sourceRoot":"","sources":["../../src/services/slimStreamStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAA;AAErE;;;;;;;;GAQG;AACH,eAAO,MAAM,6BAA6B,QAAQ,CAAA;AAElD,+EAA+E;AAC/E,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,iBAAiB,EACxB,OAAO,GAAE;IAAC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAM,GAC5E,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAE9E"}

package/build/services/slimStreamStatus.js

@@ -18,6 +18,22 @@ export function slimStreamStatusEvent(event, options = {}) {
     };
     if (event.streamId)
         slim.streamId = event.streamId;
+    if (event.sid)
+        slim.sid = event.sid;
+    if (typeof event.revision === "number")
+        slim.revision = event.revision;
+    if (typeof event.terminal === "boolean")
+        slim.terminal = event.terminal;
+    if (event.errorDetails)
+        slim.errorDetails = event.errorDetails;
+    if (event.kind === "reconnect") {
+        if ("reason" in event)
+            slim.reason = event.reason;
+        if ("attempt" in event)
+            slim.attempt = event.attempt;
+        if ("maxAttempts" in event)
+            slim.maxAttempts = event.maxAttempts;
+    }
     const ts = event.timestamp;
     if (typeof ts === "number" && Number.isFinite(ts))
         slim.timestamp = ts;

package/build/services/slimStreamStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"slimStreamStatus.js","sourceRoot":"","sources":["../../src/services/slimStreamStatus.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,CAAA;AAElD,+EAA+E;AAC/E,MAAM,UAAU,qBAAqB,CACnC,KAAwB,EACxB,UAA2E,EAAE;IAE7E,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,6BAA6B,CAAA;IACtF,MAAM,IAAI,GAA4B;QACpC,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,CAAA;IACD,IAAI,KAAK,CAAC,QAAQ;QAAE,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;IAClD,MAAM,EAAE,GAAG,KAAK,CAAC,SAAS,CAAA;IAC1B,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QAAE,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;IACtE,IAAI,OAAO,CAAC,qBAAqB,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;QAC1D,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC,cAAc,CAAA;IAC5C,CAAC;IACD,+EAA+E;IAC/E,kFAAkF;IAClF,IAAI,kBAAkB,IAAI,KAAK,CAAC,KAAK;QAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;IAC/D,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,OAAgC;IACpE,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;AAChC,CAAC","sourcesContent":["import type {StreamStatusEvent} from \"@mentra/bluetooth-sdk/internal\"\r\n\r\n/**\r\n * 1Hz encoder FPS/bitrate telemetry on `stream_status.stats`.\r\n * Lifecycle status (started/stopped/error) is unaffected.\r\n * Keep false in production; flip locally to debug the Mentra Call FPS ladder.\r\n *\r\n * Compatibility kill switch: old glasses can still emit stats. Copy onto a new object;\r\n * never mutate the incoming event. Manual acceptance with every layer false: join\r\n * waterfall yes; BLE stream_status.stats / STREAM_QUALITY / encoder-stats / watch-stats no.\r\n */\r\nexport const ENABLE_PIPELINE_FPS_TELEMETRY = false\r\n\r\n/** Fields forwarded to cloud / miniapps after the first resolvedConfig ack. */\r\nexport function slimStreamStatusEvent(\r\n  event: StreamStatusEvent,\r\n  options: {includeResolvedConfig?: boolean; enableFpsTelemetry?: boolean} = {},\r\n): Record<string, unknown> {\r\n  const enableFpsTelemetry = options.enableFpsTelemetry ?? ENABLE_PIPELINE_FPS_TELEMETRY\r\n  const slim: Record<string, unknown> = {\r\n    type: \"stream_status\",\r\n    kind: event.kind,\r\n    status: event.status,\r\n  }\r\n  if (event.streamId) slim.streamId = event.streamId\r\n  const ts = event.timestamp\r\n  if (typeof ts === \"number\" && Number.isFinite(ts)) slim.timestamp = ts\r\n  if (options.includeResolvedConfig && event.resolvedConfig) {\r\n    slim.resolvedConfig = event.resolvedConfig\r\n  }\r\n  // Compatibility kill switch: old glasses may still emit 1Hz stats. Copy onto a\r\n  // new object; never mutate `event` — other consumers may still need the original.\r\n  if (enableFpsTelemetry && event.stats) slim.stats = event.stats\r\n  return slim\r\n}\r\n\r\nexport function streamStatusSignature(payload: Record<string, unknown>): string {\r\n  return JSON.stringify(payload)\r\n}\r\n"]}
+{"version":3,"file":"slimStreamStatus.js","sourceRoot":"","sources":["../../src/services/slimStreamStatus.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,CAAA;AAElD,+EAA+E;AAC/E,MAAM,UAAU,qBAAqB,CACnC,KAAwB,EACxB,UAA2E,EAAE;IAE7E,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,6BAA6B,CAAA;IACtF,MAAM,IAAI,GAA4B;QACpC,IAAI,EAAE,eAAe;QACrB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,CAAA;IACD,IAAI,KAAK,CAAC,QAAQ;QAAE,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;IAClD,IAAI,KAAK,CAAC,GAAG;QAAE,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAA;IACnC,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ;QAAE,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;IACtE,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,SAAS;QAAE,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;IACvE,IAAI,KAAK,CAAC,YAAY;QAAE,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAA;IAC9D,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC/B,IAAI,QAAQ,IAAI,KAAK;YAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;QACjD,IAAI,SAAS,IAAI,KAAK;YAAE,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;QACpD,IAAI,aAAa,IAAI,KAAK;YAAE,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAA;IAClE,CAAC;IACD,MAAM,EAAE,GAAG,KAAK,CAAC,SAAS,CAAA;IAC1B,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QAAE,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;IACtE,IAAI,OAAO,CAAC,qBAAqB,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;QAC1D,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC,cAAc,CAAA;IAC5C,CAAC;IACD,+EAA+E;IAC/E,kFAAkF;IAClF,IAAI,kBAAkB,IAAI,KAAK,CAAC,KAAK;QAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;IAC/D,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,OAAgC;IACpE,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;AAChC,CAAC","sourcesContent":["import type {StreamStatusEvent} from \"@mentra/bluetooth-sdk/internal\"\r\n\r\n/**\r\n * 1Hz encoder FPS/bitrate telemetry on `stream_status.stats`.\r\n * Lifecycle status (started/stopped/error) is unaffected.\r\n * Keep false in production; flip locally to debug the Mentra Call FPS ladder.\r\n *\r\n * Compatibility kill switch: old glasses can still emit stats. Copy onto a new object;\r\n * never mutate the incoming event. Manual acceptance with every layer false: join\r\n * waterfall yes; BLE stream_status.stats / STREAM_QUALITY / encoder-stats / watch-stats no.\r\n */\r\nexport const ENABLE_PIPELINE_FPS_TELEMETRY = false\r\n\r\n/** Fields forwarded to cloud / miniapps after the first resolvedConfig ack. */\r\nexport function slimStreamStatusEvent(\r\n  event: StreamStatusEvent,\r\n  options: {includeResolvedConfig?: boolean; enableFpsTelemetry?: boolean} = {},\r\n): Record<string, unknown> {\r\n  const enableFpsTelemetry = options.enableFpsTelemetry ?? ENABLE_PIPELINE_FPS_TELEMETRY\r\n  const slim: Record<string, unknown> = {\r\n    type: \"stream_status\",\r\n    kind: event.kind,\r\n    status: event.status,\r\n  }\r\n  if (event.streamId) slim.streamId = event.streamId\n  if (event.sid) slim.sid = event.sid\n  if (typeof event.revision === \"number\") slim.revision = event.revision\n  if (typeof event.terminal === \"boolean\") slim.terminal = event.terminal\n  if (event.errorDetails) slim.errorDetails = event.errorDetails\n  if (event.kind === \"reconnect\") {\n    if (\"reason\" in event) slim.reason = event.reason\n    if (\"attempt\" in event) slim.attempt = event.attempt\n    if (\"maxAttempts\" in event) slim.maxAttempts = event.maxAttempts\n  }\n  const ts = event.timestamp\r\n  if (typeof ts === \"number\" && Number.isFinite(ts)) slim.timestamp = ts\r\n  if (options.includeResolvedConfig && event.resolvedConfig) {\r\n    slim.resolvedConfig = event.resolvedConfig\r\n  }\r\n  // Compatibility kill switch: old glasses may still emit 1Hz stats. Copy onto a\r\n  // new object; never mutate `event` — other consumers may still need the original.\r\n  if (enableFpsTelemetry && event.stats) slim.stats = event.stats\r\n  return slim\r\n}\r\n\r\nexport function streamStatusSignature(payload: Record<string, unknown>): string {\r\n  return JSON.stringify(payload)\r\n}\r\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mentra/engine",
-  "version": "3.2.0-dev.200",
+  "version": "3.2.0-dev.208",
   "description": "Mentra Engine — miniapp registry, WebView bridge, and miniapp store",
   "main": "build/index.js",
   "react-native": "src/index.ts",
@@ -97,12 +97,12 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@mentra/acs-meeting": "3.2.0-dev.200",
-    "@mentra/bluetooth-sdk": "3.2.0-dev.200",
-    "@mentra/cloud-client": "3.2.0-dev.200",
-    "@mentra/cloud-protocol": "3.2.0-dev.200",
-    "@mentra/crust": "3.2.0-dev.200",
-    "@mentra/miniapp": "3.2.0-dev.200",
+    "@mentra/acs-meeting": "3.2.0-dev.208",
+    "@mentra/bluetooth-sdk": "3.2.0-dev.208",
+    "@mentra/cloud-client": "3.2.0-dev.208",
+    "@mentra/cloud-protocol": "3.2.0-dev.208",
+    "@mentra/crust": "3.2.0-dev.208",
+    "@mentra/miniapp": "3.2.0-dev.208",
     "buffer": "^6.0.3",
     "events": "^3.3.0",
     "react-native-marked": "8.1.1",

package/src/generated/releaseMetadata.ts

@@ -12,9 +12,9 @@ export interface EngineReleaseMetadata {
 export const ENGINE_RELEASE_METADATA: Readonly<EngineReleaseMetadata> = Object.freeze({
   "schemaVersion": 1,
   "familyBaseVersion": "3.2.0",
-  "releaseIdentity": "3.2.0-dev.200",
-  "releaseSetId": "mentra-3.2.0-dev.200",
-  "sourceCommit": "1cdd911f596eba7b2b2f0e9ba5655c7ff16b5362",
-  "otaManifestUrl": "https://github.com/Mentra-Community/MentraOS/releases/download/mentra-builds-v3.2.0/mentra-live-ota-3.2.0-dev.200.json",
-  "otaManifestSha256": "f0b5cca2fa4d1d43acf5933fb4de629819d36a145a162c763f4faa27a7c8ff79"
+  "releaseIdentity": "3.2.0-dev.208",
+  "releaseSetId": "mentra-3.2.0-dev.208",
+  "sourceCommit": "3c22b92a5a53ce608c087503417ca5b3d16cc926",
+  "otaManifestUrl": "https://github.com/Mentra-Community/MentraOS/releases/download/mentra-builds-v3.2.0/mentra-live-ota-3.2.0-dev.208.json",
+  "otaManifestSha256": "69ce2b786afea60faaa5a47aad1ff0c9e70933365658b6628e651fb0c6cfe7bd"
 })

package/src/services/DeviceEventRouter.ts

@@ -162,22 +162,18 @@ export function startDeviceEventRouter(): void {
     }),
   )
 
-  // Phone-owned stream status / keep-alive → the stream coordinator. The Cloud V1 relay
+  // Phone-owned stream status → the stream coordinator. The Cloud V1 relay
   // for non-owned streams was removed with Cloud V1 app end-of-life.
   subs.push(
     BluetoothSdk.addListener("stream_status", (event) => {
-      if (event.streamId && phoneStreamCoordinator.owns(event.streamId)) {
+      if (
+        (event.streamId && phoneStreamCoordinator.owns(event.streamId)) ||
+        (!event.streamId && event.kind === "snapshot" && event.terminal === true)
+      ) {
         phoneStreamCoordinator.handleGlassesStatus(event)
       }
     }),
   )
-  subs.push(
-    BluetoothSdk.addListener("keep_alive_ack", (event) => {
-      if (event.streamId && phoneStreamCoordinator.owns(event.streamId)) {
-        phoneStreamCoordinator.handleKeepAliveAck(event)
-      }
-    }),
-  )
 
   // --- device input → local miniapps (forwardEvent is subscriber-gated; a no-op when
   // no miniapp listens). The v1 SocketComms cloud legs for these were removed with

package/src/services/PhoneStreamCoordinator.ts

@@ -5,7 +5,6 @@
  *   miniapp → SDK → LocalMiniappRuntime → coordinator
  *           coordinator → BluetoothSdk (BLE → glasses publisher)
  *           coordinator ↔ cloudStreamApi (managed only, cloud-v2 runtime provisioning)
- *           coordinator ↔ StreamLifecycleController (keep-alive heartbeat)
  *           coordinator → status listeners → routed back to miniapp(s)
  *
  * Single-stream constraint:
@@ -28,29 +27,17 @@
  * the legacy path.
  *
  * BLE link loss is a SUSPENDED state, not a failure:
- *   The glasses publisher keeps pushing over Wi-Fi when the phone's Bluetooth
- *   link drops; only our keep-alives stop reaching it. While the store says
- *   the glasses are disconnected we pause the heartbeat (so we don't count
- *   misses we caused ourselves), fan out `suspended`, and give the link
- *   `glassesGraceMs` to come back. On reconnect we resume, heartbeat at once,
- *   and fan out `resumed` with the SAME streamId — no re-provision. The grace
- *   ends early when Cloudflare reports the publisher gone for two probes in
- *   a row (glasses powered off, not a BLE hiccup). If the grace expires the
- *   stream is torn down with reason `glasses_disconnected`, and the BLE stop
- *   the glasses never received is sent on the next reconnect.
+ *   ASG owns the ten-second phone/controller liveness deadline. The coordinator
+ *   observes link suspension, retains cloud resources briefly for reconciliation,
+ *   and never uses missing JavaScript heartbeats as evidence of publisher failure.
+ *   An explicit stop that could not reach BLE is sent on the next reconnect.
  */
 
 import BluetoothSdk from "@mentra/bluetooth-sdk/internal"
-import type {
-  KeepAliveAckEvent,
-  StreamResolvedConfig,
-  StreamStartRequest,
-  StreamStatusEvent,
-} from "@mentra/bluetooth-sdk/internal"
+import type {StreamResolvedConfig, StreamStartRequest, StreamStatusEvent} from "@mentra/bluetooth-sdk/internal"
 import {isGlassesConnected} from "./GlassesReadiness"
 import {useGlassesStore} from "../stores/glasses"
 
-import {StreamLifecycleController, type LifecycleLogger} from "./StreamLifecycleController"
 import {slimStreamStatusEvent, streamStatusSignature} from "./slimStreamStatus"
 import {
   getManagedStreamStatus,
@@ -66,9 +53,6 @@ import {
  * can shorten them; production code should never override these.
  */
 const DEFAULT_TIMINGS = {
-  keepAliveIntervalMs: 15_000,
-  ackTimeoutMs: 10_000,
-  maxMissedAcks: 3,
   cloudflareStatusPollMs: 5_000,
   // During WHIP startup, probe quickly so readiness is not quantized to the
   // steady-state 5s monitoring cadence. The delay backs off on each miss.
@@ -77,10 +61,8 @@ const DEFAULT_TIMINGS = {
   hlsReadinessInitialDelayMs: 5_000,
   hlsReadinessPollMs: 2_000,
   hlsReadinessMaxAttempts: 30,
-  // How long a stream survives a BLE link drop before we give up on it. Must
-  // stay under the glasses publisher's own 60s no-keep-alive watchdog with
-  // margin for the resume heartbeat's round trip.
-  glassesGraceMs: 45_000,
+  // Allow ASG's ten-second stop plus a short delivery/reconciliation margin.
+  glassesGraceMs: 15_000,
   // Consecutive Cloudflare "publisher disconnected" probes while suspended
   // before we conclude the glasses are off (not just out of BLE range).
   suspendedPublisherGoneProbes: 2,
@@ -111,19 +93,6 @@ export const LINK_STATUS = {
   reason: "glasses_disconnected",
 } as const
 
-// Console-backed minimal logger; replaces pino on the phone.
-const consoleLogger: LifecycleLogger = {
-  child: (bindings) => ({
-    ...consoleLogger,
-    debug: (...args) => console.debug("[STREAM]", bindings, ...args),
-    warn: (...args) => console.warn("[STREAM]", bindings, ...args),
-    error: (...args) => console.error("[STREAM]", bindings, ...args),
-  }),
-  debug: (...args) => console.debug("[STREAM]", ...args),
-  warn: (...args) => console.warn("[STREAM]", ...args),
-  error: (...args) => console.error("[STREAM]", ...args),
-}
-
 export interface StartUnmanagedOptions {
   streamUrl: string
   video?: StreamStartRequest["video"]
@@ -237,7 +206,6 @@ interface SuspendedState {
 
 export class PhoneStreamCoordinator {
   private current: Entry | null = null
-  private lifecycle: StreamLifecycleController | null = null
   private statusSubscriber: StatusSubscriber | null = null
   private idCounter = 0
   private readonly timings: TimingConfig
@@ -277,12 +245,7 @@ export class PhoneStreamCoordinator {
    */
   private assertGlassesConnected(): void {
     if (!this.linkSource.isConnected()) {
-      throw new StreamConflictError(
-        "GLASSES_NOT_CONNECTED",
-        "Glasses are not connected",
-        "command",
-        "ble",
-      )
+      throw new StreamConflictError("GLASSES_NOT_CONNECTED", "Glasses are not connected", "command", "ble")
     }
   }
 
@@ -352,10 +315,7 @@ export class PhoneStreamCoordinator {
         }
   }
 
-  async startUnmanaged(
-    packageName: string,
-    opts: StartUnmanagedOptions,
-  ): Promise<StreamPublisherStartResult> {
+  async startUnmanaged(packageName: string, opts: StartUnmanagedOptions): Promise<StreamPublisherStartResult> {
     // Pre-check the obvious-bad input before queueing — the lock is for
     // serializing state transitions, not for validating arguments.
     if (!opts.streamUrl || typeof opts.streamUrl !== "string") {
@@ -382,7 +342,7 @@ export class PhoneStreamCoordinator {
       this.current = entry
 
       try {
-        const event = await BluetoothSdk.startExternallyManagedStream({
+        const event = await BluetoothSdk.startStream({
           type: "start_stream",
           streamUrl: opts.streamUrl,
           streamId,
@@ -404,10 +364,7 @@ export class PhoneStreamCoordinator {
     })
   }
 
-  async startManaged(
-    packageName: string,
-    opts: StartManagedOptions,
-  ): Promise<ManagedStartResult> {
+  async startManaged(packageName: string, opts: StartManagedOptions): Promise<ManagedStartResult> {
     const startupStartedAtMs = Date.now()
     // streamId doesn't exist yet — it's minted a few lines below, once we
     // know this is a fresh provision rather than a join onto an existing one.
@@ -446,9 +403,7 @@ export class PhoneStreamCoordinator {
           )
         }
         existing.subscribers.add(packageName)
-        const immediate: ManagedStartResult | null = existing.hlsReady
-          ? managedStartResult(existing)
-          : null
+        const immediate: ManagedStartResult | null = existing.hlsReady ? managedStartResult(existing) : null
         return {kind: "join", entry: existing, immediate}
       }
 
@@ -458,8 +413,7 @@ export class PhoneStreamCoordinator {
       const provision = await provisionManagedStream(opts.restreamDestinations)
       const streamId = this.mintId("m")
       const ingestUrl = pickIngestUrl(provision, opts.ingest)
-      const mode: ManagedEntry["mode"] =
-        ingestUrl === provision.webrtcPublishUrl ? "webrtc" : "hls"
+      const mode: ManagedEntry["mode"] = ingestUrl === provision.webrtcPublishUrl ? "webrtc" : "hls"
 
       const entry: ManagedEntry = {
         kind: "managed",
@@ -488,7 +442,7 @@ export class PhoneStreamCoordinator {
       })
 
       try {
-        const event = await BluetoothSdk.startExternallyManagedStream({
+        const event = await BluetoothSdk.startStream({
           type: "start_stream",
           streamUrl: ingestUrl,
           streamId,
@@ -573,7 +527,6 @@ export class PhoneStreamCoordinator {
     if (!this.current) return
     if (event.streamId && event.streamId !== this.current.streamId) return
 
-    this.lifecycle?.recordActivity()
     const includeResolvedConfig = !this.resolvedConfigForwarded && !!event.resolvedConfig
     if (includeResolvedConfig) this.resolvedConfigForwarded = true
     const slimData = slimStreamStatusEvent(event, {includeResolvedConfig})
@@ -593,15 +546,14 @@ export class PhoneStreamCoordinator {
     // glasses publisher auto-recovers (error → reconnecting → reconnected),
     // and tearing down on the first hiccup deletes the live input out from
     // under a publisher that comes right back (it then retries into a dead
-    // input forever). A publisher that errors and never recovers is reaped by
-    // the keep-alive ack timeout. Queue the teardown through the transition
-    // lock so it serializes with any start/stop currently in flight.
+    // input forever). ASG explicitly marks terminal failures; serialize teardown
+    // with any start/stop currently in flight.
     const isStopped =
       (event.kind === "lifecycle" && event.status === "stopped") ||
       (event.kind === "snapshot" && event.status === "stopped")
     const isGiveUp = event.kind === "reconnect" && event.status === "reconnect_failed"
-    if (isGiveUp || isStopped) {
-      const reason = isGiveUp ? "glasses_gave_up" : "glasses_stopped"
+    if (event.terminal === true || isGiveUp || isStopped) {
+      const reason = isGiveUp ? "glasses_gave_up" : event.status === "error" ? "glasses_error" : "glasses_stopped"
       const targetStreamId = this.current.streamId
       void this.runExclusive(async () => {
         // The stream we wanted to tear down may already be gone (e.g. another
@@ -612,12 +564,6 @@ export class PhoneStreamCoordinator {
     }
   }
 
-  /** Called by MantleManager when a phone-owned keep_alive_ack arrives. */
-  handleKeepAliveAck(event: KeepAliveAckEvent): void {
-    if (!event.ackId) return
-    this.lifecycle?.handleAck(event.ackId)
-  }
-
   // ===========================================================================
   // BLE link suspension
   // ===========================================================================
@@ -649,9 +595,6 @@ export class PhoneStreamCoordinator {
     const entry = this.current
     if (!entry) return
     const since = Date.now()
-    // Pause the heartbeat: misses now would be our own fault, not the
-    // publisher's, and counting them would reap a stream that is still live.
-    this.lifecycle?.setActive(false)
     const graceTimer = setTimeout(() => this.onGraceExpired(entry.streamId), this.timings.glassesGraceMs)
     this.suspended = {since, graceTimer, publisherGoneProbes: 0}
     console.warn("[STREAM] BLE link lost; stream suspended", {
@@ -674,10 +617,6 @@ export class PhoneStreamCoordinator {
     this.suspended = null
     const suspendedMs = Date.now() - suspended.since
     console.info("[STREAM] BLE link back; stream resumed", {streamId: entry.streamId, suspendedMs})
-    // Resume and heartbeat immediately: the glasses watchdog has been running
-    // the whole time, so the first keep-alive must not wait another interval.
-    this.lifecycle?.setActive(true)
-    this.lifecycle?.tickNow()
     // A resumed session is a fresh status baseline for subscribers.
     this.lastFanoutSignature = null
     this.fanout({
@@ -730,45 +669,10 @@ export class PhoneStreamCoordinator {
     return `phone-${prefix}-${Date.now().toString(36)}-${this.idCounter}`
   }
 
-  /** BLE keep-alives. StreamLifecycleController uses BgTimer so they survive MentraOS backgrounding. */
-  private startLifecycle(streamId: string): void {
-    // A new stream supersedes any deferred stop for the previous one.
+  /** Observe link/status; native SDK and ASG own controller liveness. */
+  private startLifecycle(_streamId: string): void {
     this.pendingBleStop = null
     this.attachLink()
-    this.lifecycle?.dispose()
-    const ctrl = new StreamLifecycleController(
-      {
-        logger: consoleLogger,
-        streamId,
-        keepAliveIntervalMs: this.timings.keepAliveIntervalMs,
-        ackTimeoutMs: this.timings.ackTimeoutMs,
-        maxMissedAcks: this.timings.maxMissedAcks,
-      },
-      {
-        sendKeepAlive: async (ackId) => {
-          await BluetoothSdk.sendExternallyManagedStreamKeepAlive({
-            type: "keep_stream_alive",
-            streamId,
-            ackId,
-          })
-        },
-        onTimeout: async () => {
-          this.fanout({
-            streamId,
-            source: "coordinator",
-            status: "error",
-            data: {reason: "keep_alive_timeout"},
-          })
-          await this.runExclusive(async () => {
-            // The stream this timeout was bound to may already be gone.
-            if (this.current?.streamId !== streamId) return
-            await this.teardownLocked("keep_alive_timeout")
-          })
-        },
-      },
-    )
-    ctrl.setActive(true)
-    this.lifecycle = ctrl
   }
 
   private startCloudflareStatusPoll(entry: ManagedEntry): void {
@@ -967,10 +871,7 @@ export class PhoneStreamCoordinator {
 
   private fanout(update: StreamStatusUpdate): void {
     if (!this.current || !this.statusSubscriber) return
-    const targets =
-      this.current.kind === "managed"
-        ? Array.from(this.current.subscribers)
-        : [this.current.packageName]
+    const targets = this.current.kind === "managed" ? Array.from(this.current.subscribers) : [this.current.packageName]
     for (const pkg of targets) {
       try {
         this.statusSubscriber(pkg, update)
@@ -1000,12 +901,6 @@ export class PhoneStreamCoordinator {
       this.suspended = null
     }
 
-    // Dispose the lifecycle controller immediately so it doesn't fire one
-    // more keep-alive against a stream we're tearing down. The transition
-    // lock guarantees no new lifecycle is started concurrently.
-    this.lifecycle?.dispose()
-    this.lifecycle = null
-
     // With the link down a BLE write can only fail (and hold the transition
     // lock for the native timeout). Defer it to the next reconnect instead.
     const linkUp = this.linkSource.isConnected()
@@ -1075,8 +970,8 @@ function pickIngestUrl(p: ProvisionResult, preference?: "srt" | "whip" | "rtmp")
     preference === "whip"
       ? p.webrtcPublishUrl || p.srtUrl || p.rtmpUrl
       : preference === "rtmp"
-        ? p.rtmpUrl || p.srtUrl || p.webrtcPublishUrl
-        : p.srtUrl || p.rtmpUrl || p.webrtcPublishUrl
+      ? p.rtmpUrl || p.srtUrl || p.webrtcPublishUrl
+      : p.srtUrl || p.rtmpUrl || p.webrtcPublishUrl
   if (!url) {
     throw new Error("Cloudflare provision returned no usable ingest URL")
   }

package/src/services/asg/galleryNotices.ts

@@ -12,6 +12,7 @@ export type GalleryNoticeCode =
   | "wifi_initializing"
   | "wifi_off"
   | "location_services_off"
+  | "location_permission_required"
   | "camera_roll_permission_required"
   | "connect_to_glasses"