peachsim 0.1.659 → 0.1.661

package/src/host/bridge-host.ts

@@ -592,24 +592,11 @@ export class SootSimBridgeHost {
       // subscriptions get cleaned up automatically on close.
       this.agentHost.registerSocket(ws)
 
-      if (role === 'sim') {
-        sim = {
-          id: this.allocateSimId(),
-          ws,
-          origin,
-          connectedAt: Date.now(),
-          lastSeenAt: Date.now(),
-          lastActiveAt: 0,
-          recentActions: [],
-        }
-        this.sims.set(sim.id, sim)
-        this.writeConnectedRuntimeSnapshot()
-        if (this.shouldPromoteSim(sim)) {
-          this.primarySimId = sim.id
-        }
-        this.broadcastSimAssignments()
-        this.broadcastSimClientStates()
-      } else {
+      // a browser socket becomes a sim when its page registers. the shell's
+      // agent bridge and other page helpers share this endpoint without ever
+      // registering, so giving them a sim id at connect listed ghost sims
+      // that took an id and could be neither driven nor closed.
+      if (role === 'cli') {
         const fallbackKey = `ws-${this.nextCliFallbackId++}`
         this.cliIdentityKeyBySocket.set(ws, fallbackKey)
       }
@@ -709,26 +696,30 @@ export class SootSimBridgeHost {
         // Origin-based role before this socket has registered a page. This reuses the existing
         // daemon transport and call envelope; it does not add a second routing
         // surface or let a registered sim switch roles mid-connection.
-        if (role === 'sim' && msg.type === 'bridge:hello' && sim && !sim.url) {
-          const provisionalId = sim.id
-          this.sims.delete(provisionalId)
-          if (this.primarySimId === provisionalId) {
-            this.primarySimId = this.getOpenSim()?.id ?? null
-          }
-          sim = null
+        if (role === 'sim' && msg.type === 'bridge:hello' && !sim) {
           role = 'cli'
           this.cliIdentityKeyBySocket.set(ws, `ws-${this.nextCliFallbackId++}`)
-          this.writeConnectedRuntimeSnapshot()
-          this.broadcastSimAssignments()
-          this.broadcastSimClientStates()
         }
 
         if (role === 'sim') {
           if (sim) {
             sim.lastSeenAt = Date.now()
           }
-          if (msg.type === 'bridge:register' && sim) {
+          if (msg.type === 'bridge:register') {
             const registration = msg as BridgeSimRegistrationMessage
+            const firstRegistration = !sim
+            if (!sim) {
+              sim = {
+                id: this.allocateSimId(),
+                ws,
+                origin,
+                connectedAt: Date.now(),
+                lastSeenAt: Date.now(),
+                lastActiveAt: 0,
+                recentActions: [],
+              }
+              this.sims.set(sim.id, sim)
+            }
             const restored = this.tryRestoreSimId(sim, registration.simId)
             sim.url = registration.url
             sim.title = registration.title
@@ -743,16 +734,12 @@ export class SootSimBridgeHost {
             if (registration.meta && typeof registration.meta === 'object') {
               sim.meta = registration.meta as Record<string, unknown>
             }
-            // re-evaluate primary now that the sim has a real page. promotion
-            // is otherwise decided once at bare-connect, before `url` is
-            // known — so a page-less sim that grabbed primary as the
-            // last-resort fallback (or a stale zombie still holding it)
-            // would never be superseded by this freshly-registered, actually
-            // driveable sim (QA F19-2). only adopt a *different* sim so a
-            // routine heartbeat re-register doesn't churn the assignment.
+            // elect primary once the sim has a page; only adopt a *different*
+            // sim so a routine heartbeat re-register doesn't churn the
+            // assignment.
             const reElected = this.primarySimId !== sim.id && this.shouldPromoteSim(sim)
             if (reElected) this.primarySimId = sim.id
-            if (restored || reElected) {
+            if (firstRegistration || restored || reElected) {
               this.broadcastSimAssignments()
               this.broadcastSimClientStates()
             }

package/src/kotlin-app.ts

@@ -5,7 +5,11 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
-import { readResourceValues, resolveThemeAttribute } from './android-theme'
+import {
+  frameworkColor,
+  readResourceValues,
+  resolveThemeAttribute,
+} from './android-theme'
 import { parseXml, type XmlElement } from './android-xml'
 import frameworkThemes from './generated/android-framework-themes.json' with { type: 'json' }
 
@@ -18,10 +22,11 @@ export interface KotlinAppProject {
   namespace: string
   targetSdk: number
   // the launched activity's window as its theme and target SDK configure it;
-  // statusBarColor is ARGB
+  // statusBarColor and navigationBarColor are ARGB
   window: {
     edgeToEdgeEnforced: boolean
     statusBarColor: number
+    navigationBarColor: number
     statusBarContrastEnforced: boolean
     navigationBarContrastEnforced: boolean
     lightStatusBar: boolean
@@ -32,6 +37,9 @@ export interface KotlinAppProject {
   // back reaches the activity through its window's back dispatch rather than
   // the back key's onBackPressed
   predictiveBack: boolean
+  // the activity's configChanges includes uiMode: a night mode change reaches
+  // onConfigurationChanged instead of relaunching it
+  handlesUiMode: boolean
 }
 
 export interface ComposeAndroidPins {
@@ -218,9 +226,22 @@ function readWindowTheme(
     lightStatusBar: flag('windowLightStatusBar'),
     lightNavigationBar: flag('windowLightNavigationBar'),
   }
+  // the theme's navigation bar color; left at the framework's transparent
+  // default, a window that is not edge to edge takes the compatible color
+  // unless the device's config_navBarDefaultTransparent is set, which it is
+  // not on the pixel 8 android 17 device the oracle measures
+  const navigationColor = resolveThemeAttribute(name, 'navigationBarColor', sources)
+  if (typeof navigationColor === 'boolean')
+    throw new Error(`${name}: navigationBarColor is not a color`)
+  const navigationDefault = frameworkColor('navigation_bar_default', sources)
+  const navigationTheme = navigationColor ?? navigationDefault
+  const navigationBarColor =
+    navigationTheme === navigationDefault && !edgeToEdgeEnforced
+      ? frameworkColor('navigation_bar_compatible', sources)
+      : navigationTheme
   // PhoneWindow enforces edge to edge apart from whether the theme draws bar
   // backgrounds: either way the bar is transparent
-  if (edgeToEdgeEnforced) return { ...window, statusBarColor: 0 }
+  if (edgeToEdgeEnforced) return { ...window, statusBarColor: 0, navigationBarColor }
   if (!flag('windowDrawsSystemBarBackgrounds'))
     throw new Error(
       `${name} does not draw system bar backgrounds; peach kotlin draws only theme status bar colors`,
@@ -228,7 +249,7 @@ function readWindowTheme(
   const color = resolveThemeAttribute(name, 'statusBarColor', sources)
   if (typeof color === 'boolean')
     throw new Error(`${name}: statusBarColor is not a color`)
-  return { ...window, statusBarColor: color ?? 0xff000000 }
+  return { ...window, statusBarColor: color ?? 0xff000000, navigationBarColor }
 }
 
 function enabled(element: XmlElement): boolean {
@@ -402,6 +423,9 @@ export function readKotlinApp(
     (themeOwner?.attributes[`${ANDROID_NS}enableOnBackInvokedCallback`] ??
       application.attributes[`${ANDROID_NS}enableOnBackInvokedCallback`] ??
       String(targetSdk > 35)) === 'true'
+  const handlesUiMode = (themeOwner?.attributes[`${ANDROID_NS}configChanges`] ?? '')
+    .split('|')
+    .includes('uiMode')
 
   const sources: string[] = []
   for (const set of ['java', 'kotlin']) {
@@ -432,5 +456,6 @@ export function readKotlinApp(
     applicationClass: applicationName ? className(applicationName) : null,
     launcher: { name: launcherName, targetClass },
     predictiveBack,
+    handlesUiMode,
   }
 }

package/src/kotlin-host.ts

@@ -337,20 +337,22 @@ export async function kotlinAppArtifact(
       '',
       '@JsExport',
       'fun peachAppMount(density: Float, fontScale: Float, locale: String, backend: String, stencilBits: Int,',
-      '    regular: String, medium: String, bold: String, statusBar: Int, navigationBar: Int, night: Boolean,',
+      '    regular: String, medium: String, bold: String, insets: String, night: Boolean,',
       '    invalidate: (Boolean) -> Unit): String = dev.peach.app.peachStartApp(',
       '    dev.peach.app.PeachAppSpec(',
       `        android.content.ComponentName(${kotlinString(app.packageName)}, ${kotlinString(app.launcher.name)}),`,
       `        android.content.ComponentName(${kotlinString(app.packageName)}, ${kotlinString(app.launcher.targetClass)}),`,
       '        android.view.WindowTheme(',
       `            ${app.window.edgeToEdgeEnforced}, 0x${app.window.statusBarColor.toString(16).padStart(8, '0')}.toInt(),`,
+      `            0x${app.window.navigationBarColor.toString(16).padStart(8, '0')}.toInt(),`,
       `            ${app.window.statusBarContrastEnforced}, ${app.window.navigationBarContrastEnforced},`,
       `            ${app.window.lightStatusBar}, ${app.window.lightNavigationBar},`,
       '        ),',
       `        { ${app.applicationClass ?? 'android.app.Application'}() },`,
       `        { ${app.launcher.targetClass}() },`,
+      `        ${app.handlesUiMode},`,
       '    ),',
-      '    density, fontScale, locale, backend, stencilBits, regular, medium, bold, statusBar, navigationBar, night, invalidate,',
+      '    density, fontScale, locale, backend, stencilBits, regular, medium, bold, insets, night, invalidate,',
       ')',
       '',
       '@JsExport',
@@ -359,6 +361,9 @@ export async function kotlinAppArtifact(
       '@JsExport',
       'fun peachAppTask(foreground: Boolean) = dev.peach.app.peachAppTask(foreground)',
       '',
+      '@JsExport',
+      'fun peachAppNight(night: Boolean) = dev.peach.app.peachAppNight(night)',
+      '',
     ].join('\n'),
   }
   const shims = [