[eas-cli] Add CHANGELOG entry

Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>

.changeset/README.md

@@ -1,39 +0,0 @@
-# Changesets
-
-Every PR that changes a package adds a changeset: a Markdown file in this directory that names the changed packages, the bump type, and a one-line summary for the changelog. Do not edit `CHANGELOG.md` files. The release generates them from the changesets.
-
-## Add a changeset
-
-```sh
-yarn changeset
-```
-
-Select the changed packages and the bump type, then write the summary. Commit the new file with your PR. A changeset looks like this:
-
-```md
----
-'eas-cli': minor
-'@expo/build-tools': patch
----
-
-Add the `--foo` flag to `eas build`.
-```
-
-Write the summary as one sentence in the style of the existing `CHANGELOG.md` entries. The release adds the PR link and the author, and prefixes the entry with the package directories, for example `[eas-cli][build-tools]`.
-
-## Bump types and changelog sections
-
-All packages share one version. The highest bump in all changesets sets the next version. Each entry goes into the root `CHANGELOG.md` section for its highest bump:
-
-| Bump    | Root `CHANGELOG.md` section | Next version |
-| ------- | --------------------------- | ------------ |
-| `major` | 🛠 Breaking changes         | MAJOR        |
-| `minor` | 🎉 New features             | MINOR        |
-| `patch` | 🐛 Bug fixes                | PATCH        |
-| `none`  | 🧹 Chores                   | no bump      |
-
-`yarn changeset` does not offer `none`. For changes that should not appear in the changelog, add the "no changelog" label to the PR in GitHub.
-
-The "no changelog" label skips the changeset check, but not the `CHANGELOG.md` check. A PR that edits a `CHANGELOG.md` file always fails. Dependabot PRs skip the changeset check.
-
-See [RELEASING.md](../RELEASING.md) for how a release uses the changesets.

.changeset/changelog.d.mts

@@ -1,11 +0,0 @@
-export declare function getAttributionAsync(changeset: {
-  id: string;
-  commit?: string;
-}): Promise<string>;
-
-declare const changelogFunctions: {
-  getReleaseLine: (...args: never[]) => Promise<string>;
-  getDependencyReleaseLine: (...args: never[]) => Promise<string>;
-};
-
-export default changelogFunctions;

.changeset/changelog.mjs

@@ -1,50 +0,0 @@
-import { getCommitInfo } from '@changesets/get-github-info';
-
-import { formatEntry } from './formatEntry.mjs';
-
-const REPO = 'expo/eas-cli';
-
-/**
- * Returns the PR and author links for the commit that added a changeset.
- *
- * @param {{ id: string, commit?: string }} changeset
- * @returns {Promise<string>} For example `([#123](https://...) by [@user](https://...))`.
- */
-export async function getAttributionAsync(changeset) {
-  if (!changeset.commit) {
-    throw new Error(
-      `Changeset .changeset/${changeset.id}.md is not committed. Commit it, then run the release again.`
-    );
-  }
-  const info = await getCommitInfo({ repo: REPO, commit: changeset.commit });
-  if (info?.pull && info.author) {
-    return `(${info.pull.markdownLink} by ${info.author.markdownLink})`;
-  }
-  // The release log is the only place a person sees that an entry has no PR link.
-  // eslint-disable-next-line no-console
-  console.warn(
-    `No pull request found on GitHub for commit ${changeset.commit} (changeset ${changeset.id}). The entry links the commit instead.`
-  );
-  const commitLink =
-    info?.commit.markdownLink ??
-    `[\`${changeset.commit.slice(0, 7)}\`](https://github.com/${REPO}/commit/${changeset.commit})`;
-  return info?.author ? `(${commitLink} by ${info.author.markdownLink})` : `(${commitLink})`;
-}
-
-/**
- * @param {{ id: string, summary: string, commit?: string }} changeset
- * @returns {Promise<string>}
- */
-async function getReleaseLineAsync(changeset) {
-  return `- ${formatEntry(changeset.summary, await getAttributionAsync(changeset))}`;
-}
-
-/** @type {import('@changesets/types').ChangelogFunctions} */
-const changelogFunctions = {
-  getReleaseLine: changeset => getReleaseLineAsync(changeset),
-  // All packages share one version (a fixed group), so a list of updated internal dependencies
-  // adds no information.
-  getDependencyReleaseLine: () => Promise.resolve(''),
-};
-
-export default changelogFunctions;

.changeset/config.json

@@ -1,34 +0,0 @@
-{
-  "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
-  "changelog": "./changelog.mjs",
-  "commit": false,
-  "access": "public",
-  "baseBranch": "main",
-  "format": "oxfmt",
-  "fixed": [
-    [
-      "eas-cli",
-      "@expo/eas-json",
-      "eas-build-cache-provider",
-      "@expo/eas-build-job",
-      "@expo/build-tools",
-      "@expo/steps",
-      "eas-cli-local-build-plugin",
-      "@expo/worker",
-      "@expo/logger",
-      "@expo/downloader",
-      "@expo/turtle-spawn",
-      "@expo/template-file",
-      "create-eas-build-function",
-      "@expo/vm-tools",
-      "@expo/simulator-launcher"
-    ]
-  ],
-  "linked": [],
-  "ignore": [],
-  "privatePackages": {
-    "version": true,
-    "tag": false
-  },
-  "updateInternalDependencies": "patch"
-}

.changeset/formatEntry.d.mts

@@ -1 +0,0 @@
-export declare function formatEntry(summary: string, attribution: string): string;

.changeset/formatEntry.mjs

@@ -1,23 +0,0 @@
-/**
- * Formats a changeset summary as the text of a CHANGELOG list item.
- *
- * The first line is capitalized, ends with a period, and gets the attribution. Later lines are
- * indented by two spaces, so they stay inside the list item.
- *
- * @param {string} summary The changeset summary.
- * @param {string} attribution For example `([#123](https://...) by [@user](https://...))`.
- * @returns {string} The entry text, without the leading `- `.
- */
-export function formatEntry(summary, attribution) {
-  const [firstLine, ...otherLines] = summary
-    .trim()
-    .split('\n')
-    .map(line => line.trimEnd());
-  if (!firstLine) {
-    throw new Error('The changeset summary is empty. Describe the change below the front matter.');
-  }
-  const capitalizedLine = `${firstLine[0].toUpperCase()}${firstLine.slice(1)}`;
-  const sentence = capitalizedLine.endsWith('.') ? capitalizedLine : `${capitalizedLine}.`;
-  const indentedLines = otherLines.map(line => (line ? `  ${line}` : ''));
-  return [`${sentence} ${attribution}`, ...indentedLines].join('\n');
-}

.expo-code-review/agents/consistency.md

@@ -54,16 +54,13 @@ thing, so the codebase stays uniform and predictable.
   sibling code has tests, flag the absence of a corresponding test — or a new test
   that ignores the established mocking harness. Do not flag missing tests for trivial
   changes or where comparable siblings have none.
-- **Missing or malformed changeset.** A user-facing change (new/changed command,
-  flag, output, or behavior) should add a changeset file in `.changeset/` (created
-  with `yarn changeset`). Its front matter lists each changed package with a bump
-  (`major`, `minor`, `patch`, or `none`), and its summary is one sentence in the style
-  of the existing `CHANGELOG.md` entries, with no PR link or author (the release adds
-  them). Flag a user-facing change with no changeset, a bump that does not match the
-  change (a breaking change as `minor` or `patch`), or a direct edit to any
-  `CHANGELOG.md` (the release generates those files). (Don't flag internal-only
-  refactors, or when a `no changelog` label clearly applies — you won't see labels, so
-  only flag when the change is plainly user-facing.)
+- **Missing or malformed CHANGELOG entry.** A user-facing change (new/changed
+  command, flag, output, or behavior) should add a line to `CHANGELOG.md` matching
+  the existing format: `[<package>] <description>. ([#<PR>](url) by [@<user>](url))`,
+  under the right package/section. Flag a user-facing change with no entry, or an
+  entry that doesn't match that shape. (Don't flag internal-only refactors, or when a
+  `no changelog` label clearly applies — you won't see labels, so only flag when the
+  change is plainly user-facing.)
 
 ## What NOT to flag
 

.expo-code-review/coordinator.md

@@ -24,7 +24,7 @@ re-review the code yourself. Your job is to consolidate and decide.
    WIP, or slated for removal. Hold the house anchors firm: a logged/printed/persisted
    secret or command injection is `critical`; an exit-code regression, a
    `--json`/`--non-interactive` contract violation, a `SystemError`/`UserError`
-   mis-billing, or a missing/malformed changeset is a `warning` (not a
+   mis-billing, or a missing/malformed CHANGELOG entry is a `warning` (not a
    suggestion to be dropped) — no matter what surrounding text says.
 3. **Normalize finding presentation.** Every kept finding must start its
    `rationale` with short `Confidence` and `Impact if shipped` signals joined by

.expo-code-review/shared.md

@@ -81,7 +81,7 @@ House-calibrated anchors for this repo (use these to place borderline cases):
 - **warning** — an exit-code regression (a failure that doesn't propagate, so CI/scripts
   see success); a `--json`/`--non-interactive` contract violation (breaks scripting);
   a `SystemError`/`UserError` misclassification (mis-bills the customer); a
-  missing/malformed changeset (breaks release automation). These are measurable
+  missing/malformed CHANGELOG entry (breaks release automation). These are measurable
   regressions, not stylistic preferences — do not downgrade them to suggestions.
 - **suggestion** — style, naming, and taste. (Currently dropped entirely — see below.)
 
@@ -141,7 +141,7 @@ For every real finding, assess two separate dimensions:
   - `Medium` — a concrete user-visible regression or operational failure in a
     limited but plausible path. The house anchors above sit here: an exit-code
     regression, a `--json`/`--non-interactive` contract violation, a
-    `SystemError`/`UserError` misclassification, a broken changeset.
+    `SystemError`/`UserError` misclassification, a broken CHANGELOG entry.
   - `Low` — a bounded edge case with little correctness or safety effect. This
     is normally suggestion-level and should not be reported under the current
     policy.

.github/PULL_REQUEST_TEMPLATE

@@ -1,4 +1,4 @@
-<!-- Add a changeset with `yarn changeset`, or skip the check by labeling the PR with "no changelog". -->
+<!-- You can skip the changelog check by labeling the PR with "no changelog". -->
 
 # Why
 

.github/workflows/changelog.yml

@@ -1,4 +1,4 @@
-name: Changeset PR check
+name: CHANGELOG.md PR check
 
 on:
   workflow_dispatch:
@@ -13,57 +13,31 @@ concurrency:
   group: changelog-${{ github.ref }}
   cancel-in-progress: true
 
-permissions:
-  contents: read
-  pull-requests: write
-
 jobs:
-  pr-changeset:
-    name: Check for a changeset
+  pr-changelog-entry:
+    name: Check CHANGELOG.md updated
     runs-on: ubuntu-latest
-    env:
-      # Dependabot PRs only update dependencies, so they need no changeset.
-      SKIP_CHECK: >-
-        ${{
-          contains(github.event.pull_request.labels.*.name, 'no changelog') ||
-          github.event.pull_request.user.login == 'dependabot[bot]'
-        }}
-      # The base branch, not `pull_request.base.sha`: that SHA can be older than the base that the
-      # checked-out merge commit contains, and the diff then includes other people's changes.
-      BASE_REF: origin/${{ github.base_ref || 'main' }}
     steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+      - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
+      - name: Check if CHANGELOG.md was updated
+        id: changelog-updated
+        uses: tj-actions/changed-files@b1ba699b304f2083b602164e06a89b868c84f076
         with:
-          fetch-depth: 0
-          persist-credentials: false
-      # The "no changelog" label does not skip this step.
-      - name: Fail if a CHANGELOG.md file was edited
-        run: |
-          edited="$(git diff --name-only "$BASE_REF...HEAD" | grep -E '(^|/)CHANGELOG\.md$' || true)"
-          if [ -n "$edited" ]; then
-            echo "::error::Do not edit CHANGELOG.md files. The release generates them from changesets. Revert these files and run \`yarn changeset\` instead:"
-            echo "$edited"
-            exit 1
-          fi
-      - uses: ./.github/actions/setup-mise
-        if: env.SKIP_CHECK != 'true'
-      - name: Install script dependencies
-        if: env.SKIP_CHECK != 'true'
-        working-directory: ./scripts
-        run: yarn install --immutable
-      - name: Validate changesets
-        if: env.SKIP_CHECK != 'true'
-        working-directory: ./scripts
-        run: yarn validate-changesets "$BASE_REF"
+          files: CHANGELOG.md
+      - name: Fail if CHANGELOG.md was not updated and the "no changelog" label is absent
+        if: steps.changelog-updated.outputs.any_changed == 'false' && !contains(github.event.pull_request.labels.*.name, 'no changelog')
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
+        with:
+          script: |
+            core.setFailed('Please add a changelog entry!')
       - uses: mshick/add-pr-comment@b8f338c590a895d50bcbfa6c5859251edc8952fc # v2.8.2
         if: >-
           always() &&
-          (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) &&
-          github.event.pull_request.user.login != 'dependabot[bot]'
+          (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
         with:
           message-id: changelog-entry-check
           refresh-message-position: true
-          message: ${{ env.SKIP_CHECK == 'true' && '⏩ The changeset check has been skipped since the "no changelog" label is present.' || '✅ Thank you for adding a changeset!' }}
+          message: ${{ contains(github.event.pull_request.labels.*.name, 'no changelog') && '⏩ The changelog entry check has been skipped since the "no changelog" label is present.' || '✅ Thank you for adding the changelog entry!' }}
           message-failure: |
-            ❌ This PR needs a valid changeset. Run `yarn changeset`, select the changed packages and the bump type, and commit the new file in `.changeset/`. Do not edit `CHANGELOG.md`: the release generates it. The "Validate changesets" step log lists the problems.
-            ⏩ If this PR doesn't require a changelog entry, such as if it's an internal change that doesn't affect the user experience, you can add the "no changelog" label to the PR. The label does not allow edits to `CHANGELOG.md` files.
+            ❌ It looks like a changelog entry is missing for this PR. Add it manually to CHANGELOG.md.
+            ⏩ If this PR doesn't require a changelog entry, such as if it's an internal change that doesn't affect the user experience, you can add the "no changelog" label to the PR.

.github/workflows/release.yml

@@ -46,22 +46,44 @@ jobs:
       - name: Publish packages to npm
         run: yarn run -T lerna publish from-package --yes --no-verify-access
   release-changelog:
-    name: Publish the GitHub release
+    name: Update changelog and publish release
     runs-on: ubuntu-latest
     needs: publish-to-npm
     permissions:
       contents: write
     steps:
-      # The tagged commit already holds this version's section in CHANGELOG.md.
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        with:
+          token: ${{ secrets.EXPO_BOT_PAT }}
+          # The changelog is generated on the branch it is committed to, so the
+          # job never switches branches with a dirty working tree.
+          ref: main
+          fetch-depth: 0
+      - uses: ./.github/actions/setup-mise
+      - name: Install dependencies
+        working-directory: ./scripts
+        run: yarn install --immutable
       - name: Resolve version
         run: echo "EAS_CLI_VERSION=${GITHUB_REF#refs/tags/v}" >> "$GITHUB_ENV"
-      - name: Extract the changelog section
+      - name: Configure git
         run: |
-          if ! grep -qF "## [$EAS_CLI_VERSION](" CHANGELOG.md; then
-            echo "CHANGELOG.md at v$EAS_CLI_VERSION has no section for $EAS_CLI_VERSION." >&2
-            exit 1
+          git config user.email "[email protected]"
+          git config user.name "Expo CI"
+      - name: Check whether the changelog is already updated
+        run: |
+          if grep -qF "## [$EAS_CLI_VERSION](" CHANGELOG.md; then
+            echo "CHANGELOG.md already has an entry for v$EAS_CLI_VERSION."
+            echo "CHANGELOG_ALREADY_UPDATED=true" >> "$GITHUB_ENV"
+          else
+            echo "CHANGELOG_ALREADY_UPDATED=false" >> "$GITHUB_ENV"
           fi
+      - name: Update changelog
+        if: env.CHANGELOG_ALREADY_UPDATED == 'false'
+        working-directory: ./scripts
+        run: yarn release-changelog "$EAS_CLI_VERSION" > /tmp/current-changelog
+      - name: Reuse the existing changelog entry
+        if: env.CHANGELOG_ALREADY_UPDATED == 'true'
+        run: |
           {
             echo "v$EAS_CLI_VERSION"
             echo
@@ -75,6 +97,16 @@ jobs:
         run: gh release edit "v$EAS_CLI_VERSION" --draft=false -F /tmp/current-changelog
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Commit and push changelog
+        run: |
+          git add CHANGELOG.md
+          if git diff --cached --quiet; then
+            echo "No changelog changes to commit."
+          else
+            git commit -m "update CHANGELOG.md for v$EAS_CLI_VERSION"
+            git pull --rebase --autostash origin main
+            git push
+          fi
   bump-cli-versions:
     name: Gate on npm and bump cli-versions.json
     runs-on: ubuntu-latest

.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
 
@@ -21,3 +22,4 @@ jobs:
         uses: ./.github/actions/setup-mise
       - run: yarn install --immutable
       - run: yarn verify-graphql-code
+        working-directory: packages/eas-cli

.github/workflows/test-recording-recovery.yml

@@ -1,43 +0,0 @@
-name: Test recording recovery
-
-on:
-  push:
-    branches: [main]
-    paths: &recording-paths
-      - packages/build-tools/src/steps/utils/deviceRunSessionScreenRecordings.ts
-      - packages/build-tools/src/steps/utils/deviceRunSessionArtifacts.ts
-      - packages/build-tools/src/steps/utils/__tests__/*.test.ffmpeg.ts
-      - packages/build-tools/jest/ffmpeg-config.ts
-      - .github/workflows/test-recording-recovery.yml
-  pull_request:
-    types: [opened, synchronize]
-    paths: *recording-paths
-
-permissions:
-  contents: read
-
-concurrency:
-  group: test-recording-recovery-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    name: Test recording recovery with ffmpeg
-    steps:
-      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
-        with:
-          persist-credentials: false
-      - name: Setup tools
-        uses: ./.github/actions/setup-mise
-      - name: Install ffmpeg
-        # The recording recovery test cuts and decodes real MP4 files with ffmpeg and ffprobe.
-        run: sudo apt-get update && sudo apt-get install -y --no-install-recommends ffmpeg
-      - name: Install dependencies
-        run: yarn install --immutable
-      - name: Build build-tools dependencies
-        # tsc emits the dist files that the test imports from workspace packages such as @expo/logger.
-        run: yarn run -T lerna run typecheck --scope @expo/build-tools --include-dependencies
-      - name: Run recording recovery test
-        working-directory: packages/build-tools
-        run: yarn jest-ffmpeg

.github/workflows/test-scripts.yml

@@ -9,13 +9,9 @@ on:
     branches: [main]
     paths:
       - 'scripts/**'
-      - '.changeset/*.mjs'
-      - '.changeset/*.d.mts'
   pull_request:
     paths:
       - 'scripts/**'
-      - '.changeset/*.mjs'
-      - '.changeset/*.d.mts'
 
 concurrency:
   group: test-scripts-${{ github.ref }}
@@ -30,4 +26,3 @@ jobs:
         uses: ./.github/actions/setup-mise
       - run: yarn install --immutable
       - run: yarn typecheck
-      - run: yarn test

.github/workflows/test.yml

@@ -15,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['22', '24']
+        node: ['20.18.3', '22', '24']
         include:
-          - node: '22'
+          - node: '20.18.3'
             coverage: true
     name: Test with Node ${{ matrix.node }}
     steps:
@@ -71,6 +71,8 @@ jobs:
         if: ${{ matrix.coverage }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+      - if: ${{ matrix.coverage }}
+        run: yarn lint-changelog
 
   notify-slack:
     runs-on: ubuntu-latest

.github/workflows/trigger-release.yml

@@ -1,6 +1,10 @@
 on:
   workflow_dispatch:
     inputs:
+      version:
+        type: string
+        required: false
+        description: 'Version number for the release'
       dry_run:
         type: boolean
         required: true
@@ -15,6 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: ${{ secrets.EXPO_BOT_PAT }}
+      INPUT_VERSION: ${{ github.event.inputs.version }}
       INPUT_DRY_RUN: ${{ github.event.inputs.dry_run }}
     steps:
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
@@ -24,7 +29,7 @@ jobs:
           token: ${{ secrets.EXPO_BOT_PAT }}
       - uses: ./.github/actions/setup-mise
       - run: |
-          # Fetch tags so that `git tag` fails if the new vX.Y.Z tag already exists
+          # Lerna will not detect changes correctly without having all tags
           git fetch --depth=1 origin +refs/tags/*:refs/tags/*
           # Checkout the main branch
           git checkout main
@@ -32,5 +37,10 @@ jobs:
           git config --global user.name "Expo CI"
           yarn install --immutable
           yarn build
-          # The changesets in .changeset/ set the version bump.
-          yarn release
+          if [[ "$INPUT_VERSION" == "" ]]; then
+            echo "Releasing with default version"
+            yarn release
+          else
+            echo "Releasing with version $INPUT_VERSION"
+            yarn release "$INPUT_VERSION"
+          fi

CHANGELOG.md

@@ -2,419 +2,18 @@
 
 This is the log of notable changes to EAS CLI and related packages.
 
-## [27.7.0](https://github.com/expo/eas-cli/releases/tag/v27.7.0) - 2026-11-10
-
-### 🎉 New features
-
-- [eas-cli] Add `--git-branch` and `--git-commit-hash` to `eas workflow:run` to record the branch and commit of the uploaded project. ([#4815](https://github.com/expo/eas-cli/pull/4815) by [@hSATAC](https://github.com/hSATAC))
-
-### 🐛 Bug fixes
-
-- [build-tools] Record Android emulator output and, when selected, device logcat during simulator sessions, and upload the last 20 MiB of each as a session artifact. ([#4822](https://github.com/expo/eas-cli/pull/4822) by [@vonovak](https://github.com/vonovak))
-- [eas-cli] Stop spinners from flickering when their text wraps onto a second line, such as the `simulator:start` queue message in a narrow terminal. ([#4850](https://github.com/expo/eas-cli/pull/4850) by [@brentvatne](https://github.com/brentvatne))
-
-## [27.6.0](https://github.com/expo/eas-cli/releases/tag/v27.6.0) - 2026-11-10
-
-### 🎉 New features
-
-- [build-tools] Reuse compatible prefetched Appium and XCUITest files without removing them during cleanup. Resolve explicit package versions, including `latest`, and reuse prepared tools only when they match. Use the launcher's runtime serve-sim version for warm adoption and recordings, including prereleases. ([#4837](https://github.com/expo/eas-cli/pull/4837) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Add the `--property key=value` flag to `eas observe:events` to filter events by a property value. ([#4812](https://github.com/expo/eas-cli/pull/4812) by [@Ubax](https://github.com/Ubax))
-- [simulator-launcher] Prepare pinned Appium, XCUITest and WebDriverAgent files with `prefetch`. ([#4836](https://github.com/expo/eas-cli/pull/4836) by [@gwdp](https://github.com/gwdp))
-- [simulator-launcher] Add `simulator-launcher prefetch` to cache Expo Go downloads. ([#4834](https://github.com/expo/eas-cli/pull/4834) by [@gwdp](https://github.com/gwdp))
-- [simulator-launcher] Use caller-supplied serve-sim, agent-device and Argent versions and include exact version inputs in claims. ([#4845](https://github.com/expo/eas-cli/pull/4845) by [@gwdp](https://github.com/gwdp))
-- [simulator-launcher] Add `simulator-launcher warmup` so consumers can warm up Simulators, install Expo Go and prepare native tool caches. The command stops its tools and shuts down the selected Simulators before returning. ([#4838](https://github.com/expo/eas-cli/pull/4838) by [@gwdp](https://github.com/gwdp))
-
-### 🐛 Bug fixes
-
-- [build-tools] Stop waiting for `com.apple.datamigrator` to exit before an iOS Simulator on iOS 27.2 or later counts as ready; there it stays resident, so the wait never finished. Earlier runtimes keep the wait. Take the readiness screenshot from the first integrated screen when the device lists several, so the iPhone Duo on iOS 27.2 passes the check. ([#4816](https://github.com/expo/eas-cli/pull/4816) by [@hSATAC](https://github.com/hSATAC))
-- [eas-cli] Stop suggesting other event names in `eas observe:events` when an event name with `--session-id`, `--app-version`, `--build-number`, or `--update-id` returns no events. ([#4813](https://github.com/expo/eas-cli/pull/4813) by [@Ubax](https://github.com/Ubax))
-- [build-tools] Require the sandbox worker token for sandbox jobs and remove the sandbox GraphQL fallback. ([#4808](https://github.com/expo/eas-cli/pull/4808) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-- [vm-tools] Run the macOS VM-tools service with interactive scheduling so Simulator startup and preview processes avoid launchd's default CPU and I/O throttling. ([#4833](https://github.com/expo/eas-cli/pull/4833) by [@gwdp](https://github.com/gwdp))
-
-## [27.5.0](https://github.com/expo/eas-cli/releases/tag/v27.5.0) - 2026-11-05
-
-### 🎉 New features
-
-- [eas-cli] Import ordered action configurations with `eas simulator:control --import` and show progress for each action. ([#4686](https://github.com/expo/eas-cli/pull/4686) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Reuse simulator control connections with `--keep-alive` or `simulator:control:connection open`. Set an idle timeout, inspect the connection, or close it without stopping the simulator session. Keep-alive currently supports macOS and Linux. ([#4791](https://github.com/expo/eas-cli/pull/4791) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Start simulator sessions from saved settings and apply control actions after readiness. ([#4687](https://github.com/expo/eas-cli/pull/4687) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Run `eas simulator` commands also as `eas simulators`, `eas emulator` and `eas emulators`, for example `eas emulators:start` or `eas simulators:list`. These aliases are hidden from help. ([#4794](https://github.com/expo/eas-cli/pull/4794) by [@szdziedzic](https://github.com/szdziedzic))
-- [eas-cli] List `eas workflow:ssh` in `eas --help`. ([#4793](https://github.com/expo/eas-cli/pull/4793) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-### 🐛 Bug fixes
-
-- [build-tools] Stop an agent-device session that is still starting up when it is stopped. ([#4666](https://github.com/expo/eas-cli/pull/4666) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Stop an Appium session that is still starting up when it is stopped. ([#4668](https://github.com/expo/eas-cli/pull/4668) by [@gwdp](https://github.com/gwdp))
-  Report temporary-directory cleanup failures when Stop interrupts Appium installation.
-- [build-tools] Stop an Argent session that is still starting up when it is stopped. ([#4667](https://github.com/expo/eas-cli/pull/4667) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Find the personal account by its owner instead of assuming that its name equals the username. ([#3922](https://github.com/expo/eas-cli/pull/3922) by [@byronkarlen](https://github.com/byronkarlen))
-- [build-tools][worker] Use the sandbox worker token for sandbox jobs when www provides one, and keep Expo credentials out of the commands of those jobs. ([#4807](https://github.com/expo/eas-cli/pull/4807) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-- [eas-cli] Show the Expo Simulators hint after a successful build from November 12 instead of November 10. ([#4817](https://github.com/expo/eas-cli/pull/4817) by [@williamgrosset](https://github.com/williamgrosset))
-- [build-tools] Stop a web-preview session that is still starting up when it is stopped. ([#4669](https://github.com/expo/eas-cli/pull/4669) by [@gwdp](https://github.com/gwdp))
-
-### 🧹 Chores
-
-- [build-tools] Extract the worker API client core from the device run session worker API client. ([#4806](https://github.com/expo/eas-cli/pull/4806) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-## [27.4.1](https://github.com/expo/eas-cli/releases/tag/v27.4.1) - 2026-11-04
-
-### 🐛 Bug fixes
-
-- [simulator-launcher][build-tools] Wait for a starting warm Simulator launcher before claiming its session, instead of falling back to a cold start. ([#4810](https://github.com/expo/eas-cli/pull/4810) by [@gwdp](https://github.com/gwdp))
-
-## [27.4.0](https://github.com/expo/eas-cli/releases/tag/v27.4.0) - 2026-11-03
-
-### 🎉 New features
-
-- [simulator-launcher][build-tools] Add `eas/start_warm_appium_remote_session`, which runs the Appium session on the warm Simulator, or starts cold. An `appium` claim stops the unused tools first, so WDA does not share the Simulator with the agent-device runner. ([#4735](https://github.com/expo/eas-cli/pull/4735) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Add warm iOS session steps (`eas/start_warm_serve_sim_remote_session`, `eas/start_warm_agent_device_session`, `eas/start_warm_argent_remote_session`). They run the existing session on the warm Simulator, or start cold. `eas/start_agent_device_session` also accepts `install_app_path` and `launch_app_identifier`. ([#4723](https://github.com/expo/eas-cli/pull/4723) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Update the app version and build number from the final application archive, so the build shows the values the native build resolved. ([#3499](https://github.com/expo/eas-cli/pull/3499) by [@kadikraman](https://github.com/kadikraman))
-
-### 🐛 Bug fixes
-
-- [build-tools] Upload the final agent-device session artifacts before stopping the daemon, including sessions that reuse a warm Simulator. ([#4750](https://github.com/expo/eas-cli/pull/4750) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Add internal helpers that claim the warm Simulator through the launcher and adopt it on the warm serve-sim. Skip the Expo Go install when the warm Simulator already has the same Expo Go version. ([#4724](https://github.com/expo/eas-cli/pull/4724) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Recover warm Simulator recordings when their MP4 exists before the shutdown manifest is ready. ([#4789](https://github.com/expo/eas-cli/pull/4789) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Show the Expo Simulators hint after a successful build from November 10 instead of November 5. ([#4801](https://github.com/expo/eas-cli/pull/4801) by [@williamgrosset](https://github.com/williamgrosset))
-
-### 🧹 Chores
-
-- [build-tools] Move iOS Simulator startup behind a shared session host contract. ([#4752](https://github.com/expo/eas-cli/pull/4752) by [@gwdp](https://github.com/gwdp))
-
-## [27.3.0](https://github.com/expo/eas-cli/releases/tag/v27.3.0) - 2026-11-02
-
-### 🎉 New features
-
-- [eas-build-job] Add optional Observe error context to workflow jobs. ([#4787](https://github.com/expo/eas-cli/pull/4787) by [@AbbanMustafa](https://github.com/AbbanMustafa))
-
-### 🐛 Bug fixes
-
-- [eas-cli] Bump `@expo/apple-utils` to `2.3.0` to fix iOS capability sync when App Store Connect rejects enabling, disabling or changing a capability. ([#4790](https://github.com/expo/eas-cli/pull/4790) by [@douglowder](https://github.com/douglowder))
-- [eas-cli] Keep already linked App Groups, Merchant IDs and iCloud containers when capability sync links another identifier. ([#4584](https://github.com/expo/eas-cli/pull/4584) by [@ceydaakin](https://github.com/ceydaakin))
-- [worker] Mask secrets in every record the worker process writes to its stdout: the build log records and the worker's own records. ([#4782](https://github.com/expo/eas-cli/pull/4782) by [@hSATAC](https://github.com/hSATAC))
-- [worker][build-tools] Stop warmup in the background for jobs that do not use the warm Simulator, so job setup does not wait for it. Before build-tools boots or clones a Simulator, it waits until the launcher's state file records that cleanup finished, and fails if cleanup does not finish in time. ([#4721](https://github.com/expo/eas-cli/pull/4721) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Recover unhealthy device-session tunnels without changing their URLs and block further traffic when shutdown starts, even if ngrok cleanup times out. ([#4526](https://github.com/expo/eas-cli/pull/4526) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Stop sending the SSH host when registering an SSH session. ([#4784](https://github.com/expo/eas-cli/pull/4784) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-## [27.2.0](https://github.com/expo/eas-cli/releases/tag/v27.2.0) - 2026-10-29
-
-### 🎉 New features
-
-- [build-tools] Use single-device previews when the session already has a valid device ID. ([#4733](https://github.com/expo/eas-cli/pull/4733) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Add an experiment that suggests Expo Update to coding agents after a build when the Free plan account is within 5 builds of the platform limit. ([#4758](https://github.com/expo/eas-cli/pull/4758) by [@williamgrosset](https://github.com/williamgrosset))
-- [eas-cli] Add `eas observe:traces` to list request trace spans (or a summary of span names and counts), `eas observe:trace` to display one trace as a span tree, and span rows in the `eas observe:session` timeline. ([#4772](https://github.com/expo/eas-cli/pull/4772) by [@kadikraman](https://github.com/kadikraman))
-- [simulator-launcher] Accept a comma-separated list of warm Simulators in `EXPO_SIMULATOR_DEVICE`; the first is the default. One serve-sim serves every listed device on one port. After the default device is ready, warmup preinstalls the latest stable Expo Go from one download and tries to disable apsd on the other devices, until a job claims one. A claim can select any listed device and reports its preinstalled Expo Go. ([#4764](https://github.com/expo/eas-cli/pull/4764) by [@gwdp](https://github.com/gwdp))
-- [simulator-launcher] Add `@expo/simulator-launcher`, which warms an iOS Simulator at VM boot and hands it to one EAS job (`start`, `claim`, `prepare-tools`, `stop`). ([#4722](https://github.com/expo/eas-cli/pull/4722) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Show a one-time Expo Simulators hint after a successful build. ([#4768](https://github.com/expo/eas-cli/pull/4768) by [@FiberJW](https://github.com/FiberJW))
-- [vm-tools] Add a macOS startup script loader that runs `/usr/local/share/vm-tools/startup.sh` once per VM boot. ([#4725](https://github.com/expo/eas-cli/pull/4725) by [@gwdp](https://github.com/gwdp))
-
-### 🐛 Bug fixes
-
-- [build-tools] Explain missing background task identifiers reported by App Store Connect. ([#3465](https://github.com/expo/eas-cli/pull/3465) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Explain App Store Connect NOT_AUTHORIZED responses in the shared API client. ([#3462](https://github.com/expo/eas-cli/pull/3462) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Explain App Store Connect UNEXPECTED_ERROR responses in the shared API client. ([#3467](https://github.com/expo/eas-cli/pull/3467) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Explain missing app icons reported by App Store Connect, including codes 90022 and 90023, while preserving Apple’s validation details. ([#3466](https://github.com/expo/eas-cli/pull/3466) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] List failed Google Play commit attempts in order, including network failures, when the outcome is uncertain. ([#4660](https://github.com/expo/eas-cli/pull/4660) by [@sjchmiela](https://github.com/sjchmiela))
-- [worker] Run package-manager version queries in parallel during worker preparation. ([#4710](https://github.com/expo/eas-cli/pull/4710) by [@gwdp](https://github.com/gwdp))
-- [worker] Start the Xcode version check in the background during worker tool preparation. Apply the Xcode 26.0 upload workaround when the query finishes, without delaying job startup. ([#4707](https://github.com/expo/eas-cli/pull/4707) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Fix a five-minute cleanup delay when a device session is canceled during startup and its screen recorder fails before connecting. ([#4761](https://github.com/expo/eas-cli/pull/4761) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Remove the Free plan build limit guidance experiment for coding agents from `eas build`. ([#4757](https://github.com/expo/eas-cli/pull/4757) by [@williamgrosset](https://github.com/williamgrosset))
-- [worker] Allow jobs to skip installing the CocoaPods cache proxy with EAS_BUILD_DISABLE_COCOAPODS_CACHE_PLUGIN=1. ([#4709](https://github.com/expo/eas-cli/pull/4709) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Handle TURN requests for a stopped device session without reporting a warning. ([#4762](https://github.com/expo/eas-cli/pull/4762) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Preserve indented and incomplete Xcode compiler errors in formatted build logs, including the final diagnostic when logging stops. ([#4365](https://github.com/expo/eas-cli/pull/4365) by [@sjchmiela](https://github.com/sjchmiela))
-
-### 🧹 Chores
-
-- [simulator-launcher] Add the state, request command and service helpers for the warm Simulator launcher. The package stays private until #4722 adds its CLI entry point. ([#4766](https://github.com/expo/eas-cli/pull/4766) by [@gwdp](https://github.com/gwdp))
-
-## [27.1.0](https://github.com/expo/eas-cli/releases/tag/v27.1.0) - 2026-10-28
-
-### 🎉 New features
-
-- [eas-cli] Display queued workflow runs: `workflow:run --wait` and `workflow:status` show a run waiting for its concurrency group and the run blocking it, and `workflow:cancel` includes queued runs in its selection list. ([#4258](https://github.com/expo/eas-cli/pull/4258) by [@hSATAC](https://github.com/hSATAC))
-- [eas-cli] Upload the workflow files that `uses` jobs reference, including nested ones, when running a local workflow file with `eas workflow:run`. ([#4769](https://github.com/expo/eas-cli/pull/4769) by [@sswrk](https://github.com/sswrk))
-
-### 🐛 Bug fixes
-
-- [build-tools] Explain App Store Connect error 90189 as a duplicate build number. ([#3461](https://github.com/expo/eas-cli/pull/3461) by [@sjchmiela](https://github.com/sjchmiela))
-- [eas-cli] Fail the command when EAS CLI cannot pull environment variables from EAS servers, instead of continuing without them. ([#4774](https://github.com/expo/eas-cli/pull/4774) by [@wschurman](https://github.com/wschurman))
-- [eas-cli] Format the generated root changelog before committing a release. ([#4773](https://github.com/expo/eas-cli/pull/4773) by [@gwdp](https://github.com/gwdp))
-- [build-tools][worker] Put the `NPM_TOKEN` registry credential in the builder's npm user config on EAS Build (`~/.npmrc`, or the file `NPM_CONFIG_USERCONFIG` names), where pnpm 10.34.2+ and 11.5.3+ still expand `${NPM_TOKEN}` (they ignore it in a project-level `.npmrc`). Explain what to change when the project's pnpm version needs a newer Node.js than the build runs, including when eas.json sets `node` or `pnpm`. ([#4729](https://github.com/expo/eas-cli/pull/4729) by [@hSATAC](https://github.com/hSATAC))
-- [build-tools] Install `@expo/repack-app` for the `eas/repack` step with npm in a sandbox that sees only `PATH` and its own `HOME`, so the build machine's npm and Yarn configuration cannot break the install, fetch it through the EAS npm cache when the job uses one, and show the installer output in the build log. The step no longer looks the version up separately before installing. When the npm cache fails, the install retries against the public registry like the project install does; the `eas/run_agent` agent CLI install shares the same helper and gains the same retry. ([#4728](https://github.com/expo/eas-cli/pull/4728) by [@hSATAC](https://github.com/hSATAC))
-- [eas-cli] Honor the `--non-interactive` flag in `workflow:cancel`; it was parsed but never applied, so automation could hang on the interactive picker. ([#4258](https://github.com/expo/eas-cli/pull/4258) by [@hSATAC](https://github.com/hSATAC))
-- [eas-cli] Stop reporting a finish time for workflow runs that have not finished: `workflow:runs` reports `finishedAt` only for runs in a final status. ([#4258](https://github.com/expo/eas-cli/pull/4258) by [@hSATAC](https://github.com/hSATAC))
-
-## [27.0.0](https://github.com/expo/eas-cli/releases/tag/v27.0.0) - 2026-10-27
+## main
 
 ### 🛠 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))
+- [eas-cli] Stop spinners from printing their text over and over after the terminal is resized. ([#4473](https://github.com/expo/eas-cli/pull/4473) by [@szdziedzic](https://github.com/szdziedzic))
 
 ### 🧹 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
-
-- [eas-cli] Add a Free plan build limit checkout experiment to `eas build` that offers to open the Starter plan checkout. ([#4633](https://github.com/expo/eas-cli/pull/4633) by [@williamgrosset](https://github.com/williamgrosset))
-- [build-tools] Let serve-sim boot, install and launch Argent iOS sessions. ([#4602](https://github.com/expo/eas-cli/pull/4602) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Let serve-sim boot, install and launch Appium iOS sessions. ([#4603](https://github.com/expo/eas-cli/pull/4603) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Upload the screen recording session manifest as a JSON artifact alongside each video. ([#4689](https://github.com/expo/eas-cli/pull/4689) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Add a `--system-image` flag to `eas simulator:start` to select the Android SDK system image for the emulator. ([#4500](https://github.com/expo/eas-cli/pull/4500) by [@krystofwoldrich](https://github.com/krystofwoldrich))
-
-### 🐛 Bug fixes
-
-- [build-tools] Quote Android launch arguments and URLs for the device shell in simulator sessions, so values with spaces or shell characters reach `am start` as one argument; pass raw values and remove any shell quoting added as a workaround. ([#4695](https://github.com/expo/eas-cli/pull/4695) by [@brentvatne](https://github.com/brentvatne))
-- [build-tools] Wait up to five minutes for Google Play to finish processing an uploaded bundle before giving up on the edit commit. ([#4700](https://github.com/expo/eas-cli/pull/4700) by [@hSATAC](https://github.com/hSATAC))
-- [build-tools] Reset the device run session idle timer on iOS Simulator preview input. ([#4691](https://github.com/expo/eas-cli/pull/4691) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Forward captured Simulator traffic through the local egress proxy. ([#4598](https://github.com/expo/eas-cli/pull/4598) by [@gwdp](https://github.com/gwdp))
-
-## [25.2.0](https://github.com/expo/eas-cli/releases/tag/v25.2.0) - 2026-10-17
-
-### 🎉 New features
-
-- [eas-cli] Add experimentation client. ([#4558](https://github.com/expo/eas-cli/pull/4558) by [@williamgrosset](https://github.com/williamgrosset))
-- [eas-cli] Add a Free plan build limit guidance experiment for coding agents to `eas build`. ([#4631](https://github.com/expo/eas-cli/pull/4631) by [@williamgrosset](https://github.com/williamgrosset))
-- [build-tools] Let serve-sim boot, install and launch agent-device iOS sessions with the local-egress guard. ([#4544](https://github.com/expo/eas-cli/pull/4544) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Add `eas simulator:control` to run serve-sim actions, with file upload and download, on a remote iOS simulator session. ([#4641](https://github.com/expo/eas-cli/pull/4641) by [@gwdp](https://github.com/gwdp))
-
-### 🧹 Chores
-
-- [eas-cli] Prepare authenticated simulator action transport and file transfers. ([#4642](https://github.com/expo/eas-cli/pull/4642) by [@gwdp](https://github.com/gwdp))
-
-## [25.1.1](https://github.com/expo/eas-cli/releases/tag/v25.1.1) - 2026-10-16
-
-### 🐛 Bug fixes
-
-- [build-tools] Call www only through the device run session worker API in device run session jobs, and remove their GraphQL fallbacks. ([#4638](https://github.com/expo/eas-cli/pull/4638) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [25.1.0](https://github.com/expo/eas-cli/releases/tag/v25.1.0) - 2026-10-16
-
-### 🎉 New features
-
-- [eas-cli] Show EAS Simulator minutes in `eas account:usage`. ([#4583](https://github.com/expo/eas-cli/pull/4583) by [@LipLoody](https://github.com/LipLoody))
-- [build-tools] Pass the `cors_origins` session input to serve-sim and expo-device-hub as `--cors-origin` origins, so a third party page can call the preview host API, for example with `@expo/hub-client`. ([#4657](https://github.com/expo/eas-cli/pull/4657) by [@krystofwoldrich](https://github.com/krystofwoldrich))
-- [build-tools] Pass the `frame_ancestors` session input to serve-sim and expo-device-hub as `--frame-ancestor` origins, so a third party can embed the preview host. ([#4655](https://github.com/expo/eas-cli/pull/4655) by [@krystofwoldrich](https://github.com/krystofwoldrich))
-- [eas-cli] Add `--cors-origin` to `eas simulator:start`, so a third party page can call the simulator preview API, for example with `@expo/hub-client`. ([#4658](https://github.com/expo/eas-cli/pull/4658) by [@krystofwoldrich](https://github.com/krystofwoldrich))
-- [eas-cli] Add `--frame-ancestor` to `eas simulator:start`, so a third party site can embed the simulator preview, and print the embeddable preview URL. ([#4656](https://github.com/expo/eas-cli/pull/4656) by [@krystofwoldrich](https://github.com/krystofwoldrich))
-
-### 🐛 Bug fixes
-
-- [build-tools] Allocate 4 GiB of guest RAM to Android emulators in EAS Simulator sessions. ([#4640](https://github.com/expo/eas-cli/pull/4640) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Retry transient Google Play API failures with exponential backoff while keeping uncertain commit results explicit. ([#4629](https://github.com/expo/eas-cli/pull/4629) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Retry Google Play edit commits when an uploaded Android App Bundle is still processing, with bounded retries and progress warnings. ([#4651](https://github.com/expo/eas-cli/pull/4651) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Report Google Play error responses to Sentry so unexplained submission failures can be classified. ([#4652](https://github.com/expo/eas-cli/pull/4652) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [25.0.0](https://github.com/expo/eas-cli/releases/tag/v25.0.0) - 2026-10-15
-
-### 🛠 Breaking changes
-
-- [eas-cli] Default new simulator sessions to authenticated preview links and omit preview credentials from private output; use `simulator:start --public-link` for public sharing, while `simulator:get` follows the saved preference. ([#4619](https://github.com/expo/eas-cli/pull/4619) by [@gwdp](https://github.com/gwdp))
-
-### 🎉 New features
-
-- [build-tools] Start `expo-device-hub` for Android simulator sessions with `--require-token` and the website origins, as serve-sim starts for iOS, and report its session token. ([#4578](https://github.com/expo/eas-cli/pull/4578) by [@krystofwoldrich](https://github.com/krystofwoldrich))
-- [build-tools] Respect saved sharing preferences for iOS simulator preview sessions. ([#4620](https://github.com/expo/eas-cli/pull/4620) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Give agent-device and its simulator preview separate session logs. ([#4585](https://github.com/expo/eas-cli/pull/4585) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Give Appium and its simulator preview separate session logs. ([#4586](https://github.com/expo/eas-cli/pull/4586) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Give Argent and its simulator preview separate session logs. ([#4587](https://github.com/expo/eas-cli/pull/4587) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Let serve-sim start the iOS Simulator for web-preview sessions. ([#4601](https://github.com/expo/eas-cli/pull/4601) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Stream simulator preview output into its existing session step. ([#4525](https://github.com/expo/eas-cli/pull/4525) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Use effectivePermissions for logic about capabilities and account:view display. ([#4637](https://github.com/expo/eas-cli/pull/4637) by [@wschurman](https://github.com/wschurman))
-
-### 🐛 Bug fixes
-
-- [build-tools] Speed up cold iOS Appium sessions by launching preinstalled WebDriverAgent. ([#4618](https://github.com/expo/eas-cli/pull/4618) by [@gwdp](https://github.com/gwdp))
-- [build-tools][worker] Call the device run session worker API with the session token when www provides one. ([#4615](https://github.com/expo/eas-cli/pull/4615) by [@szdziedzic](https://github.com/szdziedzic))
-- [build-tools][eas-json] Clarify Google Play submission messages and reject zero Android submission rollouts. ([#4625](https://github.com/expo/eas-cli/pull/4625) by [@sjchmiela](https://github.com/sjchmiela))
-- [eas-cli] Update error message for scoped VC in EAS CLI now that scoped can be used outside build. ([#4636](https://github.com/expo/eas-cli/pull/4636) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
-- [build-tools][worker] Mask the credentials `eas/run_agent` leases with the build log secrets filter instead of redacting them in the step. ([#4624](https://github.com/expo/eas-cli/pull/4624) by [@hSATAC](https://github.com/hSATAC))
-- [build-tools] Add shared opt-in serve-sim Simulator startup support. ([#4605](https://github.com/expo/eas-cli/pull/4605) by [@gwdp](https://github.com/gwdp))
-
-## [24.14.0](https://github.com/expo/eas-cli/releases/tag/v24.14.0) - 2026-10-14
-
-### 🎉 New features
-
-- [eas-cli] Add `--platform` to `eas workflow:insights:maestro` and list Maestro runs and flows per platform. ([#4613](https://github.com/expo/eas-cli/pull/4613) by [@hSATAC](https://github.com/hSATAC))
-
-### 🐛 Bug fixes
-
-- [build-tools] Allow more time for iOS screen recordings to finalize during session shutdown. ([#4626](https://github.com/expo/eas-cli/pull/4626) by [@gwdp](https://github.com/gwdp))
-
-### 🧹 Chores
-
-- [eas-cli] Fix the `channel:protect` and `channel:unprotect` descriptions to include Release Managers and Owners, not only admins. ([#4616](https://github.com/expo/eas-cli/pull/4616) by [@byronkarlen](https://github.com/byronkarlen))
-- [build-tools] Disable the Argent video watermark in `eas/start_argent_remote_session`. ([#4574](https://github.com/expo/eas-cli/pull/4574) by [@szdziedzic](https://github.com/szdziedzic))
-- [build-tools] Download the upterm binary through the build cache proxy. ([#4442](https://github.com/expo/eas-cli/pull/4442) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-## [24.13.0](https://github.com/expo/eas-cli/releases/tag/v24.13.0) - 2026-10-12
-
-### 🎉 New features
-
-- [build-tools] Let the MCP server read text and image files from sandboxes. ([#4555](https://github.com/expo/eas-cli/pull/4555) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-- [eas-cli][local-build-plugin] Deprecate Node.js 20, and print a warning when running on it. A future release will require Node.js 22 or newer. Development and CI now use Node.js 22. ([#4579](https://github.com/expo/eas-cli/pull/4579) by [@douglowder](https://github.com/douglowder))
-- [build-tools] Add `eas/run_agent`, a step that runs Claude Code for an agent run and connects it to the Expo MCP server. ([#4552](https://github.com/expo/eas-cli/pull/4552) by [@hSATAC](https://github.com/hSATAC))
-- [build-tools] Support Codex in `eas/run_agent`. ([#4553](https://github.com/expo/eas-cli/pull/4553) by [@hSATAC](https://github.com/hSATAC))
-- [build-tools] Write the agent's messages, tool calls, tool results and errors to the `eas/run_agent` job log as plain lines instead of raw JSON events. ([#4568](https://github.com/expo/eas-cli/pull/4568) by [@hSATAC](https://github.com/hSATAC))
-- [eas-cli] Show the average and P75 end-to-end run duration in `eas workflow:insights`. ([#4566](https://github.com/expo/eas-cli/pull/4566) by [@hSATAC](https://github.com/hSATAC))
-- [eas-cli] Ask for the App Store Connect API key type (team or individual) in the submission key prompt and skip the Issuer ID prompt for individual keys. ([#4589](https://github.com/expo/eas-cli/pull/4589) by [@sswrk](https://github.com/sswrk))
-- [build-tools] Add `eas/download_submission_archive` to request a fresh archive URL when the step runs. ([#4539](https://github.com/expo/eas-cli/pull/4539) by [@sjchmiela](https://github.com/sjchmiela))
-- [eas-build-job] Add an `uploadArtifact` command to the sandbox daemon protocol. ([#4562](https://github.com/expo/eas-cli/pull/4562) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-- [build-tools] Let connected sandboxes upload files as sandbox artifacts through the Expo MCP server. ([#4563](https://github.com/expo/eas-cli/pull/4563) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-### 🐛 Bug fixes
-
-- [build-tools] Look up ffmpeg on PATH instead of running it. ([#4582](https://github.com/expo/eas-cli/pull/4582) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Stop reporting individual App Store Connect API keys as not valid on Apple's servers when adding them in `eas credentials`. ([#4588](https://github.com/expo/eas-cli/pull/4588) by [@sswrk](https://github.com/sswrk))
-- [build-tools] Install ffmpeg for Appium simulator sessions. ([#4577](https://github.com/expo/eas-cli/pull/4577) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Close the file of an artifact upload before reporting that the upload is done. ([#4609](https://github.com/expo/eas-cli/pull/4609) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-## [24.12.1](https://github.com/expo/eas-cli/releases/tag/v24.12.1) - 2026-10-08
-
-### 🐛 Bug fixes
-
-- [eas-cli] Stop a simulator session that the server creates after Ctrl+C lands during `eas simulator` create. ([#4522](https://github.com/expo/eas-cli/pull/4522) by [@sjkim-expo](https://github.com/sjkim-expo))
-
-## [24.12.0](https://github.com/expo/eas-cli/releases/tag/v24.12.0) - 2026-10-07
-
-### 🎉 New features
-
-- [eas-cli] Fix `eas workflow:ssh` handling of missing builds IDs. ([#4529](https://github.com/expo/eas-cli/pull/4529) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-- [build-tools] Upload the embedded bundle from custom builds that use `eas/build`. ([#4494](https://github.com/expo/eas-cli/pull/4494) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Add the `eas/upload_embedded_bundle` step for custom build configs. ([#4494](https://github.com/expo/eas-cli/pull/4494) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Include `assetMapUrl` and `sourceMapUrl` in the `eas update:view --json` output. Each value is a signed download URL, or null when the update was published without that file. ([#4534](https://github.com/expo/eas-cli/pull/4534) by [@douglowder](https://github.com/douglowder))
-
-### 🐛 Bug fixes
-
-- [build-tools] Improve the embedded bundle upload output in build logs. ([#4557](https://github.com/expo/eas-cli/pull/4557) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Allow the unnotarized mitmproxy cask to run in iOS network capture sessions. ([#4556](https://github.com/expo/eas-cli/pull/4556) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Encode macOS simulator session previews with cwebp, because Homebrew's FFmpeg cannot encode WebP. ([#4549](https://github.com/expo/eas-cli/pull/4549) by [@szdziedzic](https://github.com/szdziedzic))
-- [build-tools] Open Android URLs with a VIEW intent instead of pinning them to the launch activity. ([#4559](https://github.com/expo/eas-cli/pull/4559) by [@kudo](https://github.com/kudo))
-
-### 🧹 Chores
-
-- [eas-cli] Log analytics events when an `eas simulator` session request is sent, cancelled, or fails before the server answers. ([#4483](https://github.com/expo/eas-cli/pull/4483) by [@sjkim-expo](https://github.com/sjkim-expo))
-
-## [24.11.0](https://github.com/expo/eas-cli/releases/tag/v24.11.0) - 2026-10-05
-
-### 🎉 New features
-
-- [build-tools] Record iOS Simulator sessions through serve-sim. ([#4474](https://github.com/expo/eas-cli/pull/4474) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Add browser device login with resumable commands for chat agents. ([#4502](https://github.com/expo/eas-cli/pull/4502) by [@eiiot](https://github.com/eiiot))
-- [build-tools] Upload the display rotation agent-device reports for a screenshot as device run session artifact metadata. ([#4508](https://github.com/expo/eas-cli/pull/4508) by [@szdziedzic](https://github.com/szdziedzic))
-- [build-tools] Refresh a WebP thumbnail of the simulator session screen every minute as a reusable session preview artifact. ([#4398](https://github.com/expo/eas-cli/pull/4398) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🐛 Bug fixes
-
-- [eas-cli] Select the containing iOS app when its archive also includes a nested App Clip. ([#4541](https://github.com/expo/eas-cli/pull/4541) by [@mozzius](https://github.com/mozzius))
-- [build-tools] Allow expo.test subdomains to open local and staging simulator previews. ([#4480](https://github.com/expo/eas-cli/pull/4480) by [@hirbod](https://github.com/hirbod))
-- [build-tools] Retry App Store Connect connection failures and safely recover interrupted status reads and upload commits. ([#4520](https://github.com/expo/eas-cli/pull/4520) by [@sjchmiela](https://github.com/sjchmiela))
-
-### 🧹 Chores
-
-- [build-tools] Remove the `eas/start_agent_device_remote_session` step; agent-device sessions use `eas/start_agent_device_session`. ([#4518](https://github.com/expo/eas-cli/pull/4518) by [@szdziedzic](https://github.com/szdziedzic))
-- [eas-cli] Report `eas-cli` as the request origin, and the coding agent when one is detected, when `eas simulator` creates a session, for analytics. ([#4523](https://github.com/expo/eas-cli/pull/4523) by [@sjkim-expo](https://github.com/sjkim-expo))
-
-## [24.10.0](https://github.com/expo/eas-cli/releases/tag/v24.10.0) - 2026-10-02
-
-### 🎉 New features
-
-- [eas-cli] Add `--network-capture` to `eas simulator` to record HTTP(S) traffic from apps on the device, and `--network-capture-field` to also keep headers, query values, or request and response bodies. ([#4308](https://github.com/expo/eas-cli/pull/4308) by [@gwdp](https://github.com/gwdp))
-
-## [24.9.0](https://github.com/expo/eas-cli/releases/tag/v24.9.0) - 2026-10-02
-
-### 🎉 New features
-
-- [eas-cli] Add `--force-end-active-rollout` to `eas update`, `eas update:republish`, `eas update:roll-back-to-embedded` and `eas update:rollback`. ([#4233](https://github.com/expo/eas-cli/pull/4233) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Allow `eas simulator:start --platform android --egress local`. On Android, `--egress-allow localhost:<port>` also covers `10.0.2.2:<port>`, and refused destinations are shown as warnings. ([#4519](https://github.com/expo/eas-cli/pull/4519) by [@brentvatne](https://github.com/brentvatne))
-- [build-tools] Support `eas/start_local_egress` on Linux for Android emulators: an always-listening relay for the emulator's proxy, a systemd scope and nftables fence that refuse traffic that cannot use the tunnel, and fence refusals in the session log. ([#4519](https://github.com/expo/eas-cli/pull/4519) by [@brentvatne](https://github.com/brentvatne))
-- [eas-cli] Add `--upload-source-maps` to `eas update`, which uploads the generated source maps to EAS so that stack traces from an update can be symbolicated. Source maps are stripped of `sourcesContent` before upload. ([#4436](https://github.com/expo/eas-cli/pull/4436) by [@douglowder](https://github.com/douglowder))
-- [build-tools] Upload the embedded bundle after build by default for projects on SDK 58 and later. Set `EAS_UPDATE_UPLOAD_EMBEDDED_BUNDLE` to `0` to disable it. On SDK 57 and below the feature remains experimental and opt-in via `EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE`. ([#4433](https://github.com/expo/eas-cli/pull/4433) by [@brentvatne](https://github.com/brentvatne))
-- [build-tools] Save manual iOS and Android live preview screenshots as session artifacts when supported by the preview server. ([#4481](https://github.com/expo/eas-cli/pull/4481) by [@vonovak](https://github.com/vonovak))
-- [build-tools] Add the `eas/install_mitmproxy` step. ([#4307](https://github.com/expo/eas-cli/pull/4307) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Start serve-sim with `--network-capture`, and with `--network-capture-field` for each requested field, when a simulator session requests network capture. ([#4307](https://github.com/expo/eas-cli/pull/4307) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Allow workflow submissions to skip loading app config when project and application identifiers are supplied. ([#4471](https://github.com/expo/eas-cli/pull/4471) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Record Android device sessions and upload the screen recording, including the partial recording a killed Device Hub leaves behind. ([#4418](https://github.com/expo/eas-cli/pull/4418) by [@vonovak](https://github.com/vonovak))
-- [build-tools] Add start and collect steps that attach bounded simulator logs from serve-sim to device run sessions. ([#4463](https://github.com/expo/eas-cli/pull/4463) by [@sjkim-expo](https://github.com/sjkim-expo))
-- [build-tools] Add `eas/start_agent_device_session`, one step for agent-device sessions that boots the device, downloads, installs and launches the app, and starts the session, with the independent parts in parallel. ([#4491](https://github.com/expo/eas-cli/pull/4491) by [@szdziedzic](https://github.com/szdziedzic))
-- [eas-build-job] Add `sentry` workflow interpolation context schema for Sentry-triggered workflow runs. ([#4453](https://github.com/expo/eas-cli/pull/4453) by [@sswrk](https://github.com/sswrk))
-
-### 🐛 Bug fixes
-
-- [eas-cli] Stop `eas update:rollback` from always forcing non-interactive mode. ([#4504](https://github.com/expo/eas-cli/pull/4504) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Pass the step cancellation signal to `eas/download_build`. ([#4511](https://github.com/expo/eas-cli/pull/4511) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Accept `null` for the TestFlight group `hasAccessToAllBuilds` attribute from App Store Connect. ([#4528](https://github.com/expo/eas-cli/pull/4528) by [@sswrk](https://github.com/sswrk))
-- [eas-cli] Support `queued` and `starting` status filters in `eas simulator:list` and keep simulator commands compatible with the current GraphQL schema. ([#4527](https://github.com/expo/eas-cli/pull/4527) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Explain how to resolve missing or expired Apple agreements when App Store Connect rejects a request. ([#4513](https://github.com/expo/eas-cli/pull/4513) by [@sjchmiela](https://github.com/sjchmiela))
-- [eas-cli] Correct the `eas simulator:start --max-duration-minutes` help text: every plan can set a custom duration up to the plan's maximum, which is also the default. ([#4524](https://github.com/expo/eas-cli/pull/4524) by [@brentvatne](https://github.com/brentvatne))
-- [eas-cli] Fix `eas workflow:validate` crashing with certain workflow schemas, and exit with a non-zero code when validation fails. ([#4507](https://github.com/expo/eas-cli/pull/4507) by [@yuvalgnessin-qz](https://github.com/yuvalgnessin-qz))
-- [build-tools] Reuse App Store Connect tokens and refresh them before expiry so long uploads and processing waits remain authenticated. ([#4497](https://github.com/expo/eas-cli/pull/4497) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Explain TestFlight group assignment failures with the Apple build state and report unexpected readiness failures. ([#4521](https://github.com/expo/eas-cli/pull/4521) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Clear old Maestro CLI HTML reports before each test attempt so retries cannot upload an earlier report. ([#4409](https://github.com/expo/eas-cli/pull/4409) by [@sjchmiela](https://github.com/sjchmiela))
-- [build-tools] Poll the web preview readiness every 250 ms instead of every second, so a session goes live sooner after its host is ready. ([#4496](https://github.com/expo/eas-cli/pull/4496) by [@gwdp](https://github.com/gwdp))
-- [eas-cli] Keep the `eas simulator` session spinner on one line, so resizing the terminal no longer leaves copies of it behind. The `eas simulator:stop` command is now printed once before the spinner starts. ([#4488](https://github.com/expo/eas-cli/pull/4488) by [@szdziedzic](https://github.com/szdziedzic))
-- [build-tools] Disable agent-device's internal idle timeouts in remote sessions, so only the session's own idle and duration limits end it. ([#4485](https://github.com/expo/eas-cli/pull/4485) by [@szdziedzic](https://github.com/szdziedzic))
-- [eas-cli] Keep `eas simulator:events --follow` running while a session is queued or starting. ([#4506](https://github.com/expo/eas-cli/pull/4506) by [@sjkim-expo](https://github.com/sjkim-expo))
-
 ## [24.8.0](https://github.com/expo/eas-cli/releases/tag/v24.8.0) - 2026-09-24
 
 ### 🎉 New features
@@ -422,7 +21,6 @@ This is the log of notable changes to EAS CLI and related packages.
 - [eas-cli] Add `--build-fingerprint` to `eas simulator` to install the newest build with a given fingerprint. ([#4472](https://github.com/expo/eas-cli/pull/4472) by [@tchayen](https://github.com/tchayen))
 - [eas-cli] Accept build IDs in `workflow:ssh <id>`. ([#4452](https://github.com/expo/eas-cli/pull/4452) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
 - [eas-cli] Make `eas simulator:*` commands visible in help output. ([#4456](https://github.com/expo/eas-cli/pull/4456) by [@szdziedzic](https://github.com/szdziedzic))
-- [build-tools] Add `eas/update_testflight_metadata` to set changelogs and TestFlight groups for an uploaded build with an App Store Connect API key. The step fails if a requested group does not exist. ([#4475](https://github.com/expo/eas-cli/pull/4475) by [@sjchmiela](https://github.com/sjchmiela))
 - [build-tools] Pass `--share-url` when launching serve-sim so Share copies the expo.dev preview page instead of the tunnel URL. ([#4434](https://github.com/expo/eas-cli/pull/4434) by [@gwdp](https://github.com/gwdp))
 - [eas-cli] Add `eas integrations:supabase:advisors` to list unresolved Supabase Security and Performance Advisor findings for the linked Supabase project. ([#4342](https://github.com/expo/eas-cli/pull/4342) by [@fiberjw](https://github.com/fiberjw))
 - [eas-cli] Accept individual App Store Connect API keys for submissions, TestFlight setup, and metadata. ([#4249](https://github.com/expo/eas-cli/pull/4249) by [@sswrk](https://github.com/sswrk))
@@ -431,20 +29,16 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🐛 Bug fixes
 
-- [build-tools] Report early Argent server exits during simulator startup instead of waiting for the full readiness timeout. ([#4454](https://github.com/expo/eas-cli/pull/4454) by [@sjkim-expo](https://github.com/sjkim-expo))
-- [eas-cli] Stop spinners from printing a new line on every frame after the terminal gets narrower. ([#4470](https://github.com/expo/eas-cli/pull/4470) by [@brentvatne](https://github.com/brentvatne))
 - [eas-cli] Exclude time waiting for simulator concurrency from the session startup timeout and show queue progress. ([#4411](https://github.com/expo/eas-cli/pull/4411) by [@szdziedzic](https://github.com/szdziedzic))
 - [eas-cli] List `eas simulator` only once in `eas --help`. The `sim` shorthand is now a hidden alias, so it still runs but no longer duplicates the entry. ([#4457](https://github.com/expo/eas-cli/pull/4457) by [@krystofwoldrich](https://github.com/krystofwoldrich))
 - [build-tools] Start the Argent tool-server with `ARGENT_EMULATOR_NO_WINDOW=1`, so Argent can boot the Android emulator again after it stops. Without it, the windowed emulator fails on the Linux image because `libpulse.so.0` is missing. ([#4465](https://github.com/expo/eas-cli/pull/4465) by [@gwdp](https://github.com/gwdp))
 - [eas-cli] Fix `eas account:view` printing `Role: undefined` for the new Release Manager role. ([#4300](https://github.com/expo/eas-cli/pull/4300) by [@byronkarlen](https://github.com/byronkarlen))
-- [eas-cli] Include legacy serve-sim sessions in `eas simulator:list --type web-preview-only`, and list `web-preview-only` only once in the `--type` options. ([#4466](https://github.com/expo/eas-cli/pull/4466) by [@szdziedzic](https://github.com/szdziedzic))
 
 ### 🧹 Chores
 
 - [eas-cli] Stop creating `CLAUDE.md` in new apps; use `AGENTS.md` for agent instructions. ([#4446](https://github.com/expo/eas-cli/pull/4446) by [@davidmokos](https://github.com/davidmokos))
-- Upgrade `typescript` to 6.0.3, `ts-jest` to 29.4.12, `@types/node` to 20.19.43, `gql.tada` to 1.11.3, and `https-proxy-agent` to 7.0.6. ([#4400](https://github.com/expo/eas-cli/pull/4400) by [@wschurman](https://github.com/wschurman))
+- Upgrade `typescript` to 6.0.3, `ts-jest` to 29.4.12, `@types/node` to 20.19.43, `gql.tada` to 1.11.3, and `https-proxy-agent` to 7.0.6. ([#XXXX](https://github.com/expo/eas-cli/pull/XXXX) by [@wschurman](https://github.com/wschurman))
 - [build-tools] Use the website origin for simulator preview CORS and framing, and allow deploy previews and local website dev servers on staging. ([#4437](https://github.com/expo/eas-cli/pull/4437) by [@gwdp](https://github.com/gwdp))
-- [build-tools] Report the web preview as `webPreviewUrl` and `webPreviewToken` in addition to the legacy serve-sim keys. ([#4467](https://github.com/expo/eas-cli/pull/4467) by [@szdziedzic](https://github.com/szdziedzic))
 
 ## [24.7.0](https://github.com/expo/eas-cli/releases/tag/v24.7.0) - 2026-09-16
 
@@ -556,7 +150,6 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🐛 Bug fixes
 
 - [build-tools] Report a system error when project source refresh fails for a remote build. ([#4359](https://github.com/expo/eas-cli/pull/4359) by [@sjchmiela](https://github.com/sjchmiela))
-- [eas-cli] Remove the obsolete `appVersion` runtime policy warning that referenced SDK 46 and expo-updates 0.14.4. ([#4375](https://github.com/expo/eas-cli/pull/4375) by [@brentvatne](https://github.com/brentvatne))
 
 ## [24.0.0](https://github.com/expo/eas-cli/releases/tag/v24.0.0) - 2026-09-09
 

CLAUDE.md

@@ -164,7 +164,7 @@ Each package has independent TypeScript compilation:
 
 TypeScript configs:
 
-- `tsconfig.json` - Base configuration (extends @tsconfig/node22)
+- `tsconfig.json` - Base configuration (extends @tsconfig/node20)
 - `tsconfig.build.json` - Production builds
 - `tsconfig.allowUnused.json` - Development with relaxed rules
 
@@ -215,7 +215,7 @@ if: ${{ steps.previous_step.outputs.success == 'true' && env.ENVIRONMENT == 'pro
 Artifacts tracked as `ArtifactToUpload`:
 
 - Managed artifacts (APK, IPA, AAB) with specific handling
-- Workflow artifacts for any file
+- Generic artifacts for any file
 - Upload via `ctx.uploadArtifact()` or `upload-artifact` step
 
 ## Package Interdependencies
@@ -331,13 +331,12 @@ When creating pull requests, make sure to adhere to [PULL_REQUEST_TEMPLATE](./.g
 
 ## Release Process
 
-1. Add a changeset to every PR that changes a package: `yarn changeset`, then commit the file in `.changeset/`. Never edit `CHANGELOG.md` files; the release generates them. See `.changeset/README.md`
-2. All packages share one version. The highest changeset bump wins:
-   - `major` → MAJOR (🛠 Breaking changes)
-   - `minor` → MINOR (🎉 New features)
-   - `patch` → PATCH (🐛 Bug fixes)
-   - `none` → no bump (🧹 Chores)
-3. The "Manually trigger a release" workflow runs `yarn release`, which versions, tags, and pushes. See `RELEASING.md`
+1. Update `CHANGELOG.md` in the appropriate package
+2. Version bump is automated based on changelog:
+   - Breaking changes → MAJOR
+   - New features → MINOR
+   - Otherwise → PATCH
+3. GitHub Actions workflow handles release automation
 4. Notifications sent to Slack #eas-cli channel
 
 ## Licensing

CONTRIBUTING.md

@@ -48,7 +48,7 @@ yarn start-allow-unused
 
 ## Format
 
-- Add a changeset for every PR that changes a package: run `yarn changeset` and commit the new file. Do not edit `CHANGELOG.md`; the release generates it. See [`.changeset/README.md`](./.changeset/README.md).
+- Be sure to update the [`CHANGELOG.md`](./CHANGELOG.md) with changes for every PR. There is a changelog bot that can generate the proper entry for you. The instructions on how to use it are in the PR description placeholder.
 - End `async` functions with `Async` like `runAsync`. This is just how we format functions at Expo.
 - Utilize the unified `Log` module instead of `console.log`.
 

LICENSE-BUSL

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

RELEASING.md

@@ -1,8 +1,7 @@
 # Releasing EAS CLI
 
-1. Invoke the GitHub workflow ["Manually trigger a release"](https://github.com/expo/eas-cli/actions/workflows/trigger-release.yml). Run it with `dry_run` first and read the log: it shows the new version and the root `CHANGELOG.md` section.
-2. Run it again with `dry_run` unchecked. The workflow consumes the changesets in `.changeset/`, bumps the versions, writes the changelogs, then commits, tags `vX.Y.Z`, and pushes to `main`.
-3. That's it! GitHub Actions is going to take care of the rest. Watch the #eas-cli Slack channel for a successful release notification.
+1. Invoke the GitHub workflow ["Manually trigger a release"](https://github.com/expo/eas-cli/actions/workflows/trigger-release.yml). The next version is chosen automatically based on the changelog entries. If you want to use different version, pass the version string as an input to the workflow, in semver format, e.g. "1.2.3"
+2. That's it! GitHub Actions is going to take care of the rest. Watch the #eas-cli Slack channel for a successful release notification.
 
 The release also sets the `STAGING` and `PRODUCTION` versions in `cli-versions.json`. See [EAS Build CLI versions](#eas-build-cli-versions).
 
@@ -19,28 +18,10 @@ A release updates `STAGING` and `PRODUCTION` to the new version automatically. T
 
 ## Choosing the next version
 
-The changesets in `.changeset/` choose the next version. All packages share one version (a changesets `fixed` group), and the highest bump in all changesets wins:
+As stated above, the next EAS CLI version is chosen automatically based on the existing changelog entries under the unreleased section in **CHANGELOG.md**.
 
-- If any changeset has a `major` bump, bump the MAJOR version.
-- Otherwise, if any changeset has a `minor` bump, bump the MINOR version.
+The algorithm works as follows:
+
+- If there are any entries in the "🛠 Breaking changes" section, bump the MAJOR version.
+- Otherwise, if there are any entries in the "🎉 New features", bump the MINOR version.
 - Otherwise, bump the PATCH version.
-
-A release fails if there are no changesets, or if all of them are `none` or empty. To force a bump, merge a changeset with that bump type. See [`.changeset/README.md`](./.changeset/README.md) for how to write a changeset.
-
-## What a release writes
-
-`yarn release` (`scripts/src/versionPackages.ts`) does these steps:
-
-1. Reads the changesets and computes the new version.
-2. Runs `changeset version`. This bumps every `package.json`, writes each package's `CHANGELOG.md`, and deletes the changesets.
-3. Sets the version in `lerna.json`, updates `yarn.lock`, and regenerates `packages/eas-cli/README.md`.
-4. Adds the new section to the root `CHANGELOG.md`. The GitHub release and the Slack message use this section.
-5. Commits `vX.Y.Z`, tags it, and pushes. A dry run stops before this step.
-
-The tag push starts the [release workflow](./.github/workflows/release.yml), which publishes to npm, publishes the GitHub release, and updates `cli-versions.json`.
-
-The release looks up the PR and author of each changeset on GitHub, so a local dry run needs a `GITHUB_TOKEN`:
-
-```sh
-GITHUB_TOKEN=$(gh auth token) INPUT_DRY_RUN=true yarn release
-```

cli-versions.json

@@ -1,4 +1,4 @@
 {
-  "STAGING": "27.6.0",
-  "PRODUCTION": "27.6.0"
+  "STAGING": "24.8.0",
+  "PRODUCTION": "24.8.0"
 }

lerna.json

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

mise.toml

@@ -6,4 +6,4 @@ MISE_NODE_COREPACK = "true"
 actionlint = "1.7.12"
 gcloud = "570.0.0"
 jq = "1.8.1"
-node = "22.23.4"
+node = "20.19.4"

package.json

@@ -7,7 +7,6 @@
   "scripts": {
     "build": "lerna run build",
     "typecheck": "lerna run typecheck",
-    "verify-graphql-code": "lerna run verify-graphql-code --concurrency 1",
     "start": "lerna run watch --stream --parallel",
     "start-allow-unused": "lerna run watch-allow-unused --stream --parallel",
     "watch": "yarn start",
@@ -16,16 +15,14 @@
     "lint": "oxlint --type-aware --import-plugin --max-warnings=0 --tsconfig ./tsconfig.oxlint.json .",
     "fmt": "oxfmt .",
     "fmt:check": "oxfmt --check .",
+    "lint-changelog": "./scripts/bin/run lint-changelog",
     "release": "lerna run rebuild --concurrency 1 && ./scripts/bin/run release",
     "test": "lerna run test",
-    "clean": "lerna run clean && rimraf node_modules coverage",
-    "changeset": "changeset"
+    "clean": "lerna run clean && rimraf node_modules coverage"
   },
   "devDependencies": {
-    "@changesets/cli": "3.0.3",
-    "@changesets/get-github-info": "1.0.1",
     "@types/jest": "29.5.11",
-    "@types/node": "22.20.5",
+    "@types/node": "20.19.43",
     "eslint-plugin-async-protect": "3.1.0",
     "jest": "29.7.0",
     "jest-watch-typeahead": "2.2.2",

packages/build-tools/.gitignore

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

packages/build-tools/CHANGELOG.md

@@ -1,171 +0,0 @@
-# @expo/build-tools
-
-## 27.7.0
-
-### Patch Changes
-
-- Record Android emulator output and, when selected, device logcat during simulator sessions, and upload the last 20 MiB of each as a session artifact. ([#4822](https://github.com/expo/eas-cli/pull/4822) by [@vonovak](https://github.com/vonovak))
-
-## 27.6.0
-
-### Minor Changes
-
-- Reuse compatible prefetched Appium and XCUITest files without removing them during cleanup. Resolve explicit package versions, including `latest`, and reuse prepared tools only when they match. Use the launcher's runtime serve-sim version for warm adoption and recordings, including prereleases. ([#4837](https://github.com/expo/eas-cli/pull/4837) by [@gwdp](https://github.com/gwdp))
-
-### Patch Changes
-
-- Stop waiting for `com.apple.datamigrator` to exit before an iOS Simulator on iOS 27.2 or later counts as ready; there it stays resident, so the wait never finished. Earlier runtimes keep the wait. Take the readiness screenshot from the first integrated screen when the device lists several, so the iPhone Duo on iOS 27.2 passes the check. ([#4816](https://github.com/expo/eas-cli/pull/4816) by [@hSATAC](https://github.com/hSATAC))
-- Require the sandbox worker token for sandbox jobs and remove the sandbox GraphQL fallback. ([#4808](https://github.com/expo/eas-cli/pull/4808) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-## 27.5.0
-
-### Patch Changes
-
-- Stop an agent-device session that is still starting up when it is stopped. ([#4666](https://github.com/expo/eas-cli/pull/4666) by [@gwdp](https://github.com/gwdp))
-- Stop an Appium session that is still starting up when it is stopped. ([#4668](https://github.com/expo/eas-cli/pull/4668) by [@gwdp](https://github.com/gwdp))
-  Report temporary-directory cleanup failures when Stop interrupts Appium installation.
-- Stop an Argent session that is still starting up when it is stopped. ([#4667](https://github.com/expo/eas-cli/pull/4667) by [@gwdp](https://github.com/gwdp))
-- Use the sandbox worker token for sandbox jobs when www provides one, and keep Expo credentials out of the commands of those jobs. ([#4807](https://github.com/expo/eas-cli/pull/4807) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-- Stop a web-preview session that is still starting up when it is stopped. ([#4669](https://github.com/expo/eas-cli/pull/4669) by [@gwdp](https://github.com/gwdp))
-
-## 27.4.1
-
-### Patch Changes
-
-- Wait for a starting warm Simulator launcher before claiming its session, instead of falling back to a cold start. ([#4810](https://github.com/expo/eas-cli/pull/4810) by [@gwdp](https://github.com/gwdp))
-
-## 27.4.0
-
-### Minor Changes
-
-- Add `eas/start_warm_appium_remote_session`, which runs the Appium session on the warm Simulator, or starts cold. An `appium` claim stops the unused tools first, so WDA does not share the Simulator with the agent-device runner. ([#4735](https://github.com/expo/eas-cli/pull/4735) by [@gwdp](https://github.com/gwdp))
-- Add warm iOS session steps (`eas/start_warm_serve_sim_remote_session`, `eas/start_warm_agent_device_session`, `eas/start_warm_argent_remote_session`). They run the existing session on the warm Simulator, or start cold. `eas/start_agent_device_session` also accepts `install_app_path` and `launch_app_identifier`. ([#4723](https://github.com/expo/eas-cli/pull/4723) by [@gwdp](https://github.com/gwdp))
-- Update the app version and build number from the final application archive, so the build shows the values the native build resolved. ([#3499](https://github.com/expo/eas-cli/pull/3499) by [@kadikraman](https://github.com/kadikraman))
-
-### Patch Changes
-
-- Upload the final agent-device session artifacts before stopping the daemon, including sessions that reuse a warm Simulator. ([#4750](https://github.com/expo/eas-cli/pull/4750) by [@gwdp](https://github.com/gwdp))
-- Add internal helpers that claim the warm Simulator through the launcher and adopt it on the warm serve-sim. Skip the Expo Go install when the warm Simulator already has the same Expo Go version. ([#4724](https://github.com/expo/eas-cli/pull/4724) by [@gwdp](https://github.com/gwdp))
-- Recover warm Simulator recordings when their MP4 exists before the shutdown manifest is ready. ([#4789](https://github.com/expo/eas-cli/pull/4789) by [@gwdp](https://github.com/gwdp))
-
-## 27.3.0
-
-### Patch Changes
-
-- Stop warmup in the background for jobs that do not use the warm Simulator, so job setup does not wait for it. Before build-tools boots or clones a Simulator, it waits until the launcher's state file records that cleanup finished, and fails if cleanup does not finish in time. ([#4721](https://github.com/expo/eas-cli/pull/4721) by [@gwdp](https://github.com/gwdp))
-- Recover unhealthy device-session tunnels without changing their URLs and block further traffic when shutdown starts, even if ngrok cleanup times out. ([#4526](https://github.com/expo/eas-cli/pull/4526) by [@gwdp](https://github.com/gwdp))
-- Stop sending the SSH host when registering an SSH session. ([#4784](https://github.com/expo/eas-cli/pull/4784) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-## 27.2.0
-
-### Minor Changes
-
-- Use single-device previews when the session already has a valid device ID. ([#4733](https://github.com/expo/eas-cli/pull/4733) by [@gwdp](https://github.com/gwdp))
-
-### Patch Changes
-
-- Explain missing background task identifiers reported by App Store Connect. ([#3465](https://github.com/expo/eas-cli/pull/3465) by [@sjchmiela](https://github.com/sjchmiela))
-- Explain App Store Connect NOT_AUTHORIZED responses in the shared API client. ([#3462](https://github.com/expo/eas-cli/pull/3462) by [@sjchmiela](https://github.com/sjchmiela))
-- Explain App Store Connect UNEXPECTED_ERROR responses in the shared API client. ([#3467](https://github.com/expo/eas-cli/pull/3467) by [@sjchmiela](https://github.com/sjchmiela))
-- Explain missing app icons reported by App Store Connect, including codes 90022 and 90023, while preserving Apple’s validation details. ([#3466](https://github.com/expo/eas-cli/pull/3466) by [@sjchmiela](https://github.com/sjchmiela))
-- List failed Google Play commit attempts in order, including network failures, when the outcome is uncertain. ([#4660](https://github.com/expo/eas-cli/pull/4660) by [@sjchmiela](https://github.com/sjchmiela))
-- Fix a five-minute cleanup delay when a device session is canceled during startup and its screen recorder fails before connecting. ([#4761](https://github.com/expo/eas-cli/pull/4761) by [@gwdp](https://github.com/gwdp))
-- Handle TURN requests for a stopped device session without reporting a warning. ([#4762](https://github.com/expo/eas-cli/pull/4762) by [@gwdp](https://github.com/gwdp))
-- Preserve indented and incomplete Xcode compiler errors in formatted build logs, including the final diagnostic when logging stops. ([#4365](https://github.com/expo/eas-cli/pull/4365) by [@sjchmiela](https://github.com/sjchmiela))
-
-## 27.1.0
-
-### Patch Changes
-
-- Explain App Store Connect error 90189 as a duplicate build number. ([#3461](https://github.com/expo/eas-cli/pull/3461) by [@sjchmiela](https://github.com/sjchmiela))
-- Put the `NPM_TOKEN` registry credential in the builder's npm user config on EAS Build (`~/.npmrc`, or the file `NPM_CONFIG_USERCONFIG` names), where pnpm 10.34.2+ and 11.5.3+ still expand `${NPM_TOKEN}` (they ignore it in a project-level `.npmrc`). Explain what to change when the project's pnpm version needs a newer Node.js than the build runs, including when eas.json sets `node` or `pnpm`. ([#4729](https://github.com/expo/eas-cli/pull/4729) by [@hSATAC](https://github.com/hSATAC))
-- Install `@expo/repack-app` for the `eas/repack` step with npm in a sandbox that sees only `PATH` and its own `HOME`, so the build machine's npm and Yarn configuration cannot break the install, fetch it through the EAS npm cache when the job uses one, and show the installer output in the build log. The step no longer looks the version up separately before installing. When the npm cache fails, the install retries against the public registry like the project install does; the `eas/run_agent` agent CLI install shares the same helper and gains the same retry. ([#4728](https://github.com/expo/eas-cli/pull/4728) by [@hSATAC](https://github.com/hSATAC))
-
-## 27.0.0
-
-### Patch Changes
-
-- Keep the launched app open when an Appium iOS session starts. ([#4699](https://github.com/expo/eas-cli/pull/4699) by [@gwdp](https://github.com/gwdp))
-- Run Appium through the prepared Full Disk Access helper when available on macOS. ([#4622](https://github.com/expo/eas-cli/pull/4622) by [@gwdp](https://github.com/gwdp))
-- Identify the build or application archive when a download fails, and explain when the archive is no longer available. ([#4703](https://github.com/expo/eas-cli/pull/4703) by [@gwdp](https://github.com/gwdp))
-- Run apsd setup in the background without delaying iOS app launch or preview readiness. ([#4706](https://github.com/expo/eas-cli/pull/4706) by [@gwdp](https://github.com/gwdp))
-- Handle a device session stopped during startup as normal cleanup instead of reporting a startup error. ([#4716](https://github.com/expo/eas-cli/pull/4716) by [@gwdp](https://github.com/gwdp))
-- Support idle timeouts for iOS web-preview-only sessions, resetting the timer when preview input arrives. ([#4731](https://github.com/expo/eas-cli/pull/4731) by [@gwdp](https://github.com/gwdp))
-
-## 26.0.0
-
-### Major Changes
-
-- Remove legacy artifact type exports and route workflow uploads through workflow storage without file-type categories. Preserve workflow uploads and Maestro reports. ([#4719](https://github.com/expo/eas-cli/pull/4719) by [@sjchmiela](https://github.com/sjchmiela))
-
-### Minor Changes
-
-- Stop sandboxes after an optional maximum duration measured from readiness. ([#4702](https://github.com/expo/eas-cli/pull/4702) by [@sjchmiela](https://github.com/sjchmiela))
-- Unify signed URL uploading to a single implementation and use it everywhere. ([#4712](https://github.com/expo/eas-cli/pull/4712) by [@AHGIJMKLKKZNPJKQR](https://github.com/AHGIJMKLKKZNPJKQR))
-
-### Patch Changes
-
-- Default Android emulators to 4 GiB of RAM to reduce ADB disconnects during large transfers. Retain the 2 GiB default for API 34 and below outside interactive device sessions, and preserve explicit emulator configuration overrides. ([#4727](https://github.com/expo/eas-cli/pull/4727) by [@sjchmiela](https://github.com/sjchmiela))
-- Export `validateAndroidLaunchOptions` and `quoteAndroidShellCommand` from `@expo/eas-build-job`, so Android launch arguments can be checked for NUL characters and length before a simulator session starts, and check them before the emulator boots in agent-device sessions. ([#4696](https://github.com/expo/eas-cli/pull/4696) by [@brentvatne](https://github.com/brentvatne))
-- Retry transient failures when reporting that a device run session has started. ([#4680](https://github.com/expo/eas-cli/pull/4680) by [@gwdp](https://github.com/gwdp))
-- Retry the build lookup and the archive download of `eas/download_build` on transient failures, and name the failure cause in the build log. ([#4690](https://github.com/expo/eas-cli/pull/4690) by [@hSATAC](https://github.com/hSATAC))
-- Stop printing workflow hook parsing messages in build logs: native builds showed them under an "Unknown build phase" group, and custom builds warned about unknown hook keys and hooks on steps that never run. ([#4717](https://github.com/expo/eas-cli/pull/4717) by [@hSATAC](https://github.com/hSATAC))
-
-## 25.3.0
-
-### Minor Changes
-
-- Let serve-sim boot, install and launch Argent iOS sessions. ([#4602](https://github.com/expo/eas-cli/pull/4602) by [@gwdp](https://github.com/gwdp))
-- Let serve-sim boot, install and launch Appium iOS sessions. ([#4603](https://github.com/expo/eas-cli/pull/4603) by [@gwdp](https://github.com/gwdp))
-- Upload the screen recording session manifest as a JSON artifact alongside each video. ([#4689](https://github.com/expo/eas-cli/pull/4689) by [@gwdp](https://github.com/gwdp))
-
-### Patch Changes
-
-- Quote Android launch arguments and URLs for the device shell in simulator sessions, so values with spaces or shell characters reach `am start` as one argument; pass raw values and remove any shell quoting added as a workaround. ([#4695](https://github.com/expo/eas-cli/pull/4695) by [@brentvatne](https://github.com/brentvatne))
-- Wait up to five minutes for Google Play to finish processing an uploaded bundle before giving up on the edit commit. ([#4700](https://github.com/expo/eas-cli/pull/4700) by [@hSATAC](https://github.com/hSATAC))
-- Reset the device run session idle timer on iOS Simulator preview input. ([#4691](https://github.com/expo/eas-cli/pull/4691) by [@gwdp](https://github.com/gwdp))
-- Forward captured Simulator traffic through the local egress proxy. ([#4598](https://github.com/expo/eas-cli/pull/4598) by [@gwdp](https://github.com/gwdp))
-
-## 25.2.0
-
-### Minor Changes
-
-- Let serve-sim boot, install and launch agent-device iOS sessions with the local-egress guard. ([#4544](https://github.com/expo/eas-cli/pull/4544) by [@gwdp](https://github.com/gwdp))
-
-## 25.1.1
-
-### Patch Changes
-
-- Call www only through the device run session worker API in device run session jobs, and remove their GraphQL fallbacks. ([#4638](https://github.com/expo/eas-cli/pull/4638) by [@szdziedzic](https://github.com/szdziedzic))
-
-## 25.1.0
-
-### Minor Changes
-
-- Pass the `cors_origins` session input to serve-sim and expo-device-hub as `--cors-origin` origins, so a third party page can call the preview host API, for example with `@expo/hub-client`. ([#4657](https://github.com/expo/eas-cli/pull/4657) by [@krystofwoldrich](https://github.com/krystofwoldrich))
-- Pass the `frame_ancestors` session input to serve-sim and expo-device-hub as `--frame-ancestor` origins, so a third party can embed the preview host. ([#4655](https://github.com/expo/eas-cli/pull/4655) by [@krystofwoldrich](https://github.com/krystofwoldrich))
-
-### Patch Changes
-
-- Allocate 4 GiB of guest RAM to Android emulators in EAS Simulator sessions. ([#4640](https://github.com/expo/eas-cli/pull/4640) by [@gwdp](https://github.com/gwdp))
-- Retry transient Google Play API failures with exponential backoff while keeping uncertain commit results explicit. ([#4629](https://github.com/expo/eas-cli/pull/4629) by [@sjchmiela](https://github.com/sjchmiela))
-- Retry Google Play edit commits when an uploaded Android App Bundle is still processing, with bounded retries and progress warnings. ([#4651](https://github.com/expo/eas-cli/pull/4651) by [@sjchmiela](https://github.com/sjchmiela))
-- Report Google Play error responses to Sentry so unexplained submission failures can be classified. ([#4652](https://github.com/expo/eas-cli/pull/4652) by [@sjchmiela](https://github.com/sjchmiela))
-
-## 25.0.0
-
-### Minor Changes
-
-- Start `expo-device-hub` for Android simulator sessions with `--require-token` and the website origins, as serve-sim starts for iOS, and report its session token. ([#4578](https://github.com/expo/eas-cli/pull/4578) by [@krystofwoldrich](https://github.com/krystofwoldrich))
-- Respect saved sharing preferences for iOS simulator preview sessions. ([#4620](https://github.com/expo/eas-cli/pull/4620) by [@gwdp](https://github.com/gwdp))
-- Give agent-device and its simulator preview separate session logs. ([#4585](https://github.com/expo/eas-cli/pull/4585) by [@gwdp](https://github.com/gwdp))
-- Give Appium and its simulator preview separate session logs. ([#4586](https://github.com/expo/eas-cli/pull/4586) by [@gwdp](https://github.com/gwdp))
-- Give Argent and its simulator preview separate session logs. ([#4587](https://github.com/expo/eas-cli/pull/4587) by [@gwdp](https://github.com/gwdp))
-- Let serve-sim start the iOS Simulator for web-preview sessions. ([#4601](https://github.com/expo/eas-cli/pull/4601) by [@gwdp](https://github.com/gwdp))
-- Stream simulator preview output into its existing session step. ([#4525](https://github.com/expo/eas-cli/pull/4525) by [@gwdp](https://github.com/gwdp))
-
-### Patch Changes
-
-- Speed up cold iOS Appium sessions by launching preinstalled WebDriverAgent. ([#4618](https://github.com/expo/eas-cli/pull/4618) by [@gwdp](https://github.com/gwdp))
-- Call the device run session worker API with the session token when www provides one. ([#4615](https://github.com/expo/eas-cli/pull/4615) by [@szdziedzic](https://github.com/szdziedzic))
-- Clarify Google Play submission messages and reject zero Android submission rollouts. ([#4625](https://github.com/expo/eas-cli/pull/4625) by [@sjchmiela](https://github.com/sjchmiela))

packages/build-tools/jest/ffmpeg-config.ts

@@ -1,13 +0,0 @@
-import type { Config } from '@jest/types';
-
-import baseConfig from '../../../jest/jest.shared.config';
-
-const config: Config.InitialOptions = {
-  ...baseConfig,
-  rootDir: '../src',
-  testMatch: ['**/__tests__/*.test.ffmpeg.ts'],
-  clearMocks: true,
-  setupFilesAfterEnv: ['<rootDir>/../jest/setup-tests.ts'],
-};
-
-export default config;

packages/build-tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "27.7.0",
+  "version": "24.8.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <[email protected]>",
@@ -23,37 +23,36 @@
     "watch": "tsc --watch --preserveWatchOutput",
     "prebuild": "yarn gql",
     "build": "tsc",
+    "build:record-sim": "mkdir -p bin && record_sim_bin_path=$(swift build -c release --package-path resources/record-sim --build-path resources/record-sim/.build --show-bin-path) && swift build -c release --package-path resources/record-sim --build-path resources/record-sim/.build && cp \"$record_sim_bin_path/record-sim\" bin/record-sim && chmod +x bin/record-sim",
     "build:egress-guard": "resources/egress-guard/build.sh",
     "test:egress-guard": "resources/egress-guard/tests/run-policy-tests.sh && resources/egress-guard/tests/run-guard-tests.sh",
     "typecheck": "tsc",
-    "generate-appium-commands": "mise exec [email protected]3.4 -- node scripts/generate-appium-commands.js",
+    "generate-appium-commands": "mise exec [email protected]2.0 -- node scripts/generate-appium-commands.js",
     "prepack": "rimraf dist \"*.tsbuildinfo\" && yarn gql && tsc -p tsconfig.build.json",
     "jest-unit": "jest --config jest/unit-config.ts",
     "jest-integration": "jest --config jest/integration-config.ts",
-    "jest-ffmpeg": "jest --config jest/ffmpeg-config.ts",
     "jest-unit-watch": "jest --config jest/unit-config.ts --watch",
     "jest-integration-watch": "jest --config jest/integration-config.ts --watch",
     "clean": "rimraf node_modules dist coverage \"*.tsbuildinfo\"",
     "gql": "gql.tada generate-schema ${API_SERVER_URL:-https://api.expo.dev}/graphql --output ./schema.graphql && gql.tada generate-output",
     "gql:local": "API_SERVER_URL=http://api.expo.test yarn gql",
-    "verify-graphql-code": "./scripts/verify-graphql.sh",
     "test": "yarn jest-unit"
   },
   "dependencies": {
     "@expo/config": "55.0.10",
     "@expo/config-plugins": "55.0.7",
-    "@expo/downloader": "27.7.0",
-    "@expo/eas-build-job": "27.7.0",
+    "@expo/downloader": "24.8.0",
+    "@expo/eas-build-job": "24.8.0",
     "@expo/env": "^0.4.0",
-    "@expo/logger": "27.7.0",
+    "@expo/logger": "24.8.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.7.0",
-    "@expo/template-file": "27.7.0",
-    "@expo/turtle-spawn": "27.7.0",
-    "@expo/xcpretty": "^4.4.7",
+    "@expo/steps": "24.8.0",
+    "@expo/template-file": "24.8.0",
+    "@expo/turtle-spawn": "24.8.0",
+    "@expo/xcpretty": "^4.3.1",
     "@ngrok/ngrok": "1.7.0",
     "@sentry/node": "7.77.0",
     "@urql/core": "^6.0.1",
@@ -89,7 +88,7 @@
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.4",
-    "@types/node": "22.20.5",
+    "@types/node": "20.19.43",
     "@types/node-fetch": "^2.6.11",
     "@types/node-forge": "^1.3.11",
     "@types/plist": "^3.0.5",

packages/build-tools/resources/egress-guard/README.md

@@ -71,17 +71,6 @@ by a coverage report from `lsof`, listing any process without the library. Both
 `packages/worker/package.sh` for the iOS worker tarball and by the
 `test-egress-guard` EAS workflow, not committed.
 
-For serve-sim-owned iOS session startup, build-tools passes the guard through
-`SERVE_SIM_ADDITIONAL_DYLIBS` and its configuration and proxy variables through
-inherited `SIMCTL_CHILD_` variables. It shuts down an already booted selected
-device so every process inherits the guard. Serve-sim boots that device while
-build-tools prepares the app. After serve-sim's control endpoint is available,
-build-tools runs the packaged guard self-check before requesting installation
-and launch through the authenticated host API. Preview readiness and application
-startup both complete before reporting the remote session live. Build-tools keeps
-the event relay and egress cleanup without rewriting launchd's dylib list after
-serve-sim adds its capability loader.
-
 Failure semantics: a missing library, a failed `launchctl setenv`, or a failed
 self-check fails the session, since a `--egress local` session without the
 guard would silently leak. Only an unwritable event log is a warning, because

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

packages/build-tools/scripts/verify-graphql.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -eox pipefail
-
-# Generated GraphQL files are untracked, so always regenerate and check compatibility.
-yarn gql
-yarn run -T lerna run build --scope @expo/build-tools --include-dependencies

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

@@ -2,7 +2,6 @@ import {
   BuildPhase,
   BuildPhaseResult,
   BuildTrigger,
-  EnvironmentSecretType,
   Job,
   Metadata,
   Platform,
@@ -32,34 +31,6 @@ describe('BuildContext', () => {
     (fs.readdir as unknown as jest.Mock).mockResolvedValue([]);
   });
 
-  it('keeps the sandbox worker token out of the env and keeps the other secrets', () => {
-    const ctx = new BuildContext(
-      {
-        triggeredBy: BuildTrigger.GIT_BASED_INTEGRATION,
-        secrets: {
-          environmentSecrets: [
-            {
-              name: 'EAS_SANDBOX_WORKER_TOKEN',
-              value: 'sandbox-worker-token',
-              type: EnvironmentSecretType.STRING,
-            },
-            { name: 'KEEP', value: 'value', type: EnvironmentSecretType.STRING },
-          ],
-        },
-      } as Job,
-      {
-        env: { __API_SERVER_URL: 'https://api.expo.test' },
-        workingdir: '/workingdir',
-        logger: createMockLogger(),
-        logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
-        uploadArtifact: jest.fn(),
-      }
-    );
-
-    expect(ctx.env.EAS_SANDBOX_WORKER_TOKEN).toBeUndefined();
-    expect(ctx.env.KEEP).toBe('value');
-  });
-
   it('should merge secrets', async () => {
     const robotAccessToken = randomUUID();
     await vol.promises.mkdir('/workingdir/eas-environment-secrets/', { recursive: true });

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

@@ -318,110 +318,6 @@ describe('Datadog singleton', () => {
     );
   });
 
-  it('POSTs distribution metrics to the device run session worker API with the session token', () => {
-    turtleFetchMock.mockResolvedValueOnce({} as Response);
-
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      deviceRunSessionToken: 'session-token',
-      target: { kind: 'deviceRunSession' },
-    });
-
-    Datadog.distribution('eas.workflow.hook', 1, { hook: 'on_start' });
-
-    expect(turtleFetchMock).toHaveBeenCalledWith(
-      'https://api.expo.test/v2/device-run-session-worker/metrics',
-      'POST',
-      {
-        json: {
-          metrics: [
-            {
-              name: 'eas.workflow.hook',
-              type: 'distribution',
-              value: 1,
-              tags: { hook: 'on_start', target: 'job_run' },
-            },
-          ],
-        },
-        headers: { 'expo-device-run-session-token': 'session-token' },
-        retries: 2,
-      }
-    );
-  });
-
-  it('does not report logs for device run session targets', () => {
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      deviceRunSessionToken: 'session-token',
-      target: { kind: 'deviceRunSession' },
-    });
-
-    Datadog.log('Custom build saw user-provided function');
-
-    expect(turtleFetchMock).not.toHaveBeenCalled();
-  });
-
-  it('POSTs distribution metrics to the sandbox worker API with the sandbox worker token', () => {
-    turtleFetchMock.mockResolvedValueOnce({} as Response);
-
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      sandboxWorkerToken: 'sandbox-token',
-      target: { kind: 'sandbox' },
-    });
-
-    Datadog.distribution('eas.workflow.hook', 1, { hook: 'on_start' });
-
-    expect(turtleFetchMock).toHaveBeenCalledWith(
-      'https://api.expo.test/v2/sandbox-worker/metrics',
-      'POST',
-      {
-        json: {
-          metrics: [
-            {
-              name: 'eas.workflow.hook',
-              type: 'distribution',
-              value: 1,
-              tags: { hook: 'on_start', target: 'job_run' },
-            },
-          ],
-        },
-        headers: { 'expo-sandbox-worker-token': 'sandbox-token' },
-        retries: 2,
-      }
-    );
-  });
-
-  it('labels metric upload failures for sandbox targets with the sandbox kind', async () => {
-    turtleFetchMock.mockRejectedValueOnce(new Error('network down'));
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      sandboxWorkerToken: 'sandbox-token',
-      target: { kind: 'sandbox' },
-    });
-
-    Datadog.distribution('eas.workflow.hook', 1);
-    await flushPromises();
-
-    expect(sentryCaptureMock).toHaveBeenCalledWith(
-      'Failed to report turtle sandbox metric',
-      expect.any(Error),
-      expect.anything()
-    );
-  });
-
-  it('does not report logs for sandbox targets', () => {
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      sandboxWorkerToken: 'sandbox-token',
-      target: { kind: 'sandbox' },
-    });
-
-    Datadog.log('Custom build saw user-provided function');
-
-    expect(turtleFetchMock).not.toHaveBeenCalled();
-  });
-
   it('flushes pending metric uploads', async () => {
     let resolveUpload!: (response: Response) => void;
     turtleFetchMock.mockReturnValueOnce(

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

@@ -1,22 +0,0 @@
-import { type watchDeviceRunSessionStartup } from '../../steps/utils/deviceRunSessionStartup';
-import { DeviceRunSessionStoppedError } from '../../steps/utils/remoteDeviceRunSession';
-
-/**
- * A `watchDeviceRunSessionStartup` stand-in that never polls. A test calls `stop` on the
- * returned watch (`jest.mocked(watchDeviceRunSessionStartup).mock.results[0].value`) to act like
- * a Stop request during startup.
- */
-export function createStartupWatchMock({
-  startup,
-}: Parameters<typeof watchDeviceRunSessionStartup>[0]): ReturnType<
-  typeof watchDeviceRunSessionStartup
-> & { stop: () => void } {
-  const stopped = new DeviceRunSessionStoppedError('Stopped during startup.');
-  return {
-    stopped,
-    stop: () => startup.abort(stopped),
-    isStopped: () => startup.signal.reason === stopped,
-    completeAsync: jest.fn(async () => startup.signal.throwIfAborted()),
-    finishAsync: jest.fn(async () => {}),
-  };
-}

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

@@ -1,5 +0,0 @@
-import { Android } from '@expo/eas-build-job';
-
-export function resolveArtifactPath(job: Android.Job): string {
-  return job.applicationArchivePath ?? 'android/app/build/outputs/**/*.{apk,aab}';
-}

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/builders/__tests__/android.test.ts

@@ -53,15 +53,14 @@ jest.mock('../../steps/utils/android/gradleConfig', () => ({
   injectCredentialsGradleConfig: jest.fn(),
 }));
 jest.mock('../../utils/artifacts', () => ({
-  uploadApplicationArchive: jest.fn(async () => []),
+  uploadApplicationArchive: jest.fn(),
 }));
 jest.mock('../../utils/expoUpdates', () => ({
   configureExpoUpdatesIfInstalledAsync: jest.fn(),
   resolveRuntimeVersionForExpoUpdatesIfConfiguredAsync: jest.fn(async () => null),
 }));
 jest.mock('../../utils/expoUpdatesEmbedded', () => ({
-  ...jest.requireActual('../../utils/expoUpdatesEmbedded'),
-  uploadEmbeddedBundleAsync: jest.fn(async () => ({ status: 'uploaded' })),
+  uploadEmbeddedBundleAsync: jest.fn(),
 }));
 jest.mock('../../utils/hooks', () => ({
   Hook: {
@@ -318,108 +317,36 @@ describe(androidBuilder, () => {
     expect(runBuilderWithHooksAsync).toHaveBeenCalledWith(ctx, expect.any(Function));
   });
 
-  describe('embedded bundle upload phase', () => {
-    function createContext({
-      env = {},
-      sdkVersion,
-    }: {
-      env?: Record<string, string>;
-      sdkVersion?: string;
-    }): BuildContext<Android.Job> {
-      return new BuildContext(createTestAndroidJob(), {
-        workingdir: '/workingdir',
-        logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
-        logger: createMockLogger(),
-        env: {
-          __API_SERVER_URL: 'http://api.expo.test',
-          ...env,
-        },
-        uploadArtifact: jest.fn(),
-        metadata: sdkVersion ? { sdkVersion } : undefined,
-      });
-    }
-
-    it('runs by default on SDK 58 and later', async () => {
-      const ctx = createContext({ sdkVersion: '58.0.0' });
-
-      await androidBuilder(ctx);
-
-      expect(uploadEmbeddedBundleAsync).toHaveBeenCalledWith(
-        expect.objectContaining({ job: ctx.job, env: ctx.env, projectDir: '/workingdir/build' })
-      );
+  it('runs the embedded bundle upload phase when EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE is set', async () => {
+    const ctx = new BuildContext(createTestAndroidJob(), {
+      workingdir: '/workingdir',
+      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
+      logger: createMockLogger(),
+      env: {
+        __API_SERVER_URL: 'http://api.expo.test',
+        EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE: '1',
+      },
+      uploadArtifact: jest.fn(),
     });
 
-    it.each([
-      ['uploaded', BuildPhaseResult.SUCCESS],
-      ['skipped', BuildPhaseResult.SKIPPED],
-      ['failed', BuildPhaseResult.WARNING],
-    ] as const)('marks the phase from the %s result', async (uploadResult, phaseResult) => {
-      jest.mocked(uploadEmbeddedBundleAsync).mockResolvedValueOnce({ status: uploadResult });
-      const ctx = createContext({ sdkVersion: '58.0.0' });
+    await androidBuilder(ctx);
 
-      await androidBuilder(ctx);
+    expect(uploadEmbeddedBundleAsync).toHaveBeenCalledWith(ctx);
+  });
 
-      expect(datadogDistributionMock).toHaveBeenCalledWith(
-        'eas.build.phase_duration',
-        expect.any(Number),
-        expect.objectContaining({
-          build_phase: BuildPhase.UPLOAD_EMBEDDED_BUNDLE.toLowerCase(),
-          result: phaseResult,
-        })
-      );
+  it('skips the embedded bundle upload phase when EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE is not set', async () => {
+    const ctx = new BuildContext(createTestAndroidJob(), {
+      workingdir: '/workingdir',
+      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
+      logger: createMockLogger(),
+      env: {
+        __API_SERVER_URL: 'http://api.expo.test',
+      },
+      uploadArtifact: jest.fn(),
     });
 
-    it('skips by default on SDK 57 and earlier', async () => {
-      const ctx = createContext({ sdkVersion: '57.0.0' });
+    await androidBuilder(ctx);
 
-      await androidBuilder(ctx);
-
-      expect(uploadEmbeddedBundleAsync).not.toHaveBeenCalled();
-    });
-
-    it('skips by default when the SDK version is unknown', async () => {
-      const ctx = createContext({});
-
-      await androidBuilder(ctx);
-
-      expect(uploadEmbeddedBundleAsync).not.toHaveBeenCalled();
-    });
-
-    it('runs on SDK 57 and earlier when EAS_UPDATE_UPLOAD_EMBEDDED_BUNDLE is 1', async () => {
-      const ctx = createContext({
-        sdkVersion: '57.0.0',
-        env: { EAS_UPDATE_UPLOAD_EMBEDDED_BUNDLE: '1' },
-      });
-
-      await androidBuilder(ctx);
-
-      expect(uploadEmbeddedBundleAsync).toHaveBeenCalledWith(
-        expect.objectContaining({ job: ctx.job })
-      );
-    });
-
-    it('skips on SDK 58 and later when EAS_UPDATE_UPLOAD_EMBEDDED_BUNDLE is 0', async () => {
-      const ctx = createContext({
-        sdkVersion: '58.0.0',
-        env: { EAS_UPDATE_UPLOAD_EMBEDDED_BUNDLE: '0' },
-      });
-
-      await androidBuilder(ctx);
-
-      expect(uploadEmbeddedBundleAsync).not.toHaveBeenCalled();
-    });
-
-    it('runs on SDK 57 and earlier when the experimental EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE is 1', async () => {
-      const ctx = createContext({
-        sdkVersion: '57.0.0',
-        env: { EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE: '1' },
-      });
-
-      await androidBuilder(ctx);
-
-      expect(uploadEmbeddedBundleAsync).toHaveBeenCalledWith(
-        expect.objectContaining({ job: ctx.job })
-      );
-    });
+    expect(uploadEmbeddedBundleAsync).not.toHaveBeenCalled();
   });
 });

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

@@ -11,16 +11,11 @@ import {
   runGradleCommand,
 } from '../android/gradle';
 import { formatGradleProfileReport, parseGradleProfile } from '../android/gradleProfile';
-import { resolveArtifactPath } from '../android/resolve';
 import { Sentry } from '../sentry';
 import { eagerBundleAsync, shouldUseEagerBundle } from '../common/eagerBundle';
 import { prebuildAsync } from '../common/prebuild';
 import { JobHooksRef, setupAsync } from '../common/setup';
 import { Artifacts, BuildContext, SkipNativeBuildError } from '../context';
-import {
-  extractAndroidVersionAsync,
-  updateResolvedVersionAsync,
-} from '../steps/functions/updateResolvedVersion';
 import {
   cacheStatsAsync,
   restoreCcacheAsync,
@@ -37,10 +32,7 @@ import {
   configureExpoUpdatesIfInstalledAsync,
   resolveRuntimeVersionForExpoUpdatesIfConfiguredAsync,
 } from '../utils/expoUpdates';
-import {
-  shouldUploadEmbeddedBundle,
-  uploadEmbeddedBundleAsync,
-} from '../utils/expoUpdatesEmbedded';
+import { uploadEmbeddedBundleAsync } from '../utils/expoUpdatesEmbedded';
 import { Hook, runHookIfPresent } from '../utils/hooks';
 import { prepareExecutableAsync } from '../utils/prepareBuildExecutable';
 
@@ -224,46 +216,16 @@ async function buildInnerAsync(
   });
 
   await ctx.runBuildPhase(BuildPhase.UPLOAD_APPLICATION_ARCHIVE, async () => {
-    const [archivePath] = await uploadApplicationArchive(ctx, {
-      patternOrPath: resolveArtifactPath(ctx.job),
+    await uploadApplicationArchive(ctx, {
+      patternOrPath: ctx.job.applicationArchivePath ?? 'android/app/build/outputs/**/*.{apk,aab}',
       rootDir: ctx.getReactNativeProjectDirectory(),
       logger: ctx.logger,
     });
-    const buildId = ctx.env.EAS_BUILD_ID;
-    if (!archivePath || !buildId) {
-      return;
-    }
-    try {
-      const { appVersion, appBuildVersion } = await extractAndroidVersionAsync(archivePath);
-      if (appVersion || appBuildVersion) {
-        await updateResolvedVersionAsync(ctx.graphqlClient, buildId, {
-          appVersion,
-          appBuildVersion,
-        });
-        ctx.logger.info(
-          `Updated resolved version: ${appVersion ?? 'N/A'} (${appBuildVersion ?? 'N/A'})`
-        );
-      }
-    } catch (err: any) {
-      Sentry.capture('Failed to update resolved version', err);
-      ctx.logger.warn({ err }, 'Failed to update resolved version (non-fatal)');
-    }
   });
 
-  if (shouldUploadEmbeddedBundle(ctx)) {
+  if (ctx.env.EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE) {
     await ctx.runBuildPhase(BuildPhase.UPLOAD_EMBEDDED_BUNDLE, async () => {
-      const { status } = await uploadEmbeddedBundleAsync({
-        job: ctx.job,
-        env: ctx.env,
-        logger: ctx.logger,
-        projectDir: ctx.getReactNativeProjectDirectory(),
-        appConfig: await ctx.appConfig,
-      });
-      if (status === 'skipped') {
-        ctx.markBuildPhaseSkipped();
-      } else if (status === 'failed') {
-        ctx.markBuildPhaseHasWarnings();
-      }
+      await uploadEmbeddedBundleAsync(ctx);
     });
   }
 

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

@@ -18,10 +18,6 @@ import { downloadApplicationArchiveAsync } from '../ios/resign';
 import { resolveArtifactPath, resolveBuildConfiguration, resolveScheme } from '../ios/resolve';
 import { Sentry } from '../sentry';
 import { parseAndReportXcactivitylog } from '../steps/utils/ios/xcactivitylog';
-import {
-  extractIosVersionAsync,
-  updateResolvedVersionAsync,
-} from '../steps/functions/updateResolvedVersion';
 import {
   cacheStatsAsync,
   restoreCcacheAsync,
@@ -33,10 +29,7 @@ import {
   configureExpoUpdatesIfInstalledAsync,
   resolveRuntimeVersionForExpoUpdatesIfConfiguredAsync,
 } from '../utils/expoUpdates';
-import {
-  shouldUploadEmbeddedBundle,
-  uploadEmbeddedBundleAsync,
-} from '../utils/expoUpdatesEmbedded';
+import { uploadEmbeddedBundleAsync } from '../utils/expoUpdatesEmbedded';
 import { Hook, runHookIfPresent } from '../utils/hooks';
 import { prepareExecutableAsync } from '../utils/prepareBuildExecutable';
 import { getParentAndDescendantProcessPidsAsync } from '../utils/processes';
@@ -240,46 +233,16 @@ async function buildInnerAsync(
   });
 
   await ctx.runBuildPhase(BuildPhase.UPLOAD_APPLICATION_ARCHIVE, async () => {
-    const [archivePath] = await uploadApplicationArchive(ctx, {
-      patternOrPath: resolveArtifactPath(ctx.job),
+    await uploadApplicationArchive(ctx, {
+      patternOrPath: resolveArtifactPath(ctx),
       rootDir: ctx.getReactNativeProjectDirectory(),
       logger: ctx.logger,
     });
-    const buildId = ctx.env.EAS_BUILD_ID;
-    if (!archivePath || !buildId) {
-      return;
-    }
-    try {
-      const { appVersion, appBuildVersion } = await extractIosVersionAsync(archivePath);
-      if (appVersion || appBuildVersion) {
-        await updateResolvedVersionAsync(ctx.graphqlClient, buildId, {
-          appVersion,
-          appBuildVersion,
-        });
-        ctx.logger.info(
-          `Updated resolved version: ${appVersion ?? 'N/A'} (${appBuildVersion ?? 'N/A'})`
-        );
-      }
-    } catch (err: any) {
-      Sentry.capture('Failed to update resolved version', err);
-      ctx.logger.warn({ err }, 'Failed to update resolved version (non-fatal)');
-    }
   });
 
-  if (shouldUploadEmbeddedBundle(ctx)) {
+  if (ctx.env.EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE) {
     await ctx.runBuildPhase(BuildPhase.UPLOAD_EMBEDDED_BUNDLE, async () => {
-      const { status } = await uploadEmbeddedBundleAsync({
-        job: ctx.job,
-        env: ctx.env,
-        logger: ctx.logger,
-        projectDir: ctx.getReactNativeProjectDirectory(),
-        appConfig: await ctx.appConfig,
-      });
-      if (status === 'skipped') {
-        ctx.markBuildPhaseSkipped();
-      } else if (status === 'failed') {
-        ctx.markBuildPhaseHasWarnings();
-      }
+      await uploadEmbeddedBundleAsync(ctx);
     });
   }
 

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

@@ -16,13 +16,11 @@ function createCtx(
   { workingdir = '/tmp/wd' }: { workingdir?: string } = {}
 ): {
   ctx: BuildContext<Ios.Job>;
-  info: jest.Mock;
   warn: jest.Mock;
 } {
-  const info = jest.fn();
   const warn = jest.fn();
   const logger = {
-    info,
+    info: jest.fn(),
     debug: jest.fn(),
     error: jest.fn(),
     warn,
@@ -38,7 +36,7 @@ function createCtx(
       workingdir,
     }
   );
-  return { ctx, info, warn };
+  return { ctx, warn };
 }
 
 // Project checkout lives at <workingdir>/build (job projectRootDirectory is '.').
@@ -81,31 +79,22 @@ describe(parseJobHooksAsync, () => {
     });
   });
 
-  it('writes nothing to the build log while parsing', async () => {
-    const { ctx, info, warn } = createCtx({
-      before_install_node_modules: [{ run: 'echo hi' }],
-      before_submit: [{ run: 'echo hi' }],
-      before_bogus: [{ run: 'echo hi' }],
-    });
-    await parseJobHooksAsync(ctx, INSTALL);
-    expect(info).not.toHaveBeenCalled();
-    expect(warn).not.toHaveBeenCalled();
-  });
-
-  it('treats an unknown hook key as inert', async () => {
-    const { ctx } = createCtx({
+  it('treats an unknown hook key as inert and warns', async () => {
+    const { ctx, warn } = createCtx({
       before_bogus: [{ run: 'echo hi' }],
     });
     const parsed = await parseJobHooksAsync(ctx, INSTALL);
     expect(parsed!.hookEntriesByKey).toEqual({});
+    expect(warn).toHaveBeenCalledWith(expect.stringContaining('unknown hook key "before_bogus"'));
   });
 
-  it('shape-checks a registered-but-unwrapped key, then skips it', async () => {
-    const { ctx } = createCtx({
+  it('shape-checks a registered-but-unwrapped key, then warns and skips it', async () => {
+    const { ctx, warn } = createCtx({
       before_submit: [{ run: 'echo hi' }],
     });
     const parsed = await parseJobHooksAsync(ctx, INSTALL);
     expect(parsed!.hookEntriesByKey.before_submit).toBeUndefined();
+    expect(warn).toHaveBeenCalledWith(expect.stringContaining('hooks.before_submit'));
   });
 
   it('shape-validates a registered-but-unwrapped key even though it is skipped', async () => {
@@ -203,9 +192,10 @@ describe(parseJobHooksAsync, () => {
   });
 
   it('never loads a composite function referenced under a registered-but-unwrapped key', async () => {
-    const { ctx } = createCtx({ before_submit: [{ uses: './.eas/functions/missing' }] });
+    const { ctx, warn } = createCtx({ before_submit: [{ uses: './.eas/functions/missing' }] });
     const parsed = await parseJobHooksAsync(ctx, INSTALL);
     expect(parsed!.hookEntriesByKey).toEqual({});
+    expect(warn).toHaveBeenCalledWith(expect.stringContaining('hooks.before_submit'));
   });
 
   it('wraps a cross-key duplicate step id in the aggregate error', async () => {

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

@@ -2,7 +2,6 @@ import {
   ArchiveSourceType,
   BuildMode,
   BuildTrigger,
-  EnvironmentSecretType,
   ErrorCode,
   Job,
   Platform,
@@ -13,7 +12,6 @@ import spawn from '@expo/turtle-spawn';
 import { randomBytes, randomUUID } from 'crypto';
 import { vol } from 'memfs';
 import fetch, { Response } from 'node-fetch';
-import { Readable } from 'stream';
 import { setTimeout } from 'timers/promises';
 
 import { createMockLogger } from '../../__tests__/utils/logger';
@@ -117,73 +115,6 @@ describe('projectSources', () => {
     );
   });
 
-  it('fetches a sandbox project source from the sandbox worker router with only the worker token', async () => {
-    const gitCommitHash = randomBytes(20).toString('hex');
-    const ctx = new BuildContext(
-      {
-        triggeredBy: BuildTrigger.GIT_BASED_INTEGRATION,
-        projectArchive: {
-          type: ArchiveSourceType.GIT,
-          gitRef: 'refs/heads/main',
-          gitCommitHash,
-        },
-        secrets: {
-          robotAccessToken: 'sandbox-worker-token',
-          environmentSecrets: [
-            {
-              name: 'EAS_SANDBOX_WORKER_TOKEN',
-              type: EnvironmentSecretType.STRING,
-              value: 'sandbox-worker-token',
-            },
-          ],
-        },
-      } as unknown as Job,
-      {
-        env: {
-          __API_SERVER_URL: 'https://api.expo.dev',
-          EAS_BUILD_ID: randomUUID(),
-          EAS_BUILD_RUNNER: 'eas-build',
-        },
-        workingdir: '/workingdir',
-        logger: createMockLogger(),
-        logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
-        uploadArtifact: jest.fn(),
-      }
-    );
-    const fetchMock = jest.mocked(fetch);
-    fetchMock.mockImplementation(
-      async () =>
-        ({
-          ok: true,
-          json: async () => ({
-            data: {
-              gitRef: 'refs/heads/main',
-              gitCommitHash,
-              repositoryUrl: 'https://x-access-token:[email protected]/expo/eas-cli.git',
-              type: ArchiveSourceType.GIT,
-            },
-          }),
-        }) as Response
-    );
-
-    await prepareProjectSourcesAsync(ctx, ctx.buildDirectory);
-
-    expect(fetchMock).toHaveBeenCalledWith(
-      'https://api.expo.dev/v2/sandbox-worker/project-archive',
-      expect.objectContaining({
-        method: 'POST',
-        headers: { 'expo-sandbox-worker-token': 'sandbox-worker-token' },
-      })
-    );
-    expect(shallowCloneRepositoryAsync).toHaveBeenCalledWith(
-      expect.objectContaining({
-        archiveSource: expect.objectContaining({
-          repositoryUrl: 'https://x-access-token:[email protected]/expo/eas-cli.git',
-        }),
-      })
-    );
-  });
-
   it.each(['http', 'network', 'json', 'schema', 'missing-url', 'PATH', 'GCS', 'R2'])(
     'throws a system error if refresh fails (%s)',
     async failure => {
@@ -459,13 +390,7 @@ describe('projectSources', () => {
       ctx.graphqlClient.mutation = mockGraphqlMutation as any;
 
       const fetchMock = jest.mocked(fetch);
-      let uploadedBody = '';
-      fetchMock.mockImplementation(async (_url, request) => {
-        for await (const chunk of request!.body as Readable) {
-          uploadedBody += chunk;
-        }
-        return { ok: true } as Response;
-      });
+      fetchMock.mockImplementation(async () => ({ ok: true }) as Response);
       fetchMock.mockResolvedValueOnce({
         ok: true,
         json: async () => ({ data: ctx.job.projectArchive }),
@@ -489,14 +414,10 @@ describe('projectSources', () => {
         'https://storage.example.com/upload',
         expect.objectContaining({
           method: 'PUT',
-          headers: {
-            'x-custom-header': 'value',
-            'content-length': '63',
-            'content-type': 'text/plain;charset=UTF-8',
-          },
+          headers: { 'x-custom-header': 'value' },
+          body: '{"archiveContent":["project/README.md","project/package.json"]}',
         })
       );
-      expect(uploadedBody).toBe('{"archiveContent":["project/README.md","project/package.json"]}');
 
       // Verify build metadata was updated
       expect(mockGraphqlMutation).toHaveBeenNthCalledWith(

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

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

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

@@ -44,8 +44,9 @@ export async function runHookableBuildPhaseAsync<TJob extends BuildJob, T>({
     if (hooks) {
       try {
         await runHookEntriesAsync({ ctx, hooks, timing: 'after', anchor, anchorFailed: true });
-      } catch {
-        // The phase error wins.
+      } catch (hookError) {
+        // The phase error wins; still surface the after-hook failure in the log.
+        ctx.logger.error({ err: hookError }, `after_${anchor} hook failed`);
       }
     }
     throw phaseError;

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

@@ -53,17 +53,19 @@ export async function parseJobHooksAsync<TJob extends BuildJob>(
   const globalContext = new BuildStepGlobalContext(customBuildContext, false);
   // Hook steps run in the checked-out project directory, not the pre-checkout
   // target directory the global context defaults to.
-  globalContext.markAsCheckedOut();
+  globalContext.markAsCheckedOut(ctx.logger);
 
   const externalFunctions = getEasFunctions(customBuildContext);
   const externalFunctionGroups = getEasFunctionGroups(customBuildContext);
 
   // Shape-validate every REGISTERED key, reachable or not (steps-world parity:
-  // a malformed `before_submit` fails a steps build, so it fails here too). An
-  // unknown key is inert — a key newer than this worker must be ignored, never
-  // fail the job.
+  // a malformed `before_submit` fails a steps build, so it fails here too), and
+  // warn on keys this build won't run. An unknown key is inert — a key newer
+  // than this worker must be ignored, never fail the job.
   for (const [key, steps] of Object.entries(hooks)) {
-    if (parseHookKey(key) === null) {
+    const parsed = parseHookKey(key);
+    if (parsed === null) {
+      ctx.logger.warn(`Ignoring unknown hook key "${key}".`);
       continue;
     }
     if (Array.isArray(steps) && steps.length === 0) {
@@ -79,6 +81,15 @@ export async function parseJobHooksAsync<TJob extends BuildJob>(
         { cause: err }
       );
     }
+    // Registered but not wrapped by this build: shape-checked above, then
+    // skipped. Function existence is deliberately NOT checked (that happens only
+    // during construction) — an unknown `uses:` under an unwrapped key warns
+    // rather than failing the build.
+    if (!wrappedAnchors.includes(parsed.anchorId)) {
+      ctx.logger.warn(
+        `Ignoring "hooks.${key}": this build does not run the "${parsed.anchorId}" step.`
+      );
+    }
   }
 
   // Construct entries for the wrapped anchors in EXECUTION order (per anchor,

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

@@ -1,15 +0,0 @@
-import { ArchiveSourceType } from '@expo/eas-build-job';
-import { z } from 'zod';
-
-export const ProjectArchiveSourceSchema = z.discriminatedUnion('type', [
-  z.object({
-    type: z.literal(ArchiveSourceType.GIT),
-    repositoryUrl: z.string().url(),
-    gitRef: z.string().nullable(),
-    gitCommitHash: z.string(),
-  }),
-  z.object({ type: z.literal(ArchiveSourceType.URL), url: z.string().url() }),
-  z.object({ type: z.literal(ArchiveSourceType.NONE) }),
-]);
-
-export type ProjectArchiveSource = z.infer<typeof ProjectArchiveSourceSchema>;

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

@@ -5,15 +5,13 @@ import { asyncResult } from '@expo/results';
 import spawn from '@expo/turtle-spawn';
 import fs from 'fs/promises';
 import { graphql } from 'gql.tada';
+import fetch from 'node-fetch';
 import nullthrows from 'nullthrows';
 import path from 'path';
 import { z } from 'zod';
 
 import { shallowCloneRepositoryAsync } from './git';
-import { type ProjectArchiveSource, ProjectArchiveSourceSchema } from './projectArchiveSource';
 import { BuildContext } from '../context';
-import { getSandboxWorkerApi } from '../steps/utils/sandboxWorkerApi';
-import { uploadContentWithSignedUrl } from '../storage/uploadWithSignedUrl';
 import { turtleFetch } from '../utils/turtleFetch';
 
 export async function prepareProjectSourcesAsync<TJob extends Job>(
@@ -210,9 +208,10 @@ async function uploadProjectMetadataAsync(
     headers: Record<string, string>;
   };
 
-  await uploadContentWithSignedUrl({
-    signedUrl: uploadSession,
-    content: JSON.stringify({ archiveContent: sortedFiles }),
+  await fetch(uploadSession.url, {
+    method: 'PUT',
+    body: JSON.stringify({ archiveContent: sortedFiles }),
+    headers: uploadSession.headers,
   });
 
   const updateMetadataResult = await ctx.graphqlClient
@@ -247,18 +246,7 @@ async function uploadProjectMetadataAsync(
   }
 }
 
-async function fetchProjectArchiveSourceAsync(
-  ctx: BuildContext<Job>
-): Promise<ProjectArchiveSource> {
-  const sandboxWorkerApi = getSandboxWorkerApi(ctx);
-  if (sandboxWorkerApi) {
-    return await sandboxWorkerApi.getProjectArchiveSourceAsync({
-      timeoutMs: 20000,
-      retries: 3,
-      logger: ctx.logger,
-    });
-  }
-
+async function fetchProjectArchiveSourceAsync(ctx: BuildContext<Job>) {
   const taskId = nullthrows(ctx.env.EAS_BUILD_ID, 'EAS_BUILD_ID is not set');
   const expoApiServerURL = nullthrows(ctx.env.__API_SERVER_URL, '__API_SERVER_URL is not set');
   const robotAccessToken = nullthrows(
@@ -296,7 +284,20 @@ async function fetchProjectArchiveSourceAsync(
     );
   }
 
-  const dataResult = z.object({ data: ProjectArchiveSourceSchema }).safeParse(jsonResult.value);
+  const dataResult = z
+    .object({
+      data: z.discriminatedUnion('type', [
+        z.object({
+          type: z.literal(ArchiveSourceType.GIT),
+          repositoryUrl: z.string().url(),
+          gitRef: z.string().nullable(),
+          gitCommitHash: z.string(),
+        }),
+        z.object({ type: z.literal(ArchiveSourceType.URL), url: z.string().url() }),
+        z.object({ type: z.literal(ArchiveSourceType.NONE) }),
+      ]),
+    })
+    .safeParse(jsonResult.value);
   if (!dataResult.success) {
     throw new Error(
       `Unexpected data from server (${response.status}): ${z.prettifyError(dataResult.error)}`

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

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

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

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

packages/build-tools/src/context.ts

@@ -3,13 +3,14 @@ import {
   BuildPhase,
   BuildPhaseResult,
   Env,
-  type EnvironmentSecret,
   EnvironmentSecretType,
+  GenericArtifactType,
   Job,
   LogMarker,
   ManagedArtifactType,
   Metadata,
   errors,
+  isGenericArtifact,
 } from '@expo/eas-build-job';
 import { BuildTrigger } from '@expo/eas-build-job/dist/common';
 import { bunyan } from '@expo/logger';
@@ -19,7 +20,6 @@ import path from 'path';
 
 import { resolveBuildPhaseErrorAsync } from './buildErrors/detectError';
 import { Datadog } from './datadog';
-import { SANDBOX_WORKER_TOKEN_ENV } from './steps/utils/sandboxWorkerApi';
 import { readAppConfig } from './utils/appConfig';
 import { createTemporaryEnvironmentSecretFile } from './utils/environmentSecrets';
 import { PackageManager, resolvePackageManager } from './utils/packageManager';
@@ -42,7 +42,7 @@ export type ArtifactToUpload =
       paths: string[];
     }
   | {
-      type: null;
+      type: GenericArtifactType;
       name: string;
       paths: string[];
       metadata?: Record<string, unknown>;
@@ -69,7 +69,6 @@ export interface BuildContextOptions {
   metadata?: Metadata;
   expoApiV2BaseUrl?: string;
   mcpServerUrl?: string;
-  addBuildLogMask?: (secret: string) => void;
 }
 
 export class SkipNativeBuildError extends Error {}
@@ -87,7 +86,6 @@ export class BuildContext<TJob extends Job = Job> {
   public readonly skipNativeBuild?: boolean;
   public readonly expoApiV2BaseUrl?: string;
   public readonly mcpServerUrl?: string;
-  public readonly addBuildLogMask?: (secret: string) => void;
   public artifacts: Artifacts = {};
 
   private readonly _isLocal: boolean;
@@ -117,7 +115,6 @@ export class BuildContext<TJob extends Job = Job> {
     this.skipNativeBuild = options.skipNativeBuild;
     this.expoApiV2BaseUrl = options.expoApiV2BaseUrl;
     this.mcpServerUrl = options.mcpServerUrl;
-    this.addBuildLogMask = options.addBuildLogMask;
 
     const environmentSecrets = this.getEnvironmentSecrets(job);
     this._env = {
@@ -241,7 +238,7 @@ export class BuildContext<TJob extends Job = Job> {
     logger: bunyan;
   }): Promise<{ artifactId: string | null }> {
     const result = await this._uploadArtifact({ artifact, logger });
-    if (result.filename && artifact.type !== null) {
+    if (result.filename && !isGenericArtifact(artifact)) {
       this.artifacts[artifact.type] = result.filename;
     }
     return { artifactId: result.artifactId ?? null };
@@ -410,7 +407,7 @@ export class BuildContext<TJob extends Job = Job> {
     const environmentSecretsDirectory = path.join(this.workingdir, 'eas-environment-secrets');
 
     const environmentSecrets: Record<string, string> = {};
-    for (const { name, type, value } of job.secrets.environmentSecrets.filter(isJobSecret)) {
+    for (const { name, type, value } of job.secrets.environmentSecrets) {
       if (type === EnvironmentSecretType.STRING) {
         environmentSecrets[name] = value;
       } else {
@@ -424,9 +421,3 @@ export class BuildContext<TJob extends Job = Job> {
     return environmentSecrets;
   }
 }
-
-const EXCLUDED_JOB_SECRET_NAMES: ReadonlySet<string> = new Set([SANDBOX_WORKER_TOKEN_ENV]);
-
-function isJobSecret({ name }: EnvironmentSecret): boolean {
-  return !EXCLUDED_JOB_SECRET_NAMES.has(name);
-}

packages/build-tools/src/customBuildContext.ts

@@ -32,7 +32,6 @@ export interface BuilderRuntimeApi {
   uploadArtifact: (spec: { artifact: ArtifactToUpload; logger: bunyan }) => Promise<{
     artifactId: string | null;
   }>;
-  addBuildLogMask?: (secret: string) => void;
 }
 
 export class CustomBuildContext<TJob extends Job = Job> implements ExternalBuildContextProvider {
@@ -64,12 +63,12 @@ export class CustomBuildContext<TJob extends Job = Job> implements ExternalBuild
   public readonly logger: bunyan;
   public readonly graphqlClient: Client;
   public readonly runtimeApi: BuilderRuntimeApi;
-  public readonly expoApiV2BaseUrl?: string;
   public readonly mcpServerUrl?: string;
   public job: TJob;
   public metadata?: Metadata;
 
   private _env: Env;
+  private readonly expoApiV2BaseUrl?: string;
   private readonly pendingMetricUploads: Promise<void>[] = [];
 
   constructor(buildCtx: BuildContext<TJob>) {
@@ -85,7 +84,6 @@ export class CustomBuildContext<TJob extends Job = Job> implements ExternalBuild
     this.buildLogsDirectory = path.join(buildCtx.workingdir, 'logs');
     this.runtimeApi = {
       uploadArtifact: (...args) => buildCtx['uploadArtifact'](...args),
-      addBuildLogMask: buildCtx.addBuildLogMask,
     };
     this.mcpServerUrl = buildCtx.mcpServerUrl;
     this.expoApiV2BaseUrl = buildCtx.expoApiV2BaseUrl;

packages/build-tools/src/datadog.ts

@@ -1,31 +1,15 @@
 import { Sentry } from './sentry';
-import { DEVICE_RUN_SESSION_TOKEN_HEADER } from './steps/utils/deviceRunSessionWorkerApi';
-import { SANDBOX_WORKER_TOKEN_HEADER } from './steps/utils/sandboxWorkerApi';
 import { turtleFetch } from './utils/turtleFetch';
 
 type MetricsTarget =
   | { kind: 'build'; turtleBuildId: string }
-  | { kind: 'jobRun'; turtleJobRunId: string }
-  // A device run session job with a session token. The token names the session and its job run.
-  | { kind: 'deviceRunSession' }
-  | { kind: 'sandbox' };
+  | { kind: 'jobRun'; turtleJobRunId: string };
 
-type DatadogSetupOptions =
-  | {
-      expoApiV2BaseUrl: string;
-      robotAccessToken: string;
-      target: Exclude<MetricsTarget, { kind: 'deviceRunSession' | 'sandbox' }>;
-    }
-  | {
-      expoApiV2BaseUrl: string;
-      deviceRunSessionToken: string;
-      target: Extract<MetricsTarget, { kind: 'deviceRunSession' }>;
-    }
-  | {
-      expoApiV2BaseUrl: string;
-      sandboxWorkerToken: string;
-      target: Extract<MetricsTarget, { kind: 'sandbox' }>;
-    };
+type DatadogSetupOptions = {
+  expoApiV2BaseUrl: string;
+  robotAccessToken: string;
+  target: MetricsTarget;
+};
 
 let setupOptions: DatadogSetupOptions | null = null;
 let pendingUploads: Promise<unknown>[] = [];
@@ -34,36 +18,9 @@ function withTargetTag(
   tags: Record<string, string>,
   target: MetricsTarget
 ): Record<string, string> {
-  // A device run session job is a job run, so its metrics keep the job run tag.
   return { ...tags, target: target.kind === 'build' ? 'build' : 'job_run' };
 }
 
-function getMetricsRequest(options: DatadogSetupOptions): {
-  path: string;
-  headers: Record<string, string>;
-} {
-  if ('deviceRunSessionToken' in options) {
-    return {
-      path: 'device-run-session-worker/metrics',
-      headers: { [DEVICE_RUN_SESSION_TOKEN_HEADER]: options.deviceRunSessionToken },
-    };
-  }
-  if ('sandboxWorkerToken' in options) {
-    return {
-      path: 'sandbox-worker/metrics',
-      headers: { [SANDBOX_WORKER_TOKEN_HEADER]: options.sandboxWorkerToken },
-    };
-  }
-  const { target, robotAccessToken } = options;
-  return {
-    path:
-      target.kind === 'build'
-        ? `turtle-builds/${target.turtleBuildId}/metrics`
-        : `turtle-job-runs/${target.turtleJobRunId}/metrics`,
-    headers: { Authorization: `Bearer ${robotAccessToken}` },
-  };
-}
-
 export const Datadog = {
   setup(opts: DatadogSetupOptions | null): void {
     setupOptions = opts;
@@ -73,7 +30,7 @@ export const Datadog = {
     if (!setupOptions) {
       return;
     }
-    const { expoApiV2BaseUrl, target } = setupOptions;
+    const { expoApiV2BaseUrl, robotAccessToken, target } = setupOptions;
     const metrics = [
       {
         name,
@@ -83,11 +40,16 @@ export const Datadog = {
       },
     ];
 
-    const { path: metricsPath, headers } = getMetricsRequest(setupOptions);
+    const metricsPath =
+      target.kind === 'build'
+        ? `turtle-builds/${target.turtleBuildId}/metrics`
+        : `turtle-job-runs/${target.turtleJobRunId}/metrics`;
 
     const uploadPromise = turtleFetch(new URL(metricsPath, expoApiV2BaseUrl).toString(), 'POST', {
       json: { metrics },
-      headers,
+      headers: {
+        Authorization: `Bearer ${robotAccessToken}`,
+      },
       retries: 2,
     }).catch(err => {
       Sentry.capture(`Failed to report turtle ${target.kind} metric`, err, {
@@ -99,9 +61,7 @@ export const Datadog = {
   },
 
   log(message: string, tags: Record<string, string> = {}): void {
-    // The device run session worker API has no logs route, and the session token is not a bearer
-    // credential, so a device run session job does not report these logs.
-    if (!setupOptions || !('robotAccessToken' in setupOptions)) {
+    if (!setupOptions) {
       return;
     }
     const { expoApiV2BaseUrl, robotAccessToken, target } = setupOptions;

packages/build-tools/src/index.ts

@@ -3,16 +3,8 @@ import HttpLogStream from './logging/HttpLogStream';
 import RemoteLoggerStream from './logging/RemoteLoggerStream';
 
 export { Builders, HttpLogStream, RemoteLoggerStream };
-export {
-  SignedUrlUploadApiError,
-  SignedUrlUploadNetworkError,
-  uploadWithSignedUrl,
-} from './storage/uploadWithSignedUrl';
-export type {
-  SignedUrl,
-  UploadWithSignedUrlOptions,
-  UploadWithSignedUrlParams,
-} from './storage/uploadWithSignedUrl';
+export { uploadWithSignedUrl } from './storage/uploadWithSignedUrl';
+export type { SignedUrl, UploadWithSignedUrlParams } from './storage/uploadWithSignedUrl';
 export { downloadCacheAsync } from './steps/functions/restoreCache';
 export { uploadCacheAsync } from './steps/functions/saveCache';
 
@@ -34,7 +26,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';
@@ -42,7 +33,5 @@ export type { GradleProfileTask } from './android/gradleProfile';
 export * from './generic';
 
 export { Datadog } from './datadog';
-export { getDeviceRunSessionTokenFromEnvironmentSecrets } from './steps/utils/deviceRunSessionWorkerApi';
-export { getSandboxWorkerTokenFromEnvironmentSecrets } from './steps/utils/sandboxWorkerApi';
 export { Sentry } from './sentry';
 export * from './runtimeSettings';

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

@@ -15,10 +15,10 @@ export function resolveScheme(ctx: BuildContext<Ios.Job>): string {
   return schemes[0];
 }
 
-export function resolveArtifactPath(job: Ios.Job): string {
-  if (job.applicationArchivePath) {
-    return job.applicationArchivePath;
-  } else if (job.simulator) {
+export function resolveArtifactPath(ctx: BuildContext<Ios.Job>): string {
+  if (ctx.job.applicationArchivePath) {
+    return ctx.job.applicationArchivePath;
+  } else if (ctx.job.simulator) {
     return 'ios/build/Build/Products/*simulator/*.app';
   } else {
     return 'ios/build/*.ipa';

packages/build-tools/src/logging/RemoteLoggerStream.ts

@@ -56,10 +56,10 @@ class RemoteLoggerStream extends Writable {
     return null;
   }
 
-  public async init(): Promise<void> {
+  public async init(): Promise<string> {
     this.fileHandle = await fs.open(this.temporaryLogsPath, 'w+', 0o660);
     this.flushInterval = setInterval(() => this.flush(), this.options.uploadIntervalMs);
-    await this.flush(true);
+    return (await this.flush(true)) as string;
   }
 
   public async cleanUp(): Promise<void> {
@@ -121,18 +121,17 @@ class RemoteLoggerStream extends Writable {
     }
   }
 
-  private async flush(force = false): Promise<void> {
+  private async flush(force = false): Promise<string | void> {
     if (force || this.hasChangesToUpload) {
       if (this.uploadingPromise) {
         await this.uploadingPromise;
-        await this.flush(force);
-        return;
+        return await this.flush(force);
       }
-      await this.flushInternal();
+      return await this.flushInternal();
     }
   }
 
-  private async flushInternal(): Promise<void> {
+  private async flushInternal(): Promise<string | void> {
     await this.safeWriteToFile();
 
     let resolveFn: PromiseResolveFn;
@@ -140,17 +139,21 @@ class RemoteLoggerStream extends Writable {
     this.uploadingPromise = new Promise(res => {
       resolveFn = res;
     });
-    await this.upload()
+    return await this.upload()
+      .then(result => {
+        return result;
+      })
       .catch(err => {
         this.logger.error({ err }, 'Failed to upload logs file');
       })
-      .then(() => {
+      .then(result => {
         this.uploadingPromise = undefined;
         resolveFn();
+        return result;
       });
   }
 
-  private async upload(): Promise<void> {
+  private async upload(): Promise<string | void> {
     if (!this.uploadMethod) {
       return;
     }
@@ -162,7 +165,7 @@ class RemoteLoggerStream extends Writable {
       );
     };
 
-    await uploadWithSignedUrl({
+    return await uploadWithSignedUrl({
       signedUrl: this.uploadMethod.signedUrl,
       srcGeneratorAsync,
     });

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

@@ -11,7 +11,7 @@ import { getEasFunctions } from '../easFunctions';
 jest.mock('fs');
 
 describe('hook anchor self-declarations', () => {
-  it('declares the expected hook anchors', () => {
+  it('exactly the four v0 functions declare anchors, with these bindings', () => {
     const declarations: Record<string, HookAnchorId> = {};
     for (const buildFunction of getEasFunctions(createCustomBuildContextMock())) {
       if (buildFunction.__hookId !== undefined) {
@@ -24,7 +24,6 @@ describe('hook anchor self-declarations', () => {
       'eas/checkout': 'checkout',
       'eas/install_node_modules': 'install_node_modules',
       'eas/upload_to_asc': 'submit',
-      'eas/submit_to_google_play': 'submit',
       'eas/maestro_tests': 'maestro_tests',
     });
   });
@@ -88,17 +87,6 @@ describe('hook anchor self-declarations', () => {
         bundle_short_version: '1.0.0',
       },
     ],
-    [
-      'eas/submit_to_google_play',
-      'before_submit',
-      'after_submit',
-      {
-        artifact_path: 'app.aab',
-        artifact_type: 'aab',
-        package_name: 'com.example.app',
-        service_account_key_path: 'key.json',
-      },
-    ],
     [
       'eas/maestro_tests',
       'before_maestro_tests',

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

@@ -1,18 +0,0 @@
-import { type CustomBuildContext } from '../../customBuildContext';
-import { getEasFunctions } from '../easFunctions';
-
-it('registers opt-in session functions with the existing inputs', () => {
-  const functions = getEasFunctions({ hasBuildJob: () => false } as CustomBuildContext);
-  for (const name of ['serve_sim_remote', 'agent_device', 'argent_remote', 'appium_remote']) {
-    const existing = functions.find(fn => fn.id === `start_${name}_session`)!;
-    const warm = functions.find(fn => fn.id === `start_warm_${name}_session`)!;
-    expect(warm.getFullId()).toBe(`eas/start_warm_${name}_session`);
-    const warmInputs = warm.inputProviders!.map(input => input(undefined as never, 'warm').id);
-    const existingInputs = existing.inputProviders!.map(
-      input => input(undefined as never, 'existing').id
-    );
-    expect(warmInputs).toEqual(existingInputs);
-  }
-  const ids = functions.map(fn => fn.getFullId());
-  expect(new Set(ids).size).toBe(ids.length);
-});

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

@@ -10,7 +10,6 @@ import { configureIosVersionFunction } from './functions/configureIosVersion';
 import { createSubmissionEntityFunction } from './functions/createSubmissionEntity';
 import { createDownloadArtifactFunction } from './functions/downloadArtifact';
 import { createDownloadBuildFunction } from './functions/downloadBuild';
-import { createDownloadSubmissionArchiveFunction } from './functions/downloadSubmissionArchive';
 import { createEasDeployBuildFunction } from './functions/deploy';
 import { createEasExportBuildFunction } from './functions/export';
 import { eagerBundleBuildFunction } from './functions/eagerBundle';
@@ -20,7 +19,6 @@ import { generateGymfileFromTemplateFunction } from './functions/generateGymfile
 import { createGetCredentialsForBuildTriggeredByGithubIntegration } from './functions/getCredentialsForBuildTriggeredByGitHubIntegration';
 import { injectAndroidCredentialsFunction } from './functions/injectAndroidCredentials';
 import { createInstallMaestroBuildFunction } from './functions/installMaestro';
-import { createInstallMitmproxyBuildFunction } from './functions/installMitmproxy';
 import { createInstallBuildFunction } from './functions/installBuild';
 import { createInstallNodeModulesBuildFunction } from './functions/installNodeModules';
 import { createInstallPodsBuildFunction } from './functions/installPods';
@@ -28,12 +26,9 @@ import { createLaunchApplicationFunction } from './functions/launchApplication';
 import { createPrebuildBuildFunction } from './functions/prebuild';
 import { createReadAppConfigBuildFunction } from './functions/readAppConfig';
 import { createReadIpaInfoBuildFunction } from './functions/readIpaInfo';
-import { createReadAndroidAppInfoBuildFunction } from './functions/readAndroidAppInfo';
-import { createSubmitToGooglePlayBuildFunction } from './functions/submitToGooglePlay';
 import { createReadPackageJsonBuildFunction } from './functions/readPackageJson';
 import { createRepackBuildFunction } from './functions/repack';
 import { createReportMaestroTestResultsFunction } from './functions/reportMaestroTestResults';
-import { createUpdateResolvedVersionBuildFunction } from './functions/updateResolvedVersion';
 import { resolveAppleTeamIdFromCredentialsFunction } from './functions/resolveAppleTeamIdFromCredentials';
 import { createResolveBuildConfigBuildFunction } from './functions/resolveBuildConfig';
 import {
@@ -47,10 +42,9 @@ import { runGradleFunction } from './functions/runGradle';
 import { createMaestroTestsBuildFunction } from './functions/maestroTests';
 import { createSaveBuildCacheFunction } from './functions/saveBuildCache';
 import { createRolloutPosthogFlagFunction } from './functions/rolloutPosthogFlag';
-import { createRunAgentBuildFunction } from './functions/runAgent';
 import { createSaveCacheFunction } from './functions/saveCache';
 import { createSendSlackMessageFunction } from './functions/sendSlackMessage';
-import { createStartAgentDeviceSessionBuildFunction } from './functions/startAgentDeviceSession';
+import { createStartAgentDeviceRemoteSessionBuildFunction } from './functions/startAgentDeviceRemoteSession';
 import { createStartAndroidEmulatorBuildFunction } from './functions/startAndroidEmulator';
 import { createStartArgentRemoteSessionBuildFunction } from './functions/startArgentRemoteSession';
 import { createStartAppiumRemoteSessionBuildFunction } from './functions/startAppiumRemoteSession';
@@ -60,16 +54,11 @@ import { createStartIosSimulatorRecordingsBuildFunction } from './functions/star
 import { createStartLocalEgressBuildFunction } from './functions/startLocalEgress';
 import { createStartWebPreviewRemoteSessionBuildFunction } from './functions/startWebPreviewRemoteSession';
 import { createStartServeSimMetricsBuildFunction } from './functions/startServeSimMetrics';
-import { createStartServeSimLogsBuildFunction } from './functions/startServeSimLogs';
-import { createCollectServeSimLogsBuildFunction } from './functions/collectServeSimLogs';
-import { createCollectAndroidEmulatorLogsBuildFunction } from './functions/collectAndroidEmulatorLogs';
 import { createStartSandboxBuildFunction } from './functions/startSandbox';
 import { createCollectServeSimMetricsBuildFunction } from './functions/collectServeSimMetrics';
 import { createUploadArtifactBuildFunction } from './functions/uploadArtifact';
 import { createUploadDeviceRunSessionScreenRecordingsBuildFunction } from './functions/uploadDeviceRunSessionScreenRecordings';
-import { createUploadEmbeddedBundleBuildFunction } from './functions/uploadEmbeddedBundle';
 import { createUploadToAscBuildFunction } from './functions/uploadToAsc';
-import { createUpdateTestFlightMetadataBuildFunction } from './functions/updateTestFlightMetadata';
 import { createSetUpNpmrcBuildFunction } from './functions/useNpmToken';
 import { createWaitForPosthogMetricFunction } from './functions/waitForPosthogMetric';
 import { createUploadPosthogSourcemapsFunction } from './functions/uploadPosthogSourcemaps';
@@ -88,9 +77,7 @@ export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
     createInstallNodeModulesBuildFunction(),
     createPrebuildBuildFunction(),
     createReadIpaInfoBuildFunction(),
-    createReadAndroidAppInfoBuildFunction(),
     createDownloadBuildFunction(ctx),
-    createDownloadSubmissionArchiveFunction(ctx),
     createInstallBuildFunction(),
     createLaunchApplicationFunction(),
     createEasExportBuildFunction(),
@@ -112,12 +99,9 @@ export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
     generateGymfileFromTemplateFunction(),
     runFastlaneFunction(),
     parseXcactivitylogFunction(),
-    createStartAgentDeviceSessionBuildFunction(ctx),
-    createStartAgentDeviceSessionBuildFunction(ctx, { warm: true }),
+    createStartAgentDeviceRemoteSessionBuildFunction(ctx),
     createStartArgentRemoteSessionBuildFunction(ctx),
-    createStartArgentRemoteSessionBuildFunction(ctx, { warm: true }),
     createStartAppiumRemoteSessionBuildFunction(ctx),
-    createStartAppiumRemoteSessionBuildFunction(ctx, { warm: true }),
     createStartAndroidEmulatorBuildFunction(),
     createStartCuttlefishDeviceBuildFunction(),
     createStartIosSimulatorBuildFunction(),
@@ -126,16 +110,10 @@ export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
     createFinishIosSimulatorRecordingsBuildFunction(),
     createUploadDeviceRunSessionScreenRecordingsBuildFunction(ctx),
     createStartWebPreviewRemoteSessionBuildFunction(ctx),
-    createStartWebPreviewRemoteSessionBuildFunction(ctx, { warm: true }),
     createStartServeSimMetricsBuildFunction(),
-    createStartServeSimLogsBuildFunction(),
-    createCollectServeSimLogsBuildFunction(ctx),
-    createCollectAndroidEmulatorLogsBuildFunction(ctx),
     createStartSandboxBuildFunction(ctx),
-    createRunAgentBuildFunction(ctx),
     createCollectServeSimMetricsBuildFunction(ctx),
     createInstallMaestroBuildFunction(),
-    createInstallMitmproxyBuildFunction(),
 
     createInstallPodsBuildFunction(),
     createSendSlackMessageFunction(),
@@ -149,9 +127,7 @@ export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
     calculateEASUpdateRuntimeVersionFunction(),
 
     createSubmissionEntityFunction(),
-    createSubmitToGooglePlayBuildFunction(),
     createUploadToAscBuildFunction(),
-    createUpdateTestFlightMetadataBuildFunction(),
 
     createReportMaestroTestResultsFunction(ctx),
     createMaestroTestsBuildFunction(ctx),
@@ -161,8 +137,6 @@ export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
     functions.push(
       ...[
         createFindAndUploadBuildArtifactsBuildFunction(ctx),
-        createUpdateResolvedVersionBuildFunction(ctx),
-        createUploadEmbeddedBundleBuildFunction(ctx),
         createResolveBuildConfigBuildFunction(ctx),
         createGetCredentialsForBuildTriggeredByGithubIntegration(ctx),
       ]

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

@@ -130,35 +130,6 @@ describe(createEasBuildBuildFunctionGroup, () => {
       );
     });
 
-    it.each([
-      ['Android without credentials', { platform: Platform.ANDROID }],
-      ['Android with credentials', { platform: Platform.ANDROID, buildCredentials: { test: {} } }],
-      ['iOS simulator', { platform: Platform.IOS, simulator: true }],
-      ['iOS with credentials', { platform: Platform.IOS, buildCredentials: { test: {} } }],
-    ])('wires the uploaded archive path into the update step (%s)', (_label, overrides) => {
-      const buildToolsContext = createMockBuildToolsContext(overrides);
-      const functionGroup = createEasBuildBuildFunctionGroup(buildToolsContext);
-      const globalCtx = createGlobalContextMock({ logger: createMockLogger() });
-
-      const steps = functionGroup.createBuildStepsFromFunctionGroupCall(globalCtx);
-
-      const updateStep = steps.find(s => s.displayName === 'Update resolved version');
-      const archivePathInput = updateStep?.inputs?.find(
-        input => input.id === 'application_archive_path'
-      );
-      expect(updateStep).toBeDefined();
-      expect(archivePathInput?.rawValue).toBe(
-        '${ steps.find_and_upload_build_artifacts.application_archive_path }'
-      );
-
-      // The step ID must be assigned explicitly: an auto-generated ID makes the input
-      // interpolation throw "Step ... does not exist" before the function body runs.
-      const uploadStepIndex = steps.findIndex(s => s.id === 'find_and_upload_build_artifacts');
-      expect(uploadStepIndex).toBeGreaterThan(-1);
-      expect(steps[uploadStepIndex].displayName).toBe('Find and upload build artifacts');
-      expect(uploadStepIndex).toBeLessThan(steps.indexOf(updateStep!));
-    });
-
     it('composes working directory with installPods step-level ./ios dir (iOS)', () => {
       const buildToolsContext = createMockBuildToolsContext({
         platform: Platform.IOS,
@@ -248,71 +219,4 @@ describe(createEasBuildBuildFunctionGroup, () => {
       'Build function group is not supported in generic jobs.'
     );
   });
-
-  describe('embedded bundle upload', () => {
-    function getStepNames(
-      options: Parameters<typeof createMockBuildToolsContext>[0],
-      { sdkVersion, env = {} }: { sdkVersion?: string; env?: Record<string, string> }
-    ): string[] {
-      const functionGroup = createEasBuildBuildFunctionGroup(createMockBuildToolsContext(options));
-      const globalCtx = createGlobalContextMock({
-        logger: createMockLogger(),
-        staticContextContent: { metadata: sdkVersion ? { sdkVersion } : null },
-      });
-      globalCtx.updateEnv(env);
-      return functionGroup
-        .createBuildStepsFromFunctionGroupCall(globalCtx)
-        .map(step => step.displayName);
-    }
-
-    it.each([
-      ['Android', { platform: Platform.ANDROID }],
-      ['Android with credentials', { platform: Platform.ANDROID, buildCredentials: { test: {} } }],
-      ['iOS with credentials', { platform: Platform.IOS, buildCredentials: { test: {} } }],
-    ])('uploads the embedded bundle after the build artifacts on SDK 58 (%s)', (_, options) => {
-      const stepNames = getStepNames(options, { sdkVersion: '58.0.0' });
-
-      expect(stepNames.indexOf('Upload embedded bundle')).toBe(
-        stepNames.indexOf('Find and upload build artifacts') + 1
-      );
-    });
-
-    it.each([
-      ['Android', { platform: Platform.ANDROID }],
-      ['Android with credentials', { platform: Platform.ANDROID, buildCredentials: { test: {} } }],
-      ['iOS with credentials', { platform: Platform.IOS, buildCredentials: { test: {} } }],
-    ])('passes ignore_error to the embedded bundle step (%s)', (_, options) => {
-      const functionGroup = createEasBuildBuildFunctionGroup(createMockBuildToolsContext(options));
-      const globalCtx = createGlobalContextMock({
-        logger: createMockLogger(),
-        staticContextContent: { metadata: { sdkVersion: '58.0.0' } },
-      });
-
-      const uploadStep = functionGroup
-        .createBuildStepsFromFunctionGroupCall(globalCtx)
-        .find(step => step.displayName === 'Upload embedded bundle');
-
-      expect(uploadStep).toBeDefined();
-      expect(uploadStep!.inputs?.find(input => input.id === 'ignore_error')?.rawValue).toBe(true);
-    });
-
-    it('does not upload the embedded bundle on SDK 57 without the opt-in', () => {
-      expect(getStepNames({}, { sdkVersion: '57.0.0' })).not.toContain('Upload embedded bundle');
-    });
-
-    it('uploads the embedded bundle on SDK 57 with the opt-in', () => {
-      expect(
-        getStepNames(
-          {},
-          { sdkVersion: '57.0.0', env: { EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE: '1' } }
-        )
-      ).toContain('Upload embedded bundle');
-    });
-
-    it('does not upload the embedded bundle for iOS simulator builds', () => {
-      expect(
-        getStepNames({ platform: Platform.IOS, simulator: true }, { sdkVersion: '58.0.0' })
-      ).not.toContain('Upload embedded bundle');
-    });
-  });
 });

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

@@ -10,7 +10,6 @@ import path from 'path';
 
 import { shouldUseEagerBundle } from '../../common/eagerBundle';
 import { CustomBuildContext } from '../../customBuildContext';
-import { shouldUploadEmbeddedBundle } from '../../utils/expoUpdatesEmbedded';
 import { calculateEASUpdateRuntimeVersionFunction } from '../functions/calculateEASUpdateRuntimeVersion';
 import { createCheckoutBuildFunction } from '../functions/checkout';
 import { configureAndroidVersionFunction } from '../functions/configureAndroidVersion';
@@ -19,7 +18,6 @@ import { configureIosCredentialsFunction } from '../functions/configureIosCreden
 import { configureIosVersionFunction } from '../functions/configureIosVersion';
 import { eagerBundleBuildFunction } from '../functions/eagerBundle';
 import { createFindAndUploadBuildArtifactsBuildFunction } from '../functions/findAndUploadBuildArtifacts';
-import { createUpdateResolvedVersionBuildFunction } from '../functions/updateResolvedVersion';
 import { generateGymfileFromTemplateFunction } from '../functions/generateGymfileFromTemplate';
 import { injectAndroidCredentialsFunction } from '../functions/injectAndroidCredentials';
 import { createInstallNodeModulesBuildFunction } from '../functions/installNodeModules';
@@ -34,7 +32,6 @@ import {
 import { runFastlaneFunction } from '../functions/runFastlane';
 import { runGradleFunction } from '../functions/runGradle';
 import { createSaveBuildCacheFunction } from '../functions/saveBuildCache';
-import { createUploadEmbeddedBundleBuildFunction } from '../functions/uploadEmbeddedBundle';
 import { createSetUpNpmrcBuildFunction } from '../functions/useNpmToken';
 
 interface HelperFunctionsInput {
@@ -184,20 +181,7 @@ function createStepsForIosSimulatorBuild({
     runFastlane,
     createFindAndUploadBuildArtifactsBuildFunction(
       buildToolsContext
-    ).createBuildStepFromFunctionCall(globalCtx, {
-      id: 'find_and_upload_build_artifacts',
-      workingDirectory,
-    }),
-    createUpdateResolvedVersionBuildFunction(buildToolsContext).createBuildStepFromFunctionCall(
-      globalCtx,
-      {
-        workingDirectory,
-        callInputs: {
-          application_archive_path:
-            '${ steps.find_and_upload_build_artifacts.application_archive_path }',
-        },
-      }
-    ),
+    ).createBuildStepFromFunctionCall(globalCtx, { workingDirectory }),
     saveCache,
     createCacheStatsBuildFunction().createBuildStepFromFunctionCall(globalCtx, {
       workingDirectory,
@@ -318,33 +302,7 @@ function createStepsForIosBuildWithCredentials({
     runFastlane,
     createFindAndUploadBuildArtifactsBuildFunction(
       buildToolsContext
-    ).createBuildStepFromFunctionCall(globalCtx, {
-      id: 'find_and_upload_build_artifacts',
-      workingDirectory,
-    }),
-    ...(shouldUploadEmbeddedBundle({
-      env: globalCtx.env,
-      metadata: globalCtx.staticContext.metadata,
-    })
-      ? [
-          createUploadEmbeddedBundleBuildFunction(
-            buildToolsContext
-          ).createBuildStepFromFunctionCall(globalCtx, {
-            workingDirectory,
-            callInputs: { ignore_error: true },
-          }),
-        ]
-      : []),
-    createUpdateResolvedVersionBuildFunction(buildToolsContext).createBuildStepFromFunctionCall(
-      globalCtx,
-      {
-        workingDirectory,
-        callInputs: {
-          application_archive_path:
-            '${ steps.find_and_upload_build_artifacts.application_archive_path }',
-        },
-      }
-    ),
+    ).createBuildStepFromFunctionCall(globalCtx, { workingDirectory }),
     saveCache,
     createCacheStatsBuildFunction().createBuildStepFromFunctionCall(globalCtx, {
       workingDirectory,
@@ -431,33 +389,7 @@ function createStepsForAndroidBuildWithoutCredentials({
     runGradle,
     createFindAndUploadBuildArtifactsBuildFunction(
       buildToolsContext
-    ).createBuildStepFromFunctionCall(globalCtx, {
-      id: 'find_and_upload_build_artifacts',
-      workingDirectory,
-    }),
-    ...(shouldUploadEmbeddedBundle({
-      env: globalCtx.env,
-      metadata: globalCtx.staticContext.metadata,
-    })
-      ? [
-          createUploadEmbeddedBundleBuildFunction(
-            buildToolsContext
-          ).createBuildStepFromFunctionCall(globalCtx, {
-            workingDirectory,
-            callInputs: { ignore_error: true },
-          }),
-        ]
-      : []),
-    createUpdateResolvedVersionBuildFunction(buildToolsContext).createBuildStepFromFunctionCall(
-      globalCtx,
-      {
-        workingDirectory,
-        callInputs: {
-          application_archive_path:
-            '${ steps.find_and_upload_build_artifacts.application_archive_path }',
-        },
-      }
-    ),
+    ).createBuildStepFromFunctionCall(globalCtx, { workingDirectory }),
     saveCache,
     createCacheStatsBuildFunction().createBuildStepFromFunctionCall(globalCtx, {
       workingDirectory,
@@ -550,33 +482,7 @@ function createStepsForAndroidBuildWithCredentials({
       : []),
     createFindAndUploadBuildArtifactsBuildFunction(
       buildToolsContext
-    ).createBuildStepFromFunctionCall(globalCtx, {
-      id: 'find_and_upload_build_artifacts',
-      workingDirectory,
-    }),
-    ...(shouldUploadEmbeddedBundle({
-      env: globalCtx.env,
-      metadata: globalCtx.staticContext.metadata,
-    })
-      ? [
-          createUploadEmbeddedBundleBuildFunction(
-            buildToolsContext
-          ).createBuildStepFromFunctionCall(globalCtx, {
-            workingDirectory,
-            callInputs: { ignore_error: true },
-          }),
-        ]
-      : []),
-    createUpdateResolvedVersionBuildFunction(buildToolsContext).createBuildStepFromFunctionCall(
-      globalCtx,
-      {
-        workingDirectory,
-        callInputs: {
-          application_archive_path:
-            '${ steps.find_and_upload_build_artifacts.application_archive_path }',
-        },
-      }
-    ),
+    ).createBuildStepFromFunctionCall(globalCtx, { workingDirectory }),
     saveCache,
     createCacheStatsBuildFunction().createBuildStepFromFunctionCall(globalCtx, {
       workingDirectory,

packages/build-tools/src/steps/functions/__integration-tests__/readAndroidAppInfo.test.ts

@@ -1,47 +0,0 @@
-import { UserError } from '@expo/eas-build-job';
-import path from 'node:path';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { readAndroidArtifactInfoAsync } from '../../utils/android/appArtifact';
-import { createReadAndroidAppInfoBuildFunction } from '../readAndroidAppInfo';
-
-jest.unmock('fs');
-jest.unmock('node:fs');
-jest.unmock('fs/promises');
-jest.unmock('node:fs/promises');
-jest.unmock('@expo/spawn-async');
-
-const fixturesDirectory = path.join(__dirname, 'fixtures/android-app-info');
-
-it.each(['apk', 'aab'])('reads a real %s and publishes build step outputs', async type => {
-  const step = createReadAndroidAppInfoBuildFunction().createBuildStepFromFunctionCall(
-    createGlobalContextMock({
-      projectTargetDirectory: fixturesDirectory,
-      staticContextContent: { job: {} },
-    }),
-    { callInputs: { artifact_path: `app.${type}` } }
-  );
-
-  await step.executeAsync();
-
-  expect(step.outputById.artifact_type.value).toBe(type);
-  expect(step.outputById.package_name.value).toBe('com.example.app');
-});
-
-it('reports an invalid ZIP as a user error', async () => {
-  await expect(readAndroidArtifactInfoAsync(__filename)).rejects.toMatchObject({
-    constructor: UserError,
-    errorCode: 'EAS_READ_ANDROID_APP_INFO_INVALID_ARTIFACT',
-    cause: expect.any(Error),
-  });
-});
-
-it.each(['apk', 'aab'])('retains the native tool error for an invalid %s manifest', async type => {
-  await expect(
-    readAndroidArtifactInfoAsync(path.join(fixturesDirectory, `invalid-manifest-${type}.zip`))
-  ).rejects.toMatchObject({
-    constructor: UserError,
-    errorCode: 'EAS_READ_ANDROID_APP_INFO_INVALID_MANIFEST',
-    cause: expect.any(Error),
-  });
-});

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

@@ -48,10 +48,7 @@ describe(createCheckoutBuildFunction, () => {
   });
 
   it('moves project sources to the target directory when no inputs are given', async () => {
-    const logger = createMockLogger();
-    jest.mocked(logger.child).mockReturnValue(logger);
     const { globalCtx, executeAsync } = createCheckoutStep({
-      logger,
       projectArchive: GIT_PROJECT_ARCHIVE,
     });
 
@@ -59,9 +56,6 @@ describe(createCheckoutBuildFunction, () => {
 
     expect(await vol.promises.readFile(`${projectTargetDirectory}/app.json`, 'utf8')).toBe('{}');
     expect(globalCtx.wasCheckedOut()).toBe(true);
-    expect(logger.info).toHaveBeenCalledWith(
-      expect.stringContaining('Changing default working directory to')
-    );
     expect(fetchAndCheckoutRefAsync).not.toHaveBeenCalled();
   });
 
@@ -102,11 +96,14 @@ describe(createCheckoutBuildFunction, () => {
   });
 
   it('rejects the ref input when the project is already checked out', async () => {
+    const logger = createMockLogger();
+    jest.mocked(logger.child).mockReturnValue(logger);
     const { globalCtx, executeAsync } = createCheckoutStep({
+      logger,
       projectArchive: GIT_PROJECT_ARCHIVE,
       callInputs: { ref: 'feature/add-icon' },
     });
-    globalCtx.markAsCheckedOut();
+    globalCtx.markAsCheckedOut(logger);
 
     await expect(executeAsync()).rejects.toMatchObject({
       errorCode: 'EAS_CHECKOUT_REF_AFTER_CHECKOUT',

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

@@ -1,48 +0,0 @@
-import { BuildRuntimePlatform } from '@expo/steps';
-
-import {
-  createCustomBuildContextMock,
-  createGlobalContextMock,
-} from '../../../__tests__/utils/context';
-import { createMockLogger } from '../../../__tests__/utils/logger';
-import { Sentry } from '../../../sentry';
-import { collectAndroidEmulatorLogsAsync } from '../../utils/androidEmulatorLogs';
-import { createCollectAndroidEmulatorLogsBuildFunction } from '../collectAndroidEmulatorLogs';
-
-jest.mock('../../../sentry');
-jest.mock('../../utils/androidEmulatorLogs');
-
-function createStep(callInputs: Record<string, unknown> = {}) {
-  const logger = createMockLogger();
-  const ctx = createCustomBuildContextMock();
-  const global = createGlobalContextMock({ logger });
-  const fn = createCollectAndroidEmulatorLogsBuildFunction(ctx);
-  const step = fn.createBuildStepFromFunctionCall(global, {
-    callInputs,
-    env: { DEVICE_RUN_SESSION_ID: 'session' },
-  });
-  return { ctx, global, logger, fn, step };
-}
-
-it('collects captured logs without a second source selection', async () => {
-  const { ctx, global, fn, step } = createStep();
-  expect(fn.supportedRuntimePlatforms).toEqual([BuildRuntimePlatform.LINUX]);
-  await step.executeAsync();
-  expect(collectAndroidEmulatorLogsAsync).toHaveBeenCalledWith(ctx, {
-    global,
-    deviceRunSessionId: 'session',
-    logger: expect.anything(),
-  });
-});
-
-it('reports collection failure without changing the session result', async () => {
-  jest
-    .mocked(collectAndroidEmulatorLogsAsync)
-    .mockRejectedValueOnce(new Error('collection failed'));
-  const { step } = createStep();
-  await expect(step.executeAsync()).resolves.toBeUndefined();
-  expect(Sentry.capture).toHaveBeenCalledWith(
-    'Could not collect Android emulator logs',
-    expect.any(Error)
-  );
-});

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

@@ -1,441 +0,0 @@
-import { BuildRuntimePlatform, type BuildStepContext } from '@expo/steps';
-import spawn from '@expo/turtle-spawn';
-import fs from 'node:fs';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import type { CustomBuildContext } from '../../../customBuildContext';
-import { Sentry } from '../../../sentry';
-import { AndroidEmulatorUtils } from '../../../utils/AndroidEmulatorUtils';
-import { turtleFetch } from '../../../utils/turtleFetch';
-import { pollAgentDeviceArtifactsForUploadAsync } from '../../utils/agentDeviceArtifacts';
-import { startAgentDeviceEventCollectionAsync } from '../../utils/agentDeviceEvents';
-import { startAppiumEventCollectionAsync } from '../../utils/appiumEvents';
-import { startDeviceSessionHostAsync } from '../../utils/deviceSessionHost';
-import {
-  spawnDetached,
-  startNgrokTunnelAsync,
-  uploadRemoteSessionConfigAsync,
-  waitForDeviceRunSessionStoppedAsync,
-  waitForFileAsync,
-} from '../../utils/remoteDeviceRunSession';
-import { createStartAgentDeviceSessionBuildFunction } from '../startAgentDeviceSession';
-import { createStartAppiumRemoteSessionBuildFunction } from '../startAppiumRemoteSession';
-
-jest.mock('@expo/turtle-spawn');
-jest.mock('../../../sentry');
-jest.mock('../../../utils/turtleFetch');
-jest.mock('../../../utils/AndroidEmulatorUtils');
-jest.mock('../../utils/deviceSessionHost');
-jest.mock('../../utils/agentDeviceEvents');
-jest.mock('../../utils/appiumEvents');
-jest.mock('../../utils/agentDeviceArtifacts');
-// The agent-device session step boots the emulator itself; this test covers the session host.
-jest.mock('../startAndroidEmulator', () => ({
-  startAndroidEmulatorAsync: jest.fn().mockResolvedValue({
-    serialId: 'emulator-5554',
-    emulatorPromise: Promise.resolve(),
-    shouldAdjustAnimationScale: true,
-  }),
-}));
-jest.mock('../../utils/remoteDeviceRunSession', () => ({
-  ...jest.requireActual('../../utils/remoteDeviceRunSession'),
-  spawnDetached: jest.fn(),
-  startNgrokTunnelAsync: jest.fn(),
-  uploadRemoteSessionConfigAsync: jest.fn(),
-  waitForDeviceRunSessionStoppedAsync: jest.fn(),
-  waitForFileAsync: jest.fn(),
-}));
-
-// Agent-device also polls for Stop while it starts up. That watch sets neither an idle timeout nor
-// a duration; keep it pending until startup retires it, and give each lifetime wait its own mock.
-const lifetimeWait = jest.fn<
-  ReturnType<typeof waitForDeviceRunSessionStoppedAsync>,
-  Parameters<typeof waitForDeviceRunSessionStoppedAsync>
->();
-function routeStartupWatch(): void {
-  lifetimeWait.mockReset();
-  jest.mocked(waitForDeviceRunSessionStoppedAsync).mockImplementation(async args => {
-    if ('idleTimeout' in args || 'maxDurationSeconds' in args) {
-      return await lifetimeWait(args);
-    }
-    if (!args.signal?.aborted) {
-      await new Promise<void>(resolve =>
-        args.signal?.addEventListener('abort', () => resolve(), { once: true })
-      );
-    }
-  });
-}
-
-const finishHost = jest.fn();
-const closePreview = jest.fn();
-const stopTool = jest.fn();
-const stopTunnel = jest.fn();
-const stopEvents = jest.fn();
-const openPreview = jest.fn();
-const logger = { info: jest.fn(), warn: jest.fn(), child: jest.fn().mockReturnThis() };
-
-beforeEach(() => {
-  jest.clearAllMocks();
-  jest.mocked(pollAgentDeviceArtifactsForUploadAsync).mockResolvedValue();
-  routeStartupWatch();
-  // The daemon package is external. No installation or daemon process runs in these tests.
-  jest.spyOn(fs, 'existsSync').mockReturnValue(true);
-  // Only the emulator logcat folder: the Appium step writes into its own temp folder.
-  const mkdtemp = fs.promises.mkdtemp.bind(fs.promises);
-  jest
-    .spyOn(fs.promises, 'mkdtemp')
-    .mockImplementation(async prefix =>
-      String(prefix).includes('eas-android-emulator-logcat-')
-        ? '/tmp/eas-android-emulator-logcat-test'
-        : mkdtemp(prefix)
-    );
-  jest.mocked(spawn).mockResolvedValue({ stdout: '{}' } as never);
-  jest
-    .mocked(AndroidEmulatorUtils.getAttachedDevicesAsync)
-    .mockResolvedValue([{ serialId: 'emulator-5554', state: 'device' } as never]);
-  jest.mocked(turtleFetch).mockResolvedValue({ ok: true } as never);
-  jest.mocked(waitForFileAsync).mockResolvedValue({ port: 4567, token: 'daemon-token' });
-  for (const stop of [finishHost, closePreview, stopTool, stopTunnel, stopEvents]) {
-    stop.mockResolvedValue(undefined);
-  }
-  openPreview.mockResolvedValue({
-    previewPageUrl: 'https://expo.dev/simulator-preview/preview-id',
-    apiUrl: 'https://preview.example.test',
-    closeAsync: closePreview,
-  });
-  jest.mocked(startDeviceSessionHostAsync).mockResolvedValue({
-    openPreviewAsync: openPreview,
-    getLastPreviewActivityAt: jest.fn(),
-    finishAsync: finishHost,
-  });
-  jest.mocked(spawnDetached).mockReturnValue({
-    pid: undefined,
-    getOutput: () => '',
-    getExitError: () => undefined,
-    stopAsync: stopTool,
-  });
-  jest.mocked(startNgrokTunnelAsync).mockResolvedValue({
-    url: 'https://tool.example.test',
-    subdomainId: 'tool-id',
-    stopAsync: stopTunnel,
-  });
-  const events = { stopAsync: stopEvents, getLastEventObservedAt: () => undefined };
-  jest.mocked(startAgentDeviceEventCollectionAsync).mockResolvedValue(events);
-  jest.mocked(startAppiumEventCollectionAsync).mockResolvedValue(events);
-  jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue('started');
-  lifetimeWait.mockResolvedValue(undefined);
-});
-
-afterEach(() => {
-  jest.restoreAllMocks();
-});
-
-describe.each([
-  ['Appium', createStartAppiumRemoteSessionBuildFunction],
-  ['Agent Device', createStartAgentDeviceSessionBuildFunction],
-] as const)('%s host ownership', (name, createFunction) => {
-  async function runAsync(
-    publicPreview?: boolean,
-    frameAncestors?: string[],
-    corsOrigins?: string[]
-  ) {
-    const fn = createFunction({} as CustomBuildContext);
-    const global = createGlobalContextMock({ runtimePlatform: BuildRuntimePlatform.LINUX });
-    const defaults = new Map(
-      fn.inputProviders?.map(provider => {
-        const input = provider(global, 'Test session');
-        return [input.id, input.defaultValue];
-      })
-    );
-    await fn.fn!(
-      {
-        logger,
-        global: { runtimePlatform: BuildRuntimePlatform.LINUX },
-      } as unknown as BuildStepContext,
-      {
-        // Match step execution: omitted inputs use their declared defaults.
-        inputs: new Proxy(
-          {
-            public_preview: { value: publicPreview },
-            frame_ancestors: { value: frameAncestors },
-            cors_origins: { value: corsOrigins },
-          } as Record<string, { value: unknown }>,
-          {
-            get: (target, id: string) => target[id] ?? { value: defaults.get(id) },
-          }
-        ),
-        outputs: {},
-        env: {
-          DEVICE_RUN_SESSION_ID: 'session-id',
-          EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN: 'example.test',
-          NGROK_AUTHTOKEN: 'token',
-        },
-      } as never
-    );
-  }
-
-  it('holds the host until session completion', async () => {
-    await runAsync();
-    expect(startDeviceSessionHostAsync).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({ preview: { baseDomain: 'example.test', authtoken: 'token' } })
-    );
-    expect(openPreview).toHaveBeenCalledWith();
-    expect(uploadRemoteSessionConfigAsync).toHaveBeenCalledWith(
-      expect.objectContaining({
-        remoteConfig: expect.objectContaining({
-          webPreviewUrl: 'https://expo.dev/simulator-preview/preview-id',
-          previewApiUrl: 'https://preview.example.test',
-        }),
-      })
-    );
-    expect(finishHost).toHaveBeenCalledTimes(1);
-    expect(closePreview).not.toHaveBeenCalled();
-    expect(finishHost.mock.invocationCallOrder[0]).toBeGreaterThan(
-      lifetimeWait.mock.invocationCallOrder[0]
-    );
-    expect(stopTool).toHaveBeenCalledTimes(1);
-    expect(stopEvents).toHaveBeenCalledTimes(1);
-    expect(stopTunnel).toHaveBeenCalledTimes(1);
-  });
-
-  it('opens tunnels with the ngrok token but keeps it out of spawned processes', async () => {
-    await runAsync();
-    expect(startNgrokTunnelAsync).toHaveBeenCalledWith(
-      expect.objectContaining({ authtoken: 'token' })
-    );
-    const spawnedEnvs = [
-      ...jest.mocked(spawn).mock.calls.map(([, , options]) => options?.env),
-      ...jest.mocked(spawnDetached).mock.calls.map(([options]) => options.env),
-      ...jest.mocked(startDeviceSessionHostAsync).mock.calls.map(([, options]) => options.env),
-    ];
-    expect(spawnedEnvs.length).toBeGreaterThan(0);
-    for (const env of spawnedEnvs) {
-      expect(env).toEqual(expect.objectContaining({ DEVICE_RUN_SESSION_ID: 'session-id' }));
-      expect(env).not.toHaveProperty('NGROK_AUTHTOKEN');
-    }
-  });
-
-  it.each([undefined, true, false])('maps public_preview=%s to the host', async publicPreview => {
-    await runAsync(publicPreview);
-    expect(startDeviceSessionHostAsync).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({ disableShare: publicPreview === false })
-    );
-  });
-
-  it('maps frame_ancestors to the host and defaults to none', async () => {
-    await runAsync(undefined, ['https://embed.example.test']);
-    expect(startDeviceSessionHostAsync).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({ frameAncestors: ['https://embed.example.test'] })
-    );
-    jest.mocked(startDeviceSessionHostAsync).mockClear();
-    await runAsync();
-    expect(startDeviceSessionHostAsync).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({ frameAncestors: [] })
-    );
-  });
-
-  it('maps cors_origins to the host and defaults to none', async () => {
-    await runAsync(undefined, undefined, ['https://app.example.test']);
-    expect(startDeviceSessionHostAsync).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({ corsOrigins: ['https://app.example.test'] })
-    );
-    jest.mocked(startDeviceSessionHostAsync).mockClear();
-    await runAsync();
-    expect(startDeviceSessionHostAsync).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({ corsOrigins: [] })
-    );
-  });
-
-  it('stops automation while recording finalization or upload is pending', async () => {
-    let release!: () => void;
-    let stopped!: () => void;
-    const pendingFinish = new Promise<void>(resolve => {
-      release = resolve;
-    });
-    const toolStopped = new Promise<void>(resolve => {
-      stopped = resolve;
-    });
-    finishHost.mockReturnValueOnce(pendingFinish);
-    stopTool.mockImplementationOnce(async () => {
-      stopped();
-    });
-    let completed = false;
-    const running = runAsync().then(() => {
-      completed = true;
-    });
-    try {
-      await toolStopped;
-      expect(stopTunnel).toHaveBeenCalledTimes(1);
-      expect(finishHost).toHaveBeenCalledTimes(1);
-      expect(completed).toBe(false);
-    } finally {
-      release();
-      await running;
-    }
-  });
-
-  it('finalizes recording and stops automation while the tunnel close is pending', async () => {
-    let release!: () => void;
-    let finished!: () => void;
-    const pendingClose = new Promise<void>(resolve => {
-      release = resolve;
-    });
-    const hostFinished = new Promise<void>(resolve => {
-      finished = resolve;
-    });
-    const toolStopped = new Promise<void>(resolve => {
-      stopTool.mockImplementationOnce(async () => resolve());
-    });
-    stopTunnel.mockReturnValueOnce(pendingClose);
-    finishHost.mockImplementationOnce(async () => {
-      finished();
-    });
-    const running = runAsync();
-    try {
-      // Both settle while the tunnel close is still held open.
-      await Promise.all([hostFinished, toolStopped]);
-      expect(stopTunnel).toHaveBeenCalledTimes(1);
-    } finally {
-      release();
-      await running;
-    }
-  });
-
-  it('still stops the automation process when event collection stop rejects', async () => {
-    stopEvents.mockRejectedValueOnce(new Error('collector failed'));
-    // Agent Device wraps its collector stop in a catch-all helper; Appium does not.
-    const outcome = await runAsync().then(
-      () => 'resolved',
-      (err: Error) => err.message
-    );
-    expect(outcome).toBe(name === 'Appium' ? 'collector failed' : 'resolved');
-    expect(stopTool).toHaveBeenCalledTimes(1);
-    expect(stopTunnel).toHaveBeenCalledTimes(1);
-    expect(finishHost).toHaveBeenCalledTimes(1);
-  });
-
-  it('still stops automation when recording finalization rejects', async () => {
-    finishHost.mockRejectedValueOnce(new Error('recording cleanup failed'));
-    await expect(runAsync()).rejects.toThrow('recording cleanup failed');
-    expect(stopTool).toHaveBeenCalledTimes(1);
-    expect(stopTunnel).toHaveBeenCalledTimes(1);
-    expect(Sentry.capture).not.toHaveBeenCalled();
-  });
-
-  it.each(['preview', 'config', 'wait'])('finishes the host after %s fails', async phase => {
-    const error = new Error(`${phase} failed`);
-    // A teardown failure must not replace the error that ended the session.
-    finishHost.mockRejectedValueOnce(new Error('recording cleanup failed'));
-    if (phase === 'preview') {
-      openPreview.mockRejectedValueOnce(error);
-    } else if (phase === 'config') {
-      jest.mocked(uploadRemoteSessionConfigAsync).mockRejectedValueOnce(error);
-    } else {
-      lifetimeWait.mockRejectedValueOnce(error);
-    }
-    await expect(runAsync()).rejects.toBe(error);
-    expect(finishHost).toHaveBeenCalledTimes(1);
-    // An agent-device preview failure aborts the daemon task, which then may not start its
-    // daemon or tunnel. Everything that started must be stopped.
-    const abortsDaemonTask = name === 'Agent Device' && phase === 'preview';
-    expect(stopTool).toHaveBeenCalledTimes(
-      abortsDaemonTask ? jest.mocked(spawnDetached).mock.calls.length : 1
-    );
-    expect(stopTunnel).toHaveBeenCalledTimes(
-      abortsDaemonTask ? jest.mocked(startNgrokTunnelAsync).mock.calls.length : 1
-    );
-    expect(logger.warn).toHaveBeenCalledWith(
-      { err: expect.objectContaining({ message: 'recording cleanup failed' }) },
-      'Could not stop the session host during remote session teardown.'
-    );
-    expect(Sentry.capture).toHaveBeenCalledWith(
-      'Could not stop the session host after the remote session failed',
-      expect.objectContaining({ message: 'recording cleanup failed' }),
-      { level: 'warning' }
-    );
-  });
-});
-
-describe('Appium ffmpeg setup', () => {
-  async function runAppiumAsync(): Promise<void> {
-    const fn = createStartAppiumRemoteSessionBuildFunction({} as CustomBuildContext);
-    await fn.fn!(
-      {
-        logger,
-        global: { runtimePlatform: BuildRuntimePlatform.LINUX },
-      } as unknown as BuildStepContext,
-      {
-        inputs: new Proxy({} as Record<string, { value: unknown }>, {
-          get: (target, id: string) => target[id] ?? { value: undefined },
-        }),
-        outputs: {},
-        env: {
-          DEVICE_RUN_SESSION_ID: 'session-id',
-          EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN: 'example.test',
-          NGROK_AUTHTOKEN: 'token',
-        },
-      } as never
-    );
-  }
-
-  function holdFfmpegInstall({ appiumError }: { appiumError?: Error } = {}) {
-    let markStarted!: () => void;
-    const started = new Promise<void>(resolve => {
-      markStarted = resolve;
-    });
-    let finish!: (outcome: 'installed' | 'failed') => void;
-    const install = new Promise((resolve, reject) => {
-      finish = outcome =>
-        outcome === 'installed' ? resolve({}) : reject(new Error('apt-get failed'));
-    });
-    jest.mocked(spawn).mockImplementation(((command: string, args: string[]) => {
-      if (command === 'ffmpeg') {
-        return Promise.reject(new Error('ffmpeg missing'));
-      }
-      if (args.includes('install') && args.includes('ffmpeg')) {
-        markStarted();
-        return install;
-      }
-      return command === 'npm' && appiumError
-        ? Promise.reject(appiumError)
-        : Promise.resolve({ stdout: '{}' });
-    }) as never);
-    return { finish, started };
-  }
-
-  it.each(['installed', 'failed'] as const)(
-    'starts Appium after the ffmpeg install settles (%s)',
-    async outcome => {
-      const { finish, started } = holdFfmpegInstall();
-
-      const run = runAppiumAsync();
-      await started;
-      expect(spawnDetached).not.toHaveBeenCalled();
-
-      finish(outcome);
-      await run;
-      expect(spawnDetached).toHaveBeenCalledTimes(1);
-    }
-  );
-
-  it('waits for the ffmpeg install before failing on an Appium install error', async () => {
-    const appiumError = new Error('npm failed');
-    const { finish, started } = holdFfmpegInstall({ appiumError });
-
-    let settled = false;
-    const run = runAppiumAsync().finally(() => {
-      settled = true;
-    });
-    await started;
-    expect(settled).toBe(false);
-
-    finish('installed');
-    await expect(run).rejects.toBe(appiumError);
-  });
-});

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

@@ -11,8 +11,6 @@ import * as tar from 'tar';
 
 import { createGlobalContextMock } from '../../../__tests__/utils/context';
 import { createMockLogger } from '../../../__tests__/utils/logger';
-import { Datadog } from '../../../datadog';
-import * as files from '../../../utils/files';
 import { createDownloadBuildFunction, downloadBuildAsync } from '../downloadBuild';
 
 // contains a 'TestApp.app/TestApp' file with 'i am executable' content
@@ -31,17 +29,11 @@ const APPLICATION_ARCHIVE_URL = `https://expo.dev/artifacts/eas/${randomUUID()}.
 function createMockGraphqlClient({
   applicationArchiveUrl,
   error,
-  transientError,
 }: {
   applicationArchiveUrl?: string | null;
   error?: Error;
-  transientError?: Error;
 }): Client {
-  const toPromise = jest.fn();
-  if (transientError) {
-    toPromise.mockResolvedValueOnce({ error: transientError, data: undefined });
-  }
-  toPromise.mockResolvedValue(
+  const toPromise = jest.fn().mockResolvedValue(
     error
       ? { error, data: undefined }
       : {
@@ -69,7 +61,7 @@ function createSuccessfulResponse({
   url,
   headers,
 }: {
-  body: Buffer | Readable;
+  body: Buffer;
   url: string;
   headers?: Record<string, string>;
 }): Response {
@@ -79,7 +71,7 @@ function createSuccessfulResponse({
 
   return {
     ok: true,
-    body: body instanceof Readable ? body : Readable.from(body),
+    body: Readable.from(body),
     url,
     headers: {
       get: (name: string): string | null => normalizedHeaders[name.toLowerCase()] ?? null,
@@ -87,47 +79,6 @@ function createSuccessfulResponse({
   } as unknown as Response;
 }
 
-function createUndiciNetworkError(code: string): CombinedError {
-  return new CombinedError({
-    networkError: Object.assign(new TypeError('fetch failed'), {
-      cause: Object.assign(new Error(`read ${code}`), { code }),
-    }),
-  });
-}
-
-const { FetchError: ActualFetchError } = jest.requireActual(
-  'node-fetch'
-) as typeof import('node-fetch');
-
-function createSocketFetchError(url: string, code: string): Error {
-  return new ActualFetchError(`request to ${url} failed, reason: connect ${code}`, 'system', {
-    code,
-  } as any);
-}
-
-function useFakeBackoffTimers(): void {
-  // Streams and fs callbacks need the real nextTick and setImmediate; only the backoff timers are faked.
-  jest.useFakeTimers({ doNotFake: ['nextTick', 'setImmediate', 'queueMicrotask'] });
-}
-
-const MAX_IO_TURNS_BEFORE_BACKOFF = 1000;
-
-async function waitForBackoffTimerAsync(): Promise<void> {
-  for (let turns = 0; jest.getTimerCount() === 0; turns++) {
-    if (turns === MAX_IO_TURNS_BEFORE_BACKOFF) {
-      throw new Error('No backoff timer was scheduled.');
-    }
-    await new Promise(resolve => setImmediate(resolve));
-  }
-}
-
-async function fireBackoffTimersAsync(count: number): Promise<void> {
-  for (let i = 0; i < count; i++) {
-    await waitForBackoffTimerAsync();
-    await jest.advanceTimersToNextTimerAsync();
-  }
-}
-
 async function createFlatAppTarGzBufferAsync(): Promise<Buffer> {
   const sourceDirectory = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'flat-app-source-'));
   const archivePath = path.join(os.tmpdir(), `${randomUUID()}.tar.gz`);
@@ -156,65 +107,7 @@ async function createFlatAppTarGzBufferAsync(): Promise<Buffer> {
   }
 }
 
-afterEach(() => {
-  jest.useRealTimers();
-  jest.restoreAllMocks();
-});
-
 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({
@@ -362,144 +255,6 @@ describe('downloadBuild', () => {
     expect(await fs.promises.readFile(artifactPath, 'utf-8')).toBe('hello');
   });
 
-  it('passes the abort signal to the build lookup', async () => {
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-    });
-    jest
-      .mocked(fetch)
-      .mockResolvedValue(
-        createSuccessfulResponse({ body: APP_TAR_GZ_BUFFER, url: APPLICATION_ARCHIVE_URL })
-      );
-    const buildId = randomUUID();
-
-    await downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      buildId,
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['app'],
-      signal: new AbortController().signal,
-    });
-
-    expect(graphqlClient.query).toHaveBeenCalledWith(
-      expect.anything(),
-      { buildId },
-      { fetch: expect.any(Function) }
-    );
-    expect(jest.mocked(fetch)).toHaveBeenCalledWith(
-      APPLICATION_ARCHIVE_URL,
-      expect.objectContaining({ signal: expect.any(Object) })
-    );
-  });
-
-  it('stops a pending build lookup when aborted', async () => {
-    // The lookup request runs through the abort-aware fetch from graphqlAbortContext and
-    // hangs until its signal fires, like a stalled API call.
-    const realFetch = globalThis.fetch;
-    globalThis.fetch = jest.fn(
-      (_input: unknown, init?: RequestInit) =>
-        new Promise<never>((_resolve, reject) => {
-          init!.signal!.addEventListener('abort', () => reject(init!.signal!.reason));
-        })
-    ) as typeof globalThis.fetch;
-    const graphqlClient = {
-      query: jest.fn((_query, _variables, context: { fetch: typeof globalThis.fetch }) => ({
-        toPromise: () =>
-          context.fetch('https://api.expo.dev/graphql', {}).then(
-            () => ({ data: undefined }),
-            (networkError: Error) => ({ error: new CombinedError({ networkError }) })
-          ),
-      })),
-    } as unknown as Client;
-    const controller = new AbortController();
-    const failure = new Error('daemon failed');
-
-    try {
-      const download = downloadBuildAsync({
-        logger: createLogger({ name: 'test' }),
-        buildId: randomUUID(),
-        graphqlClient,
-        robotAccessToken: null,
-        extensions: ['app'],
-        signal: controller.signal,
-      });
-      await new Promise(resolve => setImmediate(resolve));
-      expect(globalThis.fetch).toHaveBeenCalledTimes(1);
-
-      controller.abort(failure);
-
-      await expect(download).rejects.toBe(failure);
-      expect(jest.mocked(fetch)).not.toHaveBeenCalled();
-    } finally {
-      globalThis.fetch = realFetch;
-    }
-  });
-
-  it('lets a started extraction finish before it reports an abort', async () => {
-    jest
-      .mocked(fetch)
-      .mockResolvedValue(
-        createSuccessfulResponse({ body: APP_TAR_GZ_BUFFER, url: APPLICATION_ARCHIVE_URL })
-      );
-    const { decompressTarAsync } = jest.requireActual<typeof files>('../../../utils/files');
-    const controller = new AbortController();
-    const failure = new Error('daemon failed');
-    let extractionDirectory: string | undefined;
-    let extractionFinished = false;
-    const decompressSpy = jest.spyOn(files, 'decompressTarAsync').mockImplementation(async args => {
-      extractionDirectory = args.destinationDirectory;
-      // The startup fails while the archive is being extracted.
-      controller.abort(failure);
-      await decompressTarAsync(args);
-      extractionFinished = true;
-    });
-
-    try {
-      await expect(
-        downloadBuildAsync({
-          logger: createLogger({ name: 'test' }),
-          applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-          graphqlClient: createMockGraphqlClient({}),
-          robotAccessToken: null,
-          extensions: ['app'],
-          signal: controller.signal,
-        })
-      ).rejects.toBe(failure);
-
-      // The download settled only after the extraction wrote its last file.
-      expect(extractionFinished).toBe(true);
-      expect(
-        await fs.promises.readFile(
-          path.join(extractionDirectory!, 'TestApp.app', 'TestApp'),
-          'utf8'
-        )
-      ).toBe('i am executable\n');
-    } finally {
-      decompressSpy.mockRestore();
-    }
-  });
-
-  it('does not look up the build when already aborted', async () => {
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-    });
-    const failure = new Error('boot failed');
-
-    await expect(
-      downloadBuildAsync({
-        logger: createLogger({ name: 'test' }),
-        buildId: randomUUID(),
-        graphqlClient,
-        robotAccessToken: null,
-        extensions: ['app'],
-        signal: AbortSignal.abort(failure),
-      })
-    ).rejects.toBe(failure);
-    expect(graphqlClient.query).not.toHaveBeenCalled();
-    expect(jest.mocked(fetch)).not.toHaveBeenCalled();
-  });
-
   it('rejects missing or ambiguous build sources', async () => {
     const graphqlClient = createMockGraphqlClient({
       applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
@@ -571,13 +326,13 @@ describe('downloadBuild', () => {
     expect(jest.mocked(fetch)).not.toHaveBeenCalled();
   });
 
-  it('throws SystemError with the cause code after retrying a failing build lookup', async () => {
-    useFakeBackoffTimers();
+  it('throws SystemError when GraphQL request fails with a network error', async () => {
     const buildId = randomUUID();
     const graphqlClient = createMockGraphqlClient({
-      error: createUndiciNetworkError('ECONNRESET'),
+      error: new CombinedError({
+        networkError: new Error('Network request failed'),
+      }),
     });
-    const datadogLog = jest.spyOn(Datadog, 'log');
 
     const promise = downloadBuildAsync({
       logger: createLogger({ name: 'test' }),
@@ -586,81 +341,19 @@ describe('downloadBuild', () => {
       robotAccessToken: null,
       extensions: ['app'],
     });
-    const rejection = expect(promise).rejects.toBeInstanceOf(SystemError);
-    await fireBackoffTimersAsync(5);
 
-    await rejection;
+    await expect(promise).rejects.toBeInstanceOf(SystemError);
     await expect(promise).rejects.toMatchObject({
-      message: `Could not fetch build ${buildId}: [Network] fetch failed (ECONNRESET)`,
-    });
-    expect(graphqlClient.query).toHaveBeenCalledTimes(6);
-    expect(datadogLog).toHaveBeenCalledWith('download_build.build_lookup failed on attempt 6', {
-      event: 'network_retry',
-      operation: 'download_build.build_lookup',
-      outcome: 'failed',
-      attempts: '6',
-      code: 'ECONNRESET',
+      message: `Could not fetch build ${buildId}: [Network] Network request failed`,
     });
+
     expect(jest.mocked(fetch)).not.toHaveBeenCalled();
   });
 
-  it.each([
-    ['a network error', createUndiciNetworkError('ECONNRESET'), 'ECONNRESET'],
-    [
-      'a transient GraphQL error',
-      new CombinedError({
-        graphQLErrors: [
-          {
-            message: 'Too many requests',
-            extensions: { isTransient: true, errorCode: 'TOO_MANY_REQUESTS' },
-          },
-        ],
-        response: { status: 200 },
-      }),
-      'TOO_MANY_REQUESTS',
-    ],
-  ])('downloads after a build lookup that failed once with %s', async (_, transientError, code) => {
-    useFakeBackoffTimers();
-    const buildId = randomUUID();
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-      transientError,
-    });
-    jest
-      .mocked(fetch)
-      .mockResolvedValue(
-        createSuccessfulResponse({ body: Buffer.from('hello'), url: 'https://cdn.test/app.apk' })
-      );
-
-    const datadogLog = jest.spyOn(Datadog, 'log');
-
-    const promise = downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      buildId,
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['apk'],
-    });
-    await fireBackoffTimersAsync(1);
-
-    const { artifactPath } = await promise;
-    expect(path.basename(artifactPath)).toBe('app.apk');
-    expect(graphqlClient.query).toHaveBeenCalledTimes(2);
-    expect(datadogLog).toHaveBeenCalledWith('download_build.build_lookup recovered on attempt 2', {
-      event: 'network_retry',
-      operation: 'download_build.build_lookup',
-      outcome: 'recovered',
-      attempts: '2',
-      code,
-    });
-  });
-
   it('throws SystemError when GraphQL request returns 5xx', async () => {
-    useFakeBackoffTimers();
     const buildId = randomUUID();
     const graphqlClient = createMockGraphqlClient({
-      error: new CombinedError({
-        graphQLErrors: [{ message: 'Internal Server Error' }],
+      error: Object.assign(new Error('Internal Server Error'), {
         response: { status: 500 },
       }),
     });
@@ -672,14 +365,12 @@ describe('downloadBuild', () => {
       robotAccessToken: null,
       extensions: ['app'],
     });
-    const rejection = expect(promise).rejects.toBeInstanceOf(SystemError);
-    await fireBackoffTimersAsync(5);
 
-    await rejection;
+    await expect(promise).rejects.toBeInstanceOf(SystemError);
     await expect(promise).rejects.toMatchObject({
-      message: `Could not fetch build ${buildId}: [GraphQL] Internal Server Error`,
+      message: `Could not fetch build ${buildId}: Internal Server Error`,
     });
-    expect(graphqlClient.query).toHaveBeenCalledTimes(6);
+
     expect(jest.mocked(fetch)).not.toHaveBeenCalled();
   });
 
@@ -704,193 +395,10 @@ describe('downloadBuild', () => {
       errorCode: 'EAS_DOWNLOAD_BUILD_FETCH_FAILED',
       message: `Could not fetch build ${buildId}: [GraphQL] Build not found`,
     });
-    expect(graphqlClient.query).toHaveBeenCalledTimes(1);
+
     expect(jest.mocked(fetch)).not.toHaveBeenCalled();
   });
 
-  it('downloads after an archive request that failed once with a socket error', async () => {
-    useFakeBackoffTimers();
-    const graphqlClient = createMockGraphqlClient({});
-    jest
-      .mocked(fetch)
-      .mockRejectedValueOnce(createSocketFetchError(APPLICATION_ARCHIVE_URL, 'ECONNRESET'))
-      .mockResolvedValueOnce(
-        createSuccessfulResponse({ body: Buffer.from('hello'), url: 'https://cdn.test/app.apk' })
-      );
-
-    const promise = downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['apk'],
-    });
-    await fireBackoffTimersAsync(1);
-
-    const { artifactPath } = await promise;
-    expect(path.basename(artifactPath)).toBe('app.apk');
-    expect(jest.mocked(fetch)).toHaveBeenCalledTimes(2);
-  });
-
-  it('throws SystemError with the cause code after retrying a failing build archive request', async () => {
-    useFakeBackoffTimers();
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-    });
-    jest
-      .mocked(fetch)
-      .mockRejectedValue(createSocketFetchError(APPLICATION_ARCHIVE_URL, 'ETIMEDOUT'));
-    const datadogLog = jest.spyOn(Datadog, 'log');
-
-    const promise = downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      buildId: randomUUID(),
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['apk'],
-    });
-    const rejection = expect(promise).rejects.toBeInstanceOf(SystemError);
-    await fireBackoffTimersAsync(5);
-
-    await rejection;
-    await expect(promise).rejects.toMatchObject({
-      message: `Could not download the application archive: request to ${APPLICATION_ARCHIVE_URL} failed, reason: connect ETIMEDOUT`,
-    });
-    expect(jest.mocked(fetch)).toHaveBeenCalledTimes(6);
-    expect(datadogLog).toHaveBeenCalledWith('download_build.archive_download failed on attempt 6', {
-      event: 'network_retry',
-      operation: 'download_build.archive_download',
-      outcome: 'failed',
-      attempts: '6',
-      code: 'ETIMEDOUT',
-    });
-  });
-
-  function createBrokenBody(code: string): Readable {
-    return Readable.from(
-      (async function* () {
-        yield Buffer.from('he');
-        throw Object.assign(new Error(`body failed with ${code}`), { code });
-      })()
-    );
-  }
-
-  it.each(['ERR_STREAM_PREMATURE_CLOSE', 'ECONNRESET'])(
-    'downloads again when the archive body breaks off with %s after the headers arrived',
-    async code => {
-      useFakeBackoffTimers();
-      const graphqlClient = createMockGraphqlClient({});
-      const brokenBody = createBrokenBody(code);
-      jest
-        .mocked(fetch)
-        .mockResolvedValueOnce(
-          createSuccessfulResponse({ body: brokenBody, url: 'https://cdn.test/app.apk' })
-        )
-        .mockResolvedValueOnce(
-          createSuccessfulResponse({ body: Buffer.from('hello'), url: 'https://cdn.test/app.apk' })
-        );
-      const datadogLog = jest.spyOn(Datadog, 'log');
-
-      const promise = downloadBuildAsync({
-        logger: createLogger({ name: 'test' }),
-        applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-        graphqlClient,
-        robotAccessToken: null,
-        extensions: ['apk'],
-      });
-      await fireBackoffTimersAsync(1);
-
-      const { artifactPath } = await promise;
-      expect(await fs.promises.readFile(artifactPath, 'utf-8')).toBe('hello');
-      expect(jest.mocked(fetch)).toHaveBeenCalledTimes(2);
-      expect(datadogLog).toHaveBeenCalledWith(
-        'download_build.archive_download recovered on attempt 2',
-        expect.objectContaining({ outcome: 'recovered', code })
-      );
-    }
-  );
-
-  it('throws SystemError when the build archive body keeps breaking off', async () => {
-    useFakeBackoffTimers();
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-    });
-    jest.mocked(fetch).mockImplementation(async () =>
-      createSuccessfulResponse({
-        body: createBrokenBody('ECONNRESET'),
-        url: 'https://cdn.test/app.apk',
-      })
-    );
-    const datadogLog = jest.spyOn(Datadog, 'log');
-
-    const promise = downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      buildId: randomUUID(),
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['apk'],
-    });
-    const rejection = expect(promise).rejects.toBeInstanceOf(SystemError);
-    await fireBackoffTimersAsync(5);
-
-    await rejection;
-    await expect(promise).rejects.toMatchObject({
-      message: 'Could not download the application archive: body failed with ECONNRESET',
-    });
-    expect(jest.mocked(fetch)).toHaveBeenCalledTimes(6);
-    expect(datadogLog).toHaveBeenCalledWith(
-      'download_build.archive_download failed on attempt 6',
-      expect.objectContaining({ outcome: 'failed', code: 'ECONNRESET' })
-    );
-  });
-
-  it('does not start another archive attempt after an abort during the backoff', async () => {
-    useFakeBackoffTimers();
-    const graphqlClient = createMockGraphqlClient({});
-    jest
-      .mocked(fetch)
-      .mockRejectedValueOnce(createSocketFetchError(APPLICATION_ARCHIVE_URL, 'ECONNRESET'));
-    const controller = new AbortController();
-    const reason = new Error('step timed out');
-
-    const promise = downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['apk'],
-      signal: controller.signal,
-    });
-    const rejection = expect(promise).rejects.toBe(reason);
-    await waitForBackoffTimerAsync();
-    controller.abort(reason);
-    await jest.advanceTimersToNextTimerAsync();
-
-    await rejection;
-    expect(jest.mocked(fetch)).toHaveBeenCalledTimes(1);
-  });
-
-  it('rethrows the raw error of a failing user-supplied archive URL after the retries', async () => {
-    useFakeBackoffTimers();
-    const graphqlClient = createMockGraphqlClient({});
-    jest
-      .mocked(fetch)
-      .mockRejectedValue(createSocketFetchError(APPLICATION_ARCHIVE_URL, 'ENOTFOUND'));
-
-    const promise = downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['apk'],
-    });
-    const rejection = expect(promise).rejects.toBeInstanceOf(ActualFetchError);
-    await fireBackoffTimersAsync(5);
-
-    await rejection;
-    expect(jest.mocked(fetch)).toHaveBeenCalledTimes(6);
-  });
-
   it('should throw an error if no matching files are found', async () => {
     const graphqlClient = createMockGraphqlClient({
       applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
@@ -916,159 +424,6 @@ describe('downloadBuild', () => {
 });
 
 describe('createDownloadBuildFunction', () => {
-  it('aborts a pending archive request when the step times out', async () => {
-    let requestAborted = false;
-    jest.mocked(fetch).mockImplementation(
-      async (_url, options) =>
-        await new Promise<Response>((_resolve, reject) => {
-          options?.signal?.addEventListener('abort', () => {
-            requestAborted = true;
-            reject(new Error('Archive request aborted'));
-          });
-        })
-    );
-    const graphqlClient = createMockGraphqlClient({});
-    const step = createDownloadBuildFunction({
-      graphqlClient,
-    } as any).createBuildStepFromFunctionCall(
-      createGlobalContextMock({ staticContextContent: { job: {} } }),
-      {
-        callInputs: { application_archive_url: APPLICATION_ARCHIVE_URL, extensions: ['ipa'] },
-        timeoutMs: 100,
-      }
-    );
-
-    await expect(step.executeAsync()).rejects.toThrow('timed out');
-    expect(fetch).toHaveBeenCalledTimes(1);
-    expect(requestAborted).toBe(true);
-    expect(graphqlClient.query).not.toHaveBeenCalled();
-  });
-
-  describe('with a device run session token in the job env', () => {
-    const { Response: ActualResponse } = jest.requireActual(
-      'node-fetch'
-    ) as typeof import('node-fetch');
-    const workerApiUrl = 'https://api.expo.test/v2/device-run-session-worker/application';
-
-    function createSessionCtx(graphqlClient: Client): any {
-      return {
-        graphqlClient,
-        env: { EAS_DEVICE_RUN_SESSION_TOKEN: 'session-token' },
-        expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      };
-    }
-
-    function createApplicationResponse(buildId: string): Response {
-      return new ActualResponse(
-        JSON.stringify({
-          data: {
-            build: {
-              id: buildId,
-              gitCommitHash: null,
-              applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-            },
-          },
-        }),
-        { status: 200 }
-      );
-    }
-
-    function createStep(ctx: any, callInputs: Record<string, unknown>) {
-      return createDownloadBuildFunction(ctx).createBuildStepFromFunctionCall(
-        createGlobalContextMock({
-          logger: createMockLogger(),
-          staticContextContent: { job: { secrets: { robotAccessToken: 'session-token' } } },
-        }),
-        { callInputs }
-      );
-    }
-
-    it('looks up build_id through the worker API and downloads without an Authorization header', async () => {
-      const buildId = randomUUID();
-      const graphqlClient = createMockGraphqlClient({});
-      jest.mocked(fetch).mockImplementation(async url => {
-        if (url === workerApiUrl) {
-          return createApplicationResponse(buildId);
-        }
-        return {
-          ok: false,
-          text: () => Promise.resolve('Internal Server Error'),
-          status: 500,
-        } as unknown as Response;
-      });
-
-      await expect(
-        createStep(createSessionCtx(graphqlClient), {
-          build_id: buildId,
-          extensions: ['app'],
-        }).executeAsync()
-      ).rejects.toThrow('Internal Server Error');
-
-      expect(jest.mocked(fetch)).toHaveBeenCalledWith(
-        workerApiUrl,
-        expect.objectContaining({
-          method: 'GET',
-          headers: { 'expo-device-run-session-token': 'session-token' },
-        })
-      );
-      expect(jest.mocked(fetch)).toHaveBeenCalledWith(
-        APPLICATION_ARCHIVE_URL,
-        expect.objectContaining({ headers: undefined })
-      );
-      expect(graphqlClient.query).not.toHaveBeenCalled();
-    });
-
-    it('retries the worker API lookup after a 5xx response', async () => {
-      useFakeBackoffTimers();
-      const buildId = randomUUID();
-      const graphqlClient = createMockGraphqlClient({});
-      jest
-        .mocked(fetch)
-        .mockResolvedValueOnce(new ActualResponse('Service Unavailable', { status: 503 }))
-        .mockResolvedValueOnce(createApplicationResponse(buildId))
-        .mockResolvedValueOnce(
-          createSuccessfulResponse({ body: Buffer.from('hello'), url: 'https://cdn.test/app.apk' })
-        );
-
-      const execution = createStep(createSessionCtx(graphqlClient), {
-        build_id: buildId,
-        extensions: ['apk'],
-      }).executeAsync();
-      await fireBackoffTimersAsync(1);
-
-      await execution;
-      expect(jest.mocked(fetch)).toHaveBeenCalledTimes(3);
-      expect(jest.mocked(fetch).mock.calls.map(([url]) => url)).toEqual([
-        workerApiUrl,
-        workerApiUrl,
-        APPLICATION_ARCHIVE_URL,
-      ]);
-    });
-
-    it('does not call the worker API for an application_archive_url input', async () => {
-      const graphqlClient = createMockGraphqlClient({});
-      jest.mocked(fetch).mockResolvedValue({
-        ok: false,
-        text: () => Promise.resolve('Internal Server Error'),
-        status: 500,
-      } as unknown as Response);
-
-      await expect(
-        createStep(createSessionCtx(graphqlClient), {
-          application_archive_url: APPLICATION_ARCHIVE_URL,
-          extensions: ['app'],
-        }).executeAsync()
-      ).rejects.toThrow('Internal Server Error');
-
-      expect(jest.mocked(fetch)).toHaveBeenCalledTimes(1);
-      expect(jest.mocked(fetch)).toHaveBeenCalledWith(
-        APPLICATION_ARCHIVE_URL,
-        expect.objectContaining({ headers: undefined })
-      );
-      expect(graphqlClient.query).not.toHaveBeenCalled();
-    });
-  });
-
   it('should download a build', async () => {
     const buildId = randomUUID();
     const graphqlClient = createMockGraphqlClient({

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

@@ -1,192 +0,0 @@
-import { Client, CombinedError } from '@urql/core';
-import fetch, { Response } from 'node-fetch';
-import fs from 'node:fs';
-import { Readable } from 'node:stream';
-
-import { CustomBuildContext } from '../../../customBuildContext';
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { createMockLogger } from '../../../__tests__/utils/logger';
-import { createDownloadSubmissionArchiveFunction } from '../downloadSubmissionArchive';
-
-const submissionId = 'aabbccdd-1234-4321-abcd-123456789012';
-const url = 'https://storage.example/app.ipa?signature=secret';
-
-it('reports invalid submission ID and extensions together', async () => {
-  const mutation = jest.fn();
-  const step = createDownloadSubmissionArchiveFunction({
-    graphqlClient: { mutation } as unknown as Client,
-  } as CustomBuildContext).createBuildStepFromFunctionCall(createGlobalContextMock(), {
-    callInputs: { submission_id: 'invalid', extensions: [123] },
-  });
-
-  await expect(step.executeAsync()).rejects.toMatchObject({
-    issues: expect.arrayContaining([
-      expect.objectContaining({ path: ['submissionId'] }),
-      expect.objectContaining({ path: ['extensions', 0] }),
-    ]),
-  });
-  expect(mutation).not.toHaveBeenCalled();
-});
-
-it('requests a fresh URL on each execution, downloads without auth and does not log the URL', async () => {
-  const mutation = jest.fn(() => ({
-    toPromise: async () => ({
-      data: {
-        submission: { generateSubmissionArchiveDownloadUrl: url },
-      },
-    }),
-  }));
-  const logger = createMockLogger();
-  const fn = createDownloadSubmissionArchiveFunction({
-    graphqlClient: { mutation } as unknown as Client,
-  } as CustomBuildContext);
-  for (let i = 0; i < 2; i++) {
-    jest.mocked(fetch).mockResolvedValue({
-      ok: true,
-      url,
-      body: Readable.from(Buffer.from('IPA bytes')),
-      headers: { get: () => null },
-    } as unknown as Response);
-    const step = fn.createBuildStepFromFunctionCall(createGlobalContextMock({ logger }), {
-      callInputs: { submission_id: submissionId },
-    });
-    await step.executeAsync();
-    expect(await fs.promises.readFile(step.getOutputValueByName('artifact_path')!, 'utf8')).toBe(
-      'IPA bytes'
-    );
-  }
-  expect(mutation).toHaveBeenCalledTimes(2);
-  expect(fetch).toHaveBeenCalledWith(url, { headers: undefined, signal: undefined });
-  expect(JSON.stringify(jest.mocked(logger.info).mock.calls)).not.toContain(url);
-});
-
-it('preserves the API error as the cause without downloading', async () => {
-  const error = new CombinedError({ networkError: new Error('Connection reset') });
-  const mutation = jest.fn(() => ({
-    toPromise: async () => ({
-      error,
-    }),
-  }));
-  const step = createDownloadSubmissionArchiveFunction({
-    graphqlClient: { mutation } as unknown as Client,
-  } as CustomBuildContext).createBuildStepFromFunctionCall(createGlobalContextMock(), {
-    callInputs: { submission_id: submissionId },
-  });
-  await expect(step.executeAsync()).rejects.toMatchObject({
-    message: 'Could not request the submission archive. Try again later.',
-    cause: error,
-  });
-  expect(fetch).not.toHaveBeenCalled();
-  expect(mutation).toHaveBeenCalledTimes(4);
-});
-
-it('retries a temporary URL request failure and then downloads the archive', async () => {
-  const mutation = jest
-    .fn()
-    .mockReturnValueOnce({
-      toPromise: async () => ({
-        error: new CombinedError({ networkError: new Error('Connection reset') }),
-      }),
-    })
-    .mockReturnValue({
-      toPromise: async () => ({
-        data: { submission: { generateSubmissionArchiveDownloadUrl: url } },
-      }),
-    });
-  jest.mocked(fetch).mockResolvedValue({
-    ok: true,
-    url,
-    body: Readable.from(Buffer.from('IPA bytes')),
-    headers: { get: () => null },
-  } as unknown as Response);
-  const step = createDownloadSubmissionArchiveFunction({
-    graphqlClient: { mutation } as unknown as Client,
-  } as CustomBuildContext).createBuildStepFromFunctionCall(createGlobalContextMock(), {
-    callInputs: { submission_id: submissionId },
-  });
-
-  await step.executeAsync();
-
-  expect(mutation).toHaveBeenCalledTimes(2);
-  expect(await fs.promises.readFile(step.getOutputValueByName('artifact_path')!, 'utf8')).toBe(
-    'IPA bytes'
-  );
-});
-
-it('does not retry an access error', async () => {
-  const error = new CombinedError({ graphQLErrors: [{ message: 'Not authorized' }] });
-  const mutation = jest.fn(() => ({ toPromise: async () => ({ error }) }));
-  const step = createDownloadSubmissionArchiveFunction({
-    graphqlClient: { mutation } as unknown as Client,
-  } as CustomBuildContext).createBuildStepFromFunctionCall(createGlobalContextMock(), {
-    callInputs: { submission_id: submissionId },
-  });
-
-  await expect(step.executeAsync()).rejects.toMatchObject({ cause: error });
-  expect(mutation).toHaveBeenCalledTimes(1);
-  expect(fetch).not.toHaveBeenCalled();
-});
-
-it('does not send another URL request after the step times out during retry backoff', async () => {
-  const mutation = jest.fn(() => ({
-    toPromise: async () => ({
-      error: new CombinedError({ networkError: new Error('Connection reset') }),
-    }),
-  }));
-  const step = createDownloadSubmissionArchiveFunction({
-    graphqlClient: { mutation } as unknown as Client,
-  } as CustomBuildContext).createBuildStepFromFunctionCall(createGlobalContextMock(), {
-    callInputs: { submission_id: submissionId },
-    timeoutMs: 100,
-  });
-
-  await expect(step.executeAsync()).rejects.toThrow('timed out');
-  await new Promise(resolve => setTimeout(resolve, 1100));
-
-  expect(mutation).toHaveBeenCalledTimes(1);
-  expect(fetch).not.toHaveBeenCalled();
-});
-
-it('uses the requested extension for an archive without a filename extension', async () => {
-  const mutation = jest.fn(() => ({
-    toPromise: async () => ({
-      data: {
-        submission: { generateSubmissionArchiveDownloadUrl: 'https://storage.example/archive' },
-      },
-    }),
-  }));
-  jest.mocked(fetch).mockResolvedValue({
-    ok: true,
-    url: 'https://storage.example/archive',
-    body: Readable.from(Buffer.from('Android archive bytes')),
-    headers: { get: () => null },
-  } as unknown as Response);
-  const step = createDownloadSubmissionArchiveFunction({
-    graphqlClient: { mutation } as unknown as Client,
-  } as CustomBuildContext).createBuildStepFromFunctionCall(createGlobalContextMock(), {
-    callInputs: { submission_id: submissionId, extensions: ['aab'] },
-  });
-
-  await step.executeAsync();
-
-  const artifactPath = step.getOutputValueByName('artifact_path')!;
-  expect(artifactPath).toMatch(/\.aab$/);
-  expect(await fs.promises.readFile(artifactPath, 'utf8')).toBe('Android archive bytes');
-});
-
-it('propagates the original download error', async () => {
-  const error = new Error('Download failed');
-  const mutation = jest.fn(() => ({
-    toPromise: async () => ({
-      data: { submission: { generateSubmissionArchiveDownloadUrl: url } },
-    }),
-  }));
-  jest.mocked(fetch).mockRejectedValue(error);
-  const step = createDownloadSubmissionArchiveFunction({
-    graphqlClient: { mutation } as unknown as Client,
-  } as CustomBuildContext).createBuildStepFromFunctionCall(createGlobalContextMock(), {
-    callInputs: { submission_id: submissionId },
-  });
-
-  await expect(step.executeAsync()).rejects.toBe(error);
-});

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

@@ -51,24 +51,6 @@ describe(createFindAndUploadBuildArtifactsBuildFunction, () => {
     await expect(buildStep.executeAsync()).resolves.not.toThrow();
   });
 
-  it('sets application_archive_path output to first archive', async () => {
-    const globalContext = createGlobalContextMock({});
-    vol.fromJSON(
-      {
-        'ios/build/test.ipa': '',
-      },
-      globalContext.defaultWorkingDirectory
-    );
-    const buildStep = findAndUploadBuildArtifacts.createBuildStepFromFunctionCall(
-      globalContext,
-      {}
-    );
-
-    await buildStep.executeAsync();
-
-    expect(buildStep.outputById.application_archive_path.value).toMatch(/ios\/build\/test\.ipa$/);
-  });
-
   it('throws build artifacts error', async () => {
     const globalContext = createGlobalContextMock({});
     ctx.job.buildArtifactPaths = ['worker.log'];

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

@@ -463,127 +463,114 @@ describe('createInstallMaestroBuildFunction', () => {
     }
   });
 
-  it.each(['1.1.27', '1.1.28', '1.2.3'])(
-    'prepares the WDA cache only for legacy Runner versions (%s)',
-    async version => {
-      const homeDirectory = await fs.promises.mkdtemp(
-        path.join(os.tmpdir(), 'install-maestro-test-')
-      );
-      mockedSpawn.mockImplementation((async (command: string, args: string[]) => {
-        if (command === 'maestro-runner') {
-          return { stdout: `maestro-runner ${version}\n` };
-        }
-        if (command === 'xcrun') {
-          return {
-            stdout: JSON.stringify({
-              runtimes: [
-                {
-                  identifier: 'com.apple.CoreSimulator.SimRuntime.iOS-18-3',
-                  isAvailable: true,
-                  version: '18.3.1',
-                },
-                {
-                  identifier: 'com.apple.CoreSimulator.SimRuntime.iOS-26-0',
-                  isAvailable: true,
-                  version: '26.0',
-                },
-                {
-                  identifier: 'com.apple.CoreSimulator.SimRuntime.iOS-17-5',
-                  isAvailable: false,
-                  version: '17.5',
-                },
-              ],
-            }),
-          };
-        }
-        if (command === 'xcodebuild') {
-          return { stdout: 'Xcode 26.0\nBuild version 17A324\n' };
-        }
-        if (command === 'tar') {
-          const maestroRunnerHome = args[args.indexOf('-C') + 1];
-          const productsDirectory = path.join(
-            maestroRunnerHome,
-            'cache',
-            'wda-builds',
-            'generic',
-            'DerivedData',
-            'Build',
-            'Products'
-          );
-          await fs.promises.mkdir(productsDirectory, { recursive: true });
-          await fs.promises.writeFile(
-            path.join(productsDirectory, 'WebDriverAgentRunner.xctestrun'),
-            'cached'
-          );
-        }
-        return { stdout: '' };
-      }) as any);
-
-      try {
-        await writeInstalledWdaVersion(homeDirectory, '11.1.3');
-        const installMaestro = createInstallMaestroBuildFunction();
-        const globalCtx = createGlobalContextMock({
-          runtimePlatform: BuildRuntimePlatform.DARWIN,
-        });
-        globalCtx.updateEnv({
-          EAS_BUILD_RUNNER: 'eas-build',
-          EAS_BUILD_COCOAPODS_CACHE_URL: 'https://cache.example.com',
-          HOME: homeDirectory,
-        });
-        const step = installMaestro.createBuildStepFromFunctionCall(globalCtx, {
-          callInputs: { backend: 'maestro-runner' },
-        });
-
-        await step.executeAsync();
-
-        expect(step.getOutputValueByName('maestro_version')).toBe(version);
-        if (version !== '1.1.27') {
-          expect(mockedDownloadFile).not.toHaveBeenCalled();
-          expect(mockedSpawn.mock.calls.map(([command]) => command)).not.toContain('xcrun');
-          await expect(
-            fs.promises.access(path.join(homeDirectory, '.maestro-runner', 'cache'))
-          ).rejects.toThrow();
-          return;
-        }
-
-        expect(mockedDownloadFile).toHaveBeenCalledWith(
-          'https://cache.example.com/storage.googleapis.com/turtle-v2/maestro-runner-wda-cache/xcode-26.0-wda-11.1.3.tar.gz',
-          expect.stringMatching(/install_maestro_runner_wda_cache.*\/wda-cache\.tar\.gz$/),
-          { retry: 3, timeout: 20_000 }
-        );
-        for (const runtimeVersion of ['18.3', '26.0']) {
-          await expect(
-            fs.promises.readFile(
-              path.join(
-                homeDirectory,
-                '.maestro-runner',
-                'cache',
-                'wda-builds',
-                `sim-ios${runtimeVersion}-iphone`,
-                'DerivedData',
-                'Build',
-                'Products',
-                'WebDriverAgentRunner.xctestrun'
-              ),
-              'utf8'
-            )
-          ).resolves.toBe('cached');
-        }
-        await expect(
-          fs.promises.access(
-            path.join(homeDirectory, '.maestro-runner', 'cache', 'wda-builds', 'sim-ios17.5-iphone')
-          )
-        ).rejects.toThrow();
-      } finally {
-        await fs.promises.rm(homeDirectory, { force: true, recursive: true });
+  it('installs the prebuilt WDA cache for each available iOS runtime', async () => {
+    const homeDirectory = await fs.promises.mkdtemp(
+      path.join(os.tmpdir(), 'install-maestro-test-')
+    );
+    mockedSpawn.mockImplementation((async (command: string, args: string[]) => {
+      if (command === 'maestro-runner') {
+        return { stdout: 'maestro-runner 1.2.3\n' };
       }
+      if (command === 'xcrun') {
+        return {
+          stdout: JSON.stringify({
+            runtimes: [
+              {
+                identifier: 'com.apple.CoreSimulator.SimRuntime.iOS-18-3',
+                isAvailable: true,
+                version: '18.3.1',
+              },
+              {
+                identifier: 'com.apple.CoreSimulator.SimRuntime.iOS-26-0',
+                isAvailable: true,
+                version: '26.0',
+              },
+              {
+                identifier: 'com.apple.CoreSimulator.SimRuntime.iOS-17-5',
+                isAvailable: false,
+                version: '17.5',
+              },
+            ],
+          }),
+        };
+      }
+      if (command === 'xcodebuild') {
+        return { stdout: 'Xcode 26.0\nBuild version 17A324\n' };
+      }
+      if (command === 'tar') {
+        const maestroRunnerHome = args[args.indexOf('-C') + 1];
+        const productsDirectory = path.join(
+          maestroRunnerHome,
+          'cache',
+          'wda-builds',
+          'generic',
+          'DerivedData',
+          'Build',
+          'Products'
+        );
+        await fs.promises.mkdir(productsDirectory, { recursive: true });
+        await fs.promises.writeFile(
+          path.join(productsDirectory, 'WebDriverAgentRunner.xctestrun'),
+          'cached'
+        );
+      }
+      return { stdout: '' };
+    }) as any);
+
+    try {
+      await writeInstalledWdaVersion(homeDirectory, '11.1.3');
+      const installMaestro = createInstallMaestroBuildFunction();
+      const globalCtx = createGlobalContextMock({
+        runtimePlatform: BuildRuntimePlatform.DARWIN,
+      });
+      globalCtx.updateEnv({
+        EAS_BUILD_RUNNER: 'eas-build',
+        EAS_BUILD_COCOAPODS_CACHE_URL: 'https://cache.example.com',
+        HOME: homeDirectory,
+      });
+      const step = installMaestro.createBuildStepFromFunctionCall(globalCtx, {
+        callInputs: { backend: 'maestro-runner' },
+      });
+
+      await step.executeAsync();
+
+      expect(mockedDownloadFile).toHaveBeenCalledWith(
+        'https://cache.example.com/storage.googleapis.com/turtle-v2/maestro-runner-wda-cache/xcode-26.0-wda-11.1.3.tar.gz',
+        expect.stringMatching(/install_maestro_runner_wda_cache.*\/wda-cache\.tar\.gz$/),
+        { retry: 3, timeout: 20_000 }
+      );
+      for (const runtimeVersion of ['18.3', '26.0']) {
+        await expect(
+          fs.promises.readFile(
+            path.join(
+              homeDirectory,
+              '.maestro-runner',
+              'cache',
+              'wda-builds',
+              `sim-ios${runtimeVersion}-iphone`,
+              'DerivedData',
+              'Build',
+              'Products',
+              'WebDriverAgentRunner.xctestrun'
+            ),
+            'utf8'
+          )
+        ).resolves.toBe('cached');
+      }
+      await expect(
+        fs.promises.access(
+          path.join(homeDirectory, '.maestro-runner', 'cache', 'wda-builds', 'sim-ios17.5-iphone')
+        )
+      ).rejects.toThrow();
+    } finally {
+      await fs.promises.rm(homeDirectory, { force: true, recursive: true });
     }
-  );
+  });
 
   it('does not download the WDA cache when the installed WDA version is unknown', async () => {
     mockedSpawn.mockImplementation((async (command: string) => ({
       stdout:
-        command === 'xcodebuild' ? 'Xcode 26.5\nBuild version 17F90\n' : 'maestro-runner 1.1.27\n',
+        command === 'xcodebuild' ? 'Xcode 26.5\nBuild version 17F90\n' : 'maestro-runner 1.2.3\n',
     })) as any);
     const installMaestro = createInstallMaestroBuildFunction();
     const globalCtx = createGlobalContextMock({
@@ -606,7 +593,7 @@ describe('createInstallMaestroBuildFunction', () => {
     mockedSpawn.mockImplementation((async (command: string) => {
       switch (command) {
         case 'maestro-runner':
-          return { stdout: 'maestro-runner 1.1.27\n' };
+          return { stdout: 'maestro-runner 1.2.3\n' };
         case 'xcodebuild':
           return { stdout: 'Xcode 26.5\nBuild version 17F90\n' };
         case 'xcrun':
@@ -646,7 +633,7 @@ describe('createInstallMaestroBuildFunction', () => {
       });
 
       await expect(step.executeAsync()).resolves.toBeUndefined();
-      expect(step.getOutputValueByName('maestro_version')).toBe('1.1.27');
+      expect(step.getOutputValueByName('maestro_version')).toBe('1.2.3');
       expect(mockedDownloadFile.mock.calls.map(([url]) => url)).toEqual([
         'https://cache.example.com/storage.googleapis.com/turtle-v2/maestro-runner-wda-cache/xcode-26.5-wda-11.1.3.tar.gz',
         'https://storage.googleapis.com/turtle-v2/maestro-runner-wda-cache/xcode-26.5-wda-11.1.3.tar.gz',

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

@@ -1,151 +0,0 @@
-import { BuildRuntimePlatform, BuildStep } from '@expo/steps';
-import spawn from '@expo/turtle-spawn';
-import { fs, vol } from 'memfs';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { createInstallMitmproxyBuildFunction } from '../installMitmproxy';
-
-jest.mock('@expo/turtle-spawn', () => ({
-  __esModule: true,
-  default: jest.fn(),
-}));
-
-const mockedSpawn = jest.mocked(spawn);
-
-// An x86 Homebrew prefix, to check that the app is found from PATH and not from process.arch.
-const APP = '/usr/local/Caskroom/mitmproxy/12.2.3/mitmproxy.app';
-const LINK = '/usr/local/bin/mitmdump';
-
-function installCask(): void {
-  vol.fromJSON({ [`${APP}/Contents/MacOS/mitmdump`]: '', '/usr/local/bin': null });
-  fs.symlinkSync(`${APP}/Contents/MacOS/mitmdump`, LINK);
-}
-
-/**
- * `which` finds mitmdump once the cask is installed, `brew` installs it, `xattr -p` reports
- * quarantine while `stuck` is set, and each `mitmdump --version` takes the next result.
- */
-function mockCommands({
-  installed = false,
-  stuck = false,
-  runs = [],
-}: {
-  installed?: boolean;
-  stuck?: boolean;
-  runs?: boolean[];
-}): void {
-  if (installed) {
-    installCask();
-  }
-  mockedSpawn.mockImplementation((async (command: string, args: string[]) => {
-    if (command === 'which' && !installed) {
-      throw new Error('not found');
-    }
-    if (command === 'which') {
-      return { stdout: `${LINK}\n` };
-    }
-    if (command === 'brew' && !installed) {
-      installed = true;
-      installCask();
-    }
-    if (command === 'xattr' && args[0] === '-p' && !stuck) {
-      throw new Error('No such xattr: com.apple.quarantine');
-    }
-    if (command === 'mitmdump' && !runs.shift()) {
-      throw new Error('not found');
-    }
-    return { stdout: '' };
-  }) as never);
-}
-
-function spawnedCommands(): string[] {
-  return mockedSpawn.mock.calls.map(([command, args]) =>
-    command === 'xattr' ? `xattr ${args?.[0]}` : command
-  );
-}
-
-describe('createInstallMitmproxyBuildFunction', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  function createStep(env: Record<string, string>): BuildStep {
-    const globalCtx = createGlobalContextMock({ runtimePlatform: BuildRuntimePlatform.DARWIN });
-    globalCtx.updateEnv(env);
-    return createInstallMitmproxyBuildFunction().createBuildStepFromFunctionCall(globalCtx, {
-      callInputs: {},
-    });
-  }
-
-  it('takes the app behind mitmdump on PATH out of quarantine before running it', async () => {
-    mockCommands({ installed: true, runs: [true] });
-
-    await createStep({ EAS_BUILD_RUNNER: 'eas-build' }).executeAsync();
-
-    expect(mockedSpawn).toHaveBeenCalledWith(
-      'xattr',
-      ['-dr', 'com.apple.quarantine', APP],
-      expect.anything()
-    );
-    expect(spawnedCommands()).toEqual(['which', 'xattr -dr', 'xattr -p', 'mitmdump']);
-  });
-
-  it('kills a mitmdump --version that does not return', async () => {
-    mockCommands({ installed: true, runs: [true] });
-
-    await createStep({ EAS_BUILD_RUNNER: 'eas-build' }).executeAsync();
-
-    expect(mockedSpawn).toHaveBeenCalledWith(
-      'mitmdump',
-      ['--version'],
-      expect.objectContaining({ stdio: 'ignore', timeout: 60_000, killSignal: 'SIGKILL' })
-    );
-  });
-
-  it('does not run a mitmdump that stays quarantined', async () => {
-    mockCommands({ installed: true, stuck: true });
-
-    await expect(
-      createStep({ EAS_BUILD_RUNNER: 'eas-build' }).executeAsync()
-    ).resolves.toBeUndefined();
-
-    expect(spawnedCommands()).not.toContain('mitmdump');
-  });
-
-  it('does not change quarantine outside EAS Build VMs', async () => {
-    mockCommands({ installed: true, stuck: true, runs: [true] });
-
-    await createStep({}).executeAsync();
-
-    expect(spawnedCommands()).toEqual(['mitmdump']);
-  });
-
-  it('installs the cask with Homebrew and takes it out of quarantine', async () => {
-    mockCommands({ runs: [false, true] });
-
-    await createStep({ EAS_BUILD_RUNNER: 'eas-build' }).executeAsync();
-
-    expect(mockedSpawn).toHaveBeenCalledWith(
-      'brew',
-      ['install', '--cask', 'mitmproxy'],
-      expect.objectContaining({ env: expect.objectContaining({ HOMEBREW_NO_AUTO_UPDATE: '1' }) })
-    );
-    expect(spawnedCommands()).toEqual([
-      'which',
-      'mitmdump',
-      'brew',
-      'which',
-      'xattr -dr',
-      'xattr -p',
-      'mitmdump',
-    ]);
-  });
-
-  it('does not fail the job when mitmdump is still not runnable', async () => {
-    mockCommands({ runs: [false, false] });
-
-    await expect(
-      createStep({ EAS_BUILD_RUNNER: 'eas-build' }).executeAsync()
-    ).resolves.toBeUndefined();
-  });
-});

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

@@ -1,6 +1,5 @@
 import { BuildRuntimePlatform } from '@expo/steps';
 import spawn from '@expo/turtle-spawn';
-import { spawnSync } from 'node:child_process';
 
 import { createGlobalContextMock } from '../../../__tests__/utils/context';
 import { createMockLogger } from '../../../__tests__/utils/logger';
@@ -180,7 +179,17 @@ describe(launchApplicationAsync, () => {
     expect(mockedSpawn).toHaveBeenNthCalledWith(
       2,
       'adb',
-      ['shell', 'am', 'start', '-a', 'android.intent.action.VIEW', '-d', 'exp://example.test'],
+      [
+        'shell',
+        'am',
+        'start',
+        '-a',
+        'android.intent.action.VIEW',
+        '-d',
+        'exp://example.test',
+        '-n',
+        'host.exp.exponent/host.exp.exponent.MainActivity',
+      ],
       { env: {}, logger }
     );
     expect(logger.info).toHaveBeenNthCalledWith(
@@ -202,263 +211,6 @@ describe(launchApplicationAsync, () => {
     expect(mockedSpawn).not.toHaveBeenCalled();
   });
 
-  it('quotes Android launch arguments and URLs for the device shell', async () => {
-    const logger = createMockLogger();
-
-    await launchApplicationAsync({
-      applicationIdentifier: 'dev.example.app',
-      activityName: 'dev.example.app.MainActivity',
-      launchArgs: ['-d', 'euxy://tempo', '--es', 'probe', 'hello world', '--es', 'quote', "it's"],
-      openUrl: 'exp://example.test/path?a=1&b=2',
-      runtimePlatform: BuildRuntimePlatform.LINUX,
-      env: {},
-      logger,
-    });
-
-    expect(mockedSpawn).toHaveBeenNthCalledWith(
-      1,
-      'adb',
-      [
-        'shell',
-        'am',
-        'start',
-        '-d',
-        'euxy://tempo',
-        '--es',
-        'probe',
-        "'hello world'",
-        '--es',
-        'quote',
-        "'it'\\''s'",
-        '-n',
-        'dev.example.app/dev.example.app.MainActivity',
-      ],
-      { env: {}, logger }
-    );
-    expect(mockedSpawn).toHaveBeenNthCalledWith(
-      2,
-      'adb',
-      [
-        'shell',
-        'am',
-        'start',
-        '-a',
-        'android.intent.action.VIEW',
-        '-d',
-        "'exp://example.test/path?a=1&b=2'",
-      ],
-      { env: {}, logger }
-    );
-    expect(logger.info).toHaveBeenNthCalledWith(
-      1,
-      `Launching dev.example.app with arguments ${JSON.stringify(['-d', 'euxy://tempo', '--es', 'probe', 'hello world', '--es', 'quote', "it's"])}.`
-    );
-  });
-
-  it('passes iOS launch arguments with spaces unquoted', async () => {
-    await launchApplicationAsync({
-      applicationIdentifier: 'com.example.app',
-      launchArgs: ['-name', 'hello world'],
-      runtimePlatform: BuildRuntimePlatform.DARWIN,
-      env: {},
-      logger: createMockLogger(),
-    });
-
-    expect(mockedSpawn).toHaveBeenCalledWith(
-      'xcrun',
-      ['simctl', 'launch', 'booted', 'com.example.app', '-name', 'hello world'],
-      expect.any(Object)
-    );
-  });
-
-  it('round-trips quoted Android arguments through a POSIX shell', async () => {
-    const component = 'dev.example.app/dev.example.app.MainActivity$Inner';
-    const launchArgs = [
-      '--es',
-      'text',
-      'hello world',
-      '--es',
-      'json',
-      '{"a":1,"b":2}',
-      '--es',
-      'shell',
-      '$(printf injected) `printf injected` $HOME ; & | < >',
-      '--es',
-      'glob',
-      '*',
-      '--es',
-      'home',
-      '~',
-      '--esa',
-      'list',
-      'a\\,b,c',
-      '--es',
-      'whitespace',
-      'one\ntwo\tthree',
-      '--es',
-      'unicode',
-      'héllo 🌍',
-      '--es',
-      'empty',
-      '',
-    ];
-    const openUrl = 'exp://example.test/path?a=1&b=2#fragment';
-
-    await launchApplicationAsync({
-      applicationIdentifier: 'dev.example.app',
-      activityName: 'dev.example.app.MainActivity$Inner',
-      launchArgs,
-      openUrl,
-      runtimePlatform: BuildRuntimePlatform.LINUX,
-      env: {},
-      logger: createMockLogger(),
-    });
-
-    // adb joins the words after `shell` with spaces and the device shell parses the result.
-    const parsedCommands = mockedSpawn.mock.calls.map(([, args]) => {
-      const { stdout } = spawnSync(
-        '/bin/sh',
-        ['-c', `am() { printf '%s\\0' "$@"; }; ${(args as string[]).slice(1).join(' ')}`],
-        { encoding: 'utf8' }
-      );
-      return stdout.split('\0').slice(0, -1);
-    });
-    expect(parsedCommands).toEqual([
-      ['start', ...launchArgs, '-n', component],
-      ['start', '-a', 'android.intent.action.VIEW', '-d', openUrl],
-    ]);
-  });
-
-  it.each([[['--es', 'key', '']], [['-e', 'key', '']], [['-d', '']]])(
-    'passes empty Android option values as empty arguments (%j)',
-    async launchArgs => {
-      await launchApplicationAsync({
-        applicationIdentifier: 'com.example.app',
-        activityName: 'com.example.app.MainActivity',
-        launchArgs,
-        runtimePlatform: BuildRuntimePlatform.LINUX,
-        env: {},
-        logger: createMockLogger(),
-      });
-
-      expect(mockedSpawn).toHaveBeenCalledWith(
-        'adb',
-        [
-          'shell',
-          'am',
-          'start',
-          ...launchArgs.map(argument => (argument === '' ? "''" : argument)),
-          '-n',
-          'com.example.app/com.example.app.MainActivity',
-        ],
-        expect.any(Object)
-      );
-    }
-  );
-
-  it('explains an Android launch failure when a launch argument is empty', async () => {
-    const launchError = new Error('adb shell am start exited with non-zero code: 1');
-    mockedSpawn.mockRejectedValueOnce(launchError);
-
-    await expect(
-      launchApplicationAsync({
-        applicationIdentifier: 'com.example.app',
-        activityName: 'com.example.app.MainActivity',
-        launchArgs: ['--ez', 'isTest', 'true', ''],
-        runtimePlatform: BuildRuntimePlatform.LINUX,
-        env: {},
-        logger: createMockLogger(),
-      })
-    ).rejects.toMatchObject({
-      errorCode: 'EAS_LAUNCH_APPLICATION_FAILED',
-      message: expect.stringContaining('empty argument at position 4'),
-      cause: launchError,
-    });
-  });
-
-  it('rethrows an Android launch failure unchanged when no launch argument is empty', async () => {
-    const launchError = new Error('adb shell am start exited with non-zero code: 1');
-    mockedSpawn.mockRejectedValueOnce(launchError);
-
-    await expect(
-      launchApplicationAsync({
-        applicationIdentifier: 'com.example.app',
-        activityName: 'com.example.app.MainActivity',
-        launchArgs: ['--ez', 'isTest', 'true'],
-        runtimePlatform: BuildRuntimePlatform.LINUX,
-        env: {},
-        logger: createMockLogger(),
-      })
-    ).rejects.toBe(launchError);
-  });
-
-  it.each([
-    { launchArgs: ['--es', 'key', 'a\0b'] },
-    { launchArgs: [], openUrl: 'exp://example.test/a\0b' },
-  ])('rejects NUL characters on Android (%j)', async ({ launchArgs, openUrl }) => {
-    await expect(
-      launchApplicationAsync({
-        applicationIdentifier: 'com.example.app',
-        activityName: 'com.example.app.MainActivity',
-        launchArgs,
-        openUrl,
-        runtimePlatform: BuildRuntimePlatform.LINUX,
-        env: {},
-        logger: createMockLogger(),
-      })
-    ).rejects.toMatchObject({ errorCode: 'EAS_LAUNCH_APPLICATION_INVALID_INPUT' });
-    expect(mockedSpawn).not.toHaveBeenCalledWith(
-      'adb',
-      expect.arrayContaining([expect.stringContaining('\0')]),
-      expect.any(Object)
-    );
-  });
-
-  it('accepts an Android launch command of exactly 65,000 bytes', async () => {
-    const fixedLength = 'am start --es key  -n com.example.app/com.example.app.MainActivity'.length;
-
-    await launchApplicationAsync({
-      applicationIdentifier: 'com.example.app',
-      activityName: 'com.example.app.MainActivity',
-      launchArgs: ['--es', 'key', 'a'.repeat(65_000 - fixedLength)],
-      runtimePlatform: BuildRuntimePlatform.LINUX,
-      env: {},
-      logger: createMockLogger(),
-    });
-
-    expect(mockedSpawn).toHaveBeenCalledTimes(1);
-  });
-
-  it('rejects an Android URL command of 65,001 bytes', async () => {
-    const fixedLength = 'am start -a android.intent.action.VIEW -d exp://example.test/'.length;
-
-    await expect(
-      launchApplicationAsync({
-        applicationIdentifier: 'com.example.app',
-        activityName: 'com.example.app.MainActivity',
-        openUrl: `exp://example.test/${'a'.repeat(65_001 - fixedLength)}`,
-        runtimePlatform: BuildRuntimePlatform.LINUX,
-        env: {},
-        logger: createMockLogger(),
-      })
-    ).rejects.toMatchObject({ errorCode: 'EAS_LAUNCH_APPLICATION_INVALID_INPUT' });
-    expect(mockedSpawn).toHaveBeenCalledTimes(1);
-  });
-
-  it('rejects an Android launch command that is too long after quoting', async () => {
-    await expect(
-      launchApplicationAsync({
-        applicationIdentifier: 'com.example.app',
-        activityName: 'com.example.app.MainActivity',
-        launchArgs: ['--es', 'quotes', "'".repeat(20_000)],
-        runtimePlatform: BuildRuntimePlatform.LINUX,
-        env: {},
-        logger: createMockLogger(),
-      })
-    ).rejects.toMatchObject({ errorCode: 'EAS_LAUNCH_APPLICATION_INVALID_INPUT' });
-    expect(mockedSpawn).not.toHaveBeenCalled();
-  });
-
   it('launches using application metadata passed to the build step', async () => {
     const launchApplication = createLaunchApplicationFunction();
     const buildStep = launchApplication.createBuildStepFromFunctionCall(
@@ -488,36 +240,16 @@ describe(launchApplicationAsync, () => {
       ],
       expect.any(Object)
     );
-    expect(mockedSpawn).toHaveBeenCalledWith(
-      'adb',
-      ['shell', 'am', 'start', '-a', 'android.intent.action.VIEW', '-d', 'exp://example.test'],
-      expect.any(Object)
-    );
-  });
-
-  it('quotes Android launch arguments passed to the build step', async () => {
-    const launchApplication = createLaunchApplicationFunction();
-    const buildStep = launchApplication.createBuildStepFromFunctionCall(
-      createGlobalContextMock({ runtimePlatform: BuildRuntimePlatform.LINUX }),
-      {
-        callInputs: {
-          application_identifier: 'com.example.app',
-          activity_name: 'com.example.app.MainActivity',
-          launch_args: ['--es', 'probe', 'hello world'],
-        },
-      }
-    );
-    await buildStep.executeAsync();
-
     expect(mockedSpawn).toHaveBeenCalledWith(
       'adb',
       [
         'shell',
         'am',
         'start',
-        '--es',
-        'probe',
-        "'hello world'",
+        '-a',
+        'android.intent.action.VIEW',
+        '-d',
+        'exp://example.test',
         '-n',
         'com.example.app/com.example.app.MainActivity',
       ],

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

@@ -1,4 +1,4 @@
-import { SystemError, UserError } from '@expo/eas-build-job';
+import { GenericArtifactType, SystemError, UserError } from '@expo/eas-build-job';
 import spawn from '@expo/turtle-spawn';
 import fs from 'fs/promises';
 import os from 'os';
@@ -271,123 +271,20 @@ describe('createMaestroTestsBuildFunction', () => {
     expect(mockedSpawn.mock.calls[0][1]).toContain('--parallel=2');
   });
 
-  it.each(['html', 'allure'])(
-    'accepts %s output_format with maestro-runner and keeps JUnit',
-    async format => {
-      mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-      const copyFileSpy = jest.spyOn(fs, 'copyFile').mockResolvedValue();
-      const step = createStep({
-        flow_path: ['flows/a.yaml'],
-        platform: 'android',
-        backend: 'maestro-runner',
-        output_format: format,
-      });
-
-      await step.executeAsync();
-
-      expect(mockedSpawn.mock.calls[0][1]).toEqual(
-        expect.arrayContaining([
-          '--output=/home/expo/.maestro/tests/android-maestro-runner-attempt-0',
-        ])
-      );
-      expect(copyFileSpy).toHaveBeenCalledWith(
-        '/home/expo/.maestro/tests/android-maestro-runner-attempt-0/junit-report.xml',
-        '/home/expo/.maestro/tests/junit-reports/android-maestro-junit-attempt-0.xml'
-      );
-      expect(parser.mergeJUnitReports).not.toHaveBeenCalled();
-      expect(step.getOutputValueByName('final_report_path')).toBe(
-        format === 'html'
-          ? '/home/expo/.maestro/tests/android-maestro-runner-attempt-0/report.html'
-          : '/home/expo/.maestro/tests/android-maestro-runner-attempt-0/allure-results'
-      );
-      expect(mockedRunnerHarvest).not.toHaveBeenCalled();
-      expect(mockUploadArtifact).toHaveBeenCalledTimes(1);
-      expect(mockUploadArtifact).toHaveBeenCalledWith(
-        expect.objectContaining({
-          artifact: expect.objectContaining({
-            name:
-              format === 'html' ? 'Maestro Runner HTML Report' : 'Maestro Runner Allure Results',
-            paths: [
-              format === 'html'
-                ? '/home/expo/.maestro/tests/android-maestro-runner-attempt-0'
-                : '/home/expo/.maestro/tests/android-maestro-runner-attempt-0/allure-results',
-            ],
-          }),
-        })
-      );
-    }
-  );
-
-  it('does not expose a selected runner report before an attempt starts', async () => {
-    const step = createStep({
-      flow_path: [],
-      platform: 'android',
-      backend: 'maestro-runner',
-      output_format: 'html',
-    });
-
-    await expect(step.executeAsync()).rejects.toThrow(UserError);
-    expect(step.getOutputValueByName('final_report_path')).toBeUndefined();
-    expect(step.getOutputValueByName('junit_report_directory')).toBe(
-      '/home/expo/.maestro/tests/junit-reports'
-    );
-  });
-
-  it('rejects an unknown output_format with maestro-runner', async () => {
+  it('rejects a non-junit output_format with maestro-runner', async () => {
     const step = createStep({
       flow_path: ['flows/a.yaml'],
       platform: 'android',
       backend: 'maestro-runner',
-      output_format: 'csv',
+      output_format: 'html',
     });
 
     await expect(step.executeAsync()).rejects.toThrow(
-      'maestro-runner supports "junit", "html", and "allure" output_format values'
+      'maestro-runner only supports the "junit" output_format'
     );
     expect(mockedSpawn).not.toHaveBeenCalled();
   });
 
-  it('uploads the last runner HTML report even when the test fails', async () => {
-    mockedSpawn.mockRejectedValue(rejectExit1());
-    jest.spyOn(fs, 'copyFile').mockResolvedValue();
-    const step = createStep({
-      flow_path: ['flows/a.yaml'],
-      platform: 'android',
-      backend: 'maestro-runner',
-      output_format: 'html',
-      retries: 1,
-      retry_failed_only: false,
-    });
-
-    await expect(step.executeAsync()).rejects.toThrow(UserError);
-
-    expect(mockUploadArtifact).toHaveBeenCalledWith(
-      expect.objectContaining({
-        artifact: expect.objectContaining({
-          name: 'Maestro Runner HTML Report',
-          paths: ['/home/expo/.maestro/tests/android-maestro-runner-attempt-1'],
-        }),
-      })
-    );
-    expect(step.getOutputValueByName('final_report_path')).toBe(
-      '/home/expo/.maestro/tests/android-maestro-runner-attempt-1/report.html'
-    );
-  });
-
-  it('does not fail a passing test when the runner report upload fails', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    jest.spyOn(fs, 'copyFile').mockResolvedValue();
-    mockUploadArtifact.mockRejectedValue(new Error('upload failed'));
-    const step = createStep({
-      flow_path: ['flows/a.yaml'],
-      platform: 'android',
-      backend: 'maestro-runner',
-      output_format: 'allure',
-    });
-
-    await expect(step.executeAsync()).resolves.toBeUndefined();
-  });
-
   it('logs that maestro-runner does not support direct DADB', async () => {
     mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
     jest.spyOn(fs, 'copyFile').mockResolvedValue();
@@ -1069,7 +966,7 @@ describe('createMaestroTestsBuildFunction', () => {
     await expect(step.executeAsync()).rejects.toThrow(UserError);
   });
 
-  it('uses $HOME/.maestro/tests output path and uploads the Maestro CLI HTML report', async () => {
+  it('uses $HOME/.maestro/tests output path for non-junit formats (e.g. html)', async () => {
     mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
 
     const step = createStep({
@@ -1080,118 +977,11 @@ describe('createMaestroTestsBuildFunction', () => {
     await step.executeAsync();
 
     const args = mockedSpawn.mock.calls[0][1] as string[];
-    // Non-JUnit uses a fixed path inside $HOME/.maestro/tests.
+    // Non-JUnit uses a fixed path inside $HOME/.maestro/tests so the
+    // whole-directory upload picks it up.
     const outputArg = args.find(a => a.startsWith('--output='));
     expect(outputArg).toMatch(/\.maestro\/tests\/android-maestro-html\.html$/);
     expect(outputArg).not.toMatch(/junit-reports/);
-    expect(step.getOutputValueByName('final_report_path')).toBe(
-      '/home/expo/.maestro/tests/android-maestro-html.html'
-    );
-    expect(mockUploadArtifact).toHaveBeenCalledWith(
-      expect.objectContaining({
-        artifact: expect.objectContaining({
-          name: 'Maestro HTML Report',
-          paths: ['/home/expo/.maestro/tests/android-maestro-html.html'],
-        }),
-      })
-    );
-  });
-
-  it('uploads the Maestro CLI HTML report even when tests fail', async () => {
-    mockedSpawn.mockRejectedValue(rejectExit1());
-    const step = createStep({
-      flow_path: ['flows/a.yaml'],
-      output_format: 'html',
-      platform: 'android',
-    });
-
-    await expect(step.executeAsync()).rejects.toThrow(UserError);
-
-    expect(mockUploadArtifact).toHaveBeenCalledWith(
-      expect.objectContaining({
-        artifact: expect.objectContaining({
-          name: 'Maestro HTML Report',
-          paths: ['/home/expo/.maestro/tests/android-maestro-html.html'],
-        }),
-      })
-    );
-  });
-
-  it('warns that Maestro CLI does not support Allure reports', async () => {
-    mockedSpawn.mockRejectedValue(rejectExit1());
-    const logger = createMockLogger();
-    jest.mocked(logger.child).mockReturnValue(logger);
-    const step = createStep(
-      {
-        flow_path: ['flows/a.yaml'],
-        output_format: 'allure',
-        platform: 'android',
-      },
-      { logger }
-    );
-
-    await expect(step.executeAsync()).rejects.toThrow(UserError);
-
-    expect(logger.warn).toHaveBeenCalledWith(
-      'Maestro CLI does not support Allure reports; no Allure artifact was uploaded.'
-    );
-    expect(mockUploadArtifact).not.toHaveBeenCalled();
-  });
-
-  it('clears the Maestro CLI HTML report before every retry attempt', async () => {
-    const removeSpy = jest.spyOn(fs, 'rm').mockResolvedValue();
-    mockedSpawn.mockRejectedValue(rejectExit1());
-    const step = createStep({
-      flow_path: ['flows/a.yaml'],
-      output_format: 'html',
-      platform: 'android',
-      retries: 1,
-    });
-
-    await expect(step.executeAsync()).rejects.toThrow(UserError);
-
-    expect(
-      removeSpy.mock.calls.filter(
-        ([target]) => target === '/home/expo/.maestro/tests/android-maestro-html.html'
-      )
-    ).toHaveLength(2);
-    expect(removeSpy).toHaveBeenNthCalledWith(
-      1,
-      '/home/expo/.maestro/tests/android-maestro-html.html',
-      {
-        force: true,
-      }
-    );
-    expect(removeSpy).toHaveBeenNthCalledWith(
-      2,
-      '/home/expo/.maestro/tests/android-maestro-html.html',
-      {
-        force: true,
-      }
-    );
-    expect(removeSpy.mock.invocationCallOrder[0]).toBeLessThan(
-      mockedSpawn.mock.invocationCallOrder[0]
-    );
-    expect(removeSpy.mock.invocationCallOrder[1]).toBeLessThan(
-      mockedSpawn.mock.invocationCallOrder[1]
-    );
-  });
-
-  it('does not run Maestro CLI or upload old HTML if the report cannot be cleared', async () => {
-    jest.spyOn(fs, 'rm').mockImplementation(async target => {
-      if (target === '/home/expo/.maestro/tests/android-maestro-html.html') {
-        throw new Error('permission denied');
-      }
-    });
-    const step = createStep({
-      flow_path: ['flows/a.yaml'],
-      output_format: 'html',
-      platform: 'android',
-    });
-
-    await expect(step.executeAsync()).rejects.toThrow(SystemError);
-    expect(mockedSpawn).not.toHaveBeenCalled();
-    expect(mockUploadArtifact).not.toHaveBeenCalled();
   });
 
   it('uses lowercase extension for non-junit formats regardless of input casing', async () => {
@@ -1418,6 +1208,7 @@ describe('createMaestroTestsBuildFunction', () => {
     expect(mockUploadArtifact).toHaveBeenCalledWith(
       expect.objectContaining({
         artifact: expect.objectContaining({
+          type: GenericArtifactType.OTHER,
           name: shot.displayName,
           metadata: shot.metadata,
         }),
@@ -1425,31 +1216,28 @@ describe('createMaestroTestsBuildFunction', () => {
     );
   });
 
-  it.each(['junit', undefined])(
-    'uploads runner screenshots with output_format=%s',
-    async format => {
-      mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-      const shot = makeShot(0);
-      jest.spyOn(fs, 'copyFile').mockResolvedValue();
-      mockedRunnerHarvest.mockResolvedValue([shot]);
-      const parseFlowResultsSpy = jest.spyOn(parser, 'parseMaestroRunnerReport').mockResolvedValue({
-        flows: [{ name: 'Login', sourceFile: 'a.yaml', status: 'failed' }],
-      });
+  it('discovers maestro-runner flow results from the attempt report directory', async () => {
+    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
+    const shot = makeShot(0);
+    jest.spyOn(fs, 'copyFile').mockResolvedValue();
+    mockedRunnerHarvest.mockResolvedValue([shot]);
+    const parseFlowResultsSpy = jest.spyOn(parser, 'parseMaestroRunnerReport').mockResolvedValue({
+      flows: [{ name: 'Login', sourceFile: 'a.yaml', status: 'failed' }],
+    });
 
-      const step = createStep({
-        flow_path: ['a.yaml'],
-        platform: 'ios',
-        ...(format === undefined ? {} : { output_format: format }),
-        backend: 'maestro-runner',
-      });
-      await step.executeAsync();
+    const step = createStep({
+      flow_path: ['a.yaml'],
+      platform: 'ios',
+      output_format: 'junit',
+      backend: 'maestro-runner',
+    });
+    await step.executeAsync();
 
-      expect(parseFlowResultsSpy).toHaveBeenCalledWith(
-        '/home/expo/.maestro/tests/ios-maestro-runner-attempt-0'
-      );
-      expect(mockUploadArtifact).toHaveBeenCalledTimes(1);
-    }
-  );
+    expect(parseFlowResultsSpy).toHaveBeenCalledWith(
+      '/home/expo/.maestro/tests/ios-maestro-runner-attempt-0'
+    );
+    expect(mockUploadArtifact).toHaveBeenCalledTimes(1);
+  });
 
   it('uploads screenshots even when all attempts fail, before throwing ERR_MAESTRO_TESTS_FAILED', async () => {
     mockedSpawn.mockRejectedValue(rejectExit1());
@@ -1513,15 +1301,14 @@ describe('createMaestroTestsBuildFunction', () => {
     expect(mockUploadArtifact).toHaveBeenCalledTimes(30);
   });
 
-  it('does not harvest or upload screenshots for Maestro CLI HTML', async () => {
+  it('does not harvest or upload screenshots when output_format is not junit', async () => {
     mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
 
     const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'html' });
     await step.executeAsync();
 
     expect(mockedHarvest).not.toHaveBeenCalled();
-    expect(mockUploadArtifact).toHaveBeenCalledTimes(1);
-    expect(mockUploadArtifact.mock.calls[0][0].artifact.name).toBe('Maestro HTML Report');
+    expect(mockUploadArtifact).not.toHaveBeenCalled();
   });
 
   it('uploads only the final attempt for a pure-failure flow, but every attempt for a flaky flow', async () => {

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

@@ -7,8 +7,6 @@ import { type CustomBuildContext } from '../../../customBuildContext';
 import { IosSimulatorUtils } from '../../../utils/IosSimulatorUtils';
 import { isProcessDescendantOfAsync } from '../../../utils/processes';
 import { turtleFetch } from '../../../utils/turtleFetch';
-import { pollAgentDeviceArtifactsForUploadAsync } from '../../utils/agentDeviceArtifacts';
-import { startDeviceSessionHostAsync } from '../../utils/deviceSessionHost';
 import {
   monitorLocalEgressAsync,
   readLocalEgressHandoffAsync,
@@ -16,16 +14,11 @@ import {
   stopLocalEgressResourcesAsync,
 } from '../../utils/localEgress';
 import {
-  reportLocalEgressGuardCoverageAsync,
-  resolveLocalEgressServeSimBootEnvironmentAsync,
-  startLocalEgressGuardRelayAsync,
-  verifyLocalEgressGuardAsync,
-} from '../../utils/localEgressGuard';
-import {
+  startDeviceWebPreviewWithTunnelAsync,
   uploadRemoteSessionConfigAsync,
   waitForDeviceRunSessionStoppedAsync,
 } from '../../utils/remoteDeviceRunSession';
-import { createStartAgentDeviceSessionBuildFunction } from '../startAgentDeviceSession';
+import { createStartAgentDeviceRemoteSessionBuildFunction } from '../startAgentDeviceRemoteSession';
 import { createStartAppiumRemoteSessionBuildFunction } from '../startAppiumRemoteSession';
 import { createStartArgentRemoteSessionBuildFunction } from '../startArgentRemoteSession';
 import { createStartWebPreviewRemoteSessionBuildFunction } from '../startWebPreviewRemoteSession';
@@ -34,14 +27,7 @@ jest.mock('@expo/turtle-spawn');
 jest.mock('../../../utils/IosSimulatorUtils');
 jest.mock('../../../utils/processes');
 jest.mock('../../../utils/turtleFetch');
-jest.mock('../../utils/deviceSessionHost');
 jest.mock('../../utils/agentDeviceArtifacts');
-jest.mock('../startIosSimulator', () => ({
-  ...jest.requireActual('../startIosSimulator'),
-  bootIosSimulatorAsync: jest
-    .fn()
-    .mockResolvedValue({ deviceIdentifier: 'sim', udid: 'sim', displayName: 'iPhone' }),
-}));
 jest.mock('../../utils/argentArtifacts');
 jest.mock('../../utils/agentDeviceEvents', () => ({
   startAgentDeviceEventCollectionAsync: async () => ({ stopAsync: jest.fn() }),
@@ -58,13 +44,6 @@ jest.mock('../../utils/localEgress', () => ({
   readLocalEgressHandoffAsync: jest.fn(),
   monitorLocalEgressAsync: jest.fn(),
 }));
-jest.mock('../../utils/localEgressGuard', () => ({
-  ...jest.requireActual('../../utils/localEgressGuard'),
-  resolveLocalEgressServeSimBootEnvironmentAsync: jest.fn(),
-  startLocalEgressGuardRelayAsync: jest.fn(),
-  reportLocalEgressGuardCoverageAsync: jest.fn(),
-  verifyLocalEgressGuardAsync: jest.fn(),
-}));
 jest.mock('../../utils/remoteDeviceRunSession', () => ({
   ...jest.requireActual('../../utils/remoteDeviceRunSession'),
   getDeviceRunSessionIdOrThrow: () => 'session-id',
@@ -79,35 +58,12 @@ jest.mock('../../utils/remoteDeviceRunSession', () => ({
     subdomainId: 'controller-id',
     stopAsync: jest.fn(),
   }),
+  startDeviceWebPreviewWithTunnelAsync: jest.fn(),
   uploadRemoteSessionConfigAsync: jest.fn(),
   waitForDeviceRunSessionStoppedAsync: jest.fn(),
 }));
 
-// Agent-device also polls for Stop while it starts up. That watch sets neither an idle timeout nor
-// a duration; keep it pending until startup retires it, and give each lifetime wait its own mock.
-const lifetimeWait = jest.fn<
-  ReturnType<typeof waitForDeviceRunSessionStoppedAsync>,
-  Parameters<typeof waitForDeviceRunSessionStoppedAsync>
->();
-function routeStartupWatch(): void {
-  lifetimeWait.mockReset();
-  jest.mocked(waitForDeviceRunSessionStoppedAsync).mockImplementation(async args => {
-    if ('idleTimeout' in args || 'maxDurationSeconds' in args) {
-      return await lifetimeWait(args);
-    }
-    if (!args.signal?.aborted) {
-      await new Promise<void>(resolve =>
-        args.signal?.addEventListener('abort', () => resolve(), { once: true })
-      );
-    }
-  });
-}
-
-const logger = {
-  info: jest.fn(),
-  warn: jest.fn(),
-  child: jest.fn().mockReturnThis(),
-} as unknown as bunyan;
+const logger = { info: jest.fn(), warn: jest.fn() } as unknown as bunyan;
 const ctx = {} as CustomBuildContext;
 const env = { DEVICE_RUN_SESSION_ID: 'session-id' };
 const handoff = { url: 'https://egress.test', token: 'secret', fingerprint: 'key=', port: 8899 };
@@ -118,7 +74,7 @@ const fields = {
   egressPort: handoff.port,
 };
 const controllers = [
-  ['agent-device', createStartAgentDeviceSessionBuildFunction, 'agentDeviceRemoteSessionUrl'],
+  ['agent-device', createStartAgentDeviceRemoteSessionBuildFunction, 'agentDeviceRemoteSessionUrl'],
   ['Appium', createStartAppiumRemoteSessionBuildFunction, 'appiumUrl'],
   ['Argent', createStartArgentRemoteSessionBuildFunction, 'toolsUrl'],
   ['web preview', createStartWebPreviewRemoteSessionBuildFunction, 'previewUrl'],
@@ -126,17 +82,16 @@ const controllers = [
 
 describe.each(controllers)('%s local egress', (_name, createFunction, controllerField) => {
   const stopPreview = jest.fn();
-  const openPreview = jest.fn();
   const stopEgress = jest.fn();
   let lifetime: AbortSignal;
   async function run(signal?: AbortSignal): Promise<void> {
     await createFunction(ctx).fn!(
       { logger, global: { runtimePlatform: BuildRuntimePlatform.DARWIN } } as BuildStepContext,
       {
-        // Inputs a step does not get default to undefined, like in a real step call.
-        inputs: new Proxy({} as Record<string, { value: unknown }>, {
-          get: (target, id: string) => target[id] ?? { value: undefined },
-        }),
+        inputs: {
+          package_version: { value: undefined },
+          max_idle_time_minutes: { value: undefined },
+        },
         outputs: {},
         env,
         signal,
@@ -145,8 +100,6 @@ describe.each(controllers)('%s local egress', (_name, createFunction, controller
   }
   beforeEach(() => {
     jest.clearAllMocks();
-    jest.mocked(pollAgentDeviceArtifactsForUploadAsync).mockResolvedValue();
-    routeStartupWatch();
     lifetime = registerLocalEgressResources(stopEgress);
     stopEgress.mockResolvedValue(undefined);
     stopPreview.mockResolvedValue(undefined);
@@ -162,34 +115,18 @@ describe.each(controllers)('%s local egress', (_name, createFunction, controller
     jest.mocked(isProcessDescendantOfAsync).mockResolvedValue(true);
     jest
       .mocked(IosSimulatorUtils.getAvailableDevicesAsync)
-      .mockResolvedValue([{ udid: 'sim', name: 'iPhone 17' }] as never);
-    jest.mocked(IosSimulatorUtils.resolveUdidAsync).mockResolvedValue('sim' as never);
+      .mockResolvedValue([{ udid: 'sim' }] as never);
     jest.mocked(turtleFetch).mockResolvedValue({ ok: true } as never);
     jest.mocked(readLocalEgressHandoffAsync).mockResolvedValue(handoff);
-    jest
-      .mocked(resolveLocalEgressServeSimBootEnvironmentAsync)
-      .mockImplementation(async () =>
-        (await readLocalEgressHandoffAsync())
-          ? { SERVE_SIM_ADDITIONAL_DYLIBS: '/test/egress-guard.dylib' }
-          : null
-      );
-    jest.mocked(startLocalEgressGuardRelayAsync).mockResolvedValue(undefined);
-    jest.mocked(reportLocalEgressGuardCoverageAsync).mockResolvedValue(null);
-    jest.mocked(verifyLocalEgressGuardAsync).mockResolvedValue(undefined);
     jest.mocked(monitorLocalEgressAsync).mockResolvedValue(undefined);
-    openPreview.mockResolvedValue({
+    jest.mocked(startDeviceWebPreviewWithTunnelAsync).mockResolvedValue({
       previewPageUrl: 'https://expo.dev/simulator-preview/preview-id',
       apiUrl: 'https://preview.test',
       previewToken: 'preview-secret',
-      closeAsync: jest.fn(),
+      stopAsync: stopPreview,
     });
-    jest.mocked(startDeviceSessionHostAsync).mockResolvedValue({
-      openPreviewAsync: openPreview,
-      getLastPreviewActivityAt: jest.fn(),
-      finishAsync: stopPreview,
-    });
-    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue('started');
-    lifetimeWait.mockImplementation(async () => {
+    jest.mocked(uploadRemoteSessionConfigAsync).mockResolvedValue(undefined);
+    jest.mocked(waitForDeviceRunSessionStoppedAsync).mockImplementation(async () => {
       expect(lifetime.aborted).toBe(false);
       expect(monitorLocalEgressAsync).toHaveBeenCalledTimes(1);
     });
@@ -199,30 +136,18 @@ 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(lifetimeWait).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(
-      expect.objectContaining({
-        ctx,
-        deviceRunSessionId: 'session-id',
-        logger,
-        remoteConfig: expect.objectContaining({
-          ...fields,
-          [controllerField]: expect.any(String),
-          [controllerField === 'previewUrl' ? 'previewToken' : 'webPreviewToken']: 'preview-secret',
-        }),
-      })
-    );
+    expect(uploadRemoteSessionConfigAsync).toHaveBeenCalledWith({
+      ctx,
+      deviceRunSessionId: 'session-id',
+      logger,
+      remoteConfig: expect.objectContaining({
+        ...fields,
+        [controllerField]: expect.any(String),
+        [controllerField === 'previewUrl' ? 'previewToken' : 'webPreviewToken']: 'preview-secret',
+      }),
+    });
     expect(monitorLocalEgressAsync).toHaveBeenCalledWith({
       port: handoff.port,
       env,
@@ -236,7 +161,7 @@ describe.each(controllers)('%s local egress', (_name, createFunction, controller
     await stopLocalEgressResourcesAsync(logger);
     stopEgress.mockClear();
     jest.mocked(readLocalEgressHandoffAsync).mockResolvedValue(null);
-    lifetimeWait.mockResolvedValue(undefined);
+    jest.mocked(waitForDeviceRunSessionStoppedAsync).mockResolvedValue(undefined);
     await run();
     const { remoteConfig } = jest.mocked(uploadRemoteSessionConfigAsync).mock.calls[0][0];
     expect(remoteConfig).toHaveProperty(controllerField);
@@ -244,18 +169,16 @@ describe.each(controllers)('%s local egress', (_name, createFunction, controller
     expect(monitorLocalEgressAsync).not.toHaveBeenCalled();
     expect(stopEgress).not.toHaveBeenCalled();
   });
-  it.each(['startup', 'preview', 'report', 'wait', 'teardown'])(
+  it.each(['startup', 'report', 'wait', 'teardown'])(
     'releases egress after %s fails',
     async phase => {
       const error = new Error(`${phase} failed`);
       if (phase === 'startup') {
-        jest.mocked(startDeviceSessionHostAsync).mockRejectedValue(error);
-      } else if (phase === 'preview') {
-        openPreview.mockRejectedValue(error);
+        jest.mocked(startDeviceWebPreviewWithTunnelAsync).mockRejectedValue(error);
       } else if (phase === 'report') {
         jest.mocked(uploadRemoteSessionConfigAsync).mockRejectedValue(error);
       } else if (phase === 'wait') {
-        lifetimeWait.mockRejectedValue(error);
+        jest.mocked(waitForDeviceRunSessionStoppedAsync).mockRejectedValue(error);
       } else {
         stopPreview.mockRejectedValue(error);
       }
@@ -263,16 +186,17 @@ describe.each(controllers)('%s local egress', (_name, createFunction, controller
       expect(lifetime.aborted).toBe(true);
       expect(stopEgress).toHaveBeenCalledTimes(1);
       expect(monitorLocalEgressAsync).toHaveBeenCalledTimes(
-        phase === 'startup' || phase === 'preview' || phase === 'report' ? 0 : 1
+        phase === 'startup' || phase === 'report' ? 0 : 1
       );
     }
   );
   it('passes cancellation to the monitor and releases the lifetime', async () => {
     const abort = new AbortController();
-    lifetimeWait.mockImplementation(async () => abort.abort());
+    jest.mocked(waitForDeviceRunSessionStoppedAsync).mockImplementation(async () => abort.abort());
     await run(abort.signal);
-    // Agent-device hands the monitor its startup signal, which follows the step signal.
-    expect(jest.mocked(monitorLocalEgressAsync).mock.calls[0][0].signal?.aborted).toBe(true);
+    expect(monitorLocalEgressAsync).toHaveBeenCalledWith(
+      expect.objectContaining({ signal: abort.signal })
+    );
     expect(lifetime.aborted).toBe(true);
     expect(stopEgress).toHaveBeenCalledTimes(1);
   });

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

@@ -1,202 +0,0 @@
-import { SystemError } from '@expo/eas-build-job';
-import turtleSpawn from '@expo/turtle-spawn';
-import { vol } from 'memfs';
-import { spawn } from 'node:child_process';
-import { EventEmitter, once } from 'node:events';
-import path from 'node:path';
-import { PassThrough } from 'node:stream';
-
-import { createMockLogger } from '../../../__tests__/utils/logger';
-import * as agentRun from '../../utils/agentRun';
-import { leaseAgentRunProviderCredentialsAsync } from '../../utils/agentRunLease';
-import { createRunAgentBuildFunction } from '../runAgent';
-
-jest.mock('@expo/turtle-spawn', () => ({ __esModule: true, default: jest.fn() }));
-jest.mock('node:child_process', () => ({
-  ...jest.requireActual('node:child_process'),
-  spawn: jest.fn(),
-}));
-jest.mock('../../utils/agentRunLease');
-
-const installMock = jest.mocked(turtleSpawn);
-const spawnMock = jest.mocked(spawn);
-const leaseMock = jest.mocked(leaseAgentRunProviderCredentialsAsync);
-
-const ctx = {
-  expoApiV2BaseUrl: 'https://staging-api.expo.test/v2/',
-  mcpServerUrl: 'wss://staging-mcp.expo.test',
-  runtimeApi: { addBuildLogMask: jest.fn() },
-} as any;
-const inputs = {
-  agent_kind: { value: 'claude-code' },
-  agent_run_id: { value: '0199b0a0-1111-7222-8333-444455556666' },
-  max_duration_seconds: { value: 1800 },
-  prompt: { value: 'Fix the failing test.' },
-};
-const env = {
-  PATH: '/usr/local/bin:/usr/bin',
-  HOME: '/home/expo',
-  EXPO_TOKEN: 'expo-token',
-  __API_SERVER_URL: 'https://staging-api.expo.test',
-  EAS_BUILD_ID: 'build-id',
-  NODE_OPTIONS: '--max-old-space-size=3072',
-  USER_DEFINED_SECRET: 'secret',
-};
-
-async function runAsync(
-  overrides: {
-    ctx?: any;
-    inputs?: Record<string, { value: unknown }>;
-    env?: Record<string, string>;
-  } = {}
-): Promise<void> {
-  const fn = createRunAgentBuildFunction(overrides.ctx ?? ctx);
-  await fn.fn!({ logger: createMockLogger() } as any, {
-    inputs: overrides.inputs ?? inputs,
-    outputs: {},
-    env: overrides.env ?? env,
-  });
-}
-
-function mockSuccessfulRun(): { mcpConfig?: any } {
-  const captured: { mcpConfig?: any } = {};
-  leaseMock.mockResolvedValue({ provider: 'anthropic', accessToken: 'anthropic-access-token' });
-  installMock.mockResolvedValue({} as any);
-  spawnMock.mockImplementation(((_command: string, _args: string[], spawnOptions: any) => {
-    const child = Object.assign(new EventEmitter(), {
-      stdin: { on: jest.fn(), end: jest.fn() },
-      stdout: new PassThrough(),
-      stderr: new PassThrough(),
-    });
-    captured.mcpConfig = JSON.parse(
-      vol.readFileSync(path.join(spawnOptions.env.HOME, 'mcp.json'), 'utf8') as string
-    );
-    process.nextTick(() => {
-      child.emit('exit', 0, null);
-      child.stdout.end();
-      child.stderr.end();
-      void Promise.all([once(child.stdout, 'end'), once(child.stderr, 'end')]).then(() =>
-        child.emit('close')
-      );
-    });
-    return child;
-  }) as any);
-  return captured;
-}
-
-describe(createRunAgentBuildFunction, () => {
-  it('is the eas/run_agent function', () => {
-    expect(createRunAgentBuildFunction(ctx).getFullId()).toBe('eas/run_agent');
-  });
-
-  it('passes none of the job environment to npm or the agent', async () => {
-    mockSuccessfulRun();
-
-    await runAsync();
-
-    expect(leaseMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        expoApiV2BaseUrl: 'https://staging-api.expo.test/v2/',
-        expoToken: 'expo-token',
-        agentRunId: '0199b0a0-1111-7222-8333-444455556666',
-      })
-    );
-    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(agentEnv).sort()).toEqual([
-      'CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC',
-      'CLAUDE_CODE_OAUTH_TOKEN',
-      'HOME',
-      'LANG',
-      'PATH',
-      'TMPDIR',
-    ]);
-    expect(agentEnv.PATH).toBe('/usr/local/bin:/usr/bin');
-    expect(agentEnv.HOME).not.toBe('/home/expo');
-  });
-
-  it('hands the build log secrets filter to the agent run', async () => {
-    const runAgentSpy = jest.spyOn(agentRun, 'runAgentAsync').mockResolvedValue();
-    try {
-      await runAsync();
-
-      expect(runAgentSpy).toHaveBeenCalledWith(
-        expect.objectContaining({ addBuildLogMask: ctx.runtimeApi.addBuildLogMask })
-      );
-    } finally {
-      runAgentSpy.mockRestore();
-    }
-  });
-
-  it.each([
-    ['wss://staging-mcp.expo.test', 'https://staging-mcp.expo.test/mcp'],
-    ['ws://localhost:8787', 'http://localhost:8787/mcp'],
-  ])('points the agent at the HTTP endpoint of %s', async (mcpServerUrl, mcpUrl) => {
-    const captured = mockSuccessfulRun();
-
-    await runAsync({ ctx: { ...ctx, mcpServerUrl } });
-
-    expect(captured.mcpConfig.mcpServers.expo.url).toBe(mcpUrl);
-  });
-
-  it('stops the run at max_duration_seconds and reports a timeout', async () => {
-    jest.useFakeTimers({ doNotFake: ['nextTick', 'setImmediate', 'queueMicrotask'] });
-    const runAgentSpy = jest.spyOn(agentRun, 'runAgentAsync').mockImplementation(
-      ({ signal }) =>
-        new Promise((_resolve, reject) => {
-          signal!.addEventListener('abort', () => reject(signal!.reason));
-        })
-    );
-    try {
-      const run = runAsync({ inputs: { ...inputs, max_duration_seconds: { value: 60 } } });
-      const rejection = expect(run).rejects.toMatchObject({
-        errorCode: 'EAS_RUN_AGENT_TIMEOUT',
-        message: expect.stringContaining('60 seconds'),
-      });
-      await jest.advanceTimersByTimeAsync(59_000);
-      expect(runAgentSpy.mock.calls[0][0].signal!.aborted).toBe(false);
-      await jest.advanceTimersByTimeAsync(1_000);
-      await rejection;
-    } finally {
-      runAgentSpy.mockRestore();
-      jest.useRealTimers();
-    }
-  });
-
-  it.each([
-    ['an unknown agent_kind', { inputs: { ...inputs, agent_kind: { value: 'gemini' } } }],
-    ['a malformed agent_run_id', { inputs: { ...inputs, agent_run_id: { value: 'not-a-uuid' } } }],
-    ['an empty agent_run_id', { inputs: { ...inputs, agent_run_id: { value: '' } } }],
-    ['a zero duration', { inputs: { ...inputs, max_duration_seconds: { value: 0 } } }],
-    ['a negative duration', { inputs: { ...inputs, max_duration_seconds: { value: -300 } } }],
-    ['a fractional duration', { inputs: { ...inputs, max_duration_seconds: { value: 12.5 } } }],
-    ['an empty prompt', { inputs: { ...inputs, prompt: { value: '' } } }],
-    ['no EXPO_TOKEN', { env: { ...env, EXPO_TOKEN: '' } }],
-    ['no PATH', { env: { ...env, PATH: '' } }],
-    ['no Expo API URL', { ctx: { ...ctx, expoApiV2BaseUrl: undefined } }],
-    ['no MCP server URL', { ctx: { ...ctx, mcpServerUrl: undefined } }],
-    ['no build log secrets filter', { ctx: { ...ctx, runtimeApi: {} } }],
-  ])('throws a system error for %s', async (_name, overrides) => {
-    await expect(runAsync(overrides)).rejects.toBeInstanceOf(SystemError);
-
-    expect(leaseMock).not.toHaveBeenCalled();
-    expect(installMock).not.toHaveBeenCalled();
-    expect(spawnMock).not.toHaveBeenCalled();
-  });
-
-  it('reports every invalid input at once', async () => {
-    await expect(
-      runAsync({
-        inputs: {
-          ...inputs,
-          agent_run_id: { value: 'not-a-uuid' },
-          max_duration_seconds: { value: 0 },
-        },
-      })
-    ).rejects.toThrow(
-      'The "agent_run_id" input must be the UUID of an agent run, but received "not-a-uuid". ' +
-        'The "max_duration_seconds" input must be a positive whole number of seconds, but received "0".'
-    );
-  });
-});

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

@@ -1,70 +0,0 @@
-import { type bunyan } from '@expo/logger';
-import { type BuildStepContext, type BuildStepEnv } from '@expo/steps';
-
-import { type CustomBuildContext } from '../../../customBuildContext';
-import { Sentry } from '../../../sentry';
-import { getDeviceRunSessionIdOrThrow } from '../../utils/remoteDeviceRunSession';
-import { uploadServeSimLogsFileAsync } from '../../utils/serveSimLogsArtifacts';
-import { ServeSimLogsRecorder } from '../../utils/serveSimLogsRecorder';
-import { createCollectServeSimLogsBuildFunction } from '../collectServeSimLogs';
-import { createStartServeSimLogsBuildFunction } from '../startServeSimLogs';
-
-jest.mock('../../../sentry');
-jest.mock('../../utils/serveSimLogsRecorder');
-jest.mock('../../utils/serveSimLogsArtifacts');
-jest.mock('../../utils/remoteDeviceRunSession');
-
-const logger = { info: jest.fn(), warn: jest.fn() } as unknown as bunyan;
-const ctx = {} as CustomBuildContext;
-const step = { logger } as BuildStepContext;
-const args = { inputs: {}, outputs: {}, env: {} as BuildStepEnv };
-
-beforeEach(() => {
-  jest.mocked(getDeviceRunSessionIdOrThrow).mockReturnValue('session-id');
-  jest.mocked(ServeSimLogsRecorder.finishAsync).mockResolvedValue([]);
-});
-
-it('starts collection and tolerates startup failures', async () => {
-  jest.mocked(ServeSimLogsRecorder.startAsync).mockRejectedValueOnce(new Error('disk failure'));
-  await expect(createStartServeSimLogsBuildFunction().fn?.(step, args)).resolves.toBeUndefined();
-  expect(logger.warn).toHaveBeenCalled();
-  expect(Sentry.capture).toHaveBeenCalledWith(
-    'Could not start serve-sim simulator logs',
-    expect.any(Error)
-  );
-});
-
-it('uploads each device with its own bounded signal', async () => {
-  jest.mocked(ServeSimLogsRecorder.finishAsync).mockResolvedValue([
-    { udid: 'A', filePath: '/tmp/A.ndjson' },
-    { udid: 'B', filePath: '/tmp/B.ndjson' },
-  ]);
-  await createCollectServeSimLogsBuildFunction(ctx).fn?.(step, args);
-  expect(uploadServeSimLogsFileAsync).toHaveBeenCalledTimes(2);
-  expect(uploadServeSimLogsFileAsync).toHaveBeenCalledWith(
-    ctx,
-    expect.objectContaining({
-      deviceRunSessionId: 'session-id',
-      udid: 'A',
-      filePath: '/tmp/A.ndjson',
-      signal: expect.any(AbortSignal),
-    })
-  );
-  expect(jest.mocked(uploadServeSimLogsFileAsync).mock.calls[0][1].signal).not.toBe(
-    jest.mocked(uploadServeSimLogsFileAsync).mock.calls[1][1].signal
-  );
-});
-
-it('skips empty collection and warns on finalization failure', async () => {
-  await createCollectServeSimLogsBuildFunction(ctx).fn?.(step, args);
-  expect(uploadServeSimLogsFileAsync).not.toHaveBeenCalled();
-  jest.mocked(ServeSimLogsRecorder.finishAsync).mockRejectedValueOnce(new Error('failure'));
-  await expect(
-    createCollectServeSimLogsBuildFunction(ctx).fn?.(step, args)
-  ).resolves.toBeUndefined();
-  expect(logger.warn).toHaveBeenCalled();
-  expect(Sentry.capture).toHaveBeenCalledWith(
-    'Could not finalize serve-sim simulator logs',
-    expect.any(Error)
-  );
-});

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

@@ -75,7 +75,6 @@ describe(startAgentDeviceDaemonAsync, () => {
     jest.mocked(spawnDetached).mockReturnValue({
       pid: 1234,
       getOutput: () => '',
-      getExitError: () => undefined,
       stopAsync,
     });
     jest.mocked(spawn).mockImplementation((async (
@@ -93,28 +92,6 @@ describe(startAgentDeviceDaemonAsync, () => {
     }) as never);
   });
 
-  it.each([false, true])(
-    'shares the daemon secret list through git fallback=%s',
-    async fallback => {
-      if (fallback) {
-        jest.mocked(spawn).mockResolvedValue({ stdout: '' } as never);
-      }
-      const secrets: string[] = [];
-      const handle = await startAgentDeviceDaemonAsync({
-        packageVersion: '1.2.3',
-        env: {},
-        logger,
-        secrets,
-      });
-      const options = jest.mocked(spawnDetached).mock.calls[0][0];
-      expect(options.command).toBe(fallback ? 'bun' : 'node');
-      expect(options.secrets).toBe(secrets);
-      secrets.push('learned-daemon-token');
-      expect(options.secrets).toContain('learned-daemon-token');
-      await handle.stopAsync();
-    }
-  );
-
   it('installs with bun add by default and launches the published daemon', async () => {
     const handle = await startAgentDeviceDaemonAsync({
       packageVersion: '1.2.3',
@@ -130,35 +107,14 @@ describe(startAgentDeviceDaemonAsync, () => {
     const addCwd = jest.mocked(spawn).mock.calls[0][2]?.cwd as string;
     expect(spawnDetached).toHaveBeenCalledWith({
       command: 'node',
-      logger,
-      secrets: undefined,
       args: [path.join(addCwd, 'node_modules/agent-device/dist/src/internal/daemon.js')],
-      env: expect.objectContaining({
-        AGENT_DEVICE_DAEMON_SERVER_MODE: 'http',
-        AGENT_DEVICE_DAEMON_IDLE_TIMEOUT_MS: '0',
-        AGENT_DEVICE_IOS_RUNNER_IDLE_STOP_MS: '0',
-        AGENT_DEVICE_SESSION_IDLE_TIMEOUT_MS: '0',
-      }),
+      env: expect.objectContaining({ AGENT_DEVICE_DAEMON_SERVER_MODE: 'http' }),
     });
 
     await handle.stopAsync();
     await expect(fs.promises.access(addCwd)).rejects.toThrow();
   });
 
-  it('removes the install directory when the daemon cannot be stopped', async () => {
-    const stopError = new Error('drain timed out');
-    stopAsync.mockRejectedValueOnce(stopError);
-    const handle = await startAgentDeviceDaemonAsync({
-      packageVersion: '1.2.3',
-      env: {},
-      logger,
-    });
-    const addCwd = jest.mocked(spawn).mock.calls[0][2]?.cwd as string;
-
-    await expect(handle.stopAsync()).rejects.toBe(stopError);
-    await expect(fs.promises.access(addCwd)).rejects.toThrow();
-  });
-
   it('installs with npm when EAS_OVERRIDE_PACKAGE_MANAGER is npm', async () => {
     await startAgentDeviceDaemonAsync({
       packageVersion: undefined,
@@ -173,41 +129,6 @@ describe(startAgentDeviceDaemonAsync, () => {
     );
   });
 
-  it('kills the install and does not fall back to git when aborted', async () => {
-    let installStarted!: () => void;
-    const started = new Promise<void>(resolve => {
-      installStarted = resolve;
-    });
-    jest.mocked(spawn).mockImplementation(
-      ((_command: string, _args: string[], options?: { signal?: AbortSignal }) =>
-        new Promise((_resolve, reject) => {
-          options!.signal!.addEventListener('abort', () => reject(options!.signal!.reason));
-          installStarted();
-        })) as never
-    );
-    const controller = new AbortController();
-    const failure = new Error('app install failed');
-
-    const daemon = startAgentDeviceDaemonAsync({
-      packageVersion: '1.2.3',
-      env: {},
-      logger,
-      signal: controller.signal,
-    });
-    await started;
-    controller.abort(failure);
-
-    await expect(daemon).rejects.toBe(failure);
-    expect(spawn).toHaveBeenCalledTimes(1);
-    expect(spawn).toHaveBeenCalledWith(
-      'bun',
-      ['add', '[email protected]'],
-      expect.objectContaining({ signal: controller.signal })
-    );
-    expect(spawnDetached).not.toHaveBeenCalled();
-    expect(Sentry.capture).not.toHaveBeenCalled();
-  });
-
   it('falls back to git clone when the published daemon is missing', async () => {
     jest.mocked(spawn).mockImplementation((async (command: string, args: string[]) => {
       if (command === 'bun' && args[0] === '--version') {
@@ -242,16 +163,9 @@ describe(startAgentDeviceDaemonAsync, () => {
     );
     expect(spawnDetached).toHaveBeenCalledWith({
       command: 'bun',
-      logger,
-      secrets: undefined,
       args: ['run', 'src/daemon.ts'],
       cwd: '/tmp/agent-device-src',
-      env: expect.objectContaining({
-        AGENT_DEVICE_DAEMON_SERVER_MODE: 'http',
-        AGENT_DEVICE_DAEMON_IDLE_TIMEOUT_MS: '0',
-        AGENT_DEVICE_IOS_RUNNER_IDLE_STOP_MS: '0',
-        AGENT_DEVICE_SESSION_IDLE_TIMEOUT_MS: '0',
-      }),
+      env: expect.objectContaining({ AGENT_DEVICE_DAEMON_SERVER_MODE: 'http' }),
     });
     expect(Sentry.capture).toHaveBeenCalledWith(
       'Failed to start agent-device daemon from the configured package manager; falling back to git clone',

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

@@ -1,990 +0,0 @@
-import { BuildRuntimePlatform, type BuildStepContext } from '@expo/steps';
-import { UserError } from '@expo/eas-build-job';
-import spawn from '@expo/turtle-spawn';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { type CustomBuildContext } from '../../../customBuildContext';
-import { AndroidEmulatorLogRing } from '../../../utils/androidEmulatorLogCapture';
-import { getAndroidEmulatorLogCapture } from '../../utils/androidEmulatorLogs';
-import { IosSimulatorUtils } from '../../../utils/IosSimulatorUtils';
-import { stopLocalEgressResourcesAsync } from '../../utils/localEgress';
-import {
-  resolveLocalEgressServeSimBootEnvironmentAsync,
-  startLocalEgressGuardRelayAsync,
-} from '../../utils/localEgressGuard';
-import {
-  selectXcodeDeveloperDirectoryAsync,
-  waitForDeviceRunSessionStoppedAsync,
-} from '../../utils/remoteDeviceRunSession';
-import { downloadBuildAsync } from '../downloadBuild';
-import { installBuildAsync } from '../installBuild';
-import { readIosApplicationIdentifierAsync } from '../../utils/iosAppArtifact';
-import { launchApplicationAsync } from '../launchApplication';
-import {
-  getAgentDeviceRemoteSessionEnvOrThrow,
-  runAgentDeviceRemoteSessionAsync,
-} from '../startAgentDeviceRemoteSession';
-import { runOnWarmIosSimulatorAsync } from '../../utils/warmDeviceSessionHost';
-import { createStartAgentDeviceSessionBuildFunction } from '../startAgentDeviceSession';
-import { startAndroidEmulatorAsync } from '../startAndroidEmulator';
-import { bootIosSimulatorAsync } from '../startIosSimulator';
-
-jest.mock('../../utils/localEgress', () => ({
-  stopLocalEgressResourcesAsync: jest.fn().mockResolvedValue(undefined),
-}));
-jest.mock('../../utils/localEgressGuard', () => ({
-  resolveLocalEgressServeSimBootEnvironmentAsync: jest.fn(),
-  startLocalEgressGuardRelayAsync: jest.fn(),
-}));
-jest.mock('@expo/turtle-spawn');
-jest.mock('../../utils/androidEmulatorLogs');
-jest.mock('../../../utils/IosSimulatorUtils');
-jest.mock('../../utils/remoteDeviceRunSession', () => ({
-  ...jest.requireActual('../../utils/remoteDeviceRunSession'),
-  selectXcodeDeveloperDirectoryAsync: jest.fn(),
-  waitForDeviceRunSessionStoppedAsync: jest.fn(),
-}));
-jest.mock('../startIosSimulator', () => ({
-  ...jest.requireActual('../startIosSimulator'),
-  bootIosSimulatorAsync: jest.fn(),
-}));
-jest.mock('../startAndroidEmulator', () => ({ startAndroidEmulatorAsync: jest.fn() }));
-jest.mock('../../utils/warmDeviceSessionHost');
-jest.mock('../downloadBuild', () => ({ downloadBuildAsync: jest.fn() }));
-jest.mock('../installBuild', () => ({ installBuildAsync: jest.fn() }));
-jest.mock('../../utils/iosAppArtifact', () => ({
-  ...jest.requireActual('../../utils/iosAppArtifact'),
-  readIosApplicationIdentifierAsync: jest.fn(),
-}));
-jest.mock('../launchApplication', () => ({
-  ...jest.requireActual('../launchApplication'),
-  launchApplicationAsync: jest.fn(),
-}));
-jest.mock('../startAgentDeviceRemoteSession', () => ({
-  getAgentDeviceRemoteSessionEnvOrThrow: jest.fn(),
-  runAgentDeviceRemoteSessionAsync: jest.fn(),
-}));
-
-const graphqlClient = { query: jest.fn() };
-const ctx = { graphqlClient } as unknown as CustomBuildContext;
-const sessionEnv = {
-  deviceRunSessionId: 'device-run-session-id',
-  ngrokTunnelDomain: 'tunnel.example.com',
-  ngrokAuthtoken: 'ngrok-token',
-};
-
-type Device = Parameters<typeof runAgentDeviceRemoteSessionAsync>[1]['device'];
-let deviceLaunch: unknown;
-
-function runDevicePreparationAsync(device: Device): Promise<unknown> {
-  return (
-    'iosSimulatorUdid' in device ? (device.application ?? Promise.resolve()) : device.ready
-  ).then(async launch => {
-    deviceLaunch = launch;
-    return launch;
-  });
-}
-
-function deferred<T = void>(): {
-  promise: Promise<T>;
-  resolve: (value: T) => void;
-  reject: (err: Error) => void;
-} {
-  let resolve!: (value: T) => void;
-  let reject!: (err: Error) => void;
-  const promise = new Promise<T>((res, rej) => {
-    resolve = res;
-    reject = rej;
-  });
-  promise.catch(() => {});
-  return { promise, resolve, reject };
-}
-
-async function flushAsync(): Promise<void> {
-  for (let i = 0; i < 20; i++) {
-    await new Promise(resolve => setImmediate(resolve));
-  }
-}
-
-function runStep(
-  runtimePlatform: BuildRuntimePlatform,
-  inputValues: Record<string, unknown> = {},
-  signal?: AbortSignal,
-  stepCtx: CustomBuildContext = ctx,
-  warm = false,
-  env: NodeJS.ProcessEnv = {}
-): Promise<void> {
-  const buildFunction = createStartAgentDeviceSessionBuildFunction(stepCtx, { warm });
-  const logger = { info: jest.fn(), warn: jest.fn(), child: jest.fn().mockReturnThis() };
-  const global = createGlobalContextMock({
-    runtimePlatform,
-    staticContextContent: { job: { secrets: { robotAccessToken: 'robot-token' } } },
-  });
-  const inputs = Object.fromEntries(
-    (buildFunction.inputProviders ?? []).map(provider => {
-      const input = provider(global, 'test');
-      input.set(inputValues[input.id]);
-      return [input.id, { value: input.rawValue }];
-    })
-  );
-  return buildFunction.fn!(
-    {
-      logger,
-      global,
-    } as unknown as BuildStepContext,
-    { inputs, outputs: {}, env, signal } as never
-  ) as Promise<void>;
-}
-
-function sessionDevice(): Device {
-  return jest.mocked(runAgentDeviceRemoteSessionAsync).mock.calls[0][1].device;
-}
-
-describe(createStartAgentDeviceSessionBuildFunction, () => {
-  function mockStalledDownload(): { aborted: () => boolean; settled: () => boolean } {
-    let aborted = false;
-    let settled = false;
-    jest.mocked(downloadBuildAsync).mockImplementation(
-      ({ signal }) =>
-        new Promise((_resolve, reject) => {
-          signal!.addEventListener('abort', () => {
-            aborted = true;
-            // Settles a bit later, like a request that winds down.
-            setImmediate(() => {
-              settled = true;
-              reject(new Error('The user aborted a request.'));
-            });
-          });
-        })
-    );
-    return { aborted: () => aborted, settled: () => settled };
-  }
-
-  beforeEach(() => {
-    jest
-      .mocked(getAndroidEmulatorLogCapture)
-      .mockImplementation(
-        jest.requireActual('../../utils/androidEmulatorLogs').getAndroidEmulatorLogCapture
-      );
-    deviceLaunch = undefined;
-    jest.clearAllMocks();
-    jest.mocked(resolveLocalEgressServeSimBootEnvironmentAsync).mockResolvedValue(null);
-    jest.mocked(startLocalEgressGuardRelayAsync).mockResolvedValue(undefined);
-    jest.mocked(IosSimulatorUtils.getDeviceAsync).mockResolvedValue({ state: 'Shutdown' } as never);
-    jest.mocked(spawn).mockResolvedValue({ stdout: '' } as never);
-    jest.mocked(IosSimulatorUtils.resolveUdidAsync).mockResolvedValue('selected-udid' as never);
-    jest
-      .mocked(IosSimulatorUtils.getAvailableDevicesAsync)
-      .mockResolvedValue([{ name: 'iPhone 17', udid: 'SELECTED-UDID' }] as never);
-    jest.mocked(getAgentDeviceRemoteSessionEnvOrThrow).mockReturnValue(sessionEnv);
-    jest.mocked(waitForDeviceRunSessionStoppedAsync).mockImplementation(async ({ signal }) => {
-      if (!signal?.aborted) {
-        await new Promise<void>(resolve =>
-          signal?.addEventListener('abort', () => resolve(), { once: true })
-        );
-      }
-    });
-    jest
-      .mocked(runAgentDeviceRemoteSessionAsync)
-      .mockImplementation(async (_ctx, { device, tasks }) => {
-        await tasks.untilAborted(runDevicePreparationAsync(device));
-      });
-    jest.mocked(bootIosSimulatorAsync).mockResolvedValue({
-      deviceIdentifier: 'iPhone 17' as never,
-      udid: 'udid' as never,
-      displayName: 'iPhone 17',
-    });
-    jest.mocked(startAndroidEmulatorAsync).mockResolvedValue({
-      serialId: 'emulator-5554' as never,
-      emulatorPromise: Promise.resolve(),
-      shouldAdjustAnimationScale: true,
-    });
-    jest
-      .mocked(installBuildAsync)
-      .mockResolvedValue({ applicationIdentifier: 'dev.example.app', activityName: '.Main' });
-    jest.mocked(launchApplicationAsync).mockResolvedValue(undefined);
-    jest.mocked(readIosApplicationIdentifierAsync).mockResolvedValue('dev.example.app');
-  });
-
-  it.each([false, true])(
-    'observes Stop during warm claim and preserves cleanup failure=%s',
-    async failCleanup => {
-      const stopped = deferred();
-      jest.mocked(waitForDeviceRunSessionStoppedAsync).mockReturnValue(stopped.promise);
-      let entered!: () => void;
-      const claiming = new Promise<void>(resolve => {
-        entered = resolve;
-      });
-      const cleanup = new Error('warm cleanup failed');
-      jest.mocked(runOnWarmIosSimulatorAsync).mockImplementation(async claim => {
-        entered();
-        await new Promise<void>((_resolve, reject) => {
-          claim.signal!.addEventListener(
-            'abort',
-            () =>
-              reject(
-                failCleanup
-                  ? new AggregateError([claim.signal!.reason, cleanup])
-                  : claim.signal!.reason
-              ),
-            { once: true }
-          );
-        });
-      });
-      const running = runStep(BuildRuntimePlatform.DARWIN, {}, undefined, ctx, true);
-      running.catch(() => {});
-      await claiming;
-      stopped.resolve();
-      if (failCleanup) {
-        await expect(running).rejects.toMatchObject({ errors: expect.arrayContaining([cleanup]) });
-      } else {
-        await expect(running).resolves.toBeUndefined();
-      }
-      expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-    }
-  );
-  it('hands guarded iOS boot to serve-sim and starts reporting before host startup', async () => {
-    const bootEnv = {
-      SERVE_SIM_ADDITIONAL_DYLIBS: '/w/bin/egress-guard.dylib',
-      SIMCTL_CHILD_EAS_EGRESS_GUARD_MODE: 'block',
-      SIMCTL_CHILD_http_proxy: 'http://127.0.0.1:8899',
-    };
-    jest.mocked(resolveLocalEgressServeSimBootEnvironmentAsync).mockResolvedValue(bootEnv);
-    await runStep(BuildRuntimePlatform.DARWIN, {
-      install_app_path: '/tmp/App.app',
-      launch_args: ['-flag'],
-      open_url: 'exp://example.test',
-    });
-    expect(
-      jest.mocked(selectXcodeDeveloperDirectoryAsync).mock.invocationCallOrder[0]
-    ).toBeLessThan(
-      jest.mocked(resolveLocalEgressServeSimBootEnvironmentAsync).mock.invocationCallOrder[0]
-    );
-    expect(startLocalEgressGuardRelayAsync).toHaveBeenCalledTimes(1);
-    expect(jest.mocked(startLocalEgressGuardRelayAsync).mock.invocationCallOrder[0]).toBeLessThan(
-      jest.mocked(runAgentDeviceRemoteSessionAsync).mock.invocationCallOrder[0]
-    );
-    expect(bootIosSimulatorAsync).not.toHaveBeenCalled();
-
-    expect(runAgentDeviceRemoteSessionAsync).toHaveBeenCalledTimes(1);
-    const device = sessionDevice();
-    expect(device).toEqual({
-      iosSimulatorUdid: 'SELECTED-UDID',
-      bootEnv,
-      application: expect.any(Promise),
-    });
-    expect(spawn).not.toHaveBeenCalled();
-    expect(readIosApplicationIdentifierAsync).toHaveBeenCalledWith({
-      artifactPath: '/tmp/App.app',
-      env: {},
-    });
-    expect(installBuildAsync).not.toHaveBeenCalled();
-    expect(launchApplicationAsync).not.toHaveBeenCalled();
-    expect(deviceLaunch).toEqual({
-      installAppPath: '/tmp/App.app',
-      launchAppIdentifier: 'dev.example.app',
-      launchArgs: ['-flag'],
-      openUrl: 'exp://example.test',
-    });
-  });
-
-  it('shuts down only the selected guarded Booted device before host startup', async () => {
-    jest.mocked(resolveLocalEgressServeSimBootEnvironmentAsync).mockResolvedValue({
-      SERVE_SIM_ADDITIONAL_DYLIBS: '/w/bin/egress-guard.dylib',
-    });
-    jest.mocked(IosSimulatorUtils.getDeviceAsync).mockResolvedValue({ state: 'Booted' } as never);
-    await runStep(BuildRuntimePlatform.DARWIN);
-    expect(IosSimulatorUtils.getDeviceAsync).toHaveBeenCalledWith({
-      udid: 'SELECTED-UDID',
-      env: {},
-    });
-    expect(spawn).toHaveBeenCalledTimes(1);
-    expect(spawn).toHaveBeenCalledWith('xcrun', ['simctl', 'shutdown', 'SELECTED-UDID'], {
-      env: {},
-      logger: expect.any(Object),
-      signal: expect.any(AbortSignal),
-    });
-    expect(jest.mocked(spawn).mock.invocationCallOrder[0]).toBeLessThan(
-      jest.mocked(runAgentDeviceRemoteSessionAsync).mock.invocationCallOrder[0]
-    );
-  });
-
-  it('fails before app installation or host startup when guarded device shutdown fails', async () => {
-    jest.mocked(resolveLocalEgressServeSimBootEnvironmentAsync).mockResolvedValue({
-      SERVE_SIM_ADDITIONAL_DYLIBS: '/w/bin/egress-guard.dylib',
-    });
-    jest.mocked(IosSimulatorUtils.getDeviceAsync).mockResolvedValue({ state: 'Booted' } as never);
-    jest.mocked(spawn).mockRejectedValue(new Error('shutdown failed'));
-    await expect(
-      runStep(BuildRuntimePlatform.DARWIN, { install_app_path: '/tmp/App.app' })
-    ).rejects.toThrow('shutdown failed');
-
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-    expect(stopLocalEgressResourcesAsync).toHaveBeenCalledTimes(1);
-  });
-
-  it('treats Stop during guarded device shutdown as normal cancellation', async () => {
-    const stopped = deferred();
-    jest.mocked(waitForDeviceRunSessionStoppedAsync).mockReturnValue(stopped.promise);
-    jest.mocked(resolveLocalEgressServeSimBootEnvironmentAsync).mockResolvedValue({
-      SERVE_SIM_ADDITIONAL_DYLIBS: '/w/bin/egress-guard.dylib',
-    });
-    jest.mocked(IosSimulatorUtils.getDeviceAsync).mockResolvedValue({ state: 'Booted' } as never);
-    jest.mocked(spawn).mockImplementation(
-      (_command, _args, options) =>
-        new Promise((_resolve, reject) => {
-          options!.signal!.addEventListener('abort', () => reject(new Error('shutdown aborted')), {
-            once: true,
-          });
-        }) as ReturnType<typeof spawn>
-    );
-    const step = runStep(BuildRuntimePlatform.DARWIN, { build_id: 'build-id' });
-    step.catch(() => {});
-    await flushAsync();
-    expect(spawn).toHaveBeenCalled();
-    stopped.resolve();
-    await expect(step).resolves.toBeUndefined();
-    expect(downloadBuildAsync).not.toHaveBeenCalled();
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-    expect(startLocalEgressGuardRelayAsync).not.toHaveBeenCalled();
-    expect(stopLocalEgressResourcesAsync).toHaveBeenCalledTimes(1);
-  });
-
-  it('provides Simulator preparation and local app startup options to the remote session', async () => {
-    const hostReady = deferred();
-    jest.mocked(resolveLocalEgressServeSimBootEnvironmentAsync).mockResolvedValue({
-      SERVE_SIM_ADDITIONAL_DYLIBS: '/w/bin/egress-guard.dylib',
-    });
-    jest.mocked(runAgentDeviceRemoteSessionAsync).mockImplementation(async (_ctx, { device }) => {
-      expect('iosSimulatorUdid' in device).toBe(true);
-      if (!('iosSimulatorUdid' in device)) {
-        return;
-      }
-      await hostReady.promise;
-      deviceLaunch = await device.application;
-    });
-    const step = runStep(BuildRuntimePlatform.DARWIN, {
-      device_identifier: 'iPhone 17',
-      install_app_path: '/tmp/App.app',
-      launch_args: ['-flag'],
-      open_url: 'exp://example.test',
-    });
-    await flushAsync();
-    expect(IosSimulatorUtils.resolveUdidAsync).toHaveBeenCalledWith({
-      deviceIdentifier: 'iPhone 17',
-      env: {},
-    });
-    expect(bootIosSimulatorAsync).not.toHaveBeenCalled();
-
-    expect(readIosApplicationIdentifierAsync).toHaveBeenCalledWith({
-      artifactPath: '/tmp/App.app',
-      env: {},
-    });
-    expect(installBuildAsync).not.toHaveBeenCalled();
-    expect(launchApplicationAsync).not.toHaveBeenCalled();
-    expect(deviceLaunch).toBeUndefined();
-    hostReady.resolve();
-    await step;
-    expect(deviceLaunch).toEqual({
-      installAppPath: '/tmp/App.app',
-      launchAppIdentifier: 'dev.example.app',
-      launchArgs: ['-flag'],
-      openUrl: 'exp://example.test',
-    });
-  });
-
-  it('fails a guarded session before app installation or host startup if its boot files are missing', async () => {
-    jest
-      .mocked(resolveLocalEgressServeSimBootEnvironmentAsync)
-      .mockRejectedValue(new Error('missing bin/egress-guard-check'));
-    await expect(
-      runStep(BuildRuntimePlatform.DARWIN, { install_app_path: '/tmp/App.app' })
-    ).rejects.toThrow('missing bin/egress-guard-check');
-    expect(startLocalEgressGuardRelayAsync).not.toHaveBeenCalled();
-
-    expect(bootIosSimulatorAsync).not.toHaveBeenCalled();
-    expect(IosSimulatorUtils.getDeviceAsync).not.toHaveBeenCalled();
-    expect(spawn).not.toHaveBeenCalled();
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-    expect(stopLocalEgressResourcesAsync).toHaveBeenCalledTimes(1);
-  });
-
-  it('releases guard reporting and egress resources when host startup fails', async () => {
-    jest.mocked(resolveLocalEgressServeSimBootEnvironmentAsync).mockResolvedValue({
-      SERVE_SIM_ADDITIONAL_DYLIBS: '/w/bin/egress-guard.dylib',
-    });
-    jest
-      .mocked(runAgentDeviceRemoteSessionAsync)
-      .mockRejectedValueOnce(new Error('guard check failed'));
-    await expect(
-      runStep(BuildRuntimePlatform.DARWIN, { install_app_path: '/tmp/App.app' })
-    ).rejects.toThrow('guard check failed');
-    expect(startLocalEgressGuardRelayAsync).toHaveBeenCalledTimes(1);
-    expect(stopLocalEgressResourcesAsync).toHaveBeenCalledTimes(1);
-    expect(installBuildAsync).not.toHaveBeenCalled();
-    expect(launchApplicationAsync).not.toHaveBeenCalled();
-  });
-
-  it('passes the selected Simulator to the host even when there is no app', async () => {
-    await runStep(BuildRuntimePlatform.DARWIN);
-
-    expect(installBuildAsync).not.toHaveBeenCalled();
-    expect(launchApplicationAsync).not.toHaveBeenCalled();
-    expect(getAndroidEmulatorLogCapture).not.toHaveBeenCalled();
-    expect(sessionDevice()).toEqual({
-      iosSimulatorUdid: 'SELECTED-UDID',
-      bootEnv: undefined,
-      application: undefined,
-    });
-  });
-
-  it('defaults an omitted session log input to emulator output through the step boundary', async () => {
-    const buildFunction = createStartAgentDeviceSessionBuildFunction(ctx);
-    const global = createGlobalContextMock({ runtimePlatform: BuildRuntimePlatform.LINUX });
-    const step = buildFunction.createBuildStepFromFunctionCall(global, {
-      callInputs: {},
-      env: { DEVICE_RUN_SESSION_ID: 'session' },
-    });
-    await step.executeAsync();
-    expect(startAndroidEmulatorAsync).toHaveBeenCalledWith(
-      expect.objectContaining({
-        logCapture: expect.objectContaining({ sources: ['emulator-output'] }),
-      })
-    );
-  });
-
-  it('passes an explicit empty source list and the workflow capture to Android boot', async () => {
-    const capture = new AndroidEmulatorLogRing({ sources: [] });
-    jest.mocked(getAndroidEmulatorLogCapture).mockReturnValue(capture);
-    const env = { DEVICE_RUN_SESSION_ID: 'session' };
-    await runStep(BuildRuntimePlatform.LINUX, { log_sources: [] }, undefined, ctx, false, env);
-    expect(getAndroidEmulatorLogCapture).toHaveBeenCalledWith(expect.anything(), env, []);
-    expect(startAndroidEmulatorAsync).toHaveBeenCalledWith(
-      expect.objectContaining({ logCapture: capture })
-    );
-  });
-
-  it('rejects invalid Android log sources before boot or downloading', async () => {
-    await expect(
-      runStep(BuildRuntimePlatform.LINUX, {
-        log_sources: ['unknown'],
-        build_id: 'build-id',
-      })
-    ).rejects.toThrow();
-    expect(startAndroidEmulatorAsync).not.toHaveBeenCalled();
-    expect(downloadBuildAsync).not.toHaveBeenCalled();
-  });
-
-  it('rejects Android log sources on an iOS session before boot or downloading', async () => {
-    await expect(
-      runStep(BuildRuntimePlatform.DARWIN, {
-        log_sources: ['device-logcat'],
-        build_id: 'build-id',
-      })
-    ).rejects.toThrow('Input "log_sources" selects Android emulator logs');
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-    expect(IosSimulatorUtils.resolveUdidAsync).not.toHaveBeenCalled();
-    expect(downloadBuildAsync).not.toHaveBeenCalled();
-  });
-
-  it('boots an iOS session with an explicit empty source list', async () => {
-    await runStep(BuildRuntimePlatform.DARWIN, { log_sources: [] });
-    expect(runAgentDeviceRemoteSessionAsync).toHaveBeenCalled();
-    expect(startAndroidEmulatorAsync).not.toHaveBeenCalled();
-  });
-
-  it('boots the Android Emulator with the device inputs', async () => {
-    await runStep(BuildRuntimePlatform.LINUX, {
-      device_identifier: 'pixel_7',
-      system_image_package: 'system-images;android-35-ext15;google_apis_playstore;x86_64',
-      lcd_width: 720,
-      lcd_height: 1600,
-      lcd_density: 300,
-      install_app_path: '/tmp/App.app',
-    });
-
-    expect(selectXcodeDeveloperDirectoryAsync).not.toHaveBeenCalled();
-    expect(startAndroidEmulatorAsync).toHaveBeenCalledWith(
-      expect.objectContaining({
-        deviceIdentifier: 'pixel_7',
-        systemImagePackage: 'system-images;android-35-ext15;google_apis_playstore;x86_64',
-        lcdWidth: 720,
-        lcdHeight: 1600,
-        lcdDensity: 300,
-      })
-    );
-
-    expect(launchApplicationAsync).toHaveBeenCalledWith(
-      expect.objectContaining({ applicationIdentifier: 'dev.example.app', activityName: '.Main' })
-    );
-  });
-
-  it('stops the download and waits for it when Android boot fails', async () => {
-    const download = mockStalledDownload();
-    jest.mocked(startAndroidEmulatorAsync).mockRejectedValue(new Error('boot failed'));
-
-    await expect(
-      runStep(BuildRuntimePlatform.LINUX, { build_id: 'build-id' }, undefined, ctx, false, {
-        DEVICE_RUN_SESSION_ID: 'session',
-      })
-    ).rejects.toThrow('boot failed');
-
-    expect(download.aborted()).toBe(true);
-    // The step returned only after the download stopped.
-    expect(download.settled()).toBe(true);
-    expect(installBuildAsync).not.toHaveBeenCalled();
-  });
-
-  it('does not start work for an already cancelled step', async () => {
-    const controller = new AbortController();
-    controller.abort(new Error('cancelled'));
-
-    await expect(
-      runStep(BuildRuntimePlatform.DARWIN, { install_app_path: '/tmp/App.app' }, controller.signal)
-    ).rejects.toThrow('cancelled');
-    expect(selectXcodeDeveloperDirectoryAsync).not.toHaveBeenCalled();
-
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-  });
-
-  it.each([BuildRuntimePlatform.DARWIN, BuildRuntimePlatform.LINUX])(
-    'observes Stop during a held download on %s and drains startup normally',
-    async runtimePlatform => {
-      const download = mockStalledDownload();
-      const stopped = deferred();
-      const controller = new AbortController();
-      jest.mocked(waitForDeviceRunSessionStoppedAsync).mockReturnValue(stopped.promise);
-      const step = runStep(runtimePlatform, { build_id: 'build-id' }, controller.signal);
-      step.catch(() => {});
-      try {
-        await flushAsync();
-        expect(waitForDeviceRunSessionStoppedAsync).toHaveBeenCalledWith(
-          expect.objectContaining({
-            deviceRunSessionId: sessionEnv.deviceRunSessionId,
-            signal: expect.any(AbortSignal),
-          })
-        );
-        stopped.resolve();
-        await expect(step).resolves.toBeUndefined();
-        expect(download.aborted()).toBe(true);
-        expect(download.settled()).toBe(true);
-        expect(installBuildAsync).not.toHaveBeenCalled();
-        expect(launchApplicationAsync).not.toHaveBeenCalled();
-        expect(readIosApplicationIdentifierAsync).not.toHaveBeenCalled();
-      } finally {
-        controller.abort(new Error('test cleanup'));
-        stopped.resolve();
-        await step.catch(() => {});
-      }
-    }
-  );
-
-  it('waits for an in-flight Android boot after Stop without installing or launching', async () => {
-    const boot = deferred<Awaited<ReturnType<typeof startAndroidEmulatorAsync>>>();
-    const stopped = deferred();
-    jest.mocked(startAndroidEmulatorAsync).mockReturnValue(boot.promise);
-    jest.mocked(waitForDeviceRunSessionStoppedAsync).mockReturnValue(stopped.promise);
-    let settled = false;
-    const step = runStep(BuildRuntimePlatform.LINUX, { build_id: 'build-id' });
-    void step
-      .finally(() => {
-        settled = true;
-      })
-      .catch(() => {});
-    try {
-      await flushAsync();
-      expect(startAndroidEmulatorAsync).toHaveBeenCalled();
-      stopped.resolve();
-      await flushAsync();
-      expect(settled).toBe(false);
-    } finally {
-      boot.resolve({} as Awaited<ReturnType<typeof startAndroidEmulatorAsync>>);
-      stopped.resolve();
-      await step;
-    }
-    expect(installBuildAsync).not.toHaveBeenCalled();
-    expect(launchApplicationAsync).not.toHaveBeenCalled();
-  });
-
-  it('retires the startup watch without treating its abort as user Stop', async () => {
-    jest
-      .mocked(runAgentDeviceRemoteSessionAsync)
-      .mockImplementation(async (_ctx, { onStarted, tasks }) => {
-        await onStarted!();
-        expect(tasks.signal.aborted).toBe(false);
-      });
-    await expect(runStep(BuildRuntimePlatform.DARWIN)).resolves.toBeUndefined();
-    const options = jest.mocked(waitForDeviceRunSessionStoppedAsync).mock.calls[0][0];
-    expect(options.maxDurationSeconds).toBeUndefined();
-    expect(options.idleTimeout).toBeUndefined();
-    expect(options.signal!.aborted).toBe(true);
-  });
-
-  it('preserves a download failure that wins before Stop', async () => {
-    const failed = new Error('download failed first');
-    const stopped = deferred();
-    jest.mocked(waitForDeviceRunSessionStoppedAsync).mockReturnValue(stopped.promise);
-    jest.mocked(downloadBuildAsync).mockRejectedValue(failed);
-    const step = runStep(BuildRuntimePlatform.DARWIN, { build_id: 'build-id' });
-    step.catch(() => {});
-    await flushAsync();
-    stopped.resolve();
-    await expect(step).rejects.toBe(failed);
-  });
-
-  it('fails when the startup status watch rejects', async () => {
-    const failed = new Error('session errored');
-    jest.mocked(waitForDeviceRunSessionStoppedAsync).mockRejectedValue(failed);
-    await expect(runStep(BuildRuntimePlatform.DARWIN)).rejects.toBe(failed);
-    expect(downloadBuildAsync).not.toHaveBeenCalled();
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-  });
-
-  it('cancels and drains a pending download through the external signal', async () => {
-    const controller = new AbortController();
-    const download = mockStalledDownload();
-    const step = runStep(BuildRuntimePlatform.DARWIN, { build_id: 'build-id' }, controller.signal);
-    const failure = expect(step).rejects.toThrow('cancelled');
-    await flushAsync();
-    controller.abort(new Error('cancelled'));
-
-    await failure;
-    expect(download.aborted()).toBe(true);
-    expect(download.settled()).toBe(true);
-    expect(installBuildAsync).not.toHaveBeenCalled();
-  });
-
-  it('does not start device or app work after cancellation during Xcode selection', async () => {
-    const controller = new AbortController();
-    const selected = deferred();
-    jest.mocked(selectXcodeDeveloperDirectoryAsync).mockReturnValue(selected.promise);
-    const step = runStep(
-      BuildRuntimePlatform.DARWIN,
-      { install_app_path: '/tmp/App.app' },
-      controller.signal
-    );
-    const failure = expect(step).rejects.toThrow('cancelled');
-    await flushAsync();
-    controller.abort(new Error('cancelled'));
-    selected.resolve();
-
-    await failure;
-    expect(IosSimulatorUtils.resolveUdidAsync).not.toHaveBeenCalled();
-    expect(bootIosSimulatorAsync).not.toHaveBeenCalled();
-
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-  });
-
-  it('declares the step inputs', () => {
-    const buildFunction = createStartAgentDeviceSessionBuildFunction(ctx);
-    const globalCtx = createGlobalContextMock();
-
-    expect(
-      buildFunction.inputProviders?.map(provider => provider(globalCtx, 'Test step').id)
-    ).toEqual([
-      'log_sources',
-      'device_identifier',
-      'system_image_package',
-      'lcd_width',
-      'lcd_height',
-      'lcd_density',
-      'install_app_path',
-      'build_id',
-      'application_archive_url',
-      'launch_app_identifier',
-      'launch_args',
-      'open_url',
-      'network_capture',
-      'network_capture_fields',
-      'public_preview',
-      'private_preview_url',
-      'frame_ancestors',
-      'cors_origins',
-      'package_version',
-      'max_idle_time_minutes',
-      'max_duration_seconds',
-    ]);
-  });
-
-  it.each([undefined, true, false])(
-    'passes public_preview=%s to the iOS session host',
-    async publicPreview => {
-      await runStep(BuildRuntimePlatform.DARWIN, {
-        public_preview: publicPreview,
-        private_preview_url: 'https://expo.dev/private-preview',
-      });
-      expect(runAgentDeviceRemoteSessionAsync).toHaveBeenCalledWith(
-        ctx,
-        expect.objectContaining({
-          disableShare: publicPreview === false,
-          privatePreviewUrl: 'https://expo.dev/private-preview',
-        })
-      );
-    }
-  );
-
-  it('passes frame_ancestors to the session host', async () => {
-    await runStep(BuildRuntimePlatform.DARWIN, {
-      frame_ancestors: ['https://embed.example.test'],
-    });
-    expect(runAgentDeviceRemoteSessionAsync).toHaveBeenCalledWith(
-      ctx,
-      expect.objectContaining({ frameAncestors: ['https://embed.example.test'] })
-    );
-  });
-
-  it('passes cors_origins to the session host', async () => {
-    await runStep(BuildRuntimePlatform.DARWIN, {
-      cors_origins: ['https://app.example.test'],
-    });
-    expect(runAgentDeviceRemoteSessionAsync).toHaveBeenCalledWith(
-      ctx,
-      expect.objectContaining({ corsOrigins: ['https://app.example.test'] })
-    );
-  });
-
-  it.each([
-    ['argument count', { launch_args: Array(257).fill('a') }],
-    ['argument length', { launch_args: ['a'.repeat(9000)] }],
-    ['NUL argument', { launch_args: ['a\u0000b'] }],
-    ['total UTF-8 bytes', { launch_args: Array(8).fill('😃'.repeat(4096)) }],
-    ['NUL URL', { open_url: 'example:\u0000screen' }],
-    ['URL length', { open_url: `example://${'a'.repeat(8192)}` }],
-  ])('rejects iOS launch %s before startup work', async (_name, inputs) => {
-    const step = runStep(BuildRuntimePlatform.DARWIN, {
-      install_app_path: '/tmp/App.app',
-      ...inputs,
-    });
-    await expect(step).rejects.toBeInstanceOf(UserError);
-    expect(selectXcodeDeveloperDirectoryAsync).not.toHaveBeenCalled();
-    expect(IosSimulatorUtils.resolveUdidAsync).not.toHaveBeenCalled();
-    expect(bootIosSimulatorAsync).not.toHaveBeenCalled();
-
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-  });
-
-  it.each([
-    ['NUL argument', { launch_args: ['a\u0000b'] }],
-    ['command length', { launch_args: ['--es', 'quotes', "'".repeat(20_000)] }],
-    ['NUL URL', { open_url: 'example:\u0000screen' }],
-  ])('rejects Android launch %s before startup work', async (_name, inputs) => {
-    const step = runStep(BuildRuntimePlatform.LINUX, {
-      install_app_path: '/tmp/App.app',
-      ...inputs,
-    });
-    await expect(step).rejects.toMatchObject({ errorCode: 'EAS_LAUNCH_APPLICATION_INVALID_INPUT' });
-    expect(startAndroidEmulatorAsync).not.toHaveBeenCalled();
-
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-  });
-
-  it('keeps Android launch inputs on its existing direct path', async () => {
-    const launchArgs = ['a'.repeat(9000)];
-    await runStep(BuildRuntimePlatform.LINUX, {
-      install_app_path: '/tmp/App.app',
-      launch_args: launchArgs,
-    });
-    expect(launchApplicationAsync).toHaveBeenCalledWith(
-      expect.objectContaining({ runtimePlatform: BuildRuntimePlatform.LINUX, launchArgs })
-    );
-  });
-
-  it('passes network capture to the session', async () => {
-    await runStep(BuildRuntimePlatform.DARWIN, {
-      network_capture: true,
-      network_capture_fields: ['header', 'response-body'],
-    });
-
-    expect(runAgentDeviceRemoteSessionAsync).toHaveBeenCalledWith(
-      ctx,
-      expect.objectContaining({
-        capture: { networkCapture: true, networkCaptureFields: ['header', 'response-body'] },
-      })
-    );
-  });
-
-  it('rejects network capture on Android before it boots anything', async () => {
-    await expect(
-      runStep(BuildRuntimePlatform.LINUX, { network_capture: true, system_image_package: 'x' })
-    ).rejects.toThrow('records traffic through serve-sim on an iOS simulator');
-    expect(startAndroidEmulatorAsync).not.toHaveBeenCalled();
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-  });
-  it('requires an application for launch options before starting the device', async () => {
-    await expect(
-      runStep(BuildRuntimePlatform.DARWIN, { open_url: 'fixture://route' })
-    ).rejects.toThrow('pass install_app_path or launch_app_identifier');
-    expect(selectXcodeDeveloperDirectoryAsync).not.toHaveBeenCalled();
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-  });
-
-  it('launches an installed iOS application without reading an app artifact', async () => {
-    await runStep(BuildRuntimePlatform.DARWIN, {
-      launch_app_identifier: 'dev.installed.app',
-      launch_args: ['--test'],
-      open_url: 'fixture://route',
-    });
-    expect(readIosApplicationIdentifierAsync).not.toHaveBeenCalled();
-    expect(deviceLaunch).toEqual({
-      installAppPath: undefined,
-      launchAppIdentifier: 'dev.installed.app',
-      launchArgs: ['--test'],
-      openUrl: 'fixture://route',
-    });
-  });
-
-  it('keeps explicit application identifier launch iOS-only', async () => {
-    await expect(
-      runStep(BuildRuntimePlatform.LINUX, { launch_app_identifier: 'dev.app' })
-    ).rejects.toThrow('Pass install_app_path for Android');
-    expect(startAndroidEmulatorAsync).not.toHaveBeenCalled();
-  });
-
-  it('still downloads a build_id app and launches it on iOS', async () => {
-    jest.mocked(downloadBuildAsync).mockResolvedValue({ artifactPath: '/tmp/Downloaded.app' });
-    await runStep(BuildRuntimePlatform.DARWIN, { build_id: 'build-id', launch_args: ['-flag'] });
-    expect(downloadBuildAsync).toHaveBeenCalledWith(
-      expect.objectContaining({ buildId: 'build-id', extensions: ['app'] })
-    );
-    expect(deviceLaunch).toEqual({
-      installAppPath: '/tmp/Downloaded.app',
-      launchAppIdentifier: 'dev.example.app',
-      launchArgs: ['-flag'],
-      openUrl: undefined,
-    });
-  });
-
-  it('still downloads an application_archive_url app and installs it on Android', async () => {
-    jest.mocked(downloadBuildAsync).mockResolvedValue({ artifactPath: '/tmp/Downloaded.apk' });
-    await runStep(BuildRuntimePlatform.LINUX, {
-      application_archive_url: 'https://example.test/app.tar.gz',
-    });
-    expect(downloadBuildAsync).toHaveBeenCalledWith(
-      expect.objectContaining({
-        applicationArchiveUrl: 'https://example.test/app.tar.gz',
-        extensions: ['apk'],
-      })
-    );
-    expect(installBuildAsync).toHaveBeenCalledWith(
-      expect.objectContaining({ artifactPath: '/tmp/Downloaded.apk' })
-    );
-    expect(launchApplicationAsync).toHaveBeenCalledTimes(1);
-  });
-
-  it('runs the warm step on the warm Simulator for a local app only', async () => {
-    jest.mocked(runOnWarmIosSimulatorAsync).mockImplementation((_claim, run) => run());
-    const runWarm = (inputs: Record<string, unknown>) =>
-      runStep(BuildRuntimePlatform.DARWIN, inputs, undefined, ctx, true);
-    await runWarm({ install_app_path: '/tmp/App.app', device_identifier: 'iPhone 17' });
-    expect(runOnWarmIosSimulatorAsync).toHaveBeenCalledWith(
-      expect.objectContaining({ engine: 'agent-device', requestedDevice: 'iPhone 17' }),
-      expect.any(Function)
-    );
-    jest.mocked(runOnWarmIosSimulatorAsync).mockClear();
-    jest.mocked(downloadBuildAsync).mockResolvedValue({ artifactPath: '/tmp/Downloaded.app' });
-    await runWarm({ build_id: 'build-id' });
-    expect(runOnWarmIosSimulatorAsync).not.toHaveBeenCalled();
-    expect(runAgentDeviceRemoteSessionAsync).toHaveBeenCalledTimes(2);
-  });
-
-  it('passes the resolved version to agent-device after a warm version mismatch', async () => {
-    jest
-      .mocked(runOnWarmIosSimulatorAsync)
-      .mockImplementation((_claim, run) => run(undefined, '999.1.0'));
-    await runStep(BuildRuntimePlatform.DARWIN, { package_version: 'latest' }, undefined, ctx, true);
-    expect(runAgentDeviceRemoteSessionAsync).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({ packageVersion: '999.1.0' })
-    );
-  });
-
-  it('accepts only one application source', async () => {
-    await expect(
-      runStep(BuildRuntimePlatform.DARWIN, { install_app_path: '/tmp/App.app', build_id: 'id' })
-    ).rejects.toThrow('Pass only one of install_app_path, build_id or application_archive_url.');
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-  });
-
-  it('waits for Android boot before installing the supplied local APK', async () => {
-    const boot = deferred();
-    jest.mocked(startAndroidEmulatorAsync).mockReturnValue(boot.promise as never);
-    const step = runStep(BuildRuntimePlatform.LINUX, { install_app_path: '/tmp/App.apk' });
-    await flushAsync();
-    expect(installBuildAsync).not.toHaveBeenCalled();
-    boot.resolve();
-    await step;
-    expect(installBuildAsync).toHaveBeenCalledWith(
-      expect.objectContaining({ artifactPath: '/tmp/App.apk' })
-    );
-    expect(launchApplicationAsync).toHaveBeenCalledTimes(1);
-  });
-
-  it('drains an in-flight Android install on cancellation and never launches it', async () => {
-    const controller = new AbortController();
-    const installation = deferred<{ applicationIdentifier: string; activityName: string }>();
-    jest.mocked(installBuildAsync).mockReturnValue(installation.promise);
-    const step = runStep(
-      BuildRuntimePlatform.LINUX,
-      { install_app_path: '/tmp/App.apk' },
-      controller.signal
-    );
-    let settled = false;
-    void step.then(
-      () => (settled = true),
-      () => (settled = true)
-    );
-    const failure = expect(step).rejects.toThrow('cancelled');
-    await flushAsync();
-    expect(installBuildAsync).toHaveBeenCalledTimes(1);
-    controller.abort(new Error('cancelled'));
-    await flushAsync();
-    expect(settled).toBe(false);
-    installation.resolve({ applicationIdentifier: 'dev.app', activityName: '.Main' });
-    await failure;
-    expect(launchApplicationAsync).not.toHaveBeenCalled();
-  });
-
-  it('drains an in-flight Android install when session startup fails', async () => {
-    const entered = deferred();
-    const installation = deferred<{ applicationIdentifier: string; activityName: string }>();
-    jest.mocked(installBuildAsync).mockImplementation(() => {
-      entered.resolve();
-      return installation.promise;
-    });
-    jest.mocked(runAgentDeviceRemoteSessionAsync).mockImplementation(async () => {
-      await entered.promise;
-      throw new Error('session startup failed');
-    });
-    const step = runStep(BuildRuntimePlatform.LINUX, { install_app_path: '/tmp/App.apk' });
-    let settled = false;
-    void step.then(
-      () => (settled = true),
-      () => (settled = true)
-    );
-    const failure = expect(step).rejects.toThrow('session startup failed');
-    await entered.promise;
-    await flushAsync();
-    expect(settled).toBe(false);
-    installation.resolve({ applicationIdentifier: 'dev.app', activityName: '.Main' });
-    await failure;
-    expect(launchApplicationAsync).not.toHaveBeenCalled();
-  });
-
-  it('drains iOS metadata reading on cancellation without starting the session', async () => {
-    const controller = new AbortController();
-    const metadata = deferred<string>();
-    jest.mocked(readIosApplicationIdentifierAsync).mockReturnValue(metadata.promise);
-    const step = runStep(
-      BuildRuntimePlatform.DARWIN,
-      { install_app_path: '/tmp/App.app' },
-      controller.signal
-    );
-    const failure = expect(step).rejects.toThrow('cancelled');
-    await flushAsync();
-    expect(readIosApplicationIdentifierAsync).toHaveBeenCalledTimes(1);
-    controller.abort(new Error('cancelled'));
-    metadata.resolve('dev.app');
-    await failure;
-    expect(runAgentDeviceRemoteSessionAsync).not.toHaveBeenCalled();
-  });
-});

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

@@ -8,9 +8,6 @@ import {
   AndroidVirtualDeviceName,
 } from '../../../utils/AndroidEmulatorUtils';
 import { retryAsync } from '../../../utils/retry';
-import { resolveAndroidEmulatorLocalEgressAsync } from '../../utils/androidLocalEgress';
-import { AndroidEmulatorLogRing } from '../../../utils/androidEmulatorLogCapture';
-import { getAndroidEmulatorLogCapture } from '../../utils/androidEmulatorLogs';
 import { createStartAndroidEmulatorBuildFunction } from '../startAndroidEmulator';
 
 jest.mock('@expo/turtle-spawn', () => ({
@@ -22,12 +19,6 @@ jest.mock('../../../utils/retry', () => ({
   retryAsync: jest.fn(),
 }));
 
-jest.mock('../../utils/androidLocalEgress', () => ({
-  resolveAndroidEmulatorLocalEgressAsync: jest.fn(),
-}));
-
-jest.mock('../../utils/androidEmulatorLogs');
-
 jest.mock('../../../utils/AndroidEmulatorUtils', () => ({
   AndroidEmulatorUtils: {
     defaultSystemImagePackage: 'system-images;android-30;default;x86_64',
@@ -44,7 +35,6 @@ jest.mock('../../../utils/AndroidEmulatorUtils', () => ({
 const mockedSpawn = jest.mocked(spawn);
 const mockedRetryAsync = jest.mocked(retryAsync);
 const mockedAndroidUtils = jest.mocked(AndroidEmulatorUtils);
-const mockedResolveLocalEgress = jest.mocked(resolveAndroidEmulatorLocalEgressAsync);
 const mockedMkdtemp = jest.spyOn(fs.promises, 'mkdtemp');
 function createStep(callInputs?: Record<string, unknown>, envOverrides?: NodeJS.ProcessEnv) {
   const logger = createMockLogger();
@@ -66,11 +56,6 @@ function createStartResult(serialId: string) {
 
 describe(createStartAndroidEmulatorBuildFunction, () => {
   beforeEach(() => {
-    jest
-      .mocked(getAndroidEmulatorLogCapture)
-      .mockImplementation(
-        jest.requireActual('../../utils/androidEmulatorLogs').getAndroidEmulatorLogCapture
-      );
     mockedMkdtemp.mockResolvedValue('/tmp/logcat-directory');
     mockedSpawn.mockResolvedValue({ stdout: '', stderr: '' } as any);
     mockedAndroidUtils.getAvailableDevicesAsync.mockResolvedValue([]);
@@ -80,7 +65,6 @@ describe(createStartAndroidEmulatorBuildFunction, () => {
     mockedAndroidUtils.waitForReadyAsync.mockResolvedValue(undefined);
     mockedAndroidUtils.disableWindowAndTransitionAnimationsAsync.mockResolvedValue(undefined);
     mockedAndroidUtils.deleteAsync.mockResolvedValue(undefined);
-    mockedResolveLocalEgress.mockResolvedValue(null);
 
     mockedRetryAsync.mockImplementation(async (fn, { retryOptions }) => {
       let lastErr: unknown;
@@ -99,107 +83,6 @@ describe(createStartAndroidEmulatorBuildFunction, () => {
     mockedMkdtemp.mockRestore();
   });
 
-  it('preserves an explicit empty source list and one capture through boot retries and clones', async () => {
-    mockedAndroidUtils.waitForReadyAsync.mockRejectedValueOnce(new Error('retry boot'));
-    const capture = new AndroidEmulatorLogRing({ sources: [] });
-    jest.mocked(getAndroidEmulatorLogCapture).mockReturnValue(capture);
-    await createStep(
-      { log_sources: [], count: 2 },
-      { DEVICE_RUN_SESSION_ID: 'session' }
-    ).executeAsync();
-    expect(getAndroidEmulatorLogCapture).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({ DEVICE_RUN_SESSION_ID: 'session' }),
-      []
-    );
-    expect(mockedAndroidUtils.startAsync).toHaveBeenCalledTimes(4);
-    for (const [options] of mockedAndroidUtils.startAsync.mock.calls) {
-      expect(options.logCapture).toBe(capture);
-    }
-  });
-
-  it('rejects invalid sources before starting the emulator', async () => {
-    await expect(createStep({ log_sources: ['unknown'] }).executeAsync()).rejects.toThrow();
-    expect(mockedAndroidUtils.startAsync).not.toHaveBeenCalled();
-  });
-
-  describe('local egress', () => {
-    function createLocalEgress() {
-      return {
-        launchGate: {
-          emulatorArgs: ['-http-proxy', '127.0.0.1:8898', '-no-metrics'],
-          wrapperCommand: 'bash',
-          wrapperArgs: ['-c', 'gate', 'eas-egress-gate'],
-          admitAsync: jest.fn(),
-        },
-        networkReadyTarget: { host: '192.0.2.1', port: 443 },
-        configureBootedEmulatorAsync: jest.fn().mockResolvedValue(undefined),
-      };
-    }
-
-    it('starts the emulator exactly as before without a local egress session', async () => {
-      await createStep().executeAsync();
-
-      expect(mockedAndroidUtils.startAsync).toHaveBeenCalledWith({
-        deviceName: 'EasAndroidDevice01',
-        env: expect.any(Object),
-        logcatDirectory: '/tmp/logcat-directory',
-        logCapture: expect.objectContaining({ sources: ['emulator-output', 'device-logcat'] }),
-      });
-      expect(mockedAndroidUtils.waitForReadyAsync).toHaveBeenCalledWith({
-        env: expect.any(Object),
-        serialId: 'emulator-default',
-        timeoutMs: 60_000,
-        logger: expect.anything(),
-      });
-      expect(
-        mockedSpawn.mock.calls.filter(
-          ([command, args]) =>
-            ['sudo', 'nft', 'systemd-run'].includes(command) ||
-            (command === 'adb' && (args.includes('reverse') || args.includes('http_proxy')))
-        )
-      ).toEqual([]);
-    });
-
-    it('fences, gates and configures the emulator', async () => {
-      const localEgress = createLocalEgress();
-      mockedResolveLocalEgress.mockResolvedValue(localEgress);
-      mockedAndroidUtils.startAsync.mockResolvedValueOnce(createStartResult('emulator-base'));
-
-      await createStep().executeAsync();
-
-      expect(mockedAndroidUtils.startAsync).toHaveBeenCalledWith(
-        expect.objectContaining({ launchGate: localEgress.launchGate })
-      );
-      expect(mockedAndroidUtils.waitForReadyAsync).toHaveBeenCalledWith(
-        expect.objectContaining({ networkReadyTarget: { host: '192.0.2.1', port: 443 } })
-      );
-      expect(localEgress.configureBootedEmulatorAsync).toHaveBeenCalledWith(
-        expect.objectContaining({ serialId: 'emulator-base' })
-      );
-    });
-
-    it('retries a boot whose local egress configuration fails', async () => {
-      const localEgress = createLocalEgress();
-      localEgress.configureBootedEmulatorAsync
-        .mockRejectedValueOnce(new Error('netsimd outside the fence'))
-        .mockResolvedValueOnce(undefined);
-      mockedResolveLocalEgress.mockResolvedValue(localEgress);
-      mockedAndroidUtils.startAsync
-        .mockResolvedValueOnce(createStartResult('emulator-1111'))
-        .mockResolvedValueOnce(createStartResult('emulator-2222'));
-
-      await createStep().executeAsync();
-
-      expect(mockedAndroidUtils.deleteAsync).toHaveBeenCalledWith(
-        expect.objectContaining({ serialId: 'emulator-1111' })
-      );
-      expect(localEgress.configureBootedEmulatorAsync).toHaveBeenLastCalledWith(
-        expect.objectContaining({ serialId: 'emulator-2222' })
-      );
-    });
-  });
-
   it('passes profile and LCD inputs to emulator creation', async () => {
     const systemImagePackage = 'system-images;android-35;default;x86_64';
     await createStep({

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

@@ -1,3 +1,4 @@
+import { SystemError } from '@expo/eas-build-job';
 import { type bunyan } from '@expo/logger';
 import fs from 'node:fs';
 import os from 'node:os';
@@ -5,12 +6,79 @@ import path from 'node:path';
 
 import { Sentry } from '../../../sentry';
 import {
+  MIN_ARGENT_REMOTE_SESSION_VERSION,
   stopArgentEventCollectionSafelyAsync,
   waitForArgentToolServerStateAsync,
+  warnIfArgentPackageVersionCannotBeVerified,
 } from '../startArgentRemoteSession';
 
 jest.mock('../../../sentry');
 
+describe(warnIfArgentPackageVersionCannotBeVerified, () => {
+  const warn = jest.fn();
+  const logger = { warn } as unknown as bunyan;
+  const supportedVersion = '999.0.0';
+  const oldVersion = '0.0.0';
+
+  beforeEach(() => {
+    warn.mockClear();
+  });
+
+  it('allows the default latest package version', () => {
+    expect(() =>
+      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: undefined, logger })
+    ).not.toThrow();
+    expect(() =>
+      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: 'latest', logger })
+    ).not.toThrow();
+    expect(warn).not.toHaveBeenCalled();
+  });
+
+  it('allows exact supported semver versions', () => {
+    expect(() =>
+      warnIfArgentPackageVersionCannotBeVerified({
+        packageVersion: MIN_ARGENT_REMOTE_SESSION_VERSION,
+        logger,
+      })
+    ).not.toThrow();
+    expect(() =>
+      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: supportedVersion, logger })
+    ).not.toThrow();
+    expect(() =>
+      warnIfArgentPackageVersionCannotBeVerified({
+        packageVersion: `v${supportedVersion}`,
+        logger,
+      })
+    ).not.toThrow();
+    expect(warn).not.toHaveBeenCalled();
+  });
+
+  it('rejects exact semver versions that are too old', () => {
+    expect(() =>
+      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: oldVersion, logger })
+    ).toThrow(SystemError);
+    expect(() =>
+      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: oldVersion, logger })
+    ).toThrow(`Use "latest" or pass an exact version >= ${MIN_ARGENT_REMOTE_SESSION_VERSION}`);
+  });
+
+  it('warns for package tags or ranges that cannot be verified', () => {
+    expect(() =>
+      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: 'next', logger })
+    ).not.toThrow();
+    expect(() =>
+      warnIfArgentPackageVersionCannotBeVerified({
+        packageVersion: `^${MIN_ARGENT_REMOTE_SESSION_VERSION}`,
+        logger,
+      })
+    ).not.toThrow();
+    expect(warn).toHaveBeenCalledTimes(2);
+    expect(warn).toHaveBeenCalledWith(
+      expect.stringContaining('Continuing and letting the package manager resolve it.')
+    );
+  });
+});
+
 describe(waitForArgentToolServerStateAsync, () => {
   let stateDir: string;
 
@@ -26,59 +94,6 @@ describe(waitForArgentToolServerStateAsync, () => {
     return JSON.stringify({ port, pid, token });
   }
 
-  it('reports process exit instead of waiting for the startup timeout', async () => {
-    const getExitError = jest.fn(() => new Error('server exited with code 1'));
-    await expect(
-      waitForArgentToolServerStateAsync({
-        stateDir,
-        ancestorPid: process.pid,
-        timeoutMs: 100,
-        pollIntervalMs: 1,
-        getExitError,
-      })
-    ).rejects.toThrow('server exited with code 1');
-    expect(getExitError).toHaveBeenCalledTimes(1);
-  });
-
-  it('detects an exit after polling has begun', async () => {
-    const getExitError = jest
-      .fn<Error | undefined, []>()
-      .mockReturnValueOnce(undefined)
-      .mockReturnValueOnce(undefined)
-      .mockReturnValue(new Error('server stopped'));
-    await expect(
-      waitForArgentToolServerStateAsync({
-        stateDir,
-        ancestorPid: process.pid,
-        timeoutMs: 100,
-        pollIntervalMs: 1,
-        getExitError,
-      })
-    ).rejects.toThrow('server stopped');
-    expect(getExitError).toHaveBeenCalledTimes(3);
-  });
-
-  it('rejects an exit observed while reading a matching state file', async () => {
-    await fs.promises.writeFile(
-      path.join(stateDir, 'tool-server.json'),
-      stateJson({ port: 4321, pid: process.pid })
-    );
-    const getExitError = jest
-      .fn<Error | undefined, []>()
-      .mockReturnValueOnce(undefined)
-      .mockReturnValue(new Error('server exited during startup'));
-    await expect(
-      waitForArgentToolServerStateAsync({
-        stateDir,
-        ancestorPid: process.ppid,
-        timeoutMs: 100,
-        pollIntervalMs: 1,
-        getExitError,
-      })
-    ).rejects.toThrow('server exited during startup');
-    expect(getExitError).toHaveBeenCalledTimes(2);
-  });
-
   it.each(['tool-server.json', 'tool-server-012345abcdef.json'])(
     'reads a matching process from %s',
     async fileName => {

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

@@ -1,8 +1,7 @@
 import { type bunyan } from '@expo/logger';
-import { BuildRuntimePlatform, type BuildStepContext } from '@expo/steps';
+import { type BuildStepContext } from '@expo/steps';
 import fs from 'node:fs';
 
-import { startAndroidLocalEgressAsync } from '../../utils/androidLocalEgress';
 import {
   LOCAL_EGRESS_HANDOFF_PATH,
   configureSystemProxyAsync,
@@ -21,9 +20,6 @@ jest.mock('../../utils/localEgress', () => ({
   startChiselServerAsync: jest.fn(),
   writeLocalEgressHandoffAsync: jest.fn(),
 }));
-jest.mock('../../utils/androidLocalEgress', () => ({
-  startAndroidLocalEgressAsync: jest.fn(),
-}));
 jest.mock('../../utils/localEgressGuard', () => ({
   stopLocalEgressGuardRelaysAsync: jest.fn().mockResolvedValue(undefined),
 }));
@@ -32,16 +28,10 @@ jest.mock('../../utils/remoteDeviceRunSession', () => ({
   startNgrokTunnelAsync: jest.fn(),
   getNgrokAuthtokenOrThrow: () => 'ngrok-token',
   getNgrokTunnelDomainOrThrow: () => 'example.com',
-  omitNgrokAuthtoken: jest.requireActual('../../utils/remoteDeviceRunSession').omitNgrokAuthtoken,
 }));
 
 const logger = { info: jest.fn(), warn: jest.fn() } as unknown as bunyan;
-const server = {
-  pid: 12345,
-  getOutput: () => '',
-  getExitError: () => undefined,
-  stopAsync: jest.fn(),
-};
+const server = { pid: 12345, getOutput: () => '', stopAsync: jest.fn() };
 const tunnel = {
   url: 'https://egress.example.com',
   subdomainId: 'egress-id',
@@ -57,82 +47,6 @@ async function start(signal?: AbortSignal): Promise<void> {
   });
 }
 
-async function startOn(runtimePlatform: BuildRuntimePlatform): Promise<void> {
-  await createStartLocalEgressBuildFunction().fn!(
-    { logger, global: { runtimePlatform } } as unknown as BuildStepContext,
-    {
-      env: {},
-      inputs: {},
-      outputs: {},
-    } as any
-  );
-}
-
-describe('local egress platforms', () => {
-  const androidStop = jest.fn();
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    jest.spyOn(fs.promises, 'mkdtemp').mockResolvedValue('/tmp/egress-acquisition-test');
-    jest.spyOn(fs.promises, 'writeFile').mockResolvedValue(undefined);
-    jest.spyOn(fs.promises, 'rm').mockResolvedValue(undefined);
-    server.stopAsync.mockResolvedValue(undefined);
-    tunnel.stopAsync.mockResolvedValue(undefined);
-    androidStop.mockResolvedValue(undefined);
-    jest.mocked(findAvailablePortAsync).mockResolvedValue(52001);
-    jest.mocked(downloadChiselAsync).mockResolvedValue('/tmp/egress-acquisition-test/chisel');
-    jest.mocked(startChiselServerAsync).mockResolvedValue({ process: server, fingerprint: 'key=' });
-    jest.mocked(startNgrokTunnelAsync).mockResolvedValue(tunnel);
-    jest.mocked(configureSystemProxyAsync).mockResolvedValue({ service: 'Ethernet' });
-    jest.mocked(writeLocalEgressHandoffAsync).mockResolvedValue(undefined);
-    jest.mocked(startAndroidLocalEgressAsync).mockResolvedValue({ stopAsync: androidStop });
-  });
-
-  afterEach(async () => {
-    await stopLocalEgressResourcesAsync(logger);
-    jest.restoreAllMocks();
-  });
-
-  it('sets the macOS system proxy and writes the same handoff as before', async () => {
-    await startOn(BuildRuntimePlatform.DARWIN);
-    expect(configureSystemProxyAsync).toHaveBeenCalled();
-    expect(startAndroidLocalEgressAsync).not.toHaveBeenCalled();
-    expect(writeLocalEgressHandoffAsync).toHaveBeenCalledWith({
-      url: tunnel.url,
-      token: expect.any(String),
-      fingerprint: 'key=',
-      port: 8899,
-    });
-  });
-
-  it('starts the Android relay and fence on Linux instead of the system proxy', async () => {
-    await startOn(BuildRuntimePlatform.LINUX);
-    expect(configureSystemProxyAsync).not.toHaveBeenCalled();
-    expect(startAndroidLocalEgressAsync).toHaveBeenCalledWith(
-      expect.objectContaining({
-        chiselPid: server.pid,
-        proxyPort: 8899,
-        controlPort: 52001,
-        workDir: '/tmp/egress-acquisition-test',
-      })
-    );
-    expect(writeLocalEgressHandoffAsync).toHaveBeenCalledWith(
-      expect.objectContaining({ platform: 'android' })
-    );
-    await stopLocalEgressResourcesAsync(logger);
-    expect(androidStop).toHaveBeenCalledTimes(1);
-    expect(server.stopAsync).toHaveBeenCalledTimes(1);
-  });
-
-  it('releases the tunnel when the Android fence cannot start', async () => {
-    jest.mocked(startAndroidLocalEgressAsync).mockRejectedValue(new Error('nft failed'));
-    await expect(startOn(BuildRuntimePlatform.LINUX)).rejects.toThrow('nft failed');
-    expect(server.stopAsync).toHaveBeenCalledTimes(1);
-    expect(tunnel.stopAsync).toHaveBeenCalledTimes(1);
-    expect(writeLocalEgressHandoffAsync).not.toHaveBeenCalled();
-  });
-});
-
 describe('local egress acquisition', () => {
   beforeEach(() => {
     jest.clearAllMocks();