[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/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,87 +2,6 @@
 
 This is the log of notable changes to EAS CLI and related packages.
 
-## [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": "26.0.0",
-  "PRODUCTION": "26.0.0"
+  "STAGING": "25.3.0",
+  "PRODUCTION": "25.3.0"
 }

lerna.json

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

packages/build-tools/CHANGELOG.md

@@ -1,43 +1,5 @@
 # @expo/build-tools
 
-## 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.1.0",
+  "version": "25.3.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <[email protected]>",
@@ -42,17 +42,17 @@
   "dependencies": {
     "@expo/config": "55.0.10",
     "@expo/config-plugins": "55.0.7",
-    "@expo/downloader": "27.1.0",
-    "@expo/eas-build-job": "27.1.0",
+    "@expo/downloader": "25.3.0",
+    "@expo/eas-build-job": "25.3.0",
     "@expo/env": "^0.4.0",
-    "@expo/logger": "27.1.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.1.0",
-    "@expo/template-file": "27.1.0",
-    "@expo/turtle-spawn": "27.1.0",
+    "@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",

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/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/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);
@@ -434,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',
     });
@@ -521,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__/uploadToAsc.test.ts

@@ -1,15 +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,
   isMissingPurposeStringError,
-  isRedundantBinaryUploadError,
   isSdkVersionIssueError,
   parseMissingUsageDescriptionKeys,
 } from '../uploadToAsc';
@@ -53,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);
@@ -132,62 +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();
-    }
-  });
-});

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

