@mentra/engine 3.2.0-dev.174 → 3.2.0-dev.180

package/src/services/BlobStore.ts

@@ -49,6 +49,7 @@ const SHARE_DIR_NAME = "mentra_blob_share"
  * files sooner under storage pressure.
  */
 const SHARE_CACHE_MAX_AGE_MS = 24 * 60 * 60 * 1000
+const SHARE_LAST_USED_FILE = ".last-shared"
 const META_KEY_ROOT = "mentraos_blobmeta_"
 /** Cap md5 computation so we don't block the JS thread hashing a huge file. */
 const MD5_MAX_BYTES = 50 * 1024 * 1024
@@ -103,6 +104,7 @@ interface ActiveReader {
 
 export class BlobStore {
   private readonly uploads = new Map<string, ActiveUpload>() // key: `${pkg} ${key}`
+  private readonly activeShareDirs = new Map<string, number>()
   private readonly readers = new Map<string, ActiveReader>() // key: host handle id
   /** user + package → committed usage bytes, cached; invalidated on commit/delete/clear. */
   private readonly usageCache = new Map<string, number>()
@@ -612,15 +614,18 @@ export class BlobStore {
       if (!root.exists) return
       const cutoff = now - SHARE_CACHE_MAX_AGE_MS
       for (const entry of root.list()) {
-        if (!(entry instanceof Directory)) continue
+        if (!(entry instanceof Directory) || this.activeShareDirs.has(entry.uri)) continue
         try {
+          const lastUsed = new File(entry, SHARE_LAST_USED_FILE)
           const info = entry.info()
           // modificationTime is available on both platforms; creationTime can
           // be absent on Android versions before API 26. The directory id
           // begins with Date.now().toString(36), which is a final fallback.
           const encoded = entry.name.split("-", 1)[0]
           const encodedTime = /^[0-9a-z]+$/.test(encoded) ? Number.parseInt(encoded, 36) : Number.NaN
-          const timestamp = info.modificationTime ?? info.creationTime ?? encodedTime
+          const timestamp = lastUsed.exists
+            ? Number(lastUsed.textSync())
+            : info.modificationTime ?? info.creationTime ?? encodedTime
           if (Number.isFinite(timestamp) && timestamp < cutoff) entry.delete()
         } catch {
           // Keep scanning if one cache entry disappears or is unreadable.
@@ -658,6 +663,7 @@ export class BlobStore {
     // right name + extension.
     let tempDir: Directory | null = null
     let cacheReady = false
+    let handoffStarted = false
     try {
       this.cleanupShareCache()
       tempDir = new Directory(Paths.cache, SHARE_DIR_NAME, sanitizeSegment(meta.fileName))
@@ -668,6 +674,11 @@ export class BlobStore {
         file.copy(temp)
       }
       cacheReady = true
+      // Persist each handoff's age, even when reusing old bytes. Directory
+      // modification time does not change when an existing file is shared.
+      new File(tempDir, SHARE_LAST_USED_FILE).write(String(Date.now()))
+      this.activeShareDirs.set(tempDir.uri, (this.activeShareDirs.get(tempDir.uri) ?? 0) + 1)
+      handoffStarted = true
       await Share.open({
         url: temp.uri,
         type: meta.mimeType || OCTET,
@@ -684,6 +695,18 @@ export class BlobStore {
         this.hooks.sendResult(packageName, requestId, true, {success: false})
       }
     } finally {
+      if (tempDir && handoffStarted) {
+        // Give async readers a full window after the chooser returns, even
+        // if it stayed open longer than the retention period.
+        try {
+          new File(tempDir, SHARE_LAST_USED_FILE).write(String(Date.now()))
+        } catch (error) {
+          console.warn(`${LOG_TAG}: could not refresh share retention`, error)
+        }
+        const remaining = (this.activeShareDirs.get(tempDir.uri) ?? 1) - 1
+        if (remaining > 0) this.activeShareDirs.set(tempDir.uri, remaining)
+        else this.activeShareDirs.delete(tempDir.uri)
+      }
       // Once a reusable cache entry is ready, retain it even if this particular
       // sheet is cancelled or fails: another concurrent/recent share may still
       // be reading the same file. Only remove an entry whose preparation did

package/src/services/OtaArtifactDownloader.ts

@@ -140,6 +140,16 @@ export async function prepareArtifacts(
   const prepared: PreparedOtaArtifact[] = []
   for (let index = 0; index < plan.length; index++) {
     const entry = plan[index]
+    // Announce each file before cache verification or native download callbacks,
+    // so the previous file's 100% cannot linger under the next file's label.
+    onProgress?.({
+      kind: entry.kind,
+      index,
+      totalCount: plan.length,
+      artifactPercent: 0,
+      bytesWritten: 0,
+      contentLength: 0,
+    })
 
     const cachedPath = `${directory}/${entry.sha256}`
     if (await RNFS.exists(cachedPath)) {

package/src/services/OtaInstallCoordinator.ts

@@ -22,6 +22,7 @@ import GlobalEventEmitter from "../utils/GlobalEventEmitter"
 import {isGlassesConnected, useGlassesStore} from "../stores/glasses"
 import {resolveOtaManifestUrl} from "./otaManifestUrl"
 import {hotspotOtaTransport, type HotspotOtaPhase} from "./HotspotOtaTransport"
+import type {OtaArtifactDownloadProgress} from "./OtaArtifactDownloader"
 import type {OtaCheckCurrentGlassesResult} from "./OtaUpdateCheckService"
 import {deriveDisplayState, type DisplayState} from "./otaDisplayState"
 import {
@@ -139,8 +140,10 @@ function latestPercentForStuck(otaStatus: OtaStatus | null, otaProgress: OtaProg
  * reply that cancels the fallback.
  */
 function hasRecoveringOtaReply(otaStatus: OtaStatus | null, otaProgress: OtaProgress | null): boolean {
-  if (otaProgress) return true
-  return !!otaStatus && otaStatus.status !== "idle"
+  // OtaService projects status into legacy progress too: idle becomes STARTED.
+  // Neither that projection nor progress retained across reboot proves activity.
+  if (otaStatus) return otaStatus.status !== "idle"
+  return !!otaProgress
 }
 
 /** Read model the host progress screen renders from. */
@@ -171,6 +174,7 @@ export interface OtaInstallSnapshot {
   /** Pre-ota_start phone staging/join state for a hotspot attempt. */
   hotspotPhase: HotspotOtaPhase
   hotspotArtifactPercent: number | null
+  hotspotArtifact: OtaArtifactDownloadProgress | null
   /** Transport selected from the checked glasses capabilities and Wi-Fi state. */
   transport: "wifi" | "hotspot"
 }
@@ -189,6 +193,7 @@ class OtaInstallCoordinator {
   private hotspotManifestUrl: string | null = null
   private hotspotPhase: HotspotOtaPhase = "idle"
   private hotspotArtifactPercent: number | null = null
+  private hotspotArtifact: OtaArtifactDownloadProgress | null = null
 
   // Genuinely session-local state (was component state/refs).
   private errorMsg = ""
@@ -305,6 +310,7 @@ class OtaInstallCoordinator {
     this.hotspotManifestUrl = null
     this.hotspotPhase = "idle"
     this.hotspotArtifactPercent = null
+    this.hotspotArtifact = null
     return this.selectedTransport
   }
 
@@ -512,6 +518,7 @@ class OtaInstallCoordinator {
       versionChangePhase: this.deriveVersionChangePhase(connected),
       hotspotPhase: this.hotspotPhase,
       hotspotArtifactPercent: this.hotspotArtifactPercent,
+      hotspotArtifact: this.hotspotArtifact ? {...this.hotspotArtifact} : null,
       transport: this.selectedTransport,
     }
   }
@@ -1517,7 +1524,9 @@ class OtaInstallCoordinator {
           }
           this.hotspotManifestUrl = await hotspotOtaTransport.prepare(this.preparedCheckResult, (progress) => {
             this.hotspotPhase = progress.phase
-            this.hotspotArtifactPercent = progress.artifact?.artifactPercent ?? null
+            this.hotspotArtifact = progress.artifact ? {...progress.artifact} : null
+            this.hotspotArtifactPercent =
+              progress.artifact && progress.artifact.contentLength > 0 ? progress.artifact.artifactPercent : null
             this.emitInternalChange()
           })
         }
@@ -1597,6 +1606,7 @@ class OtaInstallCoordinator {
     this.hotspotManifestUrl = null
     this.hotspotPhase = "idle"
     this.hotspotArtifactPercent = null
+    this.hotspotArtifact = null
     this.emitInternalChange()
   }
 

package/src/services/OtaUpdateCheckService.ts

@@ -13,7 +13,11 @@ import {resolveOtaReleaseVersion} from "./otaReleaseVersion"
  * glasses reporting a bare "complete", which would otherwise present as false success. Keep this
  * in lockstep with the ASG/recovery constant at release time.
  */
-export const DOWNGRADE_FLOOR_VERSION_CODE = 0
+// Mentra 3.0: matches OtaConstants and RecoveryConstants on the glasses.
+// Coordinated releases guarantee higher supported ASG builds can downgrade; no source gate is needed.
+// The shipped floor may increase, never decrease, and must stay aligned across all checkers.
+// See asg_client/docs/mentra-live-spec.md#ota-and-updates.
+export const DOWNGRADE_FLOOR_VERSION_CODE = 51518114
 
 export interface VersionInfo {
   versionCode: number

package/src/utils/display/profiles/g2.ts

@@ -1,16 +1,89 @@
-import {DisplayProfile} from "./types"
+import {G1_PROFILE} from "./g1"
+import type {DisplayProfile} from "./types"
 
 /**
- * Even Realities G2 Smart Glasses Display Profile
- *
- * G2 uses the same display hardware as G1 (green monochrome, ~640x200).
- * Glyph widths and rendering formula are identical to G1.
- * The protocol differs (EvenHub protobuf vs G1 binary) but display
- * characteristics are the same.
+ * Even Realities G2 display profile. Reuse G1's baseline metrics with
+ * G2-specific line limits and proportional Russian Cyrillic advances.
  */
 
-// G2 uses the same glyph widths as G1 (same display hardware/font)
-import {G1_PROFILE} from "./g1"
+/**
+ * Russian Cyrillic advance widths in rendered pixels. Independently reproduced
+ * with @evenrealities/evenhub-simulator 0.9.5: render each glyph 8 and 16 times,
+ * subtract the alpha-bounds widths, then divide by 8 to cancel glyph bearings
+ * and container padding. Simulator font rendering can differ from hardware.
+ * Other Cyrillic characters retain the inherited 18px fallback.
+ *
+ * Values below are converted to raw glyph units for (g + 1) * 2. Half-unit
+ * raw values preserve odd rendered advances exactly.
+ */
+const G2_CYRILLIC_RENDERED_PX: Record<string, number> = {
+  а: 12,
+  б: 12,
+  в: 12,
+  г: 9,
+  д: 12,
+  е: 11,
+  ё: 11,
+  ж: 13,
+  з: 11,
+  и: 12,
+  й: 12,
+  к: 10,
+  л: 12,
+  м: 14,
+  н: 12,
+  о: 11,
+  п: 11,
+  р: 12,
+  с: 11,
+  т: 11,
+  у: 11,
+  ф: 13,
+  х: 11,
+  ц: 12,
+  ч: 12,
+  ш: 14,
+  щ: 15,
+  ъ: 13,
+  ы: 14,
+  ь: 12,
+  э: 11,
+  ю: 14,
+  я: 11,
+  А: 13,
+  Б: 13,
+  В: 13,
+  Г: 10,
+  Д: 15,
+  Е: 12,
+  Ё: 12,
+  Ж: 17,
+  З: 12,
+  И: 14,
+  Й: 14,
+  К: 13,
+  Л: 14,
+  М: 16,
+  Н: 13,
+  О: 14,
+  П: 13,
+  Р: 13,
+  С: 13,
+  Т: 12,
+  У: 13,
+  Ф: 16,
+  Х: 13,
+  Ц: 13,
+  Ч: 12,
+  Ш: 16,
+  Щ: 17,
+  Ъ: 15,
+  Ы: 16,
+  Ь: 13,
+  Э: 13,
+  Ю: 17,
+  Я: 13,
+}
 
 export const G2_PROFILE: DisplayProfile = {
   ...G1_PROFILE,
@@ -24,6 +97,18 @@ export const G2_PROFILE: DisplayProfile = {
   // clean. With this set, the scene pipeline height-clips text so a box is
   // never handed more lines than fit.
   lineHeightPx: 40,
+  fontMetrics: {
+    ...G1_PROFILE.fontMetrics,
+    // Glyph map takes priority over uniformScripts in TextMeasurer, so the
+    // Cyrillic table overrides the uniform width for G2 only —
+    // G1 keeps its verified uniform 18px untouched.
+    glyphWidths: new Map<string, number>([
+      ...G1_PROFILE.fontMetrics.glyphWidths,
+      ...Object.entries(G2_CYRILLIC_RENDERED_PX).map(
+        ([char, renderedPx]) => [char, renderedPx / 2 - 1] as [string, number],
+      ),
+    ]),
+  },
 }
 
 /**