@glassly/engine 0.3.3-dev.670 → 0.3.4-dev.674

package/src/services/settingsBridge.ts

@@ -12,7 +12,10 @@
  * that in its storage.
  */
 
+import type {ControllerStatus, PairedController} from "@glassly/bluetooth-sdk"
+
 import {ControllerTypes} from "../types/enums"
+import {hasInput2d, isControllerReady} from "./controllers"
 
 export type SettingsBridgeAccess = "read" | "write"
 
@@ -39,11 +42,11 @@ export const SETTINGS_BRIDGE_KEYS: Readonly<Record<string, SettingsBridgeAccess>
 
 /**
  * Read-only keys the engine computes: whether the wearer can see the phone,
- * whether the foreground miniapp is drawing on the glasses, the ring's
- * battery, and whether a 2D controller is connected. They change on their
- * own clocks; the runtime pushes them like stored keys.
+ * whether the foreground miniapp is drawing on the glasses, and the paired
+ * controllers with their battery and input. They change on their own clocks;
+ * the runtime pushes them like stored keys.
  */
-export const DERIVED_SETTINGS_KEYS = ["phone_active", "foreground_app_on_screen", "ring_battery", "input_2d"] as const
+export const DERIVED_SETTINGS_KEYS = ["phone_active", "foreground_app_on_screen", "controllers"] as const
 export type DerivedSettingsKey = (typeof DERIVED_SETTINGS_KEYS)[number]
 
 export function isDerivedSettingsKey(key: string): key is DerivedSettingsKey {
@@ -91,31 +94,66 @@ export function validateSettingsSet(payload: Record<string, unknown>): SettingsS
   return {ok: true, key, value: payload.value}
 }
 
