@glassly/engine 0.1.0-dev.1 → 0.1.0-dev.100

package/src/services/effectiveCapabilities.ts

@@ -1,12 +1,19 @@
 /**
  * Effective device capabilities — the static model profile plus what the
- * connected firmware reports at runtime. Today the only runtime override is
- * the scene canvas: Glassly CFW on the G2 rasterizes scenes phone-side
- * straight into the 640×480 panel, so the drawable canvas grows past stock's
- * 576×288. Native publishes the canvas into the glasses status (0 = none).
+ * connected firmware reports at runtime. The runtime override is the scene
+ * canvas: Glassly CFW on the G2 rasterizes scenes phone-side straight into
+ * the 640×480 panel, so the drawable canvas grows past stock's 576×288.
+ * Native publishes the canvas into the glasses status (0 = none). Because
+ * that path is phone-side rasterization, the stock firmware's container
+ * pools (6 text / 4 image) don't bound a CFW frame either — element caps are
+ * lifted alongside the canvas, bounded only to keep frames sane.
  */
 import {useGlassesStore} from "../stores/glasses"
-import {getModelCapabilities, type Capabilities, type DeviceTypes} from "../types"
+import {DeviceTypes, getModelCapabilities, type Capabilities} from "../types"
+import {isGlasslyCfwFirmwareVersion} from "./CustomDashboardModel"
+
+const CFW_MAX_TEXT_ELEMENTS = 24
+const CFW_MAX_IMAGE_ELEMENTS = 16
 
 export interface SceneCanvasSize {
   width: number
@@ -22,6 +29,19 @@ export function runtimeSceneCanvas(): SceneCanvasSize | null {
 export function getEffectiveCapabilities(model: DeviceTypes): Capabilities {
   const base = getModelCapabilities(model)
   const canvas = runtimeSceneCanvas()
-  if (!base.display || !canvas) return base
-  return {...base, display: {...base.display, width: canvas.width, height: canvas.height}}
+  // The firmware marker lifts the caps even when no canvas has been published:
+  // CFW classification rides the version string, and a G2 running Glassly CFW
+  // always rasterizes phone-side regardless of whether native reported dims.
+  const cfw = model === DeviceTypes.G2 && isGlasslyCfwFirmwareVersion(useGlassesStore.getState().firmwareVersion)
+  if (!base.display || (!canvas && !cfw)) return base
+  return {
+    ...base,
+    display: {
+      ...base.display,
+      width: canvas?.width ?? base.display.width,
+      height: canvas?.height ?? base.display.height,
+      maxTextElements: Math.max(base.display.maxTextElements ?? 0, CFW_MAX_TEXT_ELEMENTS),
+      maxImageElements: Math.max(base.display.maxImageElements ?? 0, CFW_MAX_IMAGE_ELEMENTS),
+    },
+  }
 }

package/src/services/gestureClaims.ts

@@ -0,0 +1,28 @@
+/**
+ * Gesture-claim arbitration (CLAIM_GESTURES), split out of
+ * LocalMiniappRuntime so it is unit-testable — the runtime module itself
+ * pulls a native import surface bun can't parse.
+ */
+
+/**
+ * True iff the miniapp in front of the user has claimed `gesture`.
+ *
+ * "In front" spans both screens. Most claiming apps are glasses-side: the
+ * terminal runs as a background miniapp with the phone pocketed, so gating on
+ * the phone's Compositor foreground alone left its double_tap claim inert and
+ * the system dashboard kept opening mid-session. Glasses ownership is the
+ * primary signal; the phone foreground is still honored for apps driven from
+ * the handset. A claimer that owns neither screen is background and never
+ * hijacks a system gesture.
+ */
+export function claimsGesture(
+  claims: ReadonlyMap<string, ReadonlySet<string>>,
+  gesture: string,
+  glassesOwner: string | null,
+  phoneForeground: string | null,
+): boolean {
+  for (const pkg of [glassesOwner, phoneForeground]) {
+    if (pkg && claims.get(pkg)?.has(gesture) === true) return true
+  }
+  return false
+}

package/src/services/gestureDotGlyphs.ts

@@ -0,0 +1,15 @@
+/**
+ * GENERATED by scripts/gen-gesture-dot-glyphs.mjs — do not edit by hand.
+ * 24×24 8-bit grayscale PNGs (white on black) for the gesture-dots indicator.
+ */
+export const GESTURE_DOT_GLYPH_SIZE = 24
+
+export type GestureDotGlyph = "dot" | "up" | "down" | "hold" | "blank"
+
+export const GESTURE_DOT_GLYPHS: Record<GestureDotGlyph, string> = {
+  dot: "iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAAAAADFHGIkAAAALklEQVR4nM2QsQ0AAAjC/P/pmrhqZ+xIF6DqBQyWbwO3gduAmKjQuj7QL/ETEzQmMptl7Q9NBAAAAABJRU5ErkJggg==",
+  up: "iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAAAAADFHGIkAAAAMElEQVR4nGNgoCv4////f1zi2GT+/4ciTHE4RhdHIlDFUUhkcTQKQx9WBw8PCVoBAIcbOcf3xeeBAAAAAElFTkSuQmCC",
+  down: "iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAAAAADFHGIkAAAALUlEQVR4nGNgoC/4/3+4SkBFUCkkNjKJIoMg0GRgGEMGgrC4CQSwuxanR2gEAO1/Ocfgp8uvAAAAAElFTkSuQmCC",
+  hold: "iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAAAAADFHGIkAAAAR0lEQVR4nGNgIAj+gwF2UUy5//+xyyDzcLGRedjMhTEwXAKl0Z0Lof7DKbgMhBpQCZzOxedBHEGCMxAJBTXhKGRAA9hFMQEANr7jHQU9fO0AAAAASUVORK5CYII=",
+  blank: "iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAAAAADFHGIkAAAAD0lEQVR4nGNgGAWjgPoAAAJYAAGgxYwDAAAAAElFTkSuQmCC",
+}

package/src/services/glassesClockSync.ts

@@ -2,7 +2,7 @@
  * Push phone time to glasses only when clock skew is detected (gallery sync, OTA, etc.).
  */
 
-import BluetoothSdk from "@glassly/bluetooth-sdk/internal"
+import BluetoothSdk from "@glassly/bluetooth-sdk"
 import {BgTimer} from "../utils/timers"
 import {useGlassesStore} from "../stores/glasses"
 
@@ -87,6 +87,10 @@ export async function handleOtaClockSkewFromGlasses(
       lastOtaClockFixAt = Date.now()
       const {buildNumber, otaVersionUrl} = useGlassesStore.getState()
       const manifestUrl = resolveOtaManifestUrl(otaVersionUrl, buildNumber)
+      if (!manifestUrl) {
+        console.warn("[GlassesClockSync] OTA restart skipped because this build has no manifest pin")
+        return false
+      }
       console.log("[GlassesClockSync] ⏰ Restarting OTA with ota_start after clock fix")
       await BluetoothSdk.startOtaUpdate(manifestUrl)
       return true

package/src/services/iosNotificationAppCatalog.ts

@@ -0,0 +1,39 @@
+/**
+ * Seeded catalog of common iOS apps that post notifications, keyed by bundle
+ * id. iOS has no installed-apps enumeration — the filter UI shows this catalog
+ * plus apps the glasses have actually observed via ANCS — and the on-glass
+ * allowlist push needs known ids so a blocked app doesn't take every
+ * not-yet-seen app down with it (the firmware filter is allow-based).
+ */
+export interface IosNotificationApp {
+  appId: string
+  displayName: string
+}
+
+export const IOS_NOTIFICATION_APP_CATALOG: IosNotificationApp[] = [
+  {appId: "com.apple.MobileSMS", displayName: "Messages"},
+  {appId: "com.apple.mobilephone", displayName: "Phone"},
+  {appId: "com.apple.mobilemail", displayName: "Mail"},
+  {appId: "com.apple.mobilecal", displayName: "Calendar"},
+  {appId: "com.apple.reminders", displayName: "Reminders"},
+  {appId: "com.apple.facetime", displayName: "FaceTime"},
+  {appId: "net.whatsapp.WhatsApp", displayName: "WhatsApp"},
+  {appId: "ph.telegra.Telegraph", displayName: "Telegram"},
+  {appId: "org.whispersystems.signal", displayName: "Signal"},
+  {appId: "com.google.Gmail", displayName: "Gmail"},
+  {appId: "com.microsoft.Office.Outlook", displayName: "Outlook"},
+  {appId: "com.tinyspeck.chatlyio", displayName: "Slack"},
+  {appId: "com.hammerandchisel.discord", displayName: "Discord"},
+  {appId: "com.microsoft.skype.teams", displayName: "Teams"},
+  {appId: "com.facebook.Messenger", displayName: "Messenger"},
+  {appId: "com.facebook.Facebook", displayName: "Facebook"},
+  {appId: "com.burbn.instagram", displayName: "Instagram"},
+  {appId: "com.atebits.Tweetie2", displayName: "X"},
+  {appId: "com.zhiliaoapp.musically", displayName: "TikTok"},
+  {appId: "com.toyopagroup.picaboo", displayName: "Snapchat"},
+  {appId: "com.linkedin.LinkedIn", displayName: "LinkedIn"},
+  {appId: "com.google.ios.youtube", displayName: "YouTube"},
+  {appId: "com.spotify.client", displayName: "Spotify"},
+  {appId: "com.ubercab.UberClient", displayName: "Uber"},
+  {appId: "com.venmo.TouchFree", displayName: "Venmo"},
+]

package/src/services/otaDisplayState.ts

@@ -1,4 +1,4 @@
-import type {OtaProgress, OtaStatus} from "@glassly/bluetooth-sdk/internal"
+import type {OtaProgress, OtaStatus} from "@glassly/bluetooth-sdk"
 
 import {isLegacyShapedOtaStatus} from "./otaInstallPolicy"
 

package/src/services/otaInstallPolicy.ts

@@ -1,5 +1,5 @@
 /** Shared OTA progress watchdog timings (see progress-legacy.tsx / progress.tsx). */
-import type {OtaProgress, OtaStatus} from "@glassly/bluetooth-sdk/internal"
+import type {OtaProgress, OtaStatus} from "@glassly/bluetooth-sdk"
 
 /**
  * First glasses `build_number` (ASG `versionCode`) that uses `progress.tsx` with unified
@@ -32,6 +32,8 @@ export const PING_INTERVAL_MS = 10_000
 export const QUERY_REPLY_TIMEOUT_MS = 6000
 /** 15s lockout on the Continue button after a BES restart, to prevent an accidental tap. */
 export const BES_CONTINUE_LOCKOUT_MS = 15_000
+/** Fail closed if a BES reboot never reconnects; normal restarts complete in a fraction of this window. */
+export const BES_RESTART_TIMEOUT_MS = 120_000
 
 // --- Legacy old-build (< MINIMUM_OTA_STATUS_BUILD) OTA policy (WP 8C) ---
 //
@@ -51,6 +53,7 @@ export const LEGACY_MTK_INSTALL_TIMEOUT_MS = MTK_INSTALL_TIMEOUT_MS + LEGACY_EXT
 export const LEGACY_GLOBAL_OTA_TIMEOUT_MS = GLOBAL_OTA_TIMEOUT_MS + LEGACY_EXTRA_TIMEOUT_MS
 export const LEGACY_PING_INTERVAL_MS = PING_INTERVAL_MS + LEGACY_EXTRA_TIMEOUT_MS
 export const LEGACY_BES_CONTINUE_LOCKOUT_MS = BES_CONTINUE_LOCKOUT_MS + LEGACY_EXTRA_TIMEOUT_MS
+export const LEGACY_BES_RESTART_TIMEOUT_MS = BES_RESTART_TIMEOUT_MS + LEGACY_EXTRA_TIMEOUT_MS
 /**
  * After a legacy apk `install FINISHED` observed in-flight, the legacy screen held the
  * completed state for 12s (+20s pad) so the ASG process restart settles (and fresh
@@ -122,6 +125,7 @@ export function selectOtaProtocolProfile(
 export const OtaProgressMessages = {
   stalledOrStuck: "Update may have failed. Ensure glasses have internet access and try again.",
   globalTimeout: "Update took too long. Please try again.",
+  restartTimeout: "Glasses did not finish restarting. Restart them before trying the update again.",
   sendOtaStartFailed: "Failed to communicate with glasses.",
   hotspotArtifactDownloadFailed: "Could not download the update to your phone. Check phone internet and try again.",
   hotspotArtifactVerifyFailed: "The update package could not be verified. Please try again later.",

package/src/services/otaLegacyMapping.ts

@@ -1,4 +1,4 @@
-import type {OtaProgress, OtaProgressStatus, OtaStatus} from "@glassly/bluetooth-sdk/internal"
+import type {OtaProgress, OtaProgressStatus, OtaStatus} from "@glassly/bluetooth-sdk"
 
 /** Normalized ota_status fields (snake_case) after bridging Core/expo (snake or camel). */
 export type NormalizedOtaStatusEvent = {

package/src/services/otaManifestPolicy.ts

@@ -0,0 +1,43 @@
+// Legacy production manifest — pre-39 glasses install from this (they ignore ota_start's URL).
+const OTA_VERSION_URL_LEGACY_PROD = "https://ota.glassly.ai/prod_live_version.json"
+
+function trimmed(value?: string | null): string | null {
+  const result = value?.trim()
+  return result || null
+}
+
+export function isLegacyAsgOtaStartBuild(glassesBuildNumber?: string | null): boolean {
+  const buildNumber = Number.parseInt(glassesBuildNumber ?? "", 10)
+  return Number.isFinite(buildNumber) && buildNumber < 39
+}
+
+export function selectModernOtaManifestPin({
+  developerOverride,
+  hostReleasePin,
+  engineReleasePin,
+}: {
+  developerOverride?: string | null
+  hostReleasePin?: string | null
+  engineReleasePin?: string | null
+}): string | null {
+  return trimmed(developerOverride) || trimmed(hostReleasePin) || trimmed(engineReleasePin)
+}
+
+export function resolveOtaManifestPolicy({
+  glassesUrl,
+  glassesBuildNumber,
+  developerOverride,
+  hostReleasePin,
+  engineReleasePin,
+}: {
+  glassesUrl?: string | null
+  glassesBuildNumber?: string | null
+  developerOverride?: string | null
+  hostReleasePin?: string | null
+  engineReleasePin?: string | null
+}): string | null {
+  if (isLegacyAsgOtaStartBuild(glassesBuildNumber)) {
+    return trimmed(glassesUrl) || OTA_VERSION_URL_LEGACY_PROD
+  }
+  return selectModernOtaManifestPin({developerOverride, hostReleasePin, engineReleasePin})
+}

package/src/services/otaManifestUrl.ts

@@ -1,20 +1,6 @@
-import {sdkPinnedOtaManifestUrl} from "@glassly/bluetooth-sdk/internal"
-
+import {ENGINE_RELEASE_METADATA} from "../generated/releaseMetadata"
 import {SETTINGS, useSettingsStore} from "../stores/settings"
-
-// Legacy production manifest — pre-39 glasses install from this (they ignore ota_start's URL).
-const OTA_VERSION_URL_LEGACY_PROD = "https://ota.glassly.ai/prod_live_version.json"
-// Modern production fleet manifest (v2). Only a last-resort fallback when the SDK-derived pin
-// URL is somehow unavailable; modern glasses honor ota_start's URL, so this must be the v2
-// artifact, not the legacy v1 rescue manifest.
-const OTA_VERSION_URL_PROD = "https://ota.glassly.ai/prod_live_version_v2.json"
-
-function isLegacyAsgOtaStartBuild(glassesBuildNumber?: string | null): boolean {
-  const buildNumber = Number.parseInt(glassesBuildNumber ?? "", 10)
-  // ASG builds before 39 ignore ota_start.ota_version_url, so compare against
-  // the URL they will actually use.
-  return Number.isFinite(buildNumber) && buildNumber < 39
-}
+import {resolveOtaManifestPolicy, selectModernOtaManifestPin} from "./otaManifestPolicy"
 
 function getOtaVersionUrlDevOverride(): string | null {
   // Super mode only: a wrong OTA manifest can brick glasses, so a saved
@@ -27,27 +13,32 @@ function getOtaVersionUrlDevOverride(): string | null {
   return trimmed || null
 }
 
-export function resolveOtaManifestUrl(glassesUrl?: string | null, glassesBuildNumber?: string | null): string {
-  const deviceUrl = glassesUrl?.trim()
-  if (isLegacyAsgOtaStartBuild(glassesBuildNumber)) {
-    // Legacy glasses ignore ota_start.ota_version_url and install from their
-    // compiled default, so the developer override does not apply to them either.
-    return deviceUrl || OTA_VERSION_URL_LEGACY_PROD
-  }
+function getHostReleasePin(): string | null {
+  const value = process.env.EXPO_PUBLIC_ASG_OTA_VERSION_URL?.trim()
+  return value || null
+}
 
-  const devOverrideUrl = getOtaVersionUrlDevOverride()
-  if (devOverrideUrl) {
-    return devOverrideUrl
-  }
+function getEmbeddedEngineReleasePin(): string | null {
+  const value = ENGINE_RELEASE_METADATA.otaManifestUrl?.trim()
+  return value || null
+}
 
-  const envUrl = process.env.EXPO_PUBLIC_ASG_OTA_VERSION_URL?.trim()
-  if (envUrl) {
-    return envUrl
-  }
+export function hasConfiguredModernOtaManifestPin(): boolean {
+  return Boolean(
+    selectModernOtaManifestPin({
+      developerOverride: getOtaVersionUrlDevOverride(),
+      hostReleasePin: getHostReleasePin(),
+      engineReleasePin: getEmbeddedEngineReleasePin(),
+    }),
+  )
+}
 
-  // The phone owns manifest selection: modern glasses are driven with the manifest pinned to
-  // this app's Bluetooth SDK version. Modern ASG builds report no manifest URL of their own;
-  // a glasses-reported URL (older modern builds advertising their baked fleet default) is only
-  // a last resort when the SDK version is somehow unavailable.
-  return sdkPinnedOtaManifestUrl() || deviceUrl || OTA_VERSION_URL_PROD
+export function resolveOtaManifestUrl(glassesUrl?: string | null, glassesBuildNumber?: string | null): string | null {
+  return resolveOtaManifestPolicy({
+    glassesUrl,
+    glassesBuildNumber,
+    developerOverride: getOtaVersionUrlDevOverride(),
+    hostReleasePin: getHostReleasePin(),
+    engineReleasePin: getEmbeddedEngineReleasePin(),
+  })
 }

package/src/services/otaReleaseVersion.ts

@@ -0,0 +1,22 @@
+const COORDINATED_RELEASE_VERSION = /^\d+\.\d+\.\d+(?:-(?:dev|beta)\.[1-9]\d*)?$/
+
+type OtaReleaseVersionInput = {
+  manifestReleaseVersion?: string | null
+  manifestUrl: string
+  packagedManifestUrl?: string | null
+  packagedReleaseIdentity?: string | null
+}
+
+function validReleaseVersion(version: string | null | undefined): string | null {
+  const trimmed = version?.trim()
+  return trimmed && COORDINATED_RELEASE_VERSION.test(trimmed) ? trimmed : null
+}
+
+/** Resolve the label for the selected OTA pin, including stable promotion of exact beta OTA bytes. */
+export function resolveOtaReleaseVersion(input: OtaReleaseVersionInput): string | null {
+  const packagedRelease = validReleaseVersion(input.packagedReleaseIdentity)
+  if (packagedRelease && input.packagedManifestUrl?.trim() === input.manifestUrl.trim()) {
+    return packagedRelease
+  }
+  return validReleaseVersion(input.manifestReleaseVersion)
+}

package/src/stores/appVisibility.ts

@@ -0,0 +1,3 @@
+/** Combine registry-enforced visibility with the user's home-screen choice. */
+export const resolveHiddenStatus = (registryHidden: boolean, userHidden: boolean): boolean =>
+  registryHidden || userHidden

package/src/stores/apps.ts

@@ -25,6 +25,7 @@ import {islandNotifications} from "../services/NotificationsEmitter"
 import sttModelManager from "../services/STTModelManager"
 import {miniappLauncher} from "../services/MiniappLauncher"
 import {miniappRunningRegistry} from "../services/MiniappRunningRegistry"
+import {resolveHiddenStatus} from "./appVisibility"
 import {SETTINGS, useSettingsStore} from "./settings"
 import BluetoothSdk from "@glassly/bluetooth-sdk"
 
@@ -221,7 +222,12 @@ function projectApps(previousState: AppStatusState, localApps: ClientApp[]): Cli
       ...app,
       screenshot: previousByPackage.get(app.packageName)?.screenshot ?? app.screenshot,
       compatibility: HardwareCompatibility.checkCompatibility(app.hardwareRequirements, capabilities),
-      hidden: previousState.getHiddenStatus(app.packageName),
+      // A registry source can force an app off the primary home screen (for
+      // example, Miniapp Developer while its home-screen setting is disabled).
+      // Compose that gate with the user's persisted home-screen layout instead
+      // of replacing it, otherwise a default-false persisted value makes a
+      // source-hidden app visible again during projection.
+      hidden: resolveHiddenStatus(app.hidden, previousState.getHiddenStatus(app.packageName)),
       // Derive the foreground flag from the store's single source of truth
       // (`foregroundedPackage`), NOT from the previous snapshot. Carrying it over
       // per-app meant a refresh that momentarily omitted an app (e.g. the

package/src/stores/core.ts

@@ -1,13 +1,13 @@
 import {create} from "zustand"
 import {subscribeWithSelector} from "zustand/middleware"
-import type {BluetoothStatus} from "@glassly/bluetooth-sdk/internal"
+import type {PublicBluetoothStatus} from "@glassly/bluetooth-sdk"
 
-export interface CoreState extends BluetoothStatus {
-  setCoreInfo: (info: Partial<BluetoothStatus>) => void
+export interface CoreState extends PublicBluetoothStatus {
+  setCoreInfo: (info: Partial<PublicBluetoothStatus>) => void
   reset: () => void
 }
 
-const initialState: BluetoothStatus = {
+const initialState: PublicBluetoothStatus = {
   // state:
   searching: false,
   searchingController: false,

package/src/stores/display.ts

@@ -29,54 +29,34 @@ const DISPLAY_COALESCE_MS = 150
 
 type DisplayEvent = Record<string, unknown> & {view?: string}
 
-function applyDisplayEvent(
-  set: (partial: Partial<DisplayStore>) => void,
-  get: () => DisplayStore,
-  event: DisplayEvent,
-) {
-  const currentView = get().view
-  const targetBucket = event.view === "dashboard" ? "dashboardEvent" : "mainEvent"
-
-  const updates: Partial<DisplayStore> = {
-    [targetBucket]: event,
-  }
-
-  // also update the current event if the view is the same:
-  if (event.view === currentView) {
-    updates.currentEvent = event
-  }
-
-  const visibleEvent = (updates.currentEvent ?? event) as DisplayEvent
-  const textLines = extractDisplayText(visibleEvent)
+function applyDisplayEvent(set: (partial: Partial<DisplayStore>) => void, event: DisplayEvent) {
+  const textLines = extractDisplayText(event)
   if (textLines.some((line) => line.trim() !== "")) {
     logE2EMetric("display_store_update", {
-      view: visibleEvent.view ?? currentView,
-      layout_type: (visibleEvent.layout as {layoutType?: string} | undefined)?.layoutType ?? "",
+      view: event.view ?? "main",
+      layout_type: (event.layout as {layoutType?: string} | undefined)?.layoutType ?? "",
       text_lines: textLines,
     })
   }
-
-  set(updates)
+  set({currentEvent: event})
 }
 
 export interface DisplayStore {
+  /** The frame currently on the glasses — the mirror renders this. */
   currentEvent: any
-  dashboardEvent: any
-  mainEvent: any
+  /** True while the dashboard covers the main content (see DashboardCoordinator). */
+  dashboardActive: boolean
   setDisplayEvent: (event: DisplayEvent | string) => void
-  view: string
-  setView: (view: string) => void
+  setDashboardActive: (active: boolean) => void
 }
 
 let pendingDisplayEvent: DisplayEvent | null = null
 let displayCoalesceTimer: ReturnType<typeof BgTimer.setTimeout> | null = null
 
 export const useDisplayStore = create<DisplayStore>()(
-  subscribeWithSelector((set, get) => ({
+  subscribeWithSelector((set) => ({
     currentEvent: {} as any,
-    dashboardEvent: {} as any,
-    mainEvent: {} as any,
-    view: "main",
+    dashboardActive: false,
     setDisplayEvent: (event: DisplayEvent | string) => {
       const parsed: DisplayEvent = typeof event === "string" ? JSON.parse(event) : event
       pendingDisplayEvent = parsed
@@ -85,24 +65,12 @@ export const useDisplayStore = create<DisplayStore>()(
         displayCoalesceTimer = null
         const next = pendingDisplayEvent
         pendingDisplayEvent = null
-        if (next) applyDisplayEvent(set, get, next)
+        if (next) applyDisplayEvent(set, next)
       }, DISPLAY_COALESCE_MS)
     },
-    setView: (view: string) => {
-      const currentView = get().view
-      if (view === currentView) {
-        return
-      }
-
-      // update the view and the currentEvent with the corresponding event:
-      let newEvent
-      if (view === "dashboard") {
-        newEvent = get().dashboardEvent
-      } else {
-        newEvent = get().mainEvent
-      }
-      logE2EMetric("display_view_changed", {view})
-      set({view, currentEvent: newEvent})
+    setDashboardActive: (active: boolean) => {
+      logE2EMetric("display_view_changed", {view: active ? "dashboard" : "main"})
+      set({dashboardActive: active})
     },
   })),
 )
@@ -116,6 +84,6 @@ export function flushDisplayCoalesceForTests(): void {
   if (pendingDisplayEvent) {
     const event = pendingDisplayEvent
     pendingDisplayEvent = null
-    applyDisplayEvent(useDisplayStore.setState, useDisplayStore.getState, event)
+    applyDisplayEvent(useDisplayStore.setState, event)
   }
 }

package/src/stores/glasses.ts

@@ -1,12 +1,12 @@
 import type {
   GlassesConnectionStatus,
-  GlassesStatus,
   HotspotStatus,
   OtaProgress,
   OtaStatus,
   OtaUpdateInfo,
+  PublicGlassesStatus,
   WifiStatus,
-} from "@glassly/bluetooth-sdk/internal"
+} from "@glassly/bluetooth-sdk"
 import {isGlassesConnected, isGlassesLinkLayerBusy, isGlassesReady} from "../services/GlassesReadiness"
 import {create} from "zustand"
 import {subscribeWithSelector} from "zustand/middleware"
@@ -20,7 +20,14 @@ export const selectGlassesConnected = (state: {connection: GlassesConnectionStat
 
 export const selectGlassesReady = (state: {connection: GlassesConnectionStatus}) => isGlassesReady(state.connection)
 
-export interface GlassesState extends GlassesStatus {
+type EngineGlassesStatus = PublicGlassesStatus & {
+  otaUpdateAvailable: OtaUpdateInfo | null
+  otaProgress: OtaProgress | null
+  otaInProgress: boolean
+  otaVersionUrl: string
+}
+
+export interface GlassesState extends EngineGlassesStatus {
   systemTimeMs: number
   wifiStatusKnown: boolean
   setGlassesInfo: (info: GlassesInfoUpdate) => void
@@ -53,7 +60,7 @@ type LegacyHotspotFields = {
   hotspotLocalIp?: string
 }
 
-type GlassesInfoUpdate = Partial<GlassesStatus> & LegacyWifiFields & LegacyHotspotFields
+type GlassesInfoUpdate = Partial<EngineGlassesStatus> & LegacyWifiFields & LegacyHotspotFields
 
 function wifiFromLegacyFields(info: LegacyWifiFields): WifiStatus | null {
   if (info.wifiConnected === true) {
@@ -80,7 +87,7 @@ function hotspotFromLegacyFields(info: LegacyHotspotFields): HotspotStatus | nul
   return null
 }
 
-export const getGlasesInfoPartial = (state: GlassesStatus) => {
+export const getGlasesInfoPartial = (state: EngineGlassesStatus) => {
   const wifi = state.wifi
   const connected = isGlassesConnected(state.connection)
   return {
@@ -98,7 +105,7 @@ export const getGlasesInfoPartial = (state: GlassesStatus) => {
   }
 }
 
-interface GlassesStore extends GlassesStatus {
+interface GlassesStore extends EngineGlassesStatus {
   systemTimeMs: number
   mtkUpdatedThisSession: boolean
   wifiStatusKnown: boolean
@@ -158,6 +165,8 @@ const initialState: GlassesStore = {
   controllerMacAddress: "",
   controllerBatteryLevel: -1,
   controllerSignalStrength: -1,
+  // iOS ANCS consent (G2 consumes notifications on-firmware):
+  ancsAuthorized: false,
 }
 
 export const useGlassesStore = create<GlassesState>()(