peachsim 0.1.660 → 0.1.661

package/dist-lib/swift-compile.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/swift-compile.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-compile.ts
 import { execFile as execFile2 } from "node:child_process";

package/dist-lib/swift-package.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/swift-package.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-package.ts
 function isSwiftManifestFile(file) {

package/dist-lib/swift-submit.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/swift-submit.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-submit.ts
 var SWIFT_COMPILE_PATH = "/api/swift-compile";

package/dist-lib/swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/vite-swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/vite.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.660 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.661 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; } catch {}
 "use strict";
 var __create = Object.create;

package/kotlin/AppSources/android/view/Window.kt

@@ -13,6 +13,7 @@ import org.json.JSONObject
 internal class WindowTheme(
     val edgeToEdgeEnforced: Boolean,
     val statusBarColor: Int,
+    val navigationBarColor: Int,
     val statusBarContrastEnforced: Boolean,
     val navigationBarContrastEnforced: Boolean,
     val lightStatusBar: Boolean,
@@ -62,15 +63,17 @@ class Window internal constructor(
     fun getStatusBarColor(): Int = statusBarColor
     fun setStatusBarColor(color: Int) { statusBarColor = color }
 
-    // the theme's navigation bar color resolves through device configuration
-    // peach kotlin does not model, so it reads only once the app sets it; an
-    // enforced edge to edge window reports transparent
-    private var navigationBar: Int? = null
+    // the theme's navigation bar color as PhoneWindow resolved it; an enforced
+    // edge to edge window reports and draws transparent
+    private var navigationBar = theme.navigationBarColor
 
     var navigationBarColor: Int
-        get() = if (edgeToEdgeEnforced) Color.TRANSPARENT
-            else checkNotNull(navigationBar) { "the theme's navigation bar color is not modeled; read it after setting it" }
-        set(color) { navigationBar = color }
+        get() = if (edgeToEdgeEnforced) Color.TRANSPARENT else navigationBar
+        set(color) {
+            if (color == navigationBar) return
+            navigationBar = color
+            host.windowChanged()
+        }
 
     fun getNavigationBarColor(): Int = navigationBarColor
     fun setNavigationBarColor(color: Int) { navigationBarColor = color }
@@ -113,11 +116,14 @@ class Window internal constructor(
         return SCRIM_LIGHT
     }
 
-    // what the decor draws for this window: its inset policy and its status
-    // bar color as unsigned ARGB
+    // what the decor draws for this window: its inset policy and its bar
+    // colors as unsigned ARGB. gesture navigation draws no contrast scrim
+    // behind a transparent navigation bar, as the oracle's edge to edge
+    // captures show
     internal fun describe(): JSONObject = JSONObject()
         .put("decorFitsSystemWindows", fits)
         .put("statusBarColor", drawnStatusBarColor().toLong() and 0xffffffffL)
+        .put("navigationBarColor", navigationBarColor.toLong() and 0xffffffffL)
 
     // Activity.setContentView(View) fills the content parent
     internal fun setContentView(view: View, params: ViewGroup.LayoutParams) {

package/kotlin/AppSources/dev/peach/app/PeachApp.kt

@@ -53,19 +53,32 @@ internal class PeachAppSpec(
     val handlesUiMode: Boolean,
 )
 
-// the system bars the device delivers to the window's content, in pixels: all
-// of them on an edge-to-edge window, none once the decor fits system windows.
-private class SystemBarInsets(
-    private val window: Window,
-    private val status: Int,
-    private val navigation: Int,
-) : PlatformWindowInsets {
+// the insets the device delivers to the window's content, in pixels: all of
+// them on an edge-to-edge window, none once the decor fits system windows.
+// insets lists the status bars, navigation bars, display cutout, system
+// gestures, mandatory system gestures and tappable element, each left, top,
+// right and bottom.
+private class DeviceInsets(private val window: Window, insets: String) : PlatformWindowInsets {
+    private val pixels = insets.split(',').map { it.toInt() }.also { require(it.size == 24) }
+
     // read when compose lays out, so a later change to the window applies
-    private fun delivered(pixels: Int) = if (window.fitsSystemWindows) 0 else pixels
-    override val statusBars = PlatformInsets(getTop = { delivered(status) })
-    override val navigationBars = PlatformInsets(getBottom = { delivered(navigation) })
-    override val systemBars =
-        PlatformInsets(getTop = { delivered(status) }, getBottom = { delivered(navigation) })
+    private fun type(index: Int): PlatformInsets {
+        fun side(offset: Int) = { if (window.fitsSystemWindows) 0 else pixels[index * 4 + offset] }
+        return PlatformInsets(side(0), side(1), side(2), side(3))
+    }
+
+    override val statusBars = type(0)
+    override val navigationBars = type(1)
+    override val displayCutout = type(2)
+    override val systemGestures = type(3)
+    override val mandatorySystemGestures = type(4)
+    override val tappableElement = type(5)
+    override val systemBars = PlatformInsets(
+        { maxOf(statusBars.left, navigationBars.left) },
+        { maxOf(statusBars.top, navigationBars.top) },
+        { maxOf(statusBars.right, navigationBars.right) },
+        { maxOf(statusBars.bottom, navigationBars.bottom) },
+    )
 }
 
 private class ActivityOwners(activity: ComponentActivity) : PlatformArchitectureComponentsOwner {
@@ -85,7 +98,7 @@ private class AppProcess(
     val application: Application,
     val density: Float, val fontScale: Float, val locale: String, val gpu: Boolean, val stencilBits: Int,
     val fonts: FontFamily,
-    val statusBar: Int, val navigationBar: Int,
+    val insets: String,
     val invalidate: (Boolean) -> Unit,
 ) {
     lateinit var activity: Activity
@@ -120,7 +133,7 @@ internal fun peachStartApp(
     spec: PeachAppSpec,
     density: Float, fontScale: Float, locale: String, backend: String, stencilBits: Int,
     regular: String, medium: String, bold: String,
-    statusBar: Int, navigationBar: Int, night: Boolean,
+    insets: String, night: Boolean,
     invalidate: (Boolean) -> Unit,
 ): String {
     try {
@@ -131,7 +144,7 @@ internal fun peachStartApp(
         application.onCreate()
         val app = AppProcess(
             spec, application, density, fontScale, locale, backend == "graphite", stencilBits,
-            robotoFamily(regular, medium, bold), statusBar, navigationBar, invalidate,
+            robotoFamily(regular, medium, bold), insets, invalidate,
         )
         process = app
         val view = launchActivity(app, null)
@@ -201,7 +214,7 @@ private fun launchActivity(app: AppProcess, lastNonConfigurationInstance: Any?):
         app.density, app.fontScale, app.locale, app.gpu, app.stencilBits, app.fonts, app.invalidate,
         night = isNight(activity.resources.configuration),
         owners = componentActivity?.let(::ActivityOwners),
-        insets = SystemBarInsets(window, app.statusBar, app.navigationBar),
+        insets = DeviceInsets(window, app.insets),
         clockRunning = { componentActivity == null || componentActivity.lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED) },
     )
     mount.setContent {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peachsim",
-  "version": "0.1.660",
+  "version": "0.1.661",
   "description": "Vite and Metro plugins, testing drivers, and SDK exports for peach.",
   "author": "Tamagui LLC",
   "license": "SEE LICENSE IN LICENSE",
@@ -303,6 +303,7 @@
     "build:cli-binary": "bun scripts/build-cli-binary.ts",
     "smoke:cli-binary": "bun scripts/smoke-cli-binary.ts",
     "publish:cli-binary": "bun scripts/publish-cli-binaries.ts",
+    "publish:linux-browser-libs": "bun scripts/linux-browser-libs.ts publish",
     "pack:smoke": "bun scripts/pack-smoke.ts"
   },
   "dependencies": {

package/src/android-theme.ts

@@ -165,3 +165,17 @@ export function resolveThemeAttribute(
   // unset: the reader's own default applies, as PhoneWindow's getBoolean/getColor do
   return undefined
 }
+
+// a framework color resource as context.getColor reads it, following
+// references to other framework colors
+export function frameworkColor(name: string, sources: ThemeSources): number {
+  let value = sources.android.colors[name]
+  while (value !== undefined && !value.startsWith('#')) {
+    const ref = /^@(?:android:)?color\/(.+)$/.exec(value)
+    if (!ref?.[1])
+      throw new Error(`@android:color/${name} has the unsupported value ${value}`)
+    value = sources.android.colors[ref[1]]
+  }
+  if (value === undefined) throw new Error(`@android:color/${name} is not defined`)
+  return color(value)
+}

package/src/backend-origin.ts

@@ -46,6 +46,31 @@ export function buildBrowserAssetProxyUrl(targetUrl: string): string {
   return `${proxyPath}?url=${encodeURIComponent(targetUrl)}`
 }
 
+export function resolveBrowserAssetProxyUrl(
+  targetUrl: string,
+  currentOrigin: string,
+): string {
+  const proxyUrl = isBrowserAssetProxyUrl(targetUrl)
+    ? targetUrl
+    : buildBrowserAssetProxyUrl(targetUrl)
+  // loopback assets belong to the local bridge; external bytes to the backend.
+  if (proxyUrl.startsWith('/__bundle-proxy?')) return proxyUrl
+  return new URL(proxyUrl, resolveContrastBackendOrigin(currentOrigin)).toString()
+}
+
+export function isBrowserAssetProxyUrl(value: string): boolean {
+  try {
+    const url = new URL(value, DEFAULT_CONTRAST_BACKEND_ORIGIN)
+    return (
+      isContrastBackendOrigin(url.origin) &&
+      url.pathname === '/__fetch-proxy' &&
+      url.searchParams.has('url')
+    )
+  } catch {
+    return false
+  }
+}
+
 export function isContrastBackendHost(hostname: string): boolean {
   const normalized = normalizeHostname(hostname)
   return (

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
@@ -221,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`,
@@ -231,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 {

package/src/kotlin-host.ts

@@ -337,13 +337,14 @@ 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},`,
       '        ),',
@@ -351,7 +352,7 @@ export async function kotlinAppArtifact(
       `        { ${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',