-/** The ring's battery as the dashboard shows it: the relayed ring first, else the controller. */
-export interface RingBattery {
+/** One paired controller as the `controllers` derived key serves it. */
+export interface ControllerSettingEntry {
+  id: string
+  model: string
+  name: string
+  /** Delivering input. */
   connected: boolean
-  /** -1 when unknown. */
-  level: number
+  /** level -1 when unknown. */
+  battery: {level: number; charging: boolean}
+  /** Swipes sideways as well as up and down (the Meta Neural Band). */
+  input2d: boolean
 }
 
-export function ringBatteryFrom(glasses: {
+/** What the glasses report about the ring linked to them (G2 with the R1 routed through it). */
+export interface RelayedRing {
   ringConnected: boolean
   ringBatteryLevel: number
-  controllerConnected: boolean
-  controllerBatteryLevel: number
-}): RingBattery {
-  const relayed = glasses.ringConnected && glasses.ringBatteryLevel >= 0
-  return {
-    connected: relayed || glasses.controllerConnected,
-    level: relayed ? glasses.ringBatteryLevel : glasses.controllerBatteryLevel,
-  }
+  ringCharging: boolean
+}
+
+/**
+ * The R1 the glasses' ring report is about: a ring routed through the G2 keeps
+ * its phone link for telemetry, so prefer a linked ring, else the first one.
+ */
+function relayedRingId(
+  records: PairedController[],
+  statuses: Record<string, ControllerStatus> | undefined,
+): string | undefined {
+  const rings = records.filter((record) => record.model === ControllerTypes.R1)
+  return (rings.find((ring) => statuses?.[ring.id]?.connected === true) ?? rings[0])?.id
 }
 
 /**
- * Whether the connected controller swipes in two dimensions (sideways as well
- * as up and down): the Meta Neural Band's thumb swipes. The R1 ring and the
- * glasses' temples are one-dimensional.
+ * One entry per paired record, registry order. While the glasses report a
+ * linked ring, that report is that ring's link and battery: a ring routed
+ * through the G2 reports there, not to the phone.
  */
-export function input2dFrom(glasses: {controllerConnected: boolean}, controllerType: unknown): boolean {
-  return glasses.controllerConnected && controllerType === ControllerTypes.NEURAL_BAND
+export function controllersSettingFrom(
+  records: PairedController[],
+  statuses: Record<string, ControllerStatus> | undefined,
+  relayed: RelayedRing,
+): ControllerSettingEntry[] {
+  const relayedId = relayed.ringConnected ? relayedRingId(records, statuses) : undefined
+  return records.map((record) => {
+    const status = statuses?.[record.id]
+    let connected = isControllerReady(status)
+    let battery = {level: status?.batteryLevel ?? -1, charging: status?.charging === true}
+    if (record.id === relayedId) {
+      connected = true
+      if (relayed.ringBatteryLevel >= 0) {
+        battery = {level: relayed.ringBatteryLevel, charging: relayed.ringCharging}
+      }
+    }
+    return {
+      id: record.id,
+      model: record.model,
+      name: record.name,
+      connected,
+      battery,
+      input2d: connected && hasInput2d(record.model),
+    }
+  })
 }

package/src/stores/bluetoothSettingKeys.ts

@@ -20,8 +20,10 @@ export const MENTRA_LIVE_SETTING_KEYS: string[] = [
   "pending_wearable",
   "device_name",
   "device_address",
-  "default_controller",
+  "controllers",
   "pending_controller",
+  // Deprecated, kept so native can migrate and clear them:
+  "default_controller",
   "controller_device_name",
   "controller_address",
 ]

package/src/stores/core.ts

@@ -10,7 +10,6 @@ export interface CoreState extends PublicBluetoothStatus {
 const initialState: PublicBluetoothStatus = {
   // state:
   searching: false,
-  searchingController: false,
   micRanking: ["glasses", "phone", "bluetooth", "bluetoothClassic"],
   systemMicUnavailable: false,
   currentMic: null,

package/src/stores/glasses.ts

@@ -168,12 +168,8 @@ const initialState: GlassesStore = {
   otaProgress: null,
   otaInProgress: false,
   mtkUpdatedThisSession: false,
-  // ring:
-  controllerConnected: false,
-  controllerFullyBooted: false,
-  controllerMacAddress: "",
-  controllerBatteryLevel: -1,
-  controllerSignalStrength: -1,
+  // controller drivers by registry id:
+  controllers: {},
   // iOS ANCS consent (G2 consumes notifications on-firmware):
   ancsAuthorized: false,
   // G2 Glassly CFW keyboard bridge (revision 39+):

package/src/stores/settings.ts

@@ -386,6 +386,17 @@ export const SETTINGS: Record<string, Setting> = {
     saveOnServer: false,
     persist: true,
   },
+  // Which on-device LLM export serves session.ai calls routed to the phone
+  // (forceLocal / localFallback): a LocalLlmModelId ("qwen3-0.6b" |
+  // "qwen3-1.7b" | "qwen3-4b"). Device-local; the model files live on this
+  // phone. See LocalLlmModelManager.
+  local_llm_model: {
+    key: "local_llm_model",
+    defaultValue: () => "qwen3-1.7b",
+    writable: true,
+    saveOnServer: false,
+    persist: true,
+  },
   // Developer override for the ASG OTA manifest URL. null/empty = no override;
   // the normal selection applies (legacy-glasses gate, EXPO_PUBLIC_ASG_OTA_VERSION_URL,
   // glasses-reported URL, then production). See resolveOtaManifestUrl.
@@ -477,6 +488,17 @@ export const SETTINGS: Record<string, Setting> = {
     saveOnServer: false,
     persist: true,
   },
+  // Paired controllers (PairedController records) in pairing order. Native
+  // upserts on ready and removes on forget, echoing the array via save_setting.
+  controllers: {
+    key: "controllers",
+    defaultValue: () => [],
+    writable: true,
+    saveOnServer: false,
+    persist: true,
+    nativeAuthoritative: true,
+  },
+  // Deprecated single-slot identity: seeded to native for its one-shot migration into `controllers`; never read in JS.
   default_controller: {
     key: "default_controller",
     defaultValue: () => "",
@@ -487,7 +509,7 @@ export const SETTINGS: Record<string, Setting> = {
   },
   // Display name of the keyboard the glasses remember (G2 Glassly CFW). The
   // native bridge owns the address/bond; this only keeps the home card and
-  // settings row populated before the glasses connect, like default_controller.
+  // settings row populated before the glasses connect.
   keyboard_name: {
     key: "keyboard_name",
     defaultValue: () => "",
@@ -503,6 +525,7 @@ export const SETTINGS: Record<string, Setting> = {
     persist: true,
     nativeAuthoritative: true,
   },
+  // Deprecated: see default_controller.
   controller_device_name: {
     key: "controller_device_name",
     defaultValue: () => "",
@@ -511,6 +534,7 @@ export const SETTINGS: Record<string, Setting> = {
     persist: true,
     nativeAuthoritative: true,
   },
+  // Deprecated: see default_controller.
   controller_address: {
     key: "controller_address",
     defaultValue: () => "",
@@ -1179,8 +1203,10 @@ export const BLUETOOTH_SETTING_KEYS: string[] = [
   SETTINGS.device_name.key,
   SETTINGS.device_address.key,
   SETTINGS.project_name.key,
-  SETTINGS.default_controller.key,
+  SETTINGS.controllers.key,
   SETTINGS.pending_controller.key,
+  // Deprecated, kept so native can migrate and clear them:
+  SETTINGS.default_controller.key,
   SETTINGS.controller_device_name.key,
   SETTINGS.controller_address.key,
   // offline applets: