Merge branch 'main' into @GCyganek/landscape-mode/report-submit-to-popover

Author: GCyganek

.claude/skills/agent-device/SKILL.md

@@ -10,7 +10,7 @@ allowed-tools: Bash(agent-device *) Bash(npm root *) Bash(scripts/is-hybrid-app.
 
 These checks evaluate at skill load. If any line shows `FAIL`, stop and surface the fix before running any device command.
 
-`agent-device` version: !`R=0.13.0; V=$(agent-device --version 2>/dev/null); [ -n "$V" ] && [ "$(printf '%s\n%s\n' "$R" "$V" | sort -V | head -1)" = "$R" ] && echo "OK ($V)" || echo "FAIL (need v$R+, got: ${V:-not installed}). Fix: npm install -g agent-device@latest"`
+`agent-device` version: !`R=0.18.0; V=$(agent-device --version 2>/dev/null); [ -n "$V" ] && [ "$(printf '%s\n%s\n' "$R" "$V" | sort -V | head -1)" = "$R" ] && echo "OK ($V)" || echo "FAIL (need v$R+, got: ${V:-not installed}). Fix: npm install -g agent-device@latest"`
 
 Bundled CLI skills dir: !`D="$(npm root -g)/agent-device/skills/agent-device"; test -s "$D/SKILL.md" && echo "OK ($D)" || echo "FAIL (missing $D/SKILL.md). Fix: npm install -g agent-device@latest"`
 
@@ -28,18 +28,18 @@ If the user prompt names `ios` or `android` explicitly, use it. Otherwise ask. O
 
 HybridApp dev builds only (the pre-flight gate enforces this).
 
-| Platform  | Bundle ID                       | Build script      |
-| --------- | ------------------------------- | ----------------- |
-| `ios`     | `com.expensify.expensifylite`   | `npm run ios`     |
-| `android` | `org.me.mobiexpensifyg.dev`     | `npm run android` |
+| Platform  | Bundle ID                       | Build command from App root |
+| --------- | ------------------------------- | --------------------------- |
+| `ios`     | `com.expensify.expensifylite`   | `npm run ios`               |
+| `android` | `org.me.mobiexpensifyg.dev`     | `npm run android`           |
 
 ### 3. Confirm dev build is installed
 
 ```bash
-agent-device apps --user-installed --platform <p> --json
+agent-device apps --platform <p> --json
 ```
 
-If the resolved bundle ID is missing from the list, **STOP** and instruct the developer to run the matching build script from the table. HybridApp mobile builds **must** be initiated from `Mobile-Expensify/` (per project CLAUDE.md).
+If the resolved bundle ID is missing from the list, **STOP** and instruct the developer to run the matching build command from the App repository root. The build script detects HybridApp mode and builds the native app from `Mobile-Expensify/`.
 
 ### 4. Metro
 
@@ -89,6 +89,32 @@ agent-device snapshot -i
 
 Confirm the app rendered. From here, follow the [Agent decision loop](flows/README.md) for repeatable flows or drive interactively.
 
+### 9. Interaction safety
+
+After opening or relaunching the App, inspect `agent-device snapshot -i` for React Native development overlays before interacting.
+
+If the snapshot reports a LogBox warning, run:
+
+```bash
+agent-device react-native dismiss-overlay
+agent-device snapshot -i
+```
+
+Continue only when the fresh snapshot no longer reports the overlay. Multiple LogBox banners can require repeated `dismiss-overlay` and fresh `snapshot -i` calls. If the snapshot reports a RedBox fatal error, stop and surface the error instead of dismissing it.
+
+Before pressing an action that may be covered by an overlay or system UI:
+
+```bash
+agent-device snapshot -i
+agent-device screenshot --overlay-refs
+```
+
+Use a stable selector or a fresh `@eN` reference. Confirm the target is reported as hittable. Never use coordinates to bypass `interactionBlocked: "covered"`, `reason: "offscreen_ref"`, or `targetHittable: false`.
+
+When a target is rejected, capture `agent-device screenshot --overlay-refs`. Dismiss a recoverable LogBox overlay when present, capture a fresh `snapshot -i`, and retry only through a selector or fresh reference. Otherwise stop and report the blocker.
+
+After pressing the action, verify the expected destination or control state with `wait`, `is`, `find`, or a fresh snapshot.
+
 ### Canonical skill references
 
 Read these files directly for device automation guidance (bootstrap, exploration, verification, debugging): !`echo "$(npm root -g)/agent-device/skills/agent-device"`

.claude/skills/coding-standards/rules/perf-18-use-pre-mount-destination.md

@@ -109,7 +109,6 @@ Flag when:
 **DO NOT flag if:**
 
 - The code uses `usePreMountDestination` correctly with the matching reveal method for the flow
-- The call site is an approved exception (`IOURequestStepConfirmation`, `useSkipConfirmationPreInsert` until migrated)
 - The flow uses specialized dismiss helpers that intentionally bypass pre-insert/reveal
 
 **Search patterns:**

.github/actions/composite/fetchReactNativePrebuild/action.yml

@@ -0,0 +1,28 @@
+name: Fetch React Native prebuild files
+description: >
+  Copies the `ios-prebuild*` scripts and `Package.swift` from the upstream
+  facebook/react-native repo (matching the version pinned in package.json)
+  into the local node_modules/react-native/ folder.
+
+runs:
+  using: composite
+  steps:
+    - name: Get React Native version
+      id: rnVersion
+      shell: bash
+      run: echo "VERSION=$(jq -r '.dependencies["react-native"]' package.json)" >> "$GITHUB_OUTPUT"
+
+    - name: Checkout upstream React Native prebuild files
+      uses: useblacksmith/checkout@1c9394c220d293645707b625ba9d79685f093a8f # v1
+      with:
+        repository: facebook/react-native
+        ref: v${{ steps.rnVersion.outputs.VERSION }}
+        path: rn-prebuild
+        sparse-checkout: packages/react-native/scripts
+
+    - name: Copy prebuild files into node_modules
+      shell: bash
+      run: |
+        cp -r rn-prebuild/packages/react-native/scripts/ios-prebuild* node_modules/react-native/scripts/
+        cp rn-prebuild/packages/react-native/Package.swift node_modules/react-native/
+        rm -rf rn-prebuild

.github/actions/composite/setupNode/action.yml

@@ -1,5 +1,6 @@
 name: Set up Node
-description: Set up Node
+description: |
+  Set up Node and restore dependencies, picking the strategy by runner OS: Blacksmith Sticky Disks on Linux, actions/cache on macOS.
 
 inputs:
   IS_HYBRID_BUILD:
@@ -10,7 +11,7 @@ inputs:
 outputs:
   cache-hit:
     description: Was there a cache hit on the main node_modules?
-    value: ${{ steps.cache-node-modules.outputs.cache-hit }}
+    value: ${{ steps.check-node-modules.outputs.cache-hit }}
 
 runs:
   using: composite
@@ -24,33 +25,106 @@ runs:
       uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f
       with:
         node-version-file: '.nvmrc'
-        cache: 'npm'
-        cache-dependency-path: normalized-package-lock.json
+
+    - id: runner-info
+      shell: bash
+      run: echo "use-sticky-disk=${{ runner.os == 'Linux' && contains(runner.name, 'blacksmith') }}" >> "$GITHUB_OUTPUT"
+
+    - id: stickydisk-node-modules
+      if: steps.runner-info.outputs.use-sticky-disk == 'true'
+      uses: useblacksmith/stickydisk@6d373c96a74cbde0c99fedc5ea5d3a7ba66ba494 # v1.4.0
+      with:
+        key: ${{ format('{0}-{1}-{2}-node-modules-{3}', github.repository, runner.os, runner.arch, inputs.IS_HYBRID_BUILD == 'true' && hashFiles('normalized-package-lock.json', 'patches/**', 'Mobile-Expensify/patches/**') || hashFiles('normalized-package-lock.json', 'patches/**')) }}
+        path: node_modules
+
+    - id: stickydisk-old-dot-node-modules
+      if: steps.runner-info.outputs.use-sticky-disk == 'true' && inputs.IS_HYBRID_BUILD == 'true'
+      uses: useblacksmith/stickydisk@6d373c96a74cbde0c99fedc5ea5d3a7ba66ba494 # v1.4.0
+      with:
+        key: ${{ format('{0}-{1}-{2}-old-dot-node-modules-{3}', github.repository, runner.os, runner.arch, hashFiles('Mobile-Expensify/package-lock.json', 'Mobile-Expensify/patches/**')) }}
+        path: Mobile-Expensify/node_modules
+
+    - id: stickydisk-npm
+      if: steps.runner-info.outputs.use-sticky-disk == 'true'
+      uses: useblacksmith/stickydisk@6d373c96a74cbde0c99fedc5ea5d3a7ba66ba494 # v1.4.0
+      with:
+        key: ${{ format('{0}-{1}-{2}-npm', github.repository, runner.os, runner.arch) }}
+        path: ~/.npm
 
     - id: cache-node-modules
+      if: steps.runner-info.outputs.use-sticky-disk != 'true'
       # v5.0.1
       uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
       with:
         path: node_modules
-        key: ${{ inputs.IS_HYBRID_BUILD == 'true' && format('{0}-node-modules-{1}', runner.os, hashFiles('package-lock.json', 'patches/**', 'Mobile-Expensify/patches/**')) || format('{0}-node-modules-{1}', runner.os, hashFiles('package-lock.json', 'patches/**'))}}
+        key: ${{ format('{0}-node-modules-{1}', runner.os, inputs.IS_HYBRID_BUILD == 'true' && hashFiles('package-lock.json', 'patches/**', 'Mobile-Expensify/patches/**') || hashFiles('package-lock.json', 'patches/**')) }}
 
     - id: cache-old-dot-node-modules
-      if: inputs.IS_HYBRID_BUILD == 'true'
+      if: steps.runner-info.outputs.use-sticky-disk != 'true' && inputs.IS_HYBRID_BUILD == 'true'
       # v5.0.1
       uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
       with:
         path: Mobile-Expensify/node_modules
         key: ${{ runner.os }}-node-modules-${{ hashFiles('Mobile-Expensify/package-lock.json', 'Mobile-Expensify/patches/**') }}
 
-    - name: Remove ND node_modules if needed for hybrid app build
-      if: inputs.IS_HYBRID_BUILD == 'true' && steps.cache-node-modules.outputs.cache-hit == 'true' && steps.cache-old-dot-node-modules.outputs.cache-hit != 'true'
+    - id: check-node-modules
       shell: bash
-      run: rm -rf node_modules
+      env:
+        USE_STICKY_DISK: ${{ steps.runner-info.outputs.use-sticky-disk }}
+        ACTIONS_CACHE_HIT: ${{ steps.cache-node-modules.outputs.cache-hit }}
+      run: |
+        if [[ "$USE_STICKY_DISK" == 'true' ]]; then
+          [[ -f node_modules/.stickydisk-installed ]] && CACHE_HIT='true' || CACHE_HIT='false'
+        else
+          CACHE_HIT="$ACTIONS_CACHE_HIT"
+        fi
+        echo "cache-hit=$CACHE_HIT" >> "$GITHUB_OUTPUT"
+
+    - id: check-old-dot-node-modules
+      if: inputs.IS_HYBRID_BUILD == 'true'
+      shell: bash
+      env:
+        USE_STICKY_DISK: ${{ steps.runner-info.outputs.use-sticky-disk }}
+        ACTIONS_CACHE_HIT: ${{ steps.cache-old-dot-node-modules.outputs.cache-hit }}
+      run: |
+        if [[ "$USE_STICKY_DISK" == 'true' ]]; then
+          [[ -f Mobile-Expensify/node_modules/.stickydisk-installed ]] && CACHE_HIT='true' || CACHE_HIT='false'
+        else
+          CACHE_HIT="$ACTIONS_CACHE_HIT"
+        fi
+        echo "cache-hit=$CACHE_HIT" >> "$GITHUB_OUTPUT"
+
+    - id: cache-npm
+      if: steps.runner-info.outputs.use-sticky-disk != 'true' && (steps.check-node-modules.outputs.cache-hit != 'true' || (inputs.IS_HYBRID_BUILD == 'true' && steps.check-old-dot-node-modules.outputs.cache-hit != 'true'))
+      # v5.0.1
+      uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
+      with:
+        path: ~/.npm
+        key: ${{ runner.os }}-${{ runner.arch }}-npm-${{ hashFiles('normalized-package-lock.json') }}
+        restore-keys: ${{ runner.os }}-${{ runner.arch }}-npm-
+
+    - name: Clear ND node_modules if needed for hybrid app build
+      if: inputs.IS_HYBRID_BUILD == 'true' && steps.check-node-modules.outputs.cache-hit == 'true' && steps.check-old-dot-node-modules.outputs.cache-hit != 'true'
+      shell: bash
+      # Empty the contents instead of deleting node_modules itself: on Linux it is a sticky-disk mount
+      # point, so `rm -rf node_modules` would fail to remove the mount (Device or resource busy).
+      run: find node_modules -mindepth 1 -maxdepth 1 -exec rm -rf {} +
 
     - name: Install root project node packages
-      if: steps.cache-node-modules.outputs.cache-hit != 'true' || (inputs.IS_HYBRID_BUILD == 'true' && steps.cache-old-dot-node-modules.outputs.cache-hit != 'true')
+      if: steps.check-node-modules.outputs.cache-hit != 'true' || (inputs.IS_HYBRID_BUILD == 'true' && steps.check-old-dot-node-modules.outputs.cache-hit != 'true')
       uses: nick-fields/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4
       with:
         timeout_minutes: 30
         max_attempts: 3
         command: npm ci
+
+    - name: Mark sticky disks as installed
+      if: steps.runner-info.outputs.use-sticky-disk == 'true'
+      shell: bash
+      env:
+        IS_HYBRID_BUILD: ${{ inputs.IS_HYBRID_BUILD }}
+      run: |
+        touch node_modules/.stickydisk-installed
+        if [[ "$IS_HYBRID_BUILD" == 'true' ]]; then
+          touch Mobile-Expensify/node_modules/.stickydisk-installed
+        fi

.github/actions/javascript/bumpVersion/index.js

@@ -1976,7 +1976,7 @@ class CLI {
             .map((key) => `[--${key} <value>]`)
             .join(' ');
         const flagUsage = [...Object.keys(flags), '--yes', '--no', '--help'].map((key) => `[${key.startsWith('--') ? key : `--${key}`}]`).join(' ');
-        console.log(`\nUsage: npx ts-node ${scriptName} ${flagUsage} ${namedArgUsage} ${positionalUsage}\n`);
+        console.log(`\nUsage: ${CLI.detectRuntimeCommand()} ${scriptName} ${flagUsage} ${namedArgUsage} ${positionalUsage}\n`);
         console.log('Flags:');
         for (const [name, spec] of Object.entries(flags)) {
             console.log(`  --${name.padEnd(20)} ${spec.description}`);
@@ -2004,6 +2004,25 @@ class CLI {
             console.log('');
         }
     }
+    /**
+     * Attempts to detect the command used to invoke the currently-running script, for display in the usage line of the help message.
+     * Checked in order of most to least reliable signal; falls back to plain `node` if nothing else matches.
+     */
+    static detectRuntimeCommand() {
+        // Bun's own public, documented signal. Cast needed since @types/node's ProcessVersions type has no `bun` key.
+        if (process.versions.bun) {
+            return 'bun';
+        }
+        // Internal symbol ts-node sets on `process` when its register hook is active (the same mechanism other tools, e.g. fastify-autoload, rely on to detect ts-node).
+        if (Reflect.get(process, Symbol.for('ts-node.register.instance'))) {
+            return 'npx ts-node';
+        }
+        // tsx registers its loader hooks via --require/--import flags pointing into its own package, visible in execArgv regardless of how it was installed.
+        if (process.execArgv.some((arg) => arg.includes('tsx/dist/'))) {
+            return 'npx tsx';
+        }
+        return 'node';
+    }
     static parseStringArg(rawString, paramName, spec) {
         if ('parse' in spec && !!spec.parse) {
             try {