[eas-build-job] use changeset for GitHub context fix

.changeset/afraid-beds-invite.md

@@ -0,0 +1,5 @@
+---
+'eas-cli': patch
+---
+
+Regenerate graphql code

.changeset/android-35-adb-memory.md

@@ -0,0 +1,5 @@
+---
+'@expo/build-tools': patch
+---
+
+Default Android emulators to 4 GiB of RAM to reduce ADB disconnects during large transfers. Retain the 2 GiB default for API 34 and below outside interactive device sessions, and preserve explicit emulator configuration overrides.

.changeset/android-launch-arg-early-validation.md

@@ -0,0 +1,6 @@
+---
+'@expo/eas-build-job': minor
+'@expo/build-tools': patch
+---
+
+Export `validateAndroidLaunchOptions` and `quoteAndroidShellCommand` from `@expo/eas-build-job`, so Android launch arguments can be checked for NUL characters and length before a simulator session starts, and check them before the emulator boots in agent-device sessions.

.changeset/build-profile-expo-token-role.md

@@ -0,0 +1,5 @@
+---
+'@expo/eas-json': minor
+---
+
+Add `permissions.account.role` to build profiles to request a role for the build's `EXPO_TOKEN`.

.changeset/config.json

@@ -19,9 +19,7 @@
       "@expo/downloader",
       "@expo/turtle-spawn",
       "@expo/template-file",
-      "create-eas-build-function",
-      "@expo/vm-tools",
-      "@expo/simulator-launcher"
+      "create-eas-build-function"
     ]
   ],
   "linked": [],

.changeset/device-session-request-retries.md

@@ -0,0 +1,5 @@
+---
+'@expo/build-tools': patch
+---
+
+Retry transient failures when reporting that a device run session has started.

.changeset/download-build-network-retries.md

@@ -0,0 +1,5 @@
+---
+'@expo/build-tools': patch
+---
+
+Retry the build lookup and the archive download of `eas/download_build` on transient failures, and name the failure cause in the build log.

.changeset/fewer-app-config-reads.md

@@ -0,0 +1,5 @@
+---
+'eas-cli': patch
+---
+
+Read the app config fewer times in `eas build` and other project commands. An iOS build now runs `expo config` 2 times instead of 6.

.changeset/help-description-style.md

@@ -0,0 +1,5 @@
+---
+'eas-cli': none
+---
+
+Make command descriptions in `eas --help` consistently lowercase without trailing periods.

.changeset/native-hooks-log-group.md

@@ -0,0 +1,6 @@
+---
+'@expo/build-tools': patch
+'@expo/steps': patch
+---
+
+Stop printing workflow hook parsing messages in build logs: native builds showed them under an "Unknown build phase" group, and custom builds warned about unknown hook keys and hooks on steps that never run.

.changeset/node-22-23-4.md

@@ -0,0 +1,6 @@
+---
+'eas-cli': none
+'@expo/build-tools': none
+---
+
+Bump Node.js to 22.23.4 to fix the CVEs in the [October 2026 Node.js security releases](https://nodejs.org/en/blog/vulnerability/october-2026-security-releases).

.changeset/node-install-mirror-fallback.md

@@ -0,0 +1,5 @@
+---
+'@expo/worker': patch
+---
+
+Retry Node.js installation without the internal Node.js cache mirror when the first attempt fails, while preserving other configured mirrors.

.changeset/sandbox-duration.md

@@ -0,0 +1,5 @@
+---
+'@expo/build-tools': minor
+---
+
+Stop sandboxes after an optional maximum duration measured from readiness.

.changeset/shared-graphql-client.md

@@ -0,0 +1,5 @@
+---
+'eas-cli': patch
+---
+
+Share one GraphQL client between the project ID check and the command, so commands send one fewer app query.

.changeset/simulator-get-job-run-errors.md

@@ -0,0 +1,5 @@
+---
+'eas-cli': patch
+---
+
+Show why a simulator session failed in `eas simulator:get`, and add an `errors` array to its `--json` output. For an unknown error, `simulator:start` and `simulator:get` now show the failed step's error from the session logs.

.changeset/simulator-start-job-run-errors.md

@@ -0,0 +1,5 @@
+---
+'eas-cli': patch
+---
+
+Show why a simulator session failed in `eas simulator:start`, such as an unknown `--device` name, instead of only the session status.

.changeset/unify-signed-url-uploads.md

@@ -0,0 +1,5 @@
+---
+'@expo/build-tools': minor
+---
+
+Unify signed URL uploading to a single implementation and use it everywhere

.changeset/worker-mask-logged-errors.md

@@ -0,0 +1,5 @@
+---
+'@expo/worker': patch
+---
+
+Mask secrets in every field of uploaded job log records, such as logged errors, not only in log messages.

.changeset/workflow-artifact-types.md

@@ -0,0 +1,6 @@
+---
+'@expo/eas-build-job': major
+'@expo/build-tools': major
+---
+
+Remove legacy artifact type exports and route workflow uploads through workflow storage without file-type categories. Preserve workflow uploads and Maestro reports.

.changeset/workflow-github-context.md

@@ -0,0 +1,5 @@
+---
+'@expo/eas-build-job': patch
+---
+
+Add types and validation for documented GitHub workflow context fields.

.github/workflows/test-graphql.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches: [main]
   pull_request:
+    branches: [main]
   schedule:
     - cron: '0 8 * * *' # 8:00 AM UTC time every day
 

CHANGELOG.md

@@ -2,133 +2,6 @@
 
 This is the log of notable changes to EAS CLI and related packages.
 
-## [27.3.0](https://github.com/expo/eas-cli/releases/tag/v27.3.0) - 2026-11-02
-
-### 🎉 New features
-
-- [eas-build-job] Add optional Observe error context to workflow jobs. ([#4787](https://github.com/expo/eas-cli/pull/4787) by [@AbbanMustafa](https://github.com/AbbanMustafa))
-
-### 🐛 Bug fixes
-
-- [eas-cli] Bump `@expo/apple-utils` to `2.3.0` to fix iOS capability sync when App Store Connect rejects enabling, disabling or changing a capability. ([#4790](https://github.com/expo/eas-cli/pull/4790) by [@douglowder](https://github.com/douglowder))
-- [eas-cli] Keep already linked App Groups, Merchant IDs and iCloud containers when capability sync links another identifier. ([#4584](https://github.com/expo/eas-cli/pull/4584) by [@ceydaakin](https://github.com/ceydaakin))
-- [worker] Mask secrets in every record the worker process writes to its stdout: the build log records and the worker's own records. ([#4782](https://github.com/expo/eas-cli/pull/4782) by [@hSATAC](https://github.com/hSATAC))
-- [worker][build-tools] Stop warmup in the background for jobs that do not use the warm Simulator, so job setup does not wait for it. Before build-tools boots or clones a Simulator, it waits until the launcher's state file records that cleanup finished, and fails if cleanup does not finish in time. ([#4721](https://github.com/expo/eas-cli/pull/4721) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Recover unhealthy device-session tunnels without changing their URLs and block further traffic when shutdown starts, even if ngrok cleanup times out. ([#4526](https://github.com/expo/eas-cli/pull/4526) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Stop sending the SSH host when registering an SSH session. ([#4784](https://github.com/expo/eas-cli/pull/4784) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-## [27.2.0](https://github.com/expo/eas-cli/releases/tag/v27.2.0) - 2026-10-29
-
-### 🎉 New features
-
-- [build-tools] Use single-device previews when the session already has a valid device ID. ([#4733](https://github.com/expo/eas-cli/pull/4733) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Add an experiment that suggests Expo Update to coding agents after a build when the Free plan account is within 5 builds of the platform limit. ([#4758](https://github.com/expo/eas-cli/pull/4758) by [@williamgrosset](https://github.com/williamgrosset))
-- [eas-cli] Add `eas observe:traces` to list request trace spans (or a summary of span names and counts), `eas observe:trace` to display one trace as a span tree, and span rows in the `eas observe:session` timeline. ([#4772](https://github.com/expo/eas-cli/pull/4772) by [@kadikraman](https://github.com/kadikraman))
-- [simulator-launcher] Accept a comma-separated list of warm Simulators in `EXPO_SIMULATOR_DEVICE`; the first is the default. One serve-sim serves every listed device on one port. After the default device is ready, warmup preinstalls the latest stable Expo Go from one download and tries to disable apsd on the other devices, until a job claims one. A claim can select any listed device and reports its preinstalled Expo Go. ([#4764](https://github.com/expo/eas-cli/pull/4764) by [@gwdp](https://github.com/gwdp))
-- [simulator-launcher] Add `@expo/simulator-launcher`, which warms an iOS Simulator at VM boot and hands it to one EAS job (`start`, `claim`, `prepare-tools`, `stop`). ([#4722](https://github.com/expo/eas-cli/pull/4722) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Show a one-time Expo Simulators hint after a successful build. ([#4768](https://github.com/expo/eas-cli/pull/4768) by [@FiberJW](https://github.com/FiberJW))
-- [vm-tools] Add a macOS startup script loader that runs `/usr/local/share/vm-tools/startup.sh` once per VM boot. ([#4725](https://github.com/expo/eas-cli/pull/4725) by [@gwdp](https://github.com/gwdp))
-
-### 🐛 Bug fixes
-
-- [build-tools] Explain missing background task identifiers reported by App Store Connect. ([#3465](https://github.com/expo/eas-cli/pull/3465) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Explain App Store Connect NOT_AUTHORIZED responses in the shared API client. ([#3462](https://github.com/expo/eas-cli/pull/3462) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Explain App Store Connect UNEXPECTED_ERROR responses in the shared API client. ([#3467](https://github.com/expo/eas-cli/pull/3467) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Explain missing app icons reported by App Store Connect, including codes 90022 and 90023, while preserving Apple’s validation details. ([#3466](https://github.com/expo/eas-cli/pull/3466) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] List failed Google Play commit attempts in order, including network failures, when the outcome is uncertain. ([#4660](https://github.com/expo/eas-cli/pull/4660) by [@sjchmiela](https://github.com/sjchmiela))
-- [worker] Run package-manager version queries in parallel during worker preparation. ([#4710](https://github.com/expo/eas-cli/pull/4710) by [@gwdp](https://github.com/gwdp))
-- [worker] Start the Xcode version check in the background during worker tool preparation. Apply the Xcode 26.0 upload workaround when the query finishes, without delaying job startup. ([#4707](https://github.com/expo/eas-cli/pull/4707) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Fix a five-minute cleanup delay when a device session is canceled during startup and its screen recorder fails before connecting. ([#4761](https://github.com/expo/eas-cli/pull/4761) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Remove the Free plan build limit guidance experiment for coding agents from `eas build`. ([#4757](https://github.com/expo/eas-cli/pull/4757) by [@williamgrosset](https://github.com/williamgrosset))
-- [worker] Allow jobs to skip installing the CocoaPods cache proxy with EAS_BUILD_DISABLE_COCOAPODS_CACHE_PLUGIN=1. ([#4709](https://github.com/expo/eas-cli/pull/4709) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Handle TURN requests for a stopped device session without reporting a warning. ([#4762](https://github.com/expo/eas-cli/pull/4762) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Preserve indented and incomplete Xcode compiler errors in formatted build logs, including the final diagnostic when logging stops. ([#4365](https://github.com/expo/eas-cli/pull/4365) by [@sjchmiela](https://github.com/sjchmiela))
-
-### 🧹 Chores
-
-- [simulator-launcher] Add the state, request command and service helpers for the warm Simulator launcher. The package stays private until #4722 adds its CLI entry point. ([#4766](https://github.com/expo/eas-cli/pull/4766) by [@gwdp](https://github.com/gwdp))
-
-## [27.1.0](https://github.com/expo/eas-cli/releases/tag/v27.1.0) - 2026-10-28
-
-### 🎉 New features
-
-- [eas-cli] Display queued workflow runs: `workflow:run --wait` and `workflow:status` show a run waiting for its concurrency group and the run blocking it, and `workflow:cancel` includes queued runs in its selection list. ([#4258](https://github.com/expo/eas-cli/pull/4258) by [@hSATAC](https://github.com/hSATAC))
-- [eas-cli] Upload the workflow files that `uses` jobs reference, including nested ones, when running a local workflow file with `eas workflow:run`. ([#4769](https://github.com/expo/eas-cli/pull/4769) by [@sswrk](https://github.com/sswrk))
-
-### 🐛 Bug fixes
-
-- [build-tools] Explain App Store Connect error 90189 as a duplicate build number. ([#3461](https://github.com/expo/eas-cli/pull/3461) by [@sjchmiela](https://github.com/sjchmiela))
-- [eas-cli] Fail the command when EAS CLI cannot pull environment variables from EAS servers, instead of continuing without them. ([#4774](https://github.com/expo/eas-cli/pull/4774) by [@wschurman](https://github.com/wschurman))
-- [eas-cli] Format the generated root changelog before committing a release. ([#4773](https://github.com/expo/eas-cli/pull/4773) by [@gwdp](https://github.com/gwdp))
-- [build-tools][worker] Put the `NPM_TOKEN` registry credential in the builder's npm user config on EAS Build (`~/.npmrc`, or the file `NPM_CONFIG_USERCONFIG` names), where pnpm 10.34.2+ and 11.5.3+ still expand `${NPM_TOKEN}` (they ignore it in a project-level `.npmrc`). Explain what to change when the project's pnpm version needs a newer Node.js than the build runs, including when eas.json sets `node` or `pnpm`. ([#4729](https://github.com/expo/eas-cli/pull/4729) by [@hSATAC](https://github.com/hSATAC))
-- [build-tools] Install `@expo/repack-app` for the `eas/repack` step with npm in a sandbox that sees only `PATH` and its own `HOME`, so the build machine's npm and Yarn configuration cannot break the install, fetch it through the EAS npm cache when the job uses one, and show the installer output in the build log. The step no longer looks the version up separately before installing. When the npm cache fails, the install retries against the public registry like the project install does; the `eas/run_agent` agent CLI install shares the same helper and gains the same retry. ([#4728](https://github.com/expo/eas-cli/pull/4728) by [@hSATAC](https://github.com/hSATAC))
-- [eas-cli] Honor the `--non-interactive` flag in `workflow:cancel`; it was parsed but never applied, so automation could hang on the interactive picker. ([#4258](https://github.com/expo/eas-cli/pull/4258) by [@hSATAC](https://github.com/hSATAC))
-- [eas-cli] Stop reporting a finish time for workflow runs that have not finished: `workflow:runs` reports `finishedAt` only for runs in a final status. ([#4258](https://github.com/expo/eas-cli/pull/4258) by [@hSATAC](https://github.com/hSATAC))
-
-## [27.0.0](https://github.com/expo/eas-cli/releases/tag/v27.0.0) - 2026-10-27
-
-### 🛠 Breaking changes
-
-- [eas-cli] Write the reason a command failed to stderr, next to the `command failed.` line, instead of to stdout. A program that reads the reason from stdout must read stderr instead. ([#4592](https://github.com/expo/eas-cli/pull/4592) by [@vonovak](https://github.com/vonovak))
-
-### 🎉 New features
-
-- [eas-cli] Send the `permissions.account.role` from the build profile to request a role for the build's `EXPO_TOKEN`. ([#4734](https://github.com/expo/eas-cli/pull/4734) by [@wschurman](https://github.com/wschurman))
-- [eas-cli] Add `simulator:logs` to read and follow logs from an iOS simulator session and download saved logs after it stops. ([#4545](https://github.com/expo/eas-cli/pull/4545) by [@gwdp](https://github.com/gwdp))
-
-### 🐛 Bug fixes
-
-- [build-tools] Keep the launched app open when an Appium iOS session starts. ([#4699](https://github.com/expo/eas-cli/pull/4699) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Run Appium through the prepared Full Disk Access helper when available on macOS. ([#4622](https://github.com/expo/eas-cli/pull/4622) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Show permission guidance, including `permissions.account.role` in eas.json, when a build request fails with an authorization error. ([#4760](https://github.com/expo/eas-cli/pull/4760) by [@wschurman](https://github.com/wschurman))
-- [eas-cli] Print the notice about eas-cli in project dependencies only when stderr is a terminal, so programs that read stderr get the command's error. ([#4591](https://github.com/expo/eas-cli/pull/4591) by [@vonovak](https://github.com/vonovak))
-- [eas-cli] Show account roles and credential permission limits in `eas login` when you are already logged in. ([#4759](https://github.com/expo/eas-cli/pull/4759) by [@wschurman](https://github.com/wschurman))
-- [build-tools] Identify the build or application archive when a download fails, and explain when the archive is no longer available. ([#4703](https://github.com/expo/eas-cli/pull/4703) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Run apsd setup in the background without delaying iOS app launch or preview readiness. ([#4706](https://github.com/expo/eas-cli/pull/4706) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Fix simulator control action help routing and show help when a flag is incomplete. ([#4681](https://github.com/expo/eas-cli/pull/4681) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Require explicit `host:` simulator-host upload paths and report missing local files. ([#4683](https://github.com/expo/eas-cli/pull/4683) by [@gwdp](https://github.com/gwdp))
-
-  Missing local absolute paths now require the `host:` prefix. Actions that require upload IDs accept local files and reject host paths with an explanation.
-
-- [build-tools] Handle a device session stopped during startup as normal cleanup instead of reporting a startup error. ([#4716](https://github.com/expo/eas-cli/pull/4716) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Support idle timeouts for iOS web-preview-only sessions, resetting the timer when preview input arrives. ([#4731](https://github.com/expo/eas-cli/pull/4731) by [@gwdp](https://github.com/gwdp))
-
-### 🧹 Chores
-
-- [eas-cli] Run the GraphQL schema and generated code check on pull requests to any base branch, including stacked pull requests. ([#4763](https://github.com/expo/eas-cli/pull/4763) by [@wschurman](https://github.com/wschurman))
-
-## [26.0.0](https://github.com/expo/eas-cli/releases/tag/v26.0.0) - 2026-10-26
-
-### 🛠 Breaking changes
-
-- [eas-build-job][build-tools] Remove legacy artifact type exports and route workflow uploads through workflow storage without file-type categories. Preserve workflow uploads and Maestro reports. ([#4719](https://github.com/expo/eas-cli/pull/4719) by [@sjchmiela](https://github.com/sjchmiela))
-
-### 🎉 New features
-
-- [eas-build-job][build-tools] Export `validateAndroidLaunchOptions` and `quoteAndroidShellCommand` from `@expo/eas-build-job`, so Android launch arguments can be checked for NUL characters and length before a simulator session starts, and check them before the emulator boots in agent-device sessions. ([#4696](https://github.com/expo/eas-cli/pull/4696) by [@brentvatne](https://github.com/brentvatne))
-- [eas-json] Add `permissions.account.role` to build profiles to request a role for the build's `EXPO_TOKEN`. ([#4732](https://github.com/expo/eas-cli/pull/4732) by [@wschurman](https://github.com/wschurman))
-- [build-tools] Stop sandboxes after an optional maximum duration measured from readiness. ([#4702](https://github.com/expo/eas-cli/pull/4702) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Unify signed URL uploading to a single implementation and use it everywhere. ([#4712](https://github.com/expo/eas-cli/pull/4712) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-### 🐛 Bug fixes
-
-- [eas-cli] Regenerate graphql code. ([#4692](https://github.com/expo/eas-cli/pull/4692) by [@wschurman](https://github.com/wschurman))
-- [build-tools] Default Android emulators to 4 GiB of RAM to reduce ADB disconnects during large transfers. Retain the 2 GiB default for API 34 and below outside interactive device sessions, and preserve explicit emulator configuration overrides. ([#4727](https://github.com/expo/eas-cli/pull/4727) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Retry transient failures when reporting that a device run session has started. ([#4680](https://github.com/expo/eas-cli/pull/4680) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Retry the build lookup and the archive download of `eas/download_build` on transient failures, and name the failure cause in the build log. ([#4690](https://github.com/expo/eas-cli/pull/4690) by [@hSATAC](https://github.com/hSATAC))
-- [eas-cli] Read the app config fewer times in `eas build` and other project commands. An iOS build now runs `expo config` 2 times instead of 6. ([`78ba760`](https://github.com/expo/eas-cli/commit/78ba76001b67c9971236af1a1d02e46c2f82d24a) by [@vonovak](https://github.com/vonovak))
-- [build-tools][steps] Stop printing workflow hook parsing messages in build logs: native builds showed them under an "Unknown build phase" group, and custom builds warned about unknown hook keys and hooks on steps that never run. ([#4717](https://github.com/expo/eas-cli/pull/4717) by [@hSATAC](https://github.com/hSATAC))
-- [worker] Retry Node.js installation without the internal Node.js cache mirror when the first attempt fails, while preserving other configured mirrors. ([#3452](https://github.com/expo/eas-cli/pull/3452) by [@sjchmiela](https://github.com/sjchmiela))
-- [eas-cli] Share one GraphQL client between the project ID check and the command, so commands send one fewer app query. ([#4646](https://github.com/expo/eas-cli/pull/4646) by [@vonovak](https://github.com/vonovak))
-- [eas-cli] Show why a simulator session failed in `eas simulator:get`, and add an `errors` array to its `--json` output. For an unknown error, `simulator:start` and `simulator:get` now show the failed step's error from the session logs. ([#4694](https://github.com/expo/eas-cli/pull/4694) by [@brentvatne](https://github.com/brentvatne))
-- [eas-cli] Show why a simulator session failed in `eas simulator:start`, such as an unknown `--device` name, instead of only the session status. ([#4693](https://github.com/expo/eas-cli/pull/4693) by [@brentvatne](https://github.com/brentvatne))
-- [worker] Mask secrets in every field of uploaded job log records, such as logged errors, not only in log messages. ([#4698](https://github.com/expo/eas-cli/pull/4698) by [@brentvatne](https://github.com/brentvatne))
-
-### 🧹 Chores
-
-- [eas-cli] Make command descriptions in `eas --help` consistently lowercase without trailing periods. ([#4385](https://github.com/expo/eas-cli/pull/4385) by [@brentvatne](https://github.com/brentvatne))
-- [eas-cli][build-tools] Bump Node.js to 22.23.4 to fix the CVEs in the [October 2026 Node.js security releases](https://nodejs.org/en/blog/vulnerability/october-2026-security-releases). ([#4714](https://github.com/expo/eas-cli/pull/4714) by [@ramonclaudio](https://github.com/ramonclaudio))
-
 ## [25.3.0](https://github.com/expo/eas-cli/releases/tag/v25.3.0) - 2026-10-20
 
 ### 🎉 New features

cli-versions.json

@@ -1,4 +1,4 @@
 {
-  "STAGING": "27.2.0",
-  "PRODUCTION": "27.2.0"
+  "STAGING": "25.3.0",
+  "PRODUCTION": "25.3.0"
 }

lerna.json

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

packages/build-tools/CHANGELOG.md

@@ -1,68 +1,5 @@
 # @expo/build-tools
 
-## 27.3.0
-
-### Patch Changes
-
-- Stop warmup in the background for jobs that do not use the warm Simulator, so job setup does not wait for it. Before build-tools boots or clones a Simulator, it waits until the launcher's state file records that cleanup finished, and fails if cleanup does not finish in time. ([#4721](https://github.com/expo/eas-cli/pull/4721) by [@gwdp](https://github.com/gwdp))
-- Recover unhealthy device-session tunnels without changing their URLs and block further traffic when shutdown starts, even if ngrok cleanup times out. ([#4526](https://github.com/expo/eas-cli/pull/4526) by [@gwdp](https://github.com/gwdp))
-- Stop sending the SSH host when registering an SSH session. ([#4784](https://github.com/expo/eas-cli/pull/4784) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-## 27.2.0
-
-### Minor Changes
-
-- Use single-device previews when the session already has a valid device ID. ([#4733](https://github.com/expo/eas-cli/pull/4733) by [@gwdp](https://github.com/gwdp))
-
-### Patch Changes
-
-- Explain missing background task identifiers reported by App Store Connect. ([#3465](https://github.com/expo/eas-cli/pull/3465) by [@sjchmiela](https://github.com/sjchmiela))
-- Explain App Store Connect NOT_AUTHORIZED responses in the shared API client. ([#3462](https://github.com/expo/eas-cli/pull/3462) by [@sjchmiela](https://github.com/sjchmiela))
-- Explain App Store Connect UNEXPECTED_ERROR responses in the shared API client. ([#3467](https://github.com/expo/eas-cli/pull/3467) by [@sjchmiela](https://github.com/sjchmiela))
-- Explain missing app icons reported by App Store Connect, including codes 90022 and 90023, while preserving Apple’s validation details. ([#3466](https://github.com/expo/eas-cli/pull/3466) by [@sjchmiela](https://github.com/sjchmiela))
-- List failed Google Play commit attempts in order, including network failures, when the outcome is uncertain. ([#4660](https://github.com/expo/eas-cli/pull/4660) by [@sjchmiela](https://github.com/sjchmiela))
-- Fix a five-minute cleanup delay when a device session is canceled during startup and its screen recorder fails before connecting. ([#4761](https://github.com/expo/eas-cli/pull/4761) by [@gwdp](https://github.com/gwdp))
-- Handle TURN requests for a stopped device session without reporting a warning. ([#4762](https://github.com/expo/eas-cli/pull/4762) by [@gwdp](https://github.com/gwdp))
-- Preserve indented and incomplete Xcode compiler errors in formatted build logs, including the final diagnostic when logging stops. ([#4365](https://github.com/expo/eas-cli/pull/4365) by [@sjchmiela](https://github.com/sjchmiela))
-
-## 27.1.0
-
-### Patch Changes
-
-- Explain App Store Connect error 90189 as a duplicate build number. ([#3461](https://github.com/expo/eas-cli/pull/3461) by [@sjchmiela](https://github.com/sjchmiela))
-- Put the `NPM_TOKEN` registry credential in the builder's npm user config on EAS Build (`~/.npmrc`, or the file `NPM_CONFIG_USERCONFIG` names), where pnpm 10.34.2+ and 11.5.3+ still expand `${NPM_TOKEN}` (they ignore it in a project-level `.npmrc`). Explain what to change when the project's pnpm version needs a newer Node.js than the build runs, including when eas.json sets `node` or `pnpm`. ([#4729](https://github.com/expo/eas-cli/pull/4729) by [@hSATAC](https://github.com/hSATAC))
-- Install `@expo/repack-app` for the `eas/repack` step with npm in a sandbox that sees only `PATH` and its own `HOME`, so the build machine's npm and Yarn configuration cannot break the install, fetch it through the EAS npm cache when the job uses one, and show the installer output in the build log. The step no longer looks the version up separately before installing. When the npm cache fails, the install retries against the public registry like the project install does; the `eas/run_agent` agent CLI install shares the same helper and gains the same retry. ([#4728](https://github.com/expo/eas-cli/pull/4728) by [@hSATAC](https://github.com/hSATAC))
-
-## 27.0.0
-
-### Patch Changes
-
-- Keep the launched app open when an Appium iOS session starts. ([#4699](https://github.com/expo/eas-cli/pull/4699) by [@gwdp](https://github.com/gwdp))
-- Run Appium through the prepared Full Disk Access helper when available on macOS. ([#4622](https://github.com/expo/eas-cli/pull/4622) by [@gwdp](https://github.com/gwdp))
-- Identify the build or application archive when a download fails, and explain when the archive is no longer available. ([#4703](https://github.com/expo/eas-cli/pull/4703) by [@gwdp](https://github.com/gwdp))
-- Run apsd setup in the background without delaying iOS app launch or preview readiness. ([#4706](https://github.com/expo/eas-cli/pull/4706) by [@gwdp](https://github.com/gwdp))
-- Handle a device session stopped during startup as normal cleanup instead of reporting a startup error. ([#4716](https://github.com/expo/eas-cli/pull/4716) by [@gwdp](https://github.com/gwdp))
-- Support idle timeouts for iOS web-preview-only sessions, resetting the timer when preview input arrives. ([#4731](https://github.com/expo/eas-cli/pull/4731) by [@gwdp](https://github.com/gwdp))
-
-## 26.0.0
-
-### Major Changes
-
-- Remove legacy artifact type exports and route workflow uploads through workflow storage without file-type categories. Preserve workflow uploads and Maestro reports. ([#4719](https://github.com/expo/eas-cli/pull/4719) by [@sjchmiela](https://github.com/sjchmiela))
-
-### Minor Changes
-
-- Stop sandboxes after an optional maximum duration measured from readiness. ([#4702](https://github.com/expo/eas-cli/pull/4702) by [@sjchmiela](https://github.com/sjchmiela))
-- Unify signed URL uploading to a single implementation and use it everywhere. ([#4712](https://github.com/expo/eas-cli/pull/4712) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-### Patch Changes
-
-- Default Android emulators to 4 GiB of RAM to reduce ADB disconnects during large transfers. Retain the 2 GiB default for API 34 and below outside interactive device sessions, and preserve explicit emulator configuration overrides. ([#4727](https://github.com/expo/eas-cli/pull/4727) by [@sjchmiela](https://github.com/sjchmiela))
-- Export `validateAndroidLaunchOptions` and `quoteAndroidShellCommand` from `@expo/eas-build-job`, so Android launch arguments can be checked for NUL characters and length before a simulator session starts, and check them before the emulator boots in agent-device sessions. ([#4696](https://github.com/expo/eas-cli/pull/4696) by [@brentvatne](https://github.com/brentvatne))
-- Retry transient failures when reporting that a device run session has started. ([#4680](https://github.com/expo/eas-cli/pull/4680) by [@gwdp](https://github.com/gwdp))
-- Retry the build lookup and the archive download of `eas/download_build` on transient failures, and name the failure cause in the build log. ([#4690](https://github.com/expo/eas-cli/pull/4690) by [@hSATAC](https://github.com/hSATAC))
-- Stop printing workflow hook parsing messages in build logs: native builds showed them under an "Unknown build phase" group, and custom builds warned about unknown hook keys and hooks on steps that never run. ([#4717](https://github.com/expo/eas-cli/pull/4717) by [@hSATAC](https://github.com/hSATAC))
-
 ## 25.3.0
 
 ### Minor Changes

packages/build-tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "27.3.0",
+  "version": "25.3.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <[email protected]>",
@@ -42,18 +42,18 @@
   "dependencies": {
     "@expo/config": "55.0.10",
     "@expo/config-plugins": "55.0.7",
-    "@expo/downloader": "27.3.0",
-    "@expo/eas-build-job": "27.3.0",
+    "@expo/downloader": "25.3.0",
+    "@expo/eas-build-job": "25.3.0",
     "@expo/env": "^0.4.0",
-    "@expo/logger": "27.3.0",
+    "@expo/logger": "25.3.0",
     "@expo/package-manager": "1.9.10",
     "@expo/plist": "^0.3.5",
     "@expo/results": "^1.0.0",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "27.3.0",
-    "@expo/template-file": "27.3.0",
-    "@expo/turtle-spawn": "27.3.0",
-    "@expo/xcpretty": "^4.4.7",
+    "@expo/steps": "25.3.0",
+    "@expo/template-file": "25.3.0",
+    "@expo/turtle-spawn": "25.3.0",
+    "@expo/xcpretty": "^4.3.1",
     "@ngrok/ngrok": "1.7.0",
     "@sentry/node": "7.77.0",
     "@urql/core": "^6.0.1",

packages/build-tools/src/buildErrors/__tests__/detectError.test.ts

@@ -125,31 +125,6 @@ describe(resolveBuildPhaseErrorAsync, () => {
     expect(err.trackingCode).toBeUndefined();
   });
 
-  it('explains that the pnpm version needs a newer Node.js than the build runs', async () => {
-    const fakeError = new Error();
-    const err = await resolveBuildPhaseErrorAsync(
-      fakeError,
-      [
-        'Running "pnpm install --frozen-lockfile" in /home/expo/workingdir/build directory',
-        'warn: This version of pnpm requires at least Node.js v22.13',
-        'warn: The current version of Node.js is v20.19.4',
-        'warn: Visit https://r.pnpm.io/comp to see the list of past pnpm versions with respective Node.js version support.',
-        'Error [ERR_UNKNOWN_BUILTIN_MODULE]: No such built-in module: node:sqlite',
-      ],
-      {
-        job: { platform: Platform.ANDROID } as Job,
-        phase: BuildPhase.INSTALL_DEPENDENCIES,
-        env: {},
-      },
-      '/fake/path'
-    );
-    expect(err.errorCode).toBe('EAS_BUILD_PNPM_UNSUPPORTED_NODE_VERSION_ERROR');
-    expect(err.message).toBe(
-      'This build uses a pnpm version that requires Node.js 22.13.0 or newer, but runs Node.js 20.19.4. You can fix it by either:\n- setting "node" to "22.13.0" or a newer version in the build profile in eas.json\n- using a pnpm version that supports Node.js 20.19.4: change "packageManager" in package.json if your project sets it, and set "pnpm" in the build profile in eas.json'
-    );
-    expect(err.docsUrl).toBe('https://docs.expo.dev/eas/json/');
-  });
-
   it('detects xcode line error', async () => {
     vol.fromJSON({
       '/path/to/xcodelogs.log': originalFs.readFileSync(

packages/build-tools/src/buildErrors/pnpmUnsupportedNodeVersionError.ts

@@ -1,33 +0,0 @@
-import { errors } from '@expo/eas-build-job';
-import nullthrows from 'nullthrows';
-import semver from 'semver';
-
-import { ErrorHandler } from './errors.types';
-
-// example log: "warn: This version of pnpm requires at least Node.js v22.13" followed by "warn: The current version of Node.js is v20.19.4"
-const PNPM_UNSUPPORTED_NODE_VERSION_REGEXP =
-  /This version of pnpm requires at least Node\.js v([\d.]+)\n.*The current version of Node\.js is v([\d.]+)/;
-
-function createPnpmUnsupportedNodeVersionError(matchResult: RegExpMatchArray): errors.UserError {
-  const [, requiredNodeVersion, currentNodeVersion] = matchResult;
-  const minimumNodeVersion = nullthrows(semver.coerce(requiredNodeVersion)).version;
-  return new errors.UserError(
-    'EAS_BUILD_PNPM_UNSUPPORTED_NODE_VERSION_ERROR',
-    `This build uses a pnpm version that requires Node.js ${minimumNodeVersion} or newer, but runs Node.js ${currentNodeVersion}. You can fix it by either:
-- setting "node" to "${minimumNodeVersion}" or a newer version in the build profile in eas.json
-- using a pnpm version that supports Node.js ${currentNodeVersion}: change "packageManager" in package.json if your project sets it, and set "pnpm" in the build profile in eas.json`,
-    { docsUrl: 'https://docs.expo.dev/eas/json/' }
-  );
-}
-
-export const pnpmUnsupportedNodeVersionErrorHandler: ErrorHandler<errors.UserError> = {
-  regexp: PNPM_UNSUPPORTED_NODE_VERSION_REGEXP,
-  createError: createPnpmUnsupportedNodeVersionError,
-};
-
-export function detectPnpmUnsupportedNodeVersionError(
-  output: string
-): errors.UserError | undefined {
-  const match = output.match(PNPM_UNSUPPORTED_NODE_VERSION_REGEXP);
-  return match ? createPnpmUnsupportedNodeVersionError(match) : undefined;
-}

packages/build-tools/src/buildErrors/userErrorHandlers.ts

@@ -1,7 +1,6 @@
 import { BuildMode, BuildPhase, Platform, Workflow, errors } from '@expo/eas-build-job';
 
 import { ErrorHandler, XCODE_BUILD_PHASE } from './errors.types';
-import { pnpmUnsupportedNodeVersionErrorHandler } from './pnpmUnsupportedNodeVersionError';
 
 import UserError = errors.UserError;
 
@@ -212,7 +211,6 @@ You are seeing this error because either:
       return undefined;
     },
   },
-  pnpmUnsupportedNodeVersionErrorHandler,
   {
     platform: Platform.IOS,
     phase: XCODE_BUILD_PHASE,

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

@@ -3,7 +3,6 @@ import { EventEmitter } from 'events';
 import spawnAsync from '@expo/spawn-async';
 import { ExpoRunFormatter } from '@expo/xcpretty';
 import fg from 'fast-glob';
-import { vol } from 'memfs';
 
 import { createMockLogger } from '../../__tests__/utils/logger';
 import { Sentry } from '../../sentry';
@@ -60,47 +59,6 @@ describe(XcodeBuildLogger, () => {
     expect(Sentry.capture).not.toHaveBeenCalled();
   });
 
-  it('flushes the final incomplete compiler error when the log reader is interrupted', async () => {
-    const { ExpoRunFormatter: RealFormatter } =
-      jest.requireActual<typeof import('@expo/xcpretty')>('@expo/xcpretty');
-    jest.mocked(ExpoRunFormatter.create).mockImplementation(RealFormatter.create);
-
-    let rejectReader!: (error: Error) => void;
-    const spawnPromise = Object.assign(
-      new Promise<never>((_resolve, reject) => {
-        rejectReader = reject;
-      }),
-      {
-        child: {
-          stdout,
-          kill: () =>
-            rejectReader(Object.assign(new Error('tail interrupted'), { signal: 'SIGINT' })),
-        },
-      }
-    );
-    jest.mocked(spawnAsync).mockReturnValue(spawnPromise as any);
-    const diagnostics =
-      '/project/First.swift:12:3: error: first compiler error\n' +
-      '    /project/Last.swift:20:4: error: final compiler error\n';
-    vol.fromJSON({ '/logs/build.log': diagnostics });
-    const logger = createMockLogger();
-    const buildLogger = new XcodeBuildLogger(logger, '/project');
-    await buildLogger.watchLogFiles('/logs');
-    stdout.emit('data', diagnostics);
-
-    await buildLogger.flush();
-
-    const output = jest
-      .mocked(logger.info)
-      .mock.calls.map(([line]) => String(line))
-      .join('\n');
-    expect(output).toContain('first compiler error');
-    expect(output).toContain('final compiler error');
-    expect(output).toContain('Last.swift:20:4');
-    expect(output).toContain('2 error(s)');
-    expect(output.match(/final compiler error/g)).toHaveLength(1);
-  });
-
   it('falls back to raw logs when the formatter throws', async () => {
     const logger = createMockLogger();
     await startWatchingAsync(logger);

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

@@ -4,7 +4,6 @@ import path from 'path';
 
 import { BuildContext } from '../context';
 import { Sentry } from '../sentry';
-import { NpmCacheRegistryInstallError, isNpmCacheInstallFailure } from '../utils/npmCacheRegistry';
 import { PackageManager, findPackagerRootDir } from '../utils/packageManager';
 import { isUsingModernYarnVersion } from '../utils/project';
 
@@ -197,6 +196,10 @@ 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) &&
@@ -204,9 +207,24 @@ function isNpmCacheRegistryErrorLine(line: string, npmCacheUrl: string): boolean
   );
 }
 
+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/setup.ts

@@ -71,12 +71,7 @@ export async function setupAsync<TJob extends BuildJob>(
       }
     );
 
-    await setUpNpmrcAsync({
-      projectTargetDirectory: ctx.buildDirectory,
-      workingDirectory: ctx.getReactNativeProjectDirectory(),
-      env: ctx.env,
-      logger: ctx.logger,
-    });
+    await setUpNpmrcAsync(ctx, ctx.logger);
     if (ctx.job.platform === Platform.IOS && ctx.env.EAS_BUILD_RUNNER === 'eas-build') {
       await deleteXcodeEnvLocalIfExistsAsync(ctx as BuildContext<Ios.Job>);
     }

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

@@ -80,12 +80,9 @@ export class XcodeBuildLogger {
           this.logger.info(data.toString());
         }
       });
-      try {
-        await this.logReaderPromise;
-      } finally {
-        // flush() interrupts tail, but the formatter may still hold a final compiler diagnostic.
-        this.logger.info(formatter.getBuildSummary());
-      }
+      await this.logReaderPromise;
+
+      this.logger.info(formatter.getBuildSummary());
     } catch (err: any) {
       if (!this.flushing) {
         this.loggerError = err;

packages/build-tools/src/index.ts

@@ -34,7 +34,6 @@ export { formatSecondsForLog } from './utils/formatDuration';
 export { findAndUploadXcodeBuildLogsAsync } from './ios/xcodeBuildLogs';
 
 export { Hook, runHookIfPresent } from './utils/hooks';
-export { detectPnpmUnsupportedNodeVersionError } from './buildErrors/pnpmUnsupportedNodeVersionError';
 
 export { parseGradleProfile, formatGradleProfileReport } from './android/gradleProfile';
 export type { GradleProfileTask } from './android/gradleProfile';

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

@@ -98,7 +98,7 @@ beforeEach(() => {
   const events = { stopAsync: stopEvents, getLastEventObservedAt: () => undefined };
   jest.mocked(startAgentDeviceEventCollectionAsync).mockResolvedValue(events);
   jest.mocked(startAppiumEventCollectionAsync).mockResolvedValue(events);
-  jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue('started');
+  jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
   jest.mocked(waitForDeviceRunSessionStoppedAsync).mockResolvedValue(undefined);
 });
 

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

@@ -162,59 +162,6 @@ afterEach(() => {
 });
 
 describe('downloadBuild', () => {
-  it.each([404, 410])('identifies the unavailable build on HTTP %s', async status => {
-    const buildId = randomUUID();
-    const { Response: ActualResponse } =
-      jest.requireActual<typeof import('node-fetch')>('node-fetch');
-    jest
-      .mocked(fetch)
-      .mockResolvedValue(new ActualResponse('<Error>NoSuchKey</Error>', { status }));
-
-    await expect(
-      downloadBuildAsync({
-        logger: createLogger({ name: 'test' }),
-        buildId,
-        graphqlClient: createMockGraphqlClient({ applicationArchiveUrl: APPLICATION_ARCHIVE_URL }),
-        robotAccessToken: null,
-        extensions: ['app'],
-      })
-    ).rejects.toMatchObject({
-      errorCode: 'EAS_DOWNLOAD_BUILD_ARCHIVE_UNAVAILABLE',
-      message:
-        `Failed to download the application archive for build ${buildId} (HTTP ${status}). ` +
-        'The archive is unavailable. Check that the archive still exists and try again.',
-    });
-    expect(fetch).toHaveBeenCalledTimes(1);
-  });
-
-  it.each([404, 410, 500])(
-    'identifies the application URL without credentials on HTTP %s',
-    async status => {
-      const { Response: ActualResponse } =
-        jest.requireActual<typeof import('node-fetch')>('node-fetch');
-      jest.mocked(fetch).mockResolvedValue(new ActualResponse('download failed', { status }));
-
-      const download = downloadBuildAsync({
-        logger: createLogger({ name: 'test' }),
-        applicationArchiveUrl:
-          'https://user:[email protected]/app.tar.gz?token=secret#fragment',
-        graphqlClient: createMockGraphqlClient({}),
-        robotAccessToken: null,
-        extensions: ['app'],
-      });
-
-      const prefix = `Failed to download the archive at https://example.test/app.tar.gz (HTTP ${status})`;
-      await expect(download).rejects.toThrow(
-        status === 500
-          ? `${prefix}: download failed`
-          : `${prefix}. The archive is unavailable. ` +
-              'Check that the URL is correct and the archive still exists, then try again.'
-      );
-      await expect(download).rejects.not.toThrow(/password|secret|fragment/);
-      expect(fetch).toHaveBeenCalledTimes(1);
-    }
-  );
-
   it('downloads from applicationArchiveUrl returned by GraphQL', async () => {
     const buildId = randomUUID();
     const graphqlClient = createMockGraphqlClient({

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

@@ -165,7 +165,7 @@ describe.each(controllers)('%s local egress', (_name, createFunction, controller
       getLastPreviewActivityAt: jest.fn(),
       finishAsync: stopPreview,
     });
-    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue('started');
+    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
     jest.mocked(waitForDeviceRunSessionStoppedAsync).mockImplementation(async () => {
       expect(lifetime.aborted).toBe(false);
       expect(monitorLocalEgressAsync).toHaveBeenCalledTimes(1);
@@ -176,16 +176,6 @@ describe.each(controllers)('%s local egress', (_name, createFunction, controller
     jest.restoreAllMocks();
   });
 
-  it('releases resources without monitoring when the session stopped during startup', async () => {
-    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValueOnce('stopped');
-    await run();
-    expect(waitForDeviceRunSessionStoppedAsync).not.toHaveBeenCalled();
-    expect(monitorLocalEgressAsync).not.toHaveBeenCalled();
-    expect(stopPreview).toHaveBeenCalledTimes(1);
-    expect(stopEgress).toHaveBeenCalledTimes(1);
-    expect(lifetime.aborted).toBe(true);
-  });
-
   it('reports credentials and starts monitoring before waiting, then releases resources', async () => {
     await run();
     expect(uploadRemoteSessionConfigAsync).toHaveBeenCalledWith({

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

@@ -1,10 +1,8 @@
 import { type bunyan } from '@expo/logger';
-import turtleSpawnAsync from '@expo/turtle-spawn';
 import assert from 'node:assert';
 import fg from 'fast-glob';
 import { vol } from 'memfs';
 import path from 'node:path';
-import resolveFrom from 'resolve-from';
 
 import { createGlobalContextMock } from '../../../__tests__/utils/context';
 import { createTestAndroidJob, createTestIosJob } from '../../../__tests__/utils/job';
@@ -19,100 +17,17 @@ import {
 } from '../repack';
 
 jest.mock('fs');
-jest.mock('@expo/turtle-spawn', () => ({ __esModule: true, default: jest.fn() }));
+jest.mock('@expo/spawn-async');
 jest.mock('@expo/repack-app');
-jest.mock('resolve-from', () => jest.fn(() => '@expo/repack-app'));
+jest.mock('resolve-from', () => jest.fn((_, moduleName) => moduleName));
 jest.mock('../../utils/ios/credentials/manager');
 
 describe(createRepackBuildFunction, () => {
-  beforeEach(() => {
-    jest.mocked(turtleSpawnAsync).mockImplementation((async (_command: string, args: string[]) => {
-      const sandbox = args[args.indexOf('--prefix') + 1];
-      const packageName = args[args.length - 1].replace(/@[^@/]*$/, '');
-      vol.fromJSON({
-        [path.join(sandbox, 'node_modules', packageName, 'package.json')]: JSON.stringify({
-          version: '2.0.0-next.1',
-        }),
-      });
-    }) as unknown as typeof turtleSpawnAsync);
-  });
-
   afterEach(() => {
     jest.restoreAllMocks();
     vol.reset();
   });
 
-  it('installs the repack package with npm in a sandbox whose env is only PATH and HOME, through the npm cache registry', async () => {
-    const globalCtx = createGlobalContextMock({
-      staticContextContent: {
-        job: {},
-      },
-    });
-    globalCtx.updateEnv({
-      PATH: '/usr/local/bin:/usr/bin',
-      EAS_BUILD_NPM_CACHE_URL: 'https://npm-cache.expo.test',
-      NPM_TOKEN: 'secret',
-    });
-    const repack = createRepackBuildFunction();
-    const repackStep = repack.createBuildStepFromFunctionCall(globalCtx, {
-      callInputs: {
-        platform: 'ios',
-        source_app_path: '/path/to/source_app.ipa',
-        repack_package: '@scope/fork',
-        repack_version: 'next',
-      },
-    });
-    const logInfo = jest.spyOn(repackStep.ctx.logger, 'info');
-
-    await repackStep.executeAsync();
-
-    const [installCall] = jest.mocked(turtleSpawnAsync).mock.calls;
-    const npmEnv = installCall[2]?.env;
-    assert(npmEnv);
-    expect(Object.keys(npmEnv).sort()).toEqual(['HOME', 'PATH']);
-    expect(npmEnv.PATH).toMatch(/\/usr\/local\/bin:\/usr\/bin$/);
-    expect(installCall).toEqual([
-      'npm',
-      [
-        'install',
-        '--prefix',
-        npmEnv.HOME,
-        '--no-save',
-        '--package-lock=false',
-        '--no-audit',
-        '--no-fund',
-        '--no-update-notifier',
-        '--registry',
-        'https://npm-cache.expo.test',
-        '@scope/fork@next',
-      ],
-      { env: npmEnv, logger: repackStep.ctx.logger },
-    ]);
-    expect(logInfo).toHaveBeenCalledWith('Using repack from: @scope/fork@next (2.0.0-next.1)');
-    expect(resolveFrom).toHaveBeenCalledWith(npmEnv.HOME, '@scope/fork');
-  });
-
-  it('installs the repack package from the default registry when the job has no npm cache', async () => {
-    const globalCtx = createGlobalContextMock({
-      staticContextContent: {
-        job: {},
-      },
-    });
-    globalCtx.updateEnv({ PATH: '/usr/local/bin:/usr/bin' });
-    const repack = createRepackBuildFunction();
-    const repackStep = repack.createBuildStepFromFunctionCall(globalCtx, {
-      callInputs: {
-        platform: 'ios',
-        source_app_path: '/path/to/source_app.ipa',
-      },
-    });
-
-    await repackStep.executeAsync();
-
-    const [installCall] = jest.mocked(turtleSpawnAsync).mock.calls;
-    expect(installCall[1]).not.toContain('--registry');
-  });
-
   it('should set generated output path for successful repack', async () => {
     const repack = createRepackBuildFunction();
     const repackStep = repack.createBuildStepFromFunctionCall(

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

@@ -103,7 +103,7 @@ describe(createRunAgentBuildFunction, () => {
     );
     const npmEnv = installMock.mock.calls[0][2]!.env!;
     const agentEnv = spawnMock.mock.calls[0][2].env!;
-    expect(Object.keys(npmEnv).sort()).toEqual(['HOME', 'PATH']);
+    expect(Object.keys(npmEnv).sort()).toEqual(['HOME', 'LANG', 'PATH', 'TMPDIR']);
     expect(Object.keys(agentEnv).sort()).toEqual([
       'CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC',
       'CLAUDE_CODE_OAUTH_TOKEN',

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

@@ -103,18 +103,6 @@ async function runAsync(
 }
 
 describe('runAgentDeviceRemoteSessionAsync orchestration', () => {
-  it('cleans up a stopped startup without starting live-session polling', async () => {
-    const logger = { info: jest.fn(), warn: jest.fn(), child: jest.fn().mockReturnThis() };
-    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValueOnce('stopped');
-    await runAsync(logger, BuildRuntimePlatform.DARWIN);
-    expect(waitForDeviceRunSessionStoppedAsync).not.toHaveBeenCalled();
-    expect(pollAgentDeviceArtifactsForUploadAsync).not.toHaveBeenCalled();
-    expect(startAgentDeviceEventCollectionAsync).not.toHaveBeenCalled();
-    expect(mockDaemonStopAsync).toHaveBeenCalled();
-    expect(mockTunnelStopAsync).toHaveBeenCalled();
-    expect(mockPreviewStopAsync).toHaveBeenCalled();
-  });
-
   beforeEach(async () => {
     jest.clearAllMocks();
 
@@ -159,7 +147,7 @@ describe('runAgentDeviceRemoteSessionAsync orchestration', () => {
       }
       return host;
     });
-    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue('started');
+    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
     jest.mocked(waitForDeviceRunSessionStoppedAsync).mockResolvedValue(undefined);
 
     await fs.promises.mkdir(path.dirname(DAEMON_ENTRY_PATH), { recursive: true });

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

@@ -1,7 +1,6 @@
 import { BuildRuntimePlatform, type BuildStepContext } from '@expo/steps';
 import spawn from '@expo/turtle-spawn';
 import fs from 'node:fs';
-import path from 'node:path';
 
 import { createGlobalContextMock } from '../../../__tests__/utils/context';
 import { type CustomBuildContext } from '../../../customBuildContext';
@@ -203,78 +202,6 @@ describe(installAppiumAsync, () => {
 });
 
 describe('createStartAppiumRemoteSessionBuildFunction', () => {
-  it.each([
-    [BuildRuntimePlatform.DARWIN, true],
-    [BuildRuntimePlatform.DARWIN, false],
-    [BuildRuntimePlatform.LINUX, true],
-    [BuildRuntimePlatform.LINUX, false],
-  ])('starts Appium on %s with helper present=%s', async (runtimePlatform, helperPresent) => {
-    const helper = '/usr/local/libexec/turtle-tcc-fda';
-    if (helperPresent) {
-      fs.mkdirSync(path.dirname(helper), { recursive: true });
-      fs.writeFileSync(helper, 'prepared helper');
-    }
-    jest.mocked(spawn).mockResolvedValue({ stdout: '{}' } as never);
-    jest
-      .mocked(IosSimulatorUtils.getAvailableDevicesAsync)
-      .mockResolvedValue([{ udid: 'simulator' }] as never);
-    jest
-      .mocked(AndroidEmulatorUtils.getAttachedDevicesAsync)
-      .mockResolvedValue([{ serialId: 'emulator-5554', state: 'device' }] as never);
-    // Stop at the launch boundary; no readiness requests or remote session are needed.
-    const launched = new Error('launch captured');
-    jest.mocked(spawnDetached).mockImplementation(() => {
-      throw launched;
-    });
-    const env = {
-      DEVICE_RUN_SESSION_ID: 'session',
-      EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN: 'example.test',
-      PATH: '/configured/node/bin:/usr/bin',
-      DEVELOPER_DIR: '/Applications/Xcode.app/Contents/Developer',
-    };
-    const buildFunction = createStartAppiumRemoteSessionBuildFunction({} as CustomBuildContext);
-    await expect(
-      buildFunction.fn!(
-        { logger, global: { runtimePlatform } } as unknown as BuildStepContext,
-        {
-          inputs: {
-            package_version: { value: undefined },
-            max_idle_time_minutes: { value: undefined },
-          },
-          outputs: {},
-          env: { ...env, NGROK_AUTHTOKEN: 'token' },
-        } as never
-      )
-    ).rejects.toBe(launched);
-
-    expect(spawnDetached).toHaveBeenCalledTimes(1);
-    const launch = jest.mocked(spawnDetached).mock.calls[0][0];
-    const appiumBinPath = path.join(launch.env.APPIUM_HOME!, 'node_modules', '.bin', 'appium');
-    const useHelper = runtimePlatform === BuildRuntimePlatform.DARWIN && helperPresent;
-    expect(launch).toEqual({
-      command: useHelper ? helper : appiumBinPath,
-      args: [
-        ...(useHelper ? [appiumBinPath] : []),
-        '--address',
-        '127.0.0.1',
-        '--port',
-        '4723',
-        '--base-path',
-        '/',
-        '--log-level',
-        'error',
-        '--allow-insecure',
-        '*:session_discovery',
-        '--default-capabilities',
-        runtimePlatform === BuildRuntimePlatform.DARWIN
-          ? '{"appium:eventTimings":true,"appium:isHeadless":true}'
-          : '{"appium:eventTimings":true}',
-      ],
-      env: { ...env, APPIUM_HOME: launch.env.APPIUM_HOME },
-      logger,
-    });
-  });
-
   it('declares the launch inputs so serve-sim can launch the app', () => {
     const ctx = {} as unknown as CustomBuildContext;
     const buildFunction = createStartAppiumRemoteSessionBuildFunction(ctx);
@@ -382,29 +309,6 @@ describe('createStartAppiumRemoteSessionBuildFunction session lifecycle', () =>
     );
   }
 
-  it('passes the existing Android selection to the preview host', async () => {
-    stopAppium.mockResolvedValue(undefined);
-    await runSessionAsync(logger);
-    expect(startDeviceSessionHostAsync).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({ previewDeviceId: 'emulator-5554' })
-    );
-  });
-
-  it('passes the selected iOS preview target without enabling Simulator startup', async () => {
-    stopAppium.mockResolvedValue(undefined);
-    const udid = 'AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA';
-    jest
-      .mocked(IosSimulatorUtils.getAvailableDevicesAsync)
-      .mockResolvedValue([{ udid }, { udid: 'BBBBBBBB-BBBB-BBBB-BBBB-BBBBBBBBBBBB' }] as Awaited<
-        ReturnType<typeof IosSimulatorUtils.getAvailableDevicesAsync>
-      >);
-    await runSessionAsync(logger, undefined, BuildRuntimePlatform.DARWIN);
-    const options = jest.mocked(startDeviceSessionHostAsync).mock.calls[0][1];
-    expect(options).toHaveProperty('previewDeviceId', udid);
-    expect(options.iosSimulatorUdid).toBeUndefined();
-  });
-
   it.each([false, true])(
     'preserves preview settings with Simulator startup %s',
     async bootSimulator => {
@@ -457,7 +361,6 @@ describe('createStartAppiumRemoteSessionBuildFunction session lifecycle', () =>
     expect(IosSimulatorUtils.getDeviceAsync).not.toHaveBeenCalled();
     expect(JSON.parse(jest.mocked(spawnDetached).mock.calls[0][0].args.at(-1)!)).toEqual({
       'appium:eventTimings': true,
-      'appium:isHeadless': true,
       'appium:usePreinstalledWDA': true,
       'appium:prebuiltWDAPath': '/tmp/legacy-wda.app',
     });
@@ -544,7 +447,6 @@ describe('createStartAppiumRemoteSessionBuildFunction session lifecycle', () =>
     );
     expect(JSON.parse(jest.mocked(spawnDetached).mock.calls[0][0].args.at(-1)!)).toEqual({
       'appium:eventTimings': true,
-      'appium:isHeadless': true,
       'appium:usePreinstalledWDA': true,
       'appium:prebuiltWDAPath': '/tmp/selected-wda.app',
     });

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

@@ -128,7 +128,7 @@ describe('createStartArgentRemoteSessionBuildFunction orchestration', () => {
       getLastPreviewActivityAt: jest.fn(),
       finishAsync: mockPreviewStopAsync,
     });
-    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue('started');
+    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
     jest.mocked(waitForDeviceRunSessionStoppedAsync).mockResolvedValue(undefined);
 
     // The (real) tool-server state wait reads this file from the redirected ~/.argent.

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

@@ -84,52 +84,11 @@ describe(createStartWebPreviewRemoteSessionBuildFunction, () => {
       getLastPreviewActivityAt: jest.fn(),
       finishAsync: stopAsync,
     });
-    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue('started');
+    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
     jest.mocked(waitForDeviceRunSessionStoppedAsync).mockResolvedValue(undefined);
     stopAsync.mockResolvedValue(undefined);
   });
 
-  it('uses preview activity to reset the configured idle timeout', async () => {
-    await runAsync(BuildRuntimePlatform.DARWIN, { max_idle_time_minutes: { value: 5 } });
-    const { idleTimeout } = jest.mocked(waitForDeviceRunSessionStoppedAsync).mock.calls[0][0];
-    expect(idleTimeout?.maxIdleTimeMinutes).toBe(5);
-    expect(idleTimeout?.getLastEventObservedAt()).toBeUndefined();
-    const host = await jest.mocked(startDeviceSessionHostAsync).mock.results[0].value;
-    const observedAt = new Date();
-    jest.mocked(host.getLastPreviewActivityAt).mockReturnValue(observedAt);
-    expect(idleTimeout?.getLastPreviewActivityAt?.()).toBe(observedAt);
-    expect(stopAsync).toHaveBeenCalledTimes(1);
-  });
-
-  it.each([BuildRuntimePlatform.DARWIN, BuildRuntimePlatform.LINUX])(
-    'leaves the idle timer disabled when omitted on %s',
-    async runtimePlatform => {
-      await runAsync(runtimePlatform);
-      expect(waitForDeviceRunSessionStoppedAsync).toHaveBeenCalledWith(
-        expect.objectContaining({ idleTimeout: undefined, maxDurationSeconds: 120 })
-      );
-    }
-  );
-
-  it('leaves the idle timer disabled for zero', async () => {
-    await runAsync(BuildRuntimePlatform.DARWIN, {
-      max_idle_time_minutes: { value: 0 },
-    });
-    expect(waitForDeviceRunSessionStoppedAsync).toHaveBeenCalledWith(
-      expect.objectContaining({ idleTimeout: undefined, maxDurationSeconds: 120 })
-    );
-  });
-
-  it('rejects an Android idle timeout before starting the host', async () => {
-    await expect(
-      runAsync(BuildRuntimePlatform.LINUX, {
-        max_idle_time_minutes: { value: 5 },
-      })
-    ).rejects.toThrow('Omit max_idle_time_minutes for Android sessions.');
-    expect(startDeviceSessionHostAsync).not.toHaveBeenCalled();
-    expect(waitForDeviceRunSessionStoppedAsync).not.toHaveBeenCalled();
-  });
-
   it('reports the session token when serve-sim minted one', async () => {
     jest.mocked(startDeviceSessionHostAsync).mockResolvedValue({
       openPreviewAsync: jest.fn().mockResolvedValue({
@@ -309,7 +268,6 @@ describe(createStartWebPreviewRemoteSessionBuildFunction, () => {
       'frame_ancestors',
       'cors_origins',
       'package_version',
-      'max_idle_time_minutes',
       'max_duration_seconds',
     ]);
   });

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

@@ -198,10 +198,7 @@ it('does not delete the edit or publish outputs when commit outcome is unknown',
       return [204];
     });
   const task = submission();
-  const error = await task.run().catch(error => error);
-  expect(error).toBeInstanceOf(SystemError);
-  expect((error as Error).message).toContain('HTTP 404');
-  expect((error as Error).message).toContain('Could not confirm whether Google Play saved');
+  await expect(task.run()).rejects.toBeInstanceOf(SystemError);
   expect(deleted).toBe(false);
   expect(task.setters.every(set => set.mock.calls.length === 0)).toBe(true);
 });

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

@@ -1,17 +1,7 @@
-import { UserError } from '@expo/eas-build-job';
-import fs from 'fs-extra';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { AscApiClient } from '../../utils/ios/AscApiClient';
-import { AscApiUtils } from '../../utils/ios/AscApiUtils';
 import {
-  createUploadToAscBuildFunction,
   isClosedVersionTrainError,
   isInvalidBundleIdentifierError,
-  isMissingAppIconsError,
-  isMissingBackgroundTaskIdentifiersError,
   isMissingPurposeStringError,
-  isRedundantBinaryUploadError,
   isSdkVersionIssueError,
   parseMissingUsageDescriptionKeys,
 } from '../uploadToAsc';
@@ -55,20 +45,6 @@ describe(isInvalidBundleIdentifierError, () => {
   });
 });
 
-describe(isRedundantBinaryUploadError, () => {
-  it('returns true when all errors are redundant-binary-upload codes', () => {
-    expect(isRedundantBinaryUploadError([{ code: '90189' }, { code: '90189' }])).toBe(true);
-  });
-
-  it('returns false when any other error code is present', () => {
-    expect(isRedundantBinaryUploadError([{ code: '90189' }, { code: '90062' }])).toBe(false);
-  });
-
-  it('returns false when there are no errors', () => {
-    expect(isRedundantBinaryUploadError([])).toBe(false);
-  });
-});
-
 describe(isMissingPurposeStringError, () => {
   it('returns true when all errors are missing-purpose-string codes', () => {
     expect(isMissingPurposeStringError([{ code: '90683' }, { code: '90683' }])).toBe(true);
@@ -97,41 +73,6 @@ describe(isSdkVersionIssueError, () => {
   });
 });
 
-describe(isMissingBackgroundTaskIdentifiersError, () => {
-  it('returns true when all errors are missing BG task identifiers codes', () => {
-    expect(isMissingBackgroundTaskIdentifiersError([{ code: '90771' }, { code: '90771' }])).toBe(
-      true
-    );
-  });
-
-  it('returns false when any other error code is present', () => {
-    expect(isMissingBackgroundTaskIdentifiersError([{ code: '90771' }, { code: '90062' }])).toBe(
-      false
-    );
-  });
-
-  it('returns false when there are no errors', () => {
-    expect(isMissingBackgroundTaskIdentifiersError([])).toBe(false);
-  });
-});
-
-describe(isMissingAppIconsError, () => {
-  it.each([['90391', '90713', '90713'], ['90713', '90022', '90023'], ['90022'], ['90023']])(
-    'recognizes missing-icon validation codes %j',
-    (...codes) => {
-      expect(isMissingAppIconsError(codes.map(code => ({ code })))).toBe(true);
-    }
-  );
-
-  it('returns false when any other error code is present', () => {
-    expect(isMissingAppIconsError([{ code: '90391' }, { code: '90771' }])).toBe(false);
-  });
-
-  it('returns false when there are no errors', () => {
-    expect(isMissingAppIconsError([])).toBe(false);
-  });
-});
-
 describe(parseMissingUsageDescriptionKeys, () => {
   it('extracts missing UsageDescription keys from ASC messages', () => {
     expect(
@@ -169,176 +110,3 @@ describe(parseMissingUsageDescriptionKeys, () => {
     ).toEqual([]);
   });
 });
-
-describe(createUploadToAscBuildFunction, () => {
-  it('keeps Apple duplicate-build details in the public error and the full state as its cause', async () => {
-    const state = {
-      state: 'FAILED',
-      errors: [
-        {
-          code: '90189',
-          description: 'Redundant Binary Upload. Build number 1 was already uploaded.',
-        },
-      ],
-      warnings: [{ code: 'WARNING', description: 'Apple warning.' }],
-      infos: [{ code: 'INFO', description: 'Apple information.' }],
-    };
-    await fs.writeFile('/app.ipa', 'ipa');
-    await fs.writeFile('/key.json', '{}');
-    jest.spyOn(AscApiUtils, 'loadApiKeyAsync').mockResolvedValue({} as never);
-    jest.spyOn(AscApiUtils, 'getAppInfoAsync').mockResolvedValue({
-      data: { attributes: { name: 'App', bundleId: 'com.example.app' } },
-    } as never);
-    jest.spyOn(AscApiUtils, 'createBuildUploadAsync').mockResolvedValue({
-      data: { id: 'upload-id' },
-    } as never);
-    jest.spyOn(AscApiUtils, 'commitBuildUploadFileAsync').mockResolvedValue(undefined as never);
-    jest.spyOn(AscApiClient.prototype, 'postAsync').mockResolvedValue({
-      data: { id: 'file-id', attributes: { uploadOperations: [] } },
-    } as never);
-    jest
-      .spyOn(AscApiClient.prototype, 'getAsync')
-      .mockResolvedValueOnce({
-        data: { attributes: { assetDeliveryState: { state: 'COMPLETE' } } },
-      } as never)
-      .mockResolvedValueOnce({ data: { attributes: { state } } } as never);
-    try {
-      const step = createUploadToAscBuildFunction().createBuildStepFromFunctionCall(
-        createGlobalContextMock({ staticContextContent: { job: {} } }),
-        {
-          callInputs: {
-            ipa_path: '/app.ipa',
-            asc_api_key_path: '/key.json',
-            apple_app_identifier: 'app-id',
-            bundle_version: '1',
-            bundle_short_version: '1.0',
-            wait_for_processing: true,
-          },
-        }
-      );
-      const error = await step.executeAsync().catch(error => error);
-      expect(error).toBeInstanceOf(UserError);
-      expect(error.errorCode).toBe('EAS_UPLOAD_TO_ASC_VERSION_DUPLICATE');
-      expect(error.cause).toEqual(state);
-      expect(error.toExternalExpoError().message).toContain(
-        'Redundant Binary Upload. Build number 1 was already uploaded. (90189)'
-      );
-    } finally {
-      jest.restoreAllMocks();
-    }
-  });
-});
-
-describe(createUploadToAscBuildFunction, () => {
-  it('keeps Apple background-task details in the public error and the full state as its cause', async () => {
-    const state = {
-      state: 'FAILED',
-      errors: [
-        {
-          code: '90771',
-          description:
-            'Missing BGTaskSchedulerPermittedIdentifiers while UIBackgroundModes includes processing.',
-        },
-      ],
-      warnings: [{ code: 'WARNING', description: 'Apple warning.' }],
-      infos: [{ code: 'INFO', description: 'Apple information.' }],
-    };
-    await fs.writeFile('/app.ipa', 'ipa');
-    await fs.writeFile('/key.json', '{}');
-    jest.spyOn(AscApiUtils, 'loadApiKeyAsync').mockResolvedValue({} as never);
-    jest.spyOn(AscApiUtils, 'getAppInfoAsync').mockResolvedValue({
-      data: { attributes: { name: 'App', bundleId: 'com.example.app' } },
-    } as never);
-    jest.spyOn(AscApiUtils, 'createBuildUploadAsync').mockResolvedValue({
-      data: { id: 'upload-id' },
-    } as never);
-    jest.spyOn(AscApiUtils, 'commitBuildUploadFileAsync').mockResolvedValue(undefined as never);
-    jest.spyOn(AscApiClient.prototype, 'postAsync').mockResolvedValue({
-      data: { id: 'file-id', attributes: { uploadOperations: [] } },
-    } as never);
-    jest
-      .spyOn(AscApiClient.prototype, 'getAsync')
-      .mockResolvedValueOnce({
-        data: { attributes: { assetDeliveryState: { state: 'COMPLETE' } } },
-      } as never)
-      .mockResolvedValueOnce({ data: { attributes: { state } } } as never);
-    try {
-      const step = createUploadToAscBuildFunction().createBuildStepFromFunctionCall(
-        createGlobalContextMock({ staticContextContent: { job: {} } }),
-        {
-          callInputs: {
-            ipa_path: '/app.ipa',
-            asc_api_key_path: '/key.json',
-            apple_app_identifier: 'app-id',
-            bundle_version: '1',
-            bundle_short_version: '1.0',
-            wait_for_processing: true,
-          },
-        }
-      );
-      const error = await step.executeAsync().catch(error => error);
-      expect(error).toBeInstanceOf(UserError);
-      expect(error.errorCode).toBe('EAS_UPLOAD_TO_ASC_MISSING_BG_TASK_IDENTIFIERS');
-      expect(error.cause).toEqual(state);
-      expect(error.toExternalExpoError().message).toContain(
-        'Missing BGTaskSchedulerPermittedIdentifiers while UIBackgroundModes includes processing. (90771)'
-      );
-    } finally {
-      jest.restoreAllMocks();
-    }
-  });
-});
-
-describe(createUploadToAscBuildFunction, () => {
-  it('keeps Apple validation details in the public error and the full state as its cause', async () => {
-    const state = {
-      state: 'FAILED',
-      errors: [{ code: '90713', description: 'Missing CFBundleIconName in Watch.app.' }],
-      warnings: [{ code: 'WARNING', description: 'Apple warning.' }],
-      infos: [{ code: 'INFO', description: 'Apple information.' }],
-    };
-    await fs.writeFile('/app.ipa', 'ipa');
-    await fs.writeFile('/key.json', '{}');
-    jest.spyOn(AscApiUtils, 'loadApiKeyAsync').mockResolvedValue({} as never);
-    jest.spyOn(AscApiUtils, 'getAppInfoAsync').mockResolvedValue({
-      data: { attributes: { name: 'App', bundleId: 'com.example.app' } },
-    } as never);
-    jest.spyOn(AscApiUtils, 'createBuildUploadAsync').mockResolvedValue({
-      data: { id: 'upload-id' },
-    } as never);
-    jest.spyOn(AscApiUtils, 'commitBuildUploadFileAsync').mockResolvedValue(undefined as never);
-    jest.spyOn(AscApiClient.prototype, 'postAsync').mockResolvedValue({
-      data: { id: 'file-id', attributes: { uploadOperations: [] } },
-    } as never);
-    jest
-      .spyOn(AscApiClient.prototype, 'getAsync')
-      .mockResolvedValueOnce({
-        data: { attributes: { assetDeliveryState: { state: 'COMPLETE' } } },
-      } as never)
-      .mockResolvedValueOnce({ data: { attributes: { state } } } as never);
-    try {
-      const step = createUploadToAscBuildFunction().createBuildStepFromFunctionCall(
-        createGlobalContextMock({ staticContextContent: { job: {} } }),
-        {
-          callInputs: {
-            ipa_path: '/app.ipa',
-            asc_api_key_path: '/key.json',
-            apple_app_identifier: 'app-id',
-            bundle_version: '1',
-            bundle_short_version: '1.0',
-            wait_for_processing: true,
-          },
-        }
-      );
-      const error = await step.executeAsync().catch(error => error);
-      expect(error).toBeInstanceOf(UserError);
-      expect(error.errorCode).toBe('EAS_UPLOAD_TO_ASC_MISSING_APP_ICONS');
-      expect(error.cause).toEqual(state);
-      expect(error.toExternalExpoError().message).toContain(
-        'Missing CFBundleIconName in Watch.app. (90713)'
-      );
-    } finally {
-      jest.restoreAllMocks();
-    }
-  });
-});

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

@@ -1,39 +0,0 @@
-import spawn from '@expo/turtle-spawn';
-import { vol } from 'memfs';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { NpmrcAuthTokenLine } from '../../../templates/npmrc';
-import { createSetUpNpmrcBuildFunction } from '../useNpmToken';
-
-jest.mock('fs');
-jest.mock('@expo/turtle-spawn', () => ({ __esModule: true, default: jest.fn() }));
-
-const projectTargetDirectory = '/workingdir/project';
-const homeDirectory = '/home/expo';
-
-describe(createSetUpNpmrcBuildFunction, () => {
-  beforeEach(async () => {
-    vol.reset();
-    await vol.promises.mkdir(projectTargetDirectory, { recursive: true });
-    await vol.promises.mkdir(homeDirectory, { recursive: true });
-    jest.mocked(spawn).mockResolvedValue({ stdout: `${homeDirectory}/.npmrc\n` } as never);
-  });
-
-  afterEach(() => {
-    jest.restoreAllMocks();
-  });
-
-  it('adds the NPM_TOKEN placeholder from the step env to ~/.npmrc on EAS Build', async () => {
-    const globalCtx = createGlobalContextMock({ projectTargetDirectory });
-    globalCtx.updateEnv({ NPM_TOKEN: 'npm_secret_token', EAS_BUILD_RUNNER: 'eas-build' });
-    const step = createSetUpNpmrcBuildFunction().createBuildStepFromFunctionCall(globalCtx, {
-      callInputs: {},
-    });
-
-    await step.executeAsync();
-
-    expect(await vol.promises.readFile(`${homeDirectory}/.npmrc`, 'utf8')).toContain(
-      NpmrcAuthTokenLine
-    );
-  });
-});

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

@@ -312,22 +312,8 @@ export async function downloadBuildAsync(
         const response = await fetch(downloadUrl, { headers, signal });
         if (!response.ok) {
           const textResult = await asyncResult(response.text());
-          const archiveUrl = new URL(downloadUrl);
-          const source = params.buildId
-            ? `application archive for build ${params.buildId}`
-            : `archive at ${archiveUrl.origin}${archiveUrl.pathname}`;
-          if (response.status === 404 || response.status === 410) {
-            throw new UserError(
-              'EAS_DOWNLOAD_BUILD_ARCHIVE_UNAVAILABLE',
-              `Failed to download the ${source} (HTTP ${response.status}). ` +
-                'The archive is unavailable. ' +
-                (params.buildId
-                  ? 'Check that the archive still exists and try again.'
-                  : 'Check that the URL is correct and the archive still exists, then try again.')
-            );
-          }
           throw new Error(
-            `Failed to download the ${source} (HTTP ${response.status}): ${textResult.value}`
+            `Unexpected response from server (${response.status}): ${textResult.value}`
           );
         }
         const archiveFilename = resolveArchiveFilename({ response, extensions });

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

@@ -23,7 +23,7 @@ import resolveFrom from 'resolve-from';
 
 import { COMMON_FASTLANE_ENV } from '../../common/fastlane';
 import IosCredentialsManager from '../utils/ios/credentials/manager';
-import { installIsolatedNpmPackageAsync } from '../../utils/installIsolatedNpmPackageAsync';
+import { resolvePackageVersionAsync } from '../../utils/packageManager';
 
 export function createRepackBuildFunction(): BuildFunction {
   return new BuildFunction({
@@ -121,12 +121,18 @@ export function createRepackBuildFunction(): BuildFunction {
         : undefined;
       const jsBundleOnly = (inputs.js_bundle_only.value as boolean | undefined) ?? false;
 
+      const resolvedRepackVersion =
+        (await resolvePackageVersionAsync({
+          logger: stepsCtx.logger,
+          packageName: inputs.repack_package.value as string,
+          distTag: inputs.repack_version.value as string,
+        })) ?? (inputs.repack_version.value as string);
+      stepsCtx.logger.info(
+        `Using repack from: ${inputs.repack_package.value}@${inputs.repack_version.value} (${resolvedRepackVersion})`
+      );
       const repackApp = await installAndImportRepackAsync({
         packageName: inputs.repack_package.value as string,
-        versionSpec: inputs.repack_version.value as string,
-        pathEnv: env.PATH,
-        npmCacheUrl: env.EAS_BUILD_NPM_CACHE_URL,
-        logger: stepsCtx.logger,
+        version: resolvedRepackVersion,
       });
       const { repackAppIosAsync, repackAppAndroidAsync } = repackApp;
 
@@ -220,28 +226,16 @@ function createOutputPath({
  */
 async function installAndImportRepackAsync({
   packageName,
-  versionSpec,
-  pathEnv,
-  npmCacheUrl,
-  logger,
+  version,
 }: {
   packageName: string;
-  versionSpec: string;
-  pathEnv: string | undefined;
-  npmCacheUrl: string | undefined;
-  logger: bunyan;
+  version: string;
 }): Promise<typeof import('@expo/repack-app')> {
   const sandbox = await fs.promises.mkdtemp(path.join(os.tmpdir(), `repack-package-root-`));
-  await installIsolatedNpmPackageAsync({
-    packageSpec: `${packageName}@${versionSpec}`,
-    directory: sandbox,
-    npmCacheUrl,
-    pathEnv,
-    logger,
+  await spawnAsync('yarn', ['add', `${packageName}@${version}`], {
+    stdio: 'inherit',
+    cwd: sandbox,
   });
-  const packageJsonPath = path.join(sandbox, 'node_modules', packageName, 'package.json');
-  const { version } = JSON.parse(await fs.promises.readFile(packageJsonPath, 'utf8'));
-  logger.info(`Using repack from: ${packageName}@${versionSpec} (${version})`);
   return require(resolveFrom(sandbox, packageName));
 }
 

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

@@ -167,7 +167,6 @@ export async function runAgentDeviceRemoteSessionAsync(
       subdomainPrefix: 'agent-device',
       baseDomain: ngrokTunnelDomain,
       authtoken: ngrokAuthtoken,
-      healthCheck: { path: '/health' },
       logger: taskLogger,
     });
     tasks.signal.throwIfAborted();
@@ -226,7 +225,7 @@ export async function runAgentDeviceRemoteSessionAsync(
     tasks.signal.throwIfAborted();
     logger.info(tasks.summary());
 
-    const sessionStart = await uploadRemoteSessionConfigWithLocalEgressAsync({
+    await uploadRemoteSessionConfigWithLocalEgressAsync({
       env,
       signal,
       ctx,
@@ -240,9 +239,6 @@ export async function runAgentDeviceRemoteSessionAsync(
       },
       logger,
     });
-    if (sessionStart === 'stopped') {
-      return;
-    }
     tasks.signal.throwIfAborted();
     void pollAgentDeviceArtifactsForUploadAsync(ctx, {
       deviceRunSessionId,

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

@@ -65,7 +65,6 @@ const APPIUM_HOST = '127.0.0.1';
 const APPIUM_PORT = 4723;
 const APPIUM_STARTUP_TIMEOUT_MS = 120_000;
 const DEFAULT_APPIUM_VERSION = '^3';
-const FDA_HELPER = '/usr/local/libexec/turtle-tcc-fda';
 
 const AppiumInstalledDriversSchema = z.record(
   z.string(),
@@ -157,7 +156,6 @@ export function createStartAppiumRemoteSessionBuildFunction(
       const startHost = () =>
         startDeviceSessionHostAsync(ctx, {
           ...iosStartup,
-          previewDeviceId: device.udid,
           separateLogPhase: true,
           runtimePlatform,
           env,
@@ -227,12 +225,9 @@ export function createStartAppiumRemoteSessionBuildFunction(
         });
 
         setupSignal?.throwIfAborted();
-        const useFdaHelper =
-          runtimePlatform === BuildRuntimePlatform.DARWIN && fs.existsSync(FDA_HELPER);
         appiumProcess = spawnDetached({
-          command: useFdaHelper ? FDA_HELPER : appiumBinPath,
+          command: appiumBinPath,
           args: [
-            ...(useFdaHelper ? [appiumBinPath] : []),
             '--address',
             APPIUM_HOST,
             '--port',
@@ -247,13 +242,7 @@ export function createStartAppiumRemoteSessionBuildFunction(
             '--allow-insecure',
             '*:session_discovery',
             '--default-capabilities',
-            JSON.stringify({
-              'appium:eventTimings': true,
-              // Without it, XCUITest restarted the booted Simulator at session start, which
-              // closed the app serve-sim had launched. EAS VMs never show the Simulator window.
-              ...(device.platformName === 'iOS' ? { 'appium:isHeadless': true } : {}),
-              ...wdaCapabilities,
-            }),
+            JSON.stringify({ 'appium:eventTimings': true, ...wdaCapabilities }),
           ],
           env: appiumEnv,
           logger,
@@ -274,11 +263,11 @@ export function createStartAppiumRemoteSessionBuildFunction(
           subdomainPrefix: 'appium',
           baseDomain: ngrokTunnelDomain,
           authtoken: ngrokAuthtoken,
-          healthCheck: { path: '/status' },
           logger,
         });
 
-        // The preview host uses the same device selected for Appium.
+        // expo-device-hub has no serial-selection flag. Device run session workflows must expose
+        // a single booted Android emulator so the Hub and Appium resolve the same device.
         const launchDescription = describeServeSimLaunch(launch);
         if (launchDescription) {
           logger.info(launchDescription);
@@ -289,7 +278,7 @@ export function createStartAppiumRemoteSessionBuildFunction(
           authtoken: ngrokAuthtoken,
         });
 
-        const sessionStart = await uploadRemoteSessionConfigWithLocalEgressAsync({
+        await uploadRemoteSessionConfigWithLocalEgressAsync({
           env,
           signal,
           ctx,
@@ -307,9 +296,6 @@ export function createStartAppiumRemoteSessionBuildFunction(
           },
           logger,
         });
-        if (sessionStart === 'stopped') {
-          return;
-        }
 
         await waitForDeviceRunSessionStoppedAsync({
           ctx,

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

@@ -340,7 +340,6 @@ export function createStartArgentRemoteSessionBuildFunction(
           baseDomain: ngrokTunnelDomain,
           authtoken: ngrokAuthtoken,
           rewriteHostHeader: true,
-          healthCheck: { path: '/tools', statuses: [200, 401] },
           logger,
         });
         const publicToolsUrl = toolsTunnel.url;
@@ -361,7 +360,7 @@ export function createStartArgentRemoteSessionBuildFunction(
             : 'Private preview URL unavailable for this session.'
         );
 
-        const sessionStart = await uploadRemoteSessionConfigWithLocalEgressAsync({
+        await uploadRemoteSessionConfigWithLocalEgressAsync({
           env,
           signal,
           ctx,
@@ -375,9 +374,6 @@ export function createStartArgentRemoteSessionBuildFunction(
           },
           logger,
         });
-        if (sessionStart === 'stopped') {
-          return;
-        }
 
         await waitForDeviceRunSessionStoppedAsync({
           ctx,

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

@@ -1,4 +1,3 @@
-import { UserError } from '@expo/eas-build-job';
 import {
   BuildFunction,
   BuildRuntimePlatform,
@@ -58,11 +57,6 @@ export function createStartWebPreviewRemoteSessionBuildFunction(
         required: false,
         allowedValueTypeName: BuildStepInputValueTypeName.STRING,
       }),
-      BuildStepInput.createProvider({
-        id: 'max_idle_time_minutes',
-        required: false,
-        allowedValueTypeName: BuildStepInputValueTypeName.NUMBER,
-      }),
       BuildStepInput.createProvider({
         id: 'max_duration_seconds',
         required: false,
@@ -74,20 +68,9 @@ export function createStartWebPreviewRemoteSessionBuildFunction(
       const ngrokTunnelDomain = getNgrokTunnelDomainOrThrow(stepEnv);
       const ngrokAuthtoken = getNgrokAuthtokenOrThrow(stepEnv);
       const env = omitNgrokAuthtoken(stepEnv);
-      const maxIdleTimeMinutes = inputs.max_idle_time_minutes?.value as number | undefined;
       const maxDurationSeconds = inputs.max_duration_seconds?.value as number | undefined;
       const packageVersion = inputs.package_version?.value as string | undefined;
       const { runtimePlatform } = global;
-      if (
-        maxIdleTimeMinutes !== undefined &&
-        maxIdleTimeMinutes > 0 &&
-        runtimePlatform !== BuildRuntimePlatform.DARWIN
-      ) {
-        throw new UserError(
-          'UNSUPPORTED_WEB_PREVIEW_IDLE_TIMEOUT',
-          'Web preview idle timeouts require iOS preview activity reporting. Omit max_idle_time_minutes for Android sessions.'
-        );
-      }
       if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
         await selectXcodeDeveloperDirectoryAsync({ env, logger });
       }
@@ -146,7 +129,7 @@ export function createStartWebPreviewRemoteSessionBuildFunction(
             ? `Preview URL: ${webPreview.sharePageUrl} (server: ${webPreview.apiUrl}).`
             : 'Private preview URL unavailable for this session.'
         );
-        const sessionStart = await uploadRemoteSessionConfigWithLocalEgressAsync({
+        await uploadRemoteSessionConfigWithLocalEgressAsync({
           env,
           signal,
           ctx,
@@ -164,9 +147,6 @@ export function createStartWebPreviewRemoteSessionBuildFunction(
           },
           logger,
         });
-        if (sessionStart === 'stopped') {
-          return;
-        }
 
         await waitForDeviceRunSessionStoppedAsync({
           ctx,
@@ -174,14 +154,6 @@ export function createStartWebPreviewRemoteSessionBuildFunction(
           logger,
           maxDurationSeconds,
           signal,
-          idleTimeout:
-            maxIdleTimeMinutes !== undefined && maxIdleTimeMinutes > 0
-              ? {
-                  maxIdleTimeMinutes,
-                  getLastEventObservedAt: () => undefined,
-                  getLastPreviewActivityAt: () => sessionHost.getLastPreviewActivityAt(),
-                }
-              : undefined,
         });
       } finally {
         await sessionHost.finishAsync();

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

@@ -262,45 +262,6 @@ export function createUploadToAscBuildFunction(): BuildFunction {
               }
             );
           }
-          if (isRedundantBinaryUploadError(errors)) {
-            throw new UserError(
-              'EAS_UPLOAD_TO_ASC_VERSION_DUPLICATE',
-              `Increment Build Number: Build number ${bundleVersion} for app version ${bundleShortVersion} has already been used. ` +
-                'App Store Connect requires unique build numbers within each app version (version train). ' +
-                'Increment it by setting ios.buildNumber in app.json, or set "autoIncrement": true in eas.json (recommended). Then rebuild and resubmit.' +
-                `\n\nApp Store Connect errors:\n${itemizeMessages(errors)}`,
-              {
-                docsUrl: 'https://docs.expo.dev/build-reference/app-versions/',
-                cause: state,
-              }
-            );
-          }
-          if (isMissingBackgroundTaskIdentifiersError(errors)) {
-            throw new UserError(
-              'EAS_UPLOAD_TO_ASC_MISSING_BG_TASK_IDENTIFIERS',
-              'Build upload was rejected by App Store Connect because Info.plist is missing `BGTaskSchedulerPermittedIdentifiers` while `UIBackgroundModes` includes `processing`. ' +
-                'In an Expo project, add `BGTaskSchedulerPermittedIdentifiers` to `ios.infoPlist` in your app config and include every background task identifier the app schedules. ' +
-                'If you do not use Continuous Native Generation (CNG), add the same key to the native target Info.plist. Then rebuild and submit again.' +
-                `\n\nApp Store Connect errors:\n${itemizeMessages(errors)}`,
-              {
-                docsUrl: 'https://docs.expo.dev/versions/latest/config/app/#infoplist',
-                cause: state,
-              }
-            );
-          }
-          if (isMissingAppIconsError(errors)) {
-            throw new UserError(
-              'EAS_UPLOAD_TO_ASC_MISSING_APP_ICONS',
-              'Build upload was rejected by App Store Connect because required app icons are missing or misconfigured in one of the iOS bundles. ' +
-                'In an Expo project, check your icon config (`expo.icon`, `ios.icon`) and any custom native targets or plugins that create extra bundles, such as watch extensions. ' +
-                'Make sure the affected target has the required icon assets and Info.plist icon keys (for example `CFBundleIconName` / `CFBundleIconFiles`), then rebuild and submit again.' +
-                `\n\nApp Store Connect errors:\n${itemizeMessages(errors)}`,
-              {
-                docsUrl: 'https://docs.expo.dev/develop/user-interface/splash-screen-and-app-icon/',
-                cause: state,
-              }
-            );
-          }
           if (isInvalidBundleIdentifierError(errors)) {
             const ipaInfoResult = await asyncResult(readIpaInfoAsync(ipaPath));
             const ipaBundleIdentifier = ipaInfoResult.ok
@@ -383,21 +344,6 @@ export function isSdkVersionIssueError(messages: { code: string }[]): boolean {
   return messages.length > 0 && messages.every(message => message.code === '90725');
 }
 
-export function isRedundantBinaryUploadError(messages: { code: string }[]): boolean {
-  return messages.length > 0 && messages.every(message => message.code === '90189');
-}
-
-export function isMissingBackgroundTaskIdentifiersError(messages: { code: string }[]): boolean {
-  return messages.length > 0 && messages.every(message => message.code === '90771');
-}
-
-export function isMissingAppIconsError(messages: { code: string }[]): boolean {
-  return (
-    messages.length > 0 &&
-    messages.every(message => ['90022', '90023', '90391', '90713'].includes(message.code))
-  );
-}
-
 export function isInvalidBundleIdentifierError(messages: { code: string }[]): boolean {
   return (
     messages.length > 0 && messages.every(message => ['90054', '90055'].includes(message.code))

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

@@ -1,6 +1,9 @@
 import { BuildFunction } from '@expo/steps';
+import fs from 'fs-extra';
+import path from 'path';
 
-import { setUpNpmrcAsync } from '../../utils/npmrc';
+import { NpmrcTemplate } from '../../templates/npmrc';
+import { findPackagerRootDir } from '../../utils/packageManager';
 
 export function createSetUpNpmrcBuildFunction(): BuildFunction {
   return new BuildFunction({
@@ -9,12 +12,28 @@ export function createSetUpNpmrcBuildFunction(): BuildFunction {
     name: 'Use NPM_TOKEN',
     __metricsId: 'eas/use_npm_token',
     fn: async (stepCtx, { env }) => {
-      await setUpNpmrcAsync({
-        projectTargetDirectory: stepCtx.global.projectTargetDirectory,
-        workingDirectory: stepCtx.workingDirectory,
-        env,
-        logger: stepCtx.logger,
-      });
+      const { logger } = stepCtx;
+      if (env.NPM_TOKEN) {
+        logger.info('We detected that you set the NPM_TOKEN environment variable');
+        const projectNpmrcPath = path.join(stepCtx.global.projectTargetDirectory, '.npmrc');
+        if (await fs.pathExists(projectNpmrcPath)) {
+          logger.info('.npmrc already exists in your project directory, skipping generation');
+        } else {
+          logger.info('Creating .npmrc in your project directory with the following contents:');
+          logger.info(NpmrcTemplate);
+          await fs.writeFile(projectNpmrcPath, NpmrcTemplate);
+        }
+      } else {
+        const projectNpmrcPath = path.join(findPackagerRootDir(stepCtx.workingDirectory), '.npmrc');
+        if (await fs.pathExists(projectNpmrcPath)) {
+          logger.info(
+            `.npmrc found at ${path.relative(
+              stepCtx.global.projectTargetDirectory,
+              projectNpmrcPath
+            )}`
+          );
+        }
+      }
     },
   });
 }

packages/build-tools/src/steps/utils/IosSimulatorRecordingUtils.ts

@@ -36,7 +36,7 @@ const SERVE_SIM_LEASE_FINALIZE_TIMEOUT_MS =
 const SERVE_SIM_FINISH_TIMEOUT_MS =
   SERVE_SIM_CONTROL_REQUEST_TIMEOUT_MS + SERVE_SIM_LEASE_FINALIZE_TIMEOUT_MS;
 const SERVE_SIM_FORCE_STOP_TIMEOUT_MS = 5_000;
-const SERVE_SIM_RECORDING_STARTED_LINE = /(?:^|\n)serve-sim:recording-started\r?\n/;
+const SERVE_SIM_RECORDING_STARTED = 'serve-sim:recording-started';
 // The serve-sim package the session host started; every recorder runs `record-video` from it.
 let serveSimPackageSpec: string | null = null;
 
@@ -507,19 +507,14 @@ function captureProcessOutput(recordingProcess: ChildProcess): {
 } {
   let output = '';
   let started = false;
-  const captureStreamOutput = (stream: ChildProcess['stdout']): void => {
-    let streamOutput = '';
-    stream?.on('data', (chunk: Buffer | string) => {
-      const text = chunk.toString();
-      output = `${output}${text}`.slice(-16_384);
-      streamOutput = `${streamOutput}${text}`;
-      if (SERVE_SIM_RECORDING_STARTED_LINE.test(streamOutput)) {
-        started = true;
-      }
-      streamOutput = streamOutput.slice(-16_384);
-    });
+  const appendChunk = (chunk: Buffer | string): void => {
+    output = `${output}${chunk.toString()}`;
+    if (output.includes(SERVE_SIM_RECORDING_STARTED)) {
+      started = true;
+    }
+    output = output.slice(-16_384);
   };
-  captureStreamOutput(recordingProcess.stdout);
-  captureStreamOutput(recordingProcess.stderr);
+  recordingProcess.stdout?.on('data', appendChunk);
+  recordingProcess.stderr?.on('data', appendChunk);
   return { getOutput: () => output, hasStarted: () => started };
 }

packages/build-tools/src/steps/utils/__tests__/IosSimulatorRecordingUtils.test.ts

@@ -144,10 +144,7 @@ test('starts serve-sim record-video and returns only a finalized recording', asy
   const finishing = IosSimulatorRecordingUtils.finishAsync({ logger });
   await setTimeout(20);
   expect(child.kill).not.toHaveBeenCalled();
-  child.stdout?.emit('data', 'Downloading');
-  stderr.write('serve-sim:recording-');
-  child.stdout?.emit('data', ' package');
-  stderr.write('started\r\n');
+  stderr.write('serve-sim:recording-started\n');
   stderr.write('x'.repeat(17_000));
   const recordings = await finishing;
 
@@ -365,32 +362,6 @@ test('keeps a recorder active after its package-manager wrapper exits', async ()
   expect(recordings).toHaveLength(1);
 });
 
-test('does not mistake bundled source in an error for a recording start', async () => {
-  let currentTime = Date.now();
-  jest.spyOn(Date, 'now').mockImplementation(() => currentTime);
-  jest
-    .mocked(readServeSimServersAsync)
-    .mockResolvedValue([{ udid, url: 'http://127.0.0.1:43563', token: 'session-token' }]);
-  const recorder = mockRecorder();
-
-  await IosSimulatorRecordingUtils.startAsync({ env, logger });
-  await waitForRecorderSpawnAsync();
-  recorder.child.stderr?.emit(
-    'data',
-    'const marker = "serve-sim:recording-started";\nError: No running serve-sim session found.\n'
-  );
-  recorder.fail(new Error('recorder exited before connecting'));
-
-  const finishing = IosSimulatorRecordingUtils.finishAsync({ logger });
-  try {
-    expect(await Promise.race([finishing.then(() => true), setTimeout(250, false)])).toBe(true);
-  } finally {
-    currentTime += 311_000;
-    await finishing;
-  }
-  expect(recorder.child.kill).not.toHaveBeenCalled();
-});
-
 test('does not signal a recorder that exits before it reports its start', async () => {
   let currentTime = Date.now();
   jest.spyOn(Date, 'now').mockImplementation(() => currentTime);

packages/build-tools/src/steps/utils/__tests__/agentRun.test.ts

@@ -186,7 +186,6 @@ describe(runAgentAsync, () => {
         '--package-lock=false',
         '--no-audit',
         '--no-fund',
-        '--no-update-notifier',
         '--registry',
         'https://npm-cache.expo.test',
         '@anthropic-ai/[email protected]',

packages/build-tools/src/steps/utils/__tests__/deviceRunSessionWorkerApiCallers.test.ts

@@ -7,7 +7,6 @@ import { setImmediate } from 'node:timers/promises';
 
 import { type CustomBuildContext } from '../../../customBuildContext';
 import RemoteLoggerStream from '../../../logging/RemoteLoggerStream';
-import { Sentry } from '../../../sentry';
 import { turtleFetch } from '../../../utils/turtleFetch';
 import { downloadBuildAsync } from '../../functions/downloadBuild';
 import { uploadDeviceRunSessionArtifactAsync } from '../deviceRunSessionArtifacts';
@@ -171,53 +170,6 @@ describe('with a device run session token', () => {
     expect(ctx.graphqlClient.mutation).not.toHaveBeenCalled();
   });
 
-  it('handles the structured stopped code without matching the message', async () => {
-    const ctx = createCtx({ withToken: true });
-    jest.mocked(turtleFetch).mockResolvedValueOnce(
-      jsonResponse(
-        {
-          errors: [
-            { code: 'DEVICE_RUN_SESSION_ALREADY_STOPPED', message: 'A different explanation.' },
-          ],
-        },
-        400
-      )
-    );
-    await expect(
-      uploadRemoteSessionConfigAsync({
-        ctx,
-        deviceRunSessionId: 'drs-id',
-        remoteConfig: {},
-        logger,
-      })
-    ).resolves.toBe('stopped');
-    expect(turtleFetch).toHaveBeenCalledTimes(1);
-    expect(logger.info).toHaveBeenCalledWith(
-      'Device run session drs-id was stopped during startup.'
-    );
-  });
-
-  it.each([undefined, 'VALIDATION_ERROR'])('preserves an ordinary 400 with code %s', async code => {
-    const ctx = createCtx({ withToken: true });
-    jest
-      .mocked(turtleFetch)
-      .mockResolvedValueOnce(
-        jsonResponse(
-          { errors: [{ code, message: 'Device run session has already stopped.' }] },
-          400
-        )
-      );
-    await expect(
-      uploadRemoteSessionConfigAsync({
-        ctx,
-        deviceRunSessionId: 'drs-id',
-        remoteConfig: {},
-        logger,
-      })
-    ).rejects.toBeInstanceOf(SystemError);
-    expect(turtleFetch).toHaveBeenCalledTimes(1);
-  });
-
   it('fails the start with a system error that does not contain the token', async () => {
     const ctx = createCtx({ withToken: true });
     jest
@@ -267,48 +219,6 @@ describe('with a device run session token', () => {
     expect(jest.mocked(turtleFetch)).toHaveBeenCalledTimes(1);
   });
 
-  it('handles a stopped-session TURN response without a warning or retry', async () => {
-    const ctx = createCtx({ withToken: true });
-    jest
-      .mocked(turtleFetch)
-      .mockResolvedValueOnce(
-        jsonResponse(
-          { errors: [{ code: 'DEVICE_RUN_SESSION_ALREADY_STOPPED', message: 'Stopped.' }] },
-          400
-        )
-      );
-
-    await expect(fetchWebPreviewTurnArgsAsync(ctx, { logger })).resolves.toEqual([]);
-
-    expect(logger.info).toHaveBeenCalledWith(
-      'Device run session was stopped before TURN credentials were fetched.'
-    );
-    expect(logger.warn).not.toHaveBeenCalled();
-    expect(Sentry.capture).not.toHaveBeenCalled();
-    expect(turtleFetch).toHaveBeenCalledTimes(1);
-  });
-
-  it.each([undefined, 'VALIDATION_ERROR'])(
-    'still warns on a TURN failure with code %s',
-    async code => {
-      const ctx = createCtx({ withToken: true });
-      jest
-        .mocked(turtleFetch)
-        .mockResolvedValueOnce(
-          jsonResponse(
-            { errors: [{ code, message: 'Device run session has already stopped.' }] },
-            400
-          )
-        );
-
-      await expect(fetchWebPreviewTurnArgsAsync(ctx, { logger })).resolves.toEqual([]);
-
-      expect(logger.warn).toHaveBeenCalled();
-      expect(Sentry.capture).toHaveBeenCalled();
-      expect(turtleFetch).toHaveBeenCalledTimes(1);
-    }
-  );
-
   it('creates artifact upload sessions through the worker API', async () => {
     const ctx = createCtx({ withToken: true });
     jest.mocked(turtleFetch).mockResolvedValueOnce(
@@ -454,9 +364,7 @@ describe('with a device run session token', () => {
         robotAccessToken: ROBOT_ACCESS_TOKEN,
         extensions: ['app'],
       })
-    ).rejects.toThrow(
-      `Failed to download the application archive for build ${BUILD_ID} (HTTP 500): stop here`
-    );
+    ).rejects.toThrow('Unexpected response from server (500): stop here');
 
     expectWorkerApiCall('application', 'GET');
     expect(jest.mocked(fetch)).toHaveBeenCalledWith(
@@ -681,9 +589,7 @@ describe('without a device run session token', () => {
         robotAccessToken: ROBOT_ACCESS_TOKEN,
         extensions: ['app'],
       })
-    ).rejects.toThrow(
-      `Failed to download the application archive for build ${BUILD_ID} (HTTP 500): stop here`
-    );
+    ).rejects.toThrow('Unexpected response from server (500)');
 
     expect(ctx.graphqlClient.query).toHaveBeenCalled();
     expect(jest.mocked(fetch)).toHaveBeenCalledWith(

packages/build-tools/src/steps/utils/__tests__/deviceSessionHost.test.ts

@@ -24,7 +24,6 @@ import {
   uploadDeviceRunSessionScreenRecordingsAsync,
 } from '../deviceRunSessionScreenRecordings';
 import {
-  captureDeviceRunSessionPreviewAsync,
   ensureMacosPreviewEncoderInstalledAsync,
   startDeviceRunSessionPreview,
 } from '../deviceRunSessionPreview';
@@ -69,7 +68,6 @@ jest.mock('../remoteDeviceRunSession', () => ({
 jest.mock('../deviceRunSessionPreview', () => ({
   ...jest.requireActual('../deviceRunSessionPreview'),
   ensureMacosPreviewEncoderInstalledAsync: jest.fn(),
-  captureDeviceRunSessionPreviewAsync: jest.fn(),
   startDeviceRunSessionPreview: jest.fn(),
 }));
 jest.mock('../deviceRunSessionScreenRecordings', () => ({
@@ -193,91 +191,6 @@ afterEach(async () => {
   );
 });
 
-it.each([undefined, '', 'invalid serial', 'all', 'booted'])(
-  'starts Hub without adding a device restriction for %j',
-  async previewDeviceId => {
-    const host = await startDeviceSessionHostAsync(ctx, {
-      runtimePlatform: BuildRuntimePlatform.LINUX,
-      env,
-      logger,
-      timeoutMs: 10_000,
-      previewDeviceId,
-    });
-    try {
-      expect(jest.mocked(spawnDetached).mock.calls[0][0].args).not.toContain('--single-device');
-    } finally {
-      await host.finishAsync();
-    }
-  }
-);
-
-it('uses the supplied Android serial for Hub and thumbnails without selecting another device', async () => {
-  jest.mocked(turtleFetch).mockResolvedValue({
-    ok: true,
-    json: async () => ({ status: 'ready', device: 'no-device-id' }),
-  } as Awaited<ReturnType<typeof turtleFetch>>);
-  const host = await startDeviceSessionHostAsync(ctx, {
-    runtimePlatform: BuildRuntimePlatform.LINUX,
-    env,
-    logger,
-    timeoutMs: 10_000,
-    previewDeviceId: 'emulator-5556',
-  });
-  try {
-    const args = jest.mocked(spawnDetached).mock.calls[0][0].args;
-    expect(
-      args.slice(args.indexOf('--single-device'), args.indexOf('--single-device') + 2)
-    ).toEqual(['--single-device', 'emulator-5556']);
-    await new Promise(resolve => setImmediate(resolve));
-    await jest
-      .mocked(startDeviceRunSessionPreview)
-      .mock.calls[0][0].captureAsync(new AbortController().signal);
-    expect(captureDeviceRunSessionPreviewAsync).toHaveBeenCalledWith(
-      expect.objectContaining({ device: 'emulator-5556' })
-    );
-  } finally {
-    await host.finishAsync();
-  }
-});
-
-it('pins an already-booted iOS preview without taking over boot or setup', async () => {
-  const udid = 'AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA';
-  jest.mocked(turtleFetch).mockResolvedValue({
-    ok: true,
-    json: async () => ({ status: 'ready', device: udid }),
-  } as Awaited<ReturnType<typeof turtleFetch>>);
-  const host = await startDeviceSessionHostAsync(ctx, {
-    runtimePlatform: BuildRuntimePlatform.DARWIN,
-    env,
-    logger,
-    timeoutMs: 10_000,
-    previewDeviceId: udid,
-  });
-  try {
-    const args = jest.mocked(spawnDetached).mock.calls[0][0].args;
-    expect(
-      args.slice(args.indexOf('--single-device'), args.indexOf('--single-device') + 2)
-    ).toEqual(['--single-device', udid]);
-    expect(IosSimulatorUtils.disableApsdAsync).not.toHaveBeenCalled();
-    expect(runServeSimActionAsync).not.toHaveBeenCalled();
-  } finally {
-    await host.finishAsync();
-  }
-});
-
-it('rejects readiness on a different Simulator from the selected preview target', async () => {
-  await expect(
-    startDeviceSessionHostAsync(ctx, {
-      runtimePlatform: BuildRuntimePlatform.DARWIN,
-      env,
-      logger,
-      timeoutMs: 10_000,
-      previewDeviceId: 'AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA',
-    })
-  ).rejects.toThrow('but this session requested AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA');
-  expect(stopServer).toHaveBeenCalled();
-});
-
 it('targets the selected Simulator in the serve-sim invocation', () => {
   expect(createServeSimArgs({ port: 4321, iosSimulatorUdid: 'session-udid' }).slice(0, 4)).toEqual([
     '@expo/serve-sim@latest',
@@ -1500,7 +1413,7 @@ it('does not read the iOS egress handoff for an Android host', async () => {
 });
 
 it.each([true, false])(
-  'runs setup in parallel with app launch and readiness, then joins it at teardown (app: %s)',
+  'waits for setup before launch or boot-only readiness (app: %s)',
   async hasApp => {
     const setup = deferred<void>();
     const prepared = deferred<ServeSimApplicationOptions | void>();
@@ -1555,78 +1468,70 @@ it.each([true, false])(
         ? { installAppPath: '/tmp/App.app', launchAppIdentifier: 'dev.example.other' }
         : undefined
     );
-    if (hasApp) {
-      while (!jest.mocked(runServeSimActionAsync).mock.calls.length) {
-        await new Promise(resolve => setTimeout(resolve, 10));
+    if (!hasApp) {
+      let queried = false;
+      ready.resolve({
+        ok: true,
+        json: async () => {
+          queried = true;
+          return { status: 'ready', device: 'emulator-5554' };
+        },
+      } as never);
+      let reported = false;
+      void starting.then(() => {
+        reported = true;
+      });
+      while (!queried) {
+        await new Promise(resolve => setImmediate(resolve));
       }
       await new Promise(resolve => setImmediate(resolve));
-      expect(runServeSimActionAsync).toHaveBeenCalledTimes(2);
-    } else {
+      expect(reported).toBe(false);
       expect(runServeSimActionAsync).not.toHaveBeenCalled();
+      setup.resolve();
+      const host = await starting;
+      expect(runServeSimActionAsync).not.toHaveBeenCalled();
+      await host.finishAsync();
+      return;
+    }
+    while (!jest.mocked(runServeSimActionAsync).mock.calls.length) {
+      await new Promise(resolve => setTimeout(resolve, 10));
+    }
+    await new Promise(resolve => setImmediate(resolve));
+    expect(runServeSimActionAsync).toHaveBeenCalledTimes(1);
+    setup.resolve();
+    while (jest.mocked(runServeSimActionAsync).mock.calls.length < 2) {
+      await new Promise(resolve => setTimeout(resolve, 10));
     }
     expect(
       jest
         .mocked(runServeSimActionAsync)
         .mock.calls.map(([options]) => [options.action, options.params])
-    ).toEqual(
-      hasApp
-        ? [
-            ['app.install', { udid: 'emulator-5554', path: `${directory}/App.app` }],
-            [
-              'app.launch',
-              {
-                udid: 'emulator-5554',
-                bundleId: 'dev.example.other',
-                launchArgs: [],
-                openUrl: undefined,
-              },
-            ],
-          ]
-        : []
+    ).toEqual([
+      ['app.install', { udid: 'emulator-5554', path: `${directory}/App.app` }],
+      [
+        'app.launch',
+        {
+          udid: 'emulator-5554',
+          bundleId: 'dev.example.other',
+          launchArgs: [],
+          openUrl: undefined,
+        },
+      ],
+    ]);
+    expect(runServeSimActionAsync).toHaveBeenCalledWith(
+      expect.objectContaining({ token: 'preview-token', timeoutMs: 120_000 })
+    );
+    expect(stageServeSimAppAsync).toHaveBeenCalledWith(
+      '/tmp/App.app',
+      env.TMPDIR ?? require('node:os').tmpdir()
     );
-    if (hasApp) {
-      expect(runServeSimActionAsync).toHaveBeenCalledWith(
-        expect.objectContaining({ token: 'preview-token', timeoutMs: 120_000 })
-      );
-      expect(stageServeSimAppAsync).toHaveBeenCalledWith(
-        '/tmp/App.app',
-        env.TMPDIR ?? require('node:os').tmpdir()
-      );
-    }
-    let queried = false;
     ready.resolve({
       ok: true,
-      json: async () => {
-        queried = true;
-        return { status: 'ready', device: 'emulator-5554' };
-      },
+      json: async () => ({ status: 'ready', device: 'emulator-5554' }),
     } as never);
-    let reported = false;
-    void starting.then(() => {
-      reported = true;
-    });
-    while (!queried) {
-      await new Promise(resolve => setImmediate(resolve));
-    }
-    await new Promise(resolve => setImmediate(resolve));
-    try {
-      expect(reported).toBe(true);
-      const host = await starting;
-      let finished = false;
-      const finishing = host.finishAsync().then(() => {
-        finished = true;
-      });
-      await new Promise(resolve => setImmediate(resolve));
-      expect(finished).toBe(false);
-      setup.resolve();
-      await finishing;
-    } finally {
-      setup.resolve();
-      await (await starting).finishAsync();
-    }
-    if (hasApp) {
-      await expect(access(directory)).rejects.toThrow();
-    }
+    const host = await starting;
+    await host.finishAsync();
+    await expect(access(directory)).rejects.toThrow();
   }
 );
 
@@ -1771,8 +1676,7 @@ it('warns and continues launching when disabling push fails', async () => {
   await host.finishAsync();
 });
 
-it('cancels pending app preparation and observes late setup failure', async () => {
-  const application = deferred<ServeSimApplicationOptions>();
+it('cancels pending setup without launching and observes its late failure', async () => {
   const controller = new AbortController();
   let rejectSetup!: (error: Error) => void;
   jest.mocked(IosSimulatorUtils.disableApsdAsync).mockReturnValue(
@@ -1786,7 +1690,7 @@ it('cancels pending app preparation and observes late setup failure', async () =
     logger,
     timeoutMs: 2_000,
     iosSimulatorUdid: 'emulator-5554',
-    application: application.promise,
+    launchAppIdentifier: 'dev.example.app',
     signal: controller.signal,
   });
   const rejected = expect(starting).rejects.toThrow('session canceled');

packages/build-tools/src/steps/utils/__tests__/ngrokTunnel.test.ts

@@ -1,873 +0,0 @@
-import { type bunyan } from '@expo/logger';
-import * as ngrok from '@ngrok/ngrok';
-import { once } from 'node:events';
-import { createServer } from 'node:http';
-import WebSocket, { WebSocketServer } from 'ws';
-import { type AddressInfo, createConnection, createServer as createTcpServer } from 'node:net';
-
-import { turtleFetch } from '../../../utils/turtleFetch';
-import { startNgrokTunnelAsync } from '../ngrokTunnel';
-
-jest.mock('@ngrok/ngrok');
-jest.mock('node:timers', () => ({
-  setTimeout: (...args: Parameters<typeof setTimeout>) => setTimeout(...args),
-  clearTimeout: (...args: Parameters<typeof clearTimeout>) => clearTimeout(...args),
-}));
-jest.mock('../../../utils/turtleFetch');
-
-const { Response } = jest.requireActual<typeof import('node-fetch')>('node-fetch');
-const url = 'https://web-preview-fixed.example.test';
-const logger = { info: jest.fn(), warn: jest.fn() } as unknown as bunyan;
-const options = {
-  port: 4321,
-  subdomainPrefix: 'web-preview',
-  subdomainId: 'fixed',
-  baseDomain: 'example.test',
-  authtoken: 'token',
-  rewriteHostHeader: true,
-  healthCheck: { path: '/healthz' },
-  logger,
-};
-
-function listener(publicUrl = url) {
-  return { url: () => publicUrl, close: jest.fn().mockResolvedValue(undefined) };
-}
-
-let initial: ReturnType<typeof listener>;
-let replacement: ReturnType<typeof listener>;
-
-beforeEach(() => {
-  jest.useFakeTimers({ doNotFake: ['nextTick', 'setImmediate'] });
-  jest.clearAllMocks();
-  initial = listener();
-  replacement = listener();
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockResolvedValue(replacement as never);
-  jest
-    .mocked(turtleFetch)
-    .mockReset()
-    .mockResolvedValue(new Response(undefined, { status: 200 }));
-});
-
-afterEach(() => {
-  jest.useRealTimers();
-});
-
-function failPublicProbes() {
-  jest.mocked(turtleFetch).mockImplementation(
-    async target =>
-      new Response(undefined, {
-        status: target.startsWith('https:') ? 503 : 200,
-      })
-  );
-}
-
-it('keeps tunnels without a health check unsupervised and closes them on stop', async () => {
-  const tunnel = await startNgrokTunnelAsync({ ...options, healthCheck: undefined });
-  await jest.advanceTimersByTimeAsync(90_000);
-  expect(turtleFetch).not.toHaveBeenCalled();
-  expect(ngrok.forward).toHaveBeenCalledTimes(1);
-  await tunnel.stopAsync();
-  expect(initial.close).toHaveBeenCalledTimes(1);
-});
-
-it('probes the public service and keeps a healthy listener open', async () => {
-  const tunnel = await startNgrokTunnelAsync(options);
-  try {
-    await jest.advanceTimersByTimeAsync(45_000);
-    expect(turtleFetch).toHaveBeenCalledTimes(3);
-    expect(turtleFetch).toHaveBeenCalledWith(
-      `${url}/healthz`,
-      'GET',
-      expect.objectContaining({
-        retries: 0,
-        redirect: 'manual',
-        headers: expect.objectContaining({ 'ngrok-skip-browser-warning': 'true' }),
-      })
-    );
-    expect(ngrok.forward).toHaveBeenCalledTimes(1);
-  } finally {
-    await tunnel.stopAsync();
-  }
-  expect(initial.close).toHaveBeenCalledTimes(1);
-  await jest.advanceTimersByTimeAsync(60_000);
-  expect(turtleFetch).toHaveBeenCalledTimes(3);
-});
-
-it('reopens after three failed public probes with a healthy local service, preserving the endpoint', async () => {
-  failPublicProbes();
-  const tunnel = await startNgrokTunnelAsync(options);
-  try {
-    await jest.advanceTimersByTimeAsync(30_000);
-    expect(initial.close).not.toHaveBeenCalled();
-    await jest.advanceTimersByTimeAsync(15_000);
-    expect(initial.close).toHaveBeenCalledTimes(1);
-    expect(ngrok.forward).toHaveBeenCalledTimes(2);
-    expect(jest.mocked(ngrok.forward).mock.calls[1][0]).toEqual({
-      addr: expect.any(Number),
-      authtoken: 'token',
-      domain: 'web-preview-fixed.example.test',
-      request_header_add: ['Host:localhost:4321'],
-      force_new_session: true,
-    });
-    expect(tunnel.url).toBe(url);
-    jest.mocked(turtleFetch).mockResolvedValue(new Response(undefined, { status: 200 }));
-    await jest.advanceTimersByTimeAsync(15_000);
-    expect(logger.info).toHaveBeenCalledWith(expect.stringContaining('healthy again'));
-  } finally {
-    await tunnel.stopAsync();
-  }
-  expect(replacement.close).toHaveBeenCalledTimes(1);
-});
-
-it('does not reopen when the local service is unhealthy', async () => {
-  jest.mocked(turtleFetch).mockResolvedValue(new Response(undefined, { status: 503 }));
-  const tunnel = await startNgrokTunnelAsync(options);
-  try {
-    await jest.advanceTimersByTimeAsync(90_000);
-    expect(ngrok.forward).toHaveBeenCalledTimes(1);
-    expect(initial.close).not.toHaveBeenCalled();
-  } finally {
-    await tunnel.stopAsync();
-  }
-});
-
-it('resets consecutive failures after a successful public probe', async () => {
-  failPublicProbes();
-  const tunnel = await startNgrokTunnelAsync(options);
-  try {
-    await jest.advanceTimersByTimeAsync(30_000);
-    jest.mocked(turtleFetch).mockResolvedValueOnce(new Response(undefined, { status: 200 }));
-    await jest.advanceTimersByTimeAsync(15_000);
-    await jest.advanceTimersByTimeAsync(30_000);
-    expect(ngrok.forward).toHaveBeenCalledTimes(1);
-  } finally {
-    await tunnel.stopAsync();
-  }
-});
-
-it('retries a failed reopen with backoff', async () => {
-  failPublicProbes();
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockRejectedValueOnce(new Error('offline'))
-    .mockResolvedValue(replacement as never);
-  const tunnel = await startNgrokTunnelAsync(options);
-  try {
-    await jest.advanceTimersByTimeAsync(45_000);
-    expect(ngrok.forward).toHaveBeenCalledTimes(2);
-    await jest.advanceTimersByTimeAsync(1_999);
-    expect(ngrok.forward).toHaveBeenCalledTimes(2);
-    await jest.advanceTimersByTimeAsync(1);
-    expect(ngrok.forward).toHaveBeenCalledTimes(3);
-  } finally {
-    await tunnel.stopAsync();
-  }
-});
-
-it('closes a listener that finishes opening after shutdown, with idempotent cleanup', async () => {
-  failPublicProbes();
-  let resolveOpening!: (value: ngrok.Listener) => void;
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockReturnValueOnce(
-      new Promise(resolve => {
-        resolveOpening = resolve;
-      })
-    );
-  const tunnel = await startNgrokTunnelAsync(options);
-  await jest.advanceTimersByTimeAsync(45_000);
-  const stopping = tunnel.stopAsync();
-  expect(tunnel.stopAsync()).toBe(stopping);
-  const stopped = jest.fn();
-  void stopping.then(stopped);
-  await jest.advanceTimersByTimeAsync(0);
-  expect(stopped).not.toHaveBeenCalled();
-  resolveOpening(replacement as never);
-  await stopping;
-  expect(replacement.close).toHaveBeenCalledTimes(1);
-  await jest.advanceTimersByTimeAsync(120_000);
-  expect(ngrok.forward).toHaveBeenCalledTimes(2);
-});
-
-it('waits for a replacement acquired during shutdown to finish closing', async () => {
-  failPublicProbes();
-  let resolveOpening!: (value: ngrok.Listener) => void;
-  let resolveClose!: () => void;
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockReturnValueOnce(new Promise(resolve => (resolveOpening = resolve)));
-  replacement.close.mockReturnValue(new Promise<void>(resolve => (resolveClose = resolve)));
-  const tunnel = await startNgrokTunnelAsync(options);
-  await jest.advanceTimersByTimeAsync(45_000);
-  let stopped = false;
-  const stopping = tunnel.stopAsync().then(() => {
-    stopped = true;
-  });
-  await jest.advanceTimersByTimeAsync(0);
-  resolveOpening(replacement as never);
-  await jest.advanceTimersByTimeAsync(0);
-  const stoppedBeforeClose = stopped;
-  resolveClose();
-  await jest.advanceTimersByTimeAsync(250);
-  await stopping;
-  expect(stoppedBeforeClose).toBe(false);
-  expect(replacement.close).toHaveBeenCalledTimes(1);
-});
-
-it.each([0, 4, 5, 10])('retires a reopen cancelled after %s promise turns', async turns => {
-  failPublicProbes();
-  let resolveOpening!: (value: ngrok.Listener) => void;
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockReturnValueOnce(new Promise(resolve => (resolveOpening = resolve)));
-  const tunnel = await startNgrokTunnelAsync(options);
-  await jest.advanceTimersByTimeAsync(45_000);
-  resolveOpening(replacement as never);
-  for (let turn = 0; turn < turns; turn++) {
-    await Promise.resolve();
-  }
-  await tunnel.stopAsync();
-  await jest.advanceTimersByTimeAsync(0);
-  expect(replacement.close).toHaveBeenCalledTimes(1);
-});
-
-it('retries a rejected close when a reopen finishes after shutdown', async () => {
-  failPublicProbes();
-  let resolveOpening!: (value: ngrok.Listener) => void;
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockReturnValueOnce(new Promise(resolve => (resolveOpening = resolve)));
-  const tunnel = await startNgrokTunnelAsync(options);
-  await jest.advanceTimersByTimeAsync(45_000);
-  const stopping = tunnel.stopAsync();
-  replacement.close.mockRejectedValueOnce(new Error('temporary unlisten failure'));
-  resolveOpening(replacement as never);
-  await jest.advanceTimersByTimeAsync(250);
-  await stopping;
-  expect(replacement.close).toHaveBeenCalledTimes(2);
-  const warnings = jest.mocked(logger.warn).mock.calls.length;
-  await jest.advanceTimersByTimeAsync(120_000);
-  expect(logger.warn).toHaveBeenCalledTimes(warnings);
-});
-
-it('fails stop if an in-flight reopen still has not settled by the stop deadline', async () => {
-  failPublicProbes();
-  let resolveOpening!: (value: ngrok.Listener) => void;
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockReturnValueOnce(new Promise(resolve => (resolveOpening = resolve)));
-  const tunnel = await startNgrokTunnelAsync(options);
-  await jest.advanceTimersByTimeAsync(45_000);
-  const rejected = expect(tunnel.stopAsync()).rejects.toThrow(
-    'Ngrok tunnel web-preview-fixed.example.test stop timed out after 4000ms'
-  );
-  await jest.advanceTimersByTimeAsync(4_000);
-  await rejected;
-  expect(ngrok.forward).toHaveBeenCalledTimes(2);
-  resolveOpening(replacement as never);
-  await jest.advanceTimersByTimeAsync(0);
-  expect(replacement.close).toHaveBeenCalledTimes(1);
-});
-
-it('retries an old listener while a reopen outlasts shutdown', async () => {
-  failPublicProbes();
-  initial.close.mockRejectedValueOnce(new Error('agent disconnected'));
-  let resolveOpening!: (value: ngrok.Listener) => void;
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockReturnValueOnce(new Promise(resolve => (resolveOpening = resolve)));
-  const tunnel = await startNgrokTunnelAsync(options);
-  await jest.advanceTimersByTimeAsync(45_000);
-  expect(initial.close).toHaveBeenCalledTimes(1);
-  const rejected = expect(tunnel.stopAsync()).rejects.toThrow(
-    'Ngrok tunnel web-preview-fixed.example.test stop timed out after 4000ms'
-  );
-  await jest.advanceTimersByTimeAsync(4_000);
-  await rejected;
-  const oldCloseCalls = initial.close.mock.calls.length;
-  resolveOpening(replacement as never);
-  await jest.advanceTimersByTimeAsync(0);
-  expect(oldCloseCalls).toBe(2);
-  expect(replacement.close).toHaveBeenCalledTimes(1);
-  expect(ngrok.forward).toHaveBeenCalledTimes(2);
-});
-
-it('fails stop if a pending reopen arrives but cannot be retired', async () => {
-  failPublicProbes();
-  let resolveOpening!: (value: ngrok.Listener) => void;
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockReturnValueOnce(new Promise(resolve => (resolveOpening = resolve)));
-  replacement.close.mockRejectedValue(new Error('unlisten failed'));
-  const tunnel = await startNgrokTunnelAsync(options);
-  await jest.advanceTimersByTimeAsync(45_000);
-  const rejected = expect(tunnel.stopAsync()).rejects.toThrow(
-    'Ngrok tunnel web-preview-fixed.example.test stop timed out'
-  );
-  resolveOpening(replacement as never);
-  await jest.advanceTimersByTimeAsync(4_000);
-  await rejected;
-  expect(replacement.close.mock.calls.length).toBeGreaterThan(1);
-  expect(logger.warn).toHaveBeenCalledWith(
-    expect.objectContaining({ err: expect.any(Error) }),
-    'Could not retire late ngrok tunnel web-preview-fixed.example.test.'
-  );
-  const warnings = jest.mocked(logger.warn).mock.calls.length;
-  await jest.advanceTimersByTimeAsync(120_000);
-  expect(logger.warn).toHaveBeenCalledTimes(warnings);
-  expect(ngrok.forward).toHaveBeenCalledTimes(2);
-});
-
-it('rejects a changed public URL and closes the replacement', async () => {
-  failPublicProbes();
-  const changed = listener('https://different.example.test');
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockResolvedValue(changed as never);
-  const tunnel = await startNgrokTunnelAsync(options);
-  try {
-    await jest.advanceTimersByTimeAsync(45_000);
-    expect(changed.close).toHaveBeenCalledTimes(1);
-    expect(tunnel.url).toBe(url);
-    expect(logger.warn).toHaveBeenCalledWith(
-      expect.objectContaining({ err: expect.any(Error) }),
-      expect.stringContaining('Could not reopen')
-    );
-  } finally {
-    await tunnel.stopAsync();
-  }
-});
-
-it('treats ngrok error responses as failures even if their status is accepted', async () => {
-  jest.mocked(turtleFetch).mockImplementation(
-    async target =>
-      new Response(undefined, {
-        status: 200,
-        headers: target.startsWith('https:') ? { 'ngrok-error-code': 'ERR_NGROK_3200' } : {},
-      })
-  );
-  const tunnel = await startNgrokTunnelAsync(options);
-  try {
-    await jest.advanceTimersByTimeAsync(45_000);
-    expect(ngrok.forward).toHaveBeenCalledTimes(2);
-  } finally {
-    await tunnel.stopAsync();
-  }
-});
-
-it('reopens on a fresh agent session even if closing the old listener fails', async () => {
-  failPublicProbes();
-  initial.close.mockRejectedValueOnce(new Error('agent disconnected'));
-  const tunnel = await startNgrokTunnelAsync(options);
-  try {
-    await jest.advanceTimersByTimeAsync(45_000);
-    expect(ngrok.forward).toHaveBeenCalledTimes(2);
-    expect(ngrok.forward).toHaveBeenLastCalledWith(
-      expect.objectContaining({ force_new_session: true })
-    );
-    expect(ngrok.disconnect).not.toHaveBeenCalled();
-  } finally {
-    await tunnel.stopAsync();
-  }
-  expect(initial.close).toHaveBeenCalledTimes(2);
-  expect(replacement.close).toHaveBeenCalledTimes(1);
-});
-
-it('retries a rejected close before reopening an endpoint that remains bound', async () => {
-  failPublicProbes();
-  let domainOccupied = true;
-  initial.close
-    .mockRejectedValueOnce(new Error('agent disconnected'))
-    .mockImplementation(async () => {
-      domainOccupied = false;
-    });
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockImplementation(async () => {
-      if (domainOccupied) {
-        throw new Error('endpoint is still bound');
-      }
-      return replacement as never;
-    });
-  const tunnel = await startNgrokTunnelAsync(options);
-  try {
-    await jest.advanceTimersByTimeAsync(45_000);
-    expect(initial.close).toHaveBeenCalledTimes(1);
-    expect(ngrok.forward).toHaveBeenCalledTimes(2);
-    await jest.advanceTimersByTimeAsync(2_000);
-    expect(initial.close).toHaveBeenCalledTimes(2);
-    expect(ngrok.forward).toHaveBeenCalledTimes(3);
-    expect(tunnel.url).toBe(url);
-  } finally {
-    await tunnel.stopAsync();
-  }
-  expect(replacement.close).toHaveBeenCalledTimes(1);
-});
-
-it('retires an old listener even after its replacement is healthy', async () => {
-  failPublicProbes();
-  initial.close.mockRejectedValueOnce(new Error('agent disconnected'));
-  const tunnel = await startNgrokTunnelAsync(options);
-  try {
-    await jest.advanceTimersByTimeAsync(45_000);
-    expect(initial.close).toHaveBeenCalledTimes(1);
-    jest.mocked(turtleFetch).mockResolvedValue(new Response(undefined, { status: 200 }));
-    await jest.advanceTimersByTimeAsync(15_000);
-    expect(initial.close).toHaveBeenCalledTimes(2);
-    expect(ngrok.forward).toHaveBeenCalledTimes(2);
-  } finally {
-    await tunnel.stopAsync();
-  }
-});
-
-it('retries an old listener without repeating its close warning on every probe', async () => {
-  failPublicProbes();
-  initial.close.mockRejectedValue(new Error('old session disconnected'));
-  const tunnel = await startNgrokTunnelAsync(options);
-  await jest.advanceTimersByTimeAsync(45_000);
-  const warnings = jest.mocked(logger.warn).mock.calls.length;
-  expect(warnings).toBeGreaterThan(0);
-  jest.mocked(turtleFetch).mockResolvedValue(new Response(undefined, { status: 200 }));
-  await jest.advanceTimersByTimeAsync(120_000);
-  expect(initial.close.mock.calls.length).toBeGreaterThan(1);
-  expect(ngrok.forward).toHaveBeenCalledTimes(2);
-  expect(logger.warn).toHaveBeenCalledTimes(warnings);
-  const rejected = expect(tunnel.stopAsync()).rejects.toThrow(
-    'Ngrok tunnel web-preview-fixed.example.test stop timed out'
-  );
-  await jest.advanceTimersByTimeAsync(4_000);
-  await rejected;
-  expect(replacement.close).toHaveBeenCalledTimes(1);
-});
-
-it('retries a rejected close during shutdown', async () => {
-  const failure = new Error('agent disconnected');
-  initial.close.mockRejectedValueOnce(failure);
-  const tunnel = await startNgrokTunnelAsync(options);
-  const stopping = tunnel.stopAsync();
-  await jest.advanceTimersByTimeAsync(250);
-  await stopping;
-  expect(initial.close).toHaveBeenCalledTimes(2);
-  expect(logger.warn).toHaveBeenCalledTimes(1);
-  expect(logger.warn).toHaveBeenCalledWith(
-    { err: failure },
-    'Could not stop ngrok tunnel web-preview-fixed.example.test.'
-  );
-});
-
-it('logs the first close rejection once while bounded shutdown retries it', async () => {
-  const failure = new Error('agent disconnected');
-  initial.close.mockRejectedValue(failure);
-  const tunnel = await startNgrokTunnelAsync(options);
-  const rejected = expect(tunnel.stopAsync()).rejects.toThrow('stop timed out');
-  await jest.advanceTimersByTimeAsync(4_000);
-  await rejected;
-  expect(initial.close.mock.calls.length).toBeGreaterThan(1);
-  expect(logger.warn).toHaveBeenCalledTimes(1);
-  expect(logger.warn).toHaveBeenCalledWith(
-    { err: failure },
-    'Could not stop ngrok tunnel web-preview-fixed.example.test.'
-  );
-});
-
-it('bounds shutdown during recovery without duplicating a pending native close', async () => {
-  failPublicProbes();
-  let finishClose!: () => void;
-  initial.close.mockReturnValueOnce(new Promise<void>(resolve => (finishClose = resolve)));
-  const tunnel = await startNgrokTunnelAsync(options);
-  await jest.advanceTimersByTimeAsync(45_000);
-  const stopping = tunnel.stopAsync();
-  expect(tunnel.stopAsync()).toBe(stopping);
-  const rejected = expect(stopping).rejects.toThrow(
-    'Ngrok tunnel web-preview-fixed.example.test stop timed out after 4000ms'
-  );
-  await jest.advanceTimersByTimeAsync(4_000);
-  await rejected;
-  expect(initial.close).toHaveBeenCalledTimes(1);
-  expect(ngrok.forward).toHaveBeenCalledTimes(1);
-  const warnings = jest.mocked(logger.warn).mock.calls.length;
-  finishClose();
-  await jest.advanceTimersByTimeAsync(120_000);
-  expect(logger.warn).toHaveBeenCalledTimes(warnings);
-  expect(initial.close).toHaveBeenCalledTimes(1);
-});
-
-it('bounds a stalled listener close before reopening', async () => {
-  failPublicProbes();
-  initial.close.mockImplementationOnce(async () => await new Promise(() => {}));
-  const tunnel = await startNgrokTunnelAsync(options);
-  try {
-    await jest.advanceTimersByTimeAsync(49_999);
-    expect(ngrok.forward).toHaveBeenCalledTimes(1);
-    await jest.advanceTimersByTimeAsync(1);
-    expect(ngrok.forward).toHaveBeenCalledTimes(2);
-  } finally {
-    const stopping = tunnel.stopAsync();
-    const rejected = expect(stopping).rejects.toThrow(
-      'Ngrok tunnel web-preview-fixed.example.test stop timed out'
-    );
-    await jest.advanceTimersByTimeAsync(4_000);
-    await rejected;
-  }
-});
-
-it('does not queue more native opens while a timed-out open is still pending', async () => {
-  failPublicProbes();
-  let resolveOpening!: (value: ngrok.Listener) => void;
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockReturnValueOnce(
-      new Promise(resolve => {
-        resolveOpening = resolve;
-      })
-    )
-    .mockResolvedValue(replacement as never);
-  const tunnel = await startNgrokTunnelAsync(options);
-  const late = listener();
-  try {
-    await jest.advanceTimersByTimeAsync(180_000);
-    expect(ngrok.forward).toHaveBeenCalledTimes(2);
-    resolveOpening(late as never);
-    await jest.advanceTimersByTimeAsync(30_000);
-    expect(late.close).toHaveBeenCalledTimes(1);
-    expect(ngrok.forward).toHaveBeenCalledTimes(3);
-  } finally {
-    await tunnel.stopAsync();
-  }
-  expect(replacement.close).toHaveBeenCalledTimes(1);
-});
-
-it('bounds initial tunnel creation and retires a late listener', async () => {
-  let resolveOpening!: (value: ngrok.Listener) => void;
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockReturnValueOnce(
-      new Promise(resolve => {
-        resolveOpening = resolve;
-      })
-    );
-  const opening = startNgrokTunnelAsync(options);
-  const rejected = expect(opening).rejects.toThrow('Ngrok tunnel open timed out');
-  await jest.advanceTimersByTimeAsync(15_000);
-  await rejected;
-  resolveOpening(initial as never);
-  await jest.advanceTimersByTimeAsync(0);
-  expect(initial.close).toHaveBeenCalledTimes(1);
-});
-
-it('retries a rejected close after initial tunnel creation timed out', async () => {
-  let resolveOpening!: (value: ngrok.Listener) => void;
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockReturnValueOnce(new Promise(resolve => (resolveOpening = resolve)));
-  const opening = startNgrokTunnelAsync(options);
-  const rejected = expect(opening).rejects.toThrow('Ngrok tunnel open timed out');
-  await jest.advanceTimersByTimeAsync(15_000);
-  await rejected;
-  initial.close.mockRejectedValueOnce(new Error('temporary unlisten failure'));
-  resolveOpening(initial as never);
-  await jest.advanceTimersByTimeAsync(250);
-  expect(initial.close).toHaveBeenCalledTimes(2);
-});
-
-it('retires only the late listener without blaming it for an older stuck listener', async () => {
-  failPublicProbes();
-  initial.close.mockRejectedValue(new Error('old session disconnected'));
-  let resolveOpening!: (value: ngrok.Listener) => void;
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(initial as never)
-    .mockReturnValueOnce(new Promise(resolve => (resolveOpening = resolve)))
-    .mockResolvedValue(replacement as never);
-  const tunnel = await startNgrokTunnelAsync(options);
-  try {
-    await jest.advanceTimersByTimeAsync(60_000);
-    const late = listener();
-    resolveOpening(late as never);
-    jest.mocked(turtleFetch).mockResolvedValue(new Response(undefined, { status: 200 }));
-    await jest.advanceTimersByTimeAsync(4_000);
-    expect(late.close).toHaveBeenCalledTimes(1);
-    expect(
-      jest
-        .mocked(logger.warn)
-        .mock.calls.some(([, message]) => message?.includes('Could not retire late'))
-    ).toBe(false);
-  } finally {
-    initial.close.mockResolvedValue(undefined);
-    await tunnel.stopAsync();
-  }
-});
-
-it('recovers using actual HTTP health probes with a local ngrok adapter', async () => {
-  const actualFetch = jest.requireActual<typeof import('node-fetch')>('node-fetch').default;
-  const realSetTimeout = jest.requireActual<typeof import('node:timers')>('node:timers').setTimeout;
-  let broken = true;
-  const local = createServer((_req, res) => {
-    res.writeHead(200);
-    res.end('healthy');
-  });
-  const publicServer = createServer((_req, res) => {
-    res.writeHead(broken ? 503 : 200);
-    res.end('probe');
-  });
-  await Promise.all(
-    [local, publicServer].map(
-      server => new Promise<void>(resolve => server.listen(0, '127.0.0.1', resolve))
-    )
-  );
-  const publicUrl = `http://127.0.0.1:${(publicServer.address() as AddressInfo).port}`;
-  let completedRequests = 0;
-  jest.mocked(turtleFetch).mockImplementation(async (target, method, requestOptions) => {
-    const response = await actualFetch(target, { ...requestOptions, method });
-    completedRequests++;
-    return response;
-  });
-  const first = listener(publicUrl);
-  const next = listener(publicUrl);
-  jest
-    .mocked(ngrok.forward)
-    .mockReset()
-    .mockResolvedValueOnce(first as never)
-    .mockImplementation(async () => {
-      broken = false;
-      return next as never;
-    });
-  const tunnel = await startNgrokTunnelAsync({
-    ...options,
-    port: (local.address() as AddressInfo).port,
-  });
-  try {
-    for (let count = 0; count < 3; count++) {
-      await jest.advanceTimersByTimeAsync(15_000);
-      for (let turns = 0; turns < 50 && completedRequests < (count + 1) * 2; turns++) {
-        await new Promise(resolve => realSetTimeout(resolve, 10));
-      }
-      expect(completedRequests).toBe((count + 1) * 2);
-    }
-    expect(ngrok.forward).toHaveBeenCalledTimes(2);
-    expect(first.close).toHaveBeenCalledTimes(1);
-    expect((await actualFetch(`${tunnel.url}/healthz`)).status).toBe(200);
-  } finally {
-    await tunnel.stopAsync();
-    await Promise.all(
-      [local, publicServer].map(
-        server =>
-          new Promise<void>((resolve, reject) =>
-            server.close(err => (err ? reject(err) : resolve()))
-          )
-      )
-    );
-  }
-  expect(next.close).toHaveBeenCalledTimes(1);
-});
-
-it('blocks HTTP and existing WebSockets on Stop even when ngrok cannot close', async () => {
-  jest.useRealTimers();
-  const actualFetch = jest.requireActual<typeof import('node-fetch')>('node-fetch').default;
-  let requests = 0;
-  let messages = 0;
-  const backend = createServer((_request, response) => {
-    requests++;
-    response.end('owned backend');
-  });
-  const websockets = new WebSocketServer({ server: backend });
-  websockets.on('connection', socket => {
-    socket.on('message', data => {
-      messages++;
-      socket.send(data);
-    });
-  });
-  backend.listen(0, '127.0.0.1');
-  await once(backend, 'listening');
-  const backendPort = (backend.address() as AddressInfo).port;
-  const tunnel = await startNgrokTunnelAsync({
-    ...options,
-    port: backendPort,
-    healthCheck: undefined,
-  });
-  const targetPort = (jest.mocked(ngrok.forward).mock.calls[0][0] as ngrok.Config).addr;
-  const targetUrl = `http://127.0.0.1:${targetPort}`;
-  const socket = new WebSocket(`ws://127.0.0.1:${targetPort}`);
-  const opened = once(socket, 'open');
-  try {
-    expect(await (await actualFetch(targetUrl)).text()).toBe('owned backend');
-    await opened;
-    const echoed = once(socket, 'message');
-    socket.send('before-stop');
-    expect((await echoed)[0].toString()).toBe('before-stop');
-    const closed = once(socket, 'close');
-    initial.close.mockRejectedValue(new Error('agent disconnected'));
-    const stopping = tunnel.stopAsync();
-    const rejected = expect(stopping).rejects.toThrow('stop timed out after 4000ms');
-    await expect(actualFetch(targetUrl, { timeout: 1_000 })).rejects.toThrow();
-    await closed;
-    expect(requests).toBe(1);
-    expect(messages).toBe(1);
-    expect(await (await actualFetch(`http://127.0.0.1:${backendPort}`)).text()).toBe(
-      'owned backend'
-    );
-    await rejected;
-    await expect(actualFetch(targetUrl, { timeout: 1_000 })).rejects.toThrow();
-    expect(requests).toBe(2);
-    expect(messages).toBe(1);
-    const competing = createTcpServer();
-    const conflict = once(competing, 'error');
-    competing.listen(targetPort as number, '127.0.0.1');
-    expect((await conflict)[0]).toMatchObject({ code: 'EADDRINUSE' });
-  } finally {
-    socket.terminate();
-    for (const client of websockets.clients) {
-      client.terminate();
-    }
-    websockets.close();
-    backend.closeAllConnections();
-    await new Promise<void>(resolve => backend.close(() => resolve()));
-    await tunnel.stopAsync().catch(() => {});
-  }
-});
-
-it('releases its local target when initial tunnel creation fails', async () => {
-  jest.useRealTimers();
-  jest.mocked(ngrok.forward).mockReset().mockRejectedValue(new Error('forward failed'));
-  await expect(startNgrokTunnelAsync(options)).rejects.toThrow('forward failed');
-  const targetPort = (jest.mocked(ngrok.forward).mock.calls[0][0] as ngrok.Config).addr;
-  const server = createServer();
-  server.listen(targetPort as number, '127.0.0.1');
-  await once(server, 'listening');
-  await new Promise<void>(resolve => server.close(() => resolve()));
-});
-
-it('preserves a full response for a half-closed slow reader', async () => {
-  jest.useRealTimers();
-  const payload = Buffer.alloc(4 * 1024 * 1024, 37);
-  const backend = createTcpServer({ allowHalfOpen: true }, socket => {
-    socket.resume();
-    socket.on('end', () => socket.end(payload));
-  });
-  backend.listen(0, '127.0.0.1');
-  await once(backend, 'listening');
-  const tunnel = await startNgrokTunnelAsync({
-    ...options,
-    port: (backend.address() as AddressInfo).port,
-    healthCheck: undefined,
-  });
-  const targetPort = (jest.mocked(ngrok.forward).mock.calls[0][0] as ngrok.Config).addr as number;
-  const socket = createConnection({ host: '127.0.0.1', port: targetPort, allowHalfOpen: true });
-  try {
-    const chunks: Buffer[] = [];
-    socket.on('data', chunk => chunks.push(chunk));
-    const ended = once(socket, 'end');
-    socket.pause();
-    socket.end('request');
-    await new Promise(resolve => setTimeout(resolve, 100));
-    socket.resume();
-    await ended;
-    expect(Buffer.concat(chunks).equals(payload)).toBe(true);
-  } finally {
-    socket.destroy();
-    await tunnel.stopAsync();
-    await new Promise<void>(resolve => backend.close(() => resolve()));
-  }
-});
-
-it.each(['resolve', 'reject'])(
-  'releases the target after timed-out startup later %s',
-  async outcome => {
-    let resolveOpening!: (value: ngrok.Listener) => void;
-    let rejectOpening!: (error: Error) => void;
-    jest
-      .mocked(ngrok.forward)
-      .mockReset()
-      .mockReturnValue(
-        new Promise((resolve, reject) => {
-          resolveOpening = resolve;
-          rejectOpening = reject;
-        })
-      );
-    const opening = startNgrokTunnelAsync(options);
-    const rejected = expect(opening).rejects.toThrow('open timed out');
-    await new Promise<void>(resolve => setImmediate(resolve));
-    await jest.advanceTimersByTimeAsync(15_000);
-    await rejected;
-    const targetPort = (jest.mocked(ngrok.forward).mock.calls[0][0] as ngrok.Config).addr as number;
-    if (outcome === 'resolve') {
-      resolveOpening(replacement as never);
-    } else {
-      rejectOpening(new Error('forward failed'));
-    }
-    await jest.advanceTimersByTimeAsync(0);
-    const server = createTcpServer();
-    server.listen(targetPort, '127.0.0.1');
-    await once(server, 'listening');
-    await new Promise<void>(resolve => server.close(() => resolve()));
-  }
-);
-
-it('drains a full upload when the backend ends its response early', async () => {
-  jest.useRealTimers();
-  const payload = Buffer.alloc(4 * 1024 * 1024, 51);
-  let received!: Buffer;
-  let receivedRequest!: () => void;
-  const completed = new Promise<void>(resolve => {
-    receivedRequest = resolve;
-  });
-  const backend = createTcpServer({ allowHalfOpen: true }, socket => {
-    const chunks: Buffer[] = [];
-    socket.on('data', chunk => chunks.push(chunk));
-    socket.on('end', () => {
-      received = Buffer.concat(chunks);
-      receivedRequest();
-    });
-    socket.pause();
-    socket.end('early response');
-    setTimeout(() => socket.resume(), 100);
-  });
-  backend.listen(0, '127.0.0.1');
-  await once(backend, 'listening');
-  const tunnel = await startNgrokTunnelAsync({
-    ...options,
-    port: (backend.address() as AddressInfo).port,
-    healthCheck: undefined,
-  });
-  const targetPort = (jest.mocked(ngrok.forward).mock.calls[0][0] as ngrok.Config).addr as number;
-  const socket = createConnection({ host: '127.0.0.1', port: targetPort, allowHalfOpen: true });
-  try {
-    socket.resume();
-    socket.end(payload);
-    await completed;
-    expect(received.equals(payload)).toBe(true);
-  } finally {
-    socket.destroy();
-    await tunnel.stopAsync();
-    await new Promise<void>(resolve => backend.close(() => resolve()));
-  }
-});

packages/build-tools/src/steps/utils/__tests__/remoteDeviceRunSession.test.ts

@@ -530,22 +530,6 @@ describe(describeServeSimLaunch, () => {
   });
 });
 
-it('only pins hosts when a valid device ID is supplied', () => {
-  const udid = 'AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA';
-  expect(createServeSimArgs({ port: 4321, iosSimulatorUdid: udid })).toEqual(
-    expect.arrayContaining(['--single-device', udid])
-  );
-  for (const iosSimulatorUdid of [undefined, '', 'booted', 'iPhone 17']) {
-    expect(createServeSimArgs({ port: 4321, iosSimulatorUdid })).not.toContain('--single-device');
-  }
-  expect(createExpoDeviceHubArgs({ port: 4321, device: 'emulator-5554' })).toEqual(
-    expect.arrayContaining(['--single-device', 'emulator-5554'])
-  );
-  for (const device of [undefined, '', 'all', 'booted', 'invalid serial']) {
-    expect(createExpoDeviceHubArgs({ port: 4321, device })).not.toContain('--single-device');
-  }
-});
-
 describe(createServeSimArgs, () => {
   it('uses the latest Expo package and applies the EAS streaming policy', () => {
     expect(
@@ -932,7 +916,7 @@ describe(waitForWebPreviewReadyAsync, () => {
 
 describe(startNgrokTunnelAsync, () => {
   it.each(['rejected', 'stalled'] as const)(
-    'bounds %s listener retirement and reuses the stop promise',
+    'retains a %s close failure on repeated stops',
     async mode => {
       jest.useFakeTimers();
       try {
@@ -954,12 +938,14 @@ describe(startNgrokTunnelAsync, () => {
           logger: createLoggerMock(),
         });
         const stopping = tunnel.stopAsync();
-        const assertion = expect(stopping).rejects.toThrow(/stop timed out after 4000ms/);
+        const assertion = expect(stopping).rejects.toThrow(
+          mode === 'rejected' ? 'close failed' : 'Ngrok tunnel stop timed out after 4000ms.'
+        );
         expect(tunnel.stopAsync()).toBe(stopping);
         await jest.advanceTimersByTimeAsync(4_000);
         await assertion;
         await expect(tunnel.stopAsync()).rejects.toThrow();
-        expect(close).toHaveBeenCalled();
+        expect(close).toHaveBeenCalledTimes(1);
       } finally {
         jest.useRealTimers();
       }
@@ -983,7 +969,7 @@ describe(startNgrokTunnelAsync, () => {
 
     expect(ngrok.forward).toHaveBeenCalledWith(
       expect.objectContaining({
-        addr: expect.any(Number),
+        addr: 4321,
         authtoken: 'token',
         domain: expect.stringMatching(/^web-preview-[a-f0-9]{32}\.eas-simulator\.ngrok\.dev$/),
       })
@@ -1300,10 +1286,7 @@ describe(startDeviceSessionHostAsync, () => {
         recordingDirectory,
       }),
     ]);
-    expect(ngrok.forward).toHaveBeenCalledWith(
-      expect.objectContaining({ addr: expect.any(Number) })
-    );
-    expect(ngrok.forward).not.toHaveBeenCalledWith(expect.objectContaining({ addr: port }));
+    expect(ngrok.forward).toHaveBeenCalledWith(expect.objectContaining({ addr: port }));
     expect(preview.apiUrl).toBe('https://android-preview.example.test');
 
     await host.finishAsync();
@@ -1439,10 +1422,7 @@ describe(startDeviceSessionHostAsync, () => {
         packageVersion,
       }),
     ]);
-    expect(ngrok.forward).toHaveBeenCalledWith(
-      expect.objectContaining({ addr: expect.any(Number) })
-    );
-    expect(ngrok.forward).not.toHaveBeenCalledWith(expect.objectContaining({ addr: port }));
+    expect(ngrok.forward).toHaveBeenCalledWith(expect.objectContaining({ addr: port }));
     expect(preview.apiUrl).toBe('https://ios-preview.example.test');
 
     await host.finishAsync();

packages/build-tools/src/steps/utils/agentRun.ts

@@ -1,5 +1,6 @@
 import { SystemError, UserError } from '@expo/eas-build-job';
 import { type bunyan } from '@expo/logger';
+import turtleSpawn from '@expo/turtle-spawn';
 import { spawn } from 'node:child_process';
 import { once } from 'node:events';
 import fs from 'node:fs/promises';
@@ -12,7 +13,6 @@ import { type AgentCli, type AgentInvocation, type AgentLogMessage } from './age
 import { CLAUDE_CODE_CLI, prepareClaudeCodeAsync } from './agents/claude';
 import { CODEX_CLI, prepareCodexAsync } from './agents/codex';
 import { Sentry } from '../../sentry';
-import { installIsolatedNpmPackageAsync } from '../../utils/installIsolatedNpmPackageAsync';
 import { killProcessGroup } from '../../utils/processes';
 
 export type AgentKind = 'claude-code' | 'codex';
@@ -76,13 +76,17 @@ export async function runAgentAsync({
     const { packageSpec, bin, formatOutputLine } = AGENT_CLIS[agentKind];
     logger.info(`Installing ${packageSpec}.`);
     try {
-      await installIsolatedNpmPackageAsync({
-        packageSpec,
-        directory: cliDirectory,
-        npmCacheUrl,
-        pathEnv,
-        signal,
-      });
+      await turtleSpawn(
+        'npm',
+        [
+          'install',
+          ...['--prefix', cliDirectory],
+          ...['--no-save', '--package-lock=false', '--no-audit', '--no-fund'],
+          ...(npmCacheUrl ? ['--registry', npmCacheUrl] : []),
+          packageSpec,
+        ],
+        { env: minimalEnv, signal }
+      );
     } catch (error) {
       signal.throwIfAborted();
       throw new SystemError(

packages/build-tools/src/steps/utils/android/GooglePlayUtils.ts

@@ -144,7 +144,6 @@ export namespace GooglePlayUtils {
       signal?: AbortSignal;
     }
   ): Promise<void> {
-    const attempts: unknown[] = [];
     const sendCommitAsync = async ({
       changesNotSentForReview,
     }: {
@@ -162,7 +161,6 @@ export namespace GooglePlayUtils {
           throw new SystemError('Google did not confirm the committed edit.');
         }
       } catch (error) {
-        attempts.push(...(error instanceof AggregateError ? error.errors : [error]));
         if (error instanceof GooglePlayAuthRequestError) {
           throw error;
         }
@@ -170,14 +168,8 @@ export namespace GooglePlayUtils {
           !(error instanceof GooglePlayApiError) ||
           GooglePlayApiError.isRetryableStatus(error.status)
         ) {
-          const attemptMessages = attempts
-            .map(
-              (attempt, index) =>
-                `${index + 1}. ${attempt instanceof Error ? attempt.message : String(attempt)}`
-            )
-            .join('\n');
           throw new GooglePlayCommitOutcomeUnknownError(
-            `Could not confirm whether Google Play saved the release for ${packageName}. Check its release status at https://play.google.com/console/ before submitting again.\n\nCommit attempts:\n${attemptMessages}`,
+            `Could not confirm whether Google Play saved the release for ${packageName}. Check its release status at https://play.google.com/console/ before submitting again.`,
             { cause: error, metadata: GooglePlayApiError.getErrorMetadata(error) }
           );
         }

packages/build-tools/src/steps/utils/android/__tests__/GooglePlaySubmission.test.ts

@@ -84,41 +84,6 @@ it.each([408, 429, 503])('retries a transient HTTP %s commit on the same edit',
   api().post(`${editPath}:commit`).query({}).reply(200, { id: 'edit' });
   await expect(commit()).resolves.toBeUndefined();
 });
-it('shows failed commit attempts in order across processing, HTTP, and network retries', async () => {
-  mockToken();
-  api()
-    .post(`${editPath}:commit`)
-    .query({})
-    .reply(400, { error: { message: pendingUploadMessage } });
-  api().post(`${editPath}:commit`).query({}).reply(503);
-  api()
-    .post(`${editPath}:commit`)
-    .query({})
-    .replyWithError(Object.assign(new Error('Lost commit response'), { code: 'ECONNRESET' }));
-  const message = 'You must let us know whether your app includes any health features.';
-  api().post(`${editPath}:commit`).query({}).reply(403, { error: { message } });
-  const error = await commit().catch(error => error);
-  const mapped = GooglePlayUtils.mapGooglePlayError(error, packageName);
-  expect(mapped).toBeInstanceOf(GooglePlayCommitOutcomeUnknownError);
-  expect((mapped as Error).message).toContain(`Google Play request failed (HTTP 403): ${message}`);
-  expect((mapped as Error).message).toContain('Could not confirm whether Google Play saved');
-  expect((mapped as Error).message).toContain('https://play.google.com/console/');
-  expect(mapped).toMatchObject({
-    metadata: { googlePlayErrorResponse: JSON.stringify({ error: { message } }) },
-    cause: expect.any(AggregateError),
-  });
-  const attempts = (mapped as Error).message.split('Commit attempts:\n')[1]?.split('\n');
-  expect(attempts).toEqual([
-    `1. Google Play request failed (HTTP 400): ${pendingUploadMessage}`,
-    '2. Google Play request failed (HTTP 503).',
-    '3. Google Play request failed before a response was received.',
-    `4. Google Play request failed (HTTP 403): ${message}`,
-  ]);
-  expect(((mapped as Error).cause as AggregateError).errors).toHaveLength(3);
-  expect(((mapped as Error).cause as AggregateError).errors[1]).toMatchObject({
-    cause: { code: 'ECONNRESET' },
-  });
-});
 it('preserves cancellation before commit is sent', async () => {
   const controller = new AbortController();
   const reason = new Error('cancelled before commit');
@@ -285,9 +250,7 @@ it('keeps the last Google Play error response when the commit outcome is unknown
     .query({})
     .times(6)
     .reply(503, { error: { message: 'Backend error' } });
-  const error = await commit().catch(error => error);
-  expect(error.message).toContain('Google Play request failed (HTTP 503): Backend error');
-  expect(error).toMatchObject({
+  await expect(commit()).rejects.toMatchObject({
     metadata: {
       googlePlayRequestPath: `${editPath}:commit`,
       googlePlayErrorResponse: JSON.stringify({ error: { message: 'Backend error' } }),

packages/build-tools/src/steps/utils/deviceRunSessionWorkerApi.ts

@@ -91,8 +91,7 @@ export class DeviceRunSessionWorkerApiError extends Error {
     message: string,
     /** The HTTP status of the response, or undefined when no response arrived. */
     readonly status: number | undefined,
-    options?: ErrorOptions,
-    readonly code?: string
+    options?: ErrorOptions
   ) {
     super(message, options);
     this.name = 'DeviceRunSessionWorkerApiError';
@@ -268,9 +267,7 @@ export class DeviceRunSessionWorkerApi {
         : response.statusText;
       throw new DeviceRunSessionWorkerApiError(
         `${routeDescription} failed with status ${response.status}: ${apiErrorMessage}`,
-        response.status,
-        undefined,
-        apiError?.success ? apiError.data.errors[0]?.code : undefined
+        response.status
       );
     }
     if (!bodyResult.ok) {

packages/build-tools/src/steps/utils/deviceSessionHost.ts

@@ -55,8 +55,6 @@ import { IosSimulatorUtils, type IosSimulatorUuid } from '../../utils/IosSimulat
 import { createStartupTasks } from './startupTasks';
 
 const WEB_PREVIEW_HOST = '127.0.0.1';
-const IOS_SIMULATOR_UDID = /^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$/i;
-const ANDROID_DEVICE_SERIAL = /^(?!all$|booted$)[A-Za-z0-9][A-Za-z0-9._:-]*$/;
 const SERVE_SIM_PACKAGE_NAME = '@expo/serve-sim';
 const SERVE_SIM_MAX_DIMENSION = '1600';
 const SERVE_SIM_MJPEG_QUALITY = '0.55';
@@ -159,9 +157,6 @@ export function createServeSimArgs({
   return [
     createServeSimPackageSpec(packageVersion),
     ...(iosSimulatorUdid ? [iosSimulatorUdid] : []),
-    ...(iosSimulatorUdid && IOS_SIMULATOR_UDID.test(iosSimulatorUdid)
-      ? ['--single-device', iosSimulatorUdid]
-      : []),
     '--port',
     String(port),
     '--host',
@@ -203,7 +198,6 @@ export function createServeSimArgs({
 
 export function createExpoDeviceHubArgs({
   port,
-  device,
   turnArgs = [],
   websiteArgs = [],
   frameAncestorArgs: frameArgs = [],
@@ -212,7 +206,6 @@ export function createExpoDeviceHubArgs({
   recordingDirectory,
 }: {
   port: number;
-  device?: string;
   turnArgs?: string[];
   websiteArgs?: string[];
   frameAncestorArgs?: string[];
@@ -222,7 +215,6 @@ export function createExpoDeviceHubArgs({
 }): string[] {
   return [
     createExpoDeviceHubPackageSpec(packageVersion),
-    ...(device && ANDROID_DEVICE_SERIAL.test(device) ? ['--single-device', device] : []),
     '--port',
     String(port),
     '--host',
@@ -395,8 +387,6 @@ type DeviceSessionHostOptions = {
   /** Origins whose pages may call the preview host's API, in addition to the website origins. */
   corsOrigins?: string[];
   iosSimulatorUdid?: string;
-  /** Selected preview target; does not enable Simulator boot or setup. */
-  previewDeviceId?: string;
   installAppPath?: string;
   bootEnv?: Record<string, string>;
   application?: Promise<ServeSimApplicationOptions | void>;
@@ -441,7 +431,6 @@ async function startDeviceSessionHostInternalAsync(
     signal,
     packageVersion,
     iosSimulatorUdid,
-    previewDeviceId,
     installAppPath,
     application,
     onStartupError,
@@ -490,10 +479,6 @@ async function startDeviceSessionHostInternalAsync(
   if (isAndroid) {
     await ensureFfmpegInstalledOnceAsync({ runtimePlatform, env, logger });
   }
-  const deviceIdPattern = isAndroid ? ANDROID_DEVICE_SERIAL : IOS_SIMULATOR_UDID;
-  const validPreviewDevice =
-    previewDeviceId && deviceIdPattern.test(previewDeviceId) ? previewDeviceId : undefined;
-  const previewDevice = isAndroid ? validPreviewDevice : (iosSimulatorUdid ?? validPreviewDevice);
   const recording: AndroidSessionRecording | null = isAndroid
     ? {
         deviceRunSessionId: getDeviceRunSessionIdOrThrow(env),
@@ -521,7 +506,6 @@ async function startDeviceSessionHostInternalAsync(
     isAndroid
       ? createExpoDeviceHubArgs({
           port,
-          device: previewDevice,
           turnArgs,
           packageVersion,
           recordingDirectory: recording?.directory,
@@ -533,7 +517,7 @@ async function startDeviceSessionHostInternalAsync(
           port,
           turnArgs,
           packageVersion,
-          iosSimulatorUdid: previewDevice,
+          iosSimulatorUdid,
           websiteArgs: websiteOriginArgs(env),
           frameAncestorArgs: frameAncestorArgs(frameAncestors),
           corsOriginArgs: corsOriginArgs(corsOrigins),
@@ -593,7 +577,7 @@ async function startDeviceSessionHostInternalAsync(
   }
 
   let stagedAppDirectory: string | undefined;
-  let simulatorSetup: ReturnType<typeof asyncResult<void>> | undefined;
+  let beforeLaunch: ReturnType<typeof asyncResult<void>> | undefined;
   const readinessController = new AbortController();
   const readinessSignal = AbortSignal.any([startup.signal, readinessController.signal]);
   let previewToken: string | undefined;
@@ -623,7 +607,6 @@ async function startDeviceSessionHostInternalAsync(
           subdomainId,
           baseDomain,
           authtoken,
-          healthCheck: { path: isAndroid ? '/readyz' : '/healthz' },
           logger,
         });
         if (finishTask) {
@@ -687,7 +670,7 @@ async function startDeviceSessionHostInternalAsync(
         onStopped: successful => onFinished(successful && !previewFailed),
       })
         .finally(async () => {
-          await simulatorSetup;
+          await beforeLaunch;
           if (stagedAppDirectory) {
             await fs.promises.rm(stagedAppDirectory, { recursive: true, force: true });
           }
@@ -728,8 +711,7 @@ async function startDeviceSessionHostInternalAsync(
         );
       }
       signal?.throwIfAborted();
-      // APSD cleanup runs alongside app startup and readiness; teardown joins the task.
-      simulatorSetup = asyncResult(
+      beforeLaunch = asyncResult(
         startup.untilAborted(
           startup.run('Simulator setup', async taskLogger => {
             try {
@@ -767,6 +749,7 @@ async function startDeviceSessionHostInternalAsync(
         signal?.throwIfAborted();
         await action('app.install', { udid: iosSimulatorUdid, path: staged.path });
       }
+      (await beforeLaunch)?.enforceValue();
       if (app.launchAppIdentifier) {
         signal?.throwIfAborted();
         await action('app.launch', {
@@ -779,9 +762,9 @@ async function startDeviceSessionHostInternalAsync(
     }
     logger.info(`Waiting for ${serverName} to become ready.`);
     const device = (await readiness).enforceValue();
-    if (!isAndroid && previewDevice && device.toLowerCase() !== previewDevice.toLowerCase()) {
+    if (iosSimulatorUdid && device.toLowerCase() !== iosSimulatorUdid.toLowerCase()) {
       throw new SystemError(
-        `serve-sim became ready on ${device}, but this session requested ${previewDevice}.`
+        `serve-sim became ready on ${device}, but this session requested ${iosSimulatorUdid}.`
       );
     }
     hostReady = true;
@@ -824,7 +807,7 @@ async function startDeviceSessionHostInternalAsync(
           captureAsync: signal =>
             captureDeviceRunSessionPreviewAsync({
               runtimePlatform,
-              device: previewDevice ?? device,
+              device,
               env,
               signal,
             }),

packages/build-tools/src/steps/utils/ios/AscApiClient.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 * as jose from 'jose';
@@ -617,24 +617,6 @@ export class AscApiClient {
       );
       if (parsedAscErrorResponse.ok) {
         const errors = parsedAscErrorResponse.value.errors.map(ascError => {
-          if (response.status === 401 && ascError.code === 'NOT_AUTHORIZED') {
-            return new UserError(
-              'EAS_ASC_INVALID_AUTH',
-              'App Store Connect rejected the API authentication credentials. ' +
-                'Check that the API key is active and belongs to the correct App Store Connect account. ' +
-                'If the key is stored in EAS credentials, replace or reconfigure it. ' +
-                'For a local key, check `key_id` and `key`, and `issuer_id` for a team key. Then try again.',
-              { cause: ascError, docsUrl: 'https://docs.expo.dev/submit/ios/' }
-            );
-          }
-          if (response.status === 500 && ascError.code === 'UNEXPECTED_ERROR') {
-            return new SystemError(
-              'App Store Connect returned an unexpected server error. ' +
-                'Check Apple’s service status at https://developer.apple.com/system-status/ and verify whether the requested operation completed in App Store Connect before trying again. ' +
-                'If the error continues, try again later or contact Apple Developer Support.',
-              { cause: ascError, trackingCode: 'EAS_ASC_SERVER_ERROR' }
-            );
-          }
           if (ascError.code === 'FORBIDDEN.REQUIRED_AGREEMENTS_MISSING_OR_EXPIRED') {
             return new UserError(
               'EAS_ASC_REQUIRED_AGREEMENTS_MISSING_OR_EXPIRED',

packages/build-tools/src/steps/utils/ios/__tests__/AscApiClient.test.ts

@@ -1,4 +1,4 @@
-import { SystemError, UserError } from '@expo/eas-build-job';
+import { UserError } from '@expo/eas-build-job';
 import * as jose from 'jose';
 import nock from 'nock';
 
@@ -85,57 +85,6 @@ describe(AscApiClient, () => {
     }
   );
 
-  it.each([false, true])(
-    'explains NOT_AUTHORIZED without losing other errors (mixed: %s)',
-    async mixed => {
-      const known = { status: '401', code: 'NOT_AUTHORIZED' };
-      const other = { status: '401', code: 'OTHER_ERROR' };
-      const scope = nock('https://api.appstoreconnect.apple.com')
-        .get('/v1/apps/app')
-        .query(true)
-        .reply(401, { errors: mixed ? [known, other] : [known] });
-      const error = await client
-        .getAsync('/v1/apps/:id', { 'fields[apps]': ['bundleId', 'name'] }, { id: 'app' })
-        .catch(error => error);
-      const mapped = mixed ? error.errors[0] : error;
-      expect(mapped).toBeInstanceOf(UserError);
-      expect(mapped).toMatchObject({ errorCode: 'EAS_ASC_INVALID_AUTH', cause: known });
-      if (mixed) {
-        expect(error).toBeInstanceOf(AggregateError);
-        expect(error.errors[1]).toBeInstanceOf(AscApiRequestError);
-        expect(error.errors[1].code).toBe('OTHER_ERROR');
-      }
-      expect(scope.isDone()).toBe(true);
-    }
-  );
-
-  it.each([false, true])(
-    'explains UNEXPECTED_ERROR without losing other errors (mixed: %s)',
-    async mixed => {
-      const known = { status: '500', code: 'UNEXPECTED_ERROR' };
-      const other = { status: '500', code: 'OTHER_ERROR' };
-      const scope = nock('https://api.appstoreconnect.apple.com')
-        .get('/v1/apps/app')
-        .query(true)
-        .reply(500, { errors: mixed ? [known, other] : [known] });
-      const error = await client
-        .getAsync('/v1/apps/:id', { 'fields[apps]': ['bundleId', 'name'] }, { id: 'app' })
-        .catch(error => error);
-      const mapped = mixed ? error.errors[0] : error;
-      expect(mapped).toBeInstanceOf(SystemError);
-      expect(mapped).toMatchObject({
-        trackingCode: 'EAS_ASC_SERVER_ERROR',
-        cause: known,
-      });
-      if (mixed) {
-        expect(error).toBeInstanceOf(AggregateError);
-        expect(error.errors[1]).toBeInstanceOf(AscApiRequestError);
-        expect(error.errors[1].code).toBe('OTHER_ERROR');
-      }
-      expect(scope.isDone()).toBe(true);
-    }
-  );
-
   it('fetches app info', async () => {
     const appId = '1491144534';
     const responseFixture = require('./fixtures/apps/get-apps-200.json');

packages/build-tools/src/steps/utils/ios/__tests__/AscApiUtils.test.ts

@@ -391,9 +391,7 @@ describe('commitBuildUploadFileAsync', () => {
       .reply(status, { errors: [{ code }] });
     await expect(
       AscApiUtils.commitBuildUploadFileAsync({ client, fileId: 'file', logger })
-    ).rejects.toMatchObject(
-      code === 'NOT_AUTHORIZED' ? { errorCode: 'EAS_ASC_INVALID_AUTH' } : { status, code }
-    );
+    ).rejects.toMatchObject({ status, code });
   });
 
   it('does not commit when the initial state read fails', async () => {

packages/build-tools/src/steps/utils/localEgressSession.ts

@@ -31,17 +31,14 @@ export async function uploadRemoteSessionConfigWithLocalEgressAsync({
 }: Parameters<typeof uploadRemoteSessionConfigAsync>[0] & {
   env: BuildStepEnv;
   signal?: AbortSignal;
-}): Promise<'started' | 'stopped'> {
+}): Promise<void> {
   // Written by start_local_egress before simulator boot; absent for ordinary sessions.
   const localEgress = await readLocalEgressHandoffAsync();
   signal?.throwIfAborted();
-  const sessionStart = await uploadRemoteSessionConfigAsync({
+  await uploadRemoteSessionConfigAsync({
     ...options,
     remoteConfig: { ...options.remoteConfig, ...buildEgressRemoteConfigFields(localEgress) },
   });
-  if (sessionStart === 'stopped') {
-    return sessionStart;
-  }
   if (localEgress && !signal?.aborted) {
     // Guard refusals from here on show up under this step in the job log,
     // alongside the monitor's reports, instead of under the boot step.
@@ -60,5 +57,4 @@ export async function uploadRemoteSessionConfigWithLocalEgressAsync({
       ...(localEgress.platform === 'android' ? { scanSimulatorConnections: false } : {}),
     });
   }
-  return sessionStart;
 }

packages/build-tools/src/steps/utils/ngrokTunnel.ts

@@ -1,368 +0,0 @@
-import { SystemError } from '@expo/eas-build-job';
-import { type bunyan } from '@expo/logger';
-import * as ngrok from '@ngrok/ngrok';
-import { randomBytes } from 'node:crypto';
-import { once } from 'node:events';
-import { type AddressInfo, type Socket, createConnection, createServer } from 'node:net';
-import { clearTimeout, setTimeout } from 'node:timers';
-
-import { turtleFetch } from '../../utils/turtleFetch';
-import { withDeviceRunSessionTimeoutAsync } from './deviceRunSessionTimeout';
-
-const PROBE_INTERVAL_MS = 15_000;
-const FAILURE_THRESHOLD = 3;
-const STOP_TIMEOUT_MS = 4_000;
-
-export type NgrokTunnelHandle = {
-  url: string;
-  subdomainId: string;
-  stopAsync: () => Promise<void>;
-};
-
-export async function startNgrokTunnelAsync({
-  port,
-  subdomainPrefix,
-  subdomainId = randomBytes(16).toString('hex'),
-  baseDomain,
-  authtoken,
-  rewriteHostHeader,
-  healthCheck,
-  logger,
-}: {
-  port: number;
-  subdomainPrefix: string;
-  subdomainId?: string;
-  baseDomain: string;
-  authtoken: string;
-  rewriteHostHeader?: boolean;
-  healthCheck?: { path: string; statuses?: number[] };
-  logger: bunyan;
-}): Promise<NgrokTunnelHandle> {
-  const domain = `${subdomainPrefix}-${subdomainId}.${baseDomain}`;
-  const controller = new AbortController();
-  const { signal } = controller;
-  const sockets = new Set<Socket>();
-  const target = createServer({ allowHalfOpen: true }, client => {
-    if (signal.aborted) {
-      client.destroy();
-      return;
-    }
-    const upstream = createConnection({ host: '127.0.0.1', port, allowHalfOpen: true });
-    for (const socket of [client, upstream]) {
-      sockets.add(socket);
-      socket.on('error', () => {
-        client.destroy();
-        upstream.destroy();
-      });
-      socket.on('close', () => sockets.delete(socket));
-    }
-    client.pipe(upstream).pipe(client);
-  });
-  target.listen(0, '127.0.0.1');
-  await once(target, 'listening');
-  target.unref();
-  signal.addEventListener(
-    'abort',
-    () => {
-      for (const socket of sockets) {
-        socket.destroy();
-      }
-    },
-    { once: true }
-  );
-  const config: ngrok.Config = {
-    addr: (target.address() as AddressInfo).port,
-    authtoken,
-    domain,
-    ...(rewriteHostHeader ? { request_header_add: [`Host:localhost:${port}`] } : {}),
-  };
-
-  const ownedListeners = new Set<ngrok.Listener>();
-  const retiredListeners = new Set<ngrok.Listener>();
-  const closingListeners = new Map<ngrok.Listener, Promise<void>>();
-  let pendingOpen: Promise<ngrok.Listener> | undefined;
-  let currentListener: ngrok.Listener | undefined;
-  function releaseTarget(): void {
-    if (signal.aborted && !pendingOpen && ownedListeners.size === 0 && target.listening) {
-      target.close();
-    }
-  }
-
-  async function closeAsync(
-    listener: ngrok.Listener,
-    closeSignal: AbortSignal,
-    logFailure = true
-  ): Promise<void> {
-    retiredListeners.add(listener);
-    let closing = closingListeners.get(listener);
-    if (!closing) {
-      closing = Promise.resolve().then(async () => await listener.close());
-      closingListeners.set(listener, closing);
-      void closing.then(
-        () => {
-          closingListeners.delete(listener);
-          retiredListeners.delete(listener);
-          ownedListeners.delete(listener);
-          releaseTarget();
-        },
-        () => closingListeners.delete(listener)
-      );
-    }
-    try {
-      await withDeviceRunSessionTimeoutAsync(
-        { name: 'Ngrok tunnel close', timeoutMs: 5_000, signal: closeSignal },
-        async () => await closing
-      );
-    } catch (err) {
-      if (logFailure && !closeSignal.aborted) {
-        logger.warn({ err }, `Could not stop ngrok tunnel ${domain}.`);
-      }
-    }
-  }
-
-  async function retireListenersAsync(retirementSignal: AbortSignal): Promise<void> {
-    let logFailure = true;
-    while (retiredListeners.size > 0) {
-      retirementSignal.throwIfAborted();
-      await Promise.all(
-        [...retiredListeners].map(retired => closeAsync(retired, retirementSignal, logFailure))
-      );
-      logFailure = false;
-      if (retiredListeners.size > 0) {
-        await waitAsync(250, retirementSignal);
-      }
-    }
-  }
-
-  async function retireLateListenerAsync(listener: ngrok.Listener): Promise<void> {
-    retiredListeners.add(listener);
-    try {
-      await withDeviceRunSessionTimeoutAsync(
-        { name: 'Late ngrok tunnel retirement', timeoutMs: STOP_TIMEOUT_MS },
-        async retirementSignal => {
-          while (retiredListeners.has(listener)) {
-            retirementSignal.throwIfAborted();
-            await closeAsync(listener, retirementSignal, false);
-            if (retiredListeners.has(listener)) {
-              await waitAsync(250, retirementSignal);
-            }
-          }
-        }
-      );
-    } catch (err) {
-      logger.warn({ err }, `Could not retire late ngrok tunnel ${domain}.`);
-    }
-  }
-
-  async function openAsync(forceNewSession = false): Promise<ngrok.Listener> {
-    if (pendingOpen) {
-      throw new SystemError(`A previous ngrok tunnel open for ${domain} is still pending.`);
-    }
-    let acquired: ngrok.Listener | undefined;
-    let retirement: Promise<void> | undefined;
-    const retireAcquired = () => {
-      if (acquired) {
-        retirement ??= retireLateListenerAsync(acquired);
-      }
-    };
-    try {
-      return await withDeviceRunSessionTimeoutAsync(
-        { name: 'Ngrok tunnel open', timeoutMs: 15_000, signal },
-        async openSignal => {
-          openSignal.throwIfAborted();
-          const opening = ngrok
-            .forward({
-              ...config,
-              ...(forceNewSession ? { force_new_session: true } : {}),
-            })
-            .then(listener => {
-              acquired = listener;
-              ownedListeners.add(listener);
-              return listener;
-            })
-            .finally(() => {
-              pendingOpen = undefined;
-            });
-          pendingOpen = opening;
-          void opening
-            .then(() => {
-              if (openSignal.aborted) {
-                retireAcquired();
-              }
-            })
-            .catch(() => releaseTarget());
-          const listener = await opening;
-          openSignal.throwIfAborted();
-          return listener;
-        }
-      );
-    } catch (err) {
-      retireAcquired();
-      throw err;
-    }
-  }
-
-  logger.info(`Starting ngrok tunnel ${domain} -> http://localhost:${port}.`);
-  let publicUrl: string | null;
-  try {
-    currentListener = await openAsync();
-    publicUrl = currentListener.url();
-    if (!publicUrl) {
-      await closeAsync(currentListener, signal);
-      currentListener = undefined;
-      throw new SystemError(`ngrok tunnel for ${domain} did not return a public URL.`);
-    }
-  } catch (error) {
-    controller.abort();
-    releaseTarget();
-    throw error;
-  }
-
-  const url = publicUrl;
-
-  async function probeAsync(
-    baseUrl: string,
-    { path, statuses = [200] }: NonNullable<typeof healthCheck>
-  ): Promise<boolean> {
-    try {
-      return await withDeviceRunSessionTimeoutAsync(
-        { name: 'Ngrok tunnel health probe', timeoutMs: 5_000, signal },
-        async probeSignal => {
-          const requestController = new AbortController();
-          try {
-            const response = await turtleFetch(new URL(path, baseUrl).href, 'GET', {
-              retries: 0,
-              redirect: 'manual',
-              shouldThrowOnNotOk: false,
-              headers: { 'ngrok-skip-browser-warning': 'true', 'Cache-Control': 'no-cache' },
-              signal: AbortSignal.any([probeSignal, requestController.signal]),
-            });
-            return !response.headers.has('ngrok-error-code') && statuses.includes(response.status);
-          } finally {
-            requestController.abort();
-          }
-        }
-      );
-    } catch {
-      return false;
-    }
-  }
-
-  async function superviseAsync(check: NonNullable<typeof healthCheck>): Promise<void> {
-    let failures = 0;
-    let attempts = 0;
-    let localUnhealthy = false;
-    while (
-      await waitAsync(
-        currentListener || localUnhealthy
-          ? PROBE_INTERVAL_MS
-          : Math.min(1_000 * 2 ** Math.min(attempts, 5), 30_000),
-        signal
-      )
-    ) {
-      await Promise.all([...retiredListeners].map(retired => closeAsync(retired, signal, false)));
-      if (signal.aborted) {
-        return;
-      }
-      if (currentListener && (await probeAsync(url, check))) {
-        if (failures > 0 || attempts > 0 || localUnhealthy) {
-          logger.info(`Ngrok tunnel ${domain} is healthy again.`);
-        }
-        failures = 0;
-        attempts = 0;
-        localUnhealthy = false;
-        continue;
-      }
-      if (signal.aborted) {
-        return;
-      }
-      if (!(await probeAsync(`http://127.0.0.1:${port}`, check))) {
-        if (!localUnhealthy && !signal.aborted) {
-          logger.warn(`Local service on port ${port} is unhealthy; waiting for it to recover.`);
-        }
-        localUnhealthy = true;
-        failures = 0;
-        continue;
-      }
-      localUnhealthy = false;
-      if (currentListener) {
-        failures++;
-        if (failures < FAILURE_THRESHOLD) {
-          continue;
-        }
-        logger.warn(`Ngrok tunnel ${domain} failed ${failures} health probes; reopening it.`);
-        await closeAsync(currentListener, signal);
-        currentListener = undefined;
-      }
-      if (signal.aborted) {
-        return;
-      }
-      attempts++;
-      try {
-        const reopened = await openAsync(/* forceNewSession */ true);
-        if (reopened.url() !== url) {
-          await closeAsync(reopened, signal);
-          throw new SystemError(
-            `Reopened ngrok tunnel for ${domain} returned a different public URL.`
-          );
-        }
-        currentListener = reopened;
-        failures = 0;
-      } catch (err) {
-        if (!signal.aborted && (attempts === 1 || attempts % 5 === 0)) {
-          logger.warn(
-            { err, attempt: attempts },
-            `Could not reopen ngrok tunnel ${domain}; will retry.`
-          );
-        }
-      }
-    }
-  }
-
-  const supervision = healthCheck
-    ? superviseAsync(healthCheck).catch(err => {
-        if (!signal.aborted) {
-          logger.warn({ err }, `Ngrok tunnel supervision stopped for ${domain}.`);
-        }
-      })
-    : Promise.resolve();
-  let stopTask: Promise<void> | undefined;
-  return {
-    url,
-    subdomainId,
-    stopAsync: () =>
-      (stopTask ??= (async () => {
-        controller.abort();
-        await withDeviceRunSessionTimeoutAsync(
-          { name: `Ngrok tunnel ${domain} stop`, timeoutMs: STOP_TIMEOUT_MS },
-          async stopSignal => {
-            await supervision;
-            if (currentListener) {
-              retiredListeners.add(currentListener);
-              currentListener = undefined;
-            }
-            await Promise.all([pendingOpen?.catch(() => {}), retireListenersAsync(stopSignal)]);
-            await retireListenersAsync(stopSignal);
-          }
-        );
-        releaseTarget();
-      })()),
-  };
-}
-
-function waitAsync(ms: number, signal: AbortSignal): Promise<boolean> {
-  if (signal.aborted) {
-    return Promise.resolve(false);
-  }
-  return new Promise(resolve => {
-    const onAbort = () => {
-      clearTimeout(timer);
-      resolve(false);
-    };
-    const timer = setTimeout(() => {
-      signal.removeEventListener('abort', onAbort);
-      resolve(true);
-    }, ms);
-    signal.addEventListener('abort', onAbort, { once: true });
-  });
-}

packages/build-tools/src/steps/utils/remoteDeviceRunSession.ts

@@ -9,7 +9,9 @@ import {
   spawnAsync,
 } from '@expo/steps';
 import spawn from '@expo/turtle-spawn';
+import * as ngrok from '@ngrok/ngrok';
 import { z } from 'zod';
+import { randomBytes } from 'node:crypto';
 import fs from 'node:fs';
 import { createServer } from 'node:net';
 import path from 'node:path';
@@ -29,7 +31,6 @@ import { createProcessOutput } from './processOutput';
 import { withDeviceRunSessionTimeoutAsync } from './deviceRunSessionTimeout';
 import {
   type DeviceRunSessionStatus,
-  DeviceRunSessionWorkerApiError,
   requireDeviceRunSessionWorkerApi,
 } from './deviceRunSessionWorkerApi';
 
@@ -522,14 +523,6 @@ export async function fetchWebPreviewTurnArgsAsync(
     }
     return args;
   } catch (err) {
-    if (
-      err instanceof DeviceRunSessionWorkerApiError &&
-      err.code === 'DEVICE_RUN_SESSION_ALREADY_STOPPED'
-    ) {
-      logger.info('Device run session was stopped before TURN credentials were fetched.');
-      return [];
-    }
-
     const error = err instanceof Error ? err : new Error(String(err));
     Sentry.capture('Could not fetch Cloudflare TURN ICE servers', error, { level: 'warning' });
     logger.warn(
@@ -561,7 +554,7 @@ export async function uploadRemoteSessionConfigAsync({
   deviceRunSessionId: string;
   remoteConfig: Record<string, unknown>;
   logger: bunyan;
-}): Promise<'started' | 'stopped'> {
+}): Promise<void> {
   logger.info(
     `Reporting remote config to the API server (device run session: ${deviceRunSessionId}).`
   );
@@ -571,16 +564,7 @@ export async function uploadRemoteSessionConfigAsync({
       { remoteConfig },
       { retries: 3, timeoutMs: DEVICE_RUN_SESSION_WORKER_REQUEST_TIMEOUT_MS, logger }
     );
-    return 'started';
   } catch (err) {
-    if (
-      err instanceof DeviceRunSessionWorkerApiError &&
-      err.code === 'DEVICE_RUN_SESSION_ALREADY_STOPPED'
-    ) {
-      logger.info(`Device run session ${deviceRunSessionId} was stopped during startup.`);
-      return 'stopped';
-    }
-
     throw new SystemError(
       `Failed to start device run session ${deviceRunSessionId}: ${
         err instanceof Error ? err.message : String(err)
@@ -965,7 +949,63 @@ export async function findAvailablePortAsync(): Promise<number> {
   return address.port;
 }
 
-export { type NgrokTunnelHandle, startNgrokTunnelAsync } from './ngrokTunnel';
+export type NgrokTunnelHandle = {
+  url: string;
+  subdomainId: string;
+  stopAsync: () => Promise<void>;
+};
+
+export async function startNgrokTunnelAsync({
+  port,
+  subdomainPrefix,
+  subdomainId: subdomainIdArg,
+  baseDomain,
+  authtoken,
+  rewriteHostHeader,
+  logger,
+}: {
+  port: number;
+  subdomainPrefix: string;
+  subdomainId?: string;
+  baseDomain: string;
+  authtoken: string;
+  rewriteHostHeader?: boolean;
+  logger: bunyan;
+}): Promise<NgrokTunnelHandle> {
+  const subdomainId = subdomainIdArg ?? randomBytes(16).toString('hex');
+  const domain = `${subdomainPrefix}-${subdomainId}.${baseDomain}`;
+  logger.info(`Starting ngrok tunnel ${domain} -> http://localhost:${port}.`);
+  // Run the ngrok agent in-process via the SDK; it keeps the session alive until
+  // the process exits, and the step blocks forever to hold it open.
+  const listener = await ngrok.forward({
+    addr: port,
+    authtoken,
+    domain,
+    ...(rewriteHostHeader ? { request_header_add: [`Host:localhost:${port}`] } : {}),
+  });
+  const url = listener.url();
+  if (!url) {
+    await listener.close();
+    throw new SystemError(`ngrok tunnel for ${domain} did not return a public URL.`);
+  }
+  let stopTask: Promise<void> | undefined;
+  return {
+    url,
+    subdomainId,
+    stopAsync: () =>
+      (stopTask ??= (async () => {
+        try {
+          await withDeviceRunSessionTimeoutAsync(
+            { name: 'Ngrok tunnel stop', timeoutMs: 4_000 },
+            async () => await listener.close()
+          );
+        } catch (error) {
+          logger.warn({ err: error }, `Could not stop ngrok tunnel ${domain}.`);
+          throw error;
+        }
+      })()),
+  };
+}
 
 export async function waitForFileAsync<T>({
   filePath,

packages/build-tools/src/templates/npmrc.ts

@@ -1,5 +1,3 @@
-export const NpmrcAuthTokenLine = '//registry.npmjs.org/:_authToken=${NPM_TOKEN}';
-
-export const NpmrcTemplate = `${NpmrcAuthTokenLine}
+export const NpmrcTemplate = `//registry.npmjs.org/:_authToken=\${NPM_TOKEN}
 registry=https://registry.npmjs.org/
 `;

packages/build-tools/src/utils/IosSimulatorUtils.ts

@@ -7,7 +7,6 @@ import { setTimeout } from 'node:timers/promises';
 import { z } from 'zod';
 
 import { retryAsync } from './retry';
-import { waitForWarmSimulatorCleanupAsync } from './warmSimulatorCleanup';
 
 export type IosSimulatorUuid = string & z.BRAND<'IosSimulatorUuid'>;
 export type IosSimulatorName = string & z.BRAND<'IosSimulatorName'>;
@@ -120,7 +119,6 @@ export namespace IosSimulatorUtils {
     destinationDeviceName: IosSimulatorName;
     env: NodeJS.ProcessEnv;
   }): Promise<void> {
-    await waitForWarmSimulatorCleanupAsync(env);
     await spawn('xcrun', ['simctl', 'clone', sourceDeviceIdentifier, destinationDeviceName], {
       env,
     });
@@ -133,7 +131,6 @@ export namespace IosSimulatorUtils {
     deviceIdentifier: IosSimulatorUuid | IosSimulatorName;
     env: NodeJS.ProcessEnv;
   }): Promise<void> {
-    await waitForWarmSimulatorCleanupAsync(env);
     try {
       const devices = await getAvailableDevicesAsync({ env, filter: 'available' });
       const device = devices.find(
@@ -234,7 +231,6 @@ export namespace IosSimulatorUtils {
     env: NodeJS.ProcessEnv;
     launchdEnvironment?: Record<string, string>;
   }): Promise<void> {
-    await waitForWarmSimulatorCleanupAsync(env);
     const bootEnv = { ...env };
     for (const [name, value] of Object.entries(launchdEnvironment)) {
       bootEnv[`SIMCTL_CHILD_${name}`] = value;
@@ -257,7 +253,6 @@ export namespace IosSimulatorUtils {
     deviceIdentifier: IosSimulatorUuid | IosSimulatorName;
     env: NodeJS.ProcessEnv;
   }): Promise<{ udid: IosSimulatorUuid }> {
-    await waitForWarmSimulatorCleanupAsync(env);
     const bootstatusResult = await spawn(
       'xcrun',
       ['simctl', 'bootstatus', deviceIdentifier, '-b'],

packages/build-tools/src/utils/__tests__/IosSimulatorUtils.test.ts

@@ -5,7 +5,6 @@ import path from 'node:path';
 
 import { IosSimulatorUtils } from '../IosSimulatorUtils';
 import { retryAsync } from '../retry';
-import { waitForWarmSimulatorCleanupAsync } from '../warmSimulatorCleanup';
 
 jest.mock('@expo/turtle-spawn', () => ({
   __esModule: true,
@@ -15,7 +14,6 @@ jest.mock('@expo/turtle-spawn', () => ({
 jest.mock('../retry', () => ({
   retryAsync: jest.fn(async fn => await fn(0)),
 }));
-jest.mock('../warmSimulatorCleanup');
 
 const mockedSpawn = jest.mocked(spawn);
 
@@ -23,7 +21,6 @@ describe('IosSimulatorUtils', () => {
   beforeEach(() => {
     mockedSpawn.mockReset();
     mockedSpawn.mockResolvedValue({ stdout: '', stderr: '' } as any);
-    jest.mocked(waitForWarmSimulatorCleanupAsync).mockReset().mockResolvedValue(undefined);
   });
 
   describe(IosSimulatorUtils.getAvailableRuntimesAsync, () => {
@@ -154,30 +151,6 @@ describe('IosSimulatorUtils', () => {
       }) as any);
     }
 
-    it('waits for warm cleanup before checking device state and writing accessibility prefs', async () => {
-      let finishCleanup: (() => void) | undefined;
-      jest.mocked(waitForWarmSimulatorCleanupAsync).mockImplementationOnce(
-        async () =>
-          await new Promise<void>(resolve => {
-            finishCleanup = resolve;
-          })
-      );
-      mockAvailableDevices([device()]);
-
-      const setup = IosSimulatorUtils.enableAccessibilitySettingsAsync({
-        deviceIdentifier: device().udid as any,
-        env: {},
-      });
-      expect(mockedSpawn).not.toHaveBeenCalled();
-      expect(finishCleanup).toBeDefined();
-      finishCleanup?.();
-      await setup;
-
-      expect(mockedSpawn).toHaveBeenCalledWith('plutil', expect.anything(), {
-        env: {},
-      });
-    });
-
     it('writes accessibility prefs for an exact shutdown simulator match', async () => {
       mockAvailableDevices([
         device({

packages/build-tools/src/utils/__tests__/installIsolatedNpmPackageAsync.test.ts

@@ -1,89 +0,0 @@
-import spawn from '@expo/turtle-spawn';
-
-import { createMockLogger } from '../../__tests__/utils/logger';
-import { Sentry } from '../../sentry';
-import { installIsolatedNpmPackageAsync } from '../installIsolatedNpmPackageAsync';
-
-jest.mock('@expo/turtle-spawn', () => ({ __esModule: true, default: jest.fn() }));
-jest.mock('../../sentry', () => ({ Sentry: { capture: jest.fn() } }));
-
-const spawnMock = jest.mocked(spawn);
-const npmCacheUrl = 'https://npm-cache.expo.test';
-
-describe(installIsolatedNpmPackageAsync, () => {
-  it('retries without the npm cache registry when the install fails against it', async () => {
-    const logger = createMockLogger();
-    const cacheFailure = Object.assign(new Error('npm install exited with non-zero code: 1'), {
-      stderr: `npm error request to ${npmCacheUrl}/@scope%2ffork failed, reason: ECONNREFUSED`,
-    });
-    spawnMock.mockRejectedValueOnce(cacheFailure).mockResolvedValueOnce({} as never);
-
-    await installIsolatedNpmPackageAsync({
-      packageSpec: '@scope/fork@next',
-      directory: '/tmp/sandbox',
-      npmCacheUrl,
-      pathEnv: '/usr/bin',
-      logger,
-    });
-
-    expect(spawnMock).toHaveBeenCalledTimes(2);
-    expect(spawnMock.mock.calls[0][1]).toEqual(expect.arrayContaining(['--registry', npmCacheUrl]));
-    expect(spawnMock.mock.calls[1][1]).not.toContain('--registry');
-    expect(spawnMock.mock.calls[1][2]).toEqual({
-      env: { PATH: '/usr/bin', HOME: '/tmp/sandbox' },
-      logger,
-    });
-    expect(logger.warn).toHaveBeenCalledWith(
-      `Failed to install @scope/fork@next using the npm cache registry (${npmCacheUrl}). Retrying without the npm cache registry.`
-    );
-    expect(Sentry.capture).toHaveBeenCalledWith(
-      expect.objectContaining({ name: 'NpmCacheRegistryInstallError', cause: cacheFailure }),
-      { level: 'warning', extras: { packageSpec: '@scope/fork@next', npmCacheUrl } }
-    );
-  });
-
-  it('rethrows an install failure that does not mention the npm cache registry', async () => {
-    const error = Object.assign(new Error('npm install exited with non-zero code: 1'), {
-      stderr: 'npm error notarget No matching version found for @scope/fork@next.',
-    });
-    spawnMock.mockRejectedValueOnce(error);
-
-    await expect(
-      installIsolatedNpmPackageAsync({
-        packageSpec: '@scope/fork@next',
-        directory: '/tmp/sandbox',
-        npmCacheUrl,
-        pathEnv: '/usr/bin',
-      })
-    ).rejects.toBe(error);
-
-    expect(spawnMock).toHaveBeenCalledTimes(1);
-    expect(Sentry.capture).not.toHaveBeenCalled();
-  });
-
-  it('rethrows the cancellation of an install without retrying', async () => {
-    const controller = new AbortController();
-    const cancellation = new Error('cancelled');
-    spawnMock.mockImplementationOnce((() => {
-      controller.abort(cancellation);
-      return Promise.reject(
-        Object.assign(new Error('npm install was killed with SIGTERM'), {
-          stderr: `npm error request to ${npmCacheUrl}/@scope%2ffork failed`,
-        })
-      );
-    }) as unknown as typeof spawn);
-
-    await expect(
-      installIsolatedNpmPackageAsync({
-        packageSpec: '@scope/fork@next',
-        directory: '/tmp/sandbox',
-        npmCacheUrl,
-        pathEnv: '/usr/bin',
-        signal: controller.signal,
-      })
-    ).rejects.toBe(cancellation);
-
-    expect(spawnMock).toHaveBeenCalledTimes(1);
-    expect(Sentry.capture).not.toHaveBeenCalled();
-  });
-});

packages/build-tools/src/utils/__tests__/npmrc.test.ts

@@ -1,120 +0,0 @@
-import spawn from '@expo/turtle-spawn';
-import { vol } from 'memfs';
-
-import { createMockLogger } from '../../__tests__/utils/logger';
-import { NpmrcAuthTokenLine, NpmrcTemplate } from '../../templates/npmrc';
-import { setUpNpmrcAsync } from '../npmrc';
-
-jest.mock('fs');
-jest.mock('@expo/turtle-spawn', () => ({ __esModule: true, default: jest.fn() }));
-
-const projectTargetDirectory = '/workingdir/build';
-const homeDirectory = '/home/expo';
-
-describe(setUpNpmrcAsync, () => {
-  beforeEach(async () => {
-    vol.reset();
-    await vol.promises.mkdir(projectTargetDirectory, { recursive: true });
-    await vol.promises.mkdir(homeDirectory, { recursive: true });
-    jest.mocked(spawn).mockResolvedValue({ stdout: `${homeDirectory}/.npmrc\n` } as never);
-  });
-
-  afterEach(() => {
-    jest.restoreAllMocks();
-  });
-
-  it('adds the NPM_TOKEN placeholder to ~/.npmrc on EAS Build and leaves the project .npmrc alone', async () => {
-    const projectContents = '//npm.pkg.github.com/:_authToken=${GITHUB_TOKEN}\n';
-    await vol.promises.writeFile(`${projectTargetDirectory}/.npmrc`, projectContents);
-    await vol.promises.writeFile(`${homeDirectory}/.npmrc`, 'fund=false');
-
-    await setUpNpmrcAsync({
-      projectTargetDirectory,
-      workingDirectory: projectTargetDirectory,
-      env: { NPM_TOKEN: 'npm_secret_token', EAS_BUILD_RUNNER: 'eas-build' },
-      logger: createMockLogger(),
-    });
-
-    expect(await vol.promises.readFile(`${homeDirectory}/.npmrc`, 'utf8')).toBe(
-      `fund=false\n${NpmrcAuthTokenLine}\n`
-    );
-    expect(await vol.promises.readFile(`${projectTargetDirectory}/.npmrc`, 'utf8')).toBe(
-      projectContents
-    );
-  });
-
-  it('adds the NPM_TOKEN placeholder to the user config file npm resolves from the build env', async () => {
-    await vol.promises.mkdir(`${homeDirectory}/npm`, { recursive: true });
-    jest.mocked(spawn).mockResolvedValueOnce({ stdout: `${homeDirectory}/npm/npmrc\n` } as never);
-    const env = {
-      NPM_TOKEN: 'npm_secret_token',
-      EAS_BUILD_RUNNER: 'eas-build',
-      NPM_CONFIG_USERCONFIG: '~/npm/npmrc',
-    };
-
-    await setUpNpmrcAsync({
-      projectTargetDirectory,
-      workingDirectory: projectTargetDirectory,
-      env,
-      logger: createMockLogger(),
-    });
-
-    expect(spawn).toHaveBeenCalledWith(
-      'npm',
-      ['config', 'get', 'userconfig'],
-      expect.objectContaining({ cwd: projectTargetDirectory, env })
-    );
-    expect(await vol.promises.readFile(`${homeDirectory}/npm/npmrc`, 'utf8')).toBe(
-      `\n${NpmrcAuthTokenLine}\n`
-    );
-    expect(vol.existsSync(`${homeDirectory}/.npmrc`)).toBe(false);
-  });
-
-  it('creates the project .npmrc and leaves the user npmrc alone on local builds', async () => {
-    await setUpNpmrcAsync({
-      projectTargetDirectory,
-      workingDirectory: projectTargetDirectory,
-      env: { NPM_TOKEN: 'npm_secret_token', EAS_BUILD_RUNNER: 'local-build-plugin' },
-      logger: createMockLogger(),
-    });
-
-    expect(await vol.promises.readFile(`${projectTargetDirectory}/.npmrc`, 'utf8')).toBe(
-      NpmrcTemplate
-    );
-    expect(vol.existsSync(`${homeDirectory}/.npmrc`)).toBe(false);
-  });
-
-  it('leaves an existing project .npmrc untouched on local builds', async () => {
-    const existingContents = 'registry=https://registry.example.com/\n';
-    await vol.promises.writeFile(`${projectTargetDirectory}/.npmrc`, existingContents);
-
-    await setUpNpmrcAsync({
-      projectTargetDirectory,
-      workingDirectory: projectTargetDirectory,
-      env: { NPM_TOKEN: 'npm_secret_token', EAS_BUILD_RUNNER: 'local-build-plugin' },
-      logger: createMockLogger(),
-    });
-
-    expect(await vol.promises.readFile(`${projectTargetDirectory}/.npmrc`, 'utf8')).toBe(
-      existingContents
-    );
-  });
-
-  it('reports an existing .npmrc when NPM_TOKEN is not set', async () => {
-    const logger = createMockLogger();
-    await vol.promises.writeFile(
-      `${projectTargetDirectory}/.npmrc`,
-      'registry=https://registry.example.com/\n'
-    );
-
-    await setUpNpmrcAsync({
-      projectTargetDirectory,
-      workingDirectory: projectTargetDirectory,
-      env: { EAS_BUILD_RUNNER: 'eas-build' },
-      logger,
-    });
-
-    expect(logger.info).toHaveBeenCalledWith('.npmrc found at .npmrc');
-    expect(vol.existsSync(`${homeDirectory}/.npmrc`)).toBe(false);
-  });
-});

packages/build-tools/src/utils/__tests__/packageManager.test.ts

@@ -1,7 +1,9 @@
 import { errors } from '@expo/eas-build-job';
+import { type bunyan } from '@expo/logger';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import path from 'path';
+import semver from 'semver';
 
 import {
   PackageManager,
@@ -14,6 +16,7 @@ import {
   resolvePackageExec,
   resolvePackageInstall,
   resolvePackageManager,
+  resolvePackageVersionAsync,
   shouldUseFrozenLockfile,
 } from '../packageManager';
 
@@ -290,6 +293,33 @@ describe(resolvePackageInstall, () => {
   });
 });
 
+describe(resolvePackageVersionAsync, () => {
+  const logger = {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+  } as unknown as bunyan;
+
+  it('should resolve version from package name and dist tag', async () => {
+    const version = await resolvePackageVersionAsync({
+      logger,
+      packageName: '@expo/repack-app',
+      distTag: 'latest',
+    });
+    expect(semver.valid(version)).toBeTruthy();
+  });
+
+  it('should return null if version cannot be resolved', async () => {
+    const version = await resolvePackageVersionAsync({
+      logger,
+      packageName: '@expo/repack-app',
+      distTag: 'nonexistent-dist-tag',
+    });
+    expect(version).toBeNull();
+  });
+});
+
 describe(findPackagerRootDir, () => {
   beforeEach(() => {
     vol.reset();

packages/build-tools/src/utils/__tests__/turtleSshSession.test.ts

@@ -76,7 +76,11 @@ describe(getSshRelayServerUrl, () => {
 });
 
 describe(startSshSessionAsync, () => {
-  const config1: SshConnectionConfig = { type: 'upterm-v1', secret: 'secret-1' };
+  const config1: SshConnectionConfig = {
+    type: 'upterm-v1',
+    host: 'relay.expo.dev',
+    secret: 'secret-1',
+  };
   const config2: SshConnectionConfig = { ...config1, secret: 'secret-2' };
   const target = { type: 'JOB_RUN', id: 'jr-1' } as const;
 
@@ -129,7 +133,7 @@ describe(startSshSessionAsync, () => {
 
     expect(mutation).toHaveBeenCalledWith(expect.anything(), {
       target: { type: 'JOB_RUN', id: 'jr-1' },
-      connectionConfig: { type: 'UPTERM_V1', secret: 'secret-1', reconnecting: false },
+      connectionConfig: { ...config1, reconnecting: false, type: 'UPTERM_V1' },
       sessionSettings: { idleTimeoutSeconds: 900 },
     });
     expect(idleTimeoutSeconds).toBe(900);
@@ -151,7 +155,7 @@ describe(startSshSessionAsync, () => {
 
     expect(mutation).toHaveBeenCalledWith(expect.anything(), {
       target: { type: 'BUILD', id: 'b-1' },
-      connectionConfig: { type: 'UPTERM_V1', secret: 'secret-1', reconnecting: false },
+      connectionConfig: { ...config1, reconnecting: false, type: 'UPTERM_V1' },
       sessionSettings: { idleTimeoutSeconds: 900 },
     });
   });
@@ -238,7 +242,7 @@ describe(startSshSessionAsync, () => {
     );
     expect(mutation).toHaveBeenLastCalledWith(expect.anything(), {
       target: { type: 'JOB_RUN', id: 'jr-1' },
-      connectionConfig: { type: 'UPTERM_V1', secret: 'secret-2', reconnecting: false },
+      connectionConfig: { ...config2, reconnecting: false, type: 'UPTERM_V1' },
       sessionSettings: { idleTimeoutSeconds: 300 },
     });
   });
@@ -294,7 +298,7 @@ describe(startSshSessionAsync, () => {
     expect(host.redialAsync).toHaveBeenCalledTimes(1);
     expect(mutation).toHaveBeenLastCalledWith(expect.anything(), {
       target: { type: 'JOB_RUN', id: 'jr-1' },
-      connectionConfig: { type: 'UPTERM_V1', secret: 'secret-2', reconnecting: false },
+      connectionConfig: { ...config2, reconnecting: false, type: 'UPTERM_V1' },
       sessionSettings: { idleTimeoutSeconds: 300 },
     });
   });

packages/build-tools/src/utils/__tests__/upterm.test.ts

@@ -7,6 +7,7 @@ import { createMockLogger } from '../../__tests__/utils/logger';
 import { BuildContext } from '../../context';
 import { sleepAsync } from '../retry';
 import {
+  connectionConfigFromUptermSession,
   redactConnectionSecrets,
   redactSpawnErrorForLog,
   resolveUptermGcsObjectName,
@@ -41,6 +42,49 @@ describe(resolveUptermGcsObjectName, () => {
   });
 });
 
+describe(connectionConfigFromUptermSession, () => {
+  it('parses sessionId and host from session current fields', () => {
+    expect(
+      connectionConfigFromUptermSession({
+        sessionId: 'TOKENabc123',
+        host: 'ssh://relay.expo.dev:22',
+      })
+    ).toEqual({
+      type: 'upterm-v1',
+      host: 'relay.expo.dev',
+      secret: 'TOKENabc123',
+    });
+  });
+
+  it('accepts a bare hostname', () => {
+    expect(connectionConfigFromUptermSession({ sessionId: 'tok', host: 'relay.expo.dev' })).toEqual(
+      {
+        type: 'upterm-v1',
+        host: 'relay.expo.dev',
+        secret: 'tok',
+      }
+    );
+  });
+
+  it('keeps a non-default port so the CLI can pass it to ssh -p', () => {
+    expect(
+      connectionConfigFromUptermSession({
+        sessionId: 'tok',
+        host: 'ssh://relay.expo.dev:2222',
+      })
+    ).toEqual({
+      type: 'upterm-v1',
+      host: 'relay.expo.dev:2222',
+      secret: 'tok',
+    });
+  });
+
+  it('returns null when the host is not a parseable url', () => {
+    expect(connectionConfigFromUptermSession({ sessionId: 'tok', host: 'ssh://' })).toBeNull();
+    expect(connectionConfigFromUptermSession({ sessionId: 'tok', host: 'ssh://[' })).toBeNull();
+  });
+});
+
 describe(redactConnectionSecrets, () => {
   it('strips the userinfo secret from a connection string', () => {
     expect(
@@ -213,7 +257,11 @@ describe(startUptermHostAsync, () => {
       relayServerUrl: 'wss://relay.expo.dev',
     });
 
-    expect(host.connectionConfig).toEqual({ type: 'upterm-v1', secret: 'TOKENx' });
+    expect(host.connectionConfig).toEqual({
+      type: 'upterm-v1',
+      host: 'relay.expo.dev',
+      secret: 'TOKENx',
+    });
     expect(host.isAlive()).toBe(true);
     expect(mockedDownloadFile).not.toHaveBeenCalled();
     expect(mockedSpawn).toHaveBeenCalledWith('upterm', ['version'], {
@@ -321,21 +369,6 @@ describe(startUptermHostAsync, () => {
     );
   });
 
-  it('keeps polling until upterm reports a session id', async () => {
-    sessionStdout = JSON.stringify({ host: 'ssh://relay.expo.dev:22', clientCount: 0 });
-    mockedSleep.mockImplementationOnce(async () => {
-      sessionStdout = JSON.stringify({
-        sessionId: 'TOKENy',
-        host: 'ssh://relay.expo.dev:22',
-        clientCount: 0,
-      });
-    });
-
-    const host = await startUptermHostAsync(makeCtx(), { relayServerUrl: 'wss://r' });
-
-    expect(host.connectionConfig).toEqual({ type: 'upterm-v1', secret: 'TOKENy' });
-  });
-
   it('tears down and rethrows when the host never registers with the relay', async () => {
     jest.useFakeTimers();
     jest.setSystemTime(0);
@@ -387,7 +420,11 @@ describe(startUptermHostAsync, () => {
     const host = await startUptermHostAsync(makeCtx(), { relayServerUrl: 'wss://r' });
     const config = await host.redialAsync();
 
-    expect(config).toEqual({ type: 'upterm-v1', secret: 'TOKENx' });
+    expect(config).toEqual({
+      type: 'upterm-v1',
+      host: 'relay.expo.dev',
+      secret: 'TOKENx',
+    });
     expect(host.connectionConfig).toEqual(config);
   });
 
@@ -425,7 +462,11 @@ describe(startUptermHostAsync, () => {
     const host = await startUptermHostAsync(makeCtx(), { relayServerUrl: 'wss://r' });
     hostProcess.catch = () => new Promise<void>(() => {});
 
-    await expect(host.redialAsync()).resolves.toEqual({ type: 'upterm-v1', secret: 'TOKENx' });
+    await expect(host.redialAsync()).resolves.toEqual({
+      type: 'upterm-v1',
+      host: 'relay.expo.dev',
+      secret: 'TOKENx',
+    });
     expect(mockedSleep).toHaveBeenCalledWith(5_000);
   });
 

packages/build-tools/src/utils/__tests__/warmSimulatorCleanup.test.ts

@@ -1,125 +0,0 @@
-import spawn from '@expo/turtle-spawn';
-import fs from 'node:fs/promises';
-
-import { waitForWarmSimulatorCleanupAsync } from '../warmSimulatorCleanup';
-
-const STATE_FILE = '/tmp/expo-simulator-startup.json';
-const STARTUP_SCRIPT = '/usr/local/share/vm-tools/startup.sh';
-const platform = Object.getOwnPropertyDescriptor(process, 'platform')!;
-jest.mock('@expo/turtle-spawn');
-
-async function writeStateAsync(state: object): Promise<void> {
-  await fs.mkdir('/tmp', { recursive: true });
-  await fs.writeFile(STATE_FILE, JSON.stringify({ bootUuid: 'current-boot', ...state }));
-}
-
-beforeEach(() => {
-  Object.defineProperty(process, 'platform', { value: 'darwin' });
-  jest.mocked(spawn).mockResolvedValue({ stdout: 'current-boot\n' } as never);
-});
-afterEach(() => {
-  Object.defineProperty(process, 'platform', platform);
-});
-
-it('continues at once on a VM without warmup', async () => {
-  await expect(waitForWarmSimulatorCleanupAsync({})).resolves.toBeUndefined();
-  expect(spawn).not.toHaveBeenCalled();
-});
-
-it('ignores a previous boot cleanup record and reads the current boot only once', async () => {
-  await writeStateAsync({ status: 'disabled', bootUuid: 'old-boot' });
-  let finished = false;
-  const waiting = waitForWarmSimulatorCleanupAsync({}, { pollMs: 5 }).then(() => {
-    finished = true;
-  });
-  await new Promise(resolve => setTimeout(resolve, 30));
-  expect(finished).toBe(false);
-  await writeStateAsync({ status: 'disabled' });
-  await waiting;
-  expect(spawn).toHaveBeenCalledTimes(1);
-});
-
-it('does not accept a cleanup record without a boot ID', async () => {
-  await writeStateAsync({ status: 'disabled', bootUuid: undefined });
-  await expect(waitForWarmSimulatorCleanupAsync({}, { timeoutMs: 20, pollMs: 5 })).rejects.toThrow(
-    'Warm Simulator cleanup did not finish'
-  );
-});
-
-it.each(['failed', 'empty'])('fails closed when the current boot ID is %s', async mode => {
-  await writeStateAsync({ status: 'disabled' });
-  if (mode === 'failed') {
-    jest.mocked(spawn).mockRejectedValueOnce(new Error('sysctl failed'));
-  } else {
-    jest.mocked(spawn).mockResolvedValueOnce({ stdout: '' } as never);
-  }
-  await expect(waitForWarmSimulatorCleanupAsync({})).rejects.toThrow();
-});
-
-it('waits for cleanup when warmup is installed but has not written state yet', async () => {
-  await fs.mkdir('/usr/local/share/vm-tools', { recursive: true });
-  await fs.writeFile(STARTUP_SCRIPT, '');
-  let finished = false;
-  const waiting = waitForWarmSimulatorCleanupAsync({}, { pollMs: 5 }).then(() => {
-    finished = true;
-  });
-  await new Promise(resolve => setTimeout(resolve, 30));
-  expect(finished).toBe(false);
-  await writeStateAsync({ status: 'starting' });
-  await new Promise(resolve => setTimeout(resolve, 30));
-  expect(finished).toBe(false);
-  await writeStateAsync({ status: 'disabled' });
-  await waiting;
-});
-
-it('times out when installed warmup never writes state', async () => {
-  await fs.mkdir('/usr/local/share/vm-tools', { recursive: true });
-  await fs.writeFile(STARTUP_SCRIPT, '');
-  await expect(waitForWarmSimulatorCleanupAsync({}, { timeoutMs: 20, pollMs: 5 })).rejects.toThrow(
-    'Warm Simulator cleanup did not finish; the Simulator cannot be used.'
-  );
-});
-
-it('waits until the launcher records that cleanup finished', async () => {
-  await writeStateAsync({ status: 'ready' });
-  let finished = false;
-  const waiting = waitForWarmSimulatorCleanupAsync({}, { pollMs: 5 }).then(() => {
-    finished = true;
-  });
-  await new Promise(resolve => setTimeout(resolve, 30));
-  expect(finished).toBe(false);
-  await writeStateAsync({ status: 'stopping' });
-  await new Promise(resolve => setTimeout(resolve, 30));
-  expect(finished).toBe(false);
-  await writeStateAsync({ status: 'disabled' });
-  await waiting;
-  expect(finished).toBe(true);
-});
-
-it('fails with the recorded error when cleanup does not finish in time', async () => {
-  await writeStateAsync({ status: 'stopping', error: 'serve-sim did not exit' });
-  await expect(waitForWarmSimulatorCleanupAsync({}, { timeoutMs: 20, pollMs: 5 })).rejects.toThrow(
-    'Warm Simulator cleanup did not finish (serve-sim did not exit); the Simulator cannot be used.'
-  );
-});
-
-it('stops waiting when the job is cancelled', async () => {
-  await writeStateAsync({ status: 'stopping' });
-  const controller = new AbortController();
-  const waiting = waitForWarmSimulatorCleanupAsync({}, { pollMs: 5, signal: controller.signal });
-  controller.abort(new Error('cancelled'));
-  await expect(waiting).rejects.toThrow('cancelled');
-});
-
-it('does not wait for a job that uses the warm Simulator', async () => {
-  await writeStateAsync({ status: 'claimed' });
-  await expect(
-    waitForWarmSimulatorCleanupAsync({ EAS_USE_WARM_SIMULATOR: '1' }, { timeoutMs: 0 })
-  ).resolves.toBeUndefined();
-});
-
-it('does nothing outside macOS', async () => {
-  Object.defineProperty(process, 'platform', { value: 'linux' });
-  await writeStateAsync({ status: 'ready' });
-  await expect(waitForWarmSimulatorCleanupAsync({}, { timeoutMs: 0 })).resolves.toBeUndefined();
-});

packages/build-tools/src/utils/installIsolatedNpmPackageAsync.ts

@@ -1,62 +0,0 @@
-import { type bunyan } from '@expo/logger';
-import spawn from '@expo/turtle-spawn';
-
-import { NpmCacheRegistryInstallError, isNpmCacheInstallFailure } from './npmCacheRegistry';
-import { Sentry } from '../sentry';
-
-export async function installIsolatedNpmPackageAsync({
-  packageSpec,
-  directory,
-  npmCacheUrl,
-  pathEnv,
-  logger,
-  signal,
-}: {
-  packageSpec: string;
-  directory: string;
-  npmCacheUrl: string | undefined;
-  pathEnv: string | undefined;
-  logger?: bunyan;
-  signal?: AbortSignal;
-}): Promise<void> {
-  const installAsync = async (registryUrl: string | undefined): Promise<void> => {
-    await spawn(
-      'npm',
-      [
-        'install',
-        '--prefix',
-        directory,
-        '--no-save',
-        '--package-lock=false',
-        '--no-audit',
-        '--no-fund',
-        '--no-update-notifier',
-        ...(registryUrl ? ['--registry', registryUrl] : []),
-        packageSpec,
-      ],
-      // npm reads the user config in $HOME from any cwd, so the install directory doubles as HOME.
-      { env: { PATH: pathEnv, HOME: directory }, logger, signal }
-    );
-  };
-
-  if (!npmCacheUrl) {
-    await installAsync(undefined);
-    return;
-  }
-  try {
-    await installAsync(npmCacheUrl);
-  } catch (error) {
-    signal?.throwIfAborted();
-    if (!isNpmCacheInstallFailure(error, npmCacheUrl)) {
-      throw error;
-    }
-    logger?.warn(
-      `Failed to install ${packageSpec} using the npm cache registry (${npmCacheUrl}). Retrying without the npm cache registry.`
-    );
-    Sentry.capture(new NpmCacheRegistryInstallError(error), {
-      level: 'warning',
-      extras: { packageSpec, npmCacheUrl },
-    });
-    await installAsync(undefined);
-  }
-}

packages/build-tools/src/utils/npmCacheRegistry.ts

@@ -1,20 +0,0 @@
-import { SystemError } from '@expo/eas-build-job';
-
-export function isNpmCacheInstallFailure(err: unknown, npmCacheUrl: string): boolean {
-  return getErrorOutput(err).includes(npmCacheUrl);
-}
-
-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');
-}
-
-export class NpmCacheRegistryInstallError extends SystemError {
-  override name = 'NpmCacheRegistryInstallError';
-  constructor(cause: unknown) {
-    super('Failed to install dependencies using npm cache registry', { cause });
-  }
-}

packages/build-tools/src/utils/npmrc.ts

@@ -1,56 +1,23 @@
+import { Job } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
-import spawn from '@expo/turtle-spawn';
 import fs from 'fs-extra';
 import path from 'path';
 
 import { findPackagerRootDir } from './packageManager';
-import { NpmrcAuthTokenLine, NpmrcTemplate } from '../templates/npmrc';
+import { BuildContext } from '../context';
+import { NpmrcTemplate } from '../templates/npmrc';
 
-export async function setUpNpmrcAsync({
-  projectTargetDirectory,
-  workingDirectory,
-  env,
-  logger,
-}: {
-  projectTargetDirectory: string;
-  workingDirectory: string;
-  env: Record<string, string | undefined>;
-  logger: bunyan;
-}): Promise<void> {
-  if (!env.NPM_TOKEN) {
-    await logIfNpmrcExistsAsync(projectTargetDirectory, workingDirectory, logger);
-    return;
-  }
-  logger.info('We detected that you set the NPM_TOKEN environment variable');
-  // pnpm 10.34.2+ and 11.5.3+ ignore ${NPM_TOKEN} placeholders in a project-level .npmrc but expand them in ~/.npmrc
-  if (env.EAS_BUILD_RUNNER === 'eas-build') {
-    await addNpmTokenToUserNpmrcAsync(workingDirectory, env, logger);
+export async function setUpNpmrcAsync(ctx: BuildContext<Job>, logger: bunyan): Promise<void> {
+  if (ctx.env.NPM_TOKEN) {
+    await createNpmrcIfNotExistsAsync(ctx, logger);
   } else {
-    await createProjectNpmrcIfNotExistsAsync(projectTargetDirectory, logger);
+    await logIfNpmrcExistsAsync(ctx, logger);
   }
 }
 
-async function addNpmTokenToUserNpmrcAsync(
-  workingDirectory: string,
-  env: Record<string, string | undefined>,
-  logger: bunyan
-): Promise<void> {
-  const userNpmrcPath = (
-    await spawn('npm', ['config', 'get', 'userconfig'], {
-      cwd: findPackagerRootDir(workingDirectory),
-      env,
-      stdio: 'pipe',
-    })
-  ).stdout.trim();
-  logger.info(`Adding "${NpmrcAuthTokenLine}" to ${userNpmrcPath}`);
-  await fs.appendFile(userNpmrcPath, `\n${NpmrcAuthTokenLine}\n`);
-}
-
-async function createProjectNpmrcIfNotExistsAsync(
-  projectTargetDirectory: string,
-  logger: bunyan
-): Promise<void> {
-  const projectNpmrcPath = path.join(projectTargetDirectory, '.npmrc');
+async function createNpmrcIfNotExistsAsync(ctx: BuildContext<Job>, logger: bunyan): Promise<void> {
+  logger.info('We detected that you set the NPM_TOKEN environment variable');
+  const projectNpmrcPath = path.join(ctx.buildDirectory, '.npmrc');
   if (await fs.pathExists(projectNpmrcPath)) {
     logger.info('.npmrc already exists in your project directory, skipping generation');
   } else {
@@ -60,13 +27,12 @@ async function createProjectNpmrcIfNotExistsAsync(
   }
 }
 
-async function logIfNpmrcExistsAsync(
-  projectTargetDirectory: string,
-  workingDirectory: string,
-  logger: bunyan
-): Promise<void> {
-  const projectNpmrcPath = path.join(findPackagerRootDir(workingDirectory), '.npmrc');
+async function logIfNpmrcExistsAsync(ctx: BuildContext<Job>, logger: bunyan): Promise<void> {
+  const projectNpmrcPath = path.join(
+    findPackagerRootDir(ctx.getReactNativeProjectDirectory()),
+    '.npmrc'
+  );
   if (await fs.pathExists(projectNpmrcPath)) {
-    logger.info(`.npmrc found at ${path.relative(projectTargetDirectory, projectNpmrcPath)}`);
+    logger.info(`.npmrc found at ${path.relative(ctx.buildDirectory, projectNpmrcPath)}`);
   }
 }

packages/build-tools/src/utils/packageManager.ts

@@ -1,4 +1,5 @@
 import { errors } from '@expo/eas-build-job';
+import { type bunyan } from '@expo/logger';
 import * as PackageManagerUtils from '@expo/package-manager';
 import { type BuildStepEnv } from '@expo/steps';
 import spawnAsync from '@expo/turtle-spawn';
@@ -125,6 +126,34 @@ export function resolvePackageInstall(
   }
 }
 
+/**
+ * Get the version of a package from the dist-tags.
+ * Returns null if the version cannot be resolved.
+ */
+export async function resolvePackageVersionAsync({
+  logger,
+  packageName,
+  distTag,
+}: {
+  logger: bunyan;
+  packageName: string;
+  distTag: string;
+}): Promise<string | null> {
+  try {
+    const { stdout } = await spawnAsync('npm', ['view', packageName, 'dist-tags', '--json'], {
+      stdio: 'pipe',
+    });
+    const distTags = JSON.parse(stdout);
+    if (distTag in distTags) {
+      return distTags[distTag];
+    }
+  } catch (e: unknown) {
+    const message = e instanceof Error ? e.message : String(e);
+    logger.warn(`Unable to resolve version for ${packageName}@${distTag}: ${message}`);
+  }
+  return null;
+}
+
 export function findPackagerRootDir(currentDir: string): string {
   return PackageManagerUtils.resolveWorkspaceRoot(currentDir) ?? currentDir;
 }

packages/build-tools/src/utils/upterm.ts

@@ -37,9 +37,11 @@ const CONNECTION_STARTUP_TIMEOUT_MS = 60_000;
 const PROCESS_EXIT_TIMEOUT_MS = 5_000;
 const CLIENT_COUNT_READ_ATTEMPTS = 4;
 const CLIENT_COUNT_READ_RETRY_MS = 500;
+const DEFAULT_SSH_PORT = '22';
 
 export type SshConnectionConfig = {
   type: 'upterm-v1';
+  host: string;
   secret: string;
 };
 
@@ -53,10 +55,30 @@ export type UptermHost = {
 
 const UptermSessionJsonZ = z.object({
   sessionId: z.string().min(1),
+  host: z.string().min(1),
   clientCount: z.number().optional(),
 });
 type UptermSessionJson = z.infer<typeof UptermSessionJsonZ>;
 
+export function connectionConfigFromUptermSession(
+  parsed: Pick<UptermSessionJson, 'sessionId' | 'host'>
+): SshConnectionConfig | null {
+  let host = parsed.host;
+  if (host.includes('://')) {
+    let url: URL;
+    try {
+      url = new URL(host);
+    } catch {
+      return null;
+    }
+    host = url.port && url.port !== DEFAULT_SSH_PORT ? `${url.hostname}:${url.port}` : url.hostname;
+  }
+  if (!host) {
+    return null;
+  }
+  return { type: 'upterm-v1', host, secret: parsed.sessionId };
+}
+
 /**
  * Strip upterm session secrets out of text before it reaches a log or an error message. upterm
  * prints the session id as the userinfo of the connect line it advertises
@@ -174,7 +196,10 @@ async function waitForConnectionConfigAsync(
     if (adminSocketPath) {
       const session = await readCurrentSessionJsonAsync(uptermPath, adminSocketPath);
       if (session) {
-        return { type: 'upterm-v1', secret: session.sessionId };
+        const connectionConfig = connectionConfigFromUptermSession(session);
+        if (connectionConfig) {
+          return connectionConfig;
+        }
       }
     }
     if (Date.now() >= deadline) {

packages/build-tools/src/utils/warmSimulatorCleanup.ts

@@ -1,61 +0,0 @@
-import { SystemError } from '@expo/eas-build-job';
-import spawn from '@expo/turtle-spawn';
-import { existsSync } from 'node:fs';
-import fs from 'node:fs/promises';
-import { setTimeout as sleepAsync } from 'node:timers/promises';
-
-const LAUNCHER_STATE_FILE = '/tmp/expo-simulator-startup.json';
-const STARTUP_SCRIPT = '/usr/local/share/vm-tools/startup.sh';
-
-/**
- * The worker stops warmup in the background for a job that does not use the warm Simulator. Wait
- * here, before the job changes a Simulator, until the launcher records that its cleanup finished.
- */
-export async function waitForWarmSimulatorCleanupAsync(
-  env: NodeJS.ProcessEnv,
-  {
-    timeoutMs = 150_000,
-    pollMs = 250,
-    signal,
-  }: { timeoutMs?: number; pollMs?: number; signal?: AbortSignal } = {}
-): Promise<void> {
-  if (process.platform !== 'darwin' || env.EAS_USE_WARM_SIMULATOR === '1') {
-    return;
-  }
-  const deadline = Date.now() + timeoutMs;
-  let bootUuid: string | undefined;
-  for (;;) {
-    signal?.throwIfAborted();
-    let state: { status?: unknown; error?: unknown; bootUuid?: unknown };
-    try {
-      state = JSON.parse(await fs.readFile(LAUNCHER_STATE_FILE, 'utf8'));
-    } catch (error) {
-      if ((error as NodeJS.ErrnoException).code === 'ENOENT' && !existsSync(STARTUP_SCRIPT)) {
-        return;
-      }
-      // Warmup may still be loading; only disabled confirms cleanup on an enabled VM.
-      state = {};
-    }
-    if (state.status === 'disabled' && typeof state.bootUuid === 'string') {
-      bootUuid ??= (
-        await spawn('/usr/sbin/sysctl', ['-n', 'kern.bootsessionuuid'], {
-          signal,
-          timeout: Math.max(1, deadline - Date.now()),
-        })
-      ).stdout.trim();
-      if (!bootUuid) {
-        throw new SystemError('Could not read the current VM boot ID.');
-      }
-      if (state.bootUuid === bootUuid) {
-        return;
-      }
-    }
-    if (Date.now() >= deadline) {
-      throw new SystemError(
-        `Warm Simulator cleanup did not finish${typeof state.error === 'string' ? ` (${state.error})` : ''}; the Simulator cannot be used.`
-      );
-    }
-    // The signal is checked at each poll, so a cancelled job stops within one interval.
-    await sleepAsync(pollMs);
-  }
-}

packages/create-eas-build-function/CHANGELOG.md

@@ -1,25 +1,5 @@
 # create-eas-build-function
 
-## 27.3.0
-
-No changes in this release.
-
-## 27.2.0
-
-No changes in this release.
-
-## 27.1.0
-
-No changes in this release.
-
-## 27.0.0
-
-No changes in this release.
-
-## 26.0.0
-
-No changes in this release.
-
 ## 25.3.0
 
 No changes in this release.

packages/create-eas-build-function/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-eas-build-function",
-  "version": "27.3.0",
+  "version": "25.3.0",
   "description": "Create functions for use in EAS Build custom builds.",
   "keywords": [
     "expo",
@@ -35,7 +35,7 @@
     "clean": "rimraf ./build/ \"*.tsbuildinfo\""
   },
   "dependencies": {
-    "@expo/steps": "27.3.0"
+    "@expo/steps": "25.3.0"
   },
   "devDependencies": {
     "@expo/package-manager": "1.9.10",

packages/downloader/CHANGELOG.md

@@ -1,25 +1,5 @@
 # @expo/downloader
 
-## 27.3.0
-
-No changes in this release.
-
-## 27.2.0
-
-No changes in this release.
-
-## 27.1.0
-
-No changes in this release.
-
-## 27.0.0
-
-No changes in this release.
-
-## 26.0.0
-
-No changes in this release.
-
 ## 25.3.0
 
 No changes in this release.

packages/downloader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/downloader",
-  "version": "27.3.0",
+  "version": "25.3.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <[email protected]>",

packages/eas-build-cache-provider/CHANGELOG.md

@@ -1,25 +1,5 @@
 # eas-build-cache-provider
 
-## 27.3.0
-
-No changes in this release.
-
-## 27.2.0
-
-No changes in this release.
-
-## 27.1.0
-
-No changes in this release.
-
-## 27.0.0
-
-No changes in this release.
-
-## 26.0.0
-
-No changes in this release.
-
 ## 25.3.0
 
 No changes in this release.

packages/eas-build-cache-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eas-build-cache-provider",
-  "version": "27.3.0",
+  "version": "25.3.0",
   "description": "A build cache provider plugin for the Expo CLI",
   "homepage": "https://github.com/expo/eas-cli",
   "bugs": "https://github.com/expo/eas-cli/issues",

packages/eas-build-job/CHANGELOG.md

@@ -1,33 +1,5 @@
 # @expo/eas-build-job
 
-## 27.3.0
-
-### Minor Changes
-
-- Add optional Observe error context to workflow jobs. ([#4787](https://github.com/expo/eas-cli/pull/4787) by [@AbbanMustafa](https://github.com/AbbanMustafa))
-
-## 27.2.0
-
-No changes in this release.
-
-## 27.1.0
-
-No changes in this release.
-
-## 27.0.0
-
-No changes in this release.
-
-## 26.0.0
-
-### Major Changes
-
-- Remove legacy artifact type exports and route workflow uploads through workflow storage without file-type categories. Preserve workflow uploads and Maestro reports. ([#4719](https://github.com/expo/eas-cli/pull/4719) by [@sjchmiela](https://github.com/sjchmiela))
-
-### Minor Changes
-
-- Export `validateAndroidLaunchOptions` and `quoteAndroidShellCommand` from `@expo/eas-build-job`, so Android launch arguments can be checked for NUL characters and length before a simulator session starts, and check them before the emulator boots in agent-device sessions. ([#4696](https://github.com/expo/eas-cli/pull/4696) by [@brentvatne](https://github.com/brentvatne))
-
 ## 25.3.0
 
 No changes in this release.

packages/eas-build-job/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/eas-build-job",
-  "version": "27.3.0",
+  "version": "25.3.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "MIT",
   "author": "Expo <[email protected]>",
@@ -25,9 +25,9 @@
     "clean": "rimraf node_modules dist coverage \"*.tsbuildinfo\""
   },
   "dependencies": {
-    "@expo/logger": "27.3.0",
+    "@expo/logger": "25.3.0",
     "@expo/results": "1.0.0",
-    "@expo/turtle-spawn": "27.3.0",
+    "@expo/turtle-spawn": "25.3.0",
     "joi": "^17.13.1",
     "semver": "^7.6.2",
     "zod": "^4.3.5"

packages/eas-build-job/src/__tests__/common.test.ts

@@ -871,7 +871,7 @@ describe('StaticWorkflowInterpolationContextZ', () => {
 });
 
 describe('GitHub context event payload passthrough', () => {
-  it('accepts arbitrary fields at all event levels', () => {
+  it('preserves webhook fields and validates documented pull request details', () => {
     const context = {
       after: {},
       needs: {},
@@ -895,7 +895,19 @@ describe('GitHub context event payload passthrough', () => {
           },
           pull_request: {
             number: 123,
+            title: 'Fix the build',
+            body: null,
+            state: 'open',
             draft: true,
+            merged: false,
+            html_url: 'https://github.com/expo/expo/pull/123',
+            user: { login: 'octocat', id: 1 },
+            labels: [{ name: 'bug', color: 'red' }],
+            head: { ref: 'fix-build', sha: 'abc123', repo: { name: 'expo' } },
+            base: { ref: 'main', sha: 'def456' },
+            created_at: '2026-10-01T00:00:00Z',
+            updated_at: '2026-10-02T00:00:00Z',
+            merged_at: null,
           },
           number: 123,
           schedule: '0 0 * * *',
@@ -921,6 +933,34 @@ describe('GitHub context event payload passthrough', () => {
     const parsed = StaticWorkflowInterpolationContextZ.parse(context);
 
     expect(parsed.github?.event).toMatchObject(context.github.event);
+    expect(() =>
+      StaticWorkflowInterpolationContextZ.parse({
+        ...context,
+        github: {
+          ...context.github,
+          event: {
+            ...context.github.event,
+            pull_request: { ...context.github.event.pull_request, title: 123 },
+          },
+        },
+      })
+    ).toThrow();
+  });
+
+  it.each([
+    { number: 123 },
+    { number: 123, body: null, user: null, merged: null, merged_at: null },
+  ])('accepts partial pull request payloads: %j', pullRequest => {
+    const github = {
+      event_name: 'pull_request',
+      sha: 'abc123',
+      ref: 'refs/heads/main',
+      ref_name: 'main',
+      ref_type: 'branch',
+      event: { pull_request: pullRequest },
+    };
+
+    expect(StaticWorkflowInterpolationContextZ.shape.github.parse(github)).toEqual(github);
   });
 });
 

packages/eas-build-job/src/__tests__/observeContext.test.ts

@@ -1,95 +0,0 @@
-import { ArchiveSourceType, BuildTrigger, StaticWorkflowInterpolationContextZ } from '../common';
-import { Generic } from '../generic';
-
-function createContext() {
-  return {
-    after: {},
-    needs: {},
-    workflow: {
-      id: 'workflow-id',
-      name: 'Investigate error',
-      filename: 'observe.yml',
-      url: 'https://expo.dev/accounts/example/workflows/workflow-id',
-    },
-    app: { id: '123e4567-e89b-42d3-a456-426614174000', slug: 'example' },
-    account: { id: 'account-id', name: 'example' },
-    observe: {
-      event: {
-        id: '123e4567-e89b-42d3-a456-426614174001',
-        type: 'new_error' as const,
-        occurredAt: '2026-10-29T12:00:00.000Z',
-        appId: '123e4567-e89b-42d3-a456-426614174000',
-        fingerprint: { value: 'error-fingerprint', version: 'v1' },
-        severity: 'fatal' as const,
-        environment: 'production',
-        platform: 'ios' as const,
-        deviceOs: 'iOS',
-        exception: { type: 'Error', message: 'Example error' },
-      },
-    },
-  };
-}
-
-describe('Observe workflow context', () => {
-  it('preserves the event when validating a generic job', () => {
-    const context = createContext();
-    const job = {
-      projectArchive: { type: ArchiveSourceType.GIT, gitCommitHash: 'abc123', gitRef: null },
-      steps: [{ run: 'echo "${{ observe.event.exception.message }}"', shell: 'sh' }],
-      secrets: { robotAccessToken: 'token', environmentSecrets: [] },
-      expoDevUrl: context.workflow.url,
-      builderEnvironment: { image: 'ubuntu', env: {} },
-      triggeredBy: BuildTrigger.GIT_BASED_INTEGRATION,
-      appId: context.app.id,
-      initiatingUserId: '123e4567-e89b-42d3-a456-426614174002',
-      workflowInterpolationContext: context,
-    };
-
-    const parsed = Generic.JobZ.parse(job);
-
-    expect(parsed.workflowInterpolationContext).toEqual(context);
-  });
-
-  it('accepts nullable event metadata and an omitted device OS', () => {
-    const context = createContext();
-    const nullableContext = {
-      ...context,
-      observe: {
-        event: {
-          ...context.observe.event,
-          fingerprint: { value: 'error-fingerprint', version: null },
-          severity: 'error',
-          environment: null,
-          platform: null,
-          deviceOs: undefined,
-          exception: { type: null, message: null },
-        },
-      },
-    };
-
-    expect(StaticWorkflowInterpolationContextZ.parse(nullableContext)).toEqual(nullableContext);
-  });
-
-  it('preserves additional event fields from a newer producer', () => {
-    const context = createContext();
-    const extendedContext = {
-      ...context,
-      observe: {
-        ...context.observe,
-        event: {
-          ...context.observe.event,
-          additionalMetadata: 'future value',
-          exception: { ...context.observe.event.exception, stacktrace: 'future stack trace' },
-        },
-      },
-    };
-
-    expect(StaticWorkflowInterpolationContextZ.parse(extendedContext)).toEqual(extendedContext);
-  });
-
-  it('rejects an Observe context without an event', () => {
-    expect(
-      StaticWorkflowInterpolationContextZ.safeParse({ ...createContext(), observe: {} }).success
-    ).toBe(false);
-  });
-});

packages/eas-build-job/src/common.ts

@@ -207,6 +207,7 @@ const GitHubContextZ = z.object({
     .record(z.string(), z.unknown())
     .and(
       z.object({
+        action: z.string().optional(),
         label: z
           .looseObject({
             name: z.string(),
@@ -221,6 +222,19 @@ const GitHubContextZ = z.object({
         pull_request: z
           .looseObject({
             number: z.number(),
+            title: z.string().optional(),
+            body: z.string().nullable().optional(),
+            state: z.enum(['open', 'closed']).optional(),
+            draft: z.boolean().optional(),
+            merged: z.boolean().nullable().optional(),
+            html_url: z.string().optional(),
+            user: z.looseObject({ login: z.string() }).nullable().optional(),
+            labels: z.array(z.looseObject({ name: z.string() })).optional(),
+            head: z.looseObject({ ref: z.string(), sha: z.string() }).optional(),
+            base: z.looseObject({ ref: z.string(), sha: z.string() }).optional(),
+            created_at: z.string().optional(),
+            updated_at: z.string().optional(),
+            merged_at: z.string().nullable().optional(),
           })
           .optional(),
         number: z.number().optional(),
@@ -344,24 +358,6 @@ const SentryContextZ = z.looseObject({
   resolution_type: z.string().optional(),
 });
 
-const ObserveContextZ = z.looseObject({
-  event: z.looseObject({
-    id: z.uuid(),
-    type: z.literal('new_error'),
-    occurredAt: z.iso.datetime(),
-    appId: z.uuid(),
-    fingerprint: z.looseObject({
-      value: z.string().min(1),
-      version: z.string().min(1).nullable(),
-    }),
-    severity: z.enum(['fatal', 'error']),
-    environment: z.string().nullable(),
-    platform: z.enum(['ios', 'android']).nullable(),
-    deviceOs: z.string().optional(),
-    exception: z.looseObject({ type: z.string().nullable(), message: z.string().nullable() }),
-  }),
-});
-
 export const StaticWorkflowInterpolationContextZ = z.object({
   after: z.record(
     z.string(),
@@ -399,7 +395,6 @@ export const StaticWorkflowInterpolationContextZ = z.object({
   app_store_connect: AppStoreConnectContextZ.optional(),
   // We need to .optional() to support jobs that are not triggered by a Sentry event.
   sentry: SentryContextZ.optional(),
-  observe: ObserveContextZ.optional(),
 });
 
 export type StaticWorkflowInterpolationContext = z.infer<

packages/eas-cli/CHANGELOG.md

@@ -1,69 +1,5 @@
 # eas-cli
 
-## 27.3.0
-
-### Patch Changes
-
-- Bump `@expo/apple-utils` to `2.3.0` to fix iOS capability sync when App Store Connect rejects enabling, disabling or changing a capability. ([#4790](https://github.com/expo/eas-cli/pull/4790) by [@douglowder](https://github.com/douglowder))
-- Keep already linked App Groups, Merchant IDs and iCloud containers when capability sync links another identifier. ([#4584](https://github.com/expo/eas-cli/pull/4584) by [@ceydaakin](https://github.com/ceydaakin))
-
-## 27.2.0
-
-### Minor Changes
-
-- Add an experiment that suggests Expo Update to coding agents after a build when the Free plan account is within 5 builds of the platform limit. ([#4758](https://github.com/expo/eas-cli/pull/4758) by [@williamgrosset](https://github.com/williamgrosset))
-- Add `eas observe:traces` to list request trace spans (or a summary of span names and counts), `eas observe:trace` to display one trace as a span tree, and span rows in the `eas observe:session` timeline. ([#4772](https://github.com/expo/eas-cli/pull/4772) by [@kadikraman](https://github.com/kadikraman))
-- Show a one-time Expo Simulators hint after a successful build. ([#4768](https://github.com/expo/eas-cli/pull/4768) by [@FiberJW](https://github.com/FiberJW))
-
-### Patch Changes
-
-- Remove the Free plan build limit guidance experiment for coding agents from `eas build`. ([#4757](https://github.com/expo/eas-cli/pull/4757) by [@williamgrosset](https://github.com/williamgrosset))
-
-## 27.1.0
-
-### Minor Changes
-
-- Display queued workflow runs: `workflow:run --wait` and `workflow:status` show a run waiting for its concurrency group and the run blocking it, and `workflow:cancel` includes queued runs in its selection list. ([#4258](https://github.com/expo/eas-cli/pull/4258) by [@hSATAC](https://github.com/hSATAC))
-- Upload the workflow files that `uses` jobs reference, including nested ones, when running a local workflow file with `eas workflow:run`. ([#4769](https://github.com/expo/eas-cli/pull/4769) by [@sswrk](https://github.com/sswrk))
-
-### Patch Changes
-
-- Fail the command when EAS CLI cannot pull environment variables from EAS servers, instead of continuing without them. ([#4774](https://github.com/expo/eas-cli/pull/4774) by [@wschurman](https://github.com/wschurman))
-- Format the generated root changelog before committing a release. ([#4773](https://github.com/expo/eas-cli/pull/4773) by [@gwdp](https://github.com/gwdp))
-- Honor the `--non-interactive` flag in `workflow:cancel`; it was parsed but never applied, so automation could hang on the interactive picker. ([#4258](https://github.com/expo/eas-cli/pull/4258) by [@hSATAC](https://github.com/hSATAC))
-- Stop reporting a finish time for workflow runs that have not finished: `workflow:runs` reports `finishedAt` only for runs in a final status. ([#4258](https://github.com/expo/eas-cli/pull/4258) by [@hSATAC](https://github.com/hSATAC))
-
-## 27.0.0
-
-### Major Changes
-
-- Write the reason a command failed to stderr, next to the `command failed.` line, instead of to stdout. A program that reads the reason from stdout must read stderr instead. ([#4592](https://github.com/expo/eas-cli/pull/4592) by [@vonovak](https://github.com/vonovak))
-
-### Minor Changes
-
-- Send the `permissions.account.role` from the build profile to request a role for the build's `EXPO_TOKEN`. ([#4734](https://github.com/expo/eas-cli/pull/4734) by [@wschurman](https://github.com/wschurman))
-- Add `simulator:logs` to read and follow logs from an iOS simulator session and download saved logs after it stops. ([#4545](https://github.com/expo/eas-cli/pull/4545) by [@gwdp](https://github.com/gwdp))
-
-### Patch Changes
-
-- Show permission guidance, including `permissions.account.role` in eas.json, when a build request fails with an authorization error. ([#4760](https://github.com/expo/eas-cli/pull/4760) by [@wschurman](https://github.com/wschurman))
-- Print the notice about eas-cli in project dependencies only when stderr is a terminal, so programs that read stderr get the command's error. ([#4591](https://github.com/expo/eas-cli/pull/4591) by [@vonovak](https://github.com/vonovak))
-- Show account roles and credential permission limits in `eas login` when you are already logged in. ([#4759](https://github.com/expo/eas-cli/pull/4759) by [@wschurman](https://github.com/wschurman))
-- Fix simulator control action help routing and show help when a flag is incomplete. ([#4681](https://github.com/expo/eas-cli/pull/4681) by [@gwdp](https://github.com/gwdp))
-- Require explicit `host:` simulator-host upload paths and report missing local files. ([#4683](https://github.com/expo/eas-cli/pull/4683) by [@gwdp](https://github.com/gwdp))
-
-  Missing local absolute paths now require the `host:` prefix. Actions that require upload IDs accept local files and reject host paths with an explanation.
-
-## 26.0.0
-
-### Patch Changes
-
-- Regenerate graphql code. ([#4692](https://github.com/expo/eas-cli/pull/4692) by [@wschurman](https://github.com/wschurman))
-- Read the app config fewer times in `eas build` and other project commands. An iOS build now runs `expo config` 2 times instead of 6. ([`78ba760`](https://github.com/expo/eas-cli/commit/78ba76001b67c9971236af1a1d02e46c2f82d24a) by [@vonovak](https://github.com/vonovak))
-- Share one GraphQL client between the project ID check and the command, so commands send one fewer app query. ([#4646](https://github.com/expo/eas-cli/pull/4646) by [@vonovak](https://github.com/vonovak))
-- Show why a simulator session failed in `eas simulator:get`, and add an `errors` array to its `--json` output. For an unknown error, `simulator:start` and `simulator:get` now show the failed step's error from the session logs. ([#4694](https://github.com/expo/eas-cli/pull/4694) by [@brentvatne](https://github.com/brentvatne))
-- Show why a simulator session failed in `eas simulator:start`, such as an unknown `--device` name, instead of only the session status. ([#4693](https://github.com/expo/eas-cli/pull/4693) by [@brentvatne](https://github.com/brentvatne))
-
 ## 25.3.0
 
 ### Minor Changes