@@ -225,7 +225,7 @@ export async function runAgentDeviceRemoteSessionAsync(
     tasks.signal.throwIfAborted();
     logger.info(tasks.summary());
 
-    const sessionStart = await uploadRemoteSessionConfigWithLocalEgressAsync({
+    await uploadRemoteSessionConfigWithLocalEgressAsync({
       env,
       signal,
       ctx,
@@ -239,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(),
@@ -226,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',
@@ -246,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,
@@ -288,7 +278,7 @@ export function createStartAppiumRemoteSessionBuildFunction(
           authtoken: ngrokAuthtoken,
         });
 
-        const sessionStart = await uploadRemoteSessionConfigWithLocalEgressAsync({
+        await uploadRemoteSessionConfigWithLocalEgressAsync({
           env,
           signal,
           ctx,
@@ -306,9 +296,6 @@ export function createStartAppiumRemoteSessionBuildFunction(
           },
           logger,
         });
-        if (sessionStart === 'stopped') {
-          return;
-        }
 
         await waitForDeviceRunSessionStoppedAsync({
           ctx,

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

@@ -360,7 +360,7 @@ export function createStartArgentRemoteSessionBuildFunction(
             : 'Private preview URL unavailable for this session.'
         );
 
-        const sessionStart = await uploadRemoteSessionConfigWithLocalEgressAsync({
+        await uploadRemoteSessionConfigWithLocalEgressAsync({
           env,
           signal,
           ctx,
@@ -374,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,19 +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 (isInvalidBundleIdentifierError(errors)) {
             const ipaInfoResult = await asyncResult(readIpaInfoAsync(ipaPath));
             const ipaBundleIdentifier = ipaInfoResult.ok
@@ -357,10 +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 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/__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

@@ -170,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
@@ -411,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(
@@ -638,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

@@ -1413,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>();
@@ -1468,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();
   }
 );
 
@@ -1684,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(
@@ -1699,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/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/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

@@ -577,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;
@@ -670,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 });
           }
@@ -711,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 {
@@ -750,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', {

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/remoteDeviceRunSession.ts

@@ -31,7 +31,6 @@ import { createProcessOutput } from './processOutput';
 import { withDeviceRunSessionTimeoutAsync } from './deviceRunSessionTimeout';
 import {
   type DeviceRunSessionStatus,
-  DeviceRunSessionWorkerApiError,
   requireDeviceRunSessionWorkerApi,
 } from './deviceRunSessionWorkerApi';
 
@@ -555,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}).`
   );
@@ -565,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)

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/__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/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/create-eas-build-function/CHANGELOG.md

@@ -1,17 +1,5 @@
 # create-eas-build-function
 
-## 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.1.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.1.0"
+    "@expo/steps": "25.3.0"
   },
   "devDependencies": {
     "@expo/package-manager": "1.9.10",

packages/downloader/CHANGELOG.md

@@ -1,17 +1,5 @@
 # @expo/downloader
 
-## 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.1.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,17 +1,5 @@
 # eas-build-cache-provider
 
-## 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.1.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,23 +1,5 @@
 # @expo/eas-build-job
 
-## 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.1.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.1.0",
+    "@expo/logger": "25.3.0",
     "@expo/results": "1.0.0",
-    "@expo/turtle-spawn": "27.1.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/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(),

packages/eas-cli/CHANGELOG.md

@@ -1,50 +1,5 @@
 # eas-cli
 
-## 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

packages/eas-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eas-cli",
-  "version": "27.1.0",
+  "version": "25.3.0",
   "description": "EAS command line tool",
   "keywords": [
     "cli",
@@ -48,12 +48,12 @@
     "@expo/code-signing-certificates": "0.0.5",
     "@expo/config": "55.0.10",
     "@expo/config-plugins": "55.0.7",
-    "@expo/eas-build-job": "27.1.0",
-    "@expo/eas-json": "27.1.0",
+    "@expo/eas-build-job": "25.3.0",
+    "@expo/eas-json": "25.3.0",
     "@expo/env": "^1.0.0",
     "@expo/experimentation": "0.0.5",
     "@expo/json-file": "8.3.3",
-    "@expo/logger": "27.1.0",
+    "@expo/logger": "25.3.0",
     "@expo/multipart-body-parser": "2.0.0",
     "@expo/osascript": "2.1.4",
     "@expo/package-manager": "1.9.10",
@@ -65,7 +65,7 @@
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "27.1.0",
+    "@expo/steps": "25.3.0",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "^4.8.3",
     "@oclif/plugin-autocomplete": "^3.2.40",

packages/eas-cli/src/__tests__/commands/utils.ts

@@ -198,28 +198,6 @@ export function getMockEmptyWorkflowRunsFragment(): WorkflowRunFragment[] {
   return getMockWorkflowRunsFragment();
 }
 
-export function getMockWorkflowRunFragment(
-  status: WorkflowRunStatus,
-  overrides?: Partial<WorkflowRunFragment>
-): WorkflowRunFragment {
-  return {
-    id: `run-${status}`,
-    status,
-    triggerEventType: WorkflowRunTriggerEventType.Manual,
-    errors: [],
-    createdAt: '2022-01-01T00:00:00.000Z',
-    updatedAt: '2022-01-01T00:00:00.000Z',
-    gitCommitHash: '1234567890',
-    gitCommitMessage: 'commit message',
-    workflow: {
-      name: 'build',
-      id: 'build',
-      fileName: 'build.yml',
-    },
-    ...overrides,
-  };
-}
-
 export function getMockWorkflowRunsFragment(
   params?:
     | undefined
@@ -262,7 +240,6 @@ export function getMockWorkflowRunsFragment(
       status: WorkflowRunStatus.Failure,
       createdAt: '2022-01-01T00:00:00.000Z',
       updatedAt: '2022-01-01T00:00:00.000Z',
-      finalizedAt: '2022-01-01T00:00:00.000Z',
       gitCommitHash: '1234567890',
       gitCommitMessage: 'commit message',
       workflow: {
@@ -355,7 +332,6 @@ export function getMockWorkflowRunWithJobsFragment(
         id: mockProjectId,
         __typename: 'App',
         name: 'App',
-        slug: 'app',
         ownerAccount: {
           id: 'account-id',
           name: 'account-name',
@@ -388,7 +364,6 @@ export function getMockWorkflowRunWithBuildJobsFragment(
         id: mockProjectId,
         __typename: 'App',
         name: 'App',
-        slug: 'app',
         ownerAccount: {
           id: 'account-id',
           name: 'account-name',

packages/eas-cli/src/__tests__/commands/workflow-cancel-test.ts

@@ -1,88 +0,0 @@
-import {
-  getMockWorkflowRunFragment,
-  mockCommandContext,
-  mockProjectId,
-  mockTestCommand,
-} from './utils';
-import WorkflowRunCancel from '../../commands/workflow/cancel';
-import { WorkflowRunStatus } from '../../graphql/generated';
-import { WorkflowRunMutation } from '../../graphql/mutations/WorkflowRunMutation';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import { promptAsync } from '../../prompts';
-
-jest.mock('../../graphql/queries/AppQuery');
-jest.mock('../../graphql/mutations/WorkflowRunMutation');
-jest.mock('../../log');
-jest.mock('../../prompts');
-
-describe(WorkflowRunCancel, () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test('prompts with in-progress and queued runs and cancels the selected ones', async () => {
-    const ctx = mockCommandContext(WorkflowRunCancel, {
-      projectId: mockProjectId,
-    });
-    const inProgressRun = getMockWorkflowRunFragment(WorkflowRunStatus.InProgress);
-    const waitingRun = getMockWorkflowRunFragment(WorkflowRunStatus.Waiting);
-    jest
-      .mocked(AppQuery.byIdWorkflowRunsFilteredByStatusAsync)
-      .mockImplementation(async (_graphqlClient, _appId, status) =>
-        status === WorkflowRunStatus.InProgress ? [inProgressRun] : [waitingRun]
-      );
-    jest.mocked(promptAsync).mockResolvedValueOnce({ selectedRuns: [waitingRun.id] });
-
-    const cmd = mockTestCommand(WorkflowRunCancel, [], ctx);
-    await cmd.run();
-
-    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      WorkflowRunStatus.InProgress,
-      50
-    );
-    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      WorkflowRunStatus.Waiting,
-      50
-    );
-    const promptCall = jest.mocked(promptAsync).mock.calls[0][0] as any;
-    expect(promptCall.choices.map((choice: any) => choice.value)).toEqual([
-      inProgressRun.id,
-      waitingRun.id,
-    ]);
-    expect(WorkflowRunMutation.cancelWorkflowRunAsync).toHaveBeenCalledTimes(1);
-    expect(WorkflowRunMutation.cancelWorkflowRunAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      { workflowRunId: waitingRun.id }
-    );
-  });
-
-  test('throws in non-interactive mode when no run IDs are given', async () => {
-    const ctx = mockCommandContext(WorkflowRunCancel, {
-      projectId: mockProjectId,
-    });
-    const cmd = mockTestCommand(WorkflowRunCancel, ['--non-interactive'], ctx);
-    await expect(cmd.run()).rejects.toThrow(
-      'Must supply workflow run IDs as arguments when in non-interactive mode'
-    );
-    expect(promptAsync).not.toHaveBeenCalled();
-  });
-
-  test('cancels the given run IDs without prompting in non-interactive mode', async () => {
-    const ctx = mockCommandContext(WorkflowRunCancel, {
-      projectId: mockProjectId,
-    });
-    const cmd = mockTestCommand(WorkflowRunCancel, ['--non-interactive', 'run-id-1'], ctx);
-    await cmd.run();
-    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).not.toHaveBeenCalled();
-    expect(promptAsync).not.toHaveBeenCalled();
-    expect(WorkflowRunMutation.cancelWorkflowRunAsync).toHaveBeenCalledTimes(1);
-    expect(WorkflowRunMutation.cancelWorkflowRunAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      { workflowRunId: 'run-id-1' }
-    );
-  });
-});

packages/eas-cli/src/__tests__/commands/workflow-runs-test.ts

@@ -142,7 +142,6 @@ describe(WorkflowRunList, () => {
         triggerEventType: WorkflowRunTriggerEventType.Manual,
         createdAt: '2022-01-01T00:00:00.000Z',
         updatedAt: '2022-01-01T00:00:00.000Z',
-        finalizedAt: '2022-01-01T00:00:00.000Z',
         gitCommitHash: '1234567890',
         gitCommitMessage: 'commit message',
         errors: [],

packages/eas-cli/src/__tests__/fixtures/simulator-control-lifecycle.cjs

@@ -1,83 +0,0 @@
-const fs = require('node:fs');
-const path = require('node:path');
-const os = require('node:os');
-const { createRequire } = require('node:module');
-
-const root = fs.realpathSync(process.argv[2]);
-const cli = path.join(root, 'packages/eas-cli');
-const cliRequire = createRequire(path.join(cli, 'package.json'));
-cliRequire('ts-node').register({ project: path.join(cli, 'tsconfig.json'), transpileOnly: true });
-const { Config } = cliRequire('@oclif/core');
-const EasCommand = require(path.join(cli, 'src/commandUtils/EasCommand')).default;
-const Control = require(path.join(cli, 'src/commands/simulator/control')).default;
-const EasHelp = require(path.join(cli, 'src/help')).default;
-const cases = JSON.parse(process.argv[3]);
-const directory = fs.mkdtempSync(path.join(os.tmpdir(), 'eas-help-lifecycle-'));
-const events = [];
-globalThis.__helpLifecycleEvents = events;
-
-// Replace command work (auth/device I/O), keeping discovery, parsing and hooks real.
-EasCommand.prototype.run = async function () {
-  events.push({ event: 'run', id: this.id });
-};
-EasCommand.prototype.finally = async function () {};
-
-(async () => {
-  try {
-    fs.writeFileSync(
-      path.join(directory, 'package.json'),
-      JSON.stringify({
-        name: 'eas-help-lifecycle-fixture',
-        version: '1.0.0',
-        oclif: {
-          bin: 'eas',
-          commands: { strategy: 'explicit', target: './commands.cjs' },
-          hooks: { prerun: './prerun.cjs', postrun: './postrun.cjs' },
-        },
-      })
-    );
-    fs.writeFileSync(
-      path.join(directory, 'commands.cjs'),
-      `exports.default = { 'simulator:control': require(${JSON.stringify(path.join(cli, 'src/commands/simulator/control'))}).default };`
-    );
-    for (const event of ['prerun', 'postrun']) {
-      fs.writeFileSync(
-        path.join(directory, `${event}.cjs`),
-        `module.exports = async function({Command}) { globalThis.__helpLifecycleEvents.push({event:${JSON.stringify(event)},id:Command.id}); };`
-      );
-    }
-    process.env.XDG_DATA_HOME = directory;
-    process.env.XDG_CACHE_HOME = directory;
-    const config = await Config.load({ root: directory });
-    const results = [];
-    for (const args of cases) {
-      // Published manifests discover metadata without loading the command class.
-      // Clear eager discovery's assignment to exercise that cold-start boundary.
-      delete Control.id;
-      const start = events.length;
-      const write = process.stdout.write;
-      let stdout = '',
-        error;
-      process.stdout.write = (chunk, encoding, callback) => {
-        stdout += String(chunk);
-        const done = typeof encoding === 'function' ? encoding : callback;
-        done?.();
-        return true;
-      };
-      try {
-        await new EasHelp(config).showHelp(args);
-      } catch (err) {
-        error = err.message;
-      } finally {
-        process.stdout.write = write;
-      }
-      results.push({ stdout, events: events.slice(start), error });
-    }
-    console.log('LIFECYCLE_RESULT ' + JSON.stringify(results));
-  } finally {
-    fs.rmSync(directory, { recursive: true, force: true });
-  }
-})().catch(err => {
-  console.error(err);
-  process.exitCode = 1;
-});

packages/eas-cli/src/__tests__/help.lifecycle.test.ts

@@ -1,51 +0,0 @@
-import { execFile } from 'node:child_process';
-import path from 'node:path';
-import { promisify } from 'node:util';
-
-const execFileAsync = promisify(execFile);
-const root = path.resolve(__dirname, '../../../..');
-const fixture = path.join(__dirname, 'fixtures/simulator-control-lifecycle.cjs');
-const actionHelp = [
-  ['simulator:control', 'rotate', '--help'],
-  ['sim:control', 'screenshot.capture', '-h', '--id', 'session-123'],
-  ['simulator:control', '--id', 'session-123', '--help', 'rotate'],
-];
-const incompleteFlags = [
-  ['simulator:control', 'screenshot.capture', '--help', '--output'],
-  ['sim:control', 'rotate', '-h', '--id'],
-];
-let results: { stdout: string; events: unknown[]; error?: string }[];
-
-beforeAll(async () => {
-  // Load TypeScript once, outside per-case timeouts, including on coverage runners.
-  const { stdout } = await execFileAsync(
-    process.execPath,
-    [fixture, root, JSON.stringify([...actionHelp, ...incompleteFlags])],
-    { timeout: 20_000 }
-  );
-  results = JSON.parse(stdout.split('LIFECYCLE_RESULT ').at(-1)!);
-}, 30_000);
-
-describe('simulator action help through real oclif lookup and hooks', () => {
-  it.each(actionHelp.map((argv, index) => ({ argv, index })))(
-    'keeps canonical command identity and executes lifecycle hooks: $argv',
-    ({ index }) => {
-      expect(results[index].error).toBeUndefined();
-      expect(results[index].events).toEqual([
-        { event: 'prerun', id: 'simulator:control' },
-        { event: 'run', id: 'simulator:control' },
-        { event: 'postrun', id: 'simulator:control' },
-      ]);
-    }
-  );
-
-  it.each(incompleteFlags.map((argv, index) => ({ argv, index })))(
-    'shows ordinary help without starting the command for an incomplete flag: $argv',
-    ({ index }) => {
-      const { stdout, events, error } = results[index + actionHelp.length];
-      expect(error).toBeUndefined();
-      expect(stdout).toContain('USAGE');
-      expect(events).toEqual([]);
-    }
-  );
-});

packages/eas-cli/src/__tests__/help.test.ts

@@ -1,5 +1,6 @@
 import { Config, Help } from '@oclif/core';
 
+import SimulatorControl from '../commands/simulator/control';
 import EasHelp from '../help';
 
 describe(EasHelp, () => {
@@ -8,7 +9,7 @@ describe(EasHelp, () => {
   let showHelp: jest.SpyInstance;
 
   beforeEach(() => {
-    run = jest.spyOn(config, 'runCommand').mockResolvedValue(Promise.resolve());
+    run = jest.spyOn(SimulatorControl, 'run').mockResolvedValue(Promise.resolve());
     showHelp = jest.spyOn(Help.prototype, 'showHelp').mockResolvedValue();
   });
 
@@ -20,14 +21,12 @@ describe(EasHelp, () => {
     ['simulator:control', '--id', 'session-123', '--help', 'rotate'],
   ])('routes action help through the command: %j', async (...argv) => {
     await new EasHelp(config).showHelp(argv);
-    expect(run).toHaveBeenCalledWith('simulator:control', argv.slice(1));
+    expect(run).toHaveBeenCalledWith(argv.slice(1), config);
     expect(showHelp).not.toHaveBeenCalled();
   });
 
   it.each([
     ['simulator:control', '--help'],
-    ['simulator:control', 'screenshot.capture', '--help', '--output'],
-    ['sim:control', 'rotate', '-h', '--id'],
     ['sim:control', '-h'],
     ['build', '--help'],
     ['simulator:control', 'clipboard.write', '--', '--help'],

packages/eas-cli/src/build/__tests__/handleBuildRequestError-test.ts

@@ -1,6 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
 import { CombinedError } from '@urql/core';
-import chalk from 'chalk';
 import { GraphQLError } from 'graphql/error';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -22,7 +21,6 @@ import {
   EasBuildFreeTierLimitExceededError,
   EasBuildResourceClassNotAvailableInFreeTierError,
   EasBuildTooManyPendingBuildsError,
-  EasBuildUnauthorizedError,
   RequestValidationError,
   TurtleDeprecatedJobFormatError,
 } from '../errors';
@@ -760,38 +758,6 @@ describe(Build.name, () => {
           });
         });
       });
-
-      describe('for UNAUTHORIZED', () => {
-        it('points to the permission grant and permissions.account.role in eas.json', async () => {
-          const platform = Platform.ANDROID;
-          const graphQLError = getGraphQLError(
-            'Cannot create an EXPO_TOKEN for the job: the job requires the "Release Manager" role',
-            'UNAUTHORIZED'
-          );
-          const error = new CombinedError({ graphQLErrors: [graphQLError] });
-
-          const handleBuildRequestErrorThrownError = await getErrorAsync<EasBuildUnauthorizedError>(
-            async () => {
-              await handleBuildRequestErrorAsync(error, platform);
-            }
-          );
-
-          assertReThrownError(
-            handleBuildRequestErrorThrownError,
-            EasBuildUnauthorizedError,
-            'Cannot create an EXPO_TOKEN for the job: the job requires the "Release Manager" role\n' +
-              `Request ID: ${mockRequestId}\n\n` +
-              `Run ${chalk.bold(
-                'eas whoami'
-              )} to check the user you are logged in as and your permission grant. Run ${chalk.bold(
-                'eas login'
-              )} to change the user or permission grant.\n\n` +
-              `If your build profile in eas.json uses ${chalk.bold(
-                'permissions.account.role'
-              )}, it may mean your credentials do not grant the requested role.`
-          );
-        });
-      });
     });
 
     describe('error is unexpected graphQL-related error', () => {

packages/eas-cli/src/build/build.ts

@@ -25,7 +25,6 @@ import {
   EasBuildProjectArchiveUploadError,
   EasBuildResourceClassNotAvailableInFreeTierError,
   EasBuildTooManyPendingBuildsError,
-  EasBuildUnauthorizedError,
   RequestValidationError,
   TurtleDeprecatedJobFormatError,
 } from './errors';
@@ -48,7 +47,6 @@ import {
   logSourceForBuild,
 } from './logs';
 import { collectMetadataAsync } from './metadata';
-import { resolveJobExpoTokenRole } from './utils/expoTokenRole';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
 import {
   LocalFile,
@@ -132,7 +130,6 @@ function resolveBuildParamsInput<T extends Platform>(
     resourceClass: ctx.resourceClass,
     sdkVersion: metadata.sdkVersion,
     reactNativeVersion: metadata.reactNativeVersion,
-    expoTokenRole: resolveJobExpoTokenRole(ctx.buildProfile),
   };
 }
 
@@ -303,17 +300,6 @@ export async function handleBuildRequestErrorAsync(
     throw new EasBuildTooManyPendingBuildsError(
       `You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
     );
-  } else if (graphQLErrorCode === 'UNAUTHORIZED') {
-    const requestId = graphQLErrors[0]?.extensions?.requestId;
-    throw new EasBuildUnauthorizedError(
-      `${graphQLErrors[0]?.message}${requestId ? `\nRequest ID: ${requestId}` : ''}\n\nRun ${chalk.bold(
-        'eas whoami'
-      )} to check the user you are logged in as and your permission grant. Run ${chalk.bold(
-        'eas login'
-      )} to change the user or permission grant.\n\nIf your build profile in eas.json uses ${chalk.bold(
-        'permissions.account.role'
-      )}, it may mean your credentials do not grant the requested role.`
-    );
   } else if (Array.isArray(error?.graphQLErrors)) {
     const errorDetails = formatBuildRequestErrorDetails(error, graphQLErrors);
     throw new Error(

packages/eas-cli/src/build/errors.ts

@@ -22,6 +22,4 @@ export class EasBuildDownForMaintenanceError extends EasCommandError {}
 
 export class EasBuildTooManyPendingBuildsError extends EasCommandError {}
 
-export class EasBuildUnauthorizedError extends EasCommandError {}
-
 export class EasBuildProjectArchiveUploadError extends EasCommandError {}

packages/eas-cli/src/build/evaluateConfigWithEnvVarsAsync.ts

@@ -107,7 +107,11 @@ async function resolveEnvVarsAsync({
     return { ...serverEnvVars, ...buildProfile.env };
   } catch (e) {
     Log.error(`Failed to pull env variables for environment ${environment} from EAS servers`);
-    throw e;
+    Log.error(e);
+    Log.error(
+      'This can possibly be a bug in EAS/EAS CLI. Report it here: https://github.com/expo/eas-cli/issues'
+    );
+    return { ...buildProfile.env };
   }
 }
 

packages/eas-cli/src/build/utils/__tests__/expoTokenRole.test.ts

@@ -1,33 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import {
-  BuildProfile,
-  CredentialsSource,
-  JobExpoTokenRole as EasJsonJobExpoTokenRole,
-} from '@expo/eas-json';
-
-import { JobExpoTokenRole } from '../../../graphql/generated';
-import { resolveJobExpoTokenRole } from '../expoTokenRole';
-
-function createBuildProfile(
-  permissions?: BuildProfile<Platform.ANDROID>['permissions']
-): BuildProfile<Platform.ANDROID> {
-  return {
-    credentialsSource: CredentialsSource.REMOTE,
-    distribution: 'store',
-    permissions,
-  };
-}
-
-describe(resolveJobExpoTokenRole, () => {
-  it('returns undefined when the build profile does not request a role', () => {
-    expect(resolveJobExpoTokenRole(createBuildProfile())).toBeUndefined();
-  });
-
-  it.each([
-    [EasJsonJobExpoTokenRole.RUNNER, JobExpoTokenRole.Runner],
-    [EasJsonJobExpoTokenRole.DEVELOPER, JobExpoTokenRole.Developer],
-    [EasJsonJobExpoTokenRole.RELEASE_MANAGER, JobExpoTokenRole.ReleaseManager],
-  ])('maps the %s role to %s', (role, expected) => {
-    expect(resolveJobExpoTokenRole(createBuildProfile({ account: { role } }))).toBe(expected);
-  });
-});

packages/eas-cli/src/build/utils/expoTokenRole.ts

@@ -1,20 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, JobExpoTokenRole as EasJsonJobExpoTokenRole } from '@expo/eas-json';
-
-import { JobExpoTokenRole } from '../../graphql/generated';
-
-const easJsonJobExpoTokenRoleToJobExpoTokenRoleMapping: Record<
-  EasJsonJobExpoTokenRole,
-  JobExpoTokenRole
-> = {
-  [EasJsonJobExpoTokenRole.RUNNER]: JobExpoTokenRole.Runner,
-  [EasJsonJobExpoTokenRole.DEVELOPER]: JobExpoTokenRole.Developer,
-  [EasJsonJobExpoTokenRole.RELEASE_MANAGER]: JobExpoTokenRole.ReleaseManager,
-};
-
-export function resolveJobExpoTokenRole<T extends Platform>(
-  profile: BuildProfile<T>
-): JobExpoTokenRole | undefined {
-  const role = profile.permissions?.account.role;
-  return role ? easJsonJobExpoTokenRoleToJobExpoTokenRoleMapping[role] : undefined;
-}

packages/eas-cli/src/commandUtils/EasCommand.ts

@@ -272,7 +272,7 @@ export default abstract class EasCommand extends Command {
     let baseMessage = `${commandId} command failed.`;
     if (err instanceof EasCommandError) {
       if (!err.messageAlreadyPrinted) {
-        Log.errorToStderr(err.message);
+        Log.error(err.message);
       }
     } else if (err instanceof CombinedError && err?.graphQLErrors) {
       const cleanGQLErrorsMessage = err?.graphQLErrors
@@ -321,10 +321,10 @@ export default abstract class EasCommand extends Command {
       const cleanMessage = err.networkError
         ? `${cleanGQLErrorsMessage}\n${err.networkError.message}`
         : cleanGQLErrorsMessage;
-      Log.errorToStderr(cleanMessage);
+      Log.error(cleanMessage);
       baseMessage = BASE_GRAPHQL_ERROR_MESSAGE;
     } else {
-      Log.errorToStderr(err.message);
+      Log.error(err.message);
     }
     Log.debug(err);
     Sentry.withScope(scope => {

packages/eas-cli/src/commandUtils/__tests__/EasCommand-test.ts

@@ -200,7 +200,7 @@ describe('EasCommand', () => {
       it('logs the message', async () => {
         const TestEasCommand = createTestEasCommand();
         const Log = jest.requireMock('../../log').default;
-        const logErrorSpy = jest.spyOn(Log, 'errorToStderr');
+        const logErrorSpy = jest.spyOn(Log, 'error');
         const logDebugSpy = jest.spyOn(Log, 'debug');
         const runAsyncMock = jest.spyOn(TestEasCommand.prototype, 'runAsync');
         const error = new Error('Unexpected, internal error message');
@@ -218,7 +218,7 @@ describe('EasCommand', () => {
       it('skips the message when the command already printed it', async () => {
         const TestEasCommand = createTestEasCommand();
         const Log = jest.requireMock('../../log').default;
-        const logErrorSpy = jest.spyOn(Log, 'errorToStderr');
+        const logErrorSpy = jest.spyOn(Log, 'error');
         const logDebugSpy = jest.spyOn(Log, 'debug');
         const { EasCommandError } = require('../errors');
         const Sentry = jest.requireMock('../../sentry').default;
@@ -242,7 +242,7 @@ describe('EasCommand', () => {
       it('logs the cleaned message if needed', async () => {
         const TestEasCommand = createTestEasCommand();
         const Log = jest.requireMock('../../log').default;
-        const logErrorSpy = jest.spyOn(Log, 'errorToStderr');
+        const logErrorSpy = jest.spyOn(Log, 'error');
         const logDebugSpy = jest.spyOn(Log, 'debug');
         const runAsyncMock = jest.spyOn(TestEasCommand.prototype, 'runAsync');
         const { CombinedError } = require('@urql/core');
@@ -262,7 +262,7 @@ describe('EasCommand', () => {
       it('logs the cleaned message with request ID if present', async () => {
         const TestEasCommand = createTestEasCommand();
         const Log = jest.requireMock('../../log').default;
-        const logErrorSpy = jest.spyOn(Log, 'errorToStderr');
+        const logErrorSpy = jest.spyOn(Log, 'error');
         const logDebugSpy = jest.spyOn(Log, 'debug');
         const runAsyncMock = jest.spyOn(TestEasCommand.prototype, 'runAsync');
         const { CombinedError } = require('@urql/core');
@@ -297,7 +297,7 @@ describe('EasCommand', () => {
       it('logs the cleaned messages with request IDs if multiple GraphQL errors present', async () => {
         const TestEasCommand = createTestEasCommand();
         const Log = jest.requireMock('../../log').default;
-        const logErrorSpy = jest.spyOn(Log, 'errorToStderr');
+        const logErrorSpy = jest.spyOn(Log, 'error');
         const logDebugSpy = jest.spyOn(Log, 'debug');
         const runAsyncMock = jest.spyOn(TestEasCommand.prototype, 'runAsync');
         const { CombinedError } = require('@urql/core');

packages/eas-cli/src/commandUtils/context/contextUtils/__tests__/findProjectDirAndVerifyProjectSetupAsync-test.ts

@@ -11,16 +11,8 @@ jest.mock('fs');
 
 jest.mock('../../../../prompts');
 
-const originalStderrIsTTY = process.stderr.isTTY;
-
 beforeEach(() => {
   jest.resetAllMocks();
-  // The dependency notice prints once per process and only to a terminal, so keep it unspent.
-  process.stderr.isTTY = false;
-});
-
-afterAll(() => {
-  process.stderr.isTTY = originalStderrIsTTY;
 });
 
 describe(findProjectRootAsync, () => {
@@ -123,32 +115,3 @@ describe(findProjectDirAndVerifyProjectSetupAsync, () => {
     await expect(findProjectDirAndVerifyProjectSetupAsync({ cwd: '/app' })).resolves.not.toThrow();
   });
 });
-
-describe('eas-cli dependency notice', () => {
-  beforeEach(() => {
-    vol.reset();
-    vol.fromJSON(
-      {
-        './eas.json': JSON.stringify({}),
-        './package.json': JSON.stringify({ devDependencies: { 'eas-cli': '*' } }),
-      },
-      '/app'
-    );
-  });
-
-  afterEach(() => {
-    jest.restoreAllMocks();
-  });
-
-  it('prints the notice only when stderr is a terminal', async () => {
-    const warn = jest.spyOn(console, 'warn').mockImplementation(() => {});
-
-    process.stderr.isTTY = false;
-    await findProjectDirAndVerifyProjectSetupAsync({ cwd: '/app' });
-    expect(warn).not.toHaveBeenCalled();
-
-    process.stderr.isTTY = true;
-    await findProjectDirAndVerifyProjectSetupAsync({ cwd: '/app' });
-    expect(warn).toHaveBeenCalledWith(expect.stringContaining('in your project dependencies'));
-  });
-});

packages/eas-cli/src/commandUtils/context/contextUtils/findProjectDirAndVerifyProjectSetupAsync.ts

@@ -127,8 +127,7 @@ export async function findProjectDirAndVerifyProjectSetupAsync({
 } = {}): Promise<string> {
   const projectDir = await findProjectRootAsync({ cwd });
   await applyCliConfigAsync(projectDir);
-  // The notice is advice for a person. Programs that run eas-cli read stderr for its errors.
-  if (!ranEnsureEasCliIsNotInDependencies && process.stderr.isTTY) {
+  if (!ranEnsureEasCliIsNotInDependencies) {
     ranEnsureEasCliIsNotInDependencies = true;
     await ensureEasCliIsNotInDependenciesAsync(projectDir);
   }

packages/eas-cli/src/commandUtils/workflow/__tests__/referencedFiles-test.ts

@@ -1,137 +0,0 @@
-import { vol } from 'memfs';
-
-import { collectReferencedWorkflowFilesAsync } from '../referencedFiles';
-
-jest.mock('fs');
-
-const projectDir = '/app';
-const workflowsDir = `${projectDir}/.eas/workflows`;
-
-function callerYaml(calls: Record<string, string>): string {
-  return [
-    'jobs:',
-    ...Object.entries(calls).flatMap(([jobKey, fileName]) => [
-      `  ${jobKey}:`,
-      `    uses: ./.eas/workflows/${fileName}`,
-    ]),
-    '',
-  ].join('\n');
-}
-
-const calleeYaml = [
-  'on:',
-  '  workflow_call: {}',
-  'jobs:',
-  '  job:',
-  '    steps:',
-  '      - run: echo hi',
-  '',
-].join('\n');
-
-async function collectAsync(
-  rootYamlConfig: string
-): Promise<{ fileName: string; yamlConfig: string }[]> {
-  return await collectReferencedWorkflowFilesAsync({
-    projectDir,
-    rootFileName: 'root.yml',
-    rootYamlConfig,
-  });
-}
-
-describe(collectReferencedWorkflowFilesAsync, () => {
-  beforeEach(() => {
-    vol.reset();
-  });
-
-  it('returns no files and reads nothing when the root has no uses jobs', async () => {
-    vol.fromJSON({ [`${workflowsDir}/unused.yml`]: 'jobs: [not: valid' });
-
-    await expect(collectAsync(calleeYaml)).resolves.toEqual([]);
-  });
-
-  it('returns no files when the root is not valid YAML', async () => {
-    await expect(collectAsync('jobs: [not: valid')).resolves.toEqual([]);
-  });
-
-  it('collects a file called from one job', async () => {
-    vol.fromJSON({ [`${workflowsDir}/build.yml`]: calleeYaml });
-
-    await expect(collectAsync(callerYaml({ ship: 'build.yml' }))).resolves.toEqual([
-      { fileName: 'build.yml', yamlConfig: calleeYaml },
-    ]);
-  });
-
-  it('collects nested calls in discovery order', async () => {
-    const releaseYaml = `on:\n  workflow_call: {}\n${callerYaml({ build: 'build.yml' })}`;
-    vol.fromJSON({
-      [`${workflowsDir}/release.yml`]: releaseYaml,
-      [`${workflowsDir}/build.yaml`]: calleeYaml,
-      [`${workflowsDir}/build.yml`]: calleeYaml,
-    });
-
-    await expect(collectAsync(callerYaml({ release: 'release.yml' }))).resolves.toEqual([
-      { fileName: 'release.yml', yamlConfig: releaseYaml },
-      { fileName: 'build.yml', yamlConfig: calleeYaml },
-    ]);
-  });
-
-  it('collects each file once and stops at cycles', async () => {
-    const aYaml = callerYaml({ b: 'b.yml' });
-    const bYaml = callerYaml({ a: 'a.yml', root: 'root.yml', c: 'c.yml' });
-    vol.fromJSON({
-      [`${workflowsDir}/a.yml`]: aYaml,
-      [`${workflowsDir}/b.yml`]: bYaml,
-      [`${workflowsDir}/c.yml`]: calleeYaml,
-    });
-
-    await expect(
-      collectAsync(callerYaml({ first: 'a.yml', second: 'c.yml', third: 'a.yml' }))
-    ).resolves.toEqual([
-      { fileName: 'a.yml', yamlConfig: aYaml },
-      { fileName: 'c.yml', yamlConfig: calleeYaml },
-      { fileName: 'b.yml', yamlConfig: bYaml },
-    ]);
-  });
-
-  it('fails when a called file does not exist', async () => {
-    await expect(collectAsync(callerYaml({ ship: 'missing.yml' }))).rejects.toThrow(
-      'Job "ship" in root.yml uses ./.eas/workflows/missing.yml, but /app/.eas/workflows/missing.yml does not exist.'
-    );
-  });
-
-  it('fails when a nested called file does not exist', async () => {
-    vol.fromJSON({ [`${workflowsDir}/release.yml`]: callerYaml({ build: 'missing.yml' }) });
-
-    await expect(collectAsync(callerYaml({ release: 'release.yml' }))).rejects.toThrow(
-      'Job "build" in release.yml uses ./.eas/workflows/missing.yml, but /app/.eas/workflows/missing.yml does not exist.'
-    );
-  });
-
-  it('fails when a called file is not valid YAML', async () => {
-    vol.fromJSON({ [`${workflowsDir}/build.yml`]: 'jobs: [not: valid' });
-
-    await expect(collectAsync(callerYaml({ ship: 'build.yml' }))).rejects.toThrow(
-      /^Job "ship" in root\.yml uses \.\/\.eas\/workflows\/build\.yml, but \/app\/\.eas\/workflows\/build\.yml is not valid YAML: /
-    );
-  });
-
-  it('skips uses values the server does not accept', async () => {
-    const rootYaml = [
-      'jobs:',
-      '  nested:',
-      '    uses: ./.eas/workflows/nested/build.yml',
-      '  interpolated:',
-      '    uses: ./.eas/workflows/${{ inputs.name }}.yml',
-      '  notString:',
-      '    uses: { path: ./.eas/workflows/build.yml }',
-      '  valid:',
-      '    uses: ./.eas/workflows/build.yml',
-      '',
-    ].join('\n');
-    vol.fromJSON({ [`${workflowsDir}/build.yml`]: calleeYaml });
-
-    await expect(collectAsync(rootYaml)).resolves.toEqual([
-      { fileName: 'build.yml', yamlConfig: calleeYaml },
-    ]);
-  });
-});

packages/eas-cli/src/commandUtils/workflow/__tests__/utils-test.ts

@@ -1,11 +1,8 @@
-import {
-  getMockWorkflowRunFragment,
-  getMockWorkflowRunWithJobsFragment,
-} from '../../../__tests__/commands/utils';
-import { WorkflowJobStatus, WorkflowRunStatus } from '../../../graphql/generated';
+import { getMockWorkflowRunWithJobsFragment } from '../../../__tests__/commands/utils';
+import { WorkflowJobStatus } from '../../../graphql/generated';
 import { groupLogLinesIntoSteps, parseLogLines } from '../../logs/parseLogs';
 import { JobLogs, RawLogLine } from '../../logs/types';
-import { formatActiveWorkflowRun, formatFailedWorkflowRun, processWorkflowRuns } from '../utils';
+import { formatActiveWorkflowRun, formatFailedWorkflowRun } from '../utils';
 
 function jobWithLogs(
   logLines: RawLogLine[],
@@ -138,32 +135,3 @@ describe(formatFailedWorkflowRun, () => {
     expect(output).toContain('line7');
   });
 });
-
-describe(processWorkflowRuns, () => {
-  test.each([WorkflowRunStatus.Success, WorkflowRunStatus.Failure, WorkflowRunStatus.Canceled])(
-    'reports finalizedAt as finishedAt for final status %s',
-    status => {
-      const [run] = processWorkflowRuns([
-        getMockWorkflowRunFragment(status, { finalizedAt: '2022-01-01T12:00:00.000Z' }),
-      ]);
-      expect(run.finishedAt).toBe('2022-01-01T12:00:00.000Z');
-    }
-  );
-
-  test('reports no finishedAt for a final run predating finalizedAt', () => {
-    const [run] = processWorkflowRuns([getMockWorkflowRunFragment(WorkflowRunStatus.Success)]);
-    expect(run.finishedAt).toBeNull();
-  });
-
-  test.each([
-    WorkflowRunStatus.New,
-    WorkflowRunStatus.Waiting,
-    WorkflowRunStatus.InProgress,
-    WorkflowRunStatus.ActionRequired,
-  ])('reports no finishedAt for non-final status %s even with a lingering finalizedAt', status => {
-    const [run] = processWorkflowRuns([
-      getMockWorkflowRunFragment(status, { finalizedAt: '2022-01-01T12:00:00.000Z' }),
-    ]);
-    expect(run.finishedAt).toBeNull();
-  });
-});

packages/eas-cli/src/commandUtils/workflow/referencedFiles.ts

@@ -1,83 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-
-import { parsedYamlFromWorkflowContents } from './parse';
-import { WorkflowReferencedFileInput } from '../../graphql/generated';
-
-const WORKFLOW_CALL_USES_REGEX = /^\.\/\.eas\/workflows\/(?:(?!\$\{\{)[^/\\])+\.ya?ml$/;
-
-type WorkflowCall = { callerFileName: string; callerJobKey: string; uses: string };
-
-export async function collectReferencedWorkflowFilesAsync({
-  projectDir,
-  rootFileName,
-  rootYamlConfig,
-}: {
-  projectDir: string;
-  rootFileName: string;
-  rootYamlConfig: string;
-}): Promise<WorkflowReferencedFileInput[]> {
-  let rootYaml: unknown;
-  try {
-    rootYaml = parsedYamlFromWorkflowContents({ yamlConfig: rootYamlConfig });
-  } catch {
-    return [];
-  }
-
-  const collectedFileNames = new Set<string>([rootFileName]);
-  const referencedFiles: WorkflowReferencedFileInput[] = [];
-  const pendingCalls = getWorkflowCalls(rootFileName, rootYaml);
-  for (const call of pendingCalls) {
-    const fileName = path.posix.basename(call.uses);
-    if (collectedFileNames.has(fileName)) {
-      continue;
-    }
-    collectedFileNames.add(fileName);
-    const { yamlConfig, parsedYaml } = await readReferencedWorkflowFileAsync(
-      projectDir,
-      fileName,
-      call
-    );
-    referencedFiles.push({ fileName, yamlConfig });
-    pendingCalls.push(...getWorkflowCalls(fileName, parsedYaml));
-  }
-  return referencedFiles;
-}
-
-function getWorkflowCalls(callerFileName: string, parsedYaml: unknown): WorkflowCall[] {
-  const jobs = (parsedYaml as { jobs?: unknown } | null)?.jobs;
-  if (!jobs || typeof jobs !== 'object') {
-    return [];
-  }
-  return Object.entries(jobs).flatMap(([callerJobKey, job]) => {
-    const uses = (job as { uses?: unknown } | null)?.uses;
-    return typeof uses === 'string' && WORKFLOW_CALL_USES_REGEX.test(uses)
-      ? [{ callerFileName, callerJobKey, uses }]
-      : [];
-  });
-}
-
-async function readReferencedWorkflowFileAsync(
-  projectDir: string,
-  fileName: string,
-  { callerFileName, callerJobKey, uses }: WorkflowCall
-): Promise<{ yamlConfig: string; parsedYaml: unknown }> {
-  const filePath = path.join(projectDir, '.eas', 'workflows', fileName);
-  const describeCall = `Job "${callerJobKey}" in ${callerFileName} uses ${uses}, but ${filePath}`;
-
-  let yamlConfig: string;
-  try {
-    yamlConfig = await fs.promises.readFile(filePath, 'utf8');
-  } catch (error) {
-    if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
-      throw new Error(`${describeCall} does not exist.`);
-    }
-    throw new Error(`${describeCall} could not be read: ${(error as Error).message}`);
-  }
-
-  try {
-    return { yamlConfig, parsedYaml: parsedYamlFromWorkflowContents({ yamlConfig }) };
-  } catch (error) {
-    throw new Error(`${describeCall} is not valid YAML: ${(error as Error).message}`);
-  }
-}

packages/eas-cli/src/commandUtils/workflow/types.ts

@@ -19,7 +19,7 @@ export type WorkflowRunResult = {
   triggerType: WorkflowTriggerType;
   trigger: string | null;
   startedAt: string;
-  finishedAt: string | null;
+  finishedAt: string;
   workflowId: string;
   workflowName: string | null;
   workflowFileName: string;