peachsim 0.1.668 → 0.1.670

package/kotlin/fixtures/kotlin-app-variants/TextWidth.kt

@@ -0,0 +1,45 @@
+package dev.contrast.kotlinapp
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateMapOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import kotlin.math.roundToInt
+
+// laid out widths in px of the same words at the label and body styles
+@Composable
+fun TextWidth() {
+    val widths = remember { mutableStateMapOf<String, Float>() }
+    val samples = listOf(
+        "label Month" to MaterialTheme.typography.labelLarge,
+        "label Compose" to MaterialTheme.typography.labelLarge,
+        "body Range: Day" to MaterialTheme.typography.bodyLarge,
+        "body Suggest" to MaterialTheme.typography.bodyLarge,
+        "plain500 Month" to TextStyle(fontSize = 14.sp, fontWeight = FontWeight.Medium),
+        "plain400 Month" to TextStyle(fontSize = 14.sp),
+    )
+    val label = MaterialTheme.typography.labelLarge
+    Column(
+        Modifier.fillMaxSize().background(Color(0xFFE8EEF8)).safeDrawingPadding().padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Text("Label: ${label.fontSize} ${label.letterSpacing} ${label.fontWeight?.weight} ${label.fontFamily}")
+        Text("Widths: " + samples.joinToString(" ") { (key) -> "${((widths[key] ?: 0f) * 100).roundToInt() / 100.0}" })
+        samples.forEach { (key, style: TextStyle) ->
+            Text(key.substringAfter(' '), style = style, onTextLayout = { widths[key] = it.getLineRight(0) })
+        }
+    }
+}

package/kotlin/fixtures/kotlin-app-variants/Transition.kt

@@ -0,0 +1,69 @@
+package dev.contrast.kotlinapp
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.Crossfade
+import androidx.compose.animation.animateColor
+import androidx.compose.animation.core.RepeatMode
+import androidx.compose.animation.core.animateDp
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.core.updateTransition
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+
+// one state drives an updateTransition's size and color, a Crossfade and,
+// with a counter, an AnimatedContent. an infinite transition runs beside
+// them; the status reports once its value has reached both ends, and never
+// draws it, so a capture is the same at any moment
+@Composable
+fun Transition() {
+    var large by remember { mutableStateOf(false) }
+    var count by remember { mutableIntStateOf(0) }
+    val transition = updateTransition(large, label = "box")
+    val size by transition.animateDp(label = "size") { if (it) 160.dp else 80.dp }
+    val color by transition.animateColor(label = "color") { if (it) Color(0xFF6750A4) else Color(0xFFE91E63) }
+    val pulse = rememberInfiniteTransition(label = "pulse")
+    val level = pulse.animateFloat(0f, 1f, infiniteRepeatable(tween(300), RepeatMode.Reverse), label = "level")
+    var low by remember { mutableStateOf(false) }
+    var high by remember { mutableStateOf(false) }
+    LaunchedEffect(Unit) {
+        snapshotFlow { level.value }.collect {
+            if (it <= 0.01f) low = true
+            if (it >= 0.99f) high = true
+        }
+    }
+    val settled = !transition.isRunning && transition.currentState == transition.targetState
+    Column(
+        Modifier.fillMaxSize().background(Color(0xFFE8EEF8)).safeDrawingPadding().padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Text("Transition: $large settled $settled cycled ${low && high}")
+        Button(onClick = { large = !large }) { Text("Switch") }
+        Button(onClick = { count += 1 }) { Text("Add") }
+        AnimatedContent(count, label = "count") { Text("Count $it") }
+        Crossfade(large, label = "fade") { Text(if (it) "Large" else "Small") }
+        Box(Modifier.width(size).height(size).background(color))
+    }
+}

package/kotlin/fixtures/kotlin-app-variants/ViewConfig.kt

@@ -0,0 +1,22 @@
+package dev.contrast.kotlinapp
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.unit.dp
+
+// every value of the window's view configuration, as gestures read them
+@Composable
+fun ViewConfig() {
+    val c = LocalViewConfiguration.current
+    Text(
+        "Config: ${c.longPressTimeoutMillis} ${c.doubleTapTimeoutMillis} ${c.doubleTapMinTimeMillis} ${c.touchSlop} ${c.handwritingSlop} ${c.minimumTouchTargetSize} ${c.maximumFlingVelocity} ${c.minimumFlingVelocity} ${c.handwritingGestureLineMargin}",
+        Modifier.fillMaxSize().background(Color(0xFFE8EEF8)).safeDrawingPadding().padding(16.dp),
+    )
+}

package/kotlin/toolchain.json

@@ -256,6 +256,31 @@
       "name": "savedstate-wasm-js-1.5.0.klib",
       "url": "https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate-wasm-js/1.5.0/savedstate-wasm-js-1.5.0.klib",
       "sha256": "02bb90d1173b771a9eb4ff9d2440bbe50202f0d9b0578abb2f5b47b1c27285ef"
+    },
+    {
+      "name": "navigation-common-wasm-js-2.10.0.klib",
+      "url": "https://dl.google.com/dl/android/maven2/androidx/navigation/navigation-common-wasm-js/2.10.0/navigation-common-wasm-js-2.10.0.klib",
+      "sha256": "ecd83faf3e808a1b90aae9b73b2c23c793b0cb8a42116cd4c0c206c4e3f3768c"
+    },
+    {
+      "name": "navigation-runtime-wasm-js-2.10.0.klib",
+      "url": "https://dl.google.com/dl/android/maven2/androidx/navigation/navigation-runtime-wasm-js/2.10.0/navigation-runtime-wasm-js-2.10.0.klib",
+      "sha256": "a378f0c8ea8997cdac63d4845f692abb18c8d4c3aed7acbfae32c1a10275374a"
+    },
+    {
+      "name": "navigation-common-wasm-js-2.10.0-beta01.klib",
+      "url": "https://repo1.maven.org/maven2/org/jetbrains/androidx/navigation/navigation-common-wasm-js/2.10.0-beta01/navigation-common-wasm-js-2.10.0-beta01.klib",
+      "sha256": "1409cfbaa2a1985886a524ff36cc73ee3ebd37ed08371194bb2fa73019d447fa"
+    },
+    {
+      "name": "navigation-runtime-wasm-js-2.10.0-beta01.klib",
+      "url": "https://repo1.maven.org/maven2/org/jetbrains/androidx/navigation/navigation-runtime-wasm-js/2.10.0-beta01/navigation-runtime-wasm-js-2.10.0-beta01.klib",
+      "sha256": "3682e0f481303d71f71e9713b1b1c160839567b4bea1644cc73635c141206be2"
+    },
+    {
+      "name": "navigation-compose-wasm-js-2.10.0-beta01.klib",
+      "url": "https://repo1.maven.org/maven2/org/jetbrains/androidx/navigation/navigation-compose-wasm-js/2.10.0-beta01/navigation-compose-wasm-js-2.10.0-beta01.klib",
+      "sha256": "35e147105bfc48ef083c56b5108436234f8d8ab4747bce855e48a30243b15cd6"
     }
   ],
   "compose": {
@@ -266,7 +291,9 @@
       "runtime": "1.13.0-alpha02",
       "material3": "1.5.0-alpha27",
       "materialRipple": "1.13.0-alpha02",
-      "material3Ripple": "1.5.0-alpha27"
+      "material3Ripple": "1.5.0-alpha27",
+      "navigation": "2.10.0",
+      "activity": "1.13.0"
     },
     "mappingSources": [
       "https://repo1.maven.org/maven2/org/jetbrains/compose/ui/ui-android/1.13.0-alpha01/ui-android-1.13.0-alpha01.module",
@@ -285,7 +312,8 @@
       "https://repo1.maven.org/maven2/org/jetbrains/compose/foundation/foundation-layout-android/1.13.0-alpha01/foundation-layout-android-1.13.0-alpha01.module",
       "https://repo1.maven.org/maven2/org/jetbrains/compose/material/material-ripple-android/1.13.0-alpha01/material-ripple-android-1.13.0-alpha01.module",
       "https://repo1.maven.org/maven2/org/jetbrains/compose/animation/animation-core-android/1.13.0-alpha01/animation-core-android-1.13.0-alpha01.module",
-      "https://repo1.maven.org/maven2/org/jetbrains/compose/material3/material3-ripple-android/1.13.0-alpha01/material3-ripple-android-1.13.0-alpha01.module"
+      "https://repo1.maven.org/maven2/org/jetbrains/compose/material3/material3-ripple-android/1.13.0-alpha01/material3-ripple-android-1.13.0-alpha01.module",
+      "https://repo1.maven.org/maven2/org/jetbrains/androidx/navigation/navigation-compose-android/2.10.0-beta01/navigation-compose-android-2.10.0-beta01.module"
     ],
     "skiko": "0.152.0-alpha02"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peachsim",
-  "version": "0.1.668",
+  "version": "0.1.670",
   "description": "Vite and Metro plugins, testing drivers, and SDK exports for peach.",
   "author": "Tamagui LLC",
   "license": "SEE LICENSE IN LICENSE",
@@ -91,6 +91,13 @@
       "import": "./dist-lib/plist.mjs",
       "default": "./dist-lib/plist.cjs"
     },
+    "./native-firebase-metadata": {
+      "types": "./src/native-firebase-metadata.ts",
+      "source": "./src/native-firebase-metadata.ts",
+      "bun": "./src/native-firebase-metadata.ts",
+      "import": "./dist-lib/native-firebase-metadata.mjs",
+      "default": "./dist-lib/native-firebase-metadata.cjs"
+    },
     "./native-app-identity": {
       "types": "./src/native-app-identity.ts",
       "source": "./src/native-app-identity.ts",

package/skills/contrast/SKILL.md

@@ -89,6 +89,7 @@ run `peach --help` to see the full list under each group.
 - `-d, --device <model>` — override the simulated device model
 - `-t, --theme <scheme>` — override light, dark, or auto color scheme
 - `--headless` — run browser automation without a visible window where supported
+- `--redact` — mask keys, tokens, account ids and emails in the output of logs, network, what-happened and get, so it can be shared
 
 ## bundled Peach agent skills
 
@@ -123,7 +124,7 @@ commands in your own `sleep` or chain `do settle` "just to be safe"**.
 
 what this means:
 
-- `peach do tap-id login` then `peach find "Welcome"` Just Works™.
+- `peach do tap login` then `peach find "Welcome"` Just Works™.
 - you only need `peach do settle <seconds>` or `peach wait idle
   --max-ms <N>` when the CLI explicitly prints
   `⚠ auto-wait timed out after Nms — next command may see mid-animation

package/skills/peach-debug/SKILL.md

@@ -138,7 +138,7 @@ need a manual wait when:
 peach do settle 5                # wait up to 5s for layout stability
 peach wait idle --max-ms 5000    # same thing under the `wait` verb
 peach wait idle --strict         # also require animation flags clear
-peach do tap-id play --no-wait   # skip auto-settle on one command
+peach do tap play --no-wait      # skip auto-settle on one command
 PEACH_NO_AUTO_WAIT=1 peach ... # disable auto-settle for a lane
 ```
 
@@ -401,7 +401,7 @@ peach find --role button
 peach find --pressable
 peach find --visible                    # only on-screen nodes
 
-peach do tap-id loginButton             # tap by testID (preferred)
+peach do tap loginButton                # tap by testID (preferred)
 peach do tap-text "Submit"              # tap by text
 peach do tap 196 400                    # tap at coordinates
 peach do type "hello world"             # type into focused input

package/skills/peach-test/SKILL.md

@@ -67,7 +67,7 @@ peach wait selector dashboard
 ```
 
 the batch stops on the first failure. add `--json` for per-action results.
-`tap <id>` and `tap-id <id>` are exact; use `tap-text <text>` for visible text.
+`tap <id>` is the default way to tap by testID (`--testid <id>` and `tap-id <id>` are aliases); use `tap-text <text>` for visible text.
 punctuation in action data remains data. the exact `--then` token is reserved
 as the action boundary. use Maestro when the sequence should be reviewed,
 reused, or run in CI; an inline chain is not a third test runner and does not
@@ -89,11 +89,11 @@ Author from a live interaction:
 
 ```sh
 peach maestro start                     # begin a draft
-peach do tap-id loginButton             # drive the app via the CLI
+peach do tap loginButton                # drive the app via the CLI
 peach maestro keep                      # save the step
 peach do type "user@example.com"
 peach maestro keep
-peach do tap-id submit
+peach do tap submit
 peach maestro keep
 peach maestro end --output .maestro/login.yaml --validate
 ```

package/src/expo-swift-host.ts

@@ -9,7 +9,13 @@ import path from 'node:path'
 import { promisify } from 'node:util'
 import { RNX_FORKED_SCRIPT_ENV } from '../cli/internal-child'
 import { isLoopbackHost } from './backend-origin'
-import { artifactFor, icuUrl, projectFor, serveSwiftPackageAsset } from './swift-host'
+import {
+  artifactFor,
+  icuUrl,
+  localSwiftToolchain,
+  projectFor,
+  serveSwiftPackageAsset,
+} from './swift-host'
 import { MAX_SWIFT_COMPILE_FILES, MAX_SWIFT_COMPILE_SOURCE_BYTES } from './swift-submit'
 import type { IncomingMessage, ServerResponse } from 'node:http'
 
@@ -206,6 +212,11 @@ export async function handleExpoSwiftRequest(
       pending = (async () => {
         const files = await collectExpoSwiftSources(root)
         if (!files) return null
+        // app Swift compiles only on this machine, never on a remote service;
+        // an install without the SwiftUI module and toolchain leaves the
+        // app's own native modules unregistered, as an unlinked module is.
+        const moduleRoot = path.resolve(import.meta.dirname, '../../sootsim-swift')
+        if (!localSwiftToolchain(moduleRoot)) return null
         const key = createHash('sha256').update(fs.realpathSync(root)).digest('hex')
         const packagePath = path.join(os.tmpdir(), 'peach-expo-swift', key)
         const sources = path.join(packagePath, 'Sources')
@@ -217,12 +228,10 @@ export async function handleExpoSwiftRequest(
           fs.mkdirSync(path.dirname(target), { recursive: true })
           fs.writeFileSync(target, content)
         }
-        const moduleRoot = path.resolve(import.meta.dirname, '../../sootsim-swift')
-        const local = fs.existsSync(path.join(moduleRoot, 'toolchain.json'))
         const artifact = await artifactFor(
           projectFor(packagePath),
           EXPO_SWIFT_ENTRY,
-          local ? moduleRoot : undefined,
+          moduleRoot,
         )
         const host = req.headers.host
         if (!host) throw new Error('Expo Swift request has no host')

package/src/kotlin-app.ts

@@ -44,13 +44,18 @@ export interface KotlinAppProject {
   // the activity's configChanges includes uiMode: a night mode change reaches
   // onConfigurationChanged instead of relaunching it
   handlesUiMode: boolean
+  // how the activity's window meets the keyboard: pan over a covered focused
+  // view, resize above the keyboard, or nothing
+  softInputAdjust: 'pan' | 'resize' | 'nothing'
 }
 
-export interface ComposeAndroidPins {
+export interface AndroidPins {
   ui: string
   foundation: string
   runtime: string
   material3: string
+  navigation: string
+  activity: string
 }
 
 const ANDROID_NS = 'android:'
@@ -61,18 +66,17 @@ const PLUGINS = new Set([
   'org.jetbrains.kotlin.android',
   'org.jetbrains.kotlin.plugin.compose',
 ])
-// the closure Peach links. compose artifacts must match its Android pins; the
-// activity, lifecycle and savedstate artifacts are Peach's platform actuals.
-const PLATFORM_GROUPS = new Set([
-  'androidx.activity',
-  'androidx.lifecycle',
-  'androidx.savedstate',
-])
-const COMPOSE_PIN: Record<string, keyof ComposeAndroidPins> = {
+// the closure Peach links. compose, navigation and activity artifacts must
+// match their Android pins (Peach's activity actuals are that version's); the
+// lifecycle and savedstate artifacts are Peach's platform actuals.
+const PLATFORM_GROUPS = new Set(['androidx.lifecycle', 'androidx.savedstate'])
+const ANDROID_PIN: Record<string, keyof AndroidPins> = {
   'androidx.compose.ui': 'ui',
   'androidx.compose.foundation': 'foundation',
   'androidx.compose.runtime': 'runtime',
   'androidx.compose.material3': 'material3',
+  'androidx.navigation': 'navigation',
+  'androidx.activity': 'activity',
 }
 
 function readGradle(dir: string): { file: string; text: string } | null {
@@ -128,10 +132,7 @@ function kotlinPluginVersion(
   )
 }
 
-function checkModuleGradle(
-  gradle: { file: string; text: string },
-  pins: ComposeAndroidPins,
-) {
+function checkModuleGradle(gradle: { file: string; text: string }, pins: AndroidPins) {
   const at = (index: number) => `${gradle.file}:${lineOf(gradle.text, index)}`
   for (const match of gradle.text.matchAll(
     /\bid\(\s*"([^"]+)"\s*\)|\bkotlin\(\s*"([^"]+)"\s*\)/g,
@@ -166,11 +167,11 @@ function checkModuleGradle(
       if (!coordinate)
         throw new Error(`${where}: ${value} is not a literal group:artifact:version`)
       const [, group = '', artifact, version] = coordinate
-      const pin = COMPOSE_PIN[group]
+      const pin = ANDROID_PIN[group]
       if (pin) {
         if (version !== pins[pin])
           throw new Error(
-            `${where}: ${group}:${artifact}:${version} differs from Peach's Compose ${pin} ${pins[pin]}`,
+            `${where}: ${group}:${artifact}:${version} differs from Peach's ${pin} pin ${pins[pin]}`,
           )
       } else if (!PLATFORM_GROUPS.has(group))
         throw new Error(`${where}: ${group}:${artifact} is not in Peach's Kotlin closure`)
@@ -305,7 +306,7 @@ function isLauncher(element: XmlElement): boolean {
 
 export function readKotlinApp(
   moduleArg: string,
-  options: { activity?: string; pins: ComposeAndroidPins },
+  options: { activity?: string; pins: AndroidPins },
 ): KotlinAppProject {
   const moduleDir = fs.realpathSync(path.resolve(moduleArg))
   const manifestFile = path.join(moduleDir, 'src/main/AndroidManifest.xml')
@@ -444,6 +445,23 @@ export function readKotlinApp(
   const handlesUiMode = (themeOwner?.attributes[`${ANDROID_NS}configChanges`] ?? '')
     .split('|')
     .includes('uiMode')
+  // the adjust part of the activity's windowSoftInputMode. ViewRootImpl
+  // resolves unspecified to resize only for a window holding a scroll
+  // container view, which a ComposeView is not, so it pans
+  const adjust =
+    (themeOwner?.attributes[`${ANDROID_NS}windowSoftInputMode`] ?? '')
+      .split('|')
+      .find((flag) => flag.startsWith('adjust')) ?? 'adjustUnspecified'
+  const softInputAdjust =
+    adjust === 'adjustUnspecified' || adjust === 'adjustPan'
+      ? 'pan'
+      : adjust === 'adjustResize'
+        ? 'resize'
+        : adjust === 'adjustNothing'
+          ? 'nothing'
+          : null
+  if (!softInputAdjust)
+    throw new Error(`${manifestFile}: unknown windowSoftInputMode ${adjust}`)
 
   const sources: string[] = []
   for (const set of ['java', 'kotlin']) {
@@ -478,5 +496,6 @@ export function readKotlinApp(
     launcher: { name: launcherName, targetClass },
     predictiveBack,
     handlesUiMode,
+    softInputAdjust,
   }
 }

package/src/kotlin-host.ts

@@ -385,6 +385,7 @@ export async function kotlinAppArtifact(
       `        { ${app.applicationClass ?? 'android.app.Application'}() },`,
       `        { ${app.launcher.targetClass}() },`,
       `        ${app.handlesUiMode},`,
+      `        ${kotlinString(app.softInputAdjust)},`,
       '        androidx.lifecycle.viewmodel.viewModelFactory {',
       ...viewModels.map(viewModelInitializer),
       '        },',

package/src/metro-plugin.ts

@@ -30,6 +30,10 @@ import {
   insertNativeAppIdentityFooter,
 } from './native-app-identity'
 import { readNativeFirebaseConfig } from './native-firebase-config'
+import {
+  insertNativeFirebaseFooter,
+  readNativeFirebaseMetadata,
+} from './native-firebase-metadata'
 import { parsePlistSource } from './plist'
 import {
   isRootRuntimeAssetPath,
@@ -258,6 +262,26 @@ export function withRNX<T extends Record<string, unknown>>(config: T): T {
                   }
           }
         }
+        if (
+          [...(graph.dependencies?.values() ?? [])].some((module) =>
+            module.path.replace(/\\/g, '/').includes('/@react-native-firebase/app/'),
+          )
+        ) {
+          const firebase = readNativeFirebaseMetadata(
+            readNativeFirebaseConfig(
+              cfgProjectRoot,
+              typeof bundlePlatform === 'string' ? [bundlePlatform] : undefined,
+            ),
+          )
+          if (firebase)
+            annotated =
+              typeof annotated === 'string'
+                ? insertNativeFirebaseFooter(annotated, firebase)
+                : {
+                    ...annotated,
+                    code: insertNativeFirebaseFooter(annotated.code, firebase),
+                  }
+        }
         return annotated
       },
     },