Revert "docs: add simulator get changelog entry"

This reverts commit 6c0636bdbb.

Co-authored-by: krystofwoldrich <[email protected]>

.github/PULL_REQUEST_TEMPLATE

@@ -1,3 +1,4 @@
+<!-- If this PR requires a changelog entry, add it by commenting the PR with the command `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]`. -->
 <!-- You can skip the changelog check by labeling the PR with "no changelog". -->
 
 # Why

.github/codemention.yml

@@ -2,7 +2,7 @@ commentConfiguration:
   preamble: 'Subscribed to pull request'
   epilogue: 'Generated by [CodeMention](https://github.com/expo/expo/actions/workflows/codemention.yaml)'
 rules:
-  - patterns: ['packages/eas-cli/**']
+  - patterns: ['**/*']
     mentions: ['douglowder']
   - patterns: ['packages/eas-cli/src/update/**']
     mentions: ['wschurman', 'quinlanj']

.github/workflows/codemention.yml

@@ -12,9 +12,9 @@ jobs:
       contents: read
       pull-requests: write
     steps:
-      # Pinned to a commit SHA (not a tag or branch) because this runs under
-      # pull_request_target with a write-scoped token — a re-pointed tag or
-      # moving branch would allow unreviewed upstream code to run here.
-      - uses: tobyhs/codemention@ebac5877393ab8693fd73b42708c8552043e9a3b # post-v1.5.2
+      # Pinned to a commit SHA (not the v1.4.0 tag) because this runs under
+      # pull_request_target with a write-scoped token — a re-pointed tag from
+      # a compromised upstream account would give the attacker repo write access.
+      - uses: tobyhs/codemention@bb6bfb2c3ff1e6fee7ee37006bbee6d114057225 # v1.4.0
         with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          githubToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/license.yml

@@ -1,37 +0,0 @@
-name: License
-on:
-  schedule:
-    - cron: '0 0 1 1-12/3 *' # Run every three months
-  push:
-    branches:
-      - main
-    paths:
-      - .github/workflows/license.yml
-  workflow_dispatch:
-
-jobs:
-  update:
-    runs-on: ubuntu-latest
-    name: Update BSL change date
-    steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
-        with:
-          token: ${{ secrets.EXPO_BOT_PAT }}
-      - name: Check last commit date
-        run: |
-          # The date in the license
-          change_date=$(sed --quiet --regexp-extended 's/^Change Date:\s+([0-9]{4}-[0-9]{2}-[0-9]{2})/\1/p' < LICENSE-BUSL)
-          [ -z "$change_date" ] && exit 1
-
-          new_change_date=$(date --date "+3 years" --iso-8601)
-
-          if [ "$(date --date "$new_change_date" +%s)" -gt "$(date --date "$change_date" +%s)" ]; then
-            sed --in-place "s/$change_date/$new_change_date/" LICENSE-BUSL
-            git config user.name 'Expo Bot'
-            git config user.email [email protected]
-            git add LICENSE-BUSL
-            git commit -m "[license] Update BSL Change Date to $new_change_date"
-            if [ "$(git branch --show-current)" = main ]; then
-              git push
-            fi
-          fi

.vscode/settings.json

@@ -5,6 +5,5 @@
     "**/*.code-search": true,
     "**/src/**/build/**": false,
     "**/src/build/**": false,
-  },
-  "js/ts.tsdk.path": "node_modules/typescript/lib"
+  }
 }

CHANGELOG.md

@@ -10,181 +10,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🐛 Bug fixes
 
-- [eas-cli] Remove temporary working directories after `eas build:inspect` copies inspect output, avoiding leftover disk usage after failed builds. ([#3981](https://github.com/expo/eas-cli/pull/3981) by [@szdziedzic](https://github.com/szdziedzic))
-
 ### 🧹 Chores
 
-- [eas-cli] Bump `tmp` to `0.2.7` to resolve [Dependabot alert 423](https://github.com/expo/eas-cli/security/dependabot/423). ([#3965](https://github.com/expo/eas-cli/pull/3965) by [@szdziedzic](https://github.com/szdziedzic))
-- [worker] Bump `ws` to patched releases to resolve [Dependabot alert 462](https://github.com/expo/eas-cli/security/dependabot/462). ([#3963](https://github.com/expo/eas-cli/pull/3963) by [@szdziedzic](https://github.com/szdziedzic))
-- Bump `lodash` and `lodash-es` to `4.18.1` across workspaces and upgrade GraphQL Code Generator to remove the remaining vulnerable transitive copy for Dependabot alert 354. ([#4009](https://github.com/expo/eas-cli/pull/4009) by [@sjchmiela](https://github.com/sjchmiela))
-- [eas-cli] Bump `sigstore` to `4.1.1` to resolve [Dependabot alert 475](https://github.com/expo/eas-cli/security/dependabot/475). ([#3961](https://github.com/expo/eas-cli/pull/3961) by [@szdziedzic](https://github.com/szdziedzic))
-- [eas-cli] Bump `axios` to patched releases to resolve [Dependabot alert 439](https://github.com/expo/eas-cli/security/dependabot/439). ([#3964](https://github.com/expo/eas-cli/pull/3964) by [@szdziedzic](https://github.com/szdziedzic))
-- [eas-cli] Bump `handlebars` to `4.7.9` to resolve [Dependabot alert 334](https://github.com/expo/eas-cli/security/dependabot/334). ([#3958](https://github.com/expo/eas-cli/pull/3958) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [21.0.1](https://github.com/expo/eas-cli/releases/tag/v21.0.1) - 2026-07-15
-
-### 🎉 New features
-
-- [eas-cli] Add `eas project:delete` command to delete a project — the current directory's project by default, or any project passed as an argument (`@account/slug` or ID). Confirmation requires the project's full name, typed at the interactive prompt or passed via `--dangerously-confirm-deletion` (required in non-interactive mode). Deletion requires sudo mode: the command prompts for your password (and OTP) to upgrade the session when the server requires it. Deletion was previously only possible from the website. ([#4012](https://github.com/expo/eas-cli/pull/4012) by [@brentvatne](https://github.com/brentvatne))
-- [eas-cli] Add `eas browse` to open the project page on expo.dev in a web browser, with an optional page argument (e.g. `eas browse build`, `eas browse hosting`) for project subpages and a `--no-browser` flag to print the URL. `eas open` is now an alias of `eas browse`. ([#4003](https://github.com/expo/eas-cli/pull/4003) by [@jonsamp](https://github.com/jonsamp))
-- [eas-cli] Add `--dev-domain` flag to `eas deploy` to choose the project's preview URL (`<name>.expo.app`) without prompting, allowing first-time deploys with `--non-interactive`. ([#4004](https://github.com/expo/eas-cli/pull/4004) by [@brentvatne](https://github.com/brentvatne))
-- [eas-cli] Add `-p` as an alias for `--platform` in `eas simulator:start`. ([#3902](https://github.com/expo/eas-cli/pull/3902) by [@brentvatne](https://github.com/brentvatne))
-
-### 🧹 Chores
-
-- [eas-cli][build-tools][local-build-plugin][worker] Bump `tar` to `7.5.19`. ([#3971](https://github.com/expo/eas-cli/pull/3971) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [21.0.0](https://github.com/expo/eas-cli/releases/tag/v21.0.0) - 2026-07-13
-
-### 🛠 Breaking changes
-
-- [eas-cli] Remove `eas onboarding` command (aliases `init:onboarding`, `project:onboarding`). ([#3993](https://github.com/expo/eas-cli/pull/3993) by [@byronkarlen](https://github.com/byronkarlen))
-
-### 🎉 New features
-
-- [eas-cli] Improve `eas workflow:create`: add a `--template` flag, generate a placeholder workflow when a file name is passed, use shorter default file names (`build.yml`, `update.yml`, `deploy.yml`), configure EAS Build and EAS Update automatically when the chosen template requires them, set default app identifiers without prompting for the development build and deploy templates, install `expo-dev-client` during development build setup, and tighten the generated comments and next steps. ([#3943](https://github.com/expo/eas-cli/pull/3943) by [@jonsamp](https://github.com/jonsamp))
-- [eas-cli] `eas integrations:posthog:dashboard` now opens PostHog via a signed-in link, skipping the login prompt. ([#3975](https://github.com/expo/eas-cli/pull/3975) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Add `eas/posthog_capture_event` workflow function to send PostHog events from workflow runs. ([#3934](https://github.com/expo/eas-cli/pull/3934) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Add `eas/posthog_flag_rollout` workflow function to update PostHog feature flags from workflow runs. ([#3944](https://github.com/expo/eas-cli/pull/3944) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Add `eas/posthog_wait_for_metric` workflow function to gate workflow runs on a PostHog metric. ([#3945](https://github.com/expo/eas-cli/pull/3945) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Add `eas/posthog_upload_sourcemaps` workflow function to upload source maps to PostHog. ([#3947](https://github.com/expo/eas-cli/pull/3947) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Add `eas/posthog_annotation` workflow function to create PostHog annotations from workflow runs. ([#3948](https://github.com/expo/eas-cli/pull/3948) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Add `eas/posthog_wait_for_query` workflow function to gate workflow runs on a PostHog query. ([#3949](https://github.com/expo/eas-cli/pull/3949) by [@gwdp](https://github.com/gwdp))
-
-### 🐛 Bug fixes
-
-- [eas-cli] Rethrow Apple errors during capability sync instead of silently succeeding. ([#3989](https://github.com/expo/eas-cli/pull/3989) by [@douglowder](https://github.com/douglowder))
-- [build-tools] Skip embedded bundle upload for development client builds instead of warning that the bundle is missing. ([#3940](https://github.com/expo/eas-cli/pull/3940) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Accept a navigation metric name in observe:metrics when passed in on the command line. ([#3973](https://github.com/expo/eas-cli/pull/3973) by [@douglowder](https://github.com/douglowder))
-- [eas-cli] Retry uploading assets that don't finish processing during `eas update`, instead of failing the update. ([#3918](https://github.com/expo/eas-cli/pull/3918) by [@gwdp](https://github.com/gwdp))
-
-### 🧹 Chores
-
-- Upgrade Expo plist dependencies to use `@xmldom/xmldom` `0.8.13` without a root resolution, addressing Dependabot alert 372. ([#4010](https://github.com/expo/eas-cli/pull/4010) by [@sjchmiela](https://github.com/sjchmiela))
-- [eas-cli] add agent detection to analytics events. ([#3983](https://github.com/expo/eas-cli/pull/3983) by [@davidmokos](https://github.com/davidmokos))
-- Bump `glob` 10.x to a patched version in the root lockfile. ([#3979](https://github.com/expo/eas-cli/pull/3979) by [@szdziedzic](https://github.com/szdziedzic))
-- [build-tools] Bump `jws` to a patched version in the root lockfile. ([#3978](https://github.com/expo/eas-cli/pull/3978) by [@szdziedzic](https://github.com/szdziedzic))
-- [worker] Bump `koa` to `3.1.2`. ([#3974](https://github.com/expo/eas-cli/pull/3974) by [@szdziedzic](https://github.com/szdziedzic))
-- [steps] Bump `cross-spawn` to a patched version in the TypeScript custom function fixture. ([#3977](https://github.com/expo/eas-cli/pull/3977) by [@szdziedzic](https://github.com/szdziedzic))
-- [eas-cli] Bump `node-forge` to `1.4.0`. ([#3970](https://github.com/expo/eas-cli/pull/3970) by [@szdziedzic](https://github.com/szdziedzic))
-- [eas-cli] Bump `fast-xml-builder` to `1.2.1` to resolve [Dependabot alert 400](https://github.com/expo/eas-cli/security/dependabot/400). ([#3966](https://github.com/expo/eas-cli/pull/3966) by [@szdziedzic](https://github.com/szdziedzic))
-- [eas-cli] Bump `form-data` to patched releases to resolve [Dependabot alert 465](https://github.com/expo/eas-cli/security/dependabot/465). ([#3962](https://github.com/expo/eas-cli/pull/3962) by [@szdziedzic](https://github.com/szdziedzic))
-- [eas-cli] Bump `fast-xml-parser` to `4.5.7` to resolve [Dependabot alert 286](https://github.com/expo/eas-cli/security/dependabot/286). ([#3960](https://github.com/expo/eas-cli/pull/3960) by [@szdziedzic](https://github.com/szdziedzic))
-- [eas-cli] Bump `shell-quote` to `1.9.0` to resolve [Dependabot alert 440](https://github.com/expo/eas-cli/security/dependabot/440). ([#3959](https://github.com/expo/eas-cli/pull/3959) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [20.5.1](https://github.com/expo/eas-cli/releases/tag/v20.5.1) - 2026-07-01
-
-### 🐛 Bug fixes
-
-- [eas-cli] Fix Free plan users being warned they had reached their build limit while still well below it. Overage warnings are now shown only for paid plans with an actual billable overage cost. ([#3882](https://github.com/expo/eas-cli/pull/3882) by [@sarahlane8](https://github.com/sarahlane8))
-- [eas-cli] Count only genuine per-worker build overages in the pre-build usage warning, so the reported number of builds beyond included credits is accurate. ([#3932](https://github.com/expo/eas-cli/pull/3932) by [@sarahlane8](https://github.com/sarahlane8))
-- [eas-cli] Select correct tvOS build target for non-interactive Apple builds when EXPO_TV env variable is set. ([#3907](https://github.com/expo/eas-cli/pull/3907) by [@douglowder](https://github.com/douglowder))
-
-### 🧹 Chores
-
-- [eas-cli] Bump `@expo/apple-utils` to `2.1.22`. ([#3913](https://github.com/expo/eas-cli/pull/3913) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [20.5.0](https://github.com/expo/eas-cli/releases/tag/v20.5.0) - 2026-06-29
-
-### 🎉 New features
-
-- [eas-cli] `eas integrations:posthog:connect` now supports existing PostHog user connection. ([#3895](https://github.com/expo/eas-cli/pull/3895) by [@gwdp](https://github.com/gwdp))
-
-## [20.4.0](https://github.com/expo/eas-cli/releases/tag/v20.4.0) - 2026-06-25
-
-### 🎉 New features
-
-- [eas-cli] New command `observe:session` for inspecting events by session ID. ([#3868](https://github.com/expo/eas-cli/pull/3868) by [@douglowder](https://github.com/douglowder))
-- [eas-cli] Add tiered build-credit usage warnings (approaching/at/over) before each build, lowering the warning threshold to 80% to match email notifications. ([#3882](https://github.com/expo/eas-cli/pull/3882) by [@sarahlane8](https://github.com/sarahlane8))
-
-### 🐛 Bug fixes
-
-- [eas-cli] Fix `eas update --channel` failing with "Channel has no branches associated with it" when the channel was auto-created by a build. A branch with the channel's name is now created and linked, matching the behavior for a channel that doesn't exist yet. ([#3891](https://github.com/expo/eas-cli/pull/3891) by [@gwdp](https://github.com/gwdp))
-
-## [20.3.0](https://github.com/expo/eas-cli/releases/tag/v20.3.0) - 2026-06-18
-
-### 🎉 New features
-
-- [eas-cli] Add `eas account:audit [ACCOUNT_NAME]` command to view an account's audit logs. ([#3863](https://github.com/expo/eas-cli/pull/3863) by [@keith-kurak](https://github.com/keith-kurak))
-- [eas-cli] `eas update:view [GROUP_ID]` now also accepts a platform-specific update ID, resolving it to and displaying its update group. ([#3864](https://github.com/expo/eas-cli/pull/3864) by [@keith-kurak](https://github.com/keith-kurak))
-- [eas-cli] Add `eas integrations:posthog:connect` command. ([#3836](https://github.com/expo/eas-cli/pull/3836) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Add `eas integrations:posthog:dashboard` command. ([#3837](https://github.com/expo/eas-cli/pull/3837) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Add `eas integrations:posthog:disconnect` command. ([#3838](https://github.com/expo/eas-cli/pull/3838) by [@gwdp](https://github.com/gwdp))
-
-### 🐛 Bug fixes
-
-- [eas-cli] `eas integrations:posthog:connect` no longer aborts when `npx expo install` reports an error (for example, on a dynamic app config); it finishes writing the environment variables and prints any remaining manual steps. ([#3877](https://github.com/expo/eas-cli/pull/3877) by [@gwdp](https://github.com/gwdp))
-
-### 🧹 Chores
-
-- [eas-cli] Sync new app agent templates from `expo/llm-configs` before publishing. ([#3865](https://github.com/expo/eas-cli/pull/3865) by [@davidmokos](https://github.com/davidmokos))
-- [eas-cli] Simplify 2FA now that SMS is no longer supported. ([#3859](https://github.com/expo/eas-cli/pull/3859) by [@wschurman](https://github.com/wschurman))
-
-## [20.2.0](https://github.com/expo/eas-cli/releases/tag/v20.2.0) - 2026-06-15
-
-### 🎉 New features
-
-- [eas-cli] Non-interactive iOS App Store and Enterprise builds can now use the App Store Connect API key stored in EAS credentials as a submission key to validate and repair provisioning profiles on Apple servers, without requiring `EXPO_ASC_*` environment variables or an interactive Apple login. ([#3805](https://github.com/expo/eas-cli/pull/3805) by [@sswrk](https://github.com/sswrk))
-- [eas-cli] Add support for non-interactive `eas update:rollback [GROUP_ID]`. The given update group must be the latest for its branch and runtime version; the previous update group is republished, or a roll back to the embedded update is published if there is none. ([#3825](https://github.com/expo/eas-cli/pull/3825) by [@quinlanj](https://github.com/quinlanj))
-
-### 🐛 Bug fixes
-
-- [expo-cocoapods-proxy] Fix iOS worker tarball build failing on macOS Tahoe due to bundler incompatibility with RubyGems 4. ([#3824](https://github.com/expo/eas-cli/pull/3824) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Fix `update:embedded` topic showing the `update:embedded:delete` subcommand description in the command listing. ([#3866](https://github.com/expo/eas-cli/pull/3866) by [@jc-expo](https://github.com/jc-expo))
-
-## [20.1.0](https://github.com/expo/eas-cli/releases/tag/v20.1.0) - 2026-06-05
-
-### 🎉 New features
-
-- [eas-cli] Add `eas update:embedded:view` command. ([#3810](https://github.com/expo/eas-cli/pull/3810) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Add `eas update:embedded:list` command. ([#3811](https://github.com/expo/eas-cli/pull/3811) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Add `eas update:embedded:delete` command. ([#3809](https://github.com/expo/eas-cli/pull/3809) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Auto-upload embedded bundle after build when `EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE` is set. ([#3767](https://github.com/expo/eas-cli/pull/3767) by [@gwdp](https://github.com/gwdp))
-
-## [20.0.0](https://github.com/expo/eas-cli/releases/tag/v20.0.0) - 2026-05-29
-
-### 🛠 Breaking changes
-
-- [eas-cli] Rename observe commands: `observe:logs` → `observe:events` (events emitted via `logEvent`), previous `observe:events` → `observe:metrics` (individual performance metric samples), previous `observe:metrics` → `observe:metrics-summary` (aggregated stats by app version). ([#3778](https://github.com/expo/eas-cli/pull/3778) by [@kadikraman](https://github.com/kadikraman))
-
-### 🎉 New features
-
-- [eas-cli] `eas go` now prompts to select an Expo SDK version interactively when `--sdk-version` is not provided. ([#3768](https://github.com/expo/eas-cli/pull/3768) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Add `eas update:embedded:upload` command. ([#3720](https://github.com/expo/eas-cli/pull/3720) by [@gwdp](https://github.com/gwdp))
-
-### 🐛 Bug fixes
-
-- [build-tools] Fix `eas/start_ios_simulator` hanging on Xcode 26.4 by writing the readiness screenshot to a temp file instead of `/dev/null`. ([#3794](https://github.com/expo/eas-cli/pull/3794) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Disable `apsd` in the iOS Simulator after boot to stop a push-registration log storm that pegs `diagnosticd` CPU for the lifetime of the Simulator. ([#3795](https://github.com/expo/eas-cli/pull/3795) by [@gwdp](https://github.com/gwdp))
-
-## [19.1.0](https://github.com/expo/eas-cli/releases/tag/v19.1.0) - 2026-05-25
-
-### 🎉 New features
-
-- [eas-cli] Add `--refresh-ad-hoc-provisioning-profile` flag to refresh managed ad-hoc provisioning profiles from App Store Connect before gathering build credentials in non-interactive mode. ([#3716](https://github.com/expo/eas-cli/pull/3716) by [@sswrk](https://github.com/sswrk))
-- [eas-build-job] Add optional `refreshAdHocProvisioningProfile` field to iOS build jobs. ([#3717](https://github.com/expo/eas-cli/pull/3717) by [@sswrk](https://github.com/sswrk))
-- [build-tools] Pass `refreshAdHocProvisioningProfile` through `eas build:internal` for git-based integration builds. ([#3770](https://github.com/expo/eas-cli/pull/3770) by [@sswrk](https://github.com/sswrk))
-
-## [19.0.8](https://github.com/expo/eas-cli/releases/tag/v19.0.8) - 2026-05-21
-
-### 🐛 Bug fixes
-
-- [eas-cli] `eas go` now pre-selects the SDK version from the current project's `app.json` or `app.config.js` when available. ([#3776](https://github.com/expo/eas-cli/pull/3776) by [@gwdp](https://github.com/gwdp))
-
-## [19.0.7](https://github.com/expo/eas-cli/releases/tag/v19.0.7) - 2026-05-21
-
-## [19.0.6](https://github.com/expo/eas-cli/releases/tag/v19.0.6) - 2026-05-21
-
-### 🐛 Bug fixes
-
-- [build-tools] Update the minimum Expo version required for iOS precompiled modules to 55.0.26. ([#3771](https://github.com/expo/eas-cli/pull/3771) by [@chrfalch](https://github.com/chrfalch))
-
-## [19.0.5](https://github.com/expo/eas-cli/releases/tag/v19.0.5) - 2026-05-20
-
-### 🐛 Bug fixes
-
-- [eas-cli] Improve Sentry diagnostics for managed iOS entitlements config fallback. ([#3763](https://github.com/expo/eas-cli/pull/3763) by [@sjchmiela](https://github.com/sjchmiela))
-
 ## [19.0.4](https://github.com/expo/eas-cli/releases/tag/v19.0.4) - 2026-05-20
 
 ## [19.0.1](https://github.com/expo/eas-cli/releases/tag/v19.0.1) - 2026-05-19

LICENSE-BUSL

@@ -12,7 +12,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided that you d
                       to access the functionality of and directly benefit from the
                       functionality of the Licensed Work.
 
-Change Date:          2029-07-15
+Change Date:          2028-04-01
 
 Change License:       MIT
 

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
-  "version": "21.0.2",
+  "version": "19.0.4",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

mise.toml

@@ -3,6 +3,4 @@ _.path = "./tools/bin"
 MISE_NODE_COREPACK = "true"
 
 [tools]
-gcloud = "570.0.0"
-jq = "1.8.1"
 node = "20.19.4"

packages/build-tools/.gitignore

@@ -1,6 +1,5 @@
 node_modules/
 dist/
-bin/record-sim
 
 .secrets*
 !.secrets.example

packages/build-tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "21.0.2",
+  "version": "19.0.3",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <[email protected]>",
@@ -23,7 +23,6 @@
     "watch": "tsc --watch --preserveWatchOutput",
     "prebuild": "yarn gql",
     "build": "tsc",
-    "build:record-sim": "mkdir -p bin && record_sim_bin_path=$(swift build -c release --package-path resources/record-sim --build-path resources/record-sim/.build --show-bin-path) && swift build -c release --package-path resources/record-sim --build-path resources/record-sim/.build && cp \"$record_sim_bin_path/record-sim\" bin/record-sim && chmod +x bin/record-sim",
     "typecheck": "tsc",
     "prepack": "rimraf dist \"*.tsbuildinfo\" && yarn gql && tsc -p tsconfig.build.json",
     "jest-unit": "jest --config jest/unit-config.ts",
@@ -38,19 +37,19 @@
   "dependencies": {
     "@expo/config": "55.0.10",
     "@expo/config-plugins": "55.0.7",
-    "@expo/downloader": "21.0.0",
-    "@expo/eas-build-job": "21.0.2",
+    "@expo/downloader": "19.0.0",
+    "@expo/eas-build-job": "19.0.0",
     "@expo/env": "^0.4.0",
-    "@expo/logger": "21.0.0",
+    "@expo/logger": "19.0.0",
     "@expo/package-manager": "1.9.10",
-    "@expo/plist": "^0.3.5",
+    "@expo/plist": "^0.2.0",
     "@expo/results": "^1.0.0",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "21.0.2",
-    "@expo/template-file": "21.0.2",
-    "@expo/turtle-spawn": "21.0.0",
+    "@expo/steps": "19.0.0",
+    "@expo/template-file": "19.0.0",
+    "@expo/turtle-spawn": "19.0.0",
     "@expo/xcpretty": "^4.3.1",
-    "@ngrok/ngrok": "1.7.0",
+    "@google-cloud/storage": "^7.11.2",
     "@sentry/node": "7.77.0",
     "@urql/core": "^6.0.1",
     "bplist-parser": "0.3.2",
@@ -60,7 +59,7 @@
     "gql.tada": "^1.8.13",
     "joi": "^17.13.1",
     "jose": "5.10.0",
-    "lodash": "^4.18.1",
+    "lodash": "^4.17.21",
     "node-fetch": "^2.7.0",
     "node-forge": "^1.3.1",
     "node-stream-zip": "1.15.0",
@@ -71,13 +70,13 @@
     "resolve-from": "^5.0.0",
     "retry": "^0.13.1",
     "semver": "^7.6.2",
-    "tar": "7.5.19",
+    "tar": "7.5.7",
     "uuid": "9.0.1",
     "yaml": "^2.8.1",
     "zod": "^4.3.5"
   },
   "devDependencies": {
-    "@expo/repack-app": "~0.6.1",
+    "@expo/repack-app": "~0.4.1",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.4",

packages/build-tools/resources/record-sim/.gitignore

@@ -1,4 +0,0 @@
-.build/
-.swiftpm/
-DerivedData/
-.DS_Store

packages/build-tools/resources/record-sim/Package.swift

@@ -1,28 +0,0 @@
-// swift-tools-version: 5.9
-
-import PackageDescription
-
-let package = Package(
-    name: "record-sim",
-    platforms: [
-        .macOS(.v14),
-    ],
-    products: [
-        .library(name: "RecordSim", targets: ["RecordSim"]),
-        .executable(name: "record-sim", targets: ["record-sim"]),
-    ],
-    targets: [
-        .target(
-            name: "RecordSim",
-            linkerSettings: [
-                .linkedFramework("AVFoundation"),
-                .linkedFramework("CoreGraphics"),
-                .linkedFramework("CoreMedia"),
-                .linkedFramework("CoreVideo"),
-                .linkedFramework("IOSurface"),
-                .linkedFramework("UniformTypeIdentifiers"),
-            ]
-        ),
-        .executableTarget(name: "record-sim", dependencies: ["RecordSim"]),
-    ]
-)

packages/build-tools/resources/record-sim/README.md

@@ -1,79 +0,0 @@
-# RecordSim
-
-Small Swift library for non-exclusive iOS Simulator screen recording.
-
-It implements one recording path:
-
-1. Listen to SimRenderServer framebuffer callbacks.
-2. Copy the live `IOSurface` immediately into an owned `CVPixelBuffer`.
-3. Feed one continuous `AVAssetWriter`.
-4. Emit Apple HLS/CMAF-style fragmented MP4 segments.
-
-The output is suitable for uploading while recording. `session.json` contains
-the ordered segment metadata needed to build a playlist later.
-
-## Output
-
-```text
-session/
-  init.mp4
-  session.json
-  segments/
-    segment-000000.m4s
-    segment-000001.m4s
-```
-
-`init.mp4` is the fMP4 initialization segment. Individual `.m4s` files are not
-standalone MP4 files. `session.json` stores the wall-clock timestamp for the
-first video frame plus the metadata needed to build a playlist: HLS version,
-target duration, media sequence, `initSegment`, and the ordered `segments` array
-with file path and duration for each media segment.
-
-## CLI
-
-```bash
-swift run record-sim \
-  --udid <BOOTED_SIMULATOR_UDID> \
-  --output /tmp/sim-recording \
-  --segment-duration 120 \
-  --fps 30 \
-  --bitrate 30000000 \
-  --codec h264
-```
-
-For sparse 2h sessions, `--segment-duration 120` is a reasonable default: about
-60 media objects plus the init segment. The recorder appends a single duplicate
-hold frame near each segment boundary when the simulator is idle, so long idle
-periods still produce uploadable segments without encoding idle frames at 60fps.
-Use `--segment-duration 0` to write one continuous `recording.mp4` instead of
-`init.mp4` plus media segments.
-
-Frame timestamps use monotonic host time, not wall-clock time. The recorder also
-probes the framebuffer seed once per second; if the surface changes without
-callbacks for 5 seconds, it captures that frame and rewires the private callback
-registration.
-
-## Library
-
-```swift
-let recorder = SimulatorRecorder(
-  configuration: SimulatorRecordingConfiguration(
-    deviceUDID: udid,
-    outputDirectory: sessionDirectory,
-    segmentDuration: 120
-  )
-)
-
-recorder.onSegment = { segment in
-  // Enqueue upload of segment.url.
-}
-
-try recorder.start()
-try recorder.waitUntilFirstFrame()
-// ...
-let manifest = try recorder.stop()
-```
-
-`session.json` contains the precise wall-clock time for video PTS zero. In
-segmented mode it also contains the init segment and ordered media segment
-file/duration entries; in single-file mode it points at `recording.mp4`.

packages/build-tools/resources/record-sim/Sources/RecordSim/FramebufferDisplaySource.swift

@@ -1,192 +0,0 @@
-import Foundation
-import IOSurface
-import ObjectiveC
-
-final class FramebufferDisplaySource {
-    struct SurfaceSnapshot {
-        let surface: IOSurface
-        let width: Int
-        let height: Int
-        let seed: UInt32
-    }
-
-    private let deviceUDID: String
-    private let callbackQueue: DispatchQueue
-    private let onFrame: () -> Void
-    private let onSurfaceChange: () -> Void
-    private var descriptors: [NSObject] = []
-    private var callbackUUIDs: [ObjectIdentifier: NSUUID] = [:]
-    private var retainedBlocks: [AnyObject] = []
-    private var ioClient: NSObject?
-
-    init(
-        deviceUDID: String,
-        callbackQueue: DispatchQueue,
-        onFrame: @escaping () -> Void,
-        onSurfaceChange: @escaping () -> Void
-    ) {
-        self.deviceUDID = deviceUDID
-        self.callbackQueue = callbackQueue
-        self.onFrame = onFrame
-        self.onSurfaceChange = onSurfaceChange
-    }
-
-    func start() throws {
-        try PrivateSimulatorFrameworks.load()
-        guard let device = SimulatorDeviceLookup.find(udid: deviceUDID) else {
-            throw RecorderError.make(1, "Simulator \(deviceUDID) not found")
-        }
-        let state = device.value(forKey: "stateString") as? String ?? "unknown"
-        guard state == "Booted" else {
-            throw RecorderError.make(2, "Simulator \(deviceUDID) is not booted (state: \(state))")
-        }
-        guard
-            let io = device.perform(NSSelectorFromString("io"))?.takeUnretainedValue() as? NSObject
-        else {
-            throw RecorderError.make(3, "Failed to get simulator IO client")
-        }
-        ioClient = io
-        try wireUpFramebuffer()
-    }
-
-    func stop() {
-        unregisterCallbacks()
-        descriptors.removeAll()
-        retainedBlocks.removeAll()
-        ioClient = nil
-    }
-
-    func surfaceSnapshot() -> SurfaceSnapshot? {
-        let surfaceSelector = NSSelectorFromString("framebufferSurface")
-        var bestSnapshot: SurfaceSnapshot?
-        var bestArea = 0
-        for descriptor in descriptors {
-            guard let surfaceObject = descriptor.perform(surfaceSelector)?.takeUnretainedValue()
-            else {
-                continue
-            }
-            let surface = unsafeBitCast(surfaceObject, to: IOSurface.self)
-            let width = IOSurfaceGetWidth(surface)
-            let height = IOSurfaceGetHeight(surface)
-            let area = width * height
-            if area > bestArea {
-                bestSnapshot = SurfaceSnapshot(
-                    surface: surface,
-                    width: width,
-                    height: height,
-                    seed: IOSurfaceGetSeed(surface)
-                )
-                bestArea = area
-            }
-        }
-        return bestSnapshot
-    }
-
-    func rewireFramebuffer() throws {
-        try wireUpFramebuffer()
-    }
-
-    private func wireUpFramebuffer() throws {
-        guard let io = ioClient else {
-            throw RecorderError.make(3, "No simulator IO client")
-        }
-        io.perform(NSSelectorFromString("updateIOPorts"))
-        let nextDescriptors = try findFramebufferDescriptors(io: io)
-        unregisterCallbacks()
-        descriptors = nextDescriptors
-        retainedBlocks.removeAll()
-        do {
-            for descriptor in descriptors {
-                try registerCallbacks(descriptor: descriptor)
-            }
-        } catch {
-            unregisterCallbacks()
-            descriptors.removeAll()
-            retainedBlocks.removeAll()
-            throw error
-        }
-    }
-
-    private func findFramebufferDescriptors(io: NSObject) throws -> [NSObject] {
-        guard let ports = io.value(forKey: "deviceIOPorts") as? [NSObject] else {
-            throw RecorderError.make(4, "Failed to read simulator IO ports")
-        }
-        let portIdentifierSelector = NSSelectorFromString("portIdentifier")
-        let descriptorSelector = NSSelectorFromString("descriptor")
-        let surfaceSelector = NSSelectorFromString("framebufferSurface")
-
-        var candidates: [NSObject] = []
-        for port in ports {
-            guard port.responds(to: portIdentifierSelector),
-                let portIdentifier = port.perform(portIdentifierSelector)?.takeUnretainedValue(),
-                "\(portIdentifier)" == "com.apple.framebuffer.display",
-                port.responds(to: descriptorSelector),
-                let descriptor = port.perform(descriptorSelector)?.takeUnretainedValue()
-                    as? NSObject,
-                descriptor.responds(to: surfaceSelector)
-            else {
-                continue
-            }
-            candidates.append(descriptor)
-        }
-        if candidates.isEmpty {
-            throw RecorderError.make(5, "No framebuffer display descriptor found")
-        }
-        return candidates
-    }
-
-    private func registerCallbacks(descriptor: NSObject) throws {
-        let selector = NSSelectorFromString(
-            "registerScreenCallbacksWithUUID:callbackQueue:frameCallback:surfacesChangedCallback:propertiesChangedCallback:"
-        )
-        guard descriptor.responds(to: selector) else {
-            throw RecorderError.make(6, "Framebuffer descriptor does not support screen callbacks")
-        }
-        guard let msgSendPointer = dlsym(UnsafeMutableRawPointer(bitPattern: -2), "objc_msgSend")
-        else {
-            throw RecorderError.make(7, "objc_msgSend not found")
-        }
-        typealias MsgSend =
-            @convention(c) (
-                AnyObject, Selector, AnyObject, AnyObject, AnyObject, AnyObject, AnyObject
-            ) -> Void
-        let msgSend = unsafeBitCast(msgSendPointer, to: MsgSend.self)
-
-        let uuid = NSUUID()
-        callbackUUIDs[ObjectIdentifier(descriptor)] = uuid
-
-        let frameCallback: @convention(block) () -> Void = { [weak self] in
-            self?.onFrame()
-        }
-        let surfacesCallback: @convention(block) (AnyObject?, AnyObject?) -> Void = {
-            [weak self] _, _ in
-            self?.onSurfaceChange()
-        }
-        let propertiesCallback: @convention(block) () -> Void = {}
-        retainedBlocks.append(frameCallback as AnyObject)
-        retainedBlocks.append(surfacesCallback as AnyObject)
-        retainedBlocks.append(propertiesCallback as AnyObject)
-
-        msgSend(
-            descriptor,
-            selector,
-            uuid,
-            callbackQueue as AnyObject,
-            frameCallback as AnyObject,
-            surfacesCallback as AnyObject,
-            propertiesCallback as AnyObject
-        )
-    }
-
-    private func unregisterCallbacks() {
-        let selector = NSSelectorFromString("unregisterScreenCallbacksWithUUID:")
-        for descriptor in descriptors {
-            if let uuid = callbackUUIDs[ObjectIdentifier(descriptor)],
-                descriptor.responds(to: selector)
-            {
-                descriptor.perform(selector, with: uuid)
-            }
-        }
-        callbackUUIDs.removeAll()
-    }
-}

packages/build-tools/resources/record-sim/Sources/RecordSim/PrivateSimulatorServices.swift

@@ -1,96 +0,0 @@
-import Foundation
-import ObjectiveC
-
-enum XcodeDeveloperDirectory {
-    static let current: String = {
-        if let developerDir = ProcessInfo.processInfo.environment["DEVELOPER_DIR"],
-            !developerDir.isEmpty
-        {
-            return developerDir
-        }
-
-        let fallback = "/Applications/Xcode.app/Contents/Developer"
-        let pipe = Pipe()
-        let process = Process()
-        process.executableURL = URL(fileURLWithPath: "/usr/bin/xcode-select")
-        process.arguments = ["-p"]
-        process.standardOutput = pipe
-        do {
-            try process.run()
-        } catch {
-            return fallback
-        }
-        process.waitUntilExit()
-        return String(data: pipe.fileHandleForReading.readDataToEndOfFile(), encoding: .utf8)?
-            .trimmingCharacters(in: .whitespacesAndNewlines) ?? fallback
-    }()
-}
-
-enum PrivateSimulatorFrameworks {
-    static func load() throws {
-        try loadResult.get()
-    }
-
-    private static let loadResult: Result<Void, Error> = {
-        let developerDir = XcodeDeveloperDirectory.current
-        let candidates = [
-            "/Library/Developer/PrivateFrameworks/CoreSimulator.framework/CoreSimulator",
-            "\(developerDir)/Library/PrivateFrameworks/CoreSimulator.framework/CoreSimulator",
-            "\(developerDir)/../SharedFrameworks/SimulatorKit.framework/SimulatorKit",
-            "\(developerDir)/Library/PrivateFrameworks/SimulatorKit.framework/SimulatorKit",
-        ]
-        var failures: [String] = []
-        for path in candidates {
-            if dlopen(path, RTLD_NOW) == nil {
-                let message = dlerror().map { String(cString: $0) } ?? "unknown error"
-                failures.append("\(path): \(message)")
-            }
-        }
-        guard NSClassFromString("SimServiceContext") != nil else {
-            let tried = candidates.joined(separator: ", ")
-            let errors = failures.isEmpty ? "no dlopen errors" : failures.joined(separator: "; ")
-            return .failure(
-                RecorderError.make(
-                    8,
-                    "Failed to load CoreSimulator/SimulatorKit (tried: \(tried); errors: \(errors))"
-                )
-            )
-        }
-        return .success(())
-    }()
-}
-
-enum SimulatorDeviceLookup {
-    private static let context: NSObject? = {
-        guard let contextClass = NSClassFromString("SimServiceContext") as? NSObject.Type else {
-            return nil
-        }
-        let sharedSelector = NSSelectorFromString("sharedServiceContextForDeveloperDir:error:")
-        return contextClass.perform(
-            sharedSelector, with: XcodeDeveloperDirectory.current, with: nil)?
-            .takeUnretainedValue() as? NSObject
-    }()
-
-    static func find(udid: String) -> NSObject? {
-        guard let context else {
-            return nil
-        }
-        let deviceSetSelector = NSSelectorFromString("defaultDeviceSetWithError:")
-        guard
-            let deviceSet = context.perform(deviceSetSelector, with: nil)?
-                .takeUnretainedValue() as? NSObject
-        else {
-            return nil
-        }
-        guard let devices = deviceSet.value(forKey: "devices") as? [NSObject] else {
-            return nil
-        }
-        return devices.first {
-            ($0.value(forKey: "UDID") as? NSUUID)?.uuidString == udid
-        }
-    }
-
-    static func stateString(udid: String) -> String? {
-        find(udid: udid)?.value(forKey: "stateString") as? String
-    }
-}

packages/build-tools/resources/record-sim/Sources/RecordSim/RecordingModels.swift

@@ -1,77 +0,0 @@
-import Foundation
-
-public enum RecorderCodec: String, Codable, Sendable {
-    case h264
-    case hevc
-}
-
-public struct SimulatorRecordingConfiguration: Sendable {
-    public var deviceUDID: String
-    public var outputDirectory: URL
-    public var fps: Int
-    public var bitrate: Int
-    public var codec: RecorderCodec
-    public var segmentDuration: TimeInterval
-    public var maxPendingFrames: Int
-    public var overwrite: Bool
-
-    public init(
-        deviceUDID: String,
-        outputDirectory: URL,
-        fps: Int = 30,
-        bitrate: Int = 30_000_000,
-        codec: RecorderCodec = .h264,
-        segmentDuration: TimeInterval = 120,
-        maxPendingFrames: Int = 8,
-        overwrite: Bool = true
-    ) {
-        self.deviceUDID = deviceUDID
-        self.outputDirectory = outputDirectory
-        self.fps = fps
-        self.bitrate = bitrate
-        self.codec = codec
-        self.segmentDuration = segmentDuration
-        self.maxPendingFrames = maxPendingFrames
-        self.overwrite = overwrite
-    }
-}
-
-public enum SegmentKind: String, Codable, Sendable {
-    case initialization
-    case media
-}
-
-public struct SegmentOutput: Sendable {
-    public let kind: SegmentKind
-    public let relativePath: String
-    public let url: URL
-    public let byteCount: Int
-    public let durationSeconds: Double?
-}
-
-public struct MediaSegmentRecord: Codable, Sendable {
-    public let file: String
-    public let durationSeconds: Double
-}
-
-public struct FirstFrameWallClock: Codable, Sendable {
-    public let unixMs: Int64
-    public let iso8601: String
-}
-
-public enum RecordingFinalizationStage: Sendable {
-    case captureStopped
-    case videoSaved
-}
-
-public struct RecordingManifest: Codable, Sendable {
-    public let firstFrameWallClock: FirstFrameWallClock
-    public let width: Int
-    public let height: Int
-    public let hlsVersion: Int?
-    public let hlsTargetDurationSeconds: Int?
-    public let hlsMediaSequence: Int?
-    public let recording: String?
-    public let initSegment: String?
-    public let segments: [MediaSegmentRecord]
-}

packages/build-tools/resources/record-sim/Sources/RecordSim/RecordingOutputWriter.swift

@@ -1,140 +0,0 @@
-import AVFoundation
-import Foundation
-
-final class RecordingOutputWriter: NSObject, AVAssetWriterDelegate {
-    private let rootDirectory: URL
-    private let segmentsDirectory: URL
-    let singleRecordingURL: URL
-    private let stateQueue = DispatchQueue(label: "record-sim.segment-writer")
-    private let notificationQueue = DispatchQueue(label: "record-sim.segment-notifications")
-    private let onSegment: ((SegmentOutput) -> Void)?
-    private var initSegmentPath: String?
-    private var segments: [MediaSegmentRecord] = []
-    private var nextMediaSegmentIndex = 0
-    private var firstError: Error?
-
-    init(rootDirectory: URL, onSegment: ((SegmentOutput) -> Void)?) {
-        self.rootDirectory = rootDirectory
-        self.segmentsDirectory = rootDirectory.appendingPathComponent("segments", isDirectory: true)
-        self.singleRecordingURL = rootDirectory.appendingPathComponent("recording.mp4")
-        self.onSegment = onSegment
-        super.init()
-    }
-
-    func prepare(overwrite: Bool, segmented: Bool) throws {
-        if overwrite {
-            try? FileManager.default.removeItem(at: rootDirectory)
-        }
-        try FileManager.default.createDirectory(at: rootDirectory, withIntermediateDirectories: true)
-        if segmented {
-            try FileManager.default.createDirectory(at: segmentsDirectory, withIntermediateDirectories: true)
-        }
-    }
-
-    var error: Error? {
-        stateQueue.sync { firstError }
-    }
-
-    func assetWriter(
-        _ writer: AVAssetWriter,
-        didOutputSegmentData segmentData: Data,
-        segmentType: AVAssetSegmentType,
-        segmentReport: AVAssetSegmentReport?
-    ) {
-        var notification: SegmentOutput?
-
-        stateQueue.sync {
-            if firstError != nil {
-                return
-            }
-            do {
-                switch segmentType {
-                case .initialization:
-                    let relativePath = "init.mp4"
-                    let url = rootDirectory.appendingPathComponent(relativePath)
-                    try segmentData.write(to: url, options: .atomic)
-                    initSegmentPath = relativePath
-                    notification = SegmentOutput(
-                        kind: .initialization,
-                        relativePath: relativePath,
-                        url: url,
-                        byteCount: segmentData.count,
-                        durationSeconds: nil
-                    )
-                case .separable:
-                    let index = nextMediaSegmentIndex
-                    let relativePath = String(format: "segments/segment-%06d.m4s", index)
-                    let url = rootDirectory.appendingPathComponent(relativePath)
-                    try segmentData.write(to: url, options: .atomic)
-
-                    let videoReport = segmentReport?.trackReports.first(where: { $0.mediaType == .video })
-                    let duration = videoReport.flatMap { timeSeconds($0.duration) } ?? 0
-                    let record = MediaSegmentRecord(
-                        file: relativePath,
-                        durationSeconds: duration
-                    )
-                    nextMediaSegmentIndex += 1
-                    segments.append(record)
-                    notification = SegmentOutput(
-                        kind: .media,
-                        relativePath: relativePath,
-                        url: url,
-                        byteCount: segmentData.count,
-                        durationSeconds: duration
-                    )
-                default:
-                    break
-                }
-            } catch {
-                firstError = error
-            }
-        }
-
-        if let notification, let onSegment {
-            notificationQueue.async {
-                onSegment(notification)
-            }
-        }
-    }
-
-    @discardableResult
-    func writeManifest(
-        configuration: SimulatorRecordingConfiguration,
-        firstFrameWallClock: Date,
-        width: Int,
-        height: Int
-    ) throws -> RecordingManifest {
-        try stateQueue.sync {
-            if let firstError {
-                throw firstError
-            }
-            let segmented = configuration.segmentDuration > 0
-            if segmented, initSegmentPath == nil {
-                throw RecorderError.make(50, "Missing initialization segment")
-            }
-            if segmented, segments.isEmpty {
-                throw RecorderError.make(51, "No media segments were written")
-            }
-            let targetDuration = segmented
-                ? max(1, Int(ceil(segments.map(\.durationSeconds).max() ?? configuration.segmentDuration)))
-                : nil
-            let manifest = RecordingManifest(
-                firstFrameWallClock: FirstFrameWallClock(
-                    unixMs: unixMs(firstFrameWallClock),
-                    iso8601: iso8601(firstFrameWallClock)
-                ),
-                width: width,
-                height: height,
-                hlsVersion: segmented ? 7 : nil,
-                hlsTargetDurationSeconds: targetDuration,
-                hlsMediaSequence: segmented ? 0 : nil,
-                recording: segmented ? nil : "recording.mp4",
-                initSegment: segmented ? initSegmentPath : nil,
-                segments: segments
-            )
-            let data = try JSONEncoder.prettySorted.encode(manifest)
-            try data.write(to: rootDirectory.appendingPathComponent("session.json"), options: .atomic)
-            return manifest
-        }
-    }
-}

packages/build-tools/resources/record-sim/Sources/RecordSim/SimulatorRecorder.swift

@@ -1,644 +0,0 @@
-import AVFoundation
-import CoreVideo
-import Foundation
-import IOSurface
-import UniformTypeIdentifiers
-
-public final class SimulatorRecorder {
-    public var onSegment: ((SegmentOutput) -> Void)?
-    public var onSimulatorStopped: ((String) -> Void)?
-    public var onFinalizationStage: ((RecordingFinalizationStage) -> Void)?
-
-    private static let callbackStalenessTimeout: TimeInterval = 5
-    private static let firstFrameRewireInterval: TimeInterval = 1
-    private let configuration: SimulatorRecordingConfiguration
-    private let callbackQueue = DispatchQueue(
-        label: "record-sim.frame-callbacks", qos: .userInteractive)
-    private let writerQueue = DispatchQueue(label: "record-sim.asset-writer", qos: .userInitiated)
-    private let eventQueue = DispatchQueue(label: "record-sim.events", qos: .utility)
-    private let pendingLock = NSLock()
-    private var pendingFrames = 0
-    private var displaySource: FramebufferDisplaySource?
-    private var outputWriter: RecordingOutputWriter?
-    private var writer: AVAssetWriter?
-    private var input: AVAssetWriterInput?
-    private var adaptor: AVAssetWriterInputPixelBufferAdaptor?
-    private var boundaryTimer: DispatchSourceTimer?
-    private var monotonicClock = MonotonicClock()
-    private var firstAcceptedCaptureTime: CMTime?
-    private var firstAcceptedWallClock: Date?
-    private var recordingWidth: Int?
-    private var recordingHeight: Int?
-    private var lastPTS: CMTime?
-    private var lastSeed: UInt32?
-    private var lastFrameCallbackElapsed: TimeInterval?
-    private var lastFirstFrameRewireElapsed: TimeInterval = 0
-    private var lastAppendedPixelBuffer: CVPixelBuffer?
-    private var nextBoundaryElapsed: TimeInterval = 0
-    private var simulatorStoppedReason: String?
-    private var stopped = false
-    private var firstFrameReady = false
-    private let firstFrameSemaphore = DispatchSemaphore(value: 0)
-    private var firstError: Error?
-
-    public init(configuration: SimulatorRecordingConfiguration) {
-        self.configuration = configuration
-    }
-
-    public func start() throws {
-        try validateConfiguration()
-
-        let outputWriter = RecordingOutputWriter(
-            rootDirectory: configuration.outputDirectory,
-            onSegment: { [weak self] segment in
-                self?.onSegment?(segment)
-            })
-        try outputWriter.prepare(
-            overwrite: configuration.overwrite, segmented: configuration.segmentDuration > 0)
-        self.outputWriter = outputWriter
-
-        monotonicClock = MonotonicClock()
-        nextBoundaryElapsed = configuration.segmentDuration
-        lastFirstFrameRewireElapsed = 0
-        stopped = false
-
-        let source = FramebufferDisplaySource(
-            deviceUDID: configuration.deviceUDID,
-            callbackQueue: callbackQueue,
-            onFrame: { [weak self] in
-                self?.captureFrame(force: false, reason: .callback)
-            },
-            onSurfaceChange: { [weak self] in
-                self?.captureFrame(force: true, reason: .surfaceChange)
-            }
-        )
-        try source.start()
-        displaySource = source
-
-        startBoundaryTimer()
-    }
-
-    public func waitUntilFirstFrame(timeoutSeconds: TimeInterval = 15) throws {
-        let alreadyReady = try writerQueue.sync {
-            if let firstError {
-                throw firstError
-            }
-            return firstFrameReady
-        }
-        if alreadyReady {
-            return
-        }
-        if firstFrameSemaphore.wait(timeout: .now() + timeoutSeconds) == .timedOut {
-            throw RecorderError.make(20, "Timed out waiting for first frame")
-        }
-        try writerQueue.sync {
-            if let firstError {
-                throw firstError
-            }
-            if !firstFrameReady {
-                throw RecorderError.make(21, "Recorder stopped before first frame")
-            }
-        }
-    }
-
-    public func simulatorStopReason() -> String? {
-        callbackQueue.sync {
-            simulatorStoppedReason
-        }
-    }
-
-    @discardableResult
-    public func stop() throws -> RecordingManifest {
-        callbackQueue.sync {
-            stopped = true
-            boundaryTimer?.cancel()
-            boundaryTimer = nil
-            displaySource?.stop()
-            displaySource = nil
-        }
-        onFinalizationStage?(.captureStopped)
-
-        return try writerQueue.sync {
-            if let firstError {
-                throw firstError
-            }
-            guard let writer, let input, let outputWriter else {
-                let error = RecorderError.make(22, "No frames were captured")
-                firstError = error
-                signalFirstFrameReadyIfNeeded()
-                throw error
-            }
-            try appendTailFrameIfNeeded(finalPTS: monotonicClock.elapsedTime())
-            input.markAsFinished()
-            let semaphore = DispatchSemaphore(value: 0)
-            writer.finishWriting {
-                semaphore.signal()
-            }
-            if semaphore.wait(timeout: .now() + 60) == .timedOut {
-                throw RecorderError.make(23, "Timed out finishing AVAssetWriter")
-            }
-            if writer.status == .failed {
-                throw writer.error ?? RecorderError.make(24, "AVAssetWriter failed")
-            }
-            if let error = outputWriter.error {
-                throw error
-            }
-            onFinalizationStage?(.videoSaved)
-            guard let firstAcceptedWallClock else {
-                throw RecorderError.make(25, "Missing first frame wall-clock timestamp")
-            }
-            guard let recordingWidth, let recordingHeight else {
-                throw RecorderError.make(27, "Missing recording dimensions")
-            }
-            return try outputWriter.writeManifest(
-                configuration: configuration,
-                firstFrameWallClock: firstAcceptedWallClock,
-                width: recordingWidth,
-                height: recordingHeight
-            )
-        }
-    }
-
-    private enum CaptureReason {
-        case callback
-        case surfaceChange
-        case boundary
-        case healthProbe
-    }
-
-    private func validateConfiguration() throws {
-        guard !configuration.deviceUDID.isEmpty else {
-            throw RecorderError.make(30, "deviceUDID must not be empty")
-        }
-        guard configuration.fps > 0, configuration.fps <= 120 else {
-            throw RecorderError.make(31, "fps must be between 1 and 120")
-        }
-        guard configuration.bitrate > 0 else {
-            throw RecorderError.make(32, "bitrate must be positive")
-        }
-        guard configuration.segmentDuration >= 0 else {
-            throw RecorderError.make(33, "segmentDuration must be non-negative")
-        }
-        guard configuration.maxPendingFrames > 0 else {
-            throw RecorderError.make(34, "maxPendingFrames must be positive")
-        }
-    }
-
-    private func startBoundaryTimer() {
-        let timer = DispatchSource.makeTimerSource(queue: callbackQueue)
-        timer.schedule(deadline: .now() + 1, repeating: 1, leeway: .milliseconds(100))
-        timer.setEventHandler { [weak self] in
-            self?.probeSimulatorState()
-            self?.probeFramebufferHealth()
-            self?.appendBoundaryFrameIfNeeded()
-        }
-        timer.resume()
-        boundaryTimer = timer
-    }
-
-    private func appendBoundaryFrameIfNeeded() {
-        if stopped {
-            return
-        }
-        guard configuration.segmentDuration > 0 else {
-            return
-        }
-        writerQueue.sync {
-            guard firstAcceptedCaptureTime != nil else {
-                return
-            }
-            let currentPTSSeconds = CMTimeGetSeconds(
-                normalizedPresentationTime(for: monotonicClock.elapsedTime()))
-            guard currentPTSSeconds >= nextBoundaryElapsed else {
-                return
-            }
-            let boundary = nextBoundaryElapsed
-            guard let lastPTS else {
-                return
-            }
-
-            do {
-                if CMTimeGetSeconds(lastPTS) < boundary {
-                    let boundaryPTS = CMTime(seconds: boundary, preferredTimescale: 1_000_000_000)
-                    guard try appendHeldFrame(at: boundaryPTS) else {
-                        return
-                    }
-                }
-                nextBoundaryElapsed = boundary + configuration.segmentDuration
-            } catch {
-                firstError = error
-                signalFirstFrameReadyIfNeeded()
-            }
-        }
-    }
-
-    private func captureFrame(force: Bool, reason: CaptureReason) {
-        if stopped {
-            return
-        }
-        if reason == .callback {
-            lastFrameCallbackElapsed = monotonicClock.elapsedSeconds()
-        }
-        guard let snapshot = displaySource?.surfaceSnapshot() else {
-            return
-        }
-        let surface = snapshot.surface
-        let surfaceWidth = snapshot.width
-        let surfaceHeight = snapshot.height
-        guard surfaceWidth > 0, surfaceHeight > 0 else {
-            return
-        }
-
-        let seed = snapshot.seed
-        let matchesLastAppendedSeed = writerQueue.sync { lastSeed == seed }
-        if !force, matchesLastAppendedSeed {
-            return
-        }
-
-        guard reservePendingFrame() else {
-            return
-        }
-
-        let capturedAt = monotonicClock.elapsedTime()
-        let capturedAtWallClock = Date()
-        do {
-            let pixelBuffer = try copySurfaceToOwnedPixelBuffer(
-                surface,
-                width: surfaceWidth,
-                height: surfaceHeight
-            )
-            appendOwned(
-                pixelBuffer: pixelBuffer,
-                seed: seed,
-                capturedAt: capturedAt,
-                capturedAtWallClock: capturedAtWallClock
-            )
-        } catch {
-            releasePendingFrame()
-            writerQueue.async {
-                self.firstError = error
-                self.signalFirstFrameReadyIfNeeded()
-            }
-        }
-    }
-
-    private func probeFramebufferHealth() {
-        guard !stopped, let displaySource else {
-            return
-        }
-        let elapsed = monotonicClock.elapsedSeconds()
-        if !isFirstFrameReady(),
-            elapsed - lastFirstFrameRewireElapsed >= Self.firstFrameRewireInterval
-        {
-            lastFirstFrameRewireElapsed = elapsed
-            rewireFramebuffer()
-            captureFrame(force: true, reason: .healthProbe)
-            return
-        }
-
-        guard let snapshot = displaySource.surfaceSnapshot(),
-            snapshot.width > 0,
-            snapshot.height > 0
-        else {
-            rewireFramebuffer()
-            return
-        }
-
-        let observedSeed = snapshot.seed
-        let lastAppendedSeed = writerQueue.sync { lastSeed }
-        guard let lastAppendedSeed, observedSeed != lastAppendedSeed else {
-            return
-        }
-
-        let lastCallback = lastFrameCallbackElapsed ?? 0
-        if elapsed - lastCallback >= Self.callbackStalenessTimeout {
-            captureFrame(force: false, reason: .healthProbe)
-            rewireFramebuffer()
-        }
-    }
-
-    private func probeSimulatorState() {
-        guard !stopped, simulatorStoppedReason == nil else {
-            return
-        }
-        let state = SimulatorDeviceLookup.stateString(udid: configuration.deviceUDID) ?? "missing"
-        guard state != "Booted" else {
-            return
-        }
-        simulatorStoppedReason = state
-        let error = RecorderError.make(26, "Simulator stopped before first frame (state: \(state))")
-        writerQueue.async {
-            if self.firstError == nil, !self.firstFrameReady {
-                self.firstError = error
-                self.signalFirstFrameReadyIfNeeded()
-            }
-        }
-        let onSimulatorStopped = onSimulatorStopped
-        eventQueue.async {
-            onSimulatorStopped?(state)
-        }
-    }
-
-    private func rewireFramebuffer() {
-        guard let displaySource else {
-            return
-        }
-        do {
-            try displaySource.rewireFramebuffer()
-        } catch {
-            writerQueue.async {
-                self.firstError = error
-                self.signalFirstFrameReadyIfNeeded()
-            }
-        }
-    }
-
-    private func reservePendingFrame() -> Bool {
-        pendingLock.lock()
-        defer { pendingLock.unlock() }
-        if pendingFrames >= configuration.maxPendingFrames {
-            return false
-        }
-        pendingFrames += 1
-        return true
-    }
-
-    private func releasePendingFrame() {
-        pendingLock.lock()
-        pendingFrames = max(0, pendingFrames - 1)
-        pendingLock.unlock()
-    }
-
-    private func copySurfaceToOwnedPixelBuffer(
-        _ surface: IOSurface,
-        width: Int,
-        height: Int
-    ) throws -> CVPixelBuffer {
-        let pool = try writerQueue.sync {
-            if let firstError {
-                throw firstError
-            }
-            if writer == nil {
-                try startWriter(width: width, height: height)
-            }
-            guard let pool = adaptor?.pixelBufferPool else {
-                throw RecorderError.make(40, "AVAssetWriter pixel buffer pool is unavailable")
-            }
-            return pool
-        }
-
-        var output: CVPixelBuffer?
-        let status = CVPixelBufferPoolCreatePixelBuffer(kCFAllocatorDefault, pool, &output)
-        guard status == kCVReturnSuccess, let destination = output else {
-            throw RecorderError.make(41, "Failed to allocate pixel buffer from pool: \(status)")
-        }
-
-        let destinationLockStatus = CVPixelBufferLockBaseAddress(destination, [])
-        guard destinationLockStatus == kCVReturnSuccess else {
-            throw RecorderError.make(50, "Failed to lock pixel buffer: \(destinationLockStatus)")
-        }
-        let surfaceLockStatus = IOSurfaceLock(surface, .readOnly, nil)
-        guard surfaceLockStatus == KERN_SUCCESS else {
-            CVPixelBufferUnlockBaseAddress(destination, [])
-            throw RecorderError.make(49, "Failed to lock IOSurface: \(surfaceLockStatus)")
-        }
-        defer {
-            IOSurfaceUnlock(surface, .readOnly, nil)
-            CVPixelBufferUnlockBaseAddress(destination, [])
-        }
-
-        guard let destinationAddress = CVPixelBufferGetBaseAddress(destination) else {
-            throw RecorderError.make(42, "Pixel buffer has no base address")
-        }
-        let sourceAddress = IOSurfaceGetBaseAddress(surface)
-        let sourceStride = IOSurfaceGetBytesPerRow(surface)
-        let destinationStride = CVPixelBufferGetBytesPerRow(destination)
-        let copyWidth = min(width, IOSurfaceGetWidth(surface), CVPixelBufferGetWidth(destination))
-        let copyHeight = min(
-            height, IOSurfaceGetHeight(surface), CVPixelBufferGetHeight(destination))
-        let copyBytes = min(copyWidth * 4, sourceStride, destinationStride)
-        for row in 0..<copyHeight {
-            memcpy(
-                destinationAddress.advanced(by: row * destinationStride),
-                sourceAddress.advanced(by: row * sourceStride),
-                copyBytes
-            )
-        }
-        return destination
-    }
-
-    private func appendOwned(
-        pixelBuffer: CVPixelBuffer,
-        seed: UInt32,
-        capturedAt: CMTime,
-        capturedAtWallClock: Date
-    ) {
-        writerQueue.async {
-            defer { self.releasePendingFrame() }
-            if self.firstError != nil {
-                return
-            }
-            do {
-                try self.appendOnWriterQueue(
-                    pixelBuffer: pixelBuffer,
-                    seed: seed,
-                    capturedAt: capturedAt,
-                    capturedAtWallClock: capturedAtWallClock
-                )
-            } catch {
-                self.firstError = error
-                self.signalFirstFrameReadyIfNeeded()
-            }
-        }
-    }
-
-    private func appendOnWriterQueue(
-        pixelBuffer: CVPixelBuffer,
-        seed: UInt32,
-        capturedAt: CMTime,
-        capturedAtWallClock: Date
-    ) throws {
-        guard let writer, let input, let adaptor else {
-            throw RecorderError.make(43, "AVAssetWriter is not initialized")
-        }
-        let isFirstFrame = firstAcceptedCaptureTime == nil
-        let pts = isFirstFrame ? .zero : normalizedPresentationTime(for: capturedAt)
-        if let lastPTS, CMTimeCompare(pts, lastPTS) <= 0 {
-            return
-        }
-        guard try appendPendingBoundaryFrames(before: pts) else {
-            return
-        }
-        guard input.isReadyForMoreMediaData else {
-            return
-        }
-        if !adaptor.append(pixelBuffer, withPresentationTime: pts) {
-            throw writer.error ?? RecorderError.make(44, "Failed to append pixel buffer")
-        }
-        if isFirstFrame {
-            firstAcceptedCaptureTime = capturedAt
-            firstAcceptedWallClock = capturedAtWallClock
-        }
-        lastPTS = pts
-        lastSeed = seed
-        lastAppendedPixelBuffer = pixelBuffer
-        signalFirstFrameReadyIfNeeded()
-    }
-
-    private func appendTailFrameIfNeeded(finalPTS: CMTime) throws {
-        let deadline = Date().addingTimeInterval(5)
-        while true {
-            if try appendTailFrame(finalPTS: finalPTS) {
-                return
-            }
-            if Date() >= deadline {
-                throw RecorderError.make(45, "Timed out waiting to append tail frame")
-            }
-            Thread.sleep(forTimeInterval: 0.05)
-        }
-    }
-
-    private func appendTailFrame(finalPTS: CMTime) throws -> Bool {
-        let pts = normalizedPresentationTime(for: finalPTS)
-        return try appendHeldFrame(at: pts)
-    }
-
-    private func appendPendingBoundaryFrames(before pts: CMTime) throws -> Bool {
-        guard configuration.segmentDuration > 0,
-            firstAcceptedCaptureTime != nil
-        else {
-            return true
-        }
-
-        while CMTimeGetSeconds(pts) > nextBoundaryElapsed {
-            if let lastPTS, CMTimeGetSeconds(lastPTS) >= nextBoundaryElapsed {
-                nextBoundaryElapsed += configuration.segmentDuration
-                continue
-            }
-
-            let boundaryPTS = CMTime(
-                seconds: nextBoundaryElapsed, preferredTimescale: 1_000_000_000)
-            guard try appendHeldFrame(at: boundaryPTS) else {
-                return false
-            }
-            nextBoundaryElapsed += configuration.segmentDuration
-        }
-        return true
-    }
-
-    private func appendHeldFrame(at pts: CMTime) throws -> Bool {
-        guard let input,
-            let adaptor,
-            let lastPTS,
-            let lastAppendedPixelBuffer
-        else {
-            return true
-        }
-        if CMTimeCompare(pts, lastPTS) <= 0 {
-            return true
-        }
-        guard input.isReadyForMoreMediaData else {
-            return false
-        }
-        if !adaptor.append(lastAppendedPixelBuffer, withPresentationTime: pts) {
-            throw writer?.error ?? RecorderError.make(45, "Failed to append held frame")
-        }
-        self.lastPTS = pts
-        return true
-    }
-
-    private func normalizedPresentationTime(for capturedAt: CMTime) -> CMTime {
-        let start = firstAcceptedCaptureTime ?? capturedAt
-        return CMTimeSubtract(capturedAt, start)
-    }
-
-    private func startWriter(width: Int, height: Int) throws {
-        guard let outputWriter else {
-            throw RecorderError.make(46, "Missing output writer")
-        }
-
-        let writer: AVAssetWriter
-        if configuration.segmentDuration > 0 {
-            writer = AVAssetWriter(contentType: .mpeg4Movie)
-            writer.delegate = outputWriter
-            writer.outputFileTypeProfile = .mpeg4AppleHLS
-            writer.preferredOutputSegmentInterval = CMTime(
-                seconds: configuration.segmentDuration,
-                preferredTimescale: 600
-            )
-        } else {
-            writer = try AVAssetWriter(outputURL: outputWriter.singleRecordingURL, fileType: .mp4)
-        }
-        writer.initialSegmentStartTime = .zero
-
-        let input = AVAssetWriterInput(
-            mediaType: .video,
-            outputSettings: assetWriterSettings(width: width, height: height)
-        )
-        input.expectsMediaDataInRealTime = true
-
-        let attributes: [String: Any] = [
-            kCVPixelBufferPixelFormatTypeKey as String: kCVPixelFormatType_32BGRA,
-            kCVPixelBufferWidthKey as String: width,
-            kCVPixelBufferHeightKey as String: height,
-            kCVPixelBufferIOSurfacePropertiesKey as String: [:],
-        ]
-        let adaptor = AVAssetWriterInputPixelBufferAdaptor(
-            assetWriterInput: input,
-            sourcePixelBufferAttributes: attributes
-        )
-
-        guard writer.canAdd(input) else {
-            throw RecorderError.make(47, "AVAssetWriter cannot add video input")
-        }
-        writer.add(input)
-        guard writer.startWriting() else {
-            throw writer.error ?? RecorderError.make(48, "AVAssetWriter failed to start")
-        }
-        writer.startSession(atSourceTime: .zero)
-
-        self.writer = writer
-        self.input = input
-        self.adaptor = adaptor
-        recordingWidth = width
-        recordingHeight = height
-    }
-
-    private func assetWriterSettings(width: Int, height: Int) -> [String: Any] {
-        let codecType: AVVideoCodecType = configuration.codec == .hevc ? .hevc : .h264
-        var compression: [String: Any] = [
-            AVVideoAverageBitRateKey: configuration.bitrate,
-            AVVideoExpectedSourceFrameRateKey: configuration.fps,
-            AVVideoAllowFrameReorderingKey: true,
-        ]
-        if configuration.segmentDuration > 0 {
-            compression[AVVideoMaxKeyFrameIntervalKey] = max(
-                1,
-                Int((configuration.segmentDuration * Double(configuration.fps)).rounded())
-            )
-        }
-        if configuration.codec == .h264 {
-            compression[AVVideoProfileLevelKey] = AVVideoProfileLevelH264HighAutoLevel
-        }
-        return [
-            AVVideoCodecKey: codecType,
-            AVVideoWidthKey: width,
-            AVVideoHeightKey: height,
-            AVVideoCompressionPropertiesKey: compression,
-        ]
-    }
-
-    private func signalFirstFrameReadyIfNeeded() {
-        if firstFrameReady {
-            return
-        }
-        firstFrameReady = true
-        firstFrameSemaphore.signal()
-    }
-
-    private func isFirstFrameReady() -> Bool {
-        writerQueue.sync {
-            firstFrameReady
-        }
-    }
-}

packages/build-tools/resources/record-sim/Sources/RecordSim/Utilities.swift

@@ -1,60 +0,0 @@
-import CoreMedia
-import Foundation
-
-enum RecorderError {
-    static func make(_ code: Int, _ message: String) -> NSError {
-        NSError(
-            domain: "RecordSim",
-            code: code,
-            userInfo: [NSLocalizedDescriptionKey: message]
-        )
-    }
-}
-
-extension JSONEncoder {
-    static var prettySorted: JSONEncoder {
-        let encoder = JSONEncoder()
-        encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
-        return encoder
-    }
-}
-
-func timeSeconds(_ time: CMTime) -> Double? {
-    guard time.isValid, !time.isIndefinite, !time.isNegativeInfinity, !time.isPositiveInfinity else {
-        return nil
-    }
-    return CMTimeGetSeconds(time)
-}
-
-func iso8601(_ date: Date) -> String {
-    let formatter = ISO8601DateFormatter()
-    formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
-    formatter.timeZone = TimeZone(secondsFromGMT: 0)
-    return formatter.string(from: date)
-}
-
-func unixMs(_ date: Date) -> Int64 {
-    Int64((date.timeIntervalSince1970 * 1000).rounded())
-}
-
-struct MonotonicClock {
-    private static let timescale: CMTimeScale = 1_000_000_000
-
-    let startedAtUptimeNanoseconds: UInt64
-
-    init() {
-        startedAtUptimeNanoseconds = DispatchTime.now().uptimeNanoseconds
-    }
-
-    func elapsedSeconds() -> TimeInterval {
-        TimeInterval(elapsedNanoseconds()) / TimeInterval(Self.timescale)
-    }
-
-    func elapsedTime() -> CMTime {
-        CMTime(value: CMTimeValue(elapsedNanoseconds()), timescale: Self.timescale)
-    }
-
-    private func elapsedNanoseconds() -> UInt64 {
-        DispatchTime.now().uptimeNanoseconds - startedAtUptimeNanoseconds
-    }
-}

packages/build-tools/resources/record-sim/Sources/record-sim/main.swift

@@ -1,159 +0,0 @@
-import Foundation
-import RecordSim
-
-struct CLIOptions {
-    var udid: String?
-    var output: String?
-    var segmentDuration: TimeInterval = 120
-    var fps = 30
-    var bitrate = 30_000_000
-    var codec: RecorderCodec = .h264
-}
-
-private var requestedStopSignal: CInt = 0
-private var simulatorStopped: CInt = 0
-
-private func handleStopSignal(_ signal: CInt) {
-    requestedStopSignal = signal
-}
-
-private func isStopRequested() -> Bool {
-    requestedStopSignal != 0 || simulatorStopped != 0
-}
-
-func usage() -> String {
-    """
-    Usage:
-      record-sim --udid <UDID> --output <session-dir> [options]
-
-    Options:
-      --segment-duration <seconds>  Target fMP4 media segment duration. Use 0 for one MP4. Default: 120
-      --fps <fps>                   Expected source frame rate. Default: 30
-      --bitrate <bits/sec>          AVAssetWriter average bitrate. Default: 30000000
-      --codec <h264|hevc>           Video codec. Default: h264
-      -h, --help                    Show this help
-    """
-}
-
-func parseOptions(_ args: [String]) throws -> CLIOptions {
-    var options = CLIOptions()
-    var i = 0
-
-    func next(_ flag: String) throws -> String {
-        i += 1
-        guard i < args.count else {
-            throw NSError(domain: "record-sim", code: 2, userInfo: [NSLocalizedDescriptionKey: "Missing value for \(flag)"])
-        }
-        return args[i]
-    }
-
-    while i < args.count {
-        let arg = args[i]
-        switch arg {
-        case "--udid", "-u":
-            options.udid = try next(arg)
-        case "--output", "--output-dir", "--out", "-o":
-            options.output = try next(arg)
-        case "--segment-duration":
-            options.segmentDuration = Double(try next(arg)) ?? -1
-        case "--fps":
-            options.fps = Int(try next(arg)) ?? 0
-        case "--bitrate":
-            options.bitrate = Int(try next(arg)) ?? 0
-        case "--codec":
-            let raw = try next(arg)
-            guard let codec = RecorderCodec(rawValue: raw) else {
-                throw NSError(domain: "record-sim", code: 2, userInfo: [NSLocalizedDescriptionKey: "--codec must be h264 or hevc"])
-            }
-            options.codec = codec
-        case "--help", "-h":
-            print(usage())
-            exit(0)
-        default:
-            throw NSError(domain: "record-sim", code: 2, userInfo: [NSLocalizedDescriptionKey: "Unknown argument: \(arg)"])
-        }
-        i += 1
-    }
-
-    guard options.udid != nil else {
-        throw NSError(domain: "record-sim", code: 2, userInfo: [NSLocalizedDescriptionKey: "Missing required --udid"])
-    }
-    guard options.output != nil else {
-        throw NSError(domain: "record-sim", code: 2, userInfo: [NSLocalizedDescriptionKey: "Missing required --output"])
-    }
-    guard options.segmentDuration >= 0 else {
-        throw NSError(domain: "record-sim", code: 2, userInfo: [NSLocalizedDescriptionKey: "--segment-duration must be non-negative"])
-    }
-    guard options.fps > 0, options.fps <= 120 else {
-        throw NSError(domain: "record-sim", code: 2, userInfo: [NSLocalizedDescriptionKey: "--fps must be between 1 and 120"])
-    }
-    guard options.bitrate > 0 else {
-        throw NSError(domain: "record-sim", code: 2, userInfo: [NSLocalizedDescriptionKey: "--bitrate must be positive"])
-    }
-    return options
-}
-
-do {
-    signal(SIGINT, handleStopSignal)
-    signal(SIGTERM, handleStopSignal)
-
-    let options = try parseOptions(Array(CommandLine.arguments.dropFirst()))
-    let configuration = SimulatorRecordingConfiguration(
-        deviceUDID: options.udid!,
-        outputDirectory: URL(fileURLWithPath: options.output!),
-        fps: options.fps,
-        bitrate: options.bitrate,
-        codec: options.codec,
-        segmentDuration: options.segmentDuration
-    )
-
-    let recorder = SimulatorRecorder(configuration: configuration)
-    recorder.onSimulatorStopped = { state in
-        simulatorStopped = 1
-        fputs("[record-sim] simulator stopped state=\(state); finalizing recording\n", stderr)
-    }
-    recorder.onFinalizationStage = { stage in
-        switch stage {
-        case .captureStopped:
-            fputs("[record-sim] screen capture stopped; saving final video\n", stderr)
-        case .videoSaved:
-            fputs("[record-sim] final video saved; writing recording details\n", stderr)
-        }
-    }
-    recorder.onSegment = { segment in
-        switch segment.kind {
-        case .initialization:
-            fputs("[record-sim] init \(segment.relativePath) bytes=\(segment.byteCount)\n", stderr)
-        case .media:
-            let duration = segment.durationSeconds ?? 0
-            fputs(String(format: "[record-sim] segment %@ duration=%.3fs bytes=%d\n", segment.relativePath, duration, segment.byteCount), stderr)
-        }
-    }
-
-    try recorder.start()
-    try recorder.waitUntilFirstFrame()
-    fputs("[record-sim] recording -> \(options.output!)\n", stderr)
-
-    while !isStopRequested() {
-        Thread.sleep(forTimeInterval: 0.1)
-    }
-
-    if requestedStopSignal != 0 {
-        let signalName = switch requestedStopSignal {
-        case SIGINT: "SIGINT"
-        case SIGTERM: "SIGTERM"
-        default: "signal \(requestedStopSignal)"
-        }
-        fputs("[record-sim] received \(signalName); finishing recording\n", stderr)
-    }
-    let manifest = try recorder.stop()
-    if let recording = manifest.recording {
-        fputs("[record-sim] done recording=\(recording)\n", stderr)
-    } else {
-        fputs("[record-sim] done segments=\(manifest.segments.count)\n", stderr)
-    }
-    fputs("[record-sim] manifest \(URL(fileURLWithPath: options.output!).appendingPathComponent("session.json").path)\n", stderr)
-} catch {
-    fputs("error: \(error.localizedDescription)\n", stderr)
-    exit(1)
-}

packages/build-tools/src/__tests__/context.test.ts

@@ -139,38 +139,6 @@ describe('BuildContext', () => {
     });
   });
 
-  it('overwrites existing environment variables when updating env', async () => {
-    await vol.promises.mkdir('/workingdir/eas-environment-secrets/', { recursive: true });
-
-    const ctx = new BuildContext(
-      {
-        triggeredBy: BuildTrigger.GIT_BASED_INTEGRATION,
-        secrets: {},
-      } as Job,
-      {
-        env: {
-          __API_SERVER_URL: 'http://api.expo.test',
-          EXISTING_ENV: 'old-value',
-          REMOVED_ENV: 'old-value',
-        },
-        workingdir: '/workingdir',
-        logger: createMockLogger(),
-        logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
-        uploadArtifact: jest.fn(),
-      }
-    );
-
-    ctx.updateEnv({
-      EXISTING_ENV: 'new-value',
-      REMOVED_ENV: undefined,
-      NEW_ENV: 'new-env-value',
-    });
-
-    expect(ctx.env.EXISTING_ENV).toBe('new-value');
-    expect(ctx.env.REMOVED_ENV).toBeUndefined();
-    expect(ctx.env.NEW_ENV).toBe('new-env-value');
-  });
-
   it('emits build phase duration metrics for successful build phases', async () => {
     const ctx = createTestBuildContext({ platform: Platform.IOS });
 

packages/build-tools/src/__tests__/datadog.test.ts

@@ -22,13 +22,13 @@ describe('Datadog singleton', () => {
     Datadog.setup(null);
   });
 
-  it('POSTs distribution metrics to the turtle build metrics endpoint for build targets', () => {
+  it('POSTs distribution metrics to the turtle build metrics endpoint', () => {
     turtleFetchMock.mockResolvedValueOnce({} as Response);
 
     Datadog.setup({
       expoApiV2BaseUrl: 'https://api.expo.test/v2/',
+      turtleBuildId: 'build-id',
       robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
     });
 
     Datadog.distribution('eas.build.phase_duration', 1234, {
@@ -51,7 +51,6 @@ describe('Datadog singleton', () => {
                 build_phase: 'install_dependencies',
                 platform: 'ios',
                 result: 'success',
-                target: 'build',
               },
             },
           ],
@@ -62,121 +61,20 @@ describe('Datadog singleton', () => {
     );
   });
 
-  it('POSTs distribution metrics to the turtle job run metrics endpoint for jobRun targets', () => {
-    turtleFetchMock.mockResolvedValueOnce({} as Response);
-
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'jobRun', turtleJobRunId: 'job-run-id' },
-    });
-
-    Datadog.distribution('eas.maestro.install', 1, {
-      maestro_version: '2.1.0',
-    });
-
-    expect(turtleFetchMock).toHaveBeenCalledWith(
-      'https://api.expo.test/v2/turtle-job-runs/job-run-id/metrics',
-      'POST',
-      {
-        json: {
-          metrics: [
-            {
-              name: 'eas.maestro.install',
-              type: 'distribution',
-              value: 1,
-              tags: {
-                maestro_version: '2.1.0',
-                target: 'job_run',
-              },
-            },
-          ],
-        },
-        headers: { Authorization: 'Bearer token-abc' },
-        retries: 2,
-      }
-    );
-  });
-
-  it('POSTs logs to the turtle build logs endpoint with buildId for build targets', () => {
-    turtleFetchMock.mockResolvedValueOnce({} as Response);
-
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
-    });
-
-    Datadog.log('artifact dry-run matched', {
-      event: 'find_artifacts_absolute_path_dry_run',
-      status: 'match',
-    });
-
-    expect(turtleFetchMock).toHaveBeenCalledWith(
-      'https://api.expo.test/v2/turtle-builds/logs',
-      'POST',
-      {
-        json: {
-          buildId: 'build-id',
-          message: 'artifact dry-run matched',
-          tags: {
-            event: 'find_artifacts_absolute_path_dry_run',
-            status: 'match',
-            target: 'build',
-          },
-        },
-        headers: { Authorization: 'Bearer token-abc' },
-        shouldThrowOnNotOk: false,
-      }
-    );
-  });
-
-  it('POSTs logs to the turtle job run logs endpoint with jobRunId for jobRun targets', () => {
-    turtleFetchMock.mockResolvedValueOnce({} as Response);
-
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'jobRun', turtleJobRunId: 'job-run-id' },
-    });
-
-    Datadog.log('Gradle cache restored (hit)', {
-      cache_type: 'gradle',
-    });
-
-    expect(turtleFetchMock).toHaveBeenCalledWith(
-      'https://api.expo.test/v2/turtle-job-runs/logs',
-      'POST',
-      {
-        json: {
-          jobRunId: 'job-run-id',
-          message: 'Gradle cache restored (hit)',
-          tags: {
-            cache_type: 'gradle',
-            target: 'job_run',
-          },
-        },
-        headers: { Authorization: 'Bearer token-abc' },
-        shouldThrowOnNotOk: false,
-      }
-    );
-  });
-
   it('is a no-op when setup is null', () => {
     Datadog.setup(null);
 
     Datadog.distribution('eas.build.phase_duration', 1);
-    Datadog.log('artifact dry-run matched');
 
     expect(turtleFetchMock).not.toHaveBeenCalled();
   });
 
-  it('swallows metric upload failures for build targets', async () => {
+  it('swallows upload failures', async () => {
     turtleFetchMock.mockRejectedValueOnce(new Error('network down'));
     Datadog.setup({
       expoApiV2BaseUrl: 'https://api.expo.test/v2/',
+      turtleBuildId: 'build-id',
       robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
     });
 
     Datadog.distribution('eas.build.phase_duration', 1);
@@ -188,96 +86,7 @@ describe('Datadog singleton', () => {
       expect.any(Error),
       expect.objectContaining({
         extras: {
-          metrics: [
-            {
-              name: 'eas.build.phase_duration',
-              type: 'distribution',
-              value: 1,
-              tags: { target: 'build' },
-            },
-          ],
-        },
-      })
-    );
-  });
-
-  it('labels metric upload failures for jobRun targets with the jobRun kind', async () => {
-    turtleFetchMock.mockRejectedValueOnce(new Error('network down'));
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'jobRun', turtleJobRunId: 'job-run-id' },
-    });
-
-    Datadog.distribution('eas.maestro.install', 1);
-    await flushPromises();
-
-    expect(sentryCaptureMock).toHaveBeenCalledWith(
-      'Failed to report turtle jobRun metric',
-      expect.any(Error),
-      expect.objectContaining({
-        extras: {
-          metrics: [
-            {
-              name: 'eas.maestro.install',
-              type: 'distribution',
-              value: 1,
-              tags: { target: 'job_run' },
-            },
-          ],
-        },
-      })
-    );
-  });
-
-  it('swallows log upload failures for build targets', async () => {
-    turtleFetchMock.mockRejectedValueOnce(new Error('network down'));
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
-    });
-
-    Datadog.log('artifact dry-run matched');
-    await flushPromises();
-
-    expect(turtleFetchMock).toHaveBeenCalled();
-    expect(sentryCaptureMock).toHaveBeenCalledWith(
-      'Failed to report turtle build log',
-      expect.any(Error),
-      expect.objectContaining({
-        extras: {
-          log: {
-            buildId: 'build-id',
-            message: 'artifact dry-run matched',
-            tags: { target: 'build' },
-          },
-        },
-      })
-    );
-  });
-
-  it('labels log upload failures for jobRun targets with the jobRun kind', async () => {
-    turtleFetchMock.mockRejectedValueOnce(new Error('network down'));
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'jobRun', turtleJobRunId: 'job-run-id' },
-    });
-
-    Datadog.log('Gradle cache restored (hit)');
-    await flushPromises();
-
-    expect(sentryCaptureMock).toHaveBeenCalledWith(
-      'Failed to report turtle jobRun log',
-      expect.any(Error),
-      expect.objectContaining({
-        extras: {
-          log: {
-            jobRunId: 'job-run-id',
-            message: 'Gradle cache restored (hit)',
-            tags: { target: 'job_run' },
-          },
+          metrics: [{ name: 'eas.build.phase_duration', type: 'distribution', value: 1, tags: {} }],
         },
       })
     );
@@ -288,29 +97,19 @@ describe('Datadog singleton', () => {
 
     Datadog.setup({
       expoApiV2BaseUrl: 'https://api.expo.test/v2/',
+      turtleBuildId: 'first-build-id',
       robotAccessToken: 'first-token',
-      target: { kind: 'build', turtleBuildId: 'first-build-id' },
     });
     Datadog.setup({
       expoApiV2BaseUrl: 'https://api.expo.test/v2/',
+      turtleBuildId: 'second-build-id',
       robotAccessToken: 'second-token',
-      target: { kind: 'jobRun', turtleJobRunId: 'job-run-id' },
     });
 
     Datadog.distribution('eas.build.phase_duration', 1);
-    Datadog.log('artifact dry-run matched');
 
-    expect(turtleFetchMock).toHaveBeenNthCalledWith(
-      1,
-      'https://api.expo.test/v2/turtle-job-runs/job-run-id/metrics',
-      'POST',
-      expect.objectContaining({
-        headers: { Authorization: 'Bearer second-token' },
-      })
-    );
-    expect(turtleFetchMock).toHaveBeenNthCalledWith(
-      2,
-      'https://api.expo.test/v2/turtle-job-runs/logs',
+    expect(turtleFetchMock).toHaveBeenCalledWith(
+      'https://api.expo.test/v2/turtle-builds/second-build-id/metrics',
       'POST',
       expect.objectContaining({
         headers: { Authorization: 'Bearer second-token' },
@@ -327,8 +126,8 @@ describe('Datadog singleton', () => {
     );
     Datadog.setup({
       expoApiV2BaseUrl: 'https://api.expo.test/v2/',
+      turtleBuildId: 'build-id',
       robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
     });
 
     let flushed = false;
@@ -344,62 +143,6 @@ describe('Datadog singleton', () => {
 
     expect(flushed).toBe(true);
   });
-
-  it('flushes pending log uploads', async () => {
-    let resolveUpload!: (response: Response) => void;
-    turtleFetchMock.mockReturnValueOnce(
-      new Promise<Response>(resolve => {
-        resolveUpload = resolve;
-      })
-    );
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
-    });
-
-    let flushed = false;
-    Datadog.log('artifact dry-run matched');
-    const flushPromise = Datadog.flushAsync().then(() => {
-      flushed = true;
-    });
-    await Promise.resolve();
-    expect(flushed).toBe(false);
-
-    resolveUpload({} as Response);
-    await flushPromise;
-
-    expect(flushed).toBe(true);
-  });
-
-  it('only awaits uploads enqueued since the previous flush', async () => {
-    let resolveSecondUpload!: (response: Response) => void;
-    turtleFetchMock.mockReturnValueOnce(new Promise<Response>(() => {})).mockReturnValueOnce(
-      new Promise<Response>(resolve => {
-        resolveSecondUpload = resolve;
-      })
-    );
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
-    });
-
-    // The first upload never settles; the first flush rotates it out of the queue.
-    Datadog.distribution('eas.build.phase_duration', 1);
-    void Datadog.flushAsync();
-
-    Datadog.distribution('eas.build.phase_duration', 2);
-    let flushed = false;
-    const flushPromise = Datadog.flushAsync().then(() => {
-      flushed = true;
-    });
-
-    resolveSecondUpload({} as Response);
-    await flushPromise;
-
-    expect(flushed).toBe(true);
-  });
 });
 
 async function flushPromises(): Promise<void> {

packages/build-tools/src/__tests__/generic.test.ts

@@ -111,37 +111,6 @@ describe(runGenericJobAsync, () => {
     expect(rejected).toBe(true);
   });
 
-  it('passes the job hooks into the steps parser', async () => {
-    // @expo/steps is fully mocked here — assert the plumbing only (real
-    // insertion behavior is covered by the parser's own tests).
-    const mockWorkflow = { executeAsync: jest.fn().mockResolvedValue(undefined) };
-    (StepsConfigParser as unknown as jest.Mock).mockImplementation(() => ({
-      parseAsync: jest.fn().mockResolvedValue(mockWorkflow),
-    }));
-
-    mockCtx.job.hooks = { before_install_node_modules: [{ run: 'echo hi' }] };
-    await runGenericJobAsync(mockCtx);
-
-    expect(StepsConfigParser).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({ hooks: mockCtx.job.hooks })
-    );
-  });
-
-  it('passes hooks: undefined into the steps parser for a hook-less job (dormancy)', async () => {
-    const mockWorkflow = { executeAsync: jest.fn().mockResolvedValue(undefined) };
-    (StepsConfigParser as unknown as jest.Mock).mockImplementation(() => ({
-      parseAsync: jest.fn().mockResolvedValue(mockWorkflow),
-    }));
-
-    await runGenericJobAsync(mockCtx);
-
-    expect(StepsConfigParser).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({ hooks: undefined })
-    );
-  });
-
   it('throws before workflow execution when expoApiV2BaseUrl is missing', async () => {
     mockCtx.expoApiV2BaseUrl = undefined;
 

packages/build-tools/src/__tests__/runtimeSettings.test.ts

@@ -1,329 +0,0 @@
-import fetch from 'node-fetch';
-
-import { RuntimeSettings } from '../runtimeSettings';
-import { Sentry } from '../sentry';
-
-jest.mock('node-fetch', () => ({
-  __esModule: true,
-  default: jest.fn(),
-}));
-jest.mock('../sentry', () => ({
-  Sentry: {
-    capture: jest.fn(),
-  },
-}));
-
-describe('runtimeSettings', () => {
-  const originalCacheUrls = {
-    EAS_NPM_CACHE_URL: process.env.EAS_NPM_CACHE_URL,
-    EAS_NODEJS_CACHE_URL: process.env.EAS_NODEJS_CACHE_URL,
-    EAS_MAVEN_CACHE_URL: process.env.EAS_MAVEN_CACHE_URL,
-    EAS_COCOAPODS_CACHE_URL: process.env.EAS_COCOAPODS_CACHE_URL,
-  };
-  const originalPlatform = process.platform;
-
-  afterEach(() => {
-    jest.mocked(fetch).mockReset();
-    jest.restoreAllMocks();
-    jest.mocked(Sentry.capture).mockReset();
-    restoreEnv('EAS_NPM_CACHE_URL', originalCacheUrls.EAS_NPM_CACHE_URL);
-    restoreEnv('EAS_NODEJS_CACHE_URL', originalCacheUrls.EAS_NODEJS_CACHE_URL);
-    restoreEnv('EAS_MAVEN_CACHE_URL', originalCacheUrls.EAS_MAVEN_CACHE_URL);
-    restoreEnv('EAS_COCOAPODS_CACHE_URL', originalCacheUrls.EAS_COCOAPODS_CACHE_URL);
-    mockProcessPlatform(originalPlatform);
-  });
-
-  beforeEach(async () => {
-    jest.mocked(fetch).mockResolvedValue(response({}));
-    await RuntimeSettings.loadAsync({ environment: 'staging' });
-    jest.mocked(fetch).mockReset();
-  });
-
-  it('fetches runtime settings from the staging and production buckets', async () => {
-    jest.mocked(fetch).mockResolvedValue(response({}));
-
-    await RuntimeSettings.loadAsync({ environment: 'staging' });
-    await RuntimeSettings.loadAsync({ environment: 'production' });
-    await RuntimeSettings.loadAsync({ environment: 'test' });
-
-    expect(fetch).toHaveBeenNthCalledWith(
-      1,
-      'https://storage.googleapis.com/eas-workflows-staging/runtime-settings.json',
-      {
-        signal: expect.anything(),
-      }
-    );
-    expect(fetch).toHaveBeenNthCalledWith(
-      2,
-      'https://storage.googleapis.com/eas-workflows-production/runtime-settings.json',
-      {
-        signal: expect.anything(),
-      }
-    );
-    expect(fetch).toHaveBeenCalledTimes(2);
-  });
-
-  it('does not use caches by default when remote settings are unavailable', async () => {
-    process.env.EAS_NPM_CACHE_URL = 'https://npm.example';
-    jest.mocked(fetch).mockResolvedValue(response({}, 404));
-
-    await RuntimeSettings.loadAsync({ environment: 'staging' });
-
-    mockProcessPlatform('linux');
-    expect(RuntimeSettings.getNpmCacheUrl()).toBeNull();
-    expect(RuntimeSettings.isUsingIosPrecompiledModulesEnabled()).toBe(false);
-    expect(Sentry.capture).toHaveBeenCalledWith('Failed to fetch worker runtime settings', {
-      extras: {
-        status: 404,
-        url: 'https://storage.googleapis.com/eas-workflows-staging/runtime-settings.json',
-      },
-      level: 'warning',
-    });
-  });
-
-  it('does not override existing settings when remote settings are invalid', async () => {
-    process.env.EAS_NPM_CACHE_URL = 'https://npm.example';
-    jest
-      .mocked(fetch)
-      .mockResolvedValueOnce(response({ caches: { linux: { npm: true } } }))
-      .mockResolvedValueOnce(response({ iosPrecompiledModules: 'enabled' }));
-
-    await RuntimeSettings.loadAsync({ environment: 'staging' });
-    await RuntimeSettings.loadAsync({ environment: 'staging' });
-
-    mockProcessPlatform('linux');
-    expect(RuntimeSettings.getNpmCacheUrl()).toBe('https://npm.example');
-    expect(RuntimeSettings.isUsingIosPrecompiledModulesEnabled()).toBe(false);
-    expect(Sentry.capture).toHaveBeenCalledWith(
-      'Failed to load worker runtime settings',
-      expect.any(Error),
-      {
-        extras: {
-          url: 'https://storage.googleapis.com/eas-workflows-staging/runtime-settings.json',
-        },
-        level: 'warning',
-      }
-    );
-  });
-
-  it('accepts partial runtime settings and ignores unknown fields', async () => {
-    process.env.EAS_NPM_CACHE_URL = 'https://npm.example';
-    process.env.EAS_NODEJS_CACHE_URL = 'https://node.example';
-    process.env.EAS_MAVEN_CACHE_URL = 'https://maven.example';
-    process.env.EAS_COCOAPODS_CACHE_URL = 'https://pods.example';
-    jest.mocked(fetch).mockResolvedValue(
-      response({
-        caches: {
-          linux: { npm: false, nodejs: true, maven: true },
-          darwin: { npm: true, maven: true, cocoapods: false },
-        },
-        iosPrecompiledModules: true,
-        unknownFutureSetting: true,
-      })
-    );
-
-    await RuntimeSettings.loadAsync({ environment: 'staging' });
-
-    mockProcessPlatform('linux');
-    expect(RuntimeSettings.getNpmCacheUrl()).toBeNull();
-    expect(RuntimeSettings.getNodeJsCacheUrl()).toBe('https://node.example');
-    expect(RuntimeSettings.getMavenCacheUrl()).toBe('https://maven.example');
-    mockProcessPlatform('darwin');
-    expect(RuntimeSettings.getMavenCacheUrl()).toBe('https://maven.example');
-    expect(RuntimeSettings.getCocoapodsCacheUrl()).toBeNull();
-    expect(RuntimeSettings.getNpmCacheUrl()).toBe('https://npm.example');
-    expect(RuntimeSettings.isUsingIosPrecompiledModulesEnabled()).toBe(true);
-  });
-
-  it('uses Maven and CocoaPods caches when enabled for the current platform and their environment variables exist', async () => {
-    process.env.EAS_MAVEN_CACHE_URL = 'https://maven.example';
-    process.env.EAS_COCOAPODS_CACHE_URL = 'https://pods.example';
-    jest.mocked(fetch).mockResolvedValue(
-      response({
-        caches: {
-          linux: { maven: true },
-          darwin: { maven: true, cocoapods: true },
-        },
-      })
-    );
-
-    await RuntimeSettings.loadAsync({ environment: 'staging' });
-
-    mockProcessPlatform('linux');
-    expect(RuntimeSettings.getMavenCacheUrl()).toBe('https://maven.example');
-    mockProcessPlatform('darwin');
-    expect(RuntimeSettings.getMavenCacheUrl()).toBe('https://maven.example');
-    expect(RuntimeSettings.getCocoapodsCacheUrl()).toBe('https://pods.example');
-  });
-
-  it('uses job environment flags to enable cache URLs from worker environment variables', async () => {
-    process.env.EAS_NPM_CACHE_URL = 'https://npm.example';
-
-    await RuntimeSettings.loadAsync({
-      environment: 'test',
-      env: {
-        EAS_USE_NPM_CACHE: '1',
-      },
-    });
-
-    mockProcessPlatform('linux');
-    expect(RuntimeSettings.getNpmCacheUrl()).toBe('https://npm.example');
-  });
-
-  it('returns null when job env enables cache but worker env var is empty', async () => {
-    process.env.EAS_NPM_CACHE_URL = '';
-
-    await RuntimeSettings.loadAsync({
-      environment: 'test',
-      env: {
-        EAS_USE_NPM_CACHE: '1',
-      },
-    });
-
-    mockProcessPlatform('linux');
-    expect(RuntimeSettings.getNpmCacheUrl()).toBeNull();
-  });
-
-  it('does not use cache URLs from the job environment', async () => {
-    await RuntimeSettings.loadAsync({
-      environment: 'test',
-      env: {
-        EAS_USE_NPM_CACHE: '1',
-        EAS_NPM_CACHE_URL: 'https://job-npm.example',
-      },
-    });
-
-    mockProcessPlatform('linux');
-    expect(RuntimeSettings.getNpmCacheUrl()).toBeNull();
-  });
-
-  it('does not enable cache when runtime settings explicitly disable it, even with job env flag', async () => {
-    process.env.EAS_NPM_CACHE_URL = 'https://npm.example';
-    jest.mocked(fetch).mockResolvedValue(response({ caches: { linux: { npm: false } } }));
-
-    await RuntimeSettings.loadAsync({
-      environment: 'staging',
-      env: {
-        EAS_USE_NPM_CACHE: '1',
-      },
-    });
-
-    mockProcessPlatform('linux');
-    expect(RuntimeSettings.getNpmCacheUrl()).toBeNull();
-  });
-
-  it('disables cache when EAS_BUILD_DISABLE_NPM_CACHE is set', async () => {
-    process.env.EAS_NPM_CACHE_URL = 'https://npm.example';
-    jest.mocked(fetch).mockResolvedValue(response({ caches: { linux: { npm: true } } }));
-
-    await RuntimeSettings.loadAsync({
-      environment: 'staging',
-      env: {
-        EAS_BUILD_DISABLE_NPM_CACHE: '1',
-      },
-    });
-
-    mockProcessPlatform('linux');
-    expect(RuntimeSettings.getNpmCacheUrl()).toBeNull();
-  });
-
-  it('disables cache when EAS_BUILD_DISABLE_MAVEN_CACHE is set', async () => {
-    process.env.EAS_MAVEN_CACHE_URL = 'https://maven.example';
-    jest.mocked(fetch).mockResolvedValue(response({ caches: { linux: { maven: true } } }));
-
-    await RuntimeSettings.loadAsync({
-      environment: 'staging',
-      env: {
-        EAS_BUILD_DISABLE_MAVEN_CACHE: '1',
-      },
-    });
-
-    mockProcessPlatform('linux');
-    expect(RuntimeSettings.getMavenCacheUrl()).toBeNull();
-  });
-
-  it('disables cache when EAS_BUILD_DISABLE_COCOAPODS_CACHE is set', async () => {
-    process.env.EAS_COCOAPODS_CACHE_URL = 'https://pods.example';
-    jest.mocked(fetch).mockResolvedValue(response({ caches: { darwin: { cocoapods: true } } }));
-
-    await RuntimeSettings.loadAsync({
-      environment: 'staging',
-      env: {
-        EAS_BUILD_DISABLE_COCOAPODS_CACHE: '1',
-      },
-    });
-
-    mockProcessPlatform('darwin');
-    expect(RuntimeSettings.getCocoapodsCacheUrl()).toBeNull();
-  });
-
-  it('allows job environment flags to disable remotely enabled cache URLs', async () => {
-    process.env.EAS_NPM_CACHE_URL = 'https://npm.example';
-    jest.mocked(fetch).mockResolvedValue(response({ caches: { linux: { npm: true } } }));
-
-    await RuntimeSettings.loadAsync({
-      environment: 'staging',
-      env: {
-        EAS_USE_NPM_CACHE: '0',
-      },
-    });
-
-    mockProcessPlatform('linux');
-    expect(RuntimeSettings.getNpmCacheUrl()).toBeNull();
-  });
-
-  it('does not use caches when runtime settings are not loaded', () => {
-    process.env.EAS_NPM_CACHE_URL = 'https://npm.example';
-
-    jest.isolateModules(() => {
-      const { RuntimeSettings } = require('../runtimeSettings');
-
-      expect(RuntimeSettings.getNpmCacheUrl()).toBeNull();
-      expect(RuntimeSettings.isUsingIosPrecompiledModulesEnabled()).toBe(false);
-    });
-  });
-
-  it('reports when loaded runtime settings omit the current platform cache settings', async () => {
-    jest.mocked(fetch).mockResolvedValue(response({ caches: { linux: { npm: true } } }));
-    mockProcessPlatform('darwin');
-
-    await RuntimeSettings.loadAsync({ environment: 'staging' });
-
-    expect(RuntimeSettings.getNpmCacheUrl()).toBeNull();
-    expect(Sentry.capture).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: 'Runtime settings are missing cache settings for platform "darwin"',
-      }),
-      {
-        extras: {
-          configuredPlatforms: ['linux'],
-          platform: 'darwin',
-        },
-        level: 'error',
-      }
-    );
-  });
-});
-
-function restoreEnv(key: string, value: string | undefined): void {
-  if (value === undefined) {
-    delete process.env[key];
-  } else {
-    process.env[key] = value;
-  }
-}
-
-function mockProcessPlatform(platform: NodeJS.Platform): void {
-  Object.defineProperty(process, 'platform', {
-    configurable: true,
-    value: platform,
-  });
-}
-
-function response(body: unknown, status = 200): any {
-  return {
-    ok: status >= 200 && status < 300,
-    status,
-    json: async () => body,
-  };
-}

packages/build-tools/src/__tests__/utils/context.ts

@@ -10,10 +10,7 @@ import os from 'os';
 import path from 'path';
 import { v4 as uuidv4 } from 'uuid';
 
-import { createTestIosJob } from './job';
 import { createMockLogger } from './logger';
-import { BuildContext } from '../../context';
-import { CustomBuildContext } from '../../customBuildContext';
 
 export class MockContextProvider implements ExternalBuildContextProvider {
   private _env: BuildStepEnv = {};
@@ -75,19 +72,6 @@ export function createStepContextMock({
   });
 }
 
-export function createCustomBuildContextMock(): CustomBuildContext {
-  const ctx = new BuildContext(createTestIosJob({}), {
-    env: {
-      __API_SERVER_URL: 'http://api.expo.test',
-    },
-    logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
-    logger: createMockLogger(),
-    uploadArtifact: jest.fn(),
-    workingdir: '',
-  });
-  return new CustomBuildContext(ctx);
-}
-
 export function createGlobalContextMock({
   logger,
   skipCleanup,

packages/build-tools/src/android/gradle.ts

@@ -1,10 +1,12 @@
 import { Android, Env, Job, Platform } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
-import spawn from '@expo/turtle-spawn';
+import spawn, { SpawnPromise, SpawnResult } from '@expo/turtle-spawn';
+import assert from 'assert';
 import fs from 'fs-extra';
 import path from 'path';
 
 import { BuildContext } from '../context';
+import { getParentAndDescendantProcessPidsAsync } from '../utils/processes';
 
 export async function ensureLFLineEndingsInGradlewScript<TJob extends Job>(
   ctx: BuildContext<TJob>
@@ -29,19 +31,10 @@ export async function runGradleCommand(
   logger.info(`Running 'gradlew ${gradleCommand}' in ${androidDir}`);
   await fs.chmod(path.join(androidDir, 'gradlew'), 0o755);
   const verboseFlag = ctx.env['EAS_VERBOSE'] === '1' ? '--info' : '';
-  const shouldResetOOMScore =
-    ctx.env.EAS_BUILD_RUNNER === 'eas-build' && process.platform === 'linux';
 
-  await spawn(
+  const spawnPromise = spawn(
     'bash',
-    [
-      '-c',
-      getGradleShellCommand({
-        gradleCommand,
-        oomScoreAdj: shouldResetOOMScore ? 0 : undefined,
-        verboseFlag,
-      }),
-    ],
+    ['-c', `./gradlew ${gradleCommand} --profile ${verboseFlag}`],
     {
       cwd: androidDir,
       logger,
@@ -60,20 +53,42 @@ export async function runGradleCommand(
       },
     }
   );
+  if (ctx.env.EAS_BUILD_RUNNER === 'eas-build' && process.platform === 'linux') {
+    adjustOOMScore(spawnPromise, logger);
+  }
+
+  await spawnPromise;
 }
 
-export function getGradleShellCommand({
-  gradleCommand,
-  oomScoreAdj,
-  verboseFlag,
-}: {
-  gradleCommand: string;
-  oomScoreAdj?: number;
-  verboseFlag: string;
-}): string {
-  const oomScoreAdjPrefix =
-    oomScoreAdj === undefined ? '' : `echo ${oomScoreAdj} > /proc/$$/oom_score_adj || true; `;
-  return `${oomScoreAdjPrefix}exec ./gradlew ${gradleCommand} --profile ${verboseFlag}`;
+/**
+ * OOM Killer sometimes kills worker server while build is exceeding memory limits.
+ * `oom_score_adj` is a value between -1000 and 1000 and it defaults to 0.
+ * It defines which process is more likely to get killed (higher value more likely).
+ *
+ * This function sets oom_score_adj for Gradle process and all its child processes.
+ */
+function adjustOOMScore(spawnPromise: SpawnPromise<SpawnResult>, logger: bunyan): void {
+  setTimeout(
+    async () => {
+      try {
+        assert(spawnPromise.child.pid);
+        const pids = await getParentAndDescendantProcessPidsAsync(spawnPromise.child.pid);
+        await Promise.all(
+          pids.map(async (pid: number) => {
+            // Value 800 is just a guess here. It's probably higher than most other
+            // process. I didn't want to set it any higher, because I'm not sure if OOM Killer
+            // can start killing processes when there is still enough memory left.
+            const oomScoreOverride = 800;
+            await fs.writeFile(`/proc/${pid}/oom_score_adj`, `${oomScoreOverride}\n`);
+          })
+        );
+      } catch (err: any) {
+        logger.debug({ err, stderr: err?.stderr }, 'Failed to override oom_score_adj');
+      }
+    },
+    // Wait 20 seconds to make sure all child processes are started
+    20000
+  );
 }
 
 // Version envs should be set at the beginning of the build, but when building

packages/build-tools/src/builders/__tests__/android.test.ts

@@ -4,9 +4,7 @@ import { vol } from 'memfs';
 import { createTestAndroidJob } from '../../__tests__/utils/job';
 import { createMockLogger } from '../../__tests__/utils/logger';
 import { BuildContext } from '../../context';
-import { Datadog } from '../../datadog';
 import { restoreCredentials } from '../../android/credentials';
-import { uploadEmbeddedBundleAsync } from '../../utils/expoUpdatesEmbedded';
 import androidBuilder from '../android';
 import { runBuilderWithHooksAsync } from '../common';
 import {
@@ -58,9 +56,6 @@ jest.mock('../../utils/expoUpdates', () => ({
   configureExpoUpdatesIfInstalledAsync: jest.fn(),
   resolveRuntimeVersionForExpoUpdatesIfConfiguredAsync: jest.fn(async () => null),
 }));
-jest.mock('../../utils/expoUpdatesEmbedded', () => ({
-  uploadEmbeddedBundleAsync: jest.fn(),
-}));
 jest.mock('../../utils/hooks', () => ({
   Hook: {
     POST_INSTALL: 'POST_INSTALL',
@@ -72,11 +67,8 @@ jest.mock('../../utils/prepareBuildExecutable', () => ({
   prepareExecutableAsync: jest.fn(),
 }));
 
-const datadogDistributionMock = jest.spyOn(Datadog, 'distribution');
-
 describe(androidBuilder, () => {
   beforeEach(() => {
-    jest.clearAllMocks();
     vol.fromJSON(
       {
         '/workingdir/env/.gitkeep': '',
@@ -146,6 +138,7 @@ describe(androidBuilder, () => {
   });
 
   it('marks the configure Android version phase as warning for legacy eas-build.gradle', async () => {
+    const reportBuildPhaseStats = jest.fn();
     const job: Android.Job = {
       ...createTestAndroidJob(),
       secrets: {
@@ -164,23 +157,23 @@ describe(androidBuilder, () => {
         __API_SERVER_URL: 'http://api.expo.test',
       },
       uploadArtifact: jest.fn(),
+      reportBuildPhaseStats,
     });
     vol.mkdirSync('/workingdir/build/android/app', { recursive: true });
     vol.writeFileSync('/workingdir/build/android/app/eas-build.gradle', '// Legacy content');
 
     await androidBuilder(ctx);
 
-    expect(datadogDistributionMock).toHaveBeenCalledWith(
-      'eas.build.phase_duration',
-      expect.any(Number),
+    expect(reportBuildPhaseStats).toHaveBeenCalledWith(
       expect.objectContaining({
-        build_phase: BuildPhase.CONFIGURE_ANDROID_VERSION.toLowerCase(),
+        buildPhase: BuildPhase.CONFIGURE_ANDROID_VERSION,
         result: BuildPhaseResult.WARNING,
       })
     );
   });
 
   it('marks the prepare credentials phase as warning for legacy eas-build.gradle', async () => {
+    const reportBuildPhaseStats = jest.fn();
     const ctx = new BuildContext(createTestAndroidJob(), {
       workingdir: '/workingdir',
       logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
@@ -189,23 +182,23 @@ describe(androidBuilder, () => {
         __API_SERVER_URL: 'http://api.expo.test',
       },
       uploadArtifact: jest.fn(),
+      reportBuildPhaseStats,
     });
     vol.mkdirSync('/workingdir/build/android/app', { recursive: true });
     vol.writeFileSync('/workingdir/build/android/app/eas-build.gradle', '// Legacy content');
 
     await androidBuilder(ctx);
 
-    expect(datadogDistributionMock).toHaveBeenCalledWith(
-      'eas.build.phase_duration',
-      expect.any(Number),
+    expect(reportBuildPhaseStats).toHaveBeenCalledWith(
       expect.objectContaining({
-        build_phase: BuildPhase.PREPARE_CREDENTIALS.toLowerCase(),
+        buildPhase: BuildPhase.PREPARE_CREDENTIALS,
         result: BuildPhaseResult.WARNING,
       })
     );
   });
 
   it('injects credentials and version config when both are configured', async () => {
+    const reportBuildPhaseStats = jest.fn();
     const job: Android.Job = {
       ...createTestAndroidJob(),
       version: {
@@ -221,6 +214,7 @@ describe(androidBuilder, () => {
         __API_SERVER_URL: 'http://api.expo.test',
       },
       uploadArtifact: jest.fn(),
+      reportBuildPhaseStats,
     });
     vol.mkdirSync('/workingdir/build/android/app', { recursive: true });
     vol.writeFileSync('/workingdir/build/android/app/eas-build.gradle', '// Legacy content');
@@ -240,19 +234,15 @@ describe(androidBuilder, () => {
         versionName: '1.2.3',
       }
     );
-    expect(datadogDistributionMock).toHaveBeenCalledWith(
-      'eas.build.phase_duration',
-      expect.any(Number),
+    expect(reportBuildPhaseStats).toHaveBeenCalledWith(
       expect.objectContaining({
-        build_phase: BuildPhase.PREPARE_CREDENTIALS.toLowerCase(),
+        buildPhase: BuildPhase.PREPARE_CREDENTIALS,
         result: BuildPhaseResult.WARNING,
       })
     );
-    expect(datadogDistributionMock).toHaveBeenCalledWith(
-      'eas.build.phase_duration',
-      expect.any(Number),
+    expect(reportBuildPhaseStats).toHaveBeenCalledWith(
       expect.objectContaining({
-        build_phase: BuildPhase.CONFIGURE_ANDROID_VERSION.toLowerCase(),
+        buildPhase: BuildPhase.CONFIGURE_ANDROID_VERSION,
         result: BuildPhaseResult.WARNING,
       })
     );
@@ -273,37 +263,4 @@ describe(androidBuilder, () => {
 
     expect(runBuilderWithHooksAsync).toHaveBeenCalledWith(ctx, expect.any(Function));
   });
-
-  it('runs the embedded bundle upload phase when EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE is set', async () => {
-    const ctx = new BuildContext(createTestAndroidJob(), {
-      workingdir: '/workingdir',
-      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
-      logger: createMockLogger(),
-      env: {
-        __API_SERVER_URL: 'http://api.expo.test',
-        EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE: '1',
-      },
-      uploadArtifact: jest.fn(),
-    });
-
-    await androidBuilder(ctx);
-
-    expect(uploadEmbeddedBundleAsync).toHaveBeenCalledWith(ctx);
-  });
-
-  it('skips the embedded bundle upload phase when EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE is not set', async () => {
-    const ctx = new BuildContext(createTestAndroidJob(), {
-      workingdir: '/workingdir',
-      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
-      logger: createMockLogger(),
-      env: {
-        __API_SERVER_URL: 'http://api.expo.test',
-      },
-      uploadArtifact: jest.fn(),
-    });
-
-    await androidBuilder(ctx);
-
-    expect(uploadEmbeddedBundleAsync).not.toHaveBeenCalled();
-  });
 });

packages/build-tools/src/builders/__tests__/custom.test.ts

@@ -7,7 +7,6 @@ import { createMockLogger } from '../../__tests__/utils/logger';
 import { prepareProjectSourcesAsync } from '../../common/projectSources';
 import { BuildContext } from '../../context';
 import { CustomBuildContext } from '../../customBuildContext';
-import { Datadog } from '../../datadog';
 import { findAndUploadXcodeBuildLogsAsync } from '../../ios/xcodeBuildLogs';
 import { runCustomBuildAsync } from '../custom';
 
@@ -18,7 +17,6 @@ const findAndUploadXcodeBuildLogsAsyncMock = jest.mocked(findAndUploadXcodeBuild
 
 describe(runCustomBuildAsync, () => {
   let ctx: BuildContext<BuildJob>;
-  const datadogLogSpy = jest.spyOn(Datadog, 'log');
 
   beforeEach(() => {
     const job = createTestIosJob();
@@ -29,24 +27,10 @@ describe(runCustomBuildAsync, () => {
       vol.fromJSON(
         {
           'test.yaml': `
-          functions:
-            test_function:
-              name: Test function
-              path: ./custom-function
-              shell: /bin/zsh
-              supported_platforms:
-                - darwin
-                - linux
-              inputs:
-                - name
-                - profile
-              outputs:
-                - artifact_path
           build:
             steps:
               - eas/checkout
           `,
-          'custom-function/package.json': '{}',
         },
         '/workingdir/temporary-custom-build'
       );
@@ -93,21 +77,6 @@ describe(runCustomBuildAsync, () => {
     expect(prepareProjectSourcesAsync).toHaveBeenCalledTimes(2);
   });
 
-  it('reports user-provided custom functions when parsing the custom build config', async () => {
-    await runCustomBuildAsync(ctx);
-
-    expect(datadogLogSpy).toHaveBeenCalledWith('Custom build saw user-provided function', {
-      event: 'custom_build_user_provided_function',
-      custom_function_id: 'test_function',
-      custom_function_input_count: '2',
-      custom_function_module_path: '/workingdir/temporary-custom-build/custom-function',
-      custom_function_name: 'Test function',
-      custom_function_output_count: '1',
-      custom_function_shell: '/bin/zsh',
-      custom_function_supported_runtime_platforms: 'darwin,linux',
-    });
-  });
-
   it('awaits drainPendingMetricUploads after workflow execution', async () => {
     let resolveDrain!: () => void;
     const drainSpy = jest

packages/build-tools/src/builders/android.ts

@@ -32,7 +32,6 @@ import {
   configureExpoUpdatesIfInstalledAsync,
   resolveRuntimeVersionForExpoUpdatesIfConfiguredAsync,
 } from '../utils/expoUpdates';
-import { uploadEmbeddedBundleAsync } from '../utils/expoUpdatesEmbedded';
 import { Hook, runHookIfPresent } from '../utils/hooks';
 import { prepareExecutableAsync } from '../utils/prepareBuildExecutable';
 
@@ -209,12 +208,6 @@ async function buildAsync(ctx: BuildContext<Android.Job>): Promise<void> {
     });
   });
 
-  if (ctx.env.EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE) {
-    await ctx.runBuildPhase(BuildPhase.UPLOAD_EMBEDDED_BUNDLE, async () => {
-      await uploadEmbeddedBundleAsync(ctx);
-    });
-  }
-
   await ctx.runBuildPhase(BuildPhase.SAVE_CACHE, async () => {
     if (ctx.isLocal) {
       ctx.logger.info('Local builds do not support saving cache.');

packages/build-tools/src/builders/custom.ts

@@ -1,11 +1,5 @@
 import { BuildJob, BuildPhase, BuildTrigger, Ios, Platform } from '@expo/eas-build-job';
-import {
-  BuildConfigParser,
-  BuildStepGlobalContext,
-  BuildWorkflow,
-  StepsConfigParser,
-  errors,
-} from '@expo/steps';
+import { BuildConfigParser, BuildStepGlobalContext, StepsConfigParser, errors } from '@expo/steps';
 import assert from 'assert';
 import fs from 'fs/promises';
 import nullthrows from 'nullthrows';
@@ -15,7 +9,6 @@ import { resolveEnvFromBuildProfileAsync } from '../common/easBuildInternal';
 import { prepareProjectSourcesAsync } from '../common/projectSources';
 import { Artifacts, BuildContext } from '../context';
 import { CustomBuildContext } from '../customBuildContext';
-import { Datadog } from '../datadog';
 import { findAndUploadXcodeBuildLogsAsync } from '../ios/xcodeBuildLogs';
 import { getEasFunctionGroups } from '../steps/easFunctionGroups';
 import { getEasFunctions } from '../steps/easFunctions';
@@ -63,7 +56,6 @@ export async function runCustomBuildAsync(ctx: BuildContext<BuildJob>): Promise<
         externalFunctions: easFunctions,
         externalFunctionGroups: easFunctionGroups,
         steps: ctx.job.steps,
-        hooks: ctx.job.hooks,
       })
     : new BuildConfigParser(globalContext, {
         externalFunctions: easFunctions,
@@ -89,7 +81,6 @@ export async function runCustomBuildAsync(ctx: BuildContext<BuildJob>): Promise<
       throw parseError;
     }
   });
-  logUserProvidedCustomFunctions(workflow);
   try {
     try {
       await workflow.executeAsync();
@@ -112,26 +103,3 @@ export async function runCustomBuildAsync(ctx: BuildContext<BuildJob>): Promise<
 
   return ctx.artifacts;
 }
-
-function logUserProvidedCustomFunctions(workflow: BuildWorkflow): void {
-  for (const buildFunction of Object.values(workflow.buildFunctions)) {
-    if (!buildFunction.customFunctionModulePath) {
-      continue;
-    }
-    Datadog.log('Custom build saw user-provided function', {
-      event: 'custom_build_user_provided_function',
-      custom_function_id: buildFunction.getFullId(),
-      custom_function_module_path: buildFunction.customFunctionModulePath,
-      custom_function_input_count: String(buildFunction.inputProviders?.length ?? 0),
-      custom_function_output_count: String(buildFunction.outputProviders?.length ?? 0),
-      ...(buildFunction.name ? { custom_function_name: buildFunction.name } : {}),
-      ...(buildFunction.shell ? { custom_function_shell: buildFunction.shell } : {}),
-      ...(buildFunction.supportedRuntimePlatforms
-        ? {
-            custom_function_supported_runtime_platforms:
-              buildFunction.supportedRuntimePlatforms.join(','),
-          }
-        : {}),
-    });
-  }
-}

packages/build-tools/src/builders/ios.ts

@@ -25,7 +25,6 @@ import {
   configureExpoUpdatesIfInstalledAsync,
   resolveRuntimeVersionForExpoUpdatesIfConfiguredAsync,
 } from '../utils/expoUpdates';
-import { uploadEmbeddedBundleAsync } from '../utils/expoUpdatesEmbedded';
 import { Hook, runHookIfPresent } from '../utils/hooks';
 import { prepareExecutableAsync } from '../utils/prepareBuildExecutable';
 import { getParentAndDescendantProcessPidsAsync } from '../utils/processes';
@@ -182,16 +181,13 @@ async function buildAsync(ctx: BuildContext<Ios.Job>): Promise<void> {
     }
     try {
       const { derivedDataPath, workspacePath } = nullthrows(fastlaneResult);
-      const { skipped } = await parseAndReportXcactivitylog({
+      await parseAndReportXcactivitylog({
         derivedDataPath,
         workspacePath,
         logger: ctx.logger,
         proxyBaseUrl: ctx.env.EAS_BUILD_COCOAPODS_CACHE_URL,
         env: ctx.env,
       });
-      if (skipped) {
-        ctx.markBuildPhaseSkipped();
-      }
     } catch (err: any) {
       Sentry.capture('Failed to parse xcactivitylog', err);
       ctx.markBuildPhaseSkipped();
@@ -210,12 +206,6 @@ async function buildAsync(ctx: BuildContext<Ios.Job>): Promise<void> {
     });
   });
 
-  if (ctx.env.EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE) {
-    await ctx.runBuildPhase(BuildPhase.UPLOAD_EMBEDDED_BUNDLE, async () => {
-      await uploadEmbeddedBundleAsync(ctx);
-    });
-  }
-
   await ctx.runBuildPhase(BuildPhase.SAVE_CACHE, async () => {
     if (ctx.isLocal) {
       ctx.logger.info('Local builds do not support saving cache.');

packages/build-tools/src/common/__tests__/easBuildInternal.test.ts

@@ -1,4 +1,4 @@
-import { ArchiveSourceType, BuildJob, Platform, Workflow } from '@expo/eas-build-job';
+import { BuildJob } from '@expo/eas-build-job';
 import spawn from '@expo/turtle-spawn';
 
 import { resolveEnvFromBuildProfileAsync, runEasBuildInternalAsync } from '../easBuildInternal';
@@ -15,7 +15,7 @@ jest.mock('../../utils/easCli', () => ({
 
 describe('easBuildInternal', () => {
   beforeEach(() => {
-    jest.clearAllMocks();
+    jest.resetAllMocks();
     jest.mocked(resolveEasCommandPrefixAndEnvAsync).mockResolvedValue({
       cmd: 'npx',
       args: ['-y', 'eas-cli@latest'],
@@ -69,131 +69,4 @@ describe('easBuildInternal', () => {
     expect(resolveEasCommandPrefixAndEnvAsync).toHaveBeenCalledWith();
     expect(spawn).not.toHaveBeenCalled();
   });
-
-  it('passes --refresh-ad-hoc-provisioning-profile to build:internal for iOS jobs with refreshAdHocProvisioningProfile', async () => {
-    const logger = {
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-      child: jest.fn(),
-    } as any;
-
-    const internalJob = {
-      platform: Platform.IOS,
-      type: Workflow.GENERIC,
-      triggeredBy: 'EAS_CLI',
-      projectArchive: { type: ArchiveSourceType.URL, url: 'https://example.com' },
-      projectRootDirectory: '.',
-      secrets: {
-        buildCredentials: {
-          testapp: {
-            distributionCertificate: {
-              dataBase64: 'YmluYXJ5Y29udGVudDE=',
-              password: 'distCertPassword',
-            },
-            provisioningProfileBase64: 'MnRuZXRub2N5cmFuaWI=',
-          },
-        },
-      },
-      initiatingUserId: 'user-id',
-      appId: 'app-id',
-    };
-
-    jest.mocked(spawn).mockResolvedValue({
-      stdout: Buffer.from(
-        JSON.stringify({
-          job: internalJob,
-          metadata: {},
-        })
-      ),
-      stderr: Buffer.from(''),
-    } as any);
-
-    const job = {
-      platform: Platform.IOS,
-      buildProfile: 'preview',
-      refreshAdHocProvisioningProfile: true,
-      appId: 'app-id',
-      initiatingUserId: 'user-id',
-      secrets: { robotAccessToken: 'token' },
-    } as unknown as BuildJob;
-
-    await runEasBuildInternalAsync({
-      job,
-      logger,
-      env: {},
-      cwd: '/tmp/project',
-    });
-
-    expect(spawn).toHaveBeenCalledWith(
-      'npx',
-      expect.arrayContaining([
-        'build:internal',
-        '--platform',
-        Platform.IOS,
-        '--profile',
-        'preview',
-        '--refresh-ad-hoc-provisioning-profile',
-      ]),
-      expect.any(Object)
-    );
-  });
-
-  it('preserves refreshAdHocProvisioningProfile from the incoming job', async () => {
-    const logger = {
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-      child: jest.fn(),
-    } as any;
-
-    const internalJob = {
-      platform: Platform.IOS,
-      type: Workflow.GENERIC,
-      triggeredBy: 'EAS_CLI',
-      projectArchive: { type: ArchiveSourceType.URL, url: 'https://example.com' },
-      projectRootDirectory: '.',
-      secrets: {
-        buildCredentials: {
-          testapp: {
-            distributionCertificate: {
-              dataBase64: 'YmluYXJ5Y29udGVudDE=',
-              password: 'distCertPassword',
-            },
-            provisioningProfileBase64: 'MnRuZXRub2N5cmFuaWI=',
-          },
-        },
-      },
-      initiatingUserId: 'user-id',
-      appId: 'app-id',
-    };
-
-    jest.mocked(spawn).mockResolvedValue({
-      stdout: Buffer.from(
-        JSON.stringify({
-          job: internalJob,
-          metadata: {},
-        })
-      ),
-      stderr: Buffer.from(''),
-    } as any);
-
-    const job = {
-      platform: Platform.IOS,
-      buildProfile: 'preview',
-      refreshAdHocProvisioningProfile: true,
-      appId: 'app-id',
-      initiatingUserId: 'user-id',
-      secrets: { robotAccessToken: 'token' },
-    } as unknown as BuildJob;
-
-    const { newJob } = await runEasBuildInternalAsync({
-      job,
-      logger,
-      env: {},
-      cwd: '/tmp/project',
-    });
-
-    expect((newJob as any).refreshAdHocProvisioningProfile).toBe(true);
-  });
 });

packages/build-tools/src/common/__tests__/installDependencies.test.ts

@@ -1,256 +0,0 @@
-import spawn, { SpawnPromise, SpawnResult } from '@expo/turtle-spawn';
-
-import { createMockLogger } from '../../__tests__/utils/logger';
-import { Sentry } from '../../sentry';
-import { PackageManager } from '../../utils/packageManager';
-import { installDependenciesWithNpmCacheFallbackAsync } from '../installDependencies';
-
-jest.mock('@expo/turtle-spawn', () => jest.fn());
-jest.mock('../../sentry', () => ({
-  Sentry: {
-    capture: jest.fn(),
-  },
-}));
-
-describe(installDependenciesWithNpmCacheFallbackAsync, () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('retries without NPM_CONFIG_REGISTRY when npm cache install fails', async () => {
-    const logger = createMockLogger();
-    const npmCacheUrl = 'http://npm.staging.caches.eas-build.internal';
-    const error = Object.assign(
-      new Error('npm install --include=dev exited with non-zero code: 1'),
-      {
-        status: 1,
-        signal: null,
-        stdout: '',
-        stderr: `npm error request to ${npmCacheUrl}/left-pad failed, reason: getaddrinfo ENOTFOUND npm.staging.caches.eas-build.internal`,
-      }
-    );
-
-    jest
-      .mocked(spawn)
-      .mockReturnValueOnce(createSpawnPromise(Promise.reject(error)))
-      .mockReturnValueOnce(createSpawnPromise(Promise.resolve(createSpawnResult())));
-
-    await installDependenciesWithNpmCacheFallbackAsync({
-      packageManager: PackageManager.NPM,
-      env: {
-        EAS_VERBOSE: '1',
-        EAS_USE_NPM_CACHE: '1',
-        EAS_BUILD_NPM_CACHE_URL: npmCacheUrl,
-      },
-      logger,
-      cwd: '/tmp/build',
-      useFrozenLockfile: false,
-    });
-
-    expect(spawn).toHaveBeenCalledTimes(2);
-    expect(spawn).toHaveBeenNthCalledWith(1, 'npm', ['install', '--include=dev', '--verbose'], {
-      cwd: '/tmp/build',
-      logger,
-      infoCallbackFn: undefined,
-      lineTransformer: expect.any(Function),
-      env: {
-        EAS_VERBOSE: '1',
-        EAS_USE_NPM_CACHE: '1',
-        EAS_BUILD_NPM_CACHE_URL: npmCacheUrl,
-        NPM_CONFIG_REGISTRY: npmCacheUrl,
-      },
-    });
-    expect(spawn).toHaveBeenNthCalledWith(2, 'npm', ['install', '--include=dev', '--verbose'], {
-      cwd: '/tmp/build',
-      logger,
-      infoCallbackFn: undefined,
-      env: {
-        EAS_VERBOSE: '1',
-        EAS_USE_NPM_CACHE: '1',
-        EAS_BUILD_NPM_CACHE_URL: npmCacheUrl,
-      },
-    });
-    expect(logger.warn).toHaveBeenCalledWith(
-      `Failed to install dependencies using the npm cache registry (${npmCacheUrl}). Retrying without the npm cache registry.`
-    );
-    expect(Sentry.capture).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: 'Failed to install dependencies using npm cache registry',
-        name: 'NpmCacheRegistryInstallError',
-      }),
-      {
-        level: 'warning',
-        tags: {
-          packageManager: 'npm',
-        },
-        extras: {
-          cwd: '/tmp/build',
-          npmCacheUrl,
-          useFrozenLockfile: false,
-          originalErrorMessage: 'npm install --include=dev exited with non-zero code: 1',
-          status: 1,
-          signal: null,
-        },
-      }
-    );
-  });
-
-  it('reports non-fatal npm cache registry errors from successful installs', async () => {
-    const logger = createMockLogger();
-    const npmCacheUrl = 'http://npm.staging.caches.eas-build.internal';
-    const auditErrorLine = `npm verbose audit error FetchError: request to ${npmCacheUrl}/-/npm/v1/security/advisories/bulk failed, reason: getaddrinfo ENOTFOUND npm.staging.caches.eas-build.internal`;
-
-    jest.mocked(spawn).mockImplementationOnce((_command, _args, options: any) => {
-      options.lineTransformer(auditErrorLine);
-      options.lineTransformer(
-        `npm http cache left-pad@${npmCacheUrl}/left-pad/-/left-pad-1.3.0.tgz 0ms (cache hit)`
-      );
-      return createSpawnPromise(Promise.resolve(createSpawnResult()));
-    });
-
-    await installDependenciesWithNpmCacheFallbackAsync({
-      packageManager: PackageManager.NPM,
-      env: {
-        EAS_USE_NPM_CACHE: '1',
-        EAS_BUILD_NPM_CACHE_URL: npmCacheUrl,
-      },
-      logger,
-      cwd: '/tmp/build',
-      useFrozenLockfile: false,
-    });
-
-    expect(spawn).toHaveBeenCalledTimes(1);
-    expect(Sentry.capture).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: 'Non-fatal npm cache registry error during dependency install',
-        name: 'NpmCacheRegistryNonFatalError',
-      }),
-      {
-        level: 'warning',
-        tags: {
-          packageManager: 'npm',
-        },
-        extras: {
-          cwd: '/tmp/build',
-          npmCacheUrl,
-          useFrozenLockfile: false,
-          firstErrorLine: auditErrorLine,
-          errorLineCount: 1,
-        },
-      }
-    );
-  });
-
-  it('does not retry when install failure does not reference npm cache registry', async () => {
-    const logger = createMockLogger();
-    const error = Object.assign(
-      new Error('npm install --include=dev exited with non-zero code: 1'),
-      {
-        status: 1,
-        signal: null,
-        stdout: '',
-        stderr: 'npm error command sh -c node postinstall.js',
-      }
-    );
-
-    jest.mocked(spawn).mockReturnValueOnce(createSpawnPromise(Promise.reject(error)));
-
-    await expect(
-      installDependenciesWithNpmCacheFallbackAsync({
-        packageManager: PackageManager.NPM,
-        env: {
-          EAS_USE_NPM_CACHE: '1',
-          EAS_BUILD_NPM_CACHE_URL: 'http://npm.staging.caches.eas-build.internal',
-        },
-        logger,
-        cwd: '/tmp/build',
-        useFrozenLockfile: false,
-      })
-    ).rejects.toThrow(error);
-
-    expect(spawn).toHaveBeenCalledTimes(1);
-    expect(Sentry.capture).not.toHaveBeenCalled();
-  });
-
-  it('does not retry when the npm cache is not enabled', async () => {
-    const logger = createMockLogger();
-    const npmCacheUrl = 'http://npm.staging.caches.eas-build.internal';
-    const error = Object.assign(
-      new Error('npm install --include=dev exited with non-zero code: 1'),
-      {
-        status: 1,
-        signal: null,
-        stdout: '',
-        stderr: `npm error request to ${npmCacheUrl}/left-pad failed, reason: getaddrinfo ENOTFOUND npm.staging.caches.eas-build.internal`,
-      }
-    );
-
-    jest.mocked(spawn).mockReturnValueOnce(createSpawnPromise(Promise.reject(error)));
-
-    await expect(
-      installDependenciesWithNpmCacheFallbackAsync({
-        packageManager: PackageManager.NPM,
-        env: {},
-        logger,
-        cwd: '/tmp/build',
-        useFrozenLockfile: false,
-      })
-    ).rejects.toThrow(error);
-
-    expect(spawn).toHaveBeenCalledTimes(1);
-    expect(Sentry.capture).not.toHaveBeenCalled();
-  });
-
-  it('installs through the npm cache registry without retrying when the cache install succeeds', async () => {
-    const logger = createMockLogger();
-    const npmCacheUrl = 'http://npm.staging.caches.eas-build.internal';
-
-    jest
-      .mocked(spawn)
-      .mockReturnValueOnce(createSpawnPromise(Promise.resolve(createSpawnResult())));
-
-    await installDependenciesWithNpmCacheFallbackAsync({
-      packageManager: PackageManager.NPM,
-      env: {
-        EAS_USE_NPM_CACHE: '1',
-        EAS_BUILD_NPM_CACHE_URL: npmCacheUrl,
-      },
-      logger,
-      cwd: '/tmp/build',
-      useFrozenLockfile: false,
-    });
-
-    expect(spawn).toHaveBeenCalledTimes(1);
-    expect(spawn).toHaveBeenCalledWith('npm', ['install', '--include=dev'], {
-      cwd: '/tmp/build',
-      logger,
-      infoCallbackFn: undefined,
-      lineTransformer: expect.any(Function),
-      env: {
-        EAS_USE_NPM_CACHE: '1',
-        EAS_BUILD_NPM_CACHE_URL: npmCacheUrl,
-        NPM_CONFIG_REGISTRY: npmCacheUrl,
-      },
-    });
-    expect(Sentry.capture).not.toHaveBeenCalled();
-  });
-});
-
-function createSpawnPromise(result: Promise<SpawnResult>): SpawnPromise<SpawnResult> {
-  return Object.assign(result, {
-    child: {
-      pid: 123,
-    },
-  }) as SpawnPromise<SpawnResult>;
-}
-
-function createSpawnResult(): SpawnResult {
-  return {
-    pid: 123,
-    output: ['', ''],
-    stdout: '',
-    stderr: '',
-    status: 0,
-    signal: null,
-  };
-}

packages/build-tools/src/common/__tests__/xcpretty.test.ts

@@ -1,94 +0,0 @@
-import { EventEmitter } from 'events';
-
-import spawnAsync from '@expo/spawn-async';
-import { ExpoRunFormatter } from '@expo/xcpretty';
-import fg from 'fast-glob';
-
-import { createMockLogger } from '../../__tests__/utils/logger';
-import { Sentry } from '../../sentry';
-import { XcodeBuildLogger } from '../xcpretty';
-
-jest.mock('@expo/spawn-async');
-jest.mock('@expo/xcpretty');
-jest.mock('fast-glob');
-jest.mock('../../sentry', () => ({
-  Sentry: {
-    setup: jest.fn(),
-    capture: jest.fn(),
-    flush: jest.fn(),
-  },
-}));
-
-describe(XcodeBuildLogger, () => {
-  let stdout: EventEmitter;
-  let formatter: { pipe: jest.Mock; getBuildSummary: jest.Mock };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    stdout = new EventEmitter();
-    const spawnPromise = Object.assign(new Promise(() => {}), {
-      child: { stdout, kill: jest.fn() },
-    });
-    jest.mocked(spawnAsync).mockReturnValue(spawnPromise as any);
-
-    formatter = {
-      pipe: jest.fn(),
-      getBuildSummary: jest.fn().mockReturnValue('summary'),
-    };
-    jest.mocked(ExpoRunFormatter.create).mockReturnValue(formatter as any);
-
-    jest.mocked(fg).mockResolvedValue(['build.log'] as any);
-  });
-
-  async function startWatchingAsync(logger: ReturnType<typeof createMockLogger>): Promise<void> {
-    const buildLogger = new XcodeBuildLogger(logger, '/project');
-    await buildLogger.watchLogFiles('/logs');
-  }
-
-  it('logs formatted lines', async () => {
-    const logger = createMockLogger();
-    await startWatchingAsync(logger);
-
-    formatter.pipe.mockReturnValue(['line1', 'line2']);
-    stdout.emit('data', 'raw xcodebuild output');
-
-    expect(formatter.pipe).toHaveBeenCalledWith('raw xcodebuild output');
-    expect(logger.info).toHaveBeenCalledWith('line1');
-    expect(logger.info).toHaveBeenCalledWith('line2');
-    expect(Sentry.capture).not.toHaveBeenCalled();
-  });
-
-  it('falls back to raw logs when the formatter throws', async () => {
-    const logger = createMockLogger();
-    await startWatchingAsync(logger);
-
-    formatter.pipe.mockImplementation(() => {
-      throw new RangeError('Invalid array length');
-    });
-    stdout.emit('data', 'offending output');
-
-    expect(logger.info).toHaveBeenCalledWith('offending output');
-  });
-
-  it('reports the formatter error to Sentry only once', async () => {
-    const logger = createMockLogger();
-    await startWatchingAsync(logger);
-
-    const error = new RangeError('Invalid array length');
-    formatter.pipe.mockImplementation(() => {
-      throw error;
-    });
-    stdout.emit('data', 'offending output');
-    stdout.emit('data', 'more offending output');
-
-    expect(logger.info).toHaveBeenCalledWith('offending output');
-    expect(logger.info).toHaveBeenCalledWith('more offending output');
-    expect(Sentry.capture).toHaveBeenCalledTimes(1);
-    expect(Sentry.capture).toHaveBeenCalledWith(
-      'xcpretty formatter failed to parse xcodebuild logs',
-      error,
-      { extras: { data: 'offending output' } }
-    );
-  });
-});

packages/build-tools/src/common/easBuildInternal.ts

@@ -1,12 +1,4 @@
-import {
-  BuildJob,
-  Env,
-  Ios,
-  Metadata,
-  Platform,
-  sanitizeBuildJob,
-  sanitizeMetadata,
-} from '@expo/eas-build-job';
+import { BuildJob, Env, Metadata, sanitizeBuildJob, sanitizeMetadata } from '@expo/eas-build-job';
 import { PipeMode, bunyan } from '@expo/logger';
 import { BuildStepEnv } from '@expo/steps';
 import spawn from '@expo/turtle-spawn';
@@ -50,11 +42,6 @@ export async function runEasBuildInternalAsync<TJob extends BuildJob>({
     autoSubmitArgs.push('--auto-submit');
   }
 
-  const refreshAdHocProvisioningProfileArgs = [];
-  if (job.platform === Platform.IOS && job.refreshAdHocProvisioningProfile === true) {
-    refreshAdHocProvisioningProfileArgs.push('--refresh-ad-hoc-provisioning-profile');
-  }
-
   try {
     const result = await spawn(
       cmd,
@@ -66,7 +53,6 @@ export async function runEasBuildInternalAsync<TJob extends BuildJob>({
         '--profile',
         buildProfile,
         ...autoSubmitArgs,
-        ...refreshAdHocProvisioningProfileArgs,
       ],
       {
         cwd,
@@ -152,9 +138,6 @@ function validateEasBuildInternalResult<TJob extends BuildJob>({
     // We want to retain values that we have set on the job.
     appId: oldJob.appId,
     initiatingUserId: oldJob.initiatingUserId,
-    ...(oldJob.platform === Platform.IOS && oldJob.refreshAdHocProvisioningProfile === true
-      ? { refreshAdHocProvisioningProfile: true }
-      : null),
   }) as TJob;
   assert(newJob.platform === oldJob.platform, 'eas-cli returned a job for a wrong platform');
   const newMetadata = sanitizeMetadata(value.metadata);

packages/build-tools/src/common/installDependencies.ts

@@ -1,9 +1,8 @@
-import { Job, SystemError } from '@expo/eas-build-job';
+import { Job } from '@expo/eas-build-job';
 import spawn, { SpawnOptions, SpawnPromise, SpawnResult } from '@expo/turtle-spawn';
 import path from 'path';
 
 import { BuildContext } from '../context';
-import { Sentry } from '../sentry';
 import { PackageManager, findPackagerRootDir } from '../utils/packageManager';
 import { isUsingModernYarnVersion } from '../utils/project';
 
@@ -12,7 +11,6 @@ export async function installDependenciesAsync({
   env,
   logger,
   infoCallbackFn,
-  lineTransformer,
   cwd,
   useFrozenLockfile,
 }: {
@@ -21,7 +19,6 @@ export async function installDependenciesAsync({
   cwd: string;
   logger: Exclude<SpawnOptions['logger'], undefined>;
   infoCallbackFn?: SpawnOptions['infoCallbackFn'];
-  lineTransformer?: SpawnOptions['lineTransformer'];
   useFrozenLockfile: boolean;
 }): Promise<{ spawnPromise: SpawnPromise<SpawnResult> }> {
   let args: string[];
@@ -72,108 +69,11 @@ export async function installDependenciesAsync({
       cwd,
       logger,
       infoCallbackFn,
-      lineTransformer,
       env,
     }),
   };
 }
 
-export async function installDependenciesWithNpmCacheFallbackAsync({
-  packageManager,
-  env,
-  logger,
-  infoCallbackFn,
-  cwd,
-  useFrozenLockfile,
-}: {
-  packageManager: PackageManager;
-  env: Record<string, string | undefined>;
-  cwd: string;
-  logger: Exclude<SpawnOptions['logger'], undefined>;
-  infoCallbackFn?: SpawnOptions['infoCallbackFn'];
-  useFrozenLockfile: boolean;
-}): Promise<void> {
-  const npmCacheUrl = env.EAS_BUILD_NPM_CACHE_URL;
-
-  if (!npmCacheUrl) {
-    await (
-      await installDependenciesAsync({
-        packageManager,
-        env,
-        logger,
-        infoCallbackFn,
-        cwd,
-        useFrozenLockfile,
-      })
-    ).spawnPromise;
-    return;
-  }
-
-  logger.info(`Installing dependencies using the npm cache registry (${npmCacheUrl}).`);
-
-  let firstErrorLine: string | undefined;
-  let errorLineCount = 0;
-
-  try {
-    await (
-      await installDependenciesAsync({
-        packageManager,
-        env: { ...env, NPM_CONFIG_REGISTRY: npmCacheUrl },
-        logger,
-        infoCallbackFn,
-        lineTransformer: (line: string) => {
-          if (isNpmCacheRegistryErrorLine(line, npmCacheUrl)) {
-            firstErrorLine ??= line;
-            errorLineCount += 1;
-          }
-          return line;
-        },
-        cwd,
-        useFrozenLockfile,
-      })
-    ).spawnPromise;
-
-    if (firstErrorLine) {
-      Sentry.capture(new NpmCacheRegistryNonFatalError(), {
-        level: 'warning',
-        tags: { packageManager },
-        extras: { cwd, npmCacheUrl, useFrozenLockfile, firstErrorLine, errorLineCount },
-      });
-    }
-  } catch (err: unknown) {
-    if (!isNpmCacheInstallFailure(err, npmCacheUrl)) {
-      throw err;
-    }
-
-    logger.warn(
-      `Failed to install dependencies using the npm cache registry (${npmCacheUrl}). Retrying without the npm cache registry.`
-    );
-    Sentry.capture(new NpmCacheRegistryInstallError(err), {
-      level: 'warning',
-      tags: { packageManager },
-      extras: {
-        cwd,
-        npmCacheUrl,
-        useFrozenLockfile,
-        originalErrorMessage: err instanceof Error ? err.message : String(err),
-        status: err instanceof Error ? (err as any).status : undefined,
-        signal: err instanceof Error ? (err as any).signal : undefined,
-      },
-    });
-
-    await (
-      await installDependenciesAsync({
-        packageManager,
-        env,
-        logger,
-        infoCallbackFn,
-        cwd,
-        useFrozenLockfile,
-      })
-    ).spawnPromise;
-  }
-}
-
 export function resolvePackagerDir(ctx: BuildContext<Job>): string {
   const packagerRunDir = findPackagerRootDir(ctx.getReactNativeProjectDirectory());
   if (packagerRunDir !== ctx.getReactNativeProjectDirectory()) {
@@ -187,36 +87,3 @@ export function resolvePackagerDir(ctx: BuildContext<Job>): string {
   }
   return packagerRunDir;
 }
-
-function isNpmCacheInstallFailure(err: unknown, npmCacheUrl: string): boolean {
-  return getErrorOutput(err).includes(npmCacheUrl);
-}
-
-function isNpmCacheRegistryErrorLine(line: string, npmCacheUrl: string): boolean {
-  return (
-    line.includes(npmCacheUrl) &&
-    /(?:error|failed|ENOTFOUND|ECONN|ETIMEDOUT|EAI_AGAIN|FetchError)/i.test(line)
-  );
-}
-
-function getErrorOutput(err: unknown): string {
-  if (!(err instanceof Error)) {
-    return '';
-  }
-  const { stdout, stderr } = err as Error & { stdout?: string; stderr?: string };
-  return [stdout, stderr].filter(Boolean).join('\n');
-}
-
-class NpmCacheRegistryNonFatalError extends SystemError {
-  override name = 'NpmCacheRegistryNonFatalError';
-  constructor() {
-    super('Non-fatal npm cache registry error during dependency install');
-  }
-}
-
-class NpmCacheRegistryInstallError extends SystemError {
-  override name = 'NpmCacheRegistryInstallError';
-  constructor(cause: unknown) {
-    super('Failed to install dependencies using npm cache registry', { cause });
-  }
-}

packages/build-tools/src/common/prebuild.ts

@@ -2,10 +2,7 @@ import { BuildJob } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
 import { SpawnOptions } from '@expo/turtle-spawn';
 
-import {
-  installDependenciesWithNpmCacheFallbackAsync,
-  resolvePackagerDir,
-} from './installDependencies';
+import { installDependenciesAsync, resolvePackagerDir } from './installDependencies';
 import { BuildContext } from '../context';
 import { runExpoCliCommand } from '../utils/project';
 
@@ -33,14 +30,17 @@ export async function prebuildAsync<TJob extends BuildJob>(
     options: spawnOptions,
     packageManager: ctx.packageManager,
   });
-  await installDependenciesWithNpmCacheFallbackAsync({
-    packageManager: ctx.packageManager,
-    env: ctx.env,
-    logger,
-    cwd: resolvePackagerDir(ctx),
-    // prebuild sometimes modifies package.json, so we don't want to use frozen lockfile
-    useFrozenLockfile: false,
-  });
+  const installDependenciesSpawnPromise = (
+    await installDependenciesAsync({
+      packageManager: ctx.packageManager,
+      env: ctx.env,
+      logger,
+      cwd: resolvePackagerDir(ctx),
+      // prebuild sometimes modifies package.json, so we don't want to use frozen lockfile
+      useFrozenLockfile: false,
+    })
+  ).spawnPromise;
+  await installDependenciesSpawnPromise;
 }
 
 function getPrebuildCommandArgs<TJob extends BuildJob>(ctx: BuildContext<TJob>): string[] {

packages/build-tools/src/common/projectSources.ts

@@ -233,7 +233,7 @@ async function uploadProjectMetadataAsync(
         }
       `),
       {
-        buildId: nullthrows(ctx.env.EAS_BUILD_ID, 'EAS_BUILD_ID is not set'),
+        buildId: ctx.env.EAS_BUILD_ID,
         projectMetadataFile: {
           type: 'GCS',
           bucketKey: uploadSession.bucketKey,

packages/build-tools/src/context.ts

@@ -2,6 +2,7 @@ import { ExpoConfig } from '@expo/config';
 import {
   BuildPhase,
   BuildPhaseResult,
+  BuildPhaseStats,
   Env,
   EnvironmentSecretType,
   GenericArtifactType,
@@ -45,7 +46,6 @@ export type ArtifactToUpload =
       type: GenericArtifactType;
       name: string;
       paths: string[];
-      metadata?: Record<string, unknown>;
     };
 
 export interface BuildContextOptions {
@@ -63,8 +63,9 @@ export interface BuildContextOptions {
   reportError?: (
     msg: string,
     err?: Error,
-    options?: { tags?: Record<string, string>; extras?: Record<string, string | undefined> }
+    options?: { tags?: Record<string, string>; extras?: Record<string, string> }
   ) => void;
+  reportBuildPhaseStats?: (stats: BuildPhaseStats) => void;
   skipNativeBuild?: boolean;
   metadata?: Metadata;
   expoApiV2BaseUrl?: string;
@@ -80,7 +81,7 @@ export class BuildContext<TJob extends Job = Job> {
   public readonly reportError?: (
     msg: string,
     err?: Error,
-    options?: { tags?: Record<string, string>; extras?: Record<string, string | undefined> }
+    options?: { tags?: Record<string, string>; extras?: Record<string, string> }
   ) => void;
   public readonly skipNativeBuild?: boolean;
   public readonly expoApiV2BaseUrl?: string;
@@ -97,6 +98,7 @@ export class BuildContext<TJob extends Job = Job> {
   private buildPhaseSkipped = false;
   private buildPhaseHasWarnings = false;
   private _appConfig?: Promise<ExpoConfig>;
+  private readonly reportBuildPhaseStats?: (stats: BuildPhaseStats) => void;
   public readonly graphqlClient: Client;
 
   constructor(job: TJob, options: BuildContextOptions) {
@@ -112,6 +114,7 @@ export class BuildContext<TJob extends Job = Job> {
     this._metadata = options.metadata;
     this.skipNativeBuild = options.skipNativeBuild;
     this.expoApiV2BaseUrl = options.expoApiV2BaseUrl;
+    this.reportBuildPhaseStats = options.reportBuildPhaseStats;
 
     const environmentSecrets = this.getEnvironmentSecrets(job);
     this._env = {
@@ -247,10 +250,9 @@ export class BuildContext<TJob extends Job = Job> {
         'Updating environment variables is only allowed when build was triggered by a git-based integration.'
       );
     }
-
     this._env = {
-      ...this._env,
       ...env,
+      ...this._env,
       __EAS_BUILD_ENVS_DIR: this.buildEnvsDirectory,
     };
     this._env.PATH = this._env.PATH
@@ -353,6 +355,7 @@ export class BuildContext<TJob extends Job = Job> {
     }
     await this.collectAndUpdateEnvVariablesAsync();
 
+    this.reportBuildPhaseStats?.({ buildPhase: this.buildPhase, result, durationMs });
     if (this.job.platform) {
       Datadog.distribution('eas.build.phase_duration', durationMs, {
         build_phase: this.buildPhase.toLowerCase(),

packages/build-tools/src/customBuildContext.ts

@@ -9,18 +9,12 @@ import {
   StaticJobInterpolationContext,
 } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
-import {
-  BuildRuntimePlatform,
-  ExternalBuildContextProvider,
-  StepMetric,
-  WorkflowHookMetric,
-} from '@expo/steps';
+import { BuildRuntimePlatform, ExternalBuildContextProvider, StepMetric } from '@expo/steps';
 import { Client } from '@urql/core';
 import assert from 'assert';
 import path from 'path';
 
 import { ArtifactToUpload, BuildContext } from './context';
-import { reportWorkflowHookMetricToDatadog } from './utils/hookMetrics';
 import { uploadStepMetricsToWwwAsync } from './utils/stepMetrics';
 
 const platformToBuildRuntimePlatform: Record<Platform, BuildRuntimePlatform> = {
@@ -171,10 +165,6 @@ export class CustomBuildContext<TJob extends Job = Job> implements ExternalBuild
     this.pendingMetricUploads.push(p);
   }
 
-  public reportWorkflowHookMetric(metric: WorkflowHookMetric): void {
-    reportWorkflowHookMetricToDatadog(metric);
-  }
-
   public async drainPendingMetricUploads(): Promise<void> {
     await Promise.allSettled(this.pendingMetricUploads);
   }

packages/build-tools/src/datadog.ts

@@ -1,25 +1,14 @@
 import { Sentry } from './sentry';
 import { turtleFetch } from './utils/turtleFetch';
 
-type MetricsTarget =
-  | { kind: 'build'; turtleBuildId: string }
-  | { kind: 'jobRun'; turtleJobRunId: string };
-
 type DatadogSetupOptions = {
   expoApiV2BaseUrl: string;
+  turtleBuildId: string;
   robotAccessToken: string;
-  target: MetricsTarget;
 };
 
 let setupOptions: DatadogSetupOptions | null = null;
-let pendingUploads: Promise<unknown>[] = [];
-
-function withTargetTag(
-  tags: Record<string, string>,
-  target: MetricsTarget
-): Record<string, string> {
-  return { ...tags, target: target.kind === 'build' ? 'build' : 'job_run' };
-}
+let pendingMetricUploads: Promise<unknown>[] = [];
 
 export const Datadog = {
   setup(opts: DatadogSetupOptions | null): void {
@@ -30,68 +19,36 @@ export const Datadog = {
     if (!setupOptions) {
       return;
     }
-    const { expoApiV2BaseUrl, robotAccessToken, target } = setupOptions;
+    const { expoApiV2BaseUrl, turtleBuildId, robotAccessToken } = setupOptions;
     const metrics = [
       {
         name,
         type: 'distribution' as const,
         value,
-        tags: withTargetTag(tags, target),
+        tags,
       },
     ];
 
-    const metricsPath =
-      target.kind === 'build'
-        ? `turtle-builds/${target.turtleBuildId}/metrics`
-        : `turtle-job-runs/${target.turtleJobRunId}/metrics`;
-
-    const uploadPromise = turtleFetch(new URL(metricsPath, expoApiV2BaseUrl).toString(), 'POST', {
-      json: { metrics },
-      headers: {
-        Authorization: `Bearer ${robotAccessToken}`,
-      },
-      retries: 2,
-    }).catch(err => {
-      Sentry.capture(`Failed to report turtle ${target.kind} metric`, err, {
+    const uploadPromise = turtleFetch(
+      new URL(`turtle-builds/${turtleBuildId}/metrics`, expoApiV2BaseUrl).toString(),
+      'POST',
+      {
+        json: { metrics },
+        headers: {
+          Authorization: `Bearer ${robotAccessToken}`,
+        },
+        retries: 2,
+      }
+    ).catch(err => {
+      Sentry.capture('Failed to report turtle build metric', err, {
         extras: { metrics },
       });
     });
 
-    pendingUploads.push(uploadPromise);
-  },
-
-  log(message: string, tags: Record<string, string> = {}): void {
-    if (!setupOptions) {
-      return;
-    }
-    const { expoApiV2BaseUrl, robotAccessToken, target } = setupOptions;
-    const tagsWithTarget = withTargetTag(tags, target);
-    const log =
-      target.kind === 'build'
-        ? { buildId: target.turtleBuildId, message, tags: tagsWithTarget }
-        : { jobRunId: target.turtleJobRunId, message, tags: tagsWithTarget };
-    const logsPath = target.kind === 'build' ? 'turtle-builds/logs' : 'turtle-job-runs/logs';
-
-    const uploadPromise = turtleFetch(new URL(logsPath, expoApiV2BaseUrl).toString(), 'POST', {
-      json: log,
-      headers: {
-        Authorization: `Bearer ${robotAccessToken}`,
-      },
-      shouldThrowOnNotOk: false,
-    }).catch(err => {
-      Sentry.capture(`Failed to report turtle ${target.kind} log`, err, {
-        extras: { log },
-      });
-    });
-
-    pendingUploads.push(uploadPromise);
+    pendingMetricUploads.push(uploadPromise);
   },
 
   async flushAsync(): Promise<void> {
-    // Rotate so each flush only awaits its own batch; uploads enqueued during the
-    // await land in the fresh array for a later flush.
-    const uploads = pendingUploads;
-    pendingUploads = [];
-    await Promise.allSettled(uploads);
+    await Promise.allSettled(pendingMetricUploads);
   },
 };

packages/build-tools/src/gcs/LoggerStream.ts

@@ -8,7 +8,7 @@ import { Readable, Writable, pipeline } from 'stream';
 import { promisify } from 'util';
 import zlib from 'zlib';
 
-import { GCS } from './client';
+import GCS from './client';
 
 type PromiseResolveFn = (value?: void | PromiseLike<void> | undefined) => void;
 
@@ -41,7 +41,7 @@ class GCSLoggerStream extends Writable {
   }
 
   private findNormalizedHeader(name: string): string | null {
-    if (!this.uploadMethod) {
+    if (!this.uploadMethod || 'client' in this.uploadMethod) {
       return null;
     }
 
@@ -165,10 +165,25 @@ class GCSLoggerStream extends Writable {
       );
     };
 
-    return await GCS.uploadWithSignedUrl({
-      signedUrl: this.uploadMethod.signedUrl,
-      srcGeneratorAsync,
+    if ('signedUrl' in this.uploadMethod) {
+      return await GCS.uploadWithSignedUrl({
+        signedUrl: this.uploadMethod.signedUrl,
+        srcGeneratorAsync,
+      });
+    }
+
+    const { Location } = await this.uploadMethod.client.uploadFile({
+      key: this.uploadMethod.key,
+      src: await srcGeneratorAsync(),
+      streamOptions: {
+        metadata: {
+          contentType: 'text/plain;charset=utf-8',
+          ...(this.compress !== null ? { contentEncoding: this.compress } : {}),
+          customTime: this.uploadMethod.customTime,
+        },
+      },
     });
+    return Location;
   }
 
   private async createCompressedStream(src: Readable): Promise<Readable> {
@@ -208,9 +223,9 @@ namespace GCSLoggerStream {
     compress?: CompressionMethod;
   }
 
-  export type UploadMethod = {
-    signedUrl: GCS.SignedUrl;
-  };
+  export type UploadMethod =
+    | { client: GCS; key: string; customTime: Date | null }
+    | { signedUrl: GCS.SignedUrl };
 
   export interface Config {
     logger: bunyan;

packages/build-tools/src/gcs/__unit__/gcs.test.ts

@@ -1,8 +1,10 @@
 import { randomBytes } from 'crypto';
+import fs from 'fs-extra';
 import fetch, { RequestInit, Response } from 'node-fetch';
+import path from 'path';
 import { Readable } from 'stream';
 
-import { GCS } from '../client';
+import GCS from '../client';
 
 jest.mock('node-fetch');
 
@@ -27,15 +29,18 @@ class DNSError extends ErrorWithCode {
 
 const TEST_BUCKET = 'turtle-v2-test';
 
-function createSignedUrl(key: string, contentType: string): GCS.SignedUrl {
-  return {
-    url: `https://storage.googleapis.com/${TEST_BUCKET}/${key}?signature=test`,
-    headers: { 'content-type': contentType },
-  };
-}
+let googleApplicationCredentials: string | undefined;
+beforeAll(() => {
+  googleApplicationCredentials = process.env.GOOGLE_APPLICATION_CREDENTIALS;
+  process.env.GOOGLE_APPLICATION_CREDENTIALS = path.join(__dirname, 'mock-credentials.json');
+});
+
+afterAll(() => {
+  process.env.GOOGLE_APPLICATION_CREDENTIALS = googleApplicationCredentials;
+});
 
 describe('GCS client', () => {
-  describe('uploadWithSignedUrl', () => {
+  describe('uploadWithPresignedURL function', () => {
     it('should throw an error if upload fails', async () => {
       const fetchMock = jest.mocked(fetch);
       const res = {
@@ -43,16 +48,22 @@ describe('GCS client', () => {
         status: 500,
       } as Response;
 
+      const localImagePath = path.join(__dirname, 'cat.jpg');
       const key = 'cat.jpg';
 
-      const signedUrl = createSignedUrl(key, 'image/jpeg');
+      const gcs = new GCS(TEST_BUCKET);
+      const signedUrl = await gcs.createSignedUploadUrl({
+        key,
+        expirationTime: 30000,
+        contentType: 'image/jpeg',
+      });
 
       fetchMock.mockImplementation(async () => res);
       await expect(
         GCS.uploadWithSignedUrl({
           signedUrl,
-          srcGeneratorAsync: async () => Readable.from('image'),
-          retryIntervalMs: 0,
+          srcGeneratorAsync: async () => fs.createReadStream(localImagePath),
+          retryIntervalMs: 500,
         })
       ).rejects.toThrow();
     });
@@ -64,15 +75,21 @@ describe('GCS client', () => {
         status: 200,
       } as Response;
 
+      const localImagePath = path.join(__dirname, 'cat.jpg');
       const key = 'cat.jpg';
 
-      const signedUrl = createSignedUrl(key, 'image/jpeg');
+      const gcs = new GCS(TEST_BUCKET);
+      const signedUrl = await gcs.createSignedUploadUrl({
+        key,
+        expirationTime: 30000,
+        contentType: 'image/jpeg',
+      });
 
       fetchMock.mockImplementation(async () => res);
       const result = await GCS.uploadWithSignedUrl({
         signedUrl,
-        srcGeneratorAsync: async () => Readable.from('image'),
-        retryIntervalMs: 0,
+        srcGeneratorAsync: async () => fs.createReadStream(localImagePath),
+        retryIntervalMs: 500,
       });
       expect(result).toEqual('https://storage.googleapis.com/turtle-v2-test/cat.jpg');
     });
@@ -84,9 +101,15 @@ describe('GCS client', () => {
         status: 200,
       } as Response;
 
+      const localImagePath = path.join(__dirname, 'cat.jpg');
       const key = 'cat.jpg';
 
-      const signedUrl = createSignedUrl(key, 'image/jpeg');
+      const gcs = new GCS(TEST_BUCKET);
+      const signedUrl = await gcs.createSignedUploadUrl({
+        key,
+        expirationTime: 30000,
+        contentType: 'image/jpeg',
+      });
 
       fetchMock
         .mockImplementationOnce(async () => {
@@ -98,8 +121,8 @@ describe('GCS client', () => {
         .mockImplementation(async () => res);
       const result = await GCS.uploadWithSignedUrl({
         signedUrl,
-        srcGeneratorAsync: async () => Readable.from('image'),
-        retryIntervalMs: 0,
+        srcGeneratorAsync: async () => fs.createReadStream(localImagePath),
+        retryIntervalMs: 500,
       });
       expect(result).toEqual('https://storage.googleapis.com/turtle-v2-test/cat.jpg');
       expect(fetchMock).toHaveBeenCalledTimes(3);
@@ -112,9 +135,15 @@ describe('GCS client', () => {
         status: 200,
       } as Response;
 
+      const localImagePath = path.join(__dirname, 'cat.jpg');
       const key = 'cat.jpg';
 
-      const signedUrl = createSignedUrl(key, 'image/jpeg');
+      const gcs = new GCS(TEST_BUCKET);
+      const signedUrl = await gcs.createSignedUploadUrl({
+        key,
+        expirationTime: 30000,
+        contentType: 'image/jpeg',
+      });
 
       fetchMock
         .mockImplementationOnce(async () => {
@@ -132,8 +161,8 @@ describe('GCS client', () => {
         .mockImplementation(async () => res);
       const result = await GCS.uploadWithSignedUrl({
         signedUrl,
-        srcGeneratorAsync: async () => Readable.from('image'),
-        retryIntervalMs: 0,
+        srcGeneratorAsync: async () => fs.createReadStream(localImagePath),
+        retryIntervalMs: 500,
       });
       expect(result).toEqual('https://storage.googleapis.com/turtle-v2-test/cat.jpg');
       expect(fetchMock).toHaveBeenCalledTimes(3);
@@ -146,9 +175,15 @@ describe('GCS client', () => {
         status: 200,
       } as Response;
 
+      const localImagePath = path.join(__dirname, 'cat.jpg');
       const key = 'cat.jpg';
 
-      const signedUrl = createSignedUrl(key, 'image/jpeg');
+      const gcs = new GCS(TEST_BUCKET);
+      const signedUrl = await gcs.createSignedUploadUrl({
+        key,
+        expirationTime: 30000,
+        contentType: 'image/jpeg',
+      });
 
       fetchMock
         .mockImplementationOnce(async () => {
@@ -163,8 +198,8 @@ describe('GCS client', () => {
         .mockImplementation(async () => res);
       const result = await GCS.uploadWithSignedUrl({
         signedUrl,
-        srcGeneratorAsync: async () => Readable.from('image'),
-        retryIntervalMs: 0,
+        srcGeneratorAsync: async () => fs.createReadStream(localImagePath),
+        retryIntervalMs: 500,
       });
       expect(result).toEqual('https://storage.googleapis.com/turtle-v2-test/cat.jpg');
       expect(fetchMock).toHaveBeenCalledTimes(3);
@@ -177,9 +212,15 @@ describe('GCS client', () => {
         status: 200,
       } as Response;
 
+      const localImagePath = path.join(__dirname, 'cat.jpg');
       const key = 'cat.jpg';
 
-      const signedUrl = createSignedUrl(key, 'image/jpeg');
+      const gcs = new GCS(TEST_BUCKET);
+      const signedUrl = await gcs.createSignedUploadUrl({
+        key,
+        expirationTime: 30000,
+        contentType: 'image/jpeg',
+      });
 
       const lastDNSError = new DNSError('failed thrice');
       fetchMock
@@ -196,8 +237,8 @@ describe('GCS client', () => {
       await expect(
         GCS.uploadWithSignedUrl({
           signedUrl,
-          srcGeneratorAsync: async () => Readable.from('image'),
-          retryIntervalMs: 0,
+          srcGeneratorAsync: async () => fs.createReadStream(localImagePath),
+          retryIntervalMs: 500,
         })
       ).rejects.toThrow(lastDNSError);
       expect(fetchMock).toHaveBeenCalledTimes(3);
@@ -210,9 +251,15 @@ describe('GCS client', () => {
         status: 200,
       } as Response;
 
+      const localImagePath = path.join(__dirname, 'cat.jpg');
       const key = 'cat.jpg';
 
-      const signedUrl = createSignedUrl(key, 'image/jpeg');
+      const gcs = new GCS(TEST_BUCKET);
+      const signedUrl = await gcs.createSignedUploadUrl({
+        key,
+        expirationTime: 30000,
+        contentType: 'image/jpeg',
+      });
 
       fetchMock
         .mockImplementationOnce(async () => {
@@ -237,8 +284,8 @@ describe('GCS client', () => {
       await expect(
         GCS.uploadWithSignedUrl({
           signedUrl,
-          srcGeneratorAsync: async () => Readable.from('image'),
-          retryIntervalMs: 0,
+          srcGeneratorAsync: async () => fs.createReadStream(localImagePath),
+          retryIntervalMs: 500,
         })
       ).rejects.toThrow();
       expect(fetchMock).toHaveBeenCalledTimes(3);
@@ -251,9 +298,15 @@ describe('GCS client', () => {
         status: 200,
       } as Response;
 
+      const localImagePath = path.join(__dirname, 'cat.jpg');
       const key = 'cat.jpg';
 
-      const signedUrl = createSignedUrl(key, 'image/jpeg');
+      const gcs = new GCS(TEST_BUCKET);
+      const signedUrl = await gcs.createSignedUploadUrl({
+        key,
+        expirationTime: 30000,
+        contentType: 'image/jpeg',
+      });
 
       const nonDNSError = new ErrorWithCode('failed once', 'A_DIFFERENT_CODE');
       fetchMock
@@ -264,8 +317,8 @@ describe('GCS client', () => {
       await expect(
         GCS.uploadWithSignedUrl({
           signedUrl,
-          srcGeneratorAsync: async () => Readable.from('image'),
-          retryIntervalMs: 0,
+          srcGeneratorAsync: async () => fs.createReadStream(localImagePath),
+          retryIntervalMs: 500,
         })
       ).rejects.toThrow(nonDNSError);
       expect(fetchMock).toHaveBeenCalledTimes(1);
@@ -301,14 +354,19 @@ describe('GCS client', () => {
           } as Response;
         });
 
-      const signedUrl = createSignedUrl('text.txt', 'text/plain');
+      const gcs = new GCS(TEST_BUCKET);
+      const signedUrl = await gcs.createSignedUploadUrl({
+        key: 'text.txt',
+        expirationTime: 30000,
+        contentType: 'text/plain',
+      });
 
       const bufferToUpload = randomBytes(16);
 
       const result = await GCS.uploadWithSignedUrl({
         signedUrl,
         srcGeneratorAsync: async () => Readable.from(bufferToUpload),
-        retryIntervalMs: 0,
+        retryIntervalMs: 500,
       });
       expect(result).toEqual('https://storage.googleapis.com/turtle-v2-test/text.txt');
       expect(fetchMock).toHaveBeenCalledTimes(3);

packages/build-tools/src/gcs/__unit__/test-credentials.json

@@ -0,0 +1,13 @@
+{
+  "type": "service_account",
+  "project_id": "mock-project",
+  "private_key_id": "mock-private-key-id",
+  "private_key": "-----BEGIN RSA PRIVATE KEY-----\nMIICXQIBAAKBgQCMk5Qbd5E8RQeP+2vObJVJVnXWXfW/OStxkAYe7r+KVXzHyLYU\nD6Ejt94OiC3X2+tqrMIZgNAUR3VF5tSiP57Il0iWHSspmNIHz7cW6/FHiQsvN2oJ\n8Fzz03vK/FfaU50QWO+BwRnixJ0xG1kSX3MxNyRZ5omGJgcwx0l6Jt878QIDAQAB\nAoGAcGZbqO6ceNU068H6/A1D/GSeSa3NHX2np+ChlEAPdJtP7yojs7yfekC801+9\nT/gurpe9hsjBF0XflemwIJ6/5KucWHrcp2cCkdBHtkK6ScHeIVl3DcOYYhxqJrAA\nYiyGNh1+pf3FMPFBcPJ04pQT4PqOif61/W3p8eJFUke5x7UCQQDoyJ427wrUCZb+\nj2GD5uVyxQa4OJxDbRFriK5LTdwLeFeOmQhoo6kaGywILn6UtlPTUJ38ROA4Jv58\nEJf/jssDAkEAmpi/JkWlOzSM9mnb9blt/fH/DRKu9z0JPvl47V5YAzBhUtUMK15g\nSbEl+AJZyaklpJcgv6ShiGY0PLdoY7oQ+wJBAMF6VX4lKqPYIKcN9ygRlm3Q8ufV\nLZQhKBRvsyYl3Zmu+V8tNL78IEXxhaR7OHxUGtINNHKDsLUbO/NUO3GOdo8CQQCV\nV0sIIK0+JUSq4ZYvqKI9d6Fnso28noSpBfuwabvh0MGjb9Viq7eeWHeSPksYSMLp\nXWiwWMwGZJy/rnk0JVEzAkADiiARp70BZgRB8ogBx+DGTravfhPP64eFMHJnUgAE\nmDKlj3v0x3OZfdUz6Us5hfy3WqFyYbcCGLf7joVVZAEm\n-----END RSA PRIVATE KEY-----",
+  "client_email": "mock-client-email",
+  "client_id": "mock-client-id",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/mock-client-email",
+  "universe_domain": "googleapis.com"
+}

packages/build-tools/src/gcs/client.ts

@@ -1,23 +1,37 @@
+import { CreateWriteStreamOptions, File, Storage } from '@google-cloud/storage';
+import fs from 'fs-extra';
 import fetch, { FetchError } from 'node-fetch';
+import stream from 'node:stream';
+import { promisify } from 'node:util';
 import { Readable } from 'stream';
 import { URL } from 'url';
 
-import { retryOnGCSUploadFailure } from './retry';
+import { RetryOptions, retryOnGCSUploadFailure } from './retry';
+
+const pipeline = promisify(stream.pipeline);
+
+interface SignedUrlParams {
+  key: string;
+  expirationTime: number;
+  contentType?: string;
+  extensionHeaders?: { [key: string]: number | string | string[] };
+}
 
 interface UploadWithSignedUrlParams {
   signedUrl: GCS.SignedUrl;
   srcGeneratorAsync: () => Promise<Readable>;
-  retryIntervalMs?: number;
-  retries?: number;
+  retryIntervalMs?: RetryOptions['retryIntervalMs'];
+  retries?: RetryOptions['retries'];
 }
 
-export namespace GCS {
-  export type SignedUrl = {
-    url: string;
-    headers: Record<string, string>;
-  };
+class GCS {
+  private readonly client = new Storage();
 
-  export async function uploadWithSignedUrl({
+  constructor(private readonly bucket: string) {
+    this.bucket = bucket;
+  }
+
+  public static async uploadWithSignedUrl({
     signedUrl,
     srcGeneratorAsync,
     retries = 2,
@@ -34,15 +48,18 @@ export namespace GCS {
             body: src,
           });
         },
-        { retries, retryIntervalMs }
+        {
+          retries,
+          retryIntervalMs,
+        }
       );
-    } catch (err: unknown) {
+    } catch (err: any) {
       if (err instanceof FetchError) {
         throw new Error(`Failed to upload the file, reason: ${err.code}`);
+      } else {
+        throw err;
       }
-      throw err;
     }
-
     if (!resp.ok) {
       let body: string | undefined;
       try {
@@ -52,8 +69,142 @@ export namespace GCS {
         `Failed to upload file: status: ${resp.status} status text: ${resp.statusText}, body: ${body}`
       );
     }
-
     const url = new URL(signedUrl.url);
-    return `${url.protocol}//${url.host}${url.pathname}`;
+    return `${url.protocol}//${url.host}${url.pathname}`; // strip query string
+  }
+
+  public formatHttpUrl(key: string): string {
+    return this.client.bucket(this.bucket).file(key).publicUrl();
+  }
+
+  public async uploadFile({
+    key,
+    src,
+    streamOptions,
+  }: {
+    key: string;
+    src: Readable;
+    streamOptions?: CreateWriteStreamOptions;
+  }): Promise<{ Location: string }> {
+    const file = this.client.bucket(this.bucket).file(key);
+    await new Promise<void>((res, rej) => {
+      src.pipe(
+        file
+          .createWriteStream(streamOptions)
+          .on('error', err => {
+            rej(err);
+          })
+          .on('finish', () => {
+            res();
+          })
+      );
+    });
+    return { Location: file.publicUrl() };
+  }
+
+  public async deleteFile(key: string): Promise<void> {
+    try {
+      await this.client.bucket(this.bucket).file(key).delete();
+    } catch (err: any) {
+      if (err.response?.statusCode === 404) {
+        return;
+      }
+      throw err;
+    }
+  }
+
+  public async createSignedUploadUrl({
+    key,
+    expirationTime,
+    contentType,
+    extensionHeaders = {},
+  }: SignedUrlParams): Promise<GCS.SignedUrl> {
+    const config = {
+      version: 'v4' as const,
+      action: 'write' as const,
+      expires: Date.now() + expirationTime,
+      contentType,
+      extensionHeaders,
+    };
+
+    const [url] = await this.client.bucket(this.bucket).file(key).getSignedUrl(config);
+
+    return {
+      url,
+      headers: {
+        ...(contentType ? { 'content-type': contentType } : {}),
+        ...extensionHeaders,
+      },
+    };
+  }
+
+  public async createSignedDownloadUrl({
+    key,
+    expirationTime,
+  }: {
+    key: string;
+    expirationTime: number;
+  }): Promise<string> {
+    const options = {
+      version: 'v4' as const,
+      action: 'read' as const,
+      expires: Date.now() + expirationTime,
+    };
+
+    const [url] = await this.client.bucket(this.bucket).file(key).getSignedUrl(options);
+
+    return url;
+  }
+
+  public async checkIfFileExists(key: string, fileHash?: string): Promise<boolean> {
+    let metadata;
+    try {
+      [metadata] = await this.client.bucket(this.bucket).file(key).getMetadata();
+    } catch (error: any) {
+      if (error.code === 404) {
+        return false;
+      }
+      throw error;
+    }
+
+    return fileHash ? metadata.etag === fileHash : true;
+  }
+
+  public async listDirectory(prefix: string): Promise<string[]> {
+    const [files] = await this.client.bucket(this.bucket).getFiles({ prefix });
+    return files.map(x => this.formatHttpUrl(x.name));
+  }
+
+  public async moveFile(src: string, dest: string): Promise<void> {
+    await this.client.bucket(this.bucket).file(src).move(dest);
+  }
+
+  public async deleteFiles(keys: string[]): Promise<void> {
+    await Promise.all(keys.map(key => this.deleteFile(key)));
+  }
+
+  public async downloadFile(key: string, destinationPath: string): Promise<void> {
+    const stream = this.client.bucket(this.bucket).file(key).createReadStream();
+    await pipeline(stream, fs.createWriteStream(destinationPath));
+  }
+
+  public getFile(key: string): File {
+    return this.client.bucket(this.bucket).file(key);
   }
 }
+
+namespace GCS {
+  export interface SignedUrl {
+    url: string;
+    headers: { [key: string]: string };
+  }
+
+  export interface Config {
+    accessKeyId: string;
+    secretAccessKey: string;
+    region: string;
+    bucket: string;
+  }
+}
+
+export default GCS;

packages/build-tools/src/gcs/retry.ts

@@ -1,11 +1,11 @@
 import { Response } from 'node-fetch';
 
-type RetryOptions = {
+export interface RetryOptions {
   retries: number;
   retryIntervalMs: number;
-  shouldRetryOnError: (error: unknown) => boolean;
+  shouldRetryOnError: (error: any) => boolean;
   shouldRetryOnResponse: (response: Response) => boolean;
-};
+}
 
 // based on https://github.com/googleapis/nodejs-storage/blob/8ab50804fc7bae3bbd159bbb4adf65c02215b11b/src/storage.ts#L284-L320
 export async function retryOnGCSUploadFailure(
@@ -18,14 +18,13 @@ export async function retryOnGCSUploadFailure(
   return await retry(fn, {
     retries,
     retryIntervalMs,
-    shouldRetryOnError: err => {
+    shouldRetryOnError: e => {
       return (
-        isErrorWithCode(err) &&
-        (err.code === 'ENOTFOUND' ||
-          err.code === 'EAI_AGAIN' ||
-          err.code === 'ECONNRESET' ||
-          err.code === 'ETIMEDOUT' ||
-          err.code === 'EPIPE')
+        e.code === 'ENOTFOUND' ||
+        e.code === 'EAI_AGAIN' ||
+        e.code === 'ECONNRESET' ||
+        e.code === 'ETIMEDOUT' ||
+        e.code === 'EPIPE'
       );
     },
     shouldRetryOnResponse: resp => {
@@ -34,12 +33,8 @@ export async function retryOnGCSUploadFailure(
   });
 }
 
-function isErrorWithCode(error: unknown): error is { code: string } {
-  return typeof error === 'object' && error !== null && 'code' in error;
-}
-
 /**
- * Wrapper used to execute an inner function and possibly retry it if it throws an error
+ * Wrapper used to execute an inner function and possibly retry it if it throws and error
  * @param fn Function to be executed and retried in case of error
  * @param retries How many times at most should the function be retried
  * @param retryIntervalMs Time interval between the retries
@@ -60,7 +55,7 @@ async function retry(
       } else {
         return resp;
       }
-    } catch (err: unknown) {
+    } catch (err: any) {
       if (attemptCount === retries || !shouldRetryOnError(err)) {
         throw err;
       }

packages/build-tools/src/generic.ts

@@ -47,7 +47,6 @@ export async function runGenericJobAsync(
     externalFunctions: getEasFunctions(customBuildCtx),
     externalFunctionGroups: getEasFunctionGroups(customBuildCtx),
     steps: ctx.job.steps,
-    hooks: ctx.job.hooks,
   });
 
   const workflow = await ctx.runBuildPhase(BuildPhase.PARSE_CUSTOM_WORKFLOW_CONFIG, async () => {

packages/build-tools/src/index.ts

@@ -1,6 +1,6 @@
 import * as Builders from './builders';
 import GCSLoggerStream from './gcs/LoggerStream';
-import { GCS } from './gcs/client';
+import GCS from './gcs/client';
 
 export { Builders, GCS, GCSLoggerStream };
 
@@ -27,4 +27,3 @@ export * from './generic';
 
 export { Datadog } from './datadog';
 export { Sentry } from './sentry';
-export * from './runtimeSettings';

packages/build-tools/src/ios/__tests__/__snapshots__/fastfile.test.ts.snap

@@ -9,7 +9,6 @@ exports[`fastfile createFastfileForResigningBuild should create Fastfile with al
       "com.example.app" => "/path/to/profiles/main.mobileprovision",
       "com.example.app.widget" => "/path/to/profiles/widget.mobileprovision",
     },
-    use_app_entitlements: true,
     keychain_path: "/Users/expo/Library/Keychains/login.keychain"
   )
 end
@@ -23,7 +22,6 @@ exports[`fastfile createFastfileForResigningBuild should handle empty provisioni
     signing_identity: "iPhone Distribution",
     provisioning_profile: {
     },
-    use_app_entitlements: true,
     keychain_path: "/tmp/keychain"
   )
 end
@@ -41,7 +39,6 @@ exports[`fastfile createFastfileForResigningBuild should handle multiple provisi
       "com.example.app.extension" => "/profiles/extension.mobileprovision",
       "com.example.app.intents" => "/profiles/intents.mobileprovision",
     },
-    use_app_entitlements: true,
     keychain_path: "/tmp/keychain"
   )
 end
@@ -56,7 +53,6 @@ exports[`fastfile createFastfileForResigningBuild should handle paths with speci
     provisioning_profile: {
       "com.example.app" => "/path/with spaces/profile (1).mobileprovision",
     },
-    use_app_entitlements: true,
     keychain_path: "/Users/expo/Library/Keychains/login keychain.keychain"
   )
 end
@@ -71,7 +67,6 @@ exports[`fastfile createFastfileForResigningBuild should handle single provision
     provisioning_profile: {
       "com.example.app" => "/tmp/profile.mobileprovision",
     },
-    use_app_entitlements: true,
     keychain_path: "/tmp/keychain"
   )
 end
@@ -86,7 +81,6 @@ exports[`fastfile createFastfileForResigningBuild should produce valid Ruby synt
     provisioning_profile: {
       "com.example.app" => "/path/to/profile.mobileprovision",
     },
-    use_app_entitlements: true,
     keychain_path: "/tmp/keychain"
   )
 end

packages/build-tools/src/ios/__tests__/pod.test.ts

@@ -26,12 +26,10 @@ function makeIosBuildContext({
   expoVersion,
   cocoapodsCacheUrl,
   usePrecompiledModules = true,
-  expoUsePrecompiledModules,
 }: {
   expoVersion?: string;
   cocoapodsCacheUrl?: string;
   usePrecompiledModules?: boolean;
-  expoUsePrecompiledModules?: string;
 }): BuildContext<Ios.Job> {
   vol.fromJSON({
     [path.join(IOS_DIR, '.keep')]: '',
@@ -59,9 +57,6 @@ function makeIosBuildContext({
     logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
     env: {
       __API_SERVER_URL: 'http://api.expo.test',
-      ...(expoUsePrecompiledModules
-        ? { EXPO_USE_PRECOMPILED_MODULES: expoUsePrecompiledModules }
-        : {}),
       ...(cocoapodsCacheUrl ? { EAS_BUILD_COCOAPODS_CACHE_URL: cocoapodsCacheUrl } : {}),
     },
     uploadArtifact: jest.fn(),
@@ -131,14 +126,14 @@ describe(installPods, () => {
   });
 
   it('does not add precompiled modules env vars below the minimum Expo version', async () => {
-    const ctx = makeIosBuildContext({ expoVersion: '55.0.25' });
+    const ctx = makeIosBuildContext({ expoVersion: '55.0.17' });
 
     await installPods(ctx, {});
 
     expect((spawn as jest.Mock).mock.calls[0][2].env.EXPO_USE_PRECOMPILED_MODULES).toBeUndefined();
     expect(ctx.logger.info).toHaveBeenCalledWith(
       expect.stringMatching(
-        /^Detected expo=55\.0\.25; not enabling precompiled modules use because precompiled modules require expo>=55\.0\.26\./
+        /^Detected expo=55\.0\.17; not enabling precompiled modules use because precompiled modules require expo>=/
       )
     );
   });
@@ -181,23 +176,4 @@ describe(installPods, () => {
     ).toBeUndefined();
     expect(ctx.logger.info).not.toHaveBeenCalled();
   });
-
-  it('does not override EXPO_USE_PRECOMPILED_MODULES=0 even when builder flag is enabled', async () => {
-    const ctx = makeIosBuildContext({
-      expoVersion: '999.0.0',
-      usePrecompiledModules: true,
-      expoUsePrecompiledModules: '0',
-    });
-
-    await installPods(ctx, {});
-
-    expect((spawn as jest.Mock).mock.calls[0][2].env.EXPO_USE_PRECOMPILED_MODULES).toBe('0');
-    expect(
-      (spawn as jest.Mock).mock.calls[0][2].env.EXPO_PRECOMPILED_MODULES_BASE_URL
-    ).toBeUndefined();
-    expect(ctx.logger.info).toHaveBeenCalledWith(
-      'EXPO_USE_PRECOMPILED_MODULES=0 is set; not enabling precompiled modules use.'
-    );
-    expect(getInstalledExpoPackageVersionAsync).not.toHaveBeenCalled();
-  });
 });

packages/build-tools/src/ios/fastlane.ts

@@ -10,8 +10,8 @@ import type { Credentials } from './credentials/manager';
 import { createFastfileForResigningBuild } from './fastfile';
 import { createGymfileForArchiveBuild, createGymfileForSimulatorBuild } from './gymfile';
 import { isTVOS } from './tvos';
+import { XcodeBuildLogger } from './xcpretty';
 import { COMMON_FASTLANE_ENV } from '../common/fastlane';
-import { XcodeBuildLogger } from '../common/xcpretty';
 import { BuildContext, SkipNativeBuildError } from '../context';
 
 export async function runFastlaneGym<TJob extends Ios.Job>(
@@ -93,7 +93,7 @@ export async function runFastlane(
     cwd,
   }: {
     logger?: bunyan;
-    env?: Env;
+    env?: Record<string, string>;
     cwd?: string;
   } = {}
 ): Promise<SpawnResult> {

packages/build-tools/src/ios/pod.ts

@@ -5,7 +5,7 @@ import semver from 'semver';
 
 import { BuildContext } from '../context';
 
-const MIN_PRECOMPILED_MODULES_EXPO_VERSION = '55.0.26';
+const MIN_PRECOMPILED_MODULES_EXPO_VERSION = '55.0.21';
 const PRECOMPILED_MODULES_BASE_URL =
   'https://storage.googleapis.com/eas-build-precompiled-modules/';
 
@@ -46,12 +46,7 @@ export async function installPods<TJob extends Ios.Job>(
 async function resolvePrecompiledModulesPodInstallEnvAsync<TJob extends Ios.Job>(
   ctx: BuildContext<TJob>
 ): Promise<Env> {
-  if (ctx.env.EXPO_USE_PRECOMPILED_MODULES === '0') {
-    ctx.logger.info('EXPO_USE_PRECOMPILED_MODULES=0 is set; not enabling precompiled modules use.');
-    return {};
-  }
-
-  if (ctx.env.EAS_USE_PRECOMPILED_MODULES !== '1') {
+  if (ctx.job.builderEnvironment?.env?.EAS_USE_PRECOMPILED_MODULES !== '1') {
     return {};
   }
 

packages/build-tools/src/ios/xcpretty.ts

@@ -6,14 +6,11 @@ import fg from 'fast-glob';
 import fs from 'fs-extra';
 import path from 'path';
 
-import { Sentry } from '../sentry';
-
 const CHECK_FILE_INTERVAL_MS = 1000;
 
 export class XcodeBuildLogger {
   private loggerError?: Error;
   private flushing: boolean = false;
-  private reportedFormatterError: boolean = false;
   private logReaderPromise?: SpawnPromise<SpawnResult>;
   private logsPath?: string;
 
@@ -63,21 +60,9 @@ export class XcodeBuildLogger {
       this.logReaderPromise = spawnAsync('tail', ['-n', '+0', '-f', logsPath], { stdio: 'pipe' });
       assert(this.logReaderPromise.child.stdout, 'stdout is not available');
       this.logReaderPromise.child.stdout.on('data', (data: string) => {
-        try {
-          const lines = formatter.pipe(data.toString());
-          for (const line of lines) {
-            this.logger.info(line);
-          }
-        } catch (err: any) {
-          // The formatter can throw on unexpected xcodebuild output. Fall back to
-          // raw logs instead of crashing the process with an uncaught exception.
-          if (!this.reportedFormatterError) {
-            this.reportedFormatterError = true;
-            Sentry.capture('xcpretty formatter failed to parse xcodebuild logs', err, {
-              extras: { data: data.toString().slice(-2000) },
-            });
-          }
-          this.logger.info(data.toString());
+        const lines = formatter.pipe(data.toString());
+        for (const line of lines) {
+          this.logger.info(line);
         }
       });
       await this.logReaderPromise;

packages/build-tools/src/runtimeSettings.ts

@@ -1,138 +0,0 @@
-import { Env } from '@expo/eas-build-job';
-import fetch from 'node-fetch';
-import { z } from 'zod';
-
-import { Sentry } from './sentry';
-
-const ENVIRONMENT_TO_RUNTIME_SETTINGS_URL: Record<string, string | undefined> = {
-  staging: 'https://storage.googleapis.com/eas-workflows-staging/runtime-settings.json',
-  production: 'https://storage.googleapis.com/eas-workflows-production/runtime-settings.json',
-};
-
-const RuntimeSettingsSchema = z
-  .object({
-    caches: z.record(
-      z.string(),
-      z
-        .object({
-          npm: z.boolean(),
-          nodejs: z.boolean(),
-          maven: z.boolean(),
-          cocoapods: z.boolean(),
-        })
-        .partial()
-    ),
-    iosPrecompiledModules: z.boolean(),
-  })
-  .partial();
-
-let runtimeSettings: z.infer<typeof RuntimeSettingsSchema> = {};
-let runtimeEnvironment: Env = {};
-
-export namespace RuntimeSettings {
-  export async function loadAsync({
-    environment,
-    env: nextRuntimeEnvironment = {},
-  }: {
-    environment: string;
-    env?: Env;
-  }): Promise<void> {
-    runtimeEnvironment = nextRuntimeEnvironment;
-    const url = ENVIRONMENT_TO_RUNTIME_SETTINGS_URL[environment];
-    if (!url) {
-      return;
-    }
-
-    try {
-      const response = await fetch(url, {
-        signal: AbortSignal.timeout(1000),
-      });
-
-      if (!response.ok) {
-        Sentry.capture('Failed to fetch worker runtime settings', {
-          extras: { url, status: response.status },
-          level: 'warning',
-        });
-        return;
-      }
-
-      runtimeSettings = RuntimeSettingsSchema.parse(await response.json());
-      if (runtimeSettings.caches && !runtimeSettings.caches[process.platform]) {
-        Sentry.capture(
-          new Error(
-            `Runtime settings are missing cache settings for platform "${process.platform}"`
-          ),
-          {
-            extras: {
-              configuredPlatforms: Object.keys(runtimeSettings.caches),
-              platform: process.platform,
-            },
-            level: 'error',
-          }
-        );
-      }
-    } catch (err) {
-      Sentry.capture(
-        'Failed to load worker runtime settings',
-        err instanceof Error ? err : new Error(String(err)),
-        {
-          extras: { url },
-          level: 'warning',
-        }
-      );
-    }
-  }
-
-  export function isUsingIosPrecompiledModulesEnabled(): boolean {
-    return runtimeSettings.iosPrecompiledModules ?? false;
-  }
-
-  export function getNpmCacheUrl(): string | null {
-    if (runtimeEnvironment['EAS_BUILD_DISABLE_NPM_CACHE'] === '1') {
-      return null;
-    }
-    const runtimeEnabled = runtimeSettings.caches?.[process.platform]?.npm;
-    if (runtimeEnabled === false) {
-      return null;
-    }
-    const envOverride = runtimeEnvironment['EAS_USE_NPM_CACHE'];
-    const enabled = envOverride === '1' || (envOverride !== '0' && runtimeEnabled);
-    return enabled ? process.env.EAS_NPM_CACHE_URL || null : null;
-  }
-
-  export function getNodeJsCacheUrl(): string | null {
-    const runtimeEnabled = runtimeSettings.caches?.[process.platform]?.nodejs;
-    if (runtimeEnabled === false) {
-      return null;
-    }
-    const envOverride = runtimeEnvironment['EAS_USE_NODEJS_CACHE'];
-    const enabled = envOverride === '1' || (envOverride !== '0' && runtimeEnabled);
-    return enabled ? process.env.EAS_NODEJS_CACHE_URL || null : null;
-  }
-
-  export function getMavenCacheUrl(): string | null {
-    if (runtimeEnvironment['EAS_BUILD_DISABLE_MAVEN_CACHE'] === '1') {
-      return null;
-    }
-    const runtimeEnabled = runtimeSettings.caches?.[process.platform]?.maven;
-    if (runtimeEnabled === false) {
-      return null;
-    }
-    const envOverride = runtimeEnvironment['EAS_USE_MAVEN_CACHE'];
-    const enabled = envOverride === '1' || (envOverride !== '0' && runtimeEnabled);
-    return enabled ? process.env.EAS_MAVEN_CACHE_URL || null : null;
-  }
-
-  export function getCocoapodsCacheUrl(): string | null {
-    if (runtimeEnvironment['EAS_BUILD_DISABLE_COCOAPODS_CACHE'] === '1') {
-      return null;
-    }
-    const runtimeEnabled = runtimeSettings.caches?.[process.platform]?.cocoapods;
-    if (runtimeEnabled === false) {
-      return null;
-    }
-    const envOverride = runtimeEnvironment['EAS_USE_COCOAPODS_CACHE'];
-    const enabled = envOverride === '1' || (envOverride !== '0' && runtimeEnabled);
-    return enabled ? process.env.EAS_COCOAPODS_CACHE_URL || null : null;
-  }
-}

packages/build-tools/src/steps/__tests__/hookAnchors.test.ts

@@ -1,117 +0,0 @@
-import { HookAnchorId } from '@expo/eas-build-job';
-import { StepsConfigParser } from '@expo/steps';
-
-import {
-  createCustomBuildContextMock,
-  createGlobalContextMock,
-} from '../../__tests__/utils/context';
-import { getEasFunctionGroups } from '../easFunctionGroups';
-import { getEasFunctions } from '../easFunctions';
-
-jest.mock('fs');
-
-describe('hook anchor self-declarations', () => {
-  it('exactly the four v0 functions declare anchors, with these bindings', () => {
-    const declarations: Record<string, HookAnchorId> = {};
-    for (const buildFunction of getEasFunctions(createCustomBuildContextMock())) {
-      if (buildFunction.__hookId !== undefined) {
-        declarations[buildFunction.getFullId()] = buildFunction.__hookId;
-      }
-    }
-    // An empty declaration set must fail: without these, every user-authored
-    // unstamped `uses:` step and every `eas/build` expansion loses hooks.
-    expect(declarations).toEqual({
-      'eas/checkout': 'checkout',
-      'eas/install_node_modules': 'install_node_modules',
-      'eas/upload_to_asc': 'submit',
-      'eas/maestro_tests': 'maestro_tests',
-    });
-  });
-
-  it('no function group id collides with a declaring function id', () => {
-    // Group lookup shadows function lookup in StepsConfigParser, so a
-    // collision would silently unbind the anchor.
-    const declaringFunctionIds = getEasFunctions(createCustomBuildContextMock())
-      .filter(buildFunction => buildFunction.__hookId !== undefined)
-      .map(buildFunction => buildFunction.getFullId());
-    const functionGroupIds = getEasFunctionGroups(createCustomBuildContextMock()).map(
-      functionGroup => functionGroup.getFullId()
-    );
-    for (const functionId of declaringFunctionIds) {
-      expect(functionGroupIds).not.toContain(functionId);
-    }
-  });
-
-  it('attaches hooks inside a uses: eas/build expansion (declaration-driven anchor discovery)', async () => {
-    // This is the guard against a semantically stale declaration — the
-    // declaration existence test alone cannot catch a binding that no longer
-    // corresponds to what the group actually expands to.
-    const customBuildCtx = createCustomBuildContextMock();
-    const globalContext = createGlobalContextMock({});
-    const parser = new StepsConfigParser(globalContext, {
-      steps: [{ uses: 'eas/build' }],
-      hooks: {
-        before_install_node_modules: [{ run: 'echo before', id: 'before-hook' }],
-        after_install_node_modules: [{ run: 'echo after', id: 'after-hook' }],
-      },
-      externalFunctions: getEasFunctions(customBuildCtx),
-      externalFunctionGroups: getEasFunctionGroups(customBuildCtx),
-    });
-    const workflow = await parser.parseAsync();
-
-    const installStep = workflow.buildSteps.find(step => step.__hookId === 'install_node_modules');
-    expect(installStep).toBeDefined();
-    const anchorHooks = workflow.hooksByAnchorStep.get(installStep!);
-    expect(anchorHooks?.anchor).toBe('install_node_modules');
-    expect(anchorHooks?.before[0].steps[0].id).toBe('before-hook');
-    expect(anchorHooks?.after[0].steps[0].id).toBe('after-hook');
-  });
-
-  it.each([
-    ['eas/checkout', 'before_checkout', 'after_checkout', undefined],
-    [
-      'eas/install_node_modules',
-      'before_install_node_modules',
-      'after_install_node_modules',
-      undefined,
-    ],
-    [
-      'eas/upload_to_asc',
-      'before_submit',
-      'after_submit',
-      {
-        ipa_path: 'app.ipa',
-        asc_api_key_path: 'key.p8',
-        apple_app_identifier: '1234567890',
-        bundle_version: '1',
-        bundle_short_version: '1.0.0',
-      },
-    ],
-    [
-      'eas/maestro_tests',
-      'before_maestro_tests',
-      'after_maestro_tests',
-      { flow_path: ['flow.yaml'] },
-    ],
-  ] as const)(
-    'an unstamped user-authored %s step fires its hook keys end-to-end',
-    async (functionId, beforeKey, afterKey, callInputs) => {
-      const customBuildCtx = createCustomBuildContextMock();
-      const globalContext = createGlobalContextMock({});
-      const parser = new StepsConfigParser(globalContext, {
-        steps: [{ uses: functionId, ...(callInputs !== undefined ? { with: callInputs } : null) }],
-        hooks: {
-          [beforeKey]: [{ run: 'echo before', id: 'before-hook' }],
-          [afterKey]: [{ run: 'echo after', id: 'after-hook' }],
-        },
-        externalFunctions: getEasFunctions(customBuildCtx),
-        externalFunctionGroups: getEasFunctionGroups(customBuildCtx),
-      });
-      const workflow = await parser.parseAsync();
-      expect(workflow.hooksByAnchorStep.size).toBe(1);
-      const anchorHooks = [...workflow.hooksByAnchorStep.values()][0];
-      expect(anchorHooks.before[0].steps[0].id).toBe('before-hook');
-      expect(anchorHooks.after[0].steps[0].id).toBe('after-hook');
-    }
-  );
-});

packages/build-tools/src/steps/easFunctions.ts

@@ -1,7 +1,6 @@
 import { BuildFunction } from '@expo/steps';
 
 import { calculateEASUpdateRuntimeVersionFunction } from './functions/calculateEASUpdateRuntimeVersion';
-import { createCapturePosthogEventFunction } from './functions/capturePosthogEvent';
 import { createCheckoutBuildFunction } from './functions/checkout';
 import { configureAndroidVersionFunction } from './functions/configureAndroidVersion';
 import { configureEASUpdateIfInstalledFunction } from './functions/configureEASUpdateIfInstalled';
@@ -14,7 +13,6 @@ import { createEasDeployBuildFunction } from './functions/deploy';
 import { createEasExportBuildFunction } from './functions/export';
 import { eagerBundleBuildFunction } from './functions/eagerBundle';
 import { createFindAndUploadBuildArtifactsBuildFunction } from './functions/findAndUploadBuildArtifacts';
-import { createFinishIosSimulatorRecordingsBuildFunction } from './functions/finishIosSimulatorRecordings';
 import { generateGymfileFromTemplateFunction } from './functions/generateGymfileFromTemplate';
 import { createGetCredentialsForBuildTriggeredByGithubIntegration } from './functions/getCredentialsForBuildTriggeredByGitHubIntegration';
 import { injectAndroidCredentialsFunction } from './functions/injectAndroidCredentials';
@@ -39,24 +37,16 @@ import { runFastlaneFunction } from './functions/runFastlane';
 import { runGradleFunction } from './functions/runGradle';
 import { createMaestroTestsBuildFunction } from './functions/maestroTests';
 import { createSaveBuildCacheFunction } from './functions/saveBuildCache';
-import { createRolloutPosthogFlagFunction } from './functions/rolloutPosthogFlag';
 import { createSaveCacheFunction } from './functions/saveCache';
 import { createSendSlackMessageFunction } from './functions/sendSlackMessage';
 import { createStartAgentDeviceRemoteSessionBuildFunction } from './functions/startAgentDeviceRemoteSession';
 import { createStartAndroidEmulatorBuildFunction } from './functions/startAndroidEmulator';
-import { createStartArgentRemoteSessionBuildFunction } from './functions/startArgentRemoteSession';
 import { createStartCuttlefishDeviceBuildFunction } from './functions/startCuttlefishDevice';
 import { createStartIosSimulatorBuildFunction } from './functions/startIosSimulator';
-import { createStartIosSimulatorRecordingsBuildFunction } from './functions/startIosSimulatorRecordings';
 import { createStartServeSimRemoteSessionBuildFunction } from './functions/startServeSimRemoteSession';
 import { createUploadArtifactBuildFunction } from './functions/uploadArtifact';
-import { createUploadDeviceRunSessionScreenRecordingsBuildFunction } from './functions/uploadDeviceRunSessionScreenRecordings';
 import { createUploadToAscBuildFunction } from './functions/uploadToAsc';
 import { createSetUpNpmrcBuildFunction } from './functions/useNpmToken';
-import { createWaitForPosthogMetricFunction } from './functions/waitForPosthogMetric';
-import { createUploadPosthogSourcemapsFunction } from './functions/uploadPosthogSourcemaps';
-import { createPosthogAnnotationFunction } from './functions/createPosthogAnnotation';
-import { createWaitForPosthogQueryFunction } from './functions/waitForPosthogQuery';
 import { CustomBuildContext } from '../customBuildContext';
 
 export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
@@ -70,7 +60,7 @@ export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
     createInstallNodeModulesBuildFunction(),
     createPrebuildBuildFunction(),
     createReadIpaInfoBuildFunction(),
-    createDownloadBuildFunction(ctx),
+    createDownloadBuildFunction(),
     createEasExportBuildFunction(),
     createEasDeployBuildFunction(),
     createRepackBuildFunction(),
@@ -91,24 +81,14 @@ export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
     runFastlaneFunction(),
     parseXcactivitylogFunction(),
     createStartAgentDeviceRemoteSessionBuildFunction(ctx),
-    createStartArgentRemoteSessionBuildFunction(ctx),
     createStartAndroidEmulatorBuildFunction(),
     createStartCuttlefishDeviceBuildFunction(),
     createStartIosSimulatorBuildFunction(),
-    createStartIosSimulatorRecordingsBuildFunction(),
-    createFinishIosSimulatorRecordingsBuildFunction(),
-    createUploadDeviceRunSessionScreenRecordingsBuildFunction(ctx),
     createStartServeSimRemoteSessionBuildFunction(ctx),
     createInstallMaestroBuildFunction(),
 
     createInstallPodsBuildFunction(),
     createSendSlackMessageFunction(),
-    createCapturePosthogEventFunction(),
-    createRolloutPosthogFlagFunction(),
-    createWaitForPosthogMetricFunction(),
-    createUploadPosthogSourcemapsFunction(),
-    createPosthogAnnotationFunction(),
-    createWaitForPosthogQueryFunction(),
 
     calculateEASUpdateRuntimeVersionFunction(),
 
@@ -116,7 +96,7 @@ export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
     createUploadToAscBuildFunction(),
 
     createReportMaestroTestResultsFunction(ctx),
-    createMaestroTestsBuildFunction(ctx),
+    createMaestroTestsBuildFunction(),
   ];
 
   if (ctx.hasBuildJob()) {

packages/build-tools/src/steps/functions/__tests__/capturePosthogEvent.test.ts

@@ -1,176 +0,0 @@
-import fetch, { Response } from 'node-fetch';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { createCapturePosthogEventFunction } from '../capturePosthogEvent';
-
-jest.mock('@expo/logger');
-jest.mock('node-fetch');
-
-describe(createCapturePosthogEventFunction, () => {
-  const fetchMock = jest.mocked(fetch);
-  const captureEvent = createCapturePosthogEventFunction();
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  function createStep(
-    callInputs: Record<string, unknown>,
-    env: Record<string, string>
-  ): ReturnType<typeof captureEvent.createBuildStepFromFunctionCall> {
-    return captureEvent.createBuildStepFromFunctionCall(createGlobalContextMock({}), {
-      callInputs,
-      env,
-      id: captureEvent.id,
-    });
-  }
-
-  it('sends the event to the ingestion endpoint using the env key', async () => {
-    fetchMock.mockResolvedValue({ status: 200, ok: true } as Response);
-    const step = createStep(
-      { event: 'workflow_finished', distinct_id: 'account-1' },
-      {
-        EXPO_PUBLIC_POSTHOG_API_KEY: 'phc_test',
-        EXPO_PUBLIC_POSTHOG_HOST: 'https://us.posthog.com',
-      }
-    );
-
-    await step.executeAsync();
-
-    expect(fetchMock).toHaveBeenCalledTimes(1);
-    const [url, init] = fetchMock.mock.calls[0];
-    expect(url).toBe('https://us.posthog.com/i/v0/e/');
-    const body = JSON.parse(init?.body as string);
-    expect(body).toMatchObject({
-      api_key: 'phc_test',
-      event: 'workflow_finished',
-      distinct_id: 'account-1',
-    });
-    expect(body.properties?.$process_person_profile).toBeUndefined();
-  });
-
-  it('sends an anonymous system event when no distinct_id is given', async () => {
-    fetchMock.mockResolvedValue({ status: 200, ok: true } as Response);
-    const step = createStep(
-      { event: 'workflow_finished' },
-      { EXPO_PUBLIC_POSTHOG_API_KEY: 'phc_test' }
-    );
-
-    await step.executeAsync();
-
-    const body = JSON.parse(fetchMock.mock.calls[0][1]?.body as string);
-    expect(body.distinct_id).toBe('eas-workflow');
-    expect(body.properties.$process_person_profile).toBe(false);
-  });
-
-  it('skips when no api key is available and ignore_error is set', async () => {
-    const step = createStep(
-      { event: 'workflow_finished', distinct_id: 'account-1', ignore_error: true },
-      {}
-    );
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await step.executeAsync();
-
-    expect(fetchMock).not.toHaveBeenCalled();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      expect.stringMatching(/Ignoring error\.$/)
-    );
-  });
-
-  it('logs and does not throw on a non-2xx response when ignore_error is set', async () => {
-    fetchMock.mockResolvedValue({
-      status: 400,
-      ok: false,
-      text: async () => '',
-    } as unknown as Response);
-    const step = createStep(
-      { event: 'workflow_finished', distinct_id: 'account-1', ignore_error: true },
-      { EXPO_PUBLIC_POSTHOG_API_KEY: 'phc_test' }
-    );
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      'Sending PostHog event "workflow_finished" failed with status 400. Ignoring error.'
-    );
-  });
-
-  it('does not let properties override the anonymous marker', async () => {
-    fetchMock.mockResolvedValue({ status: 200, ok: true } as Response);
-    const step = createStep(
-      { event: 'workflow_finished', properties: { $process_person_profile: true, foo: 'bar' } },
-      { EXPO_PUBLIC_POSTHOG_API_KEY: 'phc_test' }
-    );
-
-    await step.executeAsync();
-
-    const body = JSON.parse(fetchMock.mock.calls[0][1]?.body as string);
-    expect(body.properties.$process_person_profile).toBe(false);
-    expect(body.properties.foo).toBe('bar');
-  });
-
-  it('throws on a network error by default', async () => {
-    fetchMock.mockRejectedValue(new Error('ECONNRESET'));
-    const step = createStep(
-      { event: 'workflow_finished' },
-      { EXPO_PUBLIC_POSTHOG_API_KEY: 'phc_test' }
-    );
-
-    await expect(step.executeAsync()).rejects.toThrow(
-      'Sending PostHog event "workflow_finished" failed.'
-    );
-  });
-
-  it('logs and does not throw on a network error when ignore_error is set', async () => {
-    fetchMock.mockRejectedValue(new Error('ECONNRESET'));
-    const step = createStep(
-      { event: 'workflow_finished', ignore_error: true },
-      { EXPO_PUBLIC_POSTHOG_API_KEY: 'phc_test' }
-    );
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      'Sending PostHog event "workflow_finished" failed. Ignoring error.'
-    );
-  });
-
-  it('throws with the PostHog error detail on failure by default', async () => {
-    fetchMock.mockResolvedValue({
-      status: 400,
-      ok: false,
-      text: async () => JSON.stringify({ detail: 'Invalid event name' }),
-    } as unknown as Response);
-    const step = createStep(
-      { event: 'workflow_finished' },
-      { EXPO_PUBLIC_POSTHOG_API_KEY: 'phc_test' }
-    );
-
-    await expect(step.executeAsync()).rejects.toThrow(/failed with status 400: Invalid event name/);
-  });
-
-  it('falls back to the raw error body when PostHog omits a detail', async () => {
-    fetchMock.mockResolvedValue({
-      status: 400,
-      ok: false,
-      text: async () => JSON.stringify({ error: 'nope' }),
-    } as unknown as Response);
-    const step = createStep(
-      { event: 'workflow_finished' },
-      { EXPO_PUBLIC_POSTHOG_API_KEY: 'phc_test' }
-    );
-
-    await expect(step.executeAsync()).rejects.toThrow(/failed with status 400: {"error":"nope"}/);
-  });
-
-  it('throws on missing key by default', async () => {
-    const step = createStep({ event: 'workflow_finished' }, {});
-
-    await expect(step.executeAsync()).rejects.toThrow(/PostHog API key not provided/);
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-});

packages/build-tools/src/steps/functions/__tests__/createPosthogAnnotation.test.ts

@@ -1,138 +0,0 @@
-import fetch, { Response } from 'node-fetch';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { createPosthogAnnotationFunction } from '../createPosthogAnnotation';
-
-jest.mock('@expo/logger');
-jest.mock('node-fetch');
-
-function jsonResponse(data: unknown, { ok = true, status = 200 } = {}): Response {
-  return {
-    ok,
-    status,
-    json: async () => data,
-    text: async () => JSON.stringify(data),
-  } as unknown as Response;
-}
-
-const ENV = {
-  POSTHOG_CLI_API_KEY: 'phx_test',
-  POSTHOG_CLI_PROJECT_ID: '123',
-  POSTHOG_CLI_HOST: 'https://us.posthog.com',
-};
-
-describe(createPosthogAnnotationFunction, () => {
-  const fetchMock = jest.mocked(fetch);
-  const annotation = createPosthogAnnotationFunction();
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  function createStep(
-    callInputs: Record<string, unknown>,
-    env: Record<string, string> = ENV
-  ): ReturnType<typeof annotation.createBuildStepFromFunctionCall> {
-    return annotation.createBuildStepFromFunctionCall(createGlobalContextMock({}), {
-      callInputs,
-      env,
-      id: annotation.id,
-    });
-  }
-
-  it('posts the annotation with an explicit date_marker', async () => {
-    fetchMock.mockResolvedValue(jsonResponse({ id: 1 }, { status: 201 }));
-    const step = createStep({ content: 'Released abc123', date_marker: '2026-07-03T00:00:00Z' });
-
-    await step.executeAsync();
-
-    const [url, init] = fetchMock.mock.calls[0];
-    expect(url).toBe('https://us.posthog.com/api/projects/123/annotations/');
-    expect(JSON.parse(init?.body as string)).toEqual({
-      content: 'Released abc123',
-      date_marker: '2026-07-03T00:00:00Z',
-    });
-  });
-
-  it('defaults date_marker to now when not given', async () => {
-    fetchMock.mockResolvedValue(jsonResponse({ id: 1 }, { status: 201 }));
-    const step = createStep({ content: 'Deploy' });
-
-    await step.executeAsync();
-
-    const body = JSON.parse(fetchMock.mock.calls[0][1]?.body as string);
-    expect(body.content).toBe('Deploy');
-    expect(typeof body.date_marker).toBe('string');
-  });
-
-  it('throws when credentials are missing by default', async () => {
-    const step = createStep({ content: 'Deploy' }, {});
-
-    await expect(step.executeAsync()).rejects.toThrow(
-      /Missing PostHog credentials: personal API key, project id/
-    );
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  it('warns and skips when credentials are missing and ignore_error is set', async () => {
-    const step = createStep({ content: 'Deploy', ignore_error: true }, {});
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await step.executeAsync();
-
-    expect(fetchMock).not.toHaveBeenCalled();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      expect.stringMatching(/Ignoring error/)
-    );
-  });
-
-  it('throws on a network error by default', async () => {
-    fetchMock.mockRejectedValue(new Error('ECONNRESET'));
-    const step = createStep({ content: 'Deploy' });
-
-    await expect(step.executeAsync()).rejects.toThrow(/Creating the PostHog annotation failed/);
-  });
-
-  it('warns and continues on a network error when ignore_error is set', async () => {
-    fetchMock.mockRejectedValue(new Error('ECONNRESET'));
-    const step = createStep({ content: 'Deploy', ignore_error: true });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      expect.stringMatching(/Ignoring error/)
-    );
-  });
-
-  it('throws on a 403 without swallowing it', async () => {
-    fetchMock.mockResolvedValue(jsonResponse({}, { ok: false, status: 403 }));
-    const step = createStep({ content: 'Deploy' });
-
-    await expect(step.executeAsync()).rejects.toThrow(/annotation:write/);
-  });
-
-  it('throws with the PostHog error detail on a non-2xx response', async () => {
-    fetchMock.mockResolvedValue(
-      jsonResponse({ detail: 'Invalid date_marker' }, { ok: false, status: 400 })
-    );
-    const step = createStep({ content: 'Deploy' });
-
-    await expect(step.executeAsync()).rejects.toThrow(
-      /failed with status 400: Invalid date_marker/
-    );
-  });
-
-  it('warns and continues on a non-2xx response when ignore_error is set', async () => {
-    fetchMock.mockResolvedValue(jsonResponse({}, { ok: false, status: 500 }));
-    const step = createStep({ content: 'Deploy', ignore_error: true });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      expect.stringMatching(/Ignoring error/)
-    );
-  });
-});

packages/build-tools/src/steps/functions/__tests__/downloadBuild.test.ts

@@ -1,6 +1,4 @@
-import { SystemError, UserError } from '@expo/eas-build-job';
 import { createLogger } from '@expo/logger';
-import { Client, CombinedError } from '@urql/core';
 import fetch, { Response } from 'node-fetch';
 import { randomUUID } from 'node:crypto';
 import fs from 'node:fs';
@@ -19,63 +17,22 @@ const APP_TAR_GZ_BUFFER = Buffer.from(
   'base64'
 );
 
-const APPLICATION_ARCHIVE_URL = `https://expo.dev/artifacts/eas/${randomUUID()}.tar.gz`;
-
-function createMockGraphqlClient({
-  applicationArchiveUrl,
-  error,
-}: {
-  applicationArchiveUrl?: string | null;
-  error?: Error;
-}): Client {
-  const toPromise = jest.fn().mockResolvedValue(
-    error
-      ? { error, data: undefined }
-      : {
-          data: {
-            builds: {
-              byId: {
-                id: randomUUID(),
-                platform: 'IOS',
-                artifacts: {
-                  applicationArchiveUrl: applicationArchiveUrl ?? null,
-                },
-              },
-            },
-          },
-        }
-  );
-
-  return {
-    query: jest.fn().mockReturnValue({ toPromise }),
-  } as unknown as Client;
-}
-
 describe('downloadBuild', () => {
-  it('downloads from applicationArchiveUrl returned by GraphQL', async () => {
-    const buildId = randomUUID();
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-    });
-
+  it('should handle an archive', async () => {
     jest.mocked(fetch).mockResolvedValue({
       ok: true,
       body: Readable.from(APP_TAR_GZ_BUFFER),
-      url: APPLICATION_ARCHIVE_URL,
+      url: `https://storage.googleapis.com/eas-workflows-production/artifacts/${randomUUID()}/${randomUUID()}/application-${randomUUID()}.tar.gz?X-Goog-Algorithm=GOOG4-RSA-SHA256`,
     } as unknown as Response);
 
     const { artifactPath } = await downloadBuildAsync({
       logger: createLogger({ name: 'test' }),
-      buildId,
-      graphqlClient,
+      buildId: randomUUID(),
+      expoApiServerURL: 'http://api.expo.test',
       robotAccessToken: null,
       extensions: ['app'],
     });
 
-    expect(jest.mocked(fetch)).toHaveBeenCalledWith(
-      APPLICATION_ARCHIVE_URL,
-      expect.objectContaining({ headers: undefined })
-    );
     expect(artifactPath).toBeDefined();
     expect(await fs.promises.readFile(path.join(artifactPath, 'TestApp'), 'utf8')).toBe(
       'i am executable\n'
@@ -83,21 +40,16 @@ describe('downloadBuild', () => {
   });
 
   it('should handle a straight-up file', async () => {
-    const applicationArchiveUrl = `https://expo.dev/artifacts/eas/${randomUUID()}.apk`;
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl,
-    });
-
     jest.mocked(fetch).mockResolvedValue({
       ok: true,
       body: Readable.from(Buffer.from('hello')),
-      url: applicationArchiveUrl,
+      url: `https://storage.googleapis.com/eas-workflows-production/artifacts/${randomUUID()}/${randomUUID()}/application-${randomUUID()}.txt?X-Goog-Algorithm=GOOG4-RSA-SHA256`,
     } as unknown as Response);
 
     const { artifactPath } = await downloadBuildAsync({
       logger: createLogger({ name: 'test' }),
       buildId: randomUUID(),
-      graphqlClient,
+      expoApiServerURL: 'http://api.expo.test',
       robotAccessToken: null,
       extensions: ['app'],
     });
@@ -106,114 +58,18 @@ describe('downloadBuild', () => {
     expect(await fs.promises.readFile(artifactPath, 'utf-8')).toBe('hello');
   });
 
-  it('throws UserError when the build has no application archive url', async () => {
-    const graphqlClient = createMockGraphqlClient({ applicationArchiveUrl: null });
-
-    await expect(
-      downloadBuildAsync({
-        logger: createLogger({ name: 'test' }),
-        buildId: randomUUID(),
-        graphqlClient,
-        robotAccessToken: null,
-        extensions: ['app'],
-      })
-    ).rejects.toMatchObject({
-      errorCode: 'EAS_DOWNLOAD_BUILD_NO_APPLICATION_ARCHIVE',
-      message: 'Build does not have an application archive url',
-    });
-
-    expect(jest.mocked(fetch)).not.toHaveBeenCalled();
-  });
-
-  it('throws SystemError when GraphQL request fails with a network error', async () => {
-    const buildId = randomUUID();
-    const graphqlClient = createMockGraphqlClient({
-      error: new CombinedError({
-        networkError: new Error('Network request failed'),
-      }),
-    });
-
-    const promise = downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      buildId,
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['app'],
-    });
-
-    await expect(promise).rejects.toBeInstanceOf(SystemError);
-    await expect(promise).rejects.toMatchObject({
-      message: `Could not fetch build ${buildId}: [Network] Network request failed`,
-    });
-
-    expect(jest.mocked(fetch)).not.toHaveBeenCalled();
-  });
-
-  it('throws SystemError when GraphQL request returns 5xx', async () => {
-    const buildId = randomUUID();
-    const graphqlClient = createMockGraphqlClient({
-      error: Object.assign(new Error('Internal Server Error'), {
-        response: { status: 500 },
-      }),
-    });
-
-    const promise = downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      buildId,
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['app'],
-    });
-
-    await expect(promise).rejects.toBeInstanceOf(SystemError);
-    await expect(promise).rejects.toMatchObject({
-      message: `Could not fetch build ${buildId}: Internal Server Error`,
-    });
-
-    expect(jest.mocked(fetch)).not.toHaveBeenCalled();
-  });
-
-  it('throws UserError when GraphQL returns a client error', async () => {
-    const buildId = randomUUID();
-    const graphqlClient = createMockGraphqlClient({
-      error: new CombinedError({
-        graphQLErrors: [{ message: 'Build not found' }],
-      }),
-    });
-
-    const promise = downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      buildId,
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['app'],
-    });
-
-    await expect(promise).rejects.toBeInstanceOf(UserError);
-    await expect(promise).rejects.toMatchObject({
-      errorCode: 'EAS_DOWNLOAD_BUILD_FETCH_FAILED',
-      message: `Could not fetch build ${buildId}: [GraphQL] Build not found`,
-    });
-
-    expect(jest.mocked(fetch)).not.toHaveBeenCalled();
-  });
-
   it('should throw an error if no matching files are found', async () => {
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-    });
-
     jest.mocked(fetch).mockResolvedValue({
       ok: true,
       body: Readable.from(APP_TAR_GZ_BUFFER),
-      url: APPLICATION_ARCHIVE_URL,
+      url: `https://storage.googleapis.com/eas-workflows-production/artifacts/${randomUUID()}/${randomUUID()}/application-${randomUUID()}.tar.gz?X-Goog-Algorithm=GOOG4-RSA-SHA256`,
     } as unknown as Response);
 
     await expect(
       downloadBuildAsync({
         logger: createLogger({ name: 'test' }),
         buildId: randomUUID(),
-        graphqlClient,
+        expoApiServerURL: 'http://api.expo.test',
         robotAccessToken: null,
         extensions: ['apk'],
       })
@@ -223,11 +79,7 @@ describe('downloadBuild', () => {
 
 describe('createDownloadBuildFunction', () => {
   it('should download a build', async () => {
-    const buildId = randomUUID();
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-    });
-    const downloadBuild = createDownloadBuildFunction({ graphqlClient } as any);
+    const downloadBuild = createDownloadBuildFunction();
     const logger = createMockLogger();
 
     const buildStep = downloadBuild.createBuildStepFromFunctionCall(
@@ -240,7 +92,7 @@ describe('createDownloadBuildFunction', () => {
       }),
       {
         callInputs: {
-          build_id: buildId,
+          build_id: randomUUID(),
           extensions: ['app'],
         },
       }
@@ -253,9 +105,5 @@ describe('createDownloadBuildFunction', () => {
     } as unknown as Response);
 
     await expect(buildStep.executeAsync()).rejects.toThrow('Internal Server Error');
-    expect(jest.mocked(fetch)).toHaveBeenCalledWith(
-      APPLICATION_ARCHIVE_URL,
-      expect.objectContaining({ headers: undefined })
-    );
   });
 });

packages/build-tools/src/steps/functions/__tests__/installMaestro.test.ts

@@ -1,90 +0,0 @@
-import spawn from '@expo/turtle-spawn';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { Datadog } from '../../../datadog';
-import { createInstallMaestroBuildFunction } from '../installMaestro';
-
-jest.mock('@expo/turtle-spawn', () => ({
-  __esModule: true,
-  default: jest.fn(),
-}));
-
-jest.mock('../../../datadog', () => ({
-  Datadog: {
-    distribution: jest.fn(),
-  },
-}));
-
-const mockedSpawn = jest.mocked(spawn);
-
-describe('createInstallMaestroBuildFunction', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    // `maestro --version` reports an installed version; `java -version` succeeds.
-    // With no requested version and Maestro present, the step skips installation.
-    mockedSpawn.mockImplementation((async (command: string) => ({
-      stdout: command === 'maestro' ? '1.41.0\n' : '',
-    })) as any);
-  });
-
-  it('reports the detected Maestro version to Datadog on EAS Build VMs', async () => {
-    const installMaestro = createInstallMaestroBuildFunction();
-    const globalCtx = createGlobalContextMock();
-    globalCtx.updateEnv({ EAS_BUILD_RUNNER: 'eas-build' });
-    const step = installMaestro.createBuildStepFromFunctionCall(globalCtx, { callInputs: {} });
-
-    await step.executeAsync();
-
-    expect(step.getOutputValueByName('maestro_version')).toBe('1.41.0');
-    expect(Datadog.distribution).toHaveBeenCalledWith('eas.maestro.install', 1, {
-      maestro_version: '1.41.0',
-    });
-  });
-
-  it('does not report to Datadog outside EAS Build VMs', async () => {
-    const installMaestro = createInstallMaestroBuildFunction();
-    const step = installMaestro.createBuildStepFromFunctionCall(createGlobalContextMock(), {
-      callInputs: {},
-    });
-
-    await step.executeAsync();
-
-    expect(Datadog.distribution).not.toHaveBeenCalled();
-  });
-
-  it('extracts the version when `maestro --version` prints an analytics notice', async () => {
-    mockedSpawn.mockImplementation((async (command: string) => ({
-      stdout:
-        command === 'maestro'
-          ? 'Anonymous analytics enabled. To opt out, set MAESTRO_CLI_NO_ANALYTICS environment variable to any value before running Maestro.\n2.0.10\n'
-          : '',
-    })) as any);
-
-    const installMaestro = createInstallMaestroBuildFunction();
-    const globalCtx = createGlobalContextMock();
-    globalCtx.updateEnv({ EAS_BUILD_RUNNER: 'eas-build' });
-    const step = installMaestro.createBuildStepFromFunctionCall(globalCtx, { callInputs: {} });
-
-    await step.executeAsync();
-
-    expect(step.getOutputValueByName('maestro_version')).toBe('2.0.10');
-    expect(Datadog.distribution).toHaveBeenCalledWith('eas.maestro.install', 1, {
-      maestro_version: '2.0.10',
-    });
-  });
-
-  it('uses the trailing version when the notice itself contains an earlier version-like string', async () => {
-    mockedSpawn.mockImplementation((async (command: string) => ({
-      stdout: command === 'maestro' ? 'Analytics schema v2.0.0 enabled.\n2.0.10\n' : '',
-    })) as any);
-
-    const installMaestro = createInstallMaestroBuildFunction();
-    const globalCtx = createGlobalContextMock();
-    globalCtx.updateEnv({ EAS_BUILD_RUNNER: 'eas-build' });
-    const step = installMaestro.createBuildStepFromFunctionCall(globalCtx, { callInputs: {} });
-
-    await step.executeAsync();
-
-    expect(step.getOutputValueByName('maestro_version')).toBe('2.0.10');
-  });
-});

packages/build-tools/src/steps/functions/__tests__/maestroResultParser.test.ts

@@ -4,14 +4,10 @@ import { vol } from 'memfs';
 
 import {
   copyLatestAttemptXml,
-  isFileAttrRun,
-  junitFileHasFileAttrs,
   mergeJUnitReports,
-  parseFailedFlowsFromFileAttrs,
   parseFailedFlowsFromJUnit,
   parseJUnitTestCases,
   parseMaestroResults,
-  parseMaestroResultsFromFileAttrs,
 } from '../maestroResultParser';
 
 describe(parseMaestroResults, () => {
@@ -302,169 +298,7 @@ describe(parseMaestroResults, () => {
   });
 });
 
-describe(parseMaestroResultsFromFileAttrs, () => {
-  it('uses file= as the path', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file=".maestro/login.yaml" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const results = await parseMaestroResultsFromFileAttrs('/junit');
-    expect(results[0]).toEqual(
-      expect.objectContaining({ name: 'login', path: '.maestro/login.yaml' })
-    );
-  });
-
-  it('keeps two same-named flows separate by their file= path', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file="a/login.yaml" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="login" file="b/login.yaml" status="ERROR" time="1.0"><failure>x</failure></testcase>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const results = await parseMaestroResultsFromFileAttrs('/junit');
-    expect(results.map(r => r.path).sort()).toEqual(['a/login.yaml', 'b/login.yaml']);
-  });
-
-  it('returns per-attempt results keyed by file= across attempt files', async () => {
-    vol.fromJSON({
-      '/junit/android-maestro-junit-attempt-0.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file="flows/login.yaml" time="1.0"><failure>x</failure></testcase>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-      '/junit/android-maestro-junit-attempt-1.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file="flows/login.yaml" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const results = await parseMaestroResultsFromFileAttrs('/junit');
-    expect(results).toEqual([
-      expect.objectContaining({ path: 'flows/login.yaml', status: 'failed', retryCount: 0 }),
-      expect.objectContaining({ path: 'flows/login.yaml', status: 'passed', retryCount: 1 }),
-    ]);
-  });
-
-  it('returns empty array when the directory does not exist', async () => {
-    const results = await parseMaestroResultsFromFileAttrs('/nope');
-    expect(results).toEqual([]);
-  });
-
-  it('skips testcases without file= instead of emitting an undefined path (contract guard)', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="a" file="a.yaml" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="b" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const results = await parseMaestroResultsFromFileAttrs('/junit');
-    expect(results).toEqual([expect.objectContaining({ name: 'a', path: 'a.yaml' })]);
-  });
-});
-
-describe('junitFileHasFileAttrs', () => {
-  it('returns true when every testcase has a non-empty file= attribute', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="a" file="a.yaml" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="b" file="b.yaml" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    expect(await junitFileHasFileAttrs('/junit/report.xml')).toBe(true);
-  });
-
-  it('returns false when any testcase lacks file= (mixed report)', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="a" file="a.yaml" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="b" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    expect(await junitFileHasFileAttrs('/junit/report.xml')).toBe(false);
-  });
-
-  it('returns false when file= is an empty string', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="a" file="" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    expect(await junitFileHasFileAttrs('/junit/report.xml')).toBe(false);
-  });
-
-  it('returns false for a legacy report with no file= attributes', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="a" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    expect(await junitFileHasFileAttrs('/junit/report.xml')).toBe(false);
-  });
-
-  it('returns false when the file cannot be read', async () => {
-    expect(await junitFileHasFileAttrs('/missing.xml')).toBe(false);
-  });
-});
-
-describe('isFileAttrRun', () => {
-  it('returns false for an empty list (an empty report is not a file-attr run)', () => {
-    expect(isFileAttrRun([])).toBe(false);
-  });
-});
-
 describe(parseJUnitTestCases, () => {
-  it('extracts the file= attribute when present', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file=".maestro/login.yaml" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const results = await parseJUnitTestCases('/junit');
-    expect(results[0].file).toBe('.maestro/login.yaml');
-  });
-
-  it('treats a missing or empty file= attribute as undefined', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="a" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="b" file="" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const results = await parseJUnitTestCases('/junit');
-    expect(results.find(r => r.name === 'a')!.file).toBeUndefined();
-    expect(results.find(r => r.name === 'b')!.file).toBeUndefined();
-  });
-
   it('parses a single testcase with SUCCESS status', async () => {
     vol.fromJSON({
       '/junit/report.xml': [
@@ -748,100 +582,6 @@ describe(parseJUnitTestCases, () => {
   });
 });
 
-describe(parseFailedFlowsFromFileAttrs, () => {
-  it('returns the failing flows by file= (duplicate names retry correctly)', async () => {
-    vol.fromJSON({
-      '/tmp/jr/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="login" file="a/login.yaml" status="SUCCESS" time="1.0"/>
-  <testcase name="login" file="b/login.yaml" time="1.0"><failure>x</failure></testcase>
-</testsuite></testsuites>`,
-      '/proj/b/login.yaml': '',
-    });
-    const result = await parseFailedFlowsFromFileAttrs({
-      junitFile: '/tmp/jr/attempt-0.xml',
-      workingDirectory: '/proj',
-    });
-    expect(result).toEqual(['b/login.yaml']);
-  });
-
-  it('returns null when a file= path does not exist on disk (dumb retry, never legacy)', async () => {
-    vol.fromJSON({
-      '/tmp/jr/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="gone" file="missing/flow.yaml" time="1.0"><failure>x</failure></testcase>
-</testsuite></testsuites>`,
-    });
-    const result = await parseFailedFlowsFromFileAttrs({
-      junitFile: '/tmp/jr/attempt-0.xml',
-      workingDirectory: '/proj',
-    });
-    expect(result).toBeNull();
-  });
-
-  it('returns null when the report lacks file= attributes (callers must pre-check)', async () => {
-    vol.fromJSON({
-      '/tmp/jr/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="A" file="a.yaml" time="1.0"><failure>x</failure></testcase>
-  <testcase name="B" time="1.0"><failure>y</failure></testcase>
-</testsuite></testsuites>`,
-      '/proj/a.yaml': '',
-    });
-    const result = await parseFailedFlowsFromFileAttrs({
-      junitFile: '/tmp/jr/attempt-0.xml',
-      workingDirectory: '/proj',
-    });
-    expect(result).toBeNull();
-  });
-
-  it('dedupes repeated failing file= paths (same flow failed twice in one attempt)', async () => {
-    vol.fromJSON({
-      '/tmp/jr/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="login" file="flows/login.yaml" time="1.0"><failure>x</failure></testcase>
-  <testcase name="login" file="flows/login.yaml" time="1.0"><failure>y</failure></testcase>
-</testsuite></testsuites>`,
-      '/proj/flows/login.yaml': '',
-    });
-    const result = await parseFailedFlowsFromFileAttrs({
-      junitFile: '/tmp/jr/attempt-0.xml',
-      workingDirectory: '/proj',
-    });
-    expect(result).toEqual(['flows/login.yaml']);
-  });
-
-  it('resolves and existence-checks an absolute file= path', async () => {
-    vol.fromJSON({
-      '/tmp/jr/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="ext" file="/outside/flow.yaml" time="1.0"><failure>x</failure></testcase>
-</testsuite></testsuites>`,
-      '/outside/flow.yaml': '',
-    });
-    const result = await parseFailedFlowsFromFileAttrs({
-      junitFile: '/tmp/jr/attempt-0.xml',
-      workingDirectory: '/proj',
-    });
-    expect(result).toEqual(['/outside/flow.yaml']);
-  });
-
-  it('returns null when junit XML is truncated mid-tag (partial parse risk)', async () => {
-    vol.fromJSON({
-      '/tmp/jr/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="A" file="a.yaml" time="1.0"><failure>x</failure></testcase>
-  <testcase name="B" file="b.yaml"`, // intentionally truncated mid-tag
-      '/proj/a.yaml': '',
-    });
-    const result = await parseFailedFlowsFromFileAttrs({
-      junitFile: '/tmp/jr/attempt-0.xml',
-      workingDirectory: '/proj',
-    });
-    expect(result).toBeNull();
-  });
-});
-
 describe('parseFailedFlowsFromJUnit', () => {
   it('returns the subset of input flow paths whose testcases failed', async () => {
     vol.fromJSON({
@@ -1025,28 +765,6 @@ describe('mergeJUnitReports', () => {
     expect(b.failure).toBeUndefined();
   });
 
-  it('keeps a same-named flow from an earlier attempt when keyed by file=', async () => {
-    vol.fromJSON({
-      '/tmp/r/android-maestro-junit-attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="login" file="a/login.yaml" status="SUCCESS" time="1.0"/>
-  <testcase name="login" file="b/login.yaml" time="1.0"><failure>x</failure></testcase>
-</testsuite></testsuites>`,
-      '/tmp/r/android-maestro-junit-attempt-1.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="login" file="b/login.yaml" status="SUCCESS" time="1.0"/>
-</testsuite></testsuites>`,
-    });
-
-    await mergeJUnitReports({ sourceDir: '/tmp/r', outputPath: '/tmp/final.xml' });
-
-    const out = await fs.readFile('/tmp/final.xml', 'utf-8');
-    const parsed = new XMLParser({ ignoreAttributes: false }).parse(out);
-    const testcases = parsed.testsuites.testsuite.testcase;
-    const files = testcases.map((t: any) => t['@_file']).sort();
-    expect(files).toEqual(['a/login.yaml', 'b/login.yaml']);
-  });
-
   it('throws when source directory contains no *.xml files', async () => {
     // No per-attempt JUnit files were ever written (maestro crashed before
     // producing output). Phase 3 in runMaestroTests treats this as a SystemError

packages/build-tools/src/steps/functions/__tests__/maestroScreenshots.test.ts

@@ -1,287 +0,0 @@
-import fs from 'fs/promises';
-import os from 'os';
-import path from 'path';
-
-import { createMockLogger } from '../../../__tests__/utils/logger';
-import {
-  type HarvestedScreenshot,
-  computePureFailureFlowNames,
-  harvestFailureScreenshotsAsync,
-  parseFailureScreenshotFilename,
-  selectFailureScreenshots,
-} from '../maestroScreenshots';
-
-describe(parseFailureScreenshotFilename, () => {
-  it('parses a plain failure screenshot', () => {
-    expect(parseFailureScreenshotFilename('screenshot-❌-1781186692250-(Login Flow).png')).toEqual({
-      flowName: 'Login Flow',
-      capturedAtMs: 1781186692250,
-    });
-  });
-
-  it('parses a sharded failure screenshot', () => {
-    expect(
-      parseFailureScreenshotFilename('screenshot-shard-2-❌-1781186692250-(Login Flow).png')
-    ).toEqual({
-      flowName: 'Login Flow',
-      capturedAtMs: 1781186692250,
-    });
-  });
-
-  it('handles parentheses inside the flow name (right-to-left parse)', () => {
-    expect(
-      parseFailureScreenshotFilename('screenshot-❌-1781186692250-(Login (staging) Flow).png')
-    ).toEqual({
-      flowName: 'Login (staging) Flow',
-      capturedAtMs: 1781186692250,
-    });
-  });
-
-  it('rejects non-failure screenshots (✅, ⚠️) and unrelated files', () => {
-    expect(
-      parseFailureScreenshotFilename('screenshot-✅-1781186692250-(Login Flow).png')
-    ).toBeNull();
-    expect(parseFailureScreenshotFilename('commands-(Login Flow).json')).toBeNull();
-    expect(parseFailureScreenshotFilename('android-maestro-junit-attempt-0.xml')).toBeNull();
-  });
-});
-
-describe(harvestFailureScreenshotsAsync, () => {
-  const logger = createMockLogger();
-  let testsDirectory: string;
-
-  beforeEach(async () => {
-    testsDirectory = await fs.mkdtemp(path.join(os.tmpdir(), 'maestro-harvest-test-'));
-  });
-
-  afterEach(async () => {
-    await fs.rm(testsDirectory, { recursive: true, force: true });
-  });
-
-  async function makeDebugDir(name: string, files: string[], mtimeMs: number): Promise<void> {
-    const dir = path.join(testsDirectory, name);
-    await fs.mkdir(dir);
-    for (const file of files) {
-      await fs.writeFile(path.join(dir, file), '');
-    }
-    const when = new Date(mtimeMs);
-    await fs.utimes(dir, when, when);
-  }
-
-  it('returns shots from dirs modified at/after sinceMtimeMs, attributed to the attempt', async () => {
-    const sinceMtimeMs = 1_000_000;
-    await makeDebugDir(
-      'attempt-dir',
-      ['screenshot-❌-1781186692250-(Login Flow).png', 'commands.json'],
-      sinceMtimeMs + 5_000
-    );
-
-    const shots = await harvestFailureScreenshotsAsync({
-      testsDirectory,
-      capturedSinceMs: sinceMtimeMs,
-      attemptIndex: 1,
-      logger,
-    });
-
-    expect(shots).toEqual([
-      {
-        fileAbsPath: path.join(
-          testsDirectory,
-          'attempt-dir',
-          'screenshot-❌-1781186692250-(Login Flow).png'
-        ),
-        displayName: 'Failure Screenshot: Login Flow (attempt 2)',
-        metadata: {
-          kind: 'maestro-test-screenshot',
-          flowName: 'Login Flow',
-          attemptIndex: 1,
-          capturedAtMs: 1781186692250,
-        },
-      },
-    ]);
-  });
-
-  it('ignores dirs older than sinceMtimeMs (previous attempts)', async () => {
-    const sinceMtimeMs = 1_000_000;
-    await makeDebugDir(
-      'old-dir',
-      ['screenshot-❌-1781186692250-(Old Flow).png'],
-      sinceMtimeMs - 5_000
-    );
-
-    const shots = await harvestFailureScreenshotsAsync({
-      testsDirectory,
-      capturedSinceMs: sinceMtimeMs,
-      attemptIndex: 0,
-      logger,
-    });
-
-    expect(shots).toEqual([]);
-  });
-
-  it('scans multiple new dirs (maestro <2.5.0 split-dir bug)', async () => {
-    const sinceMtimeMs = 1_000_000;
-    await makeDebugDir(
-      'dir-a',
-      [`screenshot-❌-${sinceMtimeMs + 100}-(Flow A).png`],
-      sinceMtimeMs + 1_000
-    );
-    await makeDebugDir(
-      'dir-b',
-      [`screenshot-❌-${sinceMtimeMs + 200}-(Flow B).png`],
-      sinceMtimeMs + 2_000
-    );
-
-    const shots = await harvestFailureScreenshotsAsync({
-      testsDirectory,
-      capturedSinceMs: sinceMtimeMs,
-      attemptIndex: 0,
-      logger,
-    });
-
-    expect(shots.map(shot => shot.metadata.flowName).sort()).toEqual(['Flow A', 'Flow B']);
-  });
-
-  it('keeps the disk flow name (slashes already substituted) and strips the shard prefix', async () => {
-    const sinceMtimeMs = 1_000_000;
-    await makeDebugDir(
-      'sharded-dir',
-      ['screenshot-shard-3-❌-1781186692250-(Login_Sub Flow).png'],
-      sinceMtimeMs + 1_000
-    );
-
-    const shots = await harvestFailureScreenshotsAsync({
-      testsDirectory,
-      capturedSinceMs: sinceMtimeMs,
-      attemptIndex: 0,
-      logger,
-    });
-
-    expect(shots).toHaveLength(1);
-    expect(shots[0].metadata.flowName).toBe('Login_Sub Flow');
-  });
-
-  it('ignores a stale screenshot whose capturedAtMs predates sinceMtimeMs (dir touched later)', async () => {
-    const sinceMtimeMs = 1_000_000;
-    // The dir mtime is AFTER this attempt started (so it passes the dir gate), but the
-    // screenshot inside was captured BEFORE it — a prior attempt's shot in a dir touched later.
-    await makeDebugDir(
-      'touched-dir',
-      ['screenshot-❌-999000-(Stale Flow).png'],
-      sinceMtimeMs + 5_000
-    );
-
-    const shots = await harvestFailureScreenshotsAsync({
-      testsDirectory,
-      capturedSinceMs: sinceMtimeMs,
-      attemptIndex: 1,
-      logger,
-    });
-
-    expect(shots).toEqual([]);
-  });
-
-  it('logs and returns [] when the tests dir cannot be read', async () => {
-    const shots = await harvestFailureScreenshotsAsync({
-      testsDirectory: path.join(testsDirectory, 'does-not-exist'),
-      capturedSinceMs: 0,
-      attemptIndex: 0,
-      logger,
-    });
-
-    expect(shots).toEqual([]);
-  });
-});
-
-describe(computePureFailureFlowNames, () => {
-  it('classifies a flow that failed every attempt as pure', () => {
-    const pure = computePureFailureFlowNames([
-      { name: 'Login Flow', status: 'failed' },
-      { name: 'Login Flow', status: 'failed' },
-    ]);
-    expect([...pure]).toEqual(['Login Flow']);
-  });
-
-  it('excludes a flaky flow (failed then passed)', () => {
-    const pure = computePureFailureFlowNames([
-      { name: 'Flaky Flow', status: 'failed' },
-      { name: 'Flaky Flow', status: 'passed' },
-    ]);
-    expect(pure.size).toBe(0);
-  });
-
-  it('excludes a fail-pass-fail flow (it passed at some point)', () => {
-    const pure = computePureFailureFlowNames([
-      { name: 'FPF', status: 'failed' },
-      { name: 'FPF', status: 'passed' },
-      { name: 'FPF', status: 'failed' },
-    ]);
-    expect(pure.size).toBe(0);
-  });
-
-  it('excludes a flow that only passed', () => {
-    expect(computePureFailureFlowNames([{ name: 'Happy', status: 'passed' }]).size).toBe(0);
-  });
-
-  it('normalizes the JUnit name to the screenshot form (/ -> _)', () => {
-    const pure = computePureFailureFlowNames([{ name: 'sub/Login', status: 'failed' }]);
-    expect([...pure]).toEqual(['sub_Login']);
-  });
-
-  it('excludes flows that collide only after / -> _ normalization (one failed, one passed)', () => {
-    const pure = computePureFailureFlowNames([
-      { name: 'sub/Login', status: 'failed' },
-      { name: 'sub_Login', status: 'passed' },
-    ]);
-    expect(pure.size).toBe(0);
-  });
-
-  it('returns an empty set for no testcases', () => {
-    expect(computePureFailureFlowNames([]).size).toBe(0);
-  });
-});
-
-describe(selectFailureScreenshots, () => {
-  function makeShot(flowName: string, attemptIndex: number): HarvestedScreenshot {
-    return {
-      fileAbsPath: `/tmp/${flowName}-${attemptIndex}.png`,
-      displayName: `Failure Screenshot: ${flowName} (attempt ${attemptIndex + 1})`,
-      metadata: {
-        kind: 'maestro-test-screenshot',
-        flowName,
-        attemptIndex,
-        capturedAtMs: 1_000 + attemptIndex,
-      },
-    };
-  }
-
-  it('keeps only the final attempt for a pure-failure flow', () => {
-    const shots = [makeShot('Pure', 0), makeShot('Pure', 1), makeShot('Pure', 2)];
-    const selected = selectFailureScreenshots(shots, new Set(['Pure']));
-    expect(selected.map(shot => shot.metadata.attemptIndex)).toEqual([2]);
-  });
-
-  it('keeps every attempt for a flow not classified pure (flaky)', () => {
-    const shots = [makeShot('Flaky', 0), makeShot('Flaky', 1)];
-    const selected = selectFailureScreenshots(shots, new Set());
-    expect(selected.map(shot => shot.metadata.attemptIndex)).toEqual([0, 1]);
-  });
-
-  it('reduces pure flows while preserving flaky flows and input order', () => {
-    const shots = [
-      makeShot('Pure', 0),
-      makeShot('Flaky', 0),
-      makeShot('Pure', 1),
-      makeShot('Flaky', 1),
-    ];
-    const selected = selectFailureScreenshots(shots, new Set(['Pure']));
-    expect(selected.map(shot => `${shot.metadata.flowName}#${shot.metadata.attemptIndex}`)).toEqual(
-      ['Flaky#0', 'Pure#1', 'Flaky#1']
-    );
-  });
-
-  it('keeps all when the pure set is empty', () => {
-    const shots = [makeShot('A', 0), makeShot('A', 1)];
-    expect(selectFailureScreenshots(shots, new Set())).toHaveLength(2);
-  });
-});

packages/build-tools/src/steps/functions/__tests__/maestroTests.test.ts

@@ -1,15 +1,10 @@
-import { GenericArtifactType, SystemError, UserError } from '@expo/eas-build-job';
+import { SystemError, UserError } from '@expo/eas-build-job';
 import spawn from '@expo/turtle-spawn';
-import fs from 'fs/promises';
-import os from 'os';
-import path from 'path';
 
 import { createGlobalContextMock } from '../../../__tests__/utils/context';
 import { createMockLogger } from '../../../__tests__/utils/logger';
-import { CustomBuildContext } from '../../../customBuildContext';
 import * as discovery from '../maestroFlowDiscovery';
 import * as parser from '../maestroResultParser';
-import * as maestroScreenshots from '../maestroScreenshots';
 import { createMaestroTestsBuildFunction } from '../maestroTests';
 
 jest.mock('@expo/turtle-spawn', () => ({
@@ -22,29 +17,7 @@ jest.mock('../../../utils/retry', () => ({
   sleepAsync: jest.fn().mockResolvedValue(undefined),
 }));
 
-// Partial mock: stub the harvest (filesystem) but keep the real reduction helpers
-// (computePureFailureFlowNames / selectFailureScreenshots) the step now calls post-loop.
-jest.mock('../maestroScreenshots', () => ({
-  ...jest.requireActual('../maestroScreenshots'),
-  harvestFailureScreenshotsAsync: jest.fn(),
-}));
-
 const mockedSpawn = jest.mocked(spawn);
-const mockedHarvest = jest.mocked(maestroScreenshots.harvestFailureScreenshotsAsync);
-const mockUploadArtifact = jest.fn();
-
-function makeShot(index: number): maestroScreenshots.HarvestedScreenshot {
-  return {
-    fileAbsPath: path.join(os.tmpdir(), `src-screenshot-${index}.png`),
-    displayName: 'Failure Screenshot: Login (attempt 1)',
-    metadata: {
-      kind: 'maestro-test-screenshot',
-      flowName: 'Login',
-      attemptIndex: 0,
-      capturedAtMs: 1781186692250,
-    },
-  };
-}
 
 const SPAWN_SUCCESS = {
   status: 0,
@@ -68,10 +41,7 @@ function createStep(
   ReturnType<typeof createMaestroTestsBuildFunction>['createBuildStepFromFunctionCall']
 > {
   const logger = createMockLogger();
-  const ctx = {
-    runtimeApi: { uploadArtifact: mockUploadArtifact },
-  } as unknown as CustomBuildContext;
-  const fn = createMaestroTestsBuildFunction(ctx);
+  const fn = createMaestroTestsBuildFunction();
   const globalCtx = createGlobalContextMock({ logger });
   globalCtx.updateEnv(options.env ?? { HOME: '/home/expo' });
   return fn.createBuildStepFromFunctionCall(globalCtx, { callInputs });
@@ -84,18 +54,10 @@ describe('createMaestroTestsBuildFunction', () => {
     // hit the real disk. Individual tests override this.
     jest.restoreAllMocks();
     jest.spyOn(parser, 'mergeJUnitReports').mockResolvedValue();
-    mockedHarvest.mockReset();
-    mockedHarvest.mockResolvedValue([]);
-    mockUploadArtifact.mockReset();
-    mockUploadArtifact.mockResolvedValue({ artifactId: 'artifact-1' });
   });
 
   it('exports a factory that returns a BuildFunction instance', () => {
-    expect(
-      createMaestroTestsBuildFunction({
-        runtimeApi: { uploadArtifact: mockUploadArtifact },
-      } as unknown as CustomBuildContext)
-    ).toBeDefined();
+    expect(createMaestroTestsBuildFunction()).toBeDefined();
   });
 
   it('sets all outputs before running any flows', async () => {
@@ -311,33 +273,6 @@ describe('createMaestroTestsBuildFunction', () => {
     );
   });
 
-  it('uses the file= path on reports that carry it, without scanning flow files', async () => {
-    mockedSpawn.mockRejectedValueOnce(rejectExit1()).mockResolvedValueOnce(SPAWN_SUCCESS);
-    jest.spyOn(parser, 'junitFileHasFileAttrs').mockResolvedValue(true);
-    const discoverySpy = jest.spyOn(discovery, 'buildFlowNameToPathMap');
-    const legacyParseSpy = jest.spyOn(parser, 'parseFailedFlowsFromJUnit');
-    const newParseSpy = jest
-      .spyOn(parser, 'parseFailedFlowsFromFileAttrs')
-      .mockResolvedValue(['flows/b.yaml']);
-
-    const step = createStep({
-      flow_path: ['flows/a.yaml', 'flows/b.yaml'],
-      retries: 1,
-      output_format: 'junit',
-      retry_failed_only: true,
-      platform: 'android',
-    });
-    await step.executeAsync();
-
-    expect(newParseSpy).toHaveBeenCalledTimes(1);
-    // The new branch needs no name→path map: no scan, no legacy parser.
-    expect(discoverySpy).not.toHaveBeenCalled();
-    expect(legacyParseSpy).not.toHaveBeenCalled();
-    const a1 = mockedSpawn.mock.calls[1][1]!;
-    expect(a1).toContain('flows/b.yaml');
-    expect(a1).not.toContain('flows/a.yaml');
-  });
-
   it('falls back to all-flows retry when nameToPath is null (duplicate flow names)', async () => {
     mockedSpawn.mockRejectedValueOnce(rejectExit1()).mockResolvedValueOnce(SPAWN_SUCCESS);
     jest.spyOn(discovery, 'buildFlowNameToPathMap').mockResolvedValue(null);
@@ -358,44 +293,6 @@ describe('createMaestroTestsBuildFunction', () => {
     );
   });
 
-  it('never scans flow files when all attempts succeed', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    const discoverySpy = jest.spyOn(discovery, 'buildFlowNameToPathMap');
-
-    const step = createStep({ flow_path: ['flows/a.yaml'], platform: 'android' });
-    await step.executeAsync();
-
-    expect(discoverySpy).not.toHaveBeenCalled();
-  });
-
-  it('memoizes the flow scan across retries (legacy reports)', async () => {
-    // Routing note: the step lands in the legacy arm because the real
-    // junitFileHasFileAttrs returns false — the attempt XML does not exist on
-    // the mock fs. Creating that file with file= attrs would flip the branch.
-    mockedSpawn
-      .mockRejectedValueOnce(rejectExit1())
-      .mockRejectedValueOnce(rejectExit1())
-      .mockResolvedValueOnce(SPAWN_SUCCESS);
-    const discoverySpy = jest
-      .spyOn(discovery, 'buildFlowNameToPathMap')
-      .mockResolvedValue(new Map([['a', 'flows/a.yaml']]));
-    const parseSpy = jest
-      .spyOn(parser, 'parseFailedFlowsFromJUnit')
-      .mockResolvedValue(['flows/a.yaml']);
-
-    const step = createStep({
-      flow_path: ['flows/a.yaml'],
-      retries: 2,
-      output_format: 'junit',
-      platform: 'android',
-    });
-    await step.executeAsync();
-
-    // Two failed attempts hit the legacy branch twice; the scan runs once.
-    expect(parseSpy).toHaveBeenCalledTimes(2);
-    expect(discoverySpy).toHaveBeenCalledTimes(1);
-  });
-
   it('defaults retry_failed_only to true when omitted from inputs', async () => {
     mockedSpawn.mockRejectedValueOnce(rejectExit1()).mockResolvedValueOnce(SPAWN_SUCCESS);
     jest.spyOn(parser, 'parseFailedFlowsFromJUnit').mockResolvedValue(['flows/b.yaml']);
@@ -742,149 +639,4 @@ describe('createMaestroTestsBuildFunction', () => {
     const step = createStep({ flow_path: ['a.yaml'], platform: 'android' }); // no shards
     await step.executeAsync(); // should succeed, not throw
   });
-
-  it('uploads harvested screenshots after the retry loop with metadata', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    const shot = makeShot(0);
-    await fs.writeFile(shot.fileAbsPath, '');
-    mockedHarvest.mockResolvedValue([shot]);
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-    await step.executeAsync();
-
-    expect(mockUploadArtifact).toHaveBeenCalledTimes(1);
-    expect(mockUploadArtifact).toHaveBeenCalledWith(
-      expect.objectContaining({
-        artifact: expect.objectContaining({
-          type: GenericArtifactType.OTHER,
-          name: shot.displayName,
-          metadata: shot.metadata,
-        }),
-      })
-    );
-  });
-
-  it('uploads screenshots even when all attempts fail, before throwing ERR_MAESTRO_TESTS_FAILED', async () => {
-    mockedSpawn.mockRejectedValue(rejectExit1());
-    const shot = makeShot(0);
-    await fs.writeFile(shot.fileAbsPath, '');
-    mockedHarvest.mockResolvedValue([shot]);
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-    await expect(step.executeAsync()).rejects.toThrow(UserError);
-
-    expect(mockUploadArtifact).toHaveBeenCalledTimes(1);
-  });
-
-  it('swallows upload errors without affecting the test verdict', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    const shot = makeShot(0);
-    await fs.writeFile(shot.fileAbsPath, '');
-    mockedHarvest.mockResolvedValue([shot]);
-    mockUploadArtifact.mockRejectedValue(new Error('upload boom'));
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-    await step.executeAsync();
-
-    expect(mockUploadArtifact).toHaveBeenCalledTimes(1);
-  });
-
-  it('skips screenshot upload but preserves the verdict when the JUnit re-parse throws', async () => {
-    mockedSpawn.mockRejectedValue(rejectExit1());
-    mockedHarvest.mockResolvedValue([makeShot(0)]);
-    jest.spyOn(parser, 'parseJUnitTestCases').mockRejectedValue(new Error('malformed junit'));
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-
-    // The classify throw is swallowed; the maestro failure verdict still surfaces.
-    await expect(step.executeAsync()).rejects.toThrow(UserError);
-    expect(mockUploadArtifact).not.toHaveBeenCalled();
-  });
-
-  it('skips screenshot upload but preserves the verdict when the staging dir cannot be created', async () => {
-    mockedSpawn.mockRejectedValue(rejectExit1());
-    mockedHarvest.mockResolvedValue([makeShot(0)]);
-    jest.spyOn(parser, 'parseJUnitTestCases').mockResolvedValue([]);
-    jest.spyOn(fs, 'mkdtemp').mockRejectedValue(new Error('no tmp space'));
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-
-    // mkdtemp failure is swallowed; the maestro failure verdict still surfaces.
-    await expect(step.executeAsync()).rejects.toThrow(UserError);
-    expect(mockUploadArtifact).not.toHaveBeenCalled();
-  });
-
-  it('caps uploads at 30 screenshots (excess dropped)', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    const shots = Array.from({ length: 35 }, (_, index) => makeShot(index));
-    await Promise.all(shots.map(shot => fs.writeFile(shot.fileAbsPath, '')));
-    mockedHarvest.mockResolvedValue(shots);
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-    await step.executeAsync();
-
-    expect(mockUploadArtifact).toHaveBeenCalledTimes(30);
-  });
-
-  it('does not harvest or upload screenshots when output_format is not junit', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'html' });
-    await step.executeAsync();
-
-    expect(mockedHarvest).not.toHaveBeenCalled();
-    expect(mockUploadArtifact).not.toHaveBeenCalled();
-  });
-
-  it('uploads only the final attempt for a pure-failure flow, but every attempt for a flaky flow', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    const tc = (name: string, status: 'passed' | 'failed'): parser.JUnitTestCaseResult => ({
-      name,
-      file: undefined,
-      status,
-      duration: 0,
-      errorMessage: null,
-      tags: [],
-      properties: {},
-    });
-    jest
-      .spyOn(parser, 'parseJUnitTestCases')
-      .mockResolvedValue([
-        tc('PureFlow', 'failed'),
-        tc('FlakyFlow', 'failed'),
-        tc('FlakyFlow', 'passed'),
-      ]);
-
-    const makeShotFor = (
-      flowName: string,
-      attemptIndex: number
-    ): maestroScreenshots.HarvestedScreenshot => ({
-      fileAbsPath: path.join(os.tmpdir(), `wiring-${flowName}-${attemptIndex}.png`),
-      displayName: `Failure Screenshot: ${flowName} (attempt ${attemptIndex + 1})`,
-      metadata: {
-        kind: 'maestro-test-screenshot',
-        flowName,
-        attemptIndex,
-        capturedAtMs: 1781186692250 + attemptIndex,
-      },
-    });
-    const shots = [
-      makeShotFor('PureFlow', 0),
-      makeShotFor('PureFlow', 1),
-      makeShotFor('FlakyFlow', 0),
-      makeShotFor('FlakyFlow', 1),
-    ];
-    await Promise.all(shots.map(shot => fs.writeFile(shot.fileAbsPath, '')));
-    mockedHarvest.mockResolvedValue(shots);
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-    await step.executeAsync();
-
-    // PureFlow keeps only its final attempt (1); FlakyFlow keeps every failed attempt.
-    // Uploads run concurrently, so compare the set, not the order.
-    const uploaded = mockUploadArtifact.mock.calls
-      .map(([arg]) => `${arg.artifact.metadata.flowName}#${arg.artifact.metadata.attemptIndex}`)
-      .sort();
-    expect(uploaded).toEqual(['FlakyFlow#0', 'FlakyFlow#1', 'PureFlow#1']);
-  });
 });

packages/build-tools/src/steps/functions/__tests__/repack.test.ts

@@ -27,7 +27,7 @@ describe(createRepackBuildFunction, () => {
     vol.reset();
   });
 
-  it('should set generated output path for successful repack', async () => {
+  it('should set the output path for successful repack', async () => {
     const repack = createRepackBuildFunction();
     const repackStep = repack.createBuildStepFromFunctionCall(
       createGlobalContextMock({
@@ -38,33 +38,14 @@ describe(createRepackBuildFunction, () => {
       {
         callInputs: {
           platform: 'ios',
-          source_app_path: '/path/to/source_app.ipa',
+          source_app_path: '/path/to/source_app',
+          output_path: '/path/to/output_app',
         },
       }
     );
 
     await repackStep.executeAsync();
-    expect(repackStep.outputById['output_path'].value).toMatch(/repacked-.*\.ipa$/);
-  });
-
-  it('should rename generated aab output path to apk', async () => {
-    const repack = createRepackBuildFunction();
-    const repackStep = repack.createBuildStepFromFunctionCall(
-      createGlobalContextMock({
-        staticContextContent: {
-          job: createTestAndroidJob(),
-        },
-      }),
-      {
-        callInputs: {
-          platform: 'android',
-          source_app_path: '/path/to/source_app.aab',
-        },
-      }
-    );
-
-    await repackStep.executeAsync();
-    expect(repackStep.outputById['output_path'].value).toMatch(/repacked-.*\.apk$/);
+    expect(repackStep.outputById['output_path'].value).toBe('/path/to/output_app');
   });
 
   it('should throw for unsupported platforms', async () => {

packages/build-tools/src/steps/functions/__tests__/reportMaestroTestResults.test.ts

@@ -3,7 +3,6 @@ import { vol } from 'memfs';
 
 import { createGlobalContextMock } from '../../../__tests__/utils/context';
 import { createMockLogger } from '../../../__tests__/utils/logger';
-import * as discovery from '../maestroFlowDiscovery';
 import { createReportMaestroTestResultsFunction } from '../reportMaestroTestResults';
 
 const JUNIT_PASS = [
@@ -44,24 +43,15 @@ describe(createReportMaestroTestResultsFunction, () => {
     } as unknown as Client;
   });
 
-  // Returns a mock logger whose child() is itself, so step-level log calls can
-  // be asserted on the returned object.
-  function createSelfChildedLogger(): ReturnType<typeof createMockLogger> {
-    const logger = createMockLogger();
-    (logger.child as jest.Mock).mockReturnValue(logger);
-    return logger;
-  }
-
   function createStep(overrides?: {
     callInputs?: Record<string, unknown>;
     staticContextContent?: Record<string, unknown>;
     env?: Record<string, string>;
-    logger?: ReturnType<typeof createMockLogger>;
   }) {
     const ctx = { graphqlClient: mockGraphqlClient };
     const fn = createReportMaestroTestResultsFunction(ctx as any);
     const globalCtx = createGlobalContextMock({
-      logger: overrides?.logger ?? createMockLogger(),
+      logger: createMockLogger(),
       projectTargetDirectory: '/root/project',
       staticContextContent: {
         expoApiServerURL: 'https://api.expo.test',
@@ -115,54 +105,6 @@ describe(createReportMaestroTestResultsFunction, () => {
     ]);
   });
 
-  it('reports both flows when two share a name but have distinct file= paths', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file="a/login.yaml" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="login" file="b/login.yaml" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    mockMutationFn.mockResolvedValue({
-      data: {
-        workflowDeviceTestCaseResult: {
-          createWorkflowDeviceTestCaseResults: [{ id: '1' }, { id: '2' }],
-        },
-      },
-    });
-    await createStep().executeAsync();
-    expect(mockGraphqlClient.mutation).toHaveBeenCalledTimes(1);
-    const [, variables] = (mockGraphqlClient.mutation as jest.Mock).mock.calls[0];
-    expect(variables.input.testCaseResults.map((r: any) => r.path).sort()).toEqual([
-      'a/login.yaml',
-      'b/login.yaml',
-    ]);
-  });
-
-  it('never scans flow files for a file= report, even when flow_path is provided', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file="flows/login.yaml" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const discoverySpy = jest.spyOn(discovery, 'buildFlowNameToPathMap');
-    mockMutationFn.mockResolvedValue({
-      data: {
-        workflowDeviceTestCaseResult: { createWorkflowDeviceTestCaseResults: [{ id: '1' }] },
-      },
-    });
-
-    await createStep({ callInputs: { flow_path: ['flows/login.yaml'] } }).executeAsync();
-
-    expect(mockGraphqlClient.mutation).toHaveBeenCalledTimes(1);
-    expect(discoverySpy).not.toHaveBeenCalled();
-  });
-
   it('sends tags and properties from JUnit XML', async () => {
     vol.fromJSON({
       '/junit/report.xml': [
@@ -279,7 +221,7 @@ describe(createReportMaestroTestResultsFunction, () => {
     await createStep().executeAsync();
   });
 
-  it('skips report when duplicate testcase names found (legacy), advising unique names', async () => {
+  it('skips report when duplicate testcase names found', async () => {
     vol.fromJSON({
       '/junit/report.xml': [
         '<?xml version="1.0"?>',
@@ -296,27 +238,8 @@ describe(createReportMaestroTestResultsFunction, () => {
       }),
     });
 
-    const logger = createSelfChildedLogger();
-    await createStep({ logger }).executeAsync();
+    await createStep().executeAsync();
     expect(mockGraphqlClient.mutation).not.toHaveBeenCalled();
-    expect(logger.error).toHaveBeenCalledWith(expect.stringContaining('unique name'));
-  });
-
-  it('skips report when the same flow file appears twice in one attempt, advising flow_path check', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file="flows/login.yaml" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="login" file="flows/login.yaml" status="SUCCESS" time="2.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-
-    const logger = createSelfChildedLogger();
-    await createStep({ logger }).executeAsync();
-    expect(mockGraphqlClient.mutation).not.toHaveBeenCalled();
-    expect(logger.error).toHaveBeenCalledWith(expect.stringContaining('flow_path entries'));
   });
 
   it('sends per-attempt results with same name but different retryCount', async () => {

packages/build-tools/src/steps/functions/__tests__/rolloutPosthogFlag.test.ts

@@ -1,443 +0,0 @@
-import fetch, { Response } from 'node-fetch';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { createRolloutPosthogFlagFunction } from '../rolloutPosthogFlag';
-
-jest.mock('@expo/logger');
-jest.mock('node-fetch');
-
-function jsonResponse(data: unknown, { ok = true, status = 200 } = {}): Response {
-  return {
-    ok,
-    status,
-    json: async () => data,
-    text: async () => JSON.stringify(data),
-  } as unknown as Response;
-}
-
-const ENV = {
-  POSTHOG_CLI_API_KEY: 'phx_test',
-  POSTHOG_CLI_PROJECT_ID: '123',
-  POSTHOG_CLI_HOST: 'https://us.posthog.com',
-};
-
-describe(createRolloutPosthogFlagFunction, () => {
-  const fetchMock = jest.mocked(fetch);
-  const rolloutFlag = createRolloutPosthogFlagFunction();
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  function createStep(
-    callInputs: Record<string, unknown>,
-    env: Record<string, string> = ENV
-  ): ReturnType<typeof rolloutFlag.createBuildStepFromFunctionCall> {
-    return rolloutFlag.createBuildStepFromFunctionCall(createGlobalContextMock({}), {
-      callInputs,
-      env,
-      id: rolloutFlag.id,
-    });
-  }
-
-  it('enables a flag by key', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [{ id: 42, key: 'my-flag', filters: {} }] }))
-      .mockResolvedValueOnce(jsonResponse({ id: 42 }));
-    const step = createStep({ flag: 'my-flag', active: 'true' });
-
-    await step.executeAsync();
-
-    const [patchUrl, patchInit] = fetchMock.mock.calls[1];
-    expect(patchUrl).toBe('https://us.posthog.com/api/projects/123/feature_flags/42/');
-    expect(patchInit?.method).toBe('PATCH');
-    expect(JSON.parse(patchInit?.body as string)).toEqual({ active: true });
-  });
-
-  it('sets rollout_percentage only on the catch-all group, preserving others', async () => {
-    fetchMock
-      .mockResolvedValueOnce(
-        jsonResponse({
-          results: [
-            {
-              id: 7,
-              key: 'gradual',
-              filters: {
-                groups: [
-                  { properties: [{ key: 'is_internal' }], rollout_percentage: 100 },
-                  { properties: [], rollout_percentage: 5 },
-                ],
-              },
-            },
-          ],
-        })
-      )
-      .mockResolvedValueOnce(jsonResponse({ id: 7 }));
-    const step = createStep({ flag: 'gradual', rollout_percentage: '50' });
-
-    await step.executeAsync();
-
-    const patchBody = JSON.parse(fetchMock.mock.calls[1][1]?.body as string);
-    expect(patchBody.filters.groups).toEqual([
-      { properties: [{ key: 'is_internal' }], rollout_percentage: 100 },
-      { properties: [], rollout_percentage: 50 },
-    ]);
-  });
-
-  it('creates a catch-all group when the flag has none', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [{ id: 8, key: 'bare', filters: {} }] }))
-      .mockResolvedValueOnce(jsonResponse({ id: 8 }));
-    const step = createStep({ flag: 'bare', rollout_percentage: '25' });
-
-    await step.executeAsync();
-
-    const patchBody = JSON.parse(fetchMock.mock.calls[1][1]?.body as string);
-    expect(patchBody.filters.groups).toEqual([{ properties: [], rollout_percentage: 25 }]);
-  });
-
-  it('falls back to the first group with a warning when no catch-all exists', async () => {
-    fetchMock
-      .mockResolvedValueOnce(
-        jsonResponse({
-          results: [
-            {
-              id: 9,
-              key: 'scoped',
-              filters: { groups: [{ properties: [{ key: 'is_internal' }] }] },
-            },
-          ],
-        })
-      )
-      .mockResolvedValueOnce(jsonResponse({ id: 9 }));
-    const step = createStep({ flag: 'scoped', rollout_percentage: '10' });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await step.executeAsync();
-
-    const patchBody = JSON.parse(fetchMock.mock.calls[1][1]?.body as string);
-    expect(patchBody.filters.groups).toEqual([
-      { properties: [{ key: 'is_internal' }], rollout_percentage: 10 },
-    ]);
-    expect(warnMock).toHaveBeenCalledWith(expect.stringMatching(/no catch-all/));
-  });
-
-  it('throws when the flag key does not exist', async () => {
-    fetchMock.mockResolvedValueOnce(jsonResponse({ results: [{ id: 1, key: 'other-flag' }] }));
-    const step = createStep({ flag: 'missing-flag', active: 'true' });
-
-    await expect(step.executeAsync()).rejects.toThrow(
-      /No PostHog feature flag with key "missing-flag"/
-    );
-  });
-
-  it('throws on a 403 even when ignore_error is set', async () => {
-    fetchMock.mockResolvedValueOnce(jsonResponse({}, { ok: false, status: 403 }));
-    const step = createStep({ flag: 'my-flag', active: 'true', ignore_error: true });
-
-    await expect(step.executeAsync()).rejects.toThrow(/forbidden \(403\)/);
-  });
-
-  it('throws when none of active, rollout_percentage, or payload is provided', async () => {
-    const step = createStep({ flag: 'my-flag' });
-
-    await expect(step.executeAsync()).rejects.toThrow(
-      /"active", "rollout_percentage", or "payload"/
-    );
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  it('sets a boolean-flag payload under the "true" key as a JSON string', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [{ id: 42, key: 'my-flag', filters: {} }] }))
-      .mockResolvedValueOnce(jsonResponse({ id: 42 }));
-    const step = createStep({ flag: 'my-flag', payload: { color: 'blue', count: 3 } });
-
-    await step.executeAsync();
-
-    const patchBody = JSON.parse(fetchMock.mock.calls[1][1]?.body as string);
-    expect(patchBody.filters.payloads).toEqual({ true: '{"color":"blue","count":3}' });
-  });
-
-  it('keys the payload under a given variant', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [{ id: 42, key: 'my-flag', filters: {} }] }))
-      .mockResolvedValueOnce(jsonResponse({ id: 42 }));
-    const step = createStep({ flag: 'my-flag', payload: { v: 1 }, variant: 'control' });
-
-    await step.executeAsync();
-
-    const patchBody = JSON.parse(fetchMock.mock.calls[1][1]?.body as string);
-    expect(patchBody.filters.payloads).toEqual({ control: '{"v":1}' });
-  });
-
-  it('sets rollout_percentage and payload together in one filters object', async () => {
-    fetchMock
-      .mockResolvedValueOnce(
-        jsonResponse({
-          results: [{ id: 7, key: 'my-flag', filters: { groups: [{ properties: [] }] } }],
-        })
-      )
-      .mockResolvedValueOnce(jsonResponse({ id: 7 }));
-    const step = createStep({ flag: 'my-flag', rollout_percentage: 25, payload: { a: 1 } });
-
-    await step.executeAsync();
-
-    const patchBody = JSON.parse(fetchMock.mock.calls[1][1]?.body as string);
-    expect(patchBody.filters.groups[0].rollout_percentage).toBe(25);
-    expect(patchBody.filters.payloads).toEqual({ true: '{"a":1}' });
-  });
-
-  it('surfaces the PostHog error detail on a failed update', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [{ id: 42, key: 'my-flag', filters: {} }] }))
-      .mockResolvedValueOnce(
-        jsonResponse(
-          { type: 'validation_error', detail: 'Variant control does not exist' },
-          { ok: false, status: 400 }
-        )
-      );
-    const step = createStep({ flag: 'my-flag', active: 'true' });
-
-    await expect(step.executeAsync()).rejects.toThrow(
-      /failed with status 400: Variant control does not exist/
-    );
-  });
-
-  it('falls back to the raw body when the error body is not JSON', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [{ id: 42, key: 'my-flag', filters: {} }] }))
-      .mockResolvedValueOnce({
-        ok: false,
-        status: 502,
-        text: async () => 'Bad Gateway',
-      } as unknown as Response);
-    const step = createStep({ flag: 'my-flag', active: 'true' });
-
-    await expect(step.executeAsync()).rejects.toThrow(/failed with status 502: Bad Gateway/);
-  });
-
-  it('warns and skips when the flag is not found and ignore_error is set', async () => {
-    fetchMock.mockResolvedValueOnce(jsonResponse({ results: [] }));
-    const step = createStep({ flag: 'missing-flag', active: 'true', ignore_error: true });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      expect.stringMatching(/No PostHog feature flag with key "missing-flag"/)
-    );
-  });
-
-  it('throws on an out-of-range rollout_percentage', async () => {
-    const step = createStep({ flag: 'my-flag', rollout_percentage: '150' });
-
-    await expect(step.executeAsync()).rejects.toThrow(/between 0 and 100/);
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  it('throws when credentials are missing by default', async () => {
-    const step = createStep({ flag: 'my-flag', active: 'true' }, {});
-
-    await expect(step.executeAsync()).rejects.toThrow(
-      /Missing PostHog credentials: personal API key, project id/
-    );
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  it('warns and skips on missing credentials when ignore_error is set', async () => {
-    const step = createStep({ flag: 'my-flag', active: 'true', ignore_error: true }, {});
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await step.executeAsync();
-
-    expect(fetchMock).not.toHaveBeenCalled();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      expect.stringMatching(/Ignoring error\.$/)
-    );
-  });
-
-  it('throws on a failed update by default', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [{ id: 42, key: 'my-flag', filters: {} }] }))
-      .mockResolvedValueOnce(jsonResponse({}, { ok: false, status: 500 }));
-    const step = createStep({ flag: 'my-flag', active: 'true' });
-
-    await expect(step.executeAsync()).rejects.toThrow(/failed with status 500/);
-  });
-
-  it('warns and skips on a failed update when ignore_error is set', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [{ id: 42, key: 'my-flag', filters: {} }] }))
-      .mockResolvedValueOnce(jsonResponse({}, { ok: false, status: 500 }));
-    const step = createStep({ flag: 'my-flag', active: 'true', ignore_error: true });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      'Updating PostHog flag "my-flag" failed with status 500: {}. Ignoring error.'
-    );
-  });
-
-  it('warns and skips on a lookup network error when ignore_error is set', async () => {
-    fetchMock.mockRejectedValueOnce(new Error('ECONNRESET'));
-    const step = createStep({ flag: 'my-flag', active: 'true', ignore_error: true });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      'Looking up PostHog flag "my-flag" failed. Ignoring error.'
-    );
-  });
-
-  it('warns and skips on a non-object lookup response when ignore_error is set', async () => {
-    fetchMock.mockResolvedValueOnce(jsonResponse('not-json-object'));
-    const step = createStep({ flag: 'my-flag', active: 'true', ignore_error: true });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await step.executeAsync();
-
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.anything() },
-      expect.stringMatching(/unexpected response/)
-    );
-  });
-
-  it('warns and skips on an unexpected lookup response when ignore_error is set', async () => {
-    fetchMock.mockResolvedValueOnce(jsonResponse({ nope: true }));
-    const step = createStep({ flag: 'my-flag', active: 'true', ignore_error: true });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await step.executeAsync();
-
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.anything() },
-      expect.stringMatching(/unexpected response/)
-    );
-  });
-
-  it('ignores malformed entries in the lookup results', async () => {
-    fetchMock
-      .mockResolvedValueOnce(
-        jsonResponse({ results: ['junk', null, { id: 42, key: 'my-flag', filters: {} }] })
-      )
-      .mockResolvedValueOnce(jsonResponse({ id: 42 }));
-    const step = createStep({ flag: 'my-flag', active: 'true' });
-
-    await step.executeAsync();
-
-    expect(fetchMock).toHaveBeenCalledTimes(2);
-  });
-
-  it('throws on a failed lookup by default', async () => {
-    fetchMock.mockResolvedValueOnce(jsonResponse({}, { ok: false, status: 500 }));
-    const step = createStep({ flag: 'my-flag', active: 'true' });
-
-    await expect(step.executeAsync()).rejects.toThrow(
-      /Looking up PostHog flag "my-flag" failed with status 500/
-    );
-  });
-
-  it('warns and skips on a failed lookup when ignore_error is set', async () => {
-    fetchMock.mockResolvedValueOnce(jsonResponse({}, { ok: false, status: 500 }));
-    const step = createStep({ flag: 'my-flag', active: 'true', ignore_error: true });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      'Looking up PostHog flag "my-flag" failed with status 500: {}. Ignoring error.'
-    );
-    expect(fetchMock).toHaveBeenCalledTimes(1);
-  });
-
-  it('warns and skips on an update network error when ignore_error is set', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [{ id: 42, key: 'my-flag', filters: {} }] }))
-      .mockRejectedValueOnce(new Error('ECONNRESET'));
-    const step = createStep({ flag: 'my-flag', active: 'true', ignore_error: true });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      'Updating PostHog flag "my-flag" failed. Ignoring error.'
-    );
-  });
-
-  it('throws on a 403 update even when ignore_error is set', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [{ id: 42, key: 'my-flag', filters: {} }] }))
-      .mockResolvedValueOnce(jsonResponse({}, { ok: false, status: 403 }));
-    const step = createStep({ flag: 'my-flag', active: 'true', ignore_error: true });
-
-    await expect(step.executeAsync()).rejects.toThrow(/feature_flag:write/);
-  });
-
-  it('debugs the underlying error before throwing on a network failure by default', async () => {
-    fetchMock.mockRejectedValueOnce(new Error('ECONNRESET'));
-    const step = createStep({ flag: 'my-flag', active: 'true' });
-    const debugMock = jest.spyOn(step.ctx.logger, 'debug');
-
-    await expect(step.executeAsync()).rejects.toThrow(/Looking up PostHog flag "my-flag" failed/);
-    expect(debugMock).toHaveBeenCalled();
-  });
-
-  it('throws on an invalid JSON lookup response by default', async () => {
-    fetchMock.mockResolvedValueOnce({
-      ok: true,
-      status: 200,
-      json: async () => {
-        throw new Error('unexpected token');
-      },
-    } as unknown as Response);
-    const step = createStep({ flag: 'my-flag', active: 'true' });
-
-    await expect(step.executeAsync()).rejects.toThrow(/returned an unexpected response/);
-  });
-
-  it('warns and skips on an invalid JSON lookup response when ignore_error is set', async () => {
-    fetchMock.mockResolvedValueOnce({
-      ok: true,
-      status: 200,
-      json: async () => {
-        throw new Error('unexpected token');
-      },
-    } as unknown as Response);
-    const step = createStep({ flag: 'my-flag', active: 'true', ignore_error: true });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      'PostHog flag lookup for "my-flag" returned an unexpected response. Ignoring error.'
-    );
-  });
-
-  it('throws on a non-integer rollout_percentage', async () => {
-    const step = createStep({ flag: 'my-flag', rollout_percentage: 25.5 });
-
-    await expect(step.executeAsync()).rejects.toThrow(/must be an integer between 0 and 100/);
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  it('falls back to the default host when POSTHOG_CLI_HOST is unset', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [{ id: 42, key: 'my-flag', filters: {} }] }))
-      .mockResolvedValueOnce(jsonResponse({ id: 42 }));
-    const step = createStep(
-      { flag: 'my-flag', active: 'true' },
-      { POSTHOG_CLI_API_KEY: 'phx_test', POSTHOG_CLI_PROJECT_ID: '123' }
-    );
-
-    await step.executeAsync();
-
-    const [searchUrl] = fetchMock.mock.calls[0];
-    expect(searchUrl).toBe(
-      'https://us.posthog.com/api/projects/123/feature_flags/?limit=200&search=my-flag'
-    );
-  });
-});

packages/build-tools/src/steps/functions/__tests__/startArgentRemoteSession.test.ts

@@ -1,145 +0,0 @@
-import { SystemError } from '@expo/eas-build-job';
-import { type bunyan } from '@expo/logger';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-
-import {
-  MIN_ARGENT_REMOTE_SESSION_VERSION,
-  waitForArgentToolServerStateAsync,
-  warnIfArgentPackageVersionCannotBeVerified,
-} from '../startArgentRemoteSession';
-
-describe(warnIfArgentPackageVersionCannotBeVerified, () => {
-  const warn = jest.fn();
-  const logger = { warn } as unknown as bunyan;
-  const supportedVersion = '999.0.0';
-  const oldVersion = '0.0.0';
-
-  beforeEach(() => {
-    warn.mockClear();
-  });
-
-  it('allows the default latest package version', () => {
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: undefined, logger })
-    ).not.toThrow();
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: 'latest', logger })
-    ).not.toThrow();
-    expect(warn).not.toHaveBeenCalled();
-  });
-
-  it('allows exact supported semver versions', () => {
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({
-        packageVersion: MIN_ARGENT_REMOTE_SESSION_VERSION,
-        logger,
-      })
-    ).not.toThrow();
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: supportedVersion, logger })
-    ).not.toThrow();
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({
-        packageVersion: `v${supportedVersion}`,
-        logger,
-      })
-    ).not.toThrow();
-    expect(warn).not.toHaveBeenCalled();
-  });
-
-  it('rejects exact semver versions that are too old', () => {
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: oldVersion, logger })
-    ).toThrow(SystemError);
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: oldVersion, logger })
-    ).toThrow(`Use "latest" or pass an exact version >= ${MIN_ARGENT_REMOTE_SESSION_VERSION}`);
-  });
-
-  it('warns for package tags or ranges that cannot be verified', () => {
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: 'next', logger })
-    ).not.toThrow();
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({
-        packageVersion: `^${MIN_ARGENT_REMOTE_SESSION_VERSION}`,
-        logger,
-      })
-    ).not.toThrow();
-    expect(warn).toHaveBeenCalledTimes(2);
-    expect(warn).toHaveBeenCalledWith(
-      expect.stringContaining('Continuing and letting bunx resolve it.')
-    );
-  });
-});
-
-describe(waitForArgentToolServerStateAsync, () => {
-  let stateDir: string;
-
-  beforeEach(async () => {
-    stateDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'argent-state-test-'));
-  });
-
-  afterEach(async () => {
-    await fs.promises.rm(stateDir, { recursive: true, force: true });
-  });
-
-  function stateJson({ port, pid, token }: { port: number; pid: number; token?: string }): string {
-    return JSON.stringify({ port, pid, token });
-  }
-
-  it.each(['tool-server.json', 'tool-server-012345abcdef.json'])(
-    'reads a matching process from %s',
-    async fileName => {
-      await fs.promises.writeFile(
-        path.join(stateDir, fileName),
-        stateJson({ port: 4321, pid: process.pid, token: 'secret' })
-      );
-
-      await expect(
-        waitForArgentToolServerStateAsync({
-          stateDir,
-          ancestorPid: process.ppid,
-          timeoutMs: 100,
-          pollIntervalMs: 1,
-        })
-      ).resolves.toEqual({ port: 4321, pid: process.pid, token: 'secret' });
-    }
-  );
-
-  it('selects the state whose pid belongs to the launched process tree', async () => {
-    await fs.promises.writeFile(
-      path.join(stateDir, 'tool-server-111111111111.json'),
-      stateJson({ port: 1111, pid: Number.MAX_SAFE_INTEGER })
-    );
-    await fs.promises.writeFile(
-      path.join(stateDir, 'tool-server-222222222222.json'),
-      stateJson({ port: 2222, pid: process.pid })
-    );
-
-    await expect(
-      waitForArgentToolServerStateAsync({
-        stateDir,
-        ancestorPid: process.ppid,
-        timeoutMs: 100,
-        pollIntervalMs: 1,
-      })
-    ).resolves.toEqual({ port: 2222, pid: process.pid });
-  });
-
-  it('does not return a state file outside the launched process tree', async () => {
-    const filePath = path.join(stateDir, 'tool-server-012345abcdef.json');
-    await fs.promises.writeFile(filePath, stateJson({ port: 1111, pid: Number.MAX_SAFE_INTEGER }));
-
-    await expect(
-      waitForArgentToolServerStateAsync({
-        stateDir,
-        ancestorPid: process.pid,
-        timeoutMs: 10,
-        pollIntervalMs: 1,
-      })
-    ).rejects.toThrow(`state file belonging to process ${process.pid}`);
-  });
-});

packages/build-tools/src/steps/functions/__tests__/startIosSimulator.test.ts

@@ -1,121 +0,0 @@
-import spawn from '@expo/turtle-spawn';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { createMockLogger } from '../../../__tests__/utils/logger';
-import { IosSimulatorUtils } from '../../../utils/IosSimulatorUtils';
-import { createStartIosSimulatorBuildFunction } from '../startIosSimulator';
-
-jest.mock('@expo/turtle-spawn', () => ({
-  __esModule: true,
-  default: jest.fn(),
-}));
-
-jest.mock('../../../utils/IosSimulatorUtils', () => ({
-  IosSimulatorUtils: {
-    getAvailableDevicesAsync: jest.fn(),
-    getDeviceAsync: jest.fn(),
-    cloneAsync: jest.fn(),
-    enableAccessibilitySettingsAsync: jest.fn(),
-    startAsync: jest.fn(),
-    waitForReadyAsync: jest.fn(),
-    disableApsdAsync: jest.fn(),
-  },
-}));
-
-const mockedSpawn = jest.mocked(spawn);
-const mockedUtils = jest.mocked(IosSimulatorUtils);
-
-function createStep(callInputs?: Record<string, unknown>) {
-  const logger = createMockLogger();
-  const fn = createStartIosSimulatorBuildFunction();
-  const globalCtx = createGlobalContextMock({ logger });
-  const step = fn.createBuildStepFromFunctionCall(globalCtx, { callInputs });
-  return Object.assign(step, { logger });
-}
-
-describe(createStartIosSimulatorBuildFunction, () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockedSpawn.mockResolvedValue({ stdout: '', stderr: '' } as any);
-    mockedUtils.getAvailableDevicesAsync.mockResolvedValue([]);
-    mockedUtils.getDeviceAsync.mockResolvedValue(null);
-    mockedUtils.cloneAsync.mockResolvedValue(undefined);
-    mockedUtils.enableAccessibilitySettingsAsync.mockResolvedValue(undefined);
-    mockedUtils.startAsync.mockResolvedValue({ udid: 'test-udid' as any });
-    mockedUtils.waitForReadyAsync.mockResolvedValue(undefined);
-    mockedUtils.disableApsdAsync.mockResolvedValue(undefined);
-  });
-
-  it('does not enable accessibility settings by default', async () => {
-    await createStep({ device_identifier: 'iPhone 15' }).executeAsync();
-
-    expect(mockedUtils.enableAccessibilitySettingsAsync).not.toHaveBeenCalled();
-    expect(mockedUtils.startAsync).toHaveBeenCalledWith({
-      deviceIdentifier: 'iPhone 15',
-      env: expect.any(Object),
-    });
-  });
-
-  it('enables accessibility settings before starting the main device and every clone when requested', async () => {
-    mockedUtils.startAsync
-      .mockResolvedValueOnce({ udid: 'base' as any })
-      .mockResolvedValueOnce({ udid: 'clone-1' as any })
-      .mockResolvedValueOnce({ udid: 'clone-2' as any });
-
-    await createStep({
-      device_identifier: 'iPhone 15',
-      count: 2,
-      enable_accessibility_settings: true,
-    }).executeAsync();
-
-    expect(mockedUtils.enableAccessibilitySettingsAsync).toHaveBeenCalledWith({
-      deviceIdentifier: 'iPhone 15',
-      env: expect.any(Object),
-    });
-    expect(mockedUtils.enableAccessibilitySettingsAsync).toHaveBeenCalledWith({
-      deviceIdentifier: 'eas-simulator-1',
-      env: expect.any(Object),
-    });
-    expect(mockedUtils.enableAccessibilitySettingsAsync).toHaveBeenCalledWith({
-      deviceIdentifier: 'eas-simulator-2',
-      env: expect.any(Object),
-    });
-    for (const [callIndex] of mockedUtils.startAsync.mock.calls.entries()) {
-      const enableCallOrder =
-        mockedUtils.enableAccessibilitySettingsAsync.mock.invocationCallOrder[callIndex];
-      const startCallOrder = mockedUtils.startAsync.mock.invocationCallOrder[callIndex];
-      expect(enableCallOrder).toBeLessThan(startCallOrder);
-    }
-  });
-
-  it('disables apsd on the main device and every clone', async () => {
-    mockedUtils.startAsync
-      .mockResolvedValueOnce({ udid: 'base' as any })
-      .mockResolvedValueOnce({ udid: 'clone-1' as any })
-      .mockResolvedValueOnce({ udid: 'clone-2' as any });
-
-    await createStep({ device_identifier: 'iPhone 15', count: 2 }).executeAsync();
-
-    expect(mockedUtils.disableApsdAsync).toHaveBeenCalledWith({
-      udid: 'base',
-      env: expect.any(Object),
-    });
-    expect(mockedUtils.disableApsdAsync).toHaveBeenCalledWith({
-      udid: 'clone-1',
-      env: expect.any(Object),
-    });
-    expect(mockedUtils.disableApsdAsync).toHaveBeenCalledWith({
-      udid: 'clone-2',
-      env: expect.any(Object),
-    });
-  });
-
-  it('continues when disabling apsd fails', async () => {
-    mockedUtils.disableApsdAsync.mockRejectedValue(new Error('apsd disable failed'));
-
-    await createStep({ device_identifier: 'iPhone 15', count: 2 }).executeAsync();
-
-    // Startup is not aborted: readiness is still awaited for each device.
-    expect(mockedUtils.waitForReadyAsync).toHaveBeenCalled();
-  });
-});

packages/build-tools/src/steps/functions/__tests__/uploadArtifact.test.ts

@@ -120,44 +120,4 @@ describe(createUploadArtifactBuildFunction, () => {
     const typeInput = buildStep.inputs?.find(input => input.id === 'type')!;
     expect(typeInput.isRawValueOneOfAllowedValues()).toBe(false);
   });
-
-  it('passes the metadata input through to runtimeApi.uploadArtifact', async () => {
-    contextUploadArtifact.mockClear();
-    const metadata = { kind: 'screen-recording', startedAtMs: '123', device: 'emulator-5554' };
-    const buildStep = uploadArtifact.createBuildStepFromFunctionCall(createGlobalContextMock({}), {
-      callInputs: {
-        // Generic ('other') artifact: only generic artifacts persist metadata in the worker
-        // (the managed-type upload paths drop it), so that's the type metadata is meant for.
-        type: 'other',
-        key: 'Screen Recording',
-        path: '/',
-        metadata,
-      },
-    });
-
-    await buildStep.executeAsync();
-
-    expect(contextUploadArtifact).toHaveBeenCalledWith(
-      expect.objectContaining({ artifact: expect.objectContaining({ metadata }) })
-    );
-  });
-
-  it('does not attach metadata to managed artifact types (the worker drops it)', async () => {
-    contextUploadArtifact.mockClear();
-    const buildStep = uploadArtifact.createBuildStepFromFunctionCall(createGlobalContextMock({}), {
-      callInputs: {
-        type: 'build-artifact',
-        path: '/',
-        metadata: { kind: 'screen-recording' },
-      },
-    });
-
-    await buildStep.executeAsync();
-
-    expect(contextUploadArtifact).toHaveBeenCalledWith(
-      expect.objectContaining({
-        artifact: expect.not.objectContaining({ metadata: expect.anything() }),
-      })
-    );
-  });
 });

packages/build-tools/src/steps/functions/__tests__/uploadDeviceRunSessionScreenRecordings.test.ts

@@ -1,146 +0,0 @@
-import { BuildRuntimePlatform } from '@expo/steps';
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import path from 'node:path';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { type CustomBuildContext } from '../../../customBuildContext';
-import { uploadDeviceRunSessionArtifactAsync } from '../../utils/deviceRunSessionArtifacts';
-import { createUploadDeviceRunSessionScreenRecordingsBuildFunction } from '../uploadDeviceRunSessionScreenRecordings';
-
-jest.mock('../../utils/deviceRunSessionArtifacts', () => ({
-  uploadDeviceRunSessionArtifactAsync: jest.fn(),
-}));
-
-const SIMULATOR_UDID = '01234567-89AB-CDEF-0123-456789ABCDEF';
-const SECOND_SIMULATOR_UDID = 'FEDCBA98-7654-3210-FEDC-BA9876543210';
-
-describe(createUploadDeviceRunSessionScreenRecordingsBuildFunction, () => {
-  beforeEach(() => {
-    jest
-      .mocked(uploadDeviceRunSessionArtifactAsync)
-      .mockReset()
-      .mockImplementation(async (_ctx, { stream }) => {
-        await new Promise<void>((resolve, reject) => {
-          stream.once('end', resolve);
-          stream.once('error', reject);
-          stream.resume();
-        });
-      });
-  });
-
-  it('uploads simulator device metadata', async () => {
-    const recordingDirectory = await fs.mkdtemp(path.join(os.tmpdir(), 'ios-recording-test-'));
-    const recordingPath = path.join(recordingDirectory, 'recording.mp4');
-    await fs.writeFile(recordingPath, 'recording');
-    await fs.writeFile(
-      path.join(recordingDirectory, 'session.json'),
-      JSON.stringify({
-        recording: path.basename(recordingPath),
-        firstFrameWallClock: { iso8601: '2026-07-10T10:00:00.000Z' },
-        width: 1179,
-        height: 2556,
-      })
-    );
-
-    try {
-      const globalContext = createGlobalContextMock({
-        runtimePlatform: BuildRuntimePlatform.DARWIN,
-      });
-      const buildStep = createUploadDeviceRunSessionScreenRecordingsBuildFunction(
-        {} as CustomBuildContext
-      ).createBuildStepFromFunctionCall(globalContext, {
-        env: { DEVICE_RUN_SESSION_ID: 'device-run-session-id' },
-        callInputs: {
-          recordings_json: [
-            {
-              udid: SIMULATOR_UDID,
-              deviceName: 'iPhone 16',
-              runtimeDisplayName: 'iOS 18.6',
-              directory: recordingDirectory,
-            },
-          ],
-        },
-      });
-
-      await buildStep.executeAsync();
-
-      expect(uploadDeviceRunSessionArtifactAsync).toHaveBeenCalledWith(
-        expect.anything(),
-        expect.objectContaining({
-          name: 'iPhone 16 screen recording (01234567-…, started at Jul 10, 2026, 10:00:00.000 UTC)',
-          metadata: {
-            __eas_type: 'screen-recording',
-            __eas_screen_recording: '1',
-            udid: SIMULATOR_UDID,
-            deviceName: 'iPhone 16',
-            runtimeDisplayName: 'iOS 18.6',
-            firstFrameAt: '2026-07-10T10:00:00.000Z',
-            width: 1179,
-            height: 2556,
-          },
-        })
-      );
-    } finally {
-      await fs.rm(recordingDirectory, { recursive: true, force: true });
-    }
-  });
-
-  it('uses unique names for recordings from rebooted and same-model simulators', async () => {
-    const recordingDirectories = await Promise.all(
-      ['2026-07-10T10:00:00.000Z', '2026-07-10T10:05:00.000Z', '2026-07-10T10:00:00.000Z'].map(
-        async firstFrameAt => {
-          const directory = await fs.mkdtemp(path.join(os.tmpdir(), 'ios-recording-test-'));
-          await fs.writeFile(path.join(directory, 'recording.mp4'), 'recording');
-          await fs.writeFile(
-            path.join(directory, 'session.json'),
-            JSON.stringify({
-              recording: 'recording.mp4',
-              firstFrameWallClock: { iso8601: firstFrameAt },
-              width: 1179,
-              height: 2556,
-            })
-          );
-          return directory;
-        }
-      )
-    );
-
-    try {
-      const globalContext = createGlobalContextMock({
-        runtimePlatform: BuildRuntimePlatform.DARWIN,
-      });
-      const buildStep = createUploadDeviceRunSessionScreenRecordingsBuildFunction(
-        {} as CustomBuildContext
-      ).createBuildStepFromFunctionCall(globalContext, {
-        env: { DEVICE_RUN_SESSION_ID: 'device-run-session-id' },
-        callInputs: {
-          recordings_json: recordingDirectories.map((directory, index) => ({
-            udid: index === 2 ? SECOND_SIMULATOR_UDID : SIMULATOR_UDID,
-            deviceName: 'iPhone 16',
-            runtimeDisplayName: 'iOS 18.6',
-            directory,
-          })),
-        },
-      });
-
-      await buildStep.executeAsync();
-
-      const names = jest
-        .mocked(uploadDeviceRunSessionArtifactAsync)
-        .mock.calls.map(([, options]) => options.name);
-      expect(names).toEqual(
-        expect.arrayContaining([
-          'iPhone 16 screen recording (01234567-…, started at Jul 10, 2026, 10:00:00.000 UTC)',
-          'iPhone 16 screen recording (01234567-…, started at Jul 10, 2026, 10:05:00.000 UTC)',
-          'iPhone 16 screen recording (FEDCBA98-…, started at Jul 10, 2026, 10:00:00.000 UTC)',
-        ])
-      );
-      expect(new Set(names).size).toBe(3);
-    } finally {
-      await Promise.all(
-        recordingDirectories.map(directory => fs.rm(directory, { recursive: true, force: true }))
-      );
-    }
-  });
-});

packages/build-tools/src/steps/functions/__tests__/uploadPosthogSourcemaps.test.ts

@@ -1,144 +0,0 @@
-import { PipeMode } from '@expo/logger';
-import spawn from '@expo/turtle-spawn';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { createUploadPosthogSourcemapsFunction } from '../uploadPosthogSourcemaps';
-
-jest.mock('@expo/logger');
-jest.mock('@expo/turtle-spawn');
-
-const spawnMock = jest.mocked(spawn);
-
-const ENV = {
-  POSTHOG_CLI_API_KEY: 'phx_test',
-  POSTHOG_CLI_PROJECT_ID: '123',
-  POSTHOG_CLI_HOST: 'https://us.posthog.com',
-};
-
-describe(createUploadPosthogSourcemapsFunction, () => {
-  const uploadSourcemaps = createUploadPosthogSourcemapsFunction();
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  function createStep(
-    callInputs: Record<string, unknown> = {},
-    env: Record<string, string> = ENV
-  ): ReturnType<typeof uploadSourcemaps.createBuildStepFromFunctionCall> {
-    return uploadSourcemaps.createBuildStepFromFunctionCall(createGlobalContextMock({}), {
-      callInputs,
-      env,
-      id: uploadSourcemaps.id,
-    });
-  }
-
-  it('runs @posthog/cli hermes upload with the resolved credentials and host', async () => {
-    spawnMock.mockResolvedValue({ stdout: '', stderr: '' } as unknown as Awaited<
-      ReturnType<typeof spawn>
-    >);
-    const step = createStep();
-
-    await step.executeAsync();
-
-    expect(spawnMock).toHaveBeenCalledTimes(1);
-    const [command, args, options] = spawnMock.mock.calls[0];
-    expect(command).toBe('npx');
-    expect(args).toEqual([
-      '-y',
-      '@posthog/cli',
-      '--host',
-      'https://us.posthog.com',
-      'hermes',
-      'upload',
-      '--directory',
-      'dist',
-    ]);
-    expect(options?.env).toMatchObject({
-      POSTHOG_CLI_API_KEY: 'phx_test',
-      POSTHOG_CLI_PROJECT_ID: '123',
-    });
-    expect(options?.mode).toBe(PipeMode.COMBINED_AS_STDOUT);
-  });
-
-  it('passes a custom host through to --host', async () => {
-    spawnMock.mockResolvedValue({ stdout: '', stderr: '' } as unknown as Awaited<
-      ReturnType<typeof spawn>
-    >);
-    const step = createStep({}, { ...ENV, POSTHOG_CLI_HOST: 'https://eu.i.posthog.com' });
-
-    await step.executeAsync();
-
-    expect(spawnMock.mock.calls[0][1]).toEqual([
-      '-y',
-      '@posthog/cli',
-      '--host',
-      'https://eu.i.posthog.com',
-      'hermes',
-      'upload',
-      '--directory',
-      'dist',
-    ]);
-  });
-
-  it('uploads the given directory', async () => {
-    spawnMock.mockResolvedValue({ stdout: '', stderr: '' } as unknown as Awaited<
-      ReturnType<typeof spawn>
-    >);
-    const step = createStep({ directory: 'build-output' });
-
-    await step.executeAsync();
-
-    expect(spawnMock.mock.calls[0][1]).toEqual([
-      '-y',
-      '@posthog/cli',
-      '--host',
-      'https://us.posthog.com',
-      'hermes',
-      'upload',
-      '--directory',
-      'build-output',
-    ]);
-  });
-
-  it('throws when credentials are missing by default', async () => {
-    const step = createStep({}, {});
-
-    await expect(step.executeAsync()).rejects.toThrow(
-      /Missing PostHog credentials: personal API key, project id/
-    );
-    expect(spawnMock).not.toHaveBeenCalled();
-  });
-
-  it('warns and skips when credentials are missing and ignore_error is set', async () => {
-    const step = createStep({ ignore_error: true }, {});
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await step.executeAsync();
-
-    expect(spawnMock).not.toHaveBeenCalled();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      expect.stringMatching(/Ignoring error/)
-    );
-  });
-
-  it('throws when the upload fails by default', async () => {
-    spawnMock.mockRejectedValue(new Error('upload failed'));
-    const step = createStep();
-
-    await expect(step.executeAsync()).rejects.toThrow(/Uploading source maps to PostHog failed/);
-  });
-
-  it('warns and continues when the upload fails and ignore_error is set', async () => {
-    spawnMock.mockRejectedValue(new Error('upload failed'));
-    const step = createStep({ ignore_error: true });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(warnMock).toHaveBeenCalledWith(
-      { err: expect.any(Error) },
-      expect.stringMatching(/Ignoring error/)
-    );
-  });
-});

packages/build-tools/src/steps/functions/__tests__/waitForPosthogMetric.test.ts

@@ -1,263 +0,0 @@
-import fetch, { Response } from 'node-fetch';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { createWaitForPosthogMetricFunction } from '../waitForPosthogMetric';
-
-jest.mock('@expo/logger');
-jest.mock('node-fetch');
-
-function jsonResponse(data: unknown, { ok = true, status = 200 } = {}): Response {
-  return {
-    ok,
-    status,
-    json: async () => data,
-    text: async () => JSON.stringify(data),
-  } as unknown as Response;
-}
-
-const ENV = {
-  POSTHOG_CLI_API_KEY: 'phx_test',
-  POSTHOG_CLI_PROJECT_ID: '123',
-  POSTHOG_CLI_HOST: 'https://us.posthog.com',
-};
-
-describe(createWaitForPosthogMetricFunction, () => {
-  const fetchMock = jest.mocked(fetch);
-  const waitForMetric = createWaitForPosthogMetricFunction();
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  function createStep(
-    callInputs: Record<string, unknown>,
-    env: Record<string, string> = ENV
-  ): ReturnType<typeof waitForMetric.createBuildStepFromFunctionCall> {
-    return waitForMetric.createBuildStepFromFunctionCall(createGlobalContextMock({}), {
-      callInputs,
-      env,
-      id: waitForMetric.id,
-    });
-  }
-
-  it('clears when the metric already meets the condition (blocking query)', async () => {
-    fetchMock.mockResolvedValueOnce(jsonResponse({ results: [[3]] }));
-    const step = createStep({
-      query: 'select count() from events',
-      operator: 'lt',
-      threshold: '5',
-    });
-
-    await step.executeAsync();
-
-    expect(fetchMock).toHaveBeenCalledTimes(1);
-    const [url, init] = fetchMock.mock.calls[0];
-    expect(url).toBe('https://us.posthog.com/api/projects/123/query/');
-    expect(JSON.parse(init?.body as string)).toMatchObject({
-      query: { kind: 'HogQLQuery' },
-      refresh: 'blocking',
-    });
-    expect(step.outputById.value.value).toBe('3');
-  });
-
-  it('throws when credentials are missing', async () => {
-    const step = createStep({ query: 'q', operator: 'lt', threshold: '5' }, {});
-
-    await expect(step.executeAsync()).rejects.toThrow(
-      /Missing PostHog credentials: personal API key, project id/
-    );
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  it('throws on an invalid operator', async () => {
-    const step = createStep({ query: 'q', operator: 'between', threshold: '5' });
-
-    await expect(step.executeAsync()).rejects.toThrow(/Invalid "operator"/);
-  });
-
-  it('rejects an Object.prototype key as an operator', async () => {
-    const step = createStep({ query: 'q', operator: 'toString', threshold: '5' });
-
-    await expect(step.executeAsync()).rejects.toThrow(/Invalid "operator"/);
-  });
-
-  it('throws with the PostHog error detail when the query fails to run', async () => {
-    fetchMock.mockResolvedValueOnce(
-      jsonResponse({ detail: 'Malformed HogQL query' }, { ok: false, status: 400 })
-    );
-    const step = createStep({ query: 'bad', operator: 'lt', threshold: '5' });
-
-    await expect(step.executeAsync()).rejects.toThrow(
-      /failed with status 400: Malformed HogQL query/
-    );
-  });
-
-  it('retries after a transient 500 and clears when the metric recovers', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({}, { ok: false, status: 500 }))
-      .mockResolvedValueOnce(jsonResponse({ results: [[1]] }));
-    const step = createStep({
-      query: 'q',
-      operator: 'lt',
-      threshold: '5',
-      interval_seconds: 0.05,
-      timeout_seconds: 5,
-    });
-
-    await step.executeAsync();
-
-    expect(fetchMock).toHaveBeenCalledTimes(2);
-  });
-
-  it('keeps polling while the query returns no numeric value', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [['not-a-number']] }))
-      .mockResolvedValueOnce(jsonResponse({ results: [[2]] }));
-    const step = createStep({
-      query: 'q',
-      operator: 'lt',
-      threshold: '5',
-      interval_seconds: 0.05,
-      timeout_seconds: 5,
-    });
-
-    await step.executeAsync();
-
-    expect(fetchMock).toHaveBeenCalledTimes(2);
-  });
-
-  it('reports a query-shape problem when no numeric value ever arrives', async () => {
-    fetchMock.mockResolvedValue(jsonResponse({ results: [['not-a-number']] }));
-    const step = createStep({
-      query: 'q',
-      operator: 'lt',
-      threshold: '5',
-      interval_seconds: 0.05,
-      timeout_seconds: 0.15,
-    });
-
-    await expect(step.executeAsync()).rejects.toThrow(/never returned a numeric value/);
-  });
-
-  it('includes the last observed value in the timeout error', async () => {
-    fetchMock.mockResolvedValue(jsonResponse({ results: [[10]] }));
-    const step = createStep({
-      query: 'q',
-      operator: 'lt',
-      threshold: '5',
-      interval_seconds: 0.05,
-      timeout_seconds: 0.15,
-    });
-
-    await expect(step.executeAsync()).rejects.toThrow(/last value: 10/);
-  });
-
-  it('throws on a non-positive interval', async () => {
-    const step = createStep({ query: 'q', operator: 'lt', threshold: '5', interval_seconds: 0 });
-
-    await expect(step.executeAsync()).rejects.toThrow(/greater than 0/);
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  it.each([
-    ['lte', 3, 3],
-    ['gt', 10, 5],
-    ['gte', 5, 5],
-    ['eq', 3, 3],
-  ] as const)('clears with the %s operator', async (operator, value, threshold) => {
-    fetchMock.mockResolvedValueOnce(jsonResponse({ results: [[value]] }));
-    const step = createStep({ query: 'q', operator, threshold });
-
-    await step.executeAsync();
-
-    expect(fetchMock).toHaveBeenCalledTimes(1);
-  });
-
-  it('treats a non-numeric non-string cell as no value and keeps polling', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [[true]] }))
-      .mockResolvedValueOnce(jsonResponse({ results: [[1]] }));
-    const step = createStep({
-      query: 'q',
-      operator: 'lt',
-      threshold: '5',
-      interval_seconds: 0.05,
-      timeout_seconds: 5,
-    });
-
-    await step.executeAsync();
-
-    expect(fetchMock).toHaveBeenCalledTimes(2);
-  });
-
-  it('retries after a network error and clears when the query recovers', async () => {
-    fetchMock
-      .mockRejectedValueOnce(new Error('ECONNRESET'))
-      .mockResolvedValueOnce(jsonResponse({ results: [[1]] }));
-    const step = createStep({
-      query: 'q',
-      operator: 'lt',
-      threshold: '5',
-      interval_seconds: 0.05,
-      timeout_seconds: 5,
-    });
-    const warnMock = jest.spyOn(step.ctx.logger, 'warn');
-
-    await step.executeAsync();
-
-    expect(fetchMock).toHaveBeenCalledTimes(2);
-    expect(warnMock).toHaveBeenCalledWith(
-      'Running the PostHog query failed with a network error; will retry on the next poll.'
-    );
-  });
-
-  it('retries after an invalid JSON response and clears when the query recovers', async () => {
-    fetchMock
-      .mockResolvedValueOnce({
-        ok: true,
-        status: 200,
-        json: async () => {
-          throw new Error('unexpected token');
-        },
-      } as unknown as Response)
-      .mockResolvedValueOnce(jsonResponse({ results: [[1]] }));
-    const step = createStep({
-      query: 'q',
-      operator: 'lt',
-      threshold: '5',
-      interval_seconds: 0.05,
-      timeout_seconds: 5,
-    });
-
-    await step.executeAsync();
-
-    expect(fetchMock).toHaveBeenCalledTimes(2);
-  });
-
-  it('throws on a 403 without retrying', async () => {
-    fetchMock.mockResolvedValue(jsonResponse({}, { ok: false, status: 403 }));
-    const step = createStep({ query: 'q', operator: 'lt', threshold: '5' });
-
-    await expect(step.executeAsync()).rejects.toThrow(/forbidden \(403\)/);
-    expect(fetchMock).toHaveBeenCalledTimes(1);
-  });
-
-  it('keeps polling through malformed response shapes until a numeric value arrives', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [[Infinity]] }))
-      .mockResolvedValueOnce(jsonResponse('not an object'))
-      .mockResolvedValueOnce(jsonResponse({ results: [5] }))
-      .mockResolvedValueOnce(jsonResponse({ results: [[1]] }));
-    const step = createStep({
-      query: 'q',
-      operator: 'lt',
-      threshold: '5',
-      interval_seconds: 0.05,
-      timeout_seconds: 5,
-    });
-
-    await step.executeAsync();
-
-    expect(fetchMock).toHaveBeenCalledTimes(4);
-  });
-});

packages/build-tools/src/steps/functions/__tests__/waitForPosthogQuery.test.ts

@@ -1,109 +0,0 @@
-import fetch, { Response } from 'node-fetch';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { createWaitForPosthogQueryFunction } from '../waitForPosthogQuery';
-
-jest.mock('@expo/logger');
-jest.mock('node-fetch');
-
-function jsonResponse(data: unknown, { ok = true, status = 200 } = {}): Response {
-  return { ok, status, json: async () => data } as unknown as Response;
-}
-
-const ENV = {
-  POSTHOG_CLI_API_KEY: 'phx_test',
-  POSTHOG_CLI_PROJECT_ID: '123',
-  POSTHOG_CLI_HOST: 'https://us.posthog.com',
-};
-
-describe(createWaitForPosthogQueryFunction, () => {
-  const fetchMock = jest.mocked(fetch);
-  const waitForQuery = createWaitForPosthogQueryFunction();
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  function createStep(
-    callInputs: Record<string, unknown>,
-    env: Record<string, string> = ENV
-  ): ReturnType<typeof waitForQuery.createBuildStepFromFunctionCall> {
-    return waitForQuery.createBuildStepFromFunctionCall(createGlobalContextMock({}), {
-      callInputs,
-      env,
-      id: waitForQuery.id,
-    });
-  }
-
-  it('resolves when the query returns true', async () => {
-    fetchMock.mockResolvedValueOnce(jsonResponse({ results: [[true]] }));
-    const step = createStep({ query: 'SELECT count() > 0 FROM events' });
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(fetchMock).toHaveBeenCalledTimes(1);
-    const [, init] = fetchMock.mock.calls[0];
-    expect(JSON.parse(init?.body as string).query).toEqual({
-      kind: 'HogQLQuery',
-      query: 'SELECT count() > 0 FROM events',
-    });
-  });
-
-  it('resolves when the query returns a nonzero number', async () => {
-    fetchMock.mockResolvedValueOnce(jsonResponse({ results: [[1]] }));
-    const step = createStep({ query: 'q' });
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-  });
-
-  it('keeps polling until the query turns true', async () => {
-    fetchMock
-      .mockResolvedValueOnce(jsonResponse({ results: [[0]] }))
-      .mockResolvedValueOnce(jsonResponse({ results: [[true]] }));
-    const step = createStep({ query: 'q', interval_seconds: 0.05, timeout_seconds: 5 });
-
-    await step.executeAsync();
-
-    expect(fetchMock).toHaveBeenCalledTimes(2);
-  });
-
-  it('keeps polling after a transient failure and clears when the query recovers', async () => {
-    fetchMock
-      .mockRejectedValueOnce(new Error('ECONNRESET'))
-      .mockResolvedValueOnce(jsonResponse({ results: [[true]] }));
-    const step = createStep({ query: 'q', interval_seconds: 0.05, timeout_seconds: 5 });
-
-    await expect(step.executeAsync()).resolves.not.toThrow();
-    expect(fetchMock).toHaveBeenCalledTimes(2);
-  });
-
-  it('throws when the query never returns true within the timeout', async () => {
-    fetchMock.mockResolvedValue(jsonResponse({ results: [[false]] }));
-    const step = createStep({ query: 'q', interval_seconds: 0.05, timeout_seconds: 0.1 });
-
-    await expect(step.executeAsync()).rejects.toThrow(/did not return true within/);
-  });
-
-  it('throws when credentials are missing', async () => {
-    const step = createStep({ query: 'q' }, {});
-
-    await expect(step.executeAsync()).rejects.toThrow(
-      /Missing PostHog credentials: personal API key, project id/
-    );
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  it('throws on a non-positive interval', async () => {
-    const step = createStep({ query: 'q', interval_seconds: 0 });
-
-    await expect(step.executeAsync()).rejects.toThrow(/greater than 0/);
-    expect(fetchMock).not.toHaveBeenCalled();
-  });
-
-  it('throws on a 403 without retrying', async () => {
-    fetchMock.mockResolvedValue(jsonResponse({}, { ok: false, status: 403 }));
-    const step = createStep({ query: 'q' });
-
-    await expect(step.executeAsync()).rejects.toThrow(/forbidden \(403\)/);
-    expect(fetchMock).toHaveBeenCalledTimes(1);
-  });
-});

packages/build-tools/src/steps/functions/capturePosthogEvent.ts

@@ -1,82 +0,0 @@
-import { UserError } from '@expo/eas-build-job';
-import { BuildFunction, BuildStepInput, BuildStepInputValueTypeName } from '@expo/steps';
-
-import { PosthogClient } from '../utils/PosthogClient';
-import { PosthogUtils } from '../utils/PosthogUtils';
-
-export function createCapturePosthogEventFunction(): BuildFunction {
-  return new BuildFunction({
-    namespace: 'eas',
-    id: 'posthog_capture_event',
-    name: 'Capture PostHog event',
-    __metricsId: 'eas/posthog_capture_event',
-    inputProviders: [
-      BuildStepInput.createProvider({
-        id: 'event',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: true,
-      }),
-      BuildStepInput.createProvider({
-        id: 'distinct_id',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'properties',
-        allowedValueTypeName: BuildStepInputValueTypeName.JSON,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'api_key',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'host',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'ignore_error',
-        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
-        required: false,
-      }),
-    ],
-    fn: async (stepCtx, { inputs, env, signal }) => {
-      const { logger } = stepCtx;
-      const ignoreError = Boolean(inputs.ignore_error.value);
-      const event = inputs.event.value as string;
-
-      const client = PosthogClient.forIngestion({
-        apiKeyOverride: inputs.api_key.value as string | undefined,
-        hostOverride: inputs.host.value as string | undefined,
-        env,
-      });
-      if (!client) {
-        PosthogUtils.failOrLogError({
-          logger,
-          ignoreError,
-          error: new UserError(
-            'EAS_POSTHOG_MISSING_API_KEY',
-            'PostHog API key not provided. Set the "api_key" input or the EXPO_PUBLIC_POSTHOG_API_KEY environment variable.'
-          ),
-        });
-        return;
-      }
-
-      logger.info(`Sending PostHog event "${event}"`);
-      try {
-        await client.captureEventAsync({
-          event,
-          distinctId: inputs.distinct_id.value as string | undefined,
-          properties: inputs.properties.value as Record<string, unknown> | undefined,
-          signal,
-        });
-      } catch (error) {
-        PosthogUtils.failOrLogError({ logger, ignoreError, error });
-        return;
-      }
-      logger.info(`Sent PostHog event "${event}"`);
-    },
-  });
-}

packages/build-tools/src/steps/functions/checkout.ts

@@ -7,7 +7,6 @@ export function createCheckoutBuildFunction(): BuildFunction {
     id: 'checkout',
     name: 'Checkout',
     __metricsId: 'eas/checkout',
-    __hookId: 'checkout',
     fn: async stepsCtx => {
       if (stepsCtx.global.wasCheckedOut()) {
         stepsCtx.logger.info('Project directory is already checked out');

packages/build-tools/src/steps/functions/createPosthogAnnotation.ts

@@ -1,78 +0,0 @@
-import { BuildFunction, BuildStepInput, BuildStepInputValueTypeName } from '@expo/steps';
-
-import { PosthogClient } from '../utils/PosthogClient';
-import { PosthogUtils } from '../utils/PosthogUtils';
-
-export function createPosthogAnnotationFunction(): BuildFunction {
-  return new BuildFunction({
-    namespace: 'eas',
-    id: 'posthog_annotation',
-    name: 'Create a PostHog annotation',
-    __metricsId: 'eas/posthog_annotation',
-    inputProviders: [
-      BuildStepInput.createProvider({
-        id: 'content',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: true,
-      }),
-      BuildStepInput.createProvider({
-        id: 'date_marker',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'api_key',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'project_id',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'ignore_error',
-        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
-        required: false,
-      }),
-    ],
-    fn: async (stepCtx, { inputs, env, signal }) => {
-      const { logger } = stepCtx;
-      const ignoreError = Boolean(inputs.ignore_error.value);
-
-      const result = PosthogClient.fromEnv({
-        apiKeyOverride: inputs.api_key.value as string | undefined,
-        projectIdOverride: inputs.project_id.value as string | undefined,
-        env,
-      });
-      if (!result.client) {
-        PosthogUtils.failOrLogError({
-          logger,
-          ignoreError,
-          error: PosthogUtils.missingCredentialsError(result.missing),
-        });
-        return;
-      }
-      const client = result.client;
-
-      const content = inputs.content.value as string;
-      const dateMarker =
-        (inputs.date_marker.value as string | undefined) ?? new Date().toISOString();
-
-      logger.info(`Creating PostHog annotation "${content}"`);
-      try {
-        await client.requestAsync('POST', '/annotations/', {
-          action: 'Creating the PostHog annotation',
-          forbiddenScope: 'annotation:write',
-          body: { content, date_marker: dateMarker },
-          signal,
-        });
-      } catch (error) {
-        PosthogUtils.failOrLogError({ logger, ignoreError, error });
-        return;
-      }
-
-      logger.info('Created PostHog annotation');
-    },
-  });
-}

packages/build-tools/src/steps/functions/createSubmissionEntity.ts

@@ -1,7 +1,6 @@
 import { asyncResult } from '@expo/results';
 import { BuildFunction, BuildStepInput, BuildStepInputValueTypeName } from '@expo/steps';
 
-import { Sentry } from '../../sentry';
 import { retryOnDNSFailure } from '../../utils/retryOnDNSFailure';
 
 export function createSubmissionEntityFunction(): BuildFunction {
@@ -55,42 +54,18 @@ export function createSubmissionEntityFunction(): BuildFunction {
       const robotAccessToken = stepsCtx.global.staticContext.job.secrets?.robotAccessToken;
       if (!robotAccessToken) {
         stepsCtx.logger.error('Failed to create submission entity: no robot access token found');
-        Sentry.capture('Failed to create submission entity: missing robot access token');
         return;
       }
 
       const buildId = inputs.build_id.value;
       if (!buildId) {
         stepsCtx.logger.error('Failed to create submission entity: no build ID provided');
-        Sentry.capture('Failed to create submission entity: missing build ID', {
-          extras: {
-            buildId,
-          },
-        });
         return;
       }
 
       const workflowJobId = stepsCtx.global.env.__WORKFLOW_JOB_ID;
       if (!workflowJobId) {
         stepsCtx.logger.error('Failed to create submission entity: no workflow job ID found');
-        Sentry.capture('Failed to create submission entity: missing workflow job ID', {
-          extras: {
-            buildId,
-            workflowJobId,
-          },
-        });
-        return;
-      }
-
-      const expoApiServerURL = stepsCtx.global.staticContext.expoApiServerURL;
-      if (!expoApiServerURL) {
-        stepsCtx.logger.error('Failed to create submission entity: no Expo API server URL found');
-        Sentry.capture('Failed to create submission entity: missing Expo API server URL', {
-          extras: {
-            buildId,
-            workflowJobId,
-          },
-        });
         return;
       }
 
@@ -108,7 +83,7 @@ export function createSubmissionEntityFunction(): BuildFunction {
 
       try {
         const response = await retryOnDNSFailure(fetch)(
-          new URL('/v2/app-store-submissions/', expoApiServerURL),
+          new URL('/v2/app-store-submissions/', stepsCtx.global.staticContext.expoApiServerURL),
           {
             method: 'POST',
             headers: {

packages/build-tools/src/steps/functions/downloadArtifact.ts

@@ -1,4 +1,4 @@
-import { SystemError } from '@expo/eas-build-job';
+import { UserError } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
 import { asyncResult } from '@expo/results';
 import {
@@ -56,23 +56,18 @@ export function createDownloadArtifactFunction(): BuildFunction {
       const interpolationContext = stepsCtx.global.getInterpolationContext();
 
       if (!('workflow' in interpolationContext)) {
-        throw new SystemError('No workflow found in the interpolation context.', {
-          trackingCode: 'EAS_DOWNLOAD_ARTIFACT_NO_WORKFLOW',
-        });
+        throw new UserError(
+          'EAS_DOWNLOAD_ARTIFACT_NO_WORKFLOW',
+          'No workflow found in the interpolation context.'
+        );
       }
 
       const robotAccessToken = stepsCtx.global.staticContext.job.secrets?.robotAccessToken;
       if (!robotAccessToken) {
-        throw new SystemError('No robot access token found in the job secrets.', {
-          trackingCode: 'EAS_DOWNLOAD_ARTIFACT_NO_ROBOT_ACCESS_TOKEN',
-        });
-      }
-
-      const expoApiServerURL = stepsCtx.global.staticContext.expoApiServerURL;
-      if (!expoApiServerURL) {
-        throw new SystemError('Missing Expo API server URL.', {
-          trackingCode: 'EAS_DOWNLOAD_ARTIFACT_NO_EXPO_API_SERVER_URL',
-        });
+        throw new UserError(
+          'EAS_DOWNLOAD_ARTIFACT_NO_ROBOT_ACCESS_TOKEN',
+          'No robot access token found in the job secrets.'
+        );
       }
 
       const workflowRunId = interpolationContext.workflow.id;
@@ -87,7 +82,7 @@ export function createDownloadArtifactFunction(): BuildFunction {
       const { artifactPath } = await downloadArtifactAsync({
         logger,
         workflowRunId,
-        expoApiServerURL,
+        expoApiServerURL: stepsCtx.global.staticContext.expoApiServerURL,
         robotAccessToken,
         params,
       });

packages/build-tools/src/steps/functions/downloadBuild.ts

@@ -1,4 +1,4 @@
-import { SystemError, UserError } from '@expo/eas-build-job';
+import { UserError } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
 import { asyncResult } from '@expo/results';
 import {
@@ -7,9 +7,7 @@ import {
   BuildStepInputValueTypeName,
   BuildStepOutput,
 } from '@expo/steps';
-import { Client } from '@urql/core';
 import { glob } from 'fast-glob';
-import { graphql } from 'gql.tada';
 import fetch from 'node-fetch';
 import fs from 'node:fs';
 import os from 'node:os';
@@ -18,7 +16,6 @@ import stream from 'stream';
 import { promisify } from 'util';
 import { z } from 'zod';
 
-import { CustomBuildContext } from '../../customBuildContext';
 import { formatBytes } from '../../utils/artifacts';
 import { decompressTarAsync, isFileTarGzAsync } from '../../utils/files';
 import { retryOnDNSFailure } from '../../utils/retryOnDNSFailure';
@@ -26,21 +23,7 @@ import { pluralize } from '../../utils/strings';
 
 const streamPipeline = promisify(stream.pipeline);
 
-const BUILD_BY_ID_QUERY = graphql(`
-  query DownloadBuildByIdQuery($buildId: ID!) {
-    builds {
-      byId(buildId: $buildId) {
-        id
-        platform
-        artifacts {
-          applicationArchiveUrl
-        }
-      }
-    }
-  }
-`);
-
-export function createDownloadBuildFunction(ctx: CustomBuildContext): BuildFunction {
+export function createDownloadBuildFunction(): BuildFunction {
   return new BuildFunction({
     namespace: 'eas',
     id: 'download_build',
@@ -76,7 +59,7 @@ export function createDownloadBuildFunction(ctx: CustomBuildContext): BuildFunct
       const { artifactPath } = await downloadBuildAsync({
         logger,
         buildId,
-        graphqlClient: ctx.graphqlClient,
+        expoApiServerURL: stepsCtx.global.staticContext.expoApiServerURL,
         robotAccessToken: stepsCtx.global.staticContext.job.secrets?.robotAccessToken ?? null,
         extensions,
       });
@@ -86,45 +69,16 @@ export function createDownloadBuildFunction(ctx: CustomBuildContext): BuildFunct
   });
 }
 
-async function fetchApplicationArchiveUrlAsync({
-  buildId,
-  graphqlClient,
-}: {
-  buildId: string;
-  graphqlClient: Client;
-}): Promise<string> {
-  const result = await graphqlClient.query(BUILD_BY_ID_QUERY, { buildId }).toPromise();
-
-  if (result.error) {
-    const { error } = result;
-    const message = `Could not fetch build ${buildId}: ${error.message}`;
-
-    throw error.networkError || result.error.response?.status >= 500
-      ? new SystemError(message, { cause: error })
-      : new UserError('EAS_DOWNLOAD_BUILD_FETCH_FAILED', message, { cause: error });
-  }
-
-  const applicationArchiveUrl = result.data?.builds.byId?.artifacts?.applicationArchiveUrl;
-  if (!applicationArchiveUrl) {
-    throw new UserError(
-      'EAS_DOWNLOAD_BUILD_NO_APPLICATION_ARCHIVE',
-      'Build does not have an application archive url'
-    );
-  }
-
-  return applicationArchiveUrl;
-}
-
 export async function downloadBuildAsync({
   logger,
   buildId,
-  graphqlClient,
+  expoApiServerURL,
   robotAccessToken,
   extensions,
 }: {
   logger: bunyan;
   buildId: string;
-  graphqlClient: Client;
+  expoApiServerURL: string;
   robotAccessToken: string | null;
   extensions: string[];
 }): Promise<{ artifactPath: string }> {
@@ -132,11 +86,12 @@ export async function downloadBuildAsync({
     path.join(os.tmpdir(), 'download_build-downloaded-')
   );
 
-  const downloadUrl = await fetchApplicationArchiveUrlAsync({ buildId, graphqlClient });
-
-  const response = await retryOnDNSFailure(fetch)(downloadUrl, {
-    headers: robotAccessToken ? { Authorization: `Bearer ${robotAccessToken}` } : undefined,
-  });
+  const response = await retryOnDNSFailure(fetch)(
+    new URL(`/v2/artifacts/eas/${buildId}`, expoApiServerURL),
+    {
+      headers: robotAccessToken ? { Authorization: `Bearer ${robotAccessToken}` } : undefined,
+    }
+  );
 
   if (!response.ok) {
     const textResult = await asyncResult(response.text());

packages/build-tools/src/steps/functions/findAndUploadBuildArtifacts.ts

@@ -26,14 +26,14 @@ export function createFindAndUploadBuildArtifactsBuildFunction(
       try {
         await uploadApplicationArchivesAsync({ ctx, stepCtx });
       } catch (err: unknown) {
-        stepCtx.logger.error({ err }, `Failed to upload application archives.`);
+        stepCtx.logger.error(`Failed to upload application archives.`, err);
         firstError ||= err;
       }
 
       try {
         await uploadBuildArtifacts({ ctx, stepCtx });
       } catch (err: unknown) {
-        stepCtx.logger.error({ err }, `Failed to upload build artifacts.`);
+        stepCtx.logger.error(`Failed to upload build artifacts.`, err);
         firstError ||= err;
       }
 

packages/build-tools/src/steps/functions/finishIosSimulatorRecordings.ts

@@ -1,23 +0,0 @@
-import { BuildFunction, BuildRuntimePlatform, BuildStepOutput } from '@expo/steps';
-
-import { IosSimulatorRecordingUtils } from '../utils/IosSimulatorRecordingUtils';
-
-export function createFinishIosSimulatorRecordingsBuildFunction(): BuildFunction {
-  return new BuildFunction({
-    namespace: 'eas',
-    id: 'finish_ios_simulator_recordings',
-    name: 'Finish iOS Simulator recordings',
-    __metricsId: 'eas/finish_ios_simulator_recordings',
-    supportedRuntimePlatforms: [BuildRuntimePlatform.DARWIN],
-    outputProviders: [
-      BuildStepOutput.createProvider({
-        id: 'recordings_json',
-        required: true,
-      }),
-    ],
-    fn: async ({ logger }, { outputs }) => {
-      const recordings = await IosSimulatorRecordingUtils.finishAsync({ logger });
-      outputs.recordings_json.set(JSON.stringify(recordings));
-    },
-  });
-}

packages/build-tools/src/steps/functions/installMaestro.ts

@@ -15,8 +15,6 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';
 
-import { Datadog } from '../../datadog';
-
 export function createInstallMaestroBuildFunction(): BuildFunction {
   return new BuildFunction({
     namespace: 'eas',
@@ -125,24 +123,13 @@ export function createInstallMaestroBuildFunction(): BuildFunction {
 
       logger.info(`Maestro ${maestroVersionResult.value} is ready.`);
       outputs.maestro_version.set(maestroVersionResult.value);
-
-      Datadog.distribution('eas.maestro.install', 1, {
-        maestro_version: maestroVersionResult.value,
-      });
     },
   });
 }
 
 async function getMaestroVersion({ env }: { env: BuildStepEnv }): Promise<string> {
-  const { stdout } = await spawn('maestro', ['--version'], { stdio: 'pipe', env });
-  // `maestro --version` can print an analytics notice to stdout before the version,
-  // e.g. "Anonymous analytics enabled. To opt out, set MAESTRO_CLI_NO_ANALYTICS...\n2.0.10".
-  // Take the last version-looking token: the real version is printed after the notice, so
-  // this stays correct even if the notice itself contains a version-like string. Keeps the
-  // step output and the eas.maestro.install metric tag clean. Best-effort only: fall back to
-  // the raw output if none is found, so we never fail the build over a version string.
-  const versions = stdout.match(/\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?/g);
-  return versions?.at(-1) ?? stdout.trim();
+  const maestroVersion = await spawn('maestro', ['--version'], { stdio: 'pipe', env });
+  return maestroVersion.stdout.trim();
 }
 
 async function installMaestro({

packages/build-tools/src/steps/functions/installNodeModules.ts

@@ -16,7 +16,6 @@ export function createInstallNodeModulesBuildFunction(): BuildFunction {
     id: 'install_node_modules',
     name: 'Install node modules',
     __metricsId: 'eas/install_node_modules',
-    __hookId: 'install_node_modules',
     fn: async (stepCtx, { env }) => {
       await installNodeModules(stepCtx, env);
     },

packages/build-tools/src/steps/functions/maestroResultParser.ts

@@ -1,4 +1,3 @@
-import { asyncResult } from '@expo/results';
 import { XMLBuilder, XMLParser, XMLValidator } from 'fast-xml-parser';
 import fs from 'fs/promises';
 import path from 'path';
@@ -19,7 +18,6 @@ const ATTEMPT_PATTERN = /attempt-(\d+)/;
 
 export interface JUnitTestCaseResult {
   name: string;
-  file: string | undefined;
   status: 'passed' | 'failed';
   duration: number; // milliseconds
   errorMessage: string | null;
@@ -34,12 +32,6 @@ const xmlParser = new XMLParser({
   isArray: name => ['testsuite', 'testcase', 'property'].includes(name),
 });
 
-// A `file=` attribute counts as present only when it is a non-empty string.
-function fileAttrOf(tc: any): string | undefined {
-  const f = tc?.['@_file'];
-  return typeof f === 'string' && f.length > 0 ? f : undefined;
-}
-
 function parseJUnitContent(content: string): JUnitTestCaseResult[] {
   const results: JUnitTestCaseResult[] = [];
   try {
@@ -62,8 +54,6 @@ function parseJUnitContent(content: string): JUnitTestCaseResult[] {
           continue;
         }
 
-        const file = fileAttrOf(tc);
-
         const timeStr = tc['@_time'];
         const timeSeconds = timeStr ? parseFloat(timeStr) : 0;
         const duration = Number.isFinite(timeSeconds) ? Math.round(timeSeconds * 1000) : 0;
@@ -104,7 +94,7 @@ function parseJUnitContent(content: string): JUnitTestCaseResult[] {
           : [];
         delete properties['tags'];
 
-        results.push({ name, file, status, duration, errorMessage, tags, properties });
+        results.push({ name, status, duration, errorMessage, tags, properties });
       }
     }
   } catch {
@@ -141,142 +131,6 @@ export async function parseJUnitTestCases(junitDirectory: string): Promise<JUnit
   return perFile.flat();
 }
 
-// ---------------------------------------------------------------------------
-// Maestro >= 2.6.0 code path: every <testcase> carries a `file=` attribute with
-// its flow's own path (all-or-none per run). Callers check the report first
-// (isFileAttrRun / junitFileHasFileAttrs) and route here; the legacy name→path
-// scan is then never consulted.
-// ---------------------------------------------------------------------------
-
-export function isFileAttrRun(
-  testcases: JUnitTestCaseResult[]
-): testcases is (JUnitTestCaseResult & { file: string })[] {
-  return testcases.length > 0 && testcases.every(tc => tc.file !== undefined);
-}
-
-// Unreadable or attribute-less reports ⇒ false: the caller then takes the
-// legacy path, whose own guards degrade safely.
-export async function junitFileHasFileAttrs(junitFile: string): Promise<boolean> {
-  return isFileAttrRun(await parseJUnitFile(junitFile));
-}
-
-async function fileExists(absPath: string): Promise<boolean> {
-  return (await asyncResult(fs.stat(absPath))).ok;
-}
-
-// Group by `file=` so two same-named flows in different files stay separate.
-export async function parseMaestroResultsFromFileAttrs(
-  junitDirectory: string
-): Promise<MaestroFlowResult[]> {
-  interface JUnitEntry {
-    result: JUnitTestCaseResult;
-    sourceFile: string;
-  }
-
-  let junitEntries: string[];
-  try {
-    junitEntries = await fs.readdir(junitDirectory);
-  } catch {
-    return [];
-  }
-  const xmlFiles = junitEntries.filter(f => f.endsWith('.xml')).sort();
-
-  const entries: JUnitEntry[] = [];
-  for (const xmlFile of xmlFiles) {
-    const fileResults = await parseJUnitFile(path.join(junitDirectory, xmlFile));
-    for (const result of fileResults) {
-      entries.push({ result, sourceFile: xmlFile });
-    }
-  }
-
-  const byPath = new Map<string, JUnitEntry[]>();
-  for (const entry of entries) {
-    // Callers verify the report with isFileAttrRun/junitFileHasFileAttrs first;
-    // skip (rather than emit an undefined path) if that contract is violated.
-    const flowPath = entry.result.file;
-    if (flowPath === undefined) {
-      continue;
-    }
-    const group = byPath.get(flowPath) ?? [];
-    group.push(entry);
-    byPath.set(flowPath, group);
-  }
-
-  const results: MaestroFlowResult[] = [];
-  for (const [flowPath, group] of byPath) {
-    // retryCount is derived from each entry's source filename (`attempt-N`);
-    // a single entry from `report.xml` (no marker) collapses to attempt 0.
-    const sorted = group
-      .map(entry => {
-        const match = entry.sourceFile.match(ATTEMPT_PATTERN);
-        const attemptIndex = match ? parseInt(match[1], 10) : 0;
-        return { ...entry, attemptIndex };
-      })
-      .sort((a, b) => a.attemptIndex - b.attemptIndex);
-
-    for (const { result, attemptIndex } of sorted) {
-      results.push({
-        name: result.name,
-        path: flowPath,
-        status: result.status,
-        errorMessage: result.errorMessage,
-        duration: result.duration,
-        retryCount: attemptIndex,
-        tags: result.tags,
-        properties: result.properties,
-      });
-    }
-  }
-  return results;
-}
-
-/**
- * Returns the `file=` paths of the failing testcases in the given attempt's
- * JUnit file, or `null` when the result cannot be trusted (caller then falls
- * back to dumb retry — re-run everything; never the legacy scan).
- *
- * Callers verify the report carries `file=` attributes first
- * (junitFileHasFileAttrs).
- */
-export async function parseFailedFlowsFromFileAttrs(args: {
-  junitFile: string;
-  workingDirectory: string;
-}): Promise<string[] | null> {
-  // Same hardening as the legacy parser: fast-xml-parser is lenient — a
-  // truncated XML could drop testcases, and trusting that partial failing set
-  // would skip retries for cut-off flows.
-  let content: string;
-  try {
-    content = await fs.readFile(args.junitFile, 'utf-8');
-  } catch {
-    return null;
-  }
-  if (XMLValidator.validate(content) !== true) {
-    return null;
-  }
-
-  const testcases = parseJUnitContent(content);
-  if (!isFileAttrRun(testcases)) {
-    return null;
-  }
-
-  const failing = testcases.filter(tc => tc.status === 'failed');
-  if (failing.length === 0) {
-    return [];
-  }
-
-  // Each failing testcase is self-identifying via `file=`, so duplicate flow
-  // names retry correctly. path.resolve (not join): `file=` may be absolute
-  // when the flow lives outside the working directory.
-  const paths = [...new Set(failing.map(tc => tc.file))];
-  for (const p of paths) {
-    if (!(await fileExists(path.resolve(args.workingDirectory, p)))) {
-      return null;
-    }
-  }
-  return paths;
-}
-
 export async function parseMaestroResults(
   junitDirectory: string,
   nameToPath: Map<string, string> | null
@@ -459,13 +313,6 @@ export async function mergeJUnitReports(args: {
     }
     const match = filename.match(ATTEMPT_PATTERN);
     const attemptIndex = match ? parseInt(match[1], 10) : 0;
-    // Maestro >= 2.6.0 reports: key by `file=` so two same-named flows in
-    // different files merge separately. Legacy reports keep name keying.
-    const allCases = testsuites.flatMap((suite: any) =>
-      Array.isArray(suite?.testcase) ? suite.testcase : []
-    );
-    const useFileKeys =
-      allCases.length > 0 && allCases.every((tc: any) => fileAttrOf(tc) !== undefined);
     const testcasesByName = new Map<string, unknown[]>();
     for (const suite of testsuites) {
       const cases = suite?.testcase;
@@ -477,10 +324,9 @@ export async function mergeJUnitReports(args: {
         if (typeof name !== 'string') {
           continue;
         }
-        const key = useFileKeys ? fileAttrOf(tc)! : name;
-        const group = testcasesByName.get(key) ?? [];
+        const group = testcasesByName.get(name) ?? [];
         group.push(tc);
-        testcasesByName.set(key, group);
+        testcasesByName.set(name, group);
       }
     }
     if (testcasesByName.size === 0) {

packages/build-tools/src/steps/functions/maestroScreenshots.ts

@@ -1,159 +0,0 @@
-import { bunyan } from '@expo/logger';
-import { type Dirent } from 'fs';
-import fs from 'fs/promises';
-import path from 'path';
-
-export interface ParsedFailureScreenshot {
-  flowName: string;
-  capturedAtMs: number;
-}
-
-// Maestro failure screenshot: `screenshot-[shard-N-]❌-<epochMillis>-(<flowName>).png`.
-// The flow name may contain parentheses, so anchor on the `-(` after the epoch and the
-// `).png` suffix rather than scanning for parens.
-const FAILURE_SCREENSHOT_PATTERN = /^screenshot-(?:shard-\d+-)?❌-(\d+)-\((.+)\)\.png$/u;
-
-export function parseFailureScreenshotFilename(filename: string): ParsedFailureScreenshot | null {
-  const match = filename.match(FAILURE_SCREENSHOT_PATTERN);
-  if (!match) {
-    return null;
-  }
-  const capturedAtMs = Number(match[1]);
-  if (!Number.isFinite(capturedAtMs)) {
-    return null;
-  }
-  return {
-    flowName: match[2],
-    capturedAtMs,
-  };
-}
-
-export interface HarvestedScreenshot {
-  fileAbsPath: string;
-  displayName: string; // `Failure Screenshot: <flowName> (attempt <n>)`
-  metadata: {
-    kind: 'maestro-test-screenshot';
-    // The Maestro flow name straight from the filename (already '/'->'_' substituted by
-    // Maestro). The website matches this against `attempt.name` (normalized the same way).
-    flowName: string;
-    attemptIndex: number;
-    capturedAtMs: number;
-  };
-}
-
-// Scans every debug dir under testsDirectory whose mtime is recent enough (mtime-based to cover
-// the maestro <2.5.0 bug that splits one invocation across two dirs), then keeps only screenshots
-// whose own capturedAtMs is at/after capturedSinceMs. Never throws: an unreadable dir is logged
-// and skipped so a screenshot harvest can't affect the maestro step outcome.
-export async function harvestFailureScreenshotsAsync(args: {
-  testsDirectory: string;
-  capturedSinceMs: number;
-  attemptIndex: number;
-  logger: bunyan;
-}): Promise<HarvestedScreenshot[]> {
-  // Gate dirs by mtime floored to the second, so a dir created within the same second as the
-  // attempt start isn't stat'd below the baseline. The exact capturedAtMs gate below is what
-  // prevents mis-attributing an earlier attempt's screenshot.
-  const dirSinceMtimeMs = Math.floor(args.capturedSinceMs / 1000) * 1000;
-  let entries: Dirent[];
-  try {
-    entries = await fs.readdir(args.testsDirectory, { withFileTypes: true });
-  } catch (err: any) {
-    args.logger.info({ err }, `Skipping screenshot harvest: cannot read ${args.testsDirectory}.`);
-    return [];
-  }
-
-  const results: HarvestedScreenshot[] = [];
-  for (const entry of entries) {
-    if (!entry.isDirectory()) {
-      continue;
-    }
-    const dirPath = path.join(args.testsDirectory, entry.name);
-    let filenames: string[];
-    try {
-      if ((await fs.stat(dirPath)).mtimeMs < dirSinceMtimeMs) {
-        continue;
-      }
-      filenames = await fs.readdir(dirPath);
-    } catch (err: any) {
-      args.logger.info({ err }, `Skipping unreadable debug dir ${dirPath}.`);
-      continue;
-    }
-    for (const filename of filenames) {
-      const parsed = parseFailureScreenshotFilename(filename);
-      // Re-check capture time per file: a dir's mtime can advance after this attempt began (or
-      // fall within the floored-second dir baseline), so the dir gate alone would re-attribute an
-      // earlier attempt's screenshot to this one.
-      if (parsed === null || parsed.capturedAtMs < args.capturedSinceMs) {
-        continue;
-      }
-      results.push({
-        fileAbsPath: path.join(dirPath, filename),
-        displayName: `Failure Screenshot: ${parsed.flowName} (attempt ${args.attemptIndex + 1})`,
-        metadata: {
-          kind: 'maestro-test-screenshot',
-          flowName: parsed.flowName,
-          attemptIndex: args.attemptIndex,
-          capturedAtMs: parsed.capturedAtMs,
-        },
-      });
-    }
-  }
-  return results;
-}
-
-// Maestro substitutes '/' -> '_' in screenshot filenames (so HarvestedScreenshot.flowName
-// is already in that form) but keeps '/' in the JUnit testcase name. Normalize the JUnit
-// name the same way before comparing — matching the website's own normalization.
-function normalizeFlowName(name: string): string {
-  return name.replace(/\//g, '_');
-}
-
-// A flow is a "pure failure" when it failed and never passed across all attempts. The website
-// surfaces only the final screenshot for such a flow, so keeping its earlier attempts would
-// spend the per-job artifact budget on screenshots that are never shown — we keep only the final
-// one (selectFailureScreenshots). A flow that passed at least once (flaky / fail-pass-fail) is
-// NOT pure: each of its failed attempts is a distinct failure and is kept.
-export function computePureFailureFlowNames(
-  testCases: readonly { name: string; status: 'passed' | 'failed' }[]
-): Set<string> {
-  const passed = new Set<string>();
-  const failed = new Set<string>();
-  for (const testCase of testCases) {
-    const flowName = normalizeFlowName(testCase.name);
-    if (testCase.status === 'passed') {
-      passed.add(flowName);
-    } else {
-      failed.add(flowName);
-    }
-  }
-  const pure = new Set<string>();
-  for (const flowName of failed) {
-    if (!passed.has(flowName)) {
-      pure.add(flowName);
-    }
-  }
-  return pure;
-}
-
-// Keep every harvested screenshot for flaky/mixed flows; for pure-failure flows keep only
-// the final (highest attemptIndex) screenshot.
-export function selectFailureScreenshots(
-  harvested: readonly HarvestedScreenshot[],
-  pureFailureFlowNames: ReadonlySet<string>
-): HarvestedScreenshot[] {
-  const finalAttemptByPureFlow = new Map<string, number>();
-  for (const shot of harvested) {
-    if (!pureFailureFlowNames.has(shot.metadata.flowName)) {
-      continue;
-    }
-    const finalAttempt = finalAttemptByPureFlow.get(shot.metadata.flowName);
-    if (finalAttempt === undefined || shot.metadata.attemptIndex > finalAttempt) {
-      finalAttemptByPureFlow.set(shot.metadata.flowName, shot.metadata.attemptIndex);
-    }
-  }
-  return harvested.filter(shot => {
-    const finalAttempt = finalAttemptByPureFlow.get(shot.metadata.flowName);
-    return finalAttempt === undefined || shot.metadata.attemptIndex === finalAttempt;
-  });
-}

packages/build-tools/src/steps/functions/maestroTests.ts

@@ -1,5 +1,4 @@
-import { GenericArtifactType, SystemError, UserError } from '@expo/eas-build-job';
-import { bunyan } from '@expo/logger';
+import { SystemError, UserError } from '@expo/eas-build-job';
 import {
   BuildFunction,
   BuildRuntimePlatform,
@@ -9,26 +8,15 @@ import {
 } from '@expo/steps';
 import spawn from '@expo/turtle-spawn';
 import fs from 'fs/promises';
-import os from 'os';
 import path from 'path';
 import { z } from 'zod';
 
 import { buildFlowNameToPathMap } from './maestroFlowDiscovery';
 import {
   copyLatestAttemptXml,
-  junitFileHasFileAttrs,
   mergeJUnitReports,
-  parseFailedFlowsFromFileAttrs,
   parseFailedFlowsFromJUnit,
-  parseJUnitTestCases,
 } from './maestroResultParser';
-import {
-  type HarvestedScreenshot,
-  computePureFailureFlowNames,
-  harvestFailureScreenshotsAsync,
-  selectFailureScreenshots,
-} from './maestroScreenshots';
-import { CustomBuildContext } from '../../customBuildContext';
 import { sleepAsync } from '../../utils/retry';
 
 const FlowPathSchema = z.array(z.string().min(1)).min(1);
@@ -91,13 +79,12 @@ function buildMaestroArgs(args: {
   return out;
 }
 
-export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildFunction {
+export function createMaestroTestsBuildFunction(): BuildFunction {
   return new BuildFunction({
     namespace: 'eas',
     id: 'maestro_tests',
     name: 'Run Maestro Tests',
     __metricsId: 'eas/maestro_tests',
-    __hookId: 'maestro_tests',
     inputProviders: [
       BuildStepInput.createProvider({
         id: 'flow_path',
@@ -213,10 +200,13 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
         throw new SystemError('Failed to create JUnit report directory', { cause: err });
       }
 
-      // Legacy-only (Maestro < 2.6.0 reports carry no `file=` attribute): the
-      // flow scan is built lazily in the retry branch below and memoized so
-      // retries share one scan. Never runs when the report has `file=`.
-      let nameToPathPromise: Promise<Map<string, string> | null> | undefined;
+      // null → duplicate flow names; retry-failed-only disabled, fall through to
+      // dumb retry (re-run everything) on failure.
+      const nameToPath = await buildFlowNameToPathMap({
+        inputFlowPaths: flowPaths,
+        projectRoot: stepCtx.workingDirectory,
+        logger,
+      });
 
       // Retry loop. spawn-async error shapes:
       //   ENOENT/EACCES → infra (binary missing/not executable) → SystemError.
@@ -224,11 +214,10 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
       //   else (signal-only, OOM kill, unknown) → infra → SystemError, never
       //     downgraded to "tests failed".
       // Retry-failed-only (junit mode): after a failed attempt, subset to the failing
-      // flows. The failed-flow parsers return null when the JUnit cannot be
+      // flows. parseFailedFlowsFromJUnit returns null when the JUnit cannot be
       // trusted; we then fall through to dumb retry (re-run everything).
       let flowsToRun: string[] = flowPaths;
       let lastAttemptExitCode: number | null = null;
-      const harvested: HarvestedScreenshot[] = [];
 
       const totalAttempts = retries + 1;
       for (let attempt = 0; attempt <= retries; attempt++) {
@@ -251,8 +240,6 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
           `Running maestro (attempt ${attempt + 1}/${totalAttempts}): maestro ${maestroArgs.join(' ')}`
         );
 
-        const attemptStartedAtMs = Date.now();
-
         try {
           await spawn('maestro', maestroArgs, {
             cwd: stepCtx.workingDirectory,
@@ -272,44 +259,15 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
           }
         }
 
-        // Harvest this attempt's failure screenshots before any retry subsetting. Gated on
-        // junit: test-case-result rows (and therefore the summary icons) only exist for junit
-        // runs, so harvesting other formats would just create orphan artifacts the website hides.
-        if (outputFormat === 'junit') {
-          harvested.push(
-            ...(await harvestFailureScreenshotsAsync({
-              testsDirectory,
-              capturedSinceMs: attemptStartedAtMs,
-              attemptIndex: attempt,
-              logger,
-            }))
-          );
-        }
-
         if (lastAttemptExitCode === 0 || attempt === retries) {
           break;
         }
 
-        if (retryFailedOnly && outputFormat === 'junit' && outputPath) {
-          let failed: string[] | null;
-          if (await junitFileHasFileAttrs(outputPath)) {
-            failed = await parseFailedFlowsFromFileAttrs({
-              junitFile: outputPath,
-              workingDirectory: stepCtx.workingDirectory,
-            });
-          } else {
-            // Legacy (Maestro < 2.6.0): map failed testcase names back to flow
-            // paths via the flow-file scan. DELETE this arm once the fleet is
-            // on >= 2.6.0.
-            const nameToPath = await (nameToPathPromise ??= buildFlowNameToPathMap({
-              inputFlowPaths: flowPaths,
-              projectRoot: stepCtx.workingDirectory,
-              logger,
-            }));
-            failed = nameToPath
-              ? await parseFailedFlowsFromJUnit({ junitFile: outputPath, nameToPath })
-              : null;
-          }
+        if (retryFailedOnly && outputFormat === 'junit' && outputPath && nameToPath) {
+          const failed = await parseFailedFlowsFromJUnit({
+            junitFile: outputPath,
+            nameToPath,
+          });
           if (failed !== null && failed.length > 0) {
             flowsToRun = failed;
             logger.info(
@@ -358,12 +316,6 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
         }
       }
 
-      // Upload before the ERR_MAESTRO_TESTS_FAILED throw below so fully-failed runs (which need
-      // screenshots most) still upload. Harvest only ran for junit, so guard the same way.
-      if (outputFormat === 'junit') {
-        await uploadFailureScreenshotsAsync({ harvested, junitReportDirectory, ctx, logger });
-      }
-
       // The retry loop exits via success (0), numeric status (retryable),
       // or throw (infra). A non-null non-zero status means the user's tests
       // failed every attempt.
@@ -376,82 +328,3 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
     },
   });
 }
-
-// Reduce harvested failure screenshots to what's worth uploading, then upload them as workflow
-// artifacts. Best-effort and verdict-neutral: never throws, so a screenshot problem can't mask
-// the maestro test result. Caller guards on junit (harvest only runs for junit).
-async function uploadFailureScreenshotsAsync({
-  harvested,
-  junitReportDirectory,
-  ctx,
-  logger,
-}: {
-  harvested: HarvestedScreenshot[];
-  junitReportDirectory: string;
-  ctx: CustomBuildContext;
-  logger: bunyan;
-}): Promise<void> {
-  // Reduce to the attempts worth uploading — every failed attempt for flaky flows, only the final
-  // attempt for all-failed flows. See computePureFailureFlowNames / selectFailureScreenshots.
-  // Guard the JUnit re-parse so a malformed/missing report can't throw past here and mask the
-  // test verdict (the whole step is verdict-neutral for screenshots).
-  let selected: HarvestedScreenshot[];
-  try {
-    const pureFailureFlowNames = computePureFailureFlowNames(
-      await parseJUnitTestCases(junitReportDirectory)
-    );
-    selected = selectFailureScreenshots(harvested, pureFailureFlowNames);
-  } catch (err: any) {
-    logger.warn({ err }, 'Failed to classify failure screenshots; skipping screenshot upload.');
-    return;
-  }
-  if (selected.length === 0) {
-    return;
-  }
-
-  // Cap well under www's 50-artifact-per-job limit.
-  const MAX_SCREENSHOT_UPLOADS = 30;
-  const toUpload = selected.slice(0, MAX_SCREENSHOT_UPLOADS);
-  if (selected.length > toUpload.length) {
-    logger.warn(
-      `Found ${selected.length} failure screenshots; uploading only the first ${toUpload.length}.`
-    );
-  }
-
-  // Copy each shot to an ASCII-safe name outside testsDirectory (the originals contain a
-  // non-ASCII marker and testsDirectory is uploaded wholesale as the tarball).
-  let safeScreenshotDir: string;
-  try {
-    safeScreenshotDir = await fs.mkdtemp(path.join(os.tmpdir(), 'eas-maestro-screenshots-'));
-  } catch (err: any) {
-    logger.warn(
-      { err },
-      'Failed to create the failure-screenshot staging dir; skipping screenshot upload.'
-    );
-    return;
-  }
-
-  await Promise.all(
-    toUpload.map(async (shot, index) => {
-      try {
-        // `index` disambiguates two flows that fail within the same millisecond of an attempt.
-        const safePath = path.join(
-          safeScreenshotDir,
-          `failure-attempt-${shot.metadata.attemptIndex}-${index}-${shot.metadata.capturedAtMs}.png`
-        );
-        await fs.copyFile(shot.fileAbsPath, safePath);
-        await ctx.runtimeApi.uploadArtifact({
-          artifact: {
-            type: GenericArtifactType.OTHER,
-            name: shot.displayName,
-            paths: [safePath],
-            metadata: shot.metadata,
-          },
-          logger,
-        });
-      } catch (err: any) {
-        logger.warn({ err }, 'Failed to upload failure screenshot.');
-      }
-    })
-  );
-}

packages/build-tools/src/steps/functions/repack.ts

@@ -42,6 +42,11 @@ export function createRepackBuildFunction(): BuildFunction {
         required: false,
         allowedValueTypeName: BuildStepInputValueTypeName.STRING,
       }),
+      BuildStepInput.createProvider({
+        id: 'output_path',
+        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
+        required: false,
+      }),
       BuildStepInput.createProvider({
         id: 'embed_bundle_assets',
         allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
@@ -52,16 +57,6 @@ export function createRepackBuildFunction(): BuildFunction {
         allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
         required: false,
       }),
-      BuildStepInput.createProvider({
-        id: 'ios_signing_use_source_app_entitlements',
-        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'ios_signing_app_entitlements_path',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: false,
-      }),
       BuildStepInput.createProvider({
         id: 'repack_version',
         allowedValueTypeName: BuildStepInputValueTypeName.STRING,
@@ -104,10 +99,9 @@ export function createRepackBuildFunction(): BuildFunction {
       stepsCtx.logger.info(`Created temporary working directory: ${workingDirectory}`);
 
       const sourceAppPath = inputs.source_app_path.value as string;
-      const outputPath = createOutputPath({
-        sourceAppPath,
-        tmpDir,
-      });
+      const outputPath =
+        (inputs.output_path.value as string) ??
+        path.join(tmpDir, `repacked-${randomUUID()}${path.extname(sourceAppPath)}`);
       const exportEmbedOptions = inputs.embed_bundle_assets.value
         ? {
             sourcemapOutput: undefined,
@@ -144,12 +138,6 @@ export function createRepackBuildFunction(): BuildFunction {
             iosSigningOptions: await resolveIosSigningOptionsAsync({
               job: stepsCtx.global.staticContext.job,
               logger: stepsCtx.logger,
-              useAppEntitlements: inputs.ios_signing_use_source_app_entitlements.value as
-                | boolean
-                | undefined,
-              entitlementsPath: inputs.ios_signing_app_entitlements_path.value as
-                | string
-                | undefined,
             }),
             logger: stepsCtx.logger,
             spawnAsync: repackSpawnAsync,
@@ -198,21 +186,6 @@ export function createRepackBuildFunction(): BuildFunction {
   });
 }
 
-function createOutputPath({
-  sourceAppPath,
-  tmpDir,
-}: {
-  sourceAppPath: string;
-  tmpDir: string;
-}): string {
-  const outputPath = path.join(tmpDir, `repacked-${randomUUID()}${path.extname(sourceAppPath)}`);
-  const extension = path.extname(outputPath);
-  if (extension.toLowerCase() !== '.aab') {
-    return outputPath;
-  }
-  return `${outputPath.slice(0, -extension.length)}.apk`;
-}
-
 /**
  * Install `@expo/repack-app` in a sandbox directory and import it.
  */
@@ -302,13 +275,9 @@ export async function resolveAndroidSigningOptionsAsync({
 export async function resolveIosSigningOptionsAsync({
   job,
   logger,
-  useAppEntitlements,
-  entitlementsPath,
 }: {
   job: Job;
   logger: bunyan;
-  useAppEntitlements?: boolean;
-  entitlementsPath?: string;
 }): Promise<IosSigningOptions | undefined> {
   const iosJob = job as Ios.Job;
   const buildCredentials = iosJob.secrets?.buildCredentials;
@@ -326,7 +295,5 @@ export async function resolveIosSigningOptionsAsync({
     provisioningProfile,
     keychainPath: credentials.keychainPath,
     signingIdentity: credentials.applicationTargetProvisioningProfile.data.certificateCommonName,
-    useAppEntitlements,
-    entitlementsPath,
   };
 }

packages/build-tools/src/steps/functions/reportMaestroTestResults.ts

@@ -3,13 +3,7 @@ import { graphql } from 'gql.tada';
 import { z } from 'zod';
 
 import { buildFlowNameToPathMap } from './maestroFlowDiscovery';
-import {
-  MaestroFlowResult,
-  isFileAttrRun,
-  parseJUnitTestCases,
-  parseMaestroResults,
-  parseMaestroResultsFromFileAttrs,
-} from './maestroResultParser';
+import { MaestroFlowResult, parseMaestroResults } from './maestroResultParser';
 import { CustomBuildContext } from '../../customBuildContext';
 
 const FlowPathSchema = z.array(z.string().min(1)).min(1);
@@ -67,64 +61,47 @@ export function createReportMaestroTestResultsFunction(ctx: CustomBuildContext):
         return;
       }
 
-      try {
-        // Maestro >= 2.6.0 stamps every <testcase> with its flow's path in a
-        // `file=` attribute; older reports need the legacy flow-file scan to
-        // map testcase names back to paths.
-        const usedFileAttrs = isFileAttrRun(await parseJUnitTestCases(junitDirectory));
-
-        let flowResults: MaestroFlowResult[];
-        if (usedFileAttrs) {
-          flowResults = await parseMaestroResultsFromFileAttrs(junitDirectory);
+      const flowPathRaw = inputs.flow_path.value;
+      let nameToPath: Map<string, string> | null = null;
+      if (flowPathRaw !== undefined) {
+        const parsed = FlowPathSchema.safeParse(flowPathRaw);
+        if (parsed.success) {
+          nameToPath = await buildFlowNameToPathMap({
+            inputFlowPaths: parsed.data,
+            projectRoot: stepsCtx.workingDirectory,
+            logger,
+          });
         } else {
-          // Legacy (Maestro < 2.6.0) — DELETE this arm once the fleet is on >= 2.6.0.
-          const flowPathRaw = inputs.flow_path.value;
-          let nameToPath: Map<string, string> | null = null;
-          if (flowPathRaw !== undefined) {
-            const parsed = FlowPathSchema.safeParse(flowPathRaw);
-            if (parsed.success) {
-              nameToPath = await buildFlowNameToPathMap({
-                inputFlowPaths: parsed.data,
-                projectRoot: stepsCtx.workingDirectory,
-                logger,
-              });
-            } else {
-              logger.warn(
-                'Ignoring malformed flow_path input (expected a non-empty array of non-empty strings).'
-              );
-            }
-          }
-          flowResults = await parseMaestroResults(junitDirectory, nameToPath);
+          logger.warn(
+            'Ignoring malformed flow_path input (expected a non-empty array of non-empty strings).'
+          );
         }
+      }
 
+      try {
+        const flowResults = await parseMaestroResults(junitDirectory, nameToPath);
         if (flowResults.length === 0) {
           logger.info('No maestro test results found, skipping report');
           return;
         }
 
-        // Detect truly conflicting results: the same (path, retryCount) twice means two
-        // flow files resolved to the same path, which we can't disambiguate and the API
-        // rejects as a duplicate. Same path with different retryCount is expected
-        // (per-attempt results from retries).
+        // Detect truly conflicting results: same (name, retryCount) pair means different flow files
+        // share the same name (Maestro config override), which we can't disambiguate.
+        // Same name with different retryCount is expected (per-attempt results from retries).
         const seen = new Set<string>();
         const conflicting = new Set<string>();
         for (const r of flowResults) {
-          const key = `${r.path}:${r.retryCount}`;
+          const key = `${r.name}:${r.retryCount}`;
           if (seen.has(key)) {
-            conflicting.add(r.path);
+            conflicting.add(r.name);
           }
           seen.add(key);
         }
         if (conflicting.size > 0) {
-          const conflictList = [...conflicting].join(', ');
           logger.error(
-            usedFileAttrs
-              ? `The same flow file was reported more than once in a single attempt: ` +
-                  `${conflictList}. Skipping report. Check for duplicate flow_path entries ` +
-                  `or leftover XML files in the JUnit report directory.`
-              : `Duplicate Maestro flow names found: ${conflictList}. Skipping report. ` +
-                  `Give each flow a unique name, or upgrade Maestro to >= 2.6.0 (flows are ` +
-                  `then identified by file path, so duplicate names are fine).`
+            `Duplicate test case names found in JUnit output: ${[...conflicting].join(
+              ', '
+            )}. Skipping report. Ensure each Maestro flow has a unique name.`
           );
           return;
         }

packages/build-tools/src/steps/functions/restoreBuildCache.ts

@@ -19,7 +19,6 @@ import {
   generateDefaultBuildCacheKeyAsync,
   getCcachePath,
 } from '../../utils/cacheKey';
-import { Datadog } from '../../datadog';
 import { GRADLE_CACHE_KEY_PREFIX, generateGradleCacheKeyAsync } from '../../utils/gradleCacheKey';
 import { TurtleFetchError, turtleFetch } from '../../utils/turtleFetch';
 
@@ -206,16 +205,16 @@ export async function restoreGradleCacheAsync({
   }
 
   try {
-    // Enable build cache via user-level gradle.properties.
-    // This avoids mutating android/gradle.properties which affects fingerprinting.
-    const gradleUserHome = path.join(os.homedir(), '.gradle');
-    await fs.promises.mkdir(gradleUserHome, { recursive: true });
-    const userGradlePropertiesPath = path.join(gradleUserHome, 'gradle.properties');
-    await fs.promises.appendFile(userGradlePropertiesPath, '\norg.gradle.caching=true\n');
+    const gradlePropertiesPath = path.join(workingDirectory, 'android', 'gradle.properties');
+    const gradlePropertiesContent = await fs.promises.readFile(gradlePropertiesPath, 'utf-8');
+    await fs.promises.writeFile(
+      gradlePropertiesPath,
+      `${gradlePropertiesContent}\n\norg.gradle.caching=true\n`
+    );
 
-    // Configure cache cleanup via init script.
-    // Works with both Gradle 8 and 9 (org.gradle.cache.cleanup property was removed in Gradle 9).
-    const initScriptDir = path.join(gradleUserHome, 'init.d');
+    // Configure cache cleanup via init script (works with both Gradle 8 and 9,
+    // org.gradle.cache.cleanup property was removed in Gradle 9)
+    const initScriptDir = path.join(os.homedir(), '.gradle', 'init.d');
     await fs.promises.mkdir(initScriptDir, { recursive: true });
     await fs.promises.writeFile(
       path.join(initScriptDir, 'eas-cache-cleanup.gradle'),
@@ -283,10 +282,22 @@ export async function restoreGradleCacheAsync({
       `Gradle cache restored to ${gradleCachesPath} (${hitType === 'direct_hit' ? 'direct hit' : 'prefix match'})`
     );
 
-    Datadog.log(`Gradle cache restored (${hitType})`, {
-      event: 'gradle_cache_restored',
-      cache_hit_type: hitType,
-    });
+    try {
+      await turtleFetch(new URL('v2/turtle-builds/logs', expoApiServerURL).toString(), 'POST', {
+        json: {
+          buildId: jobId,
+          message: `Gradle cache restored (${hitType})`,
+          tags: {
+            event: 'gradle_cache_restored',
+            cache_hit_type: hitType,
+          },
+        },
+        headers: {
+          Authorization: `Bearer ${robotAccessToken}`,
+        },
+        shouldThrowOnNotOk: false,
+      });
+    } catch {}
   } catch (err: unknown) {
     if (err instanceof TurtleFetchError && err.response?.status === 404) {
       logger.info('No Gradle cache found for this key');

packages/build-tools/src/steps/functions/restoreCache.ts

@@ -69,10 +69,6 @@ export function createRestoreCacheFunction(): BuildFunction {
           .filter(key => key !== '');
 
         const jobId = nullthrows(env.EAS_BUILD_ID, 'EAS_BUILD_ID is not set');
-        const expoApiServerURL = nullthrows(
-          stepsCtx.global.staticContext.expoApiServerURL,
-          'expoApiServerURL is not set'
-        );
         const robotAccessToken = nullthrows(
           stepsCtx.global.staticContext.job.secrets?.robotAccessToken,
           'robotAccessToken is not set'
@@ -81,7 +77,7 @@ export function createRestoreCacheFunction(): BuildFunction {
         const { archivePath, matchedKey } = await downloadCacheAsync({
           logger,
           jobId,
-          expoApiServerURL,
+          expoApiServerURL: stepsCtx.global.staticContext.expoApiServerURL,
           robotAccessToken,
           paths,
           key,

packages/build-tools/src/steps/functions/rolloutPosthogFlag.ts

@@ -1,279 +0,0 @@
-import { UserError } from '@expo/eas-build-job';
-import { bunyan } from '@expo/logger';
-import { BuildFunction, BuildStepInput, BuildStepInputValueTypeName } from '@expo/steps';
-import { z } from 'zod';
-
-import { PosthogClient } from '../utils/PosthogClient';
-import { PosthogUtils } from '../utils/PosthogUtils';
-
-const SEARCH_LIMIT = 200;
-
-const FeatureFlagGroupSchema = z.object({ properties: z.unknown().optional() }).passthrough();
-const FeatureFlagSchema = z
-  .object({
-    id: z.number(),
-    key: z.string(),
-    filters: z
-      .object({
-        groups: z.array(FeatureFlagGroupSchema).optional(),
-        payloads: z.record(z.string(), z.unknown()).optional(),
-      })
-      .passthrough()
-      .optional(),
-  })
-  .passthrough();
-const FlagSearchResponseSchema = z.object({ results: z.array(z.unknown()) });
-
-type FeatureFlagGroup = z.infer<typeof FeatureFlagGroupSchema>;
-type FeatureFlagFilters = NonNullable<z.infer<typeof FeatureFlagSchema>['filters']>;
-
-function isCatchAllGroup(group: FeatureFlagGroup): boolean {
-  const { properties } = group;
-  return (
-    properties === undefined ||
-    properties === null ||
-    (Array.isArray(properties) && properties.length === 0)
-  );
-}
-
-export function createRolloutPosthogFlagFunction(): BuildFunction {
-  return new BuildFunction({
-    namespace: 'eas',
-    id: 'posthog_flag_rollout',
-    name: 'Roll out a PostHog feature flag',
-    __metricsId: 'eas/posthog_flag_rollout',
-    inputProviders: [
-      BuildStepInput.createProvider({
-        id: 'flag',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: true,
-      }),
-      BuildStepInput.createProvider({
-        id: 'active',
-        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'rollout_percentage',
-        allowedValueTypeName: BuildStepInputValueTypeName.NUMBER,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'payload',
-        allowedValueTypeName: BuildStepInputValueTypeName.JSON,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'variant',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'api_key',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'project_id',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'ignore_error',
-        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
-        required: false,
-      }),
-    ],
-    fn: async (stepCtx, { inputs, env, signal }) => {
-      const { logger } = stepCtx;
-      const ignoreError = Boolean(inputs.ignore_error.value);
-
-      const flagKey = inputs.flag.value as string;
-      const active = inputs.active.value as boolean | undefined;
-      const rolloutPercentage = inputs.rollout_percentage.value as number | undefined;
-      const payload = inputs.payload.value as Record<string, unknown> | undefined;
-      const variant = inputs.variant.value as string | undefined;
-      if (active === undefined && rolloutPercentage === undefined && payload === undefined) {
-        throw new UserError(
-          'EAS_POSTHOG_FLAG_NO_CHANGE',
-          'You need to provide "active", "rollout_percentage", or "payload" to change the feature flag.'
-        );
-      }
-      if (
-        rolloutPercentage !== undefined &&
-        (!Number.isInteger(rolloutPercentage) || rolloutPercentage < 0 || rolloutPercentage > 100)
-      ) {
-        throw new UserError(
-          'EAS_POSTHOG_FLAG_INVALID_ROLLOUT',
-          `"rollout_percentage" must be an integer between 0 and 100, got ${rolloutPercentage}.`
-        );
-      }
-
-      const result = PosthogClient.fromEnv({
-        apiKeyOverride: inputs.api_key.value as string | undefined,
-        projectIdOverride: inputs.project_id.value as string | undefined,
-        env,
-      });
-      if (!result.client) {
-        PosthogUtils.failOrLogError({
-          logger,
-          ignoreError,
-          error: PosthogUtils.missingCredentialsError(result.missing),
-        });
-        return;
-      }
-      const client = result.client;
-
-      await rolloutPosthogFlagAsync({
-        logger,
-        client,
-        flagKey,
-        active,
-        rolloutPercentage,
-        payload,
-        variant,
-        ignoreError,
-        signal,
-      });
-    },
-  });
-}
-
-async function rolloutPosthogFlagAsync({
-  logger,
-  client,
-  flagKey,
-  active,
-  rolloutPercentage,
-  payload,
-  variant,
-  ignoreError,
-  signal,
-}: {
-  logger: bunyan;
-  client: PosthogClient;
-  flagKey: string;
-  active: boolean | undefined;
-  rolloutPercentage: number | undefined;
-  payload: Record<string, unknown> | undefined;
-  variant: string | undefined;
-  ignoreError: boolean;
-  signal: AbortSignal | undefined;
-}): Promise<void> {
-  let searchResponse;
-  try {
-    searchResponse = await client.requestAsync(
-      'GET',
-      `/feature_flags/?limit=${SEARCH_LIMIT}&search=${encodeURIComponent(flagKey)}`,
-      {
-        action: `Looking up PostHog flag "${flagKey}"`,
-        forbiddenScope: 'feature_flag:read',
-        signal,
-      }
-    );
-  } catch (error) {
-    PosthogUtils.failOrLogError({ logger, ignoreError, error });
-    return;
-  }
-
-  let results: unknown[];
-  try {
-    results = FlagSearchResponseSchema.parse(await searchResponse.json()).results;
-  } catch (error) {
-    PosthogUtils.failOrLogError({
-      logger,
-      ignoreError,
-      error: new UserError(
-        'EAS_POSTHOG_FLAG_UNEXPECTED_RESPONSE',
-        `PostHog flag lookup for "${flagKey}" returned an unexpected response.`,
-        { cause: error }
-      ),
-    });
-    return;
-  }
-
-  const flag = results
-    .flatMap(result => {
-      const parsed = FeatureFlagSchema.safeParse(result);
-      return parsed.success ? [parsed.data] : [];
-    })
-    .find(candidate => candidate.key === flagKey);
-  if (!flag) {
-    PosthogUtils.failOrLogError({
-      logger,
-      ignoreError,
-      error: new UserError(
-        'EAS_POSTHOG_FLAG_NOT_FOUND',
-        `No PostHog feature flag with key "${flagKey}" was found. Check the "flag" input.`
-      ),
-    });
-    return;
-  }
-
-  const patch: Record<string, unknown> = {};
-  if (active !== undefined) {
-    patch.active = active;
-  }
-  let filters = flag.filters;
-  if (rolloutPercentage !== undefined) {
-    filters = buildRolloutFilters({ logger, flagKey, filters, rolloutPercentage });
-  }
-  if (payload !== undefined) {
-    filters = {
-      ...filters,
-      payloads: { ...filters?.payloads, [variant ?? 'true']: JSON.stringify(payload) },
-    };
-  }
-  if (rolloutPercentage !== undefined || payload !== undefined) {
-    patch.filters = filters;
-  }
-
-  try {
-    await client.requestAsync('PATCH', `/feature_flags/${flag.id}/`, {
-      action: `Updating PostHog flag "${flagKey}"`,
-      forbiddenScope: 'feature_flag:write',
-      body: patch,
-      signal,
-    });
-  } catch (error) {
-    PosthogUtils.failOrLogError({ logger, ignoreError, error });
-    return;
-  }
-
-  logger.info(`Updated PostHog feature flag "${flagKey}".`);
-}
-
-function buildRolloutFilters({
-  logger,
-  flagKey,
-  filters,
-  rolloutPercentage,
-}: {
-  logger: bunyan;
-  flagKey: string;
-  filters: FeatureFlagFilters | undefined;
-  rolloutPercentage: number;
-}): FeatureFlagFilters {
-  const groups = filters?.groups ?? [];
-  if (groups.length === 0) {
-    return { ...filters, groups: [{ properties: [], rollout_percentage: rolloutPercentage }] };
-  }
-
-  const catchAllIndex = groups.findIndex(isCatchAllGroup);
-  const hasCatchAll = catchAllIndex >= 0;
-  const targetIndex = hasCatchAll ? catchAllIndex : 0;
-  if (!hasCatchAll) {
-    logger.warn(
-      `Flag "${flagKey}" has no catch-all release-condition group; setting rollout_percentage on the first group, which is condition-scoped.`
-    );
-  } else if (groups.length > 1) {
-    logger.warn(
-      `Flag "${flagKey}" has ${groups.length} release-condition groups; setting rollout_percentage only on the catch-all group to preserve the others.`
-    );
-  }
-
-  const groupsWithRollout = groups.map((group, index) =>
-    index === targetIndex ? { ...group, rollout_percentage: rolloutPercentage } : group
-  );
-  return { ...filters, groups: groupsWithRollout };
-}

packages/build-tools/src/steps/functions/saveCache.ts

@@ -43,10 +43,6 @@ export function createSaveCacheFunction(): BuildFunction {
           .filter(path => path.length > 0);
         const key = z.string().parse(inputs.key.value);
         const jobId = nullthrows(env.EAS_BUILD_ID, 'EAS_BUILD_ID is not set');
-        const expoApiServerURL = nullthrows(
-          stepsCtx.global.staticContext.expoApiServerURL,
-          'expoApiServerURL is not set'
-        );
         const robotAccessToken = nullthrows(
           stepsCtx.global.staticContext.job.secrets?.robotAccessToken,
           'robotAccessToken is not set'
@@ -65,7 +61,7 @@ export function createSaveCacheFunction(): BuildFunction {
           await uploadPublicCacheAsync({
             logger,
             jobId,
-            expoApiServerURL,
+            expoApiServerURL: stepsCtx.global.staticContext.expoApiServerURL,
             robotAccessToken,
             archivePath,
             key,
@@ -77,7 +73,7 @@ export function createSaveCacheFunction(): BuildFunction {
           await uploadCacheAsync({
             logger,
             jobId,
-            expoApiServerURL,
+            expoApiServerURL: stepsCtx.global.staticContext.expoApiServerURL,
             robotAccessToken,
             archivePath,
             key,

packages/build-tools/src/steps/functions/startAgentDeviceRemoteSession.ts

@@ -1,9 +1,9 @@
 import { SystemError } from '@expo/eas-build-job';
-import { type bunyan } from '@expo/logger';
+import { bunyan } from '@expo/logger';
 import {
   BuildFunction,
   BuildRuntimePlatform,
-  type BuildStepEnv,
+  BuildStepEnv,
   BuildStepInput,
   BuildStepInputValueTypeName,
 } from '@expo/steps';
@@ -12,32 +12,23 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 
-import { type CustomBuildContext } from '../../customBuildContext';
-import { Sentry } from '../../sentry';
-import { pollAgentDeviceArtifactsForUploadAsync } from '../utils/agentDeviceArtifacts';
+import { CustomBuildContext } from '../../customBuildContext';
+import { sleepAsync } from '../../utils/retry';
 import {
-  type DetachedProcessHandle,
+  DetachedProcessHandle,
+  ensureBrewPackageInstalledAsync,
   getDeviceRunSessionIdOrThrow,
-  getNgrokAuthtokenOrThrow,
-  getNgrokTunnelDomainOrThrow,
-  selectXcodeDeveloperDirectoryAsync,
   spawnDetached,
-  startNgrokTunnelAsync,
   startServeSimWithTunnelAsync,
   uploadRemoteSessionConfigAsync,
-  waitForDeviceRunSessionStoppedAsync,
-  waitForFileAsync,
 } from '../utils/remoteDeviceRunSession';
 
-const AGENT_DEVICE_PACKAGE_NAME = 'agent-device';
-const AGENT_DEVICE_REPO_URL = 'https://github.com/callstack/agent-device.git';
+const AGENT_DEVICE_REPO_URL = 'https://github.com/callstackincubator/agent-device.git';
 const SRC_DIR = '/tmp/agent-device-src';
 const DAEMON_JSON_PATH = path.join(os.homedir(), '.agent-device', 'daemon.json');
+const XCODE_DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer';
+const CLOUDFLARED_LINUX_INSTALL_PATH = '/usr/local/bin/cloudflared';
 const STARTUP_TIMEOUT_MS = 60_000;
-const AGENT_DEVICE_DAEMON_ENV = {
-  AGENT_DEVICE_DAEMON_SERVER_MODE: 'http',
-  AGENT_DEVICE_RETAIN_ARTIFACTS: '1',
-};
 
 export function createStartAgentDeviceRemoteSessionBuildFunction(
   ctx: CustomBuildContext
@@ -54,14 +45,11 @@ export function createStartAgentDeviceRemoteSessionBuildFunction(
         allowedValueTypeName: BuildStepInputValueTypeName.STRING,
       }),
     ],
-    fn: async ({ logger, global }, { inputs, env, signal }) => {
-      // Fail fast before any expensive setup if the injected env
-      // vars are missing: DEVICE_RUN_SESSION_ID (to report the remote config
-      // back to the API server), EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN (base domain
-      // for our ngrok tunnels), and NGROK_AUTHTOKEN (to authenticate them).
+    fn: async ({ logger, global }, { inputs, env }) => {
+      // Fail fast before any expensive setup if the orchestrator-injected
+      // DEVICE_RUN_SESSION_ID env var is missing — without it we cannot
+      // report the remote config back to the API server.
       const deviceRunSessionId = getDeviceRunSessionIdOrThrow(env);
-      const ngrokTunnelDomain = getNgrokTunnelDomainOrThrow(env);
-      const ngrokAuthtoken = getNgrokAuthtokenOrThrow(env);
 
       const packageVersion = inputs.package_version.value as string | undefined;
       const { runtimePlatform } = global;
@@ -70,24 +58,61 @@ export function createStartAgentDeviceRemoteSessionBuildFunction(
       );
 
       if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
-        await selectXcodeDeveloperDirectoryAsync({ env, logger });
+        logger.info(`Selecting Xcode developer directory: ${XCODE_DEVELOPER_DIR}.`);
+        await spawn('sudo', ['xcode-select', '-s', XCODE_DEVELOPER_DIR], { env, logger });
       }
 
+      logger.info('Ensuring cloudflared is installed.');
+      const cloudflaredCommand = await ensureCloudflaredInstalledAsync({
+        runtimePlatform,
+        env,
+        logger,
+      });
+
+      logger.info(
+        packageVersion
+          ? `Cloning agent-device @ v${packageVersion} into ${SRC_DIR}.`
+          : `Cloning agent-device (latest) into ${SRC_DIR}.`
+      );
+      await cloneAgentDeviceAsync({ packageVersion, env, logger });
+
+      logger.info('Installing agent-device dependencies.');
+      await spawn('bun', ['install', '--production'], {
+        cwd: SRC_DIR,
+        env,
+        logger,
+      });
+
       logger.info('Launching agent-device daemon.');
-      const daemonProcess = await startAgentDeviceDaemonAsync({ packageVersion, env, logger });
+      spawnDetached({
+        command: 'bun',
+        args: ['run', 'src/daemon.ts'],
+        cwd: SRC_DIR,
+        env: { ...env, AGENT_DEVICE_DAEMON_SERVER_MODE: 'http' },
+      });
 
       logger.info(`Waiting for daemon credentials at ${DAEMON_JSON_PATH}.`);
-      const { port: daemonPort, token: daemonToken } = await waitForDaemonInfoAsync({
-        daemonProcess,
+      await waitForFileAsync({
+        filePath: DAEMON_JSON_PATH,
+        timeoutMs: STARTUP_TIMEOUT_MS,
+        description: 'agent-device daemon',
       });
+      const { port: daemonPort, token: daemonToken } = readDaemonInfo(DAEMON_JSON_PATH);
       logger.info(`Daemon is listening on port ${daemonPort}; loaded auth token.`);
 
-      const agentDeviceRemoteSessionUrl = await startNgrokTunnelAsync({
-        port: daemonPort,
-        subdomainPrefix: 'agent-device',
-        baseDomain: ngrokTunnelDomain,
-        authtoken: ngrokAuthtoken,
-        logger,
+      logger.info(`Starting cloudflared tunnel to http://localhost:${daemonPort}.`);
+      const cloudflared = spawnDetached({
+        command: cloudflaredCommand,
+        args: ['tunnel', '--url', `http://localhost:${daemonPort}`],
+        env,
+      });
+
+      logger.info('Waiting for a public tunnel URL.');
+      const agentDeviceRemoteSessionUrl = await waitForMatchInOutputAsync({
+        process: cloudflared,
+        pattern: /https:\/\/[a-z0-9-]+\.trycloudflare\.com/,
+        timeoutMs: STARTUP_TIMEOUT_MS,
+        description: 'cloudflared tunnel',
       });
       logger.info(`Tunnel is ready at ${agentDeviceRemoteSessionUrl}.`);
 
@@ -95,8 +120,7 @@ export function createStartAgentDeviceRemoteSessionBuildFunction(
       // on Darwin. Android sessions go without a preview URL.
       let webPreviewUrl: string | undefined;
       if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
-        const { previewUrl } = await startServeSimWithTunnelAsync(ctx, {
-          baseDomain: ngrokTunnelDomain,
+        const { previewUrl } = await startServeSimWithTunnelAsync({
           env,
           logger,
           timeoutMs: STARTUP_TIMEOUT_MS,
@@ -115,108 +139,69 @@ export function createStartAgentDeviceRemoteSessionBuildFunction(
         },
         logger,
       });
-      void pollAgentDeviceArtifactsForUploadAsync(ctx, {
-        deviceRunSessionId,
-        daemonUrl: `http://127.0.0.1:${daemonPort}`,
-        daemonToken,
-        logger,
-      });
 
-      await waitForDeviceRunSessionStoppedAsync({
-        ctx,
-        deviceRunSessionId,
-        logger,
-        signal,
-      });
+      logger.info('Remote session is live. Keeping the job alive until the session is stopped.');
+      // Keep the turtle job alive so the daemon and tunnel stay reachable
+      // until stopDeviceRunSession cancels the run.
+      await new Promise<never>(() => {});
     },
   });
 }
 
-async function startAgentDeviceDaemonAsync({
-  packageVersion,
+async function ensureCloudflaredInstalledAsync({
+  runtimePlatform,
   env,
   logger,
 }: {
-  packageVersion: string | undefined;
+  runtimePlatform: BuildRuntimePlatform;
   env: BuildStepEnv;
   logger: bunyan;
-}): Promise<DetachedProcessHandle> {
-  const packageSpec = createAgentDevicePackageSpec(packageVersion);
-  try {
-    logger.info(`Installing ${packageSpec} globally with Bun.`);
-    await spawn('bun', ['add', '--global', packageSpec], {
-      env,
-      logger,
-    });
-
-    const daemonPath = getGlobalAgentDeviceDaemonPath(env);
-    if (!fs.existsSync(daemonPath)) {
-      throw new SystemError(`Expected agent-device daemon entry at ${daemonPath}.`);
-    }
-
-    logger.info(`Launching daemon from ${daemonPath}.`);
-    return spawnDetached({
-      command: 'node',
-      args: [daemonPath],
-      env: { ...env, ...AGENT_DEVICE_DAEMON_ENV },
-    });
-  } catch (err) {
-    const error = err instanceof Error ? err : new Error(String(err));
-    const bunVersion = await getBunVersionForDiagnosticsAsync(env);
-    Sentry.capture(
-      'Failed to start agent-device daemon from global Bun package; falling back to git clone',
-      error,
-      {
-        level: 'warning',
-        tags: {
-          phase: 'agent-device-daemon-start',
-          fallback: 'git-clone',
-        },
-        extras: {
-          packageSpec,
-          packageVersion: packageVersion ?? 'latest',
-          bunVersion,
-          bunInstallConfigured: Boolean(env.BUN_INSTALL?.trim()),
-        },
-      }
-    );
-    logger.warn(
-      `Failed to start daemon from global ${packageSpec}; falling back to git clone: ${error.message}`
-    );
-    return await startAgentDeviceDaemonFromGitAsync({ packageVersion, env, logger });
+}): Promise<string> {
+  if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
+    await ensureBrewPackageInstalledAsync({ name: 'cloudflared', env, logger });
+    return 'cloudflared';
   }
-}
-
-async function startAgentDeviceDaemonFromGitAsync({
-  packageVersion,
-  env,
-  logger,
-}: {
-  packageVersion: string | undefined;
-  env: BuildStepEnv;
-  logger: bunyan;
-}): Promise<DetachedProcessHandle> {
-  logger.info(
-    packageVersion
-      ? `Cloning agent-device @ v${packageVersion} into ${SRC_DIR}.`
-      : `Cloning agent-device (latest) into ${SRC_DIR}.`
-  );
-  await cloneAgentDeviceAsync({ packageVersion, env, logger });
-
-  logger.info('Installing agent-device dependencies.');
-  await spawn('bun', ['install', '--production'], {
-    cwd: SRC_DIR,
+  if (await isCommandAvailableAsync({ command: 'cloudflared', env })) {
+    return 'cloudflared';
+  }
+  const cloudflaredArch = cloudflaredLinuxArchForNodeArch(os.arch());
+  const downloadUrl = `https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${cloudflaredArch}`;
+  logger.info(`Downloading cloudflared from ${downloadUrl} to ${CLOUDFLARED_LINUX_INSTALL_PATH}.`);
+  await spawn('sudo', ['curl', '-fsSL', '-o', CLOUDFLARED_LINUX_INSTALL_PATH, downloadUrl], {
     env,
     logger,
   });
+  await spawn('sudo', ['chmod', '+x', CLOUDFLARED_LINUX_INSTALL_PATH], { env, logger });
+  // Return the absolute install path so the tunnel command works even when
+  // /usr/local/bin is not on the step's PATH.
+  return CLOUDFLARED_LINUX_INSTALL_PATH;
+}
 
-  logger.info('Launching daemon from cloned agent-device source.');
-  return spawnDetached({
-    command: 'bun',
-    args: ['run', 'src/daemon.ts'],
-    cwd: SRC_DIR,
-    env: { ...env, ...AGENT_DEVICE_DAEMON_ENV },
-  });
+function cloudflaredLinuxArchForNodeArch(arch: string): 'amd64' | 'arm64' {
+  if (arch === 'x64') {
+    return 'amd64';
+  }
+  if (arch === 'arm64') {
+    return 'arm64';
+  }
+  throw new SystemError(
+    `Unsupported architecture for cloudflared on Linux: "${arch}". Expected "x64" or "arm64".`
+  );
+}
+
+async function isCommandAvailableAsync({
+  command,
+  env,
+}: {
+  command: string;
+  env: BuildStepEnv;
+}): Promise<boolean> {
+  try {
+    await spawn('bash', ['-c', `command -v ${command}`], { env, ignoreStdio: true });
+    return true;
+  } catch {
+    return false;
+  }
 }
 
 async function cloneAgentDeviceAsync({
@@ -235,64 +220,54 @@ async function cloneAgentDeviceAsync({
   });
 }
 
-async function waitForDaemonInfoAsync({
-  daemonProcess,
+async function waitForMatchInOutputAsync({
+  process,
+  pattern,
+  timeoutMs,
+  description,
 }: {
-  daemonProcess: DetachedProcessHandle;
-}): Promise<{ port: number; token: string }> {
-  try {
-    return await waitForFileAsync({
-      filePath: DAEMON_JSON_PATH,
-      timeoutMs: STARTUP_TIMEOUT_MS,
-      description: 'agent-device daemon credentials',
-      parse: parseDaemonInfo,
-    });
-  } catch (err) {
-    const output = daemonProcess.getOutput();
-    throw new SystemError(
-      `${
-        err instanceof Error
-          ? err.message
-          : `Timed out waiting for agent-device daemon credentials.`
-      }${output ? `\nagent-device daemon output:\n${output}` : ''}`
-    );
+  process: DetachedProcessHandle;
+  pattern: RegExp;
+  timeoutMs: number;
+  description: string;
+}): Promise<string> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const match = pattern.exec(process.getOutput());
+    if (match) {
+      return match[1] ?? match[0];
+    }
+    await sleepAsync(1_000);
   }
-}
-
-async function getBunVersionForDiagnosticsAsync(env: BuildStepEnv): Promise<string> {
-  try {
-    const result = await spawn('bun', ['--version'], { stdio: 'pipe', env, cwd: os.tmpdir() });
-    return result.stdout.trim() || 'unknown';
-  } catch {
-    return 'unknown';
-  }
-}
-
-function createAgentDevicePackageSpec(packageVersion: string | undefined): string {
-  const versionSpec = packageVersion ? packageVersion.replace(/^v(?=\d)/, '') : 'latest';
-  return `${AGENT_DEVICE_PACKAGE_NAME}@${versionSpec}`;
-}
-
-function getGlobalAgentDeviceDaemonPath(env: BuildStepEnv): string {
-  return path.join(
-    getBunInstallDirectory(env),
-    'install',
-    'global',
-    'node_modules',
-    AGENT_DEVICE_PACKAGE_NAME,
-    'dist',
-    'src',
-    'internal',
-    'daemon.js'
+  throw new SystemError(
+    `Timed out waiting for ${description} to start. Last output:\n${process.getOutput() || '<empty>'}`
   );
 }
 
-function getBunInstallDirectory(env: BuildStepEnv): string {
-  const bunInstall = env.BUN_INSTALL?.trim();
-  return bunInstall ? bunInstall : path.join(os.homedir(), '.bun');
+async function waitForFileAsync({
+  filePath,
+  timeoutMs,
+  description,
+}: {
+  filePath: string;
+  timeoutMs: number;
+  description: string;
+}): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    try {
+      await fs.promises.access(filePath);
+      return;
+    } catch {
+      // not yet; keep polling
+    }
+    await sleepAsync(1_000);
+  }
+  throw new SystemError(`Timed out waiting for ${description} to write ${filePath}.`);
 }
 
-function parseDaemonInfo(raw: string): { port: number; token: string } {
+function readDaemonInfo(filePath: string): { port: number; token: string } {
+  const raw = fs.readFileSync(filePath, 'utf8');
   const parsed = JSON.parse(raw) as unknown;
   if (
     !parsed ||
@@ -301,7 +276,7 @@ function parseDaemonInfo(raw: string): { port: number; token: string } {
     typeof (parsed as { token: unknown }).token !== 'string'
   ) {
     throw new SystemError(
-      'Expected daemon credentials to contain { "httpPort": <number>, "token": "..." }.'
+      `Expected ${filePath} to contain { "httpPort": <number>, "token": "..." }.`
     );
   }
   const { httpPort, token } = parsed as { httpPort: number; token: string };

packages/build-tools/src/steps/functions/startArgentRemoteSession.ts

@@ -1,290 +0,0 @@
-import { SystemError } from '@expo/eas-build-job';
-import { type bunyan } from '@expo/logger';
-import {
-  BuildFunction,
-  BuildRuntimePlatform,
-  BuildStepInput,
-  BuildStepInputValueTypeName,
-} from '@expo/steps';
-import spawn from '@expo/turtle-spawn';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import semver from 'semver';
-import { z } from 'zod';
-
-import { CustomBuildContext } from '../../customBuildContext';
-import { Sentry } from '../../sentry';
-import { isProcessDescendantOfAsync } from '../../utils/processes';
-import { sleepAsync } from '../../utils/retry';
-import { pollArgentArtifactsForUploadAsync } from '../utils/argentArtifacts';
-import {
-  getDeviceRunSessionIdOrThrow,
-  getNgrokAuthtokenOrThrow,
-  getNgrokTunnelDomainOrThrow,
-  selectXcodeDeveloperDirectoryAsync,
-  spawnDetached,
-  startNgrokTunnelAsync,
-  startServeSimWithTunnelAsync,
-  uploadRemoteSessionConfigAsync,
-  waitForDeviceRunSessionStoppedAsync,
-} from '../utils/remoteDeviceRunSession';
-
-const ARGENT_PACKAGE_NAME = '@swmansion/argent';
-export const MIN_ARGENT_REMOTE_SESSION_VERSION = '0.12.0';
-const ARGENT_ARTIFACTS_LIST_ENDPOINT_FLAG = 'artifacts-list-endpoint';
-const ARGENT_STATE_DIR = path.join(os.homedir(), '.argent');
-const STARTUP_TIMEOUT_MS = 60_000;
-
-const ArgentToolServerStateSchema = z.object({
-  port: z.number(),
-  pid: z.number(),
-  token: z.string().optional(),
-});
-
-type ArgentToolServerState = z.infer<typeof ArgentToolServerStateSchema>;
-
-export function createStartArgentRemoteSessionBuildFunction(
-  ctx: CustomBuildContext
-): BuildFunction {
-  return new BuildFunction({
-    namespace: 'eas',
-    id: 'start_argent_remote_session',
-    name: 'Start argent remote session',
-    __metricsId: 'eas/start_argent_remote_session',
-    inputProviders: [
-      BuildStepInput.createProvider({
-        id: 'package_version',
-        required: false,
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-      }),
-    ],
-    fn: async ({ logger, global }, { inputs, env, signal }) => {
-      // Fail fast before any expensive setup if the injected env
-      // vars are missing: DEVICE_RUN_SESSION_ID (to report the remote config
-      // back to the API server), EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN (base domain
-      // for our ngrok tunnels), and NGROK_AUTHTOKEN (to authenticate them).
-      const deviceRunSessionId = getDeviceRunSessionIdOrThrow(env);
-      const ngrokTunnelDomain = getNgrokTunnelDomainOrThrow(env);
-      const ngrokAuthtoken = getNgrokAuthtokenOrThrow(env);
-
-      const packageVersion = inputs.package_version.value as string | undefined;
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion, logger });
-      const versionSpec = packageVersion ?? 'latest';
-      const { runtimePlatform } = global;
-      logger.info(
-        `Starting argent remote session (version: ${versionSpec}, runtime: ${runtimePlatform}).`
-      );
-
-      if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
-        await selectXcodeDeveloperDirectoryAsync({ env, logger });
-      }
-
-      logger.info('Enabling the Argent artifacts list endpoint flag.');
-      await spawn(
-        'bunx',
-        [`${ARGENT_PACKAGE_NAME}@${versionSpec}`, 'enable', ARGENT_ARTIFACTS_LIST_ENDPOINT_FLAG],
-        { env, logger }
-      );
-
-      logger.info(`Launching ${ARGENT_PACKAGE_NAME}@${versionSpec} tool-server via bunx.`);
-      // Keep Argent itself in foreground mode under the detached bunx process. This preserves
-      // the bunx -> Argent CLI -> tool-server ancestry used to identify the matching state file.
-      const argentServer = spawnDetached({
-        command: 'bunx',
-        args: [
-          `${ARGENT_PACKAGE_NAME}@${versionSpec}`,
-          'server',
-          'start',
-          '--port',
-          '0',
-          '--idle-timeout',
-          '0',
-          '--force',
-        ],
-        env,
-      });
-      if (argentServer.pid === undefined) {
-        throw new SystemError(
-          'Failed to start Argent: could not determine the PID of the launched process.'
-        );
-      }
-
-      logger.info(`Waiting for argent tool-server state in ${ARGENT_STATE_DIR}.`);
-      let toolServerPort: number;
-      let toolServerToken: string | undefined;
-      try {
-        const toolServerState = await waitForArgentToolServerStateAsync({
-          stateDir: ARGENT_STATE_DIR,
-          ancestorPid: argentServer.pid,
-          timeoutMs: STARTUP_TIMEOUT_MS,
-        });
-        toolServerPort = toolServerState.port;
-        toolServerToken = toolServerState.token;
-      } catch (err) {
-        const output = argentServer.getOutput();
-        throw new SystemError(
-          `${
-            err instanceof Error ? err.message : `Timed out waiting for argent tool-server state.`
-          }${output ? `\nArgent tool-server output:\n${output}` : ''}`
-        );
-      }
-      logger.info(`Argent tool-server is listening on port ${toolServerPort}.`);
-      const artifactPollAbortController = new AbortController();
-      const artifactPollSignal = signal
-        ? AbortSignal.any([signal, artifactPollAbortController.signal])
-        : artifactPollAbortController.signal;
-      const artifactPollingPromise = pollArgentArtifactsForUploadAsync(ctx, {
-        deviceRunSessionId,
-        toolsUrl: `http://127.0.0.1:${toolServerPort}`,
-        toolsAuthToken: toolServerToken,
-        logger,
-        signal: artifactPollSignal,
-      });
-
-      try {
-        const publicToolsUrl = await startNgrokTunnelAsync({
-          port: toolServerPort,
-          subdomainPrefix: 'argent',
-          baseDomain: ngrokTunnelDomain,
-          authtoken: ngrokAuthtoken,
-          rewriteHostHeader: true,
-          logger,
-        });
-        logger.info(`Tunnel is ready at ${publicToolsUrl}.`);
-
-        // serve-sim is iOS-only — Android sessions go without a preview URL.
-        let webPreviewUrl: string | undefined;
-        if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
-          const serveSim = await startServeSimWithTunnelAsync(ctx, {
-            baseDomain: ngrokTunnelDomain,
-            env,
-            logger,
-            timeoutMs: STARTUP_TIMEOUT_MS,
-          });
-          webPreviewUrl = serveSim.previewUrl;
-          logger.info(`Web preview URL: ${webPreviewUrl}`);
-        }
-
-        await uploadRemoteSessionConfigAsync({
-          ctx,
-          deviceRunSessionId,
-          remoteConfig: {
-            toolsUrl: publicToolsUrl,
-            ...(toolServerToken ? { toolsAuthToken: toolServerToken } : {}),
-            ...(webPreviewUrl ? { webPreviewUrl } : {}),
-          },
-          logger,
-        });
-
-        await waitForDeviceRunSessionStoppedAsync({
-          ctx,
-          deviceRunSessionId,
-          logger,
-          signal,
-        });
-      } finally {
-        artifactPollAbortController.abort();
-        try {
-          await artifactPollingPromise;
-        } catch (err) {
-          const error = err instanceof Error ? err : new Error(String(err));
-          Sentry.capture('Could not finish Argent remote session artifact polling', error);
-          logger.warn({ err: error }, 'Could not finish Argent remote session artifact polling.');
-        }
-      }
-    },
-  });
-}
-
-export function warnIfArgentPackageVersionCannotBeVerified({
-  packageVersion,
-  logger,
-}: {
-  packageVersion: string | undefined;
-  logger: bunyan;
-}): void {
-  if (!packageVersion || packageVersion === 'latest') {
-    return;
-  }
-
-  const validVersion = semver.valid(packageVersion);
-  if (!validVersion) {
-    logger.warn(
-      `Argent remote simulator sessions require ${ARGENT_PACKAGE_NAME}@${MIN_ARGENT_REMOTE_SESSION_VERSION} or newer, ` +
-        `but package_version "${packageVersion}" is not an exact semver version that EAS can verify. ` +
-        `Continuing and letting bunx resolve it.`
-    );
-    return;
-  }
-
-  if (semver.lt(validVersion, MIN_ARGENT_REMOTE_SESSION_VERSION)) {
-    throw new SystemError(
-      `Argent remote simulator sessions require ${ARGENT_PACKAGE_NAME}@${MIN_ARGENT_REMOTE_SESSION_VERSION} or newer. ` +
-        `The requested package_version "${packageVersion}" is too old for the EAS remote-session API. ` +
-        `Use "latest" or pass an exact version >= ${MIN_ARGENT_REMOTE_SESSION_VERSION}.`
-    );
-  }
-}
-
-function parseArgentToolServerState(raw: string): ArgentToolServerState {
-  let json: unknown;
-  try {
-    json = JSON.parse(raw);
-  } catch (err) {
-    throw new SystemError('Expected tool-server state to contain valid JSON.', { cause: err });
-  }
-  const result = ArgentToolServerStateSchema.safeParse(json);
-  if (!result.success) {
-    throw new SystemError(
-      `Expected tool-server state to contain { "port": <number>, "pid": <number>, ... }: ${result.error.message}`
-    );
-  }
-  return result.data;
-}
-
-export async function waitForArgentToolServerStateAsync({
-  stateDir,
-  ancestorPid,
-  timeoutMs,
-  pollIntervalMs = 1_000,
-}: {
-  stateDir: string;
-  ancestorPid: number;
-  timeoutMs: number;
-  pollIntervalMs?: number;
-}): Promise<ArgentToolServerState> {
-  const deadline = Date.now() + timeoutMs;
-  let lastError: unknown;
-
-  while (Date.now() < deadline) {
-    try {
-      const stateFileNames = (await fs.promises.readdir(stateDir)).filter(
-        name => name.startsWith('tool-server') && name.endsWith('.json')
-      );
-      for (const stateFileName of stateFileNames) {
-        try {
-          const state = parseArgentToolServerState(
-            await fs.promises.readFile(path.join(stateDir, stateFileName), 'utf8')
-          );
-          if (await isProcessDescendantOfAsync(state.pid, ancestorPid)) {
-            return state;
-          }
-        } catch (err) {
-          if ((err as NodeJS.ErrnoException).code !== 'ENOENT' && !(err instanceof SystemError)) {
-            throw err;
-          }
-        }
-      }
-    } catch (err) {
-      lastError = err;
-    }
-    await sleepAsync(pollIntervalMs);
-  }
-
-  throw new SystemError(
-    `Timed out waiting for an argent tool-server state file belonging to process ${ancestorPid} in ${stateDir}${
-      lastError instanceof Error ? `: ${lastError.message}` : ''
-    }.`
-  );
-}

packages/build-tools/src/steps/functions/startIosSimulator.ts

@@ -31,12 +31,6 @@ export function createStartIosSimulatorBuildFunction(): BuildFunction {
         defaultValue: 1,
         allowedValueTypeName: BuildStepInputValueTypeName.NUMBER,
       }),
-      BuildStepInput.createProvider({
-        id: 'enable_accessibility_settings',
-        required: false,
-        defaultValue: false,
-        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
-      }),
     ],
     fn: async ({ logger }, { inputs, env }) => {
       try {
@@ -61,29 +55,16 @@ export function createStartIosSimulatorBuildFunction(): BuildFunction {
         | undefined;
       const originalDeviceIdentifier =
         deviceIdentifierInput ?? (await findMostGenericIphoneUuidAsync({ env }));
-      const enableAccessibilitySettings = Boolean(inputs.enable_accessibility_settings.value);
 
       if (!originalDeviceIdentifier) {
         throw new Error('Could not find an iPhone among available simulator devices.');
       }
 
-      if (enableAccessibilitySettings) {
-        await IosSimulatorUtils.enableAccessibilitySettingsAsync({
-          deviceIdentifier: originalDeviceIdentifier,
-          env,
-        });
-      }
       const { udid } = await IosSimulatorUtils.startAsync({
         deviceIdentifier: originalDeviceIdentifier,
         env,
       });
 
-      try {
-        await IosSimulatorUtils.disableApsdAsync({ udid, env });
-      } catch (err) {
-        logger.warn({ err }, 'Failed to disable apsd in the Simulator.');
-      }
-
       await IosSimulatorUtils.waitForReadyAsync({ udid, env });
 
       logger.info('');
@@ -110,23 +91,11 @@ export function createStartIosSimulatorBuildFunction(): BuildFunction {
             env,
           });
 
-          if (enableAccessibilitySettings) {
-            await IosSimulatorUtils.enableAccessibilitySettingsAsync({
-              deviceIdentifier: cloneDeviceName,
-              env,
-            });
-          }
           const { udid: cloneUdid } = await IosSimulatorUtils.startAsync({
             deviceIdentifier: cloneDeviceName,
             env,
           });
 
-          try {
-            await IosSimulatorUtils.disableApsdAsync({ udid: cloneUdid, env });
-          } catch (err) {
-            logger.warn({ err }, 'Failed to disable apsd in the Simulator.');
-          }
-
           await IosSimulatorUtils.waitForReadyAsync({
             udid: cloneUdid,
             env,

packages/build-tools/src/steps/functions/startIosSimulatorRecordings.ts

@@ -1,19 +0,0 @@
-import { BuildFunction, BuildRuntimePlatform } from '@expo/steps';
-
-import { IosSimulatorRecordingUtils } from '../utils/IosSimulatorRecordingUtils';
-
-export function createStartIosSimulatorRecordingsBuildFunction(): BuildFunction {
-  return new BuildFunction({
-    namespace: 'eas',
-    id: 'start_ios_simulator_recordings',
-    name: 'Start iOS Simulator recordings',
-    __metricsId: 'eas/start_ios_simulator_recordings',
-    supportedRuntimePlatforms: [BuildRuntimePlatform.DARWIN],
-    fn: async ({ logger }, { env }) => {
-      await IosSimulatorRecordingUtils.startAsync({
-        env,
-        logger,
-      });
-    },
-  });
-}

packages/build-tools/src/steps/functions/startServeSimRemoteSession.ts

@@ -1,15 +1,15 @@
 import { BuildFunction, BuildRuntimePlatform } from '@expo/steps';
+import spawn from '@expo/turtle-spawn';
 
 import { CustomBuildContext } from '../../customBuildContext';
 import {
   getDeviceRunSessionIdOrThrow,
-  getNgrokTunnelDomainOrThrow,
-  selectXcodeDeveloperDirectoryAsync,
+  ensureBrewPackageInstalledAsync,
   startServeSimWithTunnelAsync,
   uploadRemoteSessionConfigAsync,
-  waitForDeviceRunSessionStoppedAsync,
 } from '../utils/remoteDeviceRunSession';
 
+const XCODE_DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer';
 const STARTUP_TIMEOUT_MS = 60_000;
 
 export function createStartServeSimRemoteSessionBuildFunction(
@@ -21,35 +21,36 @@ export function createStartServeSimRemoteSessionBuildFunction(
     name: 'Start serve-sim remote session',
     __metricsId: 'eas/start_serve_sim_remote_session',
     supportedRuntimePlatforms: [BuildRuntimePlatform.DARWIN],
-    fn: async ({ logger }, { env, signal }) => {
+    fn: async ({ logger }, { env }) => {
       const deviceRunSessionId = getDeviceRunSessionIdOrThrow(env);
-      const ngrokTunnelDomain = getNgrokTunnelDomainOrThrow(env);
 
       logger.info('Starting serve-sim remote session.');
 
-      await selectXcodeDeveloperDirectoryAsync({ env, logger });
+      logger.info(`Selecting Xcode developer directory: ${XCODE_DEVELOPER_DIR}.`);
+      await spawn('sudo', ['xcode-select', '-s', XCODE_DEVELOPER_DIR], { env, logger });
 
-      const { previewUrl } = await startServeSimWithTunnelAsync(ctx, {
-        baseDomain: ngrokTunnelDomain,
+      logger.info('Ensuring cloudflared is installed.');
+      await ensureBrewPackageInstalledAsync({ name: 'cloudflared', env, logger });
+
+      const { previewUrl, streamUrl } = await startServeSimWithTunnelAsync({
         env,
         logger,
         timeoutMs: STARTUP_TIMEOUT_MS,
       });
       logger.info(`Preview URL: ${previewUrl}`);
+      logger.info(`Stream URL: ${streamUrl}`);
 
       await uploadRemoteSessionConfigAsync({
         ctx,
         deviceRunSessionId,
-        remoteConfig: { previewUrl },
+        remoteConfig: { previewUrl, streamUrl },
         logger,
       });
 
-      await waitForDeviceRunSessionStoppedAsync({
-        ctx,
-        deviceRunSessionId,
-        logger,
-        signal,
-      });
+      logger.info('Remote session is live. Keeping the job alive until the session is stopped.');
+      // Keep the turtle job alive so the serve-sim tunnel stays reachable
+      // until stopDeviceRunSession cancels the run.
+      await new Promise<never>(() => {});
     },
   });
 }

packages/build-tools/src/steps/functions/uploadArtifact.ts

@@ -1,9 +1,4 @@
-import {
-  GenericArtifactType,
-  Job,
-  ManagedArtifactType,
-  isGenericArtifact,
-} from '@expo/eas-build-job';
+import { GenericArtifactType, Job, ManagedArtifactType } from '@expo/eas-build-job';
 import {
   BuildFunction,
   BuildStepInput,
@@ -70,11 +65,6 @@ export function createUploadArtifactBuildFunction(ctx: CustomBuildContext): Buil
         required: false,
         allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
       }),
-      BuildStepInput.createProvider({
-        id: 'metadata',
-        required: false,
-        allowedValueTypeName: BuildStepInputValueTypeName.JSON,
-      }),
     ],
     outputProviders: [
       BuildStepOutput.createProvider({
@@ -118,7 +108,7 @@ export function createUploadArtifactBuildFunction(ctx: CustomBuildContext): Buil
         throw result.reason;
       });
 
-      const artifactSpec = {
+      const artifact = {
         type: parseArtifactTypeInput({
           platform: ctx.job.platform,
           inputValue: `${inputs.type.value ?? ''}`,
@@ -126,22 +116,19 @@ export function createUploadArtifactBuildFunction(ctx: CustomBuildContext): Buil
         paths: artifactPaths,
         name: (inputs.name.value || inputs.key.value) as string,
       };
-      const artifact = isGenericArtifact(artifactSpec)
-        ? {
-            ...artifactSpec,
-            metadata: inputs.metadata.value as Record<string, unknown> | undefined,
-          }
-        : artifactSpec;
 
       try {
-        const { artifactId } = await ctx.runtimeApi.uploadArtifact({ artifact, logger });
+        const { artifactId } = await ctx.runtimeApi.uploadArtifact({
+          artifact,
+          logger,
+        });
 
         if (artifactId) {
           outputs.artifact_id.set(artifactId);
         }
       } catch (error) {
         if (inputs.ignore_error.value) {
-          logger.error({ err: error }, `Failed to upload ${artifact.type}. Ignoring error.`);
+          logger.error(`Failed to upload ${artifact.type}. Ignoring error.`, error);
           // Ignoring error.
           return;
         }