feat(simulator): expose topic commands

2026-11-14 10:08:06 -10:00 · 2026-05-20 16:24:09 +02:00
225 changed files with 3091 additions and 26118 deletions
@@ -12,9 +12,9 @@ jobs:
      contents: read
      pull-requests: write
    steps:
-      # Pinned to a commit SHA (not a tag or branch) because this runs under
-      # pull_request_target with a write-scoped token — a re-pointed tag or
-      # moving branch would allow unreviewed upstream code to run here.
-      - uses: tobyhs/codemention@ebac5877393ab8693fd73b42708c8552043e9a3b # post-v1.5.2
+      # Pinned to a commit SHA (not the v1.4.0 tag) because this runs under
+      # pull_request_target with a write-scoped token — a re-pointed tag from
+      # a compromised upstream account would give the attacker repo write access.
+      - uses: tobyhs/codemention@bb6bfb2c3ff1e6fee7ee37006bbee6d114057225 # v1.4.0
        with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
@@ -5,6 +5,5 @@
    "**/*.code-search": true,
    "**/src/**/build/**": false,
    "**/src/build/**": false,
-  },
-  "js/ts.tsdk.path": "node_modules/typescript/lib"
+  }
 }
@@ -8,109 +8,10 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

- [eas-cli] `eas integrations:posthog:connect` now supports existing PostHog user connection. ([#3895](https://github.com/expo/eas-cli/pull/3895) by [@gwdp](https://github.com/gwdp))
-
 ### 🐛 Bug fixes

 ### 🧹 Chores

-## [20.4.0](https://github.com/expo/eas-cli/releases/tag/v20.4.0) - 2026-06-25
-
-### 🎉 New features
-
- [eas-cli] New command `observe:session` for inspecting events by session ID. ([#3868](https://github.com/expo/eas-cli/pull/3868) by [@douglowder](https://github.com/douglowder))
- [eas-cli] Add tiered build-credit usage warnings (approaching/at/over) before each build, lowering the warning threshold to 80% to match email notifications. ([#3882](https://github.com/expo/eas-cli/pull/3882) by [@sarahlane8](https://github.com/sarahlane8))
-
-### 🐛 Bug fixes
-
- [eas-cli] Fix `eas update --channel` failing with "Channel has no branches associated with it" when the channel was auto-created by a build. A branch with the channel's name is now created and linked, matching the behavior for a channel that doesn't exist yet. ([#3891](https://github.com/expo/eas-cli/pull/3891) by [@gwdp](https://github.com/gwdp))
-
-## [20.3.0](https://github.com/expo/eas-cli/releases/tag/v20.3.0) - 2026-06-18
-
-### 🎉 New features
-
- [eas-cli] Add `eas account:audit [ACCOUNT_NAME]` command to view an account's audit logs. ([#3863](https://github.com/expo/eas-cli/pull/3863) by [@keith-kurak](https://github.com/keith-kurak))
- [eas-cli] `eas update:view [GROUP_ID]` now also accepts a platform-specific update ID, resolving it to and displaying its update group. ([#3864](https://github.com/expo/eas-cli/pull/3864) by [@keith-kurak](https://github.com/keith-kurak))
- [eas-cli] Add `eas integrations:posthog:connect` command. ([#3836](https://github.com/expo/eas-cli/pull/3836) by [@gwdp](https://github.com/gwdp))
- [eas-cli] Add `eas integrations:posthog:dashboard` command. ([#3837](https://github.com/expo/eas-cli/pull/3837) by [@gwdp](https://github.com/gwdp))
- [eas-cli] Add `eas integrations:posthog:disconnect` command. ([#3838](https://github.com/expo/eas-cli/pull/3838) by [@gwdp](https://github.com/gwdp))
-
-### 🐛 Bug fixes
-
- [eas-cli] `eas integrations:posthog:connect` no longer aborts when `npx expo install` reports an error (for example, on a dynamic app config); it finishes writing the environment variables and prints any remaining manual steps. ([#3877](https://github.com/expo/eas-cli/pull/3877) by [@gwdp](https://github.com/gwdp))
-
-### 🧹 Chores
-
- [eas-cli] Sync new app agent templates from `expo/llm-configs` before publishing. ([#3865](https://github.com/expo/eas-cli/pull/3865) by [@davidmokos](https://github.com/davidmokos))
- [eas-cli] Simplify 2FA now that SMS is no longer supported. ([#3859](https://github.com/expo/eas-cli/pull/3859) by [@wschurman](https://github.com/wschurman))
-
-## [20.2.0](https://github.com/expo/eas-cli/releases/tag/v20.2.0) - 2026-06-15
-
-### 🎉 New features
-
- [eas-cli] Non-interactive iOS App Store and Enterprise builds can now use the App Store Connect API key stored in EAS credentials as a submission key to validate and repair provisioning profiles on Apple servers, without requiring `EXPO_ASC_*` environment variables or an interactive Apple login. ([#3805](https://github.com/expo/eas-cli/pull/3805) by [@sswrk](https://github.com/sswrk))
- [eas-cli] Add support for non-interactive `eas update:rollback [GROUP_ID]`. The given update group must be the latest for its branch and runtime version; the previous update group is republished, or a roll back to the embedded update is published if there is none. ([#3825](https://github.com/expo/eas-cli/pull/3825) by [@quinlanj](https://github.com/quinlanj))
-
-### 🐛 Bug fixes
-
- [expo-cocoapods-proxy] Fix iOS worker tarball build failing on macOS Tahoe due to bundler incompatibility with RubyGems 4. ([#3824](https://github.com/expo/eas-cli/pull/3824) by [@gwdp](https://github.com/gwdp))
- [eas-cli] Fix `update:embedded` topic showing the `update:embedded:delete` subcommand description in the command listing. ([#3866](https://github.com/expo/eas-cli/pull/3866) by [@jc-expo](https://github.com/jc-expo))
-
-## [20.1.0](https://github.com/expo/eas-cli/releases/tag/v20.1.0) - 2026-06-05
-
-### 🎉 New features
-
- [eas-cli] Add `eas update:embedded:view` command. ([#3810](https://github.com/expo/eas-cli/pull/3810) by [@gwdp](https://github.com/gwdp))
- [eas-cli] Add `eas update:embedded:list` command. ([#3811](https://github.com/expo/eas-cli/pull/3811) by [@gwdp](https://github.com/gwdp))
- [eas-cli] Add `eas update:embedded:delete` command. ([#3809](https://github.com/expo/eas-cli/pull/3809) by [@gwdp](https://github.com/gwdp))
- [build-tools] Auto-upload embedded bundle after build when `EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE` is set. ([#3767](https://github.com/expo/eas-cli/pull/3767) by [@gwdp](https://github.com/gwdp))
-
-## [20.0.0](https://github.com/expo/eas-cli/releases/tag/v20.0.0) - 2026-05-29
-
-### 🛠 Breaking changes
-
- [eas-cli] Rename observe commands: `observe:logs` → `observe:events` (events emitted via `logEvent`), previous `observe:events` → `observe:metrics` (individual performance metric samples), previous `observe:metrics` → `observe:metrics-summary` (aggregated stats by app version). ([#3778](https://github.com/expo/eas-cli/pull/3778) by [@kadikraman](https://github.com/kadikraman))
-
-### 🎉 New features
-
- [eas-cli] `eas go` now prompts to select an Expo SDK version interactively when `--sdk-version` is not provided. ([#3768](https://github.com/expo/eas-cli/pull/3768) by [@gwdp](https://github.com/gwdp))
- [eas-cli] Add `eas update:embedded:upload` command. ([#3720](https://github.com/expo/eas-cli/pull/3720) by [@gwdp](https://github.com/gwdp))
-
-### 🐛 Bug fixes
-
- [build-tools] Fix `eas/start_ios_simulator` hanging on Xcode 26.4 by writing the readiness screenshot to a temp file instead of `/dev/null`. ([#3794](https://github.com/expo/eas-cli/pull/3794) by [@gwdp](https://github.com/gwdp))
- [build-tools] Disable `apsd` in the iOS Simulator after boot to stop a push-registration log storm that pegs `diagnosticd` CPU for the lifetime of the Simulator. ([#3795](https://github.com/expo/eas-cli/pull/3795) by [@gwdp](https://github.com/gwdp))
-
-## [19.1.0](https://github.com/expo/eas-cli/releases/tag/v19.1.0) - 2026-05-25
-
-### 🎉 New features
-
- [eas-cli] Add `--refresh-ad-hoc-provisioning-profile` flag to refresh managed ad-hoc provisioning profiles from App Store Connect before gathering build credentials in non-interactive mode. ([#3716](https://github.com/expo/eas-cli/pull/3716) by [@sswrk](https://github.com/sswrk))
- [eas-build-job] Add optional `refreshAdHocProvisioningProfile` field to iOS build jobs. ([#3717](https://github.com/expo/eas-cli/pull/3717) by [@sswrk](https://github.com/sswrk))
- [build-tools] Pass `refreshAdHocProvisioningProfile` through `eas build:internal` for git-based integration builds. ([#3770](https://github.com/expo/eas-cli/pull/3770) by [@sswrk](https://github.com/sswrk))
-
-## [19.0.8](https://github.com/expo/eas-cli/releases/tag/v19.0.8) - 2026-05-21
-
-### 🐛 Bug fixes
-
- [eas-cli] `eas go` now pre-selects the SDK version from the current project's `app.json` or `app.config.js` when available. ([#3776](https://github.com/expo/eas-cli/pull/3776) by [@gwdp](https://github.com/gwdp))
-
-## [19.0.7](https://github.com/expo/eas-cli/releases/tag/v19.0.7) - 2026-05-21
-
-## [19.0.6](https://github.com/expo/eas-cli/releases/tag/v19.0.6) - 2026-05-21
-
-### 🐛 Bug fixes
-
- [build-tools] Update the minimum Expo version required for iOS precompiled modules to 55.0.26. ([#3771](https://github.com/expo/eas-cli/pull/3771) by [@chrfalch](https://github.com/chrfalch))
-
-## [19.0.5](https://github.com/expo/eas-cli/releases/tag/v19.0.5) - 2026-05-20
-
-### 🐛 Bug fixes
-
- [eas-cli] Improve Sentry diagnostics for managed iOS entitlements config fallback. ([#3763](https://github.com/expo/eas-cli/pull/3763) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [19.0.4](https://github.com/expo/eas-cli/releases/tag/v19.0.4) - 2026-05-20
-
 ## [19.0.1](https://github.com/expo/eas-cli/releases/tag/v19.0.1) - 2026-05-19

 ### 🐛 Bug fixes
@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
-  "version": "20.5.0",
+  "version": "19.0.1",
  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
@@ -3,6 +3,4 @@ _.path = "./tools/bin"
 MISE_NODE_COREPACK = "true"

 [tools]
-gcloud = "570.0.0"
-jq = "1.8.1"
 node = "20.19.4"
@@ -1,6 +1,6 @@
 {
  "name": "@expo/build-tools",
-  "version": "20.4.0",
+  "version": "19.0.0",
  "bugs": "https://github.com/expo/eas-cli/issues",
  "license": "BUSL-1.1",
  "author": "Expo <[email protected]>",
@@ -37,20 +37,19 @@
  "dependencies": {
    "@expo/config": "55.0.10",
    "@expo/config-plugins": "55.0.7",
-    "@expo/downloader": "20.0.0",
-    "@expo/eas-build-job": "20.1.0",
+    "@expo/downloader": "19.0.0",
+    "@expo/eas-build-job": "19.0.0",
    "@expo/env": "^0.4.0",
-    "@expo/logger": "20.0.0",
+    "@expo/logger": "19.0.0",
    "@expo/package-manager": "1.9.10",
    "@expo/plist": "^0.2.0",
    "@expo/results": "^1.0.0",
    "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "20.1.0",
-    "@expo/template-file": "20.0.0",
-    "@expo/turtle-spawn": "20.0.0",
+    "@expo/steps": "19.0.0",
+    "@expo/template-file": "19.0.0",
+    "@expo/turtle-spawn": "19.0.0",
    "@expo/xcpretty": "^4.3.1",
    "@google-cloud/storage": "^7.11.2",
-    "@ngrok/ngrok": "1.7.0",
    "@sentry/node": "7.77.0",
    "@urql/core": "^6.0.1",
    "bplist-parser": "0.3.2",
@@ -77,7 +76,7 @@
    "zod": "^4.3.5"
  },
  "devDependencies": {
-    "@expo/repack-app": "~0.6.1",
+    "@expo/repack-app": "~0.4.1",
    "@types/fs-extra": "^11.0.4",
    "@types/jest": "^29.5.12",
    "@types/lodash": "^4.17.4",
@@ -22,13 +22,13 @@ describe('Datadog singleton', () => {
    Datadog.setup(null);
  });

-  it('POSTs distribution metrics to the turtle build metrics endpoint for build targets', () => {
+  it('POSTs distribution metrics to the turtle build metrics endpoint', () => {
    turtleFetchMock.mockResolvedValueOnce({} as Response);

    Datadog.setup({
      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
+      turtleBuildId: 'build-id',
      robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
    });

    Datadog.distribution('eas.build.phase_duration', 1234, {
@@ -51,7 +51,6 @@ describe('Datadog singleton', () => {
                build_phase: 'install_dependencies',
                platform: 'ios',
                result: 'success',
-                target: 'build',
              },
            },
          ],
@@ -62,121 +61,20 @@ describe('Datadog singleton', () => {
    );
  });

-  it('POSTs distribution metrics to the turtle job run metrics endpoint for jobRun targets', () => {
-    turtleFetchMock.mockResolvedValueOnce({} as Response);
-
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'jobRun', turtleJobRunId: 'job-run-id' },
-    });
-
-    Datadog.distribution('eas.maestro.install', 1, {
-      maestro_version: '2.1.0',
-    });
-
-    expect(turtleFetchMock).toHaveBeenCalledWith(
-      'https://api.expo.test/v2/turtle-job-runs/job-run-id/metrics',
-      'POST',
-      {
-        json: {
-          metrics: [
-            {
-              name: 'eas.maestro.install',
-              type: 'distribution',
-              value: 1,
-              tags: {
-                maestro_version: '2.1.0',
-                target: 'job_run',
-              },
-            },
-          ],
-        },
-        headers: { Authorization: 'Bearer token-abc' },
-        retries: 2,
-      }
-    );
-  });
-
-  it('POSTs logs to the turtle build logs endpoint with buildId for build targets', () => {
-    turtleFetchMock.mockResolvedValueOnce({} as Response);
-
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
-    });
-
-    Datadog.log('artifact dry-run matched', {
-      event: 'find_artifacts_absolute_path_dry_run',
-      status: 'match',
-    });
-
-    expect(turtleFetchMock).toHaveBeenCalledWith(
-      'https://api.expo.test/v2/turtle-builds/logs',
-      'POST',
-      {
-        json: {
-          buildId: 'build-id',
-          message: 'artifact dry-run matched',
-          tags: {
-            event: 'find_artifacts_absolute_path_dry_run',
-            status: 'match',
-            target: 'build',
-          },
-        },
-        headers: { Authorization: 'Bearer token-abc' },
-        shouldThrowOnNotOk: false,
-      }
-    );
-  });
-
-  it('POSTs logs to the turtle job run logs endpoint with jobRunId for jobRun targets', () => {
-    turtleFetchMock.mockResolvedValueOnce({} as Response);
-
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'jobRun', turtleJobRunId: 'job-run-id' },
-    });
-
-    Datadog.log('Gradle cache restored (hit)', {
-      cache_type: 'gradle',
-    });
-
-    expect(turtleFetchMock).toHaveBeenCalledWith(
-      'https://api.expo.test/v2/turtle-job-runs/logs',
-      'POST',
-      {
-        json: {
-          jobRunId: 'job-run-id',
-          message: 'Gradle cache restored (hit)',
-          tags: {
-            cache_type: 'gradle',
-            target: 'job_run',
-          },
-        },
-        headers: { Authorization: 'Bearer token-abc' },
-        shouldThrowOnNotOk: false,
-      }
-    );
-  });
-
  it('is a no-op when setup is null', () => {
    Datadog.setup(null);

    Datadog.distribution('eas.build.phase_duration', 1);
-    Datadog.log('artifact dry-run matched');

    expect(turtleFetchMock).not.toHaveBeenCalled();
  });

-  it('swallows metric upload failures for build targets', async () => {
+  it('swallows upload failures', async () => {
    turtleFetchMock.mockRejectedValueOnce(new Error('network down'));
    Datadog.setup({
      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
+      turtleBuildId: 'build-id',
      robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
    });

    Datadog.distribution('eas.build.phase_duration', 1);
@@ -188,96 +86,7 @@ describe('Datadog singleton', () => {
      expect.any(Error),
      expect.objectContaining({
        extras: {
-          metrics: [
-            {
-              name: 'eas.build.phase_duration',
-              type: 'distribution',
-              value: 1,
-              tags: { target: 'build' },
-            },
-          ],
-        },
-      })
-    );
-  });
-
-  it('labels metric upload failures for jobRun targets with the jobRun kind', async () => {
-    turtleFetchMock.mockRejectedValueOnce(new Error('network down'));
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'jobRun', turtleJobRunId: 'job-run-id' },
-    });
-
-    Datadog.distribution('eas.maestro.install', 1);
-    await flushPromises();
-
-    expect(sentryCaptureMock).toHaveBeenCalledWith(
-      'Failed to report turtle jobRun metric',
-      expect.any(Error),
-      expect.objectContaining({
-        extras: {
-          metrics: [
-            {
-              name: 'eas.maestro.install',
-              type: 'distribution',
-              value: 1,
-              tags: { target: 'job_run' },
-            },
-          ],
-        },
-      })
-    );
-  });
-
-  it('swallows log upload failures for build targets', async () => {
-    turtleFetchMock.mockRejectedValueOnce(new Error('network down'));
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
-    });
-
-    Datadog.log('artifact dry-run matched');
-    await flushPromises();
-
-    expect(turtleFetchMock).toHaveBeenCalled();
-    expect(sentryCaptureMock).toHaveBeenCalledWith(
-      'Failed to report turtle build log',
-      expect.any(Error),
-      expect.objectContaining({
-        extras: {
-          log: {
-            buildId: 'build-id',
-            message: 'artifact dry-run matched',
-            tags: { target: 'build' },
-          },
-        },
-      })
-    );
-  });
-
-  it('labels log upload failures for jobRun targets with the jobRun kind', async () => {
-    turtleFetchMock.mockRejectedValueOnce(new Error('network down'));
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'jobRun', turtleJobRunId: 'job-run-id' },
-    });
-
-    Datadog.log('Gradle cache restored (hit)');
-    await flushPromises();
-
-    expect(sentryCaptureMock).toHaveBeenCalledWith(
-      'Failed to report turtle jobRun log',
-      expect.any(Error),
-      expect.objectContaining({
-        extras: {
-          log: {
-            jobRunId: 'job-run-id',
-            message: 'Gradle cache restored (hit)',
-            tags: { target: 'job_run' },
-          },
+          metrics: [{ name: 'eas.build.phase_duration', type: 'distribution', value: 1, tags: {} }],
        },
      })
    );
@@ -288,29 +97,19 @@ describe('Datadog singleton', () => {

    Datadog.setup({
      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
+      turtleBuildId: 'first-build-id',
      robotAccessToken: 'first-token',
-      target: { kind: 'build', turtleBuildId: 'first-build-id' },
    });
    Datadog.setup({
      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
+      turtleBuildId: 'second-build-id',
      robotAccessToken: 'second-token',
-      target: { kind: 'jobRun', turtleJobRunId: 'job-run-id' },
    });

    Datadog.distribution('eas.build.phase_duration', 1);
-    Datadog.log('artifact dry-run matched');

-    expect(turtleFetchMock).toHaveBeenNthCalledWith(
-      1,
-      'https://api.expo.test/v2/turtle-job-runs/job-run-id/metrics',
-      'POST',
-      expect.objectContaining({
-        headers: { Authorization: 'Bearer second-token' },
-      })
-    );
-    expect(turtleFetchMock).toHaveBeenNthCalledWith(
-      2,
-      'https://api.expo.test/v2/turtle-job-runs/logs',
+    expect(turtleFetchMock).toHaveBeenCalledWith(
+      'https://api.expo.test/v2/turtle-builds/second-build-id/metrics',
      'POST',
      expect.objectContaining({
        headers: { Authorization: 'Bearer second-token' },
@@ -327,8 +126,8 @@ describe('Datadog singleton', () => {
    );
    Datadog.setup({
      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
+      turtleBuildId: 'build-id',
      robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
    });

    let flushed = false;
@@ -344,62 +143,6 @@ describe('Datadog singleton', () => {

    expect(flushed).toBe(true);
  });
-
-  it('flushes pending log uploads', async () => {
-    let resolveUpload!: (response: Response) => void;
-    turtleFetchMock.mockReturnValueOnce(
-      new Promise<Response>(resolve => {
-        resolveUpload = resolve;
-      })
-    );
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
-    });
-
-    let flushed = false;
-    Datadog.log('artifact dry-run matched');
-    const flushPromise = Datadog.flushAsync().then(() => {
-      flushed = true;
-    });
-    await Promise.resolve();
-    expect(flushed).toBe(false);
-
-    resolveUpload({} as Response);
-    await flushPromise;
-
-    expect(flushed).toBe(true);
-  });
-
-  it('only awaits uploads enqueued since the previous flush', async () => {
-    let resolveSecondUpload!: (response: Response) => void;
-    turtleFetchMock.mockReturnValueOnce(new Promise<Response>(() => {})).mockReturnValueOnce(
-      new Promise<Response>(resolve => {
-        resolveSecondUpload = resolve;
-      })
-    );
-    Datadog.setup({
-      expoApiV2BaseUrl: 'https://api.expo.test/v2/',
-      robotAccessToken: 'token-abc',
-      target: { kind: 'build', turtleBuildId: 'build-id' },
-    });
-
-    // The first upload never settles; the first flush rotates it out of the queue.
-    Datadog.distribution('eas.build.phase_duration', 1);
-    void Datadog.flushAsync();
-
-    Datadog.distribution('eas.build.phase_duration', 2);
-    let flushed = false;
-    const flushPromise = Datadog.flushAsync().then(() => {
-      flushed = true;
-    });
-
-    resolveSecondUpload({} as Response);
-    await flushPromise;
-
-    expect(flushed).toBe(true);
-  });
 });

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

-const datadogDistributionMock = jest.spyOn(Datadog, 'distribution');
-
 describe(androidBuilder, () => {
  beforeEach(() => {
-    jest.clearAllMocks();
    vol.fromJSON(
      {
        '/workingdir/env/.gitkeep': '',
@@ -146,6 +138,7 @@ describe(androidBuilder, () => {
  });

  it('marks the configure Android version phase as warning for legacy eas-build.gradle', async () => {
+    const reportBuildPhaseStats = jest.fn();
    const job: Android.Job = {
      ...createTestAndroidJob(),
      secrets: {
@@ -164,23 +157,23 @@ describe(androidBuilder, () => {
        __API_SERVER_URL: 'http://api.expo.test',
      },
      uploadArtifact: jest.fn(),
+      reportBuildPhaseStats,
    });
    vol.mkdirSync('/workingdir/build/android/app', { recursive: true });
    vol.writeFileSync('/workingdir/build/android/app/eas-build.gradle', '// Legacy content');

    await androidBuilder(ctx);

-    expect(datadogDistributionMock).toHaveBeenCalledWith(
-      'eas.build.phase_duration',
-      expect.any(Number),
+    expect(reportBuildPhaseStats).toHaveBeenCalledWith(
      expect.objectContaining({
-        build_phase: BuildPhase.CONFIGURE_ANDROID_VERSION.toLowerCase(),
+        buildPhase: BuildPhase.CONFIGURE_ANDROID_VERSION,
        result: BuildPhaseResult.WARNING,
      })
    );
  });

  it('marks the prepare credentials phase as warning for legacy eas-build.gradle', async () => {
+    const reportBuildPhaseStats = jest.fn();
    const ctx = new BuildContext(createTestAndroidJob(), {
      workingdir: '/workingdir',
      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
@@ -189,23 +182,23 @@ describe(androidBuilder, () => {
        __API_SERVER_URL: 'http://api.expo.test',
      },
      uploadArtifact: jest.fn(),
+      reportBuildPhaseStats,
    });
    vol.mkdirSync('/workingdir/build/android/app', { recursive: true });
    vol.writeFileSync('/workingdir/build/android/app/eas-build.gradle', '// Legacy content');

    await androidBuilder(ctx);

-    expect(datadogDistributionMock).toHaveBeenCalledWith(
-      'eas.build.phase_duration',
-      expect.any(Number),
+    expect(reportBuildPhaseStats).toHaveBeenCalledWith(
      expect.objectContaining({
-        build_phase: BuildPhase.PREPARE_CREDENTIALS.toLowerCase(),
+        buildPhase: BuildPhase.PREPARE_CREDENTIALS,
        result: BuildPhaseResult.WARNING,
      })
    );
  });

  it('injects credentials and version config when both are configured', async () => {
+    const reportBuildPhaseStats = jest.fn();
    const job: Android.Job = {
      ...createTestAndroidJob(),
      version: {
@@ -221,6 +214,7 @@ describe(androidBuilder, () => {
        __API_SERVER_URL: 'http://api.expo.test',
      },
      uploadArtifact: jest.fn(),
+      reportBuildPhaseStats,
    });
    vol.mkdirSync('/workingdir/build/android/app', { recursive: true });
    vol.writeFileSync('/workingdir/build/android/app/eas-build.gradle', '// Legacy content');
@@ -240,19 +234,15 @@ describe(androidBuilder, () => {
        versionName: '1.2.3',
      }
    );
-    expect(datadogDistributionMock).toHaveBeenCalledWith(
-      'eas.build.phase_duration',
-      expect.any(Number),
+    expect(reportBuildPhaseStats).toHaveBeenCalledWith(
      expect.objectContaining({
-        build_phase: BuildPhase.PREPARE_CREDENTIALS.toLowerCase(),
+        buildPhase: BuildPhase.PREPARE_CREDENTIALS,
        result: BuildPhaseResult.WARNING,
      })
    );
-    expect(datadogDistributionMock).toHaveBeenCalledWith(
-      'eas.build.phase_duration',
-      expect.any(Number),
+    expect(reportBuildPhaseStats).toHaveBeenCalledWith(
      expect.objectContaining({
-        build_phase: BuildPhase.CONFIGURE_ANDROID_VERSION.toLowerCase(),
+        buildPhase: BuildPhase.CONFIGURE_ANDROID_VERSION,
        result: BuildPhaseResult.WARNING,
      })
    );
@@ -273,37 +263,4 @@ describe(androidBuilder, () => {

    expect(runBuilderWithHooksAsync).toHaveBeenCalledWith(ctx, expect.any(Function));
  });
-
-  it('runs the embedded bundle upload phase when EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE is set', async () => {
-    const ctx = new BuildContext(createTestAndroidJob(), {
-      workingdir: '/workingdir',
-      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
-      logger: createMockLogger(),
-      env: {
-        __API_SERVER_URL: 'http://api.expo.test',
-        EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE: '1',
-      },
-      uploadArtifact: jest.fn(),
-    });
-
-    await androidBuilder(ctx);
-
-    expect(uploadEmbeddedBundleAsync).toHaveBeenCalledWith(ctx);
-  });
-
-  it('skips the embedded bundle upload phase when EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE is not set', async () => {
-    const ctx = new BuildContext(createTestAndroidJob(), {
-      workingdir: '/workingdir',
-      logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
-      logger: createMockLogger(),
-      env: {
-        __API_SERVER_URL: 'http://api.expo.test',
-      },
-      uploadArtifact: jest.fn(),
-    });
-
-    await androidBuilder(ctx);
-
-    expect(uploadEmbeddedBundleAsync).not.toHaveBeenCalled();
-  });
 });
@@ -7,7 +7,6 @@ import { createMockLogger } from '../../__tests__/utils/logger';
 import { prepareProjectSourcesAsync } from '../../common/projectSources';
 import { BuildContext } from '../../context';
 import { CustomBuildContext } from '../../customBuildContext';
-import { Datadog } from '../../datadog';
 import { findAndUploadXcodeBuildLogsAsync } from '../../ios/xcodeBuildLogs';
 import { runCustomBuildAsync } from '../custom';

@@ -18,7 +17,6 @@ const findAndUploadXcodeBuildLogsAsyncMock = jest.mocked(findAndUploadXcodeBuild

 describe(runCustomBuildAsync, () => {
  let ctx: BuildContext<BuildJob>;
-  const datadogLogSpy = jest.spyOn(Datadog, 'log');

  beforeEach(() => {
    const job = createTestIosJob();
@@ -29,24 +27,10 @@ describe(runCustomBuildAsync, () => {
      vol.fromJSON(
        {
          'test.yaml': `
-          functions:
-            test_function:
-              name: Test function
-              path: ./custom-function
-              shell: /bin/zsh
-              supported_platforms:
-                - darwin
-                - linux
-              inputs:
-                - name
-                - profile
-              outputs:
-                - artifact_path
          build:
            steps:
              - eas/checkout
          `,
-          'custom-function/package.json': '{}',
        },
        '/workingdir/temporary-custom-build'
      );
@@ -93,21 +77,6 @@ describe(runCustomBuildAsync, () => {
    expect(prepareProjectSourcesAsync).toHaveBeenCalledTimes(2);
  });

-  it('reports user-provided custom functions when parsing the custom build config', async () => {
-    await runCustomBuildAsync(ctx);
-
-    expect(datadogLogSpy).toHaveBeenCalledWith('Custom build saw user-provided function', {
-      event: 'custom_build_user_provided_function',
-      custom_function_id: 'test_function',
-      custom_function_input_count: '2',
-      custom_function_module_path: '/workingdir/temporary-custom-build/custom-function',
-      custom_function_name: 'Test function',
-      custom_function_output_count: '1',
-      custom_function_shell: '/bin/zsh',
-      custom_function_supported_runtime_platforms: 'darwin,linux',
-    });
-  });
-
  it('awaits drainPendingMetricUploads after workflow execution', async () => {
    let resolveDrain!: () => void;
    const drainSpy = jest
@@ -10,8 +10,6 @@ import {
  resolveGradleCommand,
  runGradleCommand,
 } from '../android/gradle';
-import { parseGradleProfile, formatGradleProfileReport } from '../android/gradleProfile';
-import { Sentry } from '../sentry';
 import { eagerBundleAsync, shouldUseEagerBundle } from '../common/eagerBundle';
 import { prebuildAsync } from '../common/prebuild';
 import { setupAsync } from '../common/setup';
@@ -32,7 +30,6 @@ import {
  configureExpoUpdatesIfInstalledAsync,
  resolveRuntimeVersionForExpoUpdatesIfConfiguredAsync,
 } from '../utils/expoUpdates';
-import { uploadEmbeddedBundleAsync } from '../utils/expoUpdatesEmbedded';
 import { Hook, runHookIfPresent } from '../utils/hooks';
 import { prepareExecutableAsync } from '../utils/prepareBuildExecutable';

@@ -183,20 +180,6 @@ async function buildAsync(ctx: BuildContext<Android.Job>): Promise<void> {
    });
  });

-  await ctx.runBuildPhase(BuildPhase.GRADLE_BUILD_PROFILE, async () => {
-    try {
-      const androidDir = path.join(ctx.getReactNativeProjectDirectory(), 'android');
-      const profileTasks = await parseGradleProfile(androidDir);
-      if (profileTasks.length > 0) {
-        const report = formatGradleProfileReport(profileTasks);
-        ctx.logger.info(report);
-      }
-    } catch (err: any) {
-      Sentry.capture('Failed to parse Gradle build profile', err);
-      ctx.markBuildPhaseSkipped();
-    }
-  });
-
  await ctx.runBuildPhase(BuildPhase.PRE_UPLOAD_ARTIFACTS_HOOK, async () => {
    await runHookIfPresent(ctx, Hook.PRE_UPLOAD_ARTIFACTS);
  });
@@ -209,12 +192,6 @@ async function buildAsync(ctx: BuildContext<Android.Job>): Promise<void> {
    });
  });

-  if (ctx.env.EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE) {
-    await ctx.runBuildPhase(BuildPhase.UPLOAD_EMBEDDED_BUNDLE, async () => {
-      await uploadEmbeddedBundleAsync(ctx);
-    });
-  }
-
  await ctx.runBuildPhase(BuildPhase.SAVE_CACHE, async () => {
    if (ctx.isLocal) {
      ctx.logger.info('Local builds do not support saving cache.');
@@ -1,11 +1,5 @@
 import { BuildJob, BuildPhase, BuildTrigger, Ios, Platform } from '@expo/eas-build-job';
-import {
-  BuildConfigParser,
-  BuildStepGlobalContext,
-  BuildWorkflow,
-  StepsConfigParser,
-  errors,
-} from '@expo/steps';
+import { BuildConfigParser, BuildStepGlobalContext, StepsConfigParser, errors } from '@expo/steps';
 import assert from 'assert';
 import fs from 'fs/promises';
 import nullthrows from 'nullthrows';
@@ -15,7 +9,6 @@ import { resolveEnvFromBuildProfileAsync } from '../common/easBuildInternal';
 import { prepareProjectSourcesAsync } from '../common/projectSources';
 import { Artifacts, BuildContext } from '../context';
 import { CustomBuildContext } from '../customBuildContext';
-import { Datadog } from '../datadog';
 import { findAndUploadXcodeBuildLogsAsync } from '../ios/xcodeBuildLogs';
 import { getEasFunctionGroups } from '../steps/easFunctionGroups';
 import { getEasFunctions } from '../steps/easFunctions';
@@ -88,7 +81,6 @@ export async function runCustomBuildAsync(ctx: BuildContext<BuildJob>): Promise<
      throw parseError;
    }
  });
-  logUserProvidedCustomFunctions(workflow);
  try {
    try {
      await workflow.executeAsync();
@@ -111,26 +103,3 @@ export async function runCustomBuildAsync(ctx: BuildContext<BuildJob>): Promise<

  return ctx.artifacts;
 }
-
-function logUserProvidedCustomFunctions(workflow: BuildWorkflow): void {
-  for (const buildFunction of Object.values(workflow.buildFunctions)) {
-    if (!buildFunction.customFunctionModulePath) {
-      continue;
-    }
-    Datadog.log('Custom build saw user-provided function', {
-      event: 'custom_build_user_provided_function',
-      custom_function_id: buildFunction.getFullId(),
-      custom_function_module_path: buildFunction.customFunctionModulePath,
-      custom_function_input_count: String(buildFunction.inputProviders?.length ?? 0),
-      custom_function_output_count: String(buildFunction.outputProviders?.length ?? 0),
-      ...(buildFunction.name ? { custom_function_name: buildFunction.name } : {}),
-      ...(buildFunction.shell ? { custom_function_shell: buildFunction.shell } : {}),
-      ...(buildFunction.supportedRuntimePlatforms
-        ? {
-            custom_function_supported_runtime_platforms:
-              buildFunction.supportedRuntimePlatforms.join(','),
-          }
-        : {}),
-    });
-  }
-}
@@ -25,7 +25,6 @@ import {
  configureExpoUpdatesIfInstalledAsync,
  resolveRuntimeVersionForExpoUpdatesIfConfiguredAsync,
 } from '../utils/expoUpdates';
-import { uploadEmbeddedBundleAsync } from '../utils/expoUpdatesEmbedded';
 import { Hook, runHookIfPresent } from '../utils/hooks';
 import { prepareExecutableAsync } from '../utils/prepareBuildExecutable';
 import { getParentAndDescendantProcessPidsAsync } from '../utils/processes';
@@ -182,16 +181,13 @@ async function buildAsync(ctx: BuildContext<Ios.Job>): Promise<void> {
    }
    try {
      const { derivedDataPath, workspacePath } = nullthrows(fastlaneResult);
-      const { skipped } = await parseAndReportXcactivitylog({
+      await parseAndReportXcactivitylog({
        derivedDataPath,
        workspacePath,
        logger: ctx.logger,
        proxyBaseUrl: ctx.env.EAS_BUILD_COCOAPODS_CACHE_URL,
        env: ctx.env,
      });
-      if (skipped) {
-        ctx.markBuildPhaseSkipped();
-      }
    } catch (err: any) {
      Sentry.capture('Failed to parse xcactivitylog', err);
      ctx.markBuildPhaseSkipped();
@@ -210,12 +206,6 @@ async function buildAsync(ctx: BuildContext<Ios.Job>): Promise<void> {
    });
  });

-  if (ctx.env.EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE) {
-    await ctx.runBuildPhase(BuildPhase.UPLOAD_EMBEDDED_BUNDLE, async () => {
-      await uploadEmbeddedBundleAsync(ctx);
-    });
-  }
-
  await ctx.runBuildPhase(BuildPhase.SAVE_CACHE, async () => {
    if (ctx.isLocal) {
      ctx.logger.info('Local builds do not support saving cache.');
@@ -1,4 +1,4 @@
-import { ArchiveSourceType, BuildJob, Platform, Workflow } from '@expo/eas-build-job';
+import { BuildJob } from '@expo/eas-build-job';
 import spawn from '@expo/turtle-spawn';

 import { resolveEnvFromBuildProfileAsync, runEasBuildInternalAsync } from '../easBuildInternal';
@@ -15,7 +15,7 @@ jest.mock('../../utils/easCli', () => ({

 describe('easBuildInternal', () => {
  beforeEach(() => {
-    jest.clearAllMocks();
+    jest.resetAllMocks();
    jest.mocked(resolveEasCommandPrefixAndEnvAsync).mockResolvedValue({
      cmd: 'npx',
      args: ['-y', 'eas-cli@latest'],
@@ -69,131 +69,4 @@ describe('easBuildInternal', () => {
    expect(resolveEasCommandPrefixAndEnvAsync).toHaveBeenCalledWith();
    expect(spawn).not.toHaveBeenCalled();
  });
-
-  it('passes --refresh-ad-hoc-provisioning-profile to build:internal for iOS jobs with refreshAdHocProvisioningProfile', async () => {
-    const logger = {
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-      child: jest.fn(),
-    } as any;
-
-    const internalJob = {
-      platform: Platform.IOS,
-      type: Workflow.GENERIC,
-      triggeredBy: 'EAS_CLI',
-      projectArchive: { type: ArchiveSourceType.URL, url: 'https://example.com' },
-      projectRootDirectory: '.',
-      secrets: {
-        buildCredentials: {
-          testapp: {
-            distributionCertificate: {
-              dataBase64: 'YmluYXJ5Y29udGVudDE=',
-              password: 'distCertPassword',
-            },
-            provisioningProfileBase64: 'MnRuZXRub2N5cmFuaWI=',
-          },
-        },
-      },
-      initiatingUserId: 'user-id',
-      appId: 'app-id',
-    };
-
-    jest.mocked(spawn).mockResolvedValue({
-      stdout: Buffer.from(
-        JSON.stringify({
-          job: internalJob,
-          metadata: {},
-        })
-      ),
-      stderr: Buffer.from(''),
-    } as any);
-
-    const job = {
-      platform: Platform.IOS,
-      buildProfile: 'preview',
-      refreshAdHocProvisioningProfile: true,
-      appId: 'app-id',
-      initiatingUserId: 'user-id',
-      secrets: { robotAccessToken: 'token' },
-    } as unknown as BuildJob;
-
-    await runEasBuildInternalAsync({
-      job,
-      logger,
-      env: {},
-      cwd: '/tmp/project',
-    });
-
-    expect(spawn).toHaveBeenCalledWith(
-      'npx',
-      expect.arrayContaining([
-        'build:internal',
-        '--platform',
-        Platform.IOS,
-        '--profile',
-        'preview',
-        '--refresh-ad-hoc-provisioning-profile',
-      ]),
-      expect.any(Object)
-    );
-  });
-
-  it('preserves refreshAdHocProvisioningProfile from the incoming job', async () => {
-    const logger = {
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-      child: jest.fn(),
-    } as any;
-
-    const internalJob = {
-      platform: Platform.IOS,
-      type: Workflow.GENERIC,
-      triggeredBy: 'EAS_CLI',
-      projectArchive: { type: ArchiveSourceType.URL, url: 'https://example.com' },
-      projectRootDirectory: '.',
-      secrets: {
-        buildCredentials: {
-          testapp: {
-            distributionCertificate: {
-              dataBase64: 'YmluYXJ5Y29udGVudDE=',
-              password: 'distCertPassword',
-            },
-            provisioningProfileBase64: 'MnRuZXRub2N5cmFuaWI=',
-          },
-        },
-      },
-      initiatingUserId: 'user-id',
-      appId: 'app-id',
-    };
-
-    jest.mocked(spawn).mockResolvedValue({
-      stdout: Buffer.from(
-        JSON.stringify({
-          job: internalJob,
-          metadata: {},
-        })
-      ),
-      stderr: Buffer.from(''),
-    } as any);
-
-    const job = {
-      platform: Platform.IOS,
-      buildProfile: 'preview',
-      refreshAdHocProvisioningProfile: true,
-      appId: 'app-id',
-      initiatingUserId: 'user-id',
-      secrets: { robotAccessToken: 'token' },
-    } as unknown as BuildJob;
-
-    const { newJob } = await runEasBuildInternalAsync({
-      job,
-      logger,
-      env: {},
-      cwd: '/tmp/project',
-    });
-
-    expect((newJob as any).refreshAdHocProvisioningProfile).toBe(true);
-  });
 });
@@ -1,222 +0,0 @@
-import spawn, { SpawnPromise, SpawnResult } from '@expo/turtle-spawn';
-
-import { createMockLogger } from '../../__tests__/utils/logger';
-import { Sentry } from '../../sentry';
-import { PackageManager } from '../../utils/packageManager';
-import { installDependenciesWithNpmCacheFallbackAsync } from '../installDependencies';
-
-jest.mock('@expo/turtle-spawn', () => jest.fn());
-jest.mock('../../sentry', () => ({
-  Sentry: {
-    capture: jest.fn(),
-  },
-}));
-
-describe(installDependenciesWithNpmCacheFallbackAsync, () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('retries without NPM_CONFIG_REGISTRY when npm cache install fails', async () => {
-    const logger = createMockLogger();
-    const npmCacheUrl = 'http://npm.staging.caches.eas-build.internal';
-    const error = Object.assign(
-      new Error('npm install --include=dev exited with non-zero code: 1'),
-      {
-        status: 1,
-        signal: null,
-        stdout: '',
-        stderr: `npm error request to ${npmCacheUrl}/left-pad failed, reason: getaddrinfo ENOTFOUND npm.staging.caches.eas-build.internal`,
-      }
-    );
-
-    jest
-      .mocked(spawn)
-      .mockReturnValueOnce(createSpawnPromise(Promise.reject(error)))
-      .mockReturnValueOnce(createSpawnPromise(Promise.resolve(createSpawnResult())));
-
-    await installDependenciesWithNpmCacheFallbackAsync({
-      packageManager: PackageManager.NPM,
-      env: {
-        EAS_VERBOSE: '1',
-        EAS_USE_NPM_CACHE: '1',
-        NPM_CONFIG_REGISTRY: npmCacheUrl,
-      },
-      logger,
-      cwd: '/tmp/build',
-      useFrozenLockfile: false,
-    });
-
-    expect(spawn).toHaveBeenCalledTimes(2);
-    expect(spawn).toHaveBeenNthCalledWith(1, 'npm', ['install', '--include=dev', '--verbose'], {
-      cwd: '/tmp/build',
-      logger,
-      infoCallbackFn: undefined,
-      lineTransformer: expect.any(Function),
-      env: {
-        EAS_VERBOSE: '1',
-        EAS_USE_NPM_CACHE: '1',
-        NPM_CONFIG_REGISTRY: npmCacheUrl,
-      },
-    });
-    expect(spawn).toHaveBeenNthCalledWith(2, 'npm', ['install', '--include=dev', '--verbose'], {
-      cwd: '/tmp/build',
-      logger,
-      infoCallbackFn: undefined,
-      env: {
-        EAS_VERBOSE: '1',
-        EAS_USE_NPM_CACHE: '1',
-      },
-    });
-    expect(logger.warn).toHaveBeenCalledWith(
-      `Failed to install dependencies using the npm cache registry (${npmCacheUrl}). Retrying without the npm cache registry.`
-    );
-    expect(Sentry.capture).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: 'Failed to install dependencies using npm cache registry',
-        name: 'NpmCacheRegistryInstallError',
-      }),
-      {
-        level: 'warning',
-        tags: {
-          packageManager: 'npm',
-        },
-        extras: {
-          cwd: '/tmp/build',
-          npmCacheUrl,
-          useFrozenLockfile: false,
-          originalErrorMessage: 'npm install --include=dev exited with non-zero code: 1',
-          status: 1,
-          signal: null,
-        },
-      }
-    );
-  });
-
-  it('reports non-fatal npm cache registry errors from successful installs', async () => {
-    const logger = createMockLogger();
-    const npmCacheUrl = 'http://npm.staging.caches.eas-build.internal';
-    const auditErrorLine = `npm verbose audit error FetchError: request to ${npmCacheUrl}/-/npm/v1/security/advisories/bulk failed, reason: getaddrinfo ENOTFOUND npm.staging.caches.eas-build.internal`;
-
-    jest.mocked(spawn).mockImplementationOnce((_command, _args, options: any) => {
-      options.lineTransformer(auditErrorLine);
-      options.lineTransformer(
-        `npm http cache left-pad@${npmCacheUrl}/left-pad/-/left-pad-1.3.0.tgz 0ms (cache hit)`
-      );
-      return createSpawnPromise(Promise.resolve(createSpawnResult()));
-    });
-
-    await installDependenciesWithNpmCacheFallbackAsync({
-      packageManager: PackageManager.NPM,
-      env: {
-        EAS_USE_NPM_CACHE: '1',
-        NPM_CONFIG_REGISTRY: npmCacheUrl,
-      },
-      logger,
-      cwd: '/tmp/build',
-      useFrozenLockfile: false,
-    });
-
-    expect(spawn).toHaveBeenCalledTimes(1);
-    expect(Sentry.capture).toHaveBeenCalledWith(
-      expect.objectContaining({
-        message: 'Non-fatal npm cache registry error during dependency install',
-        name: 'NpmCacheRegistryNonFatalError',
-      }),
-      {
-        level: 'warning',
-        tags: {
-          packageManager: 'npm',
-        },
-        extras: {
-          cwd: '/tmp/build',
-          npmCacheUrl,
-          useFrozenLockfile: false,
-          firstErrorLine: auditErrorLine,
-          errorLineCount: 1,
-        },
-      }
-    );
-  });
-
-  it('does not retry when install failure does not reference npm cache registry', async () => {
-    const logger = createMockLogger();
-    const error = Object.assign(
-      new Error('npm install --include=dev exited with non-zero code: 1'),
-      {
-        status: 1,
-        signal: null,
-        stdout: '',
-        stderr: 'npm error command sh -c node postinstall.js',
-      }
-    );
-
-    jest.mocked(spawn).mockReturnValueOnce(createSpawnPromise(Promise.reject(error)));
-
-    await expect(
-      installDependenciesWithNpmCacheFallbackAsync({
-        packageManager: PackageManager.NPM,
-        env: {
-          EAS_USE_NPM_CACHE: '1',
-          NPM_CONFIG_REGISTRY: 'http://npm.staging.caches.eas-build.internal',
-        },
-        logger,
-        cwd: '/tmp/build',
-        useFrozenLockfile: false,
-      })
-    ).rejects.toThrow(error);
-
-    expect(spawn).toHaveBeenCalledTimes(1);
-    expect(Sentry.capture).not.toHaveBeenCalled();
-  });
-
-  it('does not retry when EAS_USE_NPM_CACHE is not enabled', async () => {
-    const logger = createMockLogger();
-    const npmCacheUrl = 'http://npm.staging.caches.eas-build.internal';
-    const error = Object.assign(
-      new Error('npm install --include=dev exited with non-zero code: 1'),
-      {
-        status: 1,
-        signal: null,
-        stdout: '',
-        stderr: `npm error request to ${npmCacheUrl}/left-pad failed, reason: getaddrinfo ENOTFOUND npm.staging.caches.eas-build.internal`,
-      }
-    );
-
-    jest.mocked(spawn).mockReturnValueOnce(createSpawnPromise(Promise.reject(error)));
-
-    await expect(
-      installDependenciesWithNpmCacheFallbackAsync({
-        packageManager: PackageManager.NPM,
-        env: {
-          NPM_CONFIG_REGISTRY: npmCacheUrl,
-        },
-        logger,
-        cwd: '/tmp/build',
-        useFrozenLockfile: false,
-      })
-    ).rejects.toThrow(error);
-
-    expect(spawn).toHaveBeenCalledTimes(1);
-    expect(Sentry.capture).not.toHaveBeenCalled();
-  });
-});
-
-function createSpawnPromise(result: Promise<SpawnResult>): SpawnPromise<SpawnResult> {
-  return Object.assign(result, {
-    child: {
-      pid: 123,
-    },
-  }) as SpawnPromise<SpawnResult>;
-}
-
-function createSpawnResult(): SpawnResult {
-  return {
-    pid: 123,
-    output: ['', ''],
-    stdout: '',
-    stderr: '',
-    status: 0,
-    signal: null,
-  };
-}
@@ -1,94 +0,0 @@
-import { EventEmitter } from 'events';
-
-import spawnAsync from '@expo/spawn-async';
-import { ExpoRunFormatter } from '@expo/xcpretty';
-import fg from 'fast-glob';
-
-import { createMockLogger } from '../../__tests__/utils/logger';
-import { Sentry } from '../../sentry';
-import { XcodeBuildLogger } from '../xcpretty';
-
-jest.mock('@expo/spawn-async');
-jest.mock('@expo/xcpretty');
-jest.mock('fast-glob');
-jest.mock('../../sentry', () => ({
-  Sentry: {
-    setup: jest.fn(),
-    capture: jest.fn(),
-    flush: jest.fn(),
-  },
-}));
-
-describe(XcodeBuildLogger, () => {
-  let stdout: EventEmitter;
-  let formatter: { pipe: jest.Mock; getBuildSummary: jest.Mock };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    stdout = new EventEmitter();
-    const spawnPromise = Object.assign(new Promise(() => {}), {
-      child: { stdout, kill: jest.fn() },
-    });
-    jest.mocked(spawnAsync).mockReturnValue(spawnPromise as any);
-
-    formatter = {
-      pipe: jest.fn(),
-      getBuildSummary: jest.fn().mockReturnValue('summary'),
-    };
-    jest.mocked(ExpoRunFormatter.create).mockReturnValue(formatter as any);
-
-    jest.mocked(fg).mockResolvedValue(['build.log'] as any);
-  });
-
-  async function startWatchingAsync(logger: ReturnType<typeof createMockLogger>): Promise<void> {
-    const buildLogger = new XcodeBuildLogger(logger, '/project');
-    await buildLogger.watchLogFiles('/logs');
-  }
-
-  it('logs formatted lines', async () => {
-    const logger = createMockLogger();
-    await startWatchingAsync(logger);
-
-    formatter.pipe.mockReturnValue(['line1', 'line2']);
-    stdout.emit('data', 'raw xcodebuild output');
-
-    expect(formatter.pipe).toHaveBeenCalledWith('raw xcodebuild output');
-    expect(logger.info).toHaveBeenCalledWith('line1');
-    expect(logger.info).toHaveBeenCalledWith('line2');
-    expect(Sentry.capture).not.toHaveBeenCalled();
-  });
-
-  it('falls back to raw logs when the formatter throws', async () => {
-    const logger = createMockLogger();
-    await startWatchingAsync(logger);
-
-    formatter.pipe.mockImplementation(() => {
-      throw new RangeError('Invalid array length');
-    });
-    stdout.emit('data', 'offending output');
-
-    expect(logger.info).toHaveBeenCalledWith('offending output');
-  });
-
-  it('reports the formatter error to Sentry only once', async () => {
-    const logger = createMockLogger();
-    await startWatchingAsync(logger);
-
-    const error = new RangeError('Invalid array length');
-    formatter.pipe.mockImplementation(() => {
-      throw error;
-    });
-    stdout.emit('data', 'offending output');
-    stdout.emit('data', 'more offending output');
-
-    expect(logger.info).toHaveBeenCalledWith('offending output');
-    expect(logger.info).toHaveBeenCalledWith('more offending output');
-    expect(Sentry.capture).toHaveBeenCalledTimes(1);
-    expect(Sentry.capture).toHaveBeenCalledWith(
-      'xcpretty formatter failed to parse xcodebuild logs',
-      error,
-      { extras: { data: 'offending output' } }
-    );
-  });
-});
@@ -1,12 +1,4 @@
-import {
-  BuildJob,
-  Env,
-  Ios,
-  Metadata,
-  Platform,
-  sanitizeBuildJob,
-  sanitizeMetadata,
-} from '@expo/eas-build-job';
+import { BuildJob, Env, Metadata, sanitizeBuildJob, sanitizeMetadata } from '@expo/eas-build-job';
 import { PipeMode, bunyan } from '@expo/logger';
 import { BuildStepEnv } from '@expo/steps';
 import spawn from '@expo/turtle-spawn';
@@ -50,11 +42,6 @@ export async function runEasBuildInternalAsync<TJob extends BuildJob>({
    autoSubmitArgs.push('--auto-submit');
  }

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

 import { BuildContext } from '../context';
-import { Sentry } from '../sentry';
 import { PackageManager, findPackagerRootDir } from '../utils/packageManager';
 import { isUsingModernYarnVersion } from '../utils/project';

@@ -12,7 +11,6 @@ export async function installDependenciesAsync({
  env,
  logger,
  infoCallbackFn,
-  lineTransformer,
  cwd,
  useFrozenLockfile,
 }: {
@@ -21,7 +19,6 @@ export async function installDependenciesAsync({
  cwd: string;
  logger: Exclude<SpawnOptions['logger'], undefined>;
  infoCallbackFn?: SpawnOptions['infoCallbackFn'];
-  lineTransformer?: SpawnOptions['lineTransformer'];
  useFrozenLockfile: boolean;
 }): Promise<{ spawnPromise: SpawnPromise<SpawnResult> }> {
  let args: string[];
@@ -72,92 +69,11 @@ export async function installDependenciesAsync({
      cwd,
      logger,
      infoCallbackFn,
-      lineTransformer,
      env,
    }),
  };
 }

-export async function installDependenciesWithNpmCacheFallbackAsync({
-  packageManager,
-  env,
-  logger,
-  infoCallbackFn,
-  cwd,
-  useFrozenLockfile,
-}: {
-  packageManager: PackageManager;
-  env: Record<string, string | undefined>;
-  cwd: string;
-  logger: Exclude<SpawnOptions['logger'], undefined>;
-  infoCallbackFn?: SpawnOptions['infoCallbackFn'];
-  useFrozenLockfile: boolean;
-}): Promise<void> {
-  const npmCacheUrl = env.NPM_CONFIG_REGISTRY;
-  let firstErrorLine: string | undefined;
-  let errorLineCount = 0;
-
-  try {
-    await (
-      await installDependenciesAsync({
-        packageManager,
-        env,
-        logger,
-        infoCallbackFn,
-        lineTransformer: (line: string) => {
-          if (isNpmCacheRegistryErrorLine(line, { env, npmCacheUrl })) {
-            firstErrorLine ??= line;
-            errorLineCount += 1;
-          }
-          return line;
-        },
-        cwd,
-        useFrozenLockfile,
-      })
-    ).spawnPromise;
-
-    if (firstErrorLine) {
-      Sentry.capture(new NpmCacheRegistryNonFatalError(), {
-        level: 'warning',
-        tags: { packageManager },
-        extras: { cwd, npmCacheUrl, useFrozenLockfile, firstErrorLine, errorLineCount },
-      });
-    }
-  } catch (err: unknown) {
-    if (!isNpmCacheInstallFailure(err, { env, npmCacheUrl })) {
-      throw err;
-    }
-
-    logger.warn(
-      `Failed to install dependencies using the npm cache registry (${npmCacheUrl}). Retrying without the npm cache registry.`
-    );
-    Sentry.capture(new NpmCacheRegistryInstallError(err), {
-      level: 'warning',
-      tags: { packageManager },
-      extras: {
-        cwd,
-        npmCacheUrl,
-        useFrozenLockfile,
-        originalErrorMessage: err instanceof Error ? err.message : String(err),
-        status: err instanceof Error ? (err as any).status : undefined,
-        signal: err instanceof Error ? (err as any).signal : undefined,
-      },
-    });
-
-    const { NPM_CONFIG_REGISTRY: _NPM_CONFIG_REGISTRY, ...fallbackEnv } = env;
-    await (
-      await installDependenciesAsync({
-        packageManager,
-        env: fallbackEnv,
-        logger,
-        infoCallbackFn,
-        cwd,
-        useFrozenLockfile,
-      })
-    ).spawnPromise;
-  }
-}
-
 export function resolvePackagerDir(ctx: BuildContext<Job>): string {
  const packagerRunDir = findPackagerRootDir(ctx.getReactNativeProjectDirectory());
  if (packagerRunDir !== ctx.getReactNativeProjectDirectory()) {
@@ -171,54 +87,3 @@ export function resolvePackagerDir(ctx: BuildContext<Job>): string {
  }
  return packagerRunDir;
 }
-
-function isNpmCacheInstallFailure(
-  err: unknown,
-  { env, npmCacheUrl }: { env: Record<string, string | undefined>; npmCacheUrl: string | undefined }
-): boolean {
-  if (!isNpmCacheRegistryEnabled(env, npmCacheUrl)) {
-    return false;
-  }
-  const errorOutput = getErrorOutput(err);
-  return errorOutput.includes(npmCacheUrl);
-}
-
-function isNpmCacheRegistryErrorLine(
-  line: string,
-  { env, npmCacheUrl }: { env: Record<string, string | undefined>; npmCacheUrl: string | undefined }
-): boolean {
-  return (
-    isNpmCacheRegistryEnabled(env, npmCacheUrl) &&
-    line.includes(npmCacheUrl) &&
-    /(?:error|failed|ENOTFOUND|ECONN|ETIMEDOUT|EAI_AGAIN|FetchError)/i.test(line)
-  );
-}
-
-function isNpmCacheRegistryEnabled(
-  env: Record<string, string | undefined>,
-  npmCacheUrl: string | undefined
-): npmCacheUrl is string {
-  return env.EAS_USE_NPM_CACHE === '1' && !!npmCacheUrl;
-}
-
-function getErrorOutput(err: unknown): string {
-  if (!(err instanceof Error)) {
-    return '';
-  }
-  const { stdout, stderr } = err as Error & { stdout?: string; stderr?: string };
-  return [stdout, stderr].filter(Boolean).join('\n');
-}
-
-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 });
-  }
-}
@@ -2,10 +2,7 @@ import { BuildJob } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
 import { SpawnOptions } from '@expo/turtle-spawn';

-import {
-  installDependenciesWithNpmCacheFallbackAsync,
-  resolvePackagerDir,
-} from './installDependencies';
+import { installDependenciesAsync, resolvePackagerDir } from './installDependencies';
 import { BuildContext } from '../context';
 import { runExpoCliCommand } from '../utils/project';

@@ -33,14 +30,17 @@ export async function prebuildAsync<TJob extends BuildJob>(
    options: spawnOptions,
    packageManager: ctx.packageManager,
  });
-  await installDependenciesWithNpmCacheFallbackAsync({
-    packageManager: ctx.packageManager,
-    env: ctx.env,
-    logger,
-    cwd: resolvePackagerDir(ctx),
-    // prebuild sometimes modifies package.json, so we don't want to use frozen lockfile
-    useFrozenLockfile: false,
-  });
+  const installDependenciesSpawnPromise = (
+    await installDependenciesAsync({
+      packageManager: ctx.packageManager,
+      env: ctx.env,
+      logger,
+      cwd: resolvePackagerDir(ctx),
+      // prebuild sometimes modifies package.json, so we don't want to use frozen lockfile
+      useFrozenLockfile: false,
+    })
+  ).spawnPromise;
+  await installDependenciesSpawnPromise;
 }

 function getPrebuildCommandArgs<TJob extends BuildJob>(ctx: BuildContext<TJob>): string[] {
@@ -2,6 +2,7 @@ import { ExpoConfig } from '@expo/config';
 import {
  BuildPhase,
  BuildPhaseResult,
+  BuildPhaseStats,
  Env,
  EnvironmentSecretType,
  GenericArtifactType,
@@ -45,7 +46,6 @@ export type ArtifactToUpload =
      type: GenericArtifactType;
      name: string;
      paths: string[];
-      metadata?: Record<string, unknown>;
    };

 export interface BuildContextOptions {
@@ -65,6 +65,7 @@ export interface BuildContextOptions {
    err?: Error,
    options?: { tags?: Record<string, string>; extras?: Record<string, string> }
  ) => void;
+  reportBuildPhaseStats?: (stats: BuildPhaseStats) => void;
  skipNativeBuild?: boolean;
  metadata?: Metadata;
  expoApiV2BaseUrl?: string;
@@ -97,6 +98,7 @@ export class BuildContext<TJob extends Job = Job> {
  private buildPhaseSkipped = false;
  private buildPhaseHasWarnings = false;
  private _appConfig?: Promise<ExpoConfig>;
+  private readonly reportBuildPhaseStats?: (stats: BuildPhaseStats) => void;
  public readonly graphqlClient: Client;

  constructor(job: TJob, options: BuildContextOptions) {
@@ -112,6 +114,7 @@ export class BuildContext<TJob extends Job = Job> {
    this._metadata = options.metadata;
    this.skipNativeBuild = options.skipNativeBuild;
    this.expoApiV2BaseUrl = options.expoApiV2BaseUrl;
+    this.reportBuildPhaseStats = options.reportBuildPhaseStats;

    const environmentSecrets = this.getEnvironmentSecrets(job);
    this._env = {
@@ -352,6 +355,7 @@ export class BuildContext<TJob extends Job = Job> {
    }
    await this.collectAndUpdateEnvVariablesAsync();

+    this.reportBuildPhaseStats?.({ buildPhase: this.buildPhase, result, durationMs });
    if (this.job.platform) {
      Datadog.distribution('eas.build.phase_duration', durationMs, {
        build_phase: this.buildPhase.toLowerCase(),
@@ -1,25 +1,14 @@
 import { Sentry } from './sentry';
 import { turtleFetch } from './utils/turtleFetch';

-type MetricsTarget =
-  | { kind: 'build'; turtleBuildId: string }
-  | { kind: 'jobRun'; turtleJobRunId: string };
-
 type DatadogSetupOptions = {
  expoApiV2BaseUrl: string;
+  turtleBuildId: string;
  robotAccessToken: string;
-  target: MetricsTarget;
 };

 let setupOptions: DatadogSetupOptions | null = null;
-let pendingUploads: Promise<unknown>[] = [];
-
-function withTargetTag(
-  tags: Record<string, string>,
-  target: MetricsTarget
-): Record<string, string> {
-  return { ...tags, target: target.kind === 'build' ? 'build' : 'job_run' };
-}
+let pendingMetricUploads: Promise<unknown>[] = [];

 export const Datadog = {
  setup(opts: DatadogSetupOptions | null): void {
@@ -30,68 +19,36 @@ export const Datadog = {
    if (!setupOptions) {
      return;
    }
-    const { expoApiV2BaseUrl, robotAccessToken, target } = setupOptions;
+    const { expoApiV2BaseUrl, turtleBuildId, robotAccessToken } = setupOptions;
    const metrics = [
      {
        name,
        type: 'distribution' as const,
        value,
-        tags: withTargetTag(tags, target),
+        tags,
      },
    ];

-    const metricsPath =
-      target.kind === 'build'
-        ? `turtle-builds/${target.turtleBuildId}/metrics`
-        : `turtle-job-runs/${target.turtleJobRunId}/metrics`;
-
-    const uploadPromise = turtleFetch(new URL(metricsPath, expoApiV2BaseUrl).toString(), 'POST', {
-      json: { metrics },
-      headers: {
-        Authorization: `Bearer ${robotAccessToken}`,
-      },
-      retries: 2,
-    }).catch(err => {
-      Sentry.capture(`Failed to report turtle ${target.kind} metric`, err, {
+    const uploadPromise = turtleFetch(
+      new URL(`turtle-builds/${turtleBuildId}/metrics`, expoApiV2BaseUrl).toString(),
+      'POST',
+      {
+        json: { metrics },
+        headers: {
+          Authorization: `Bearer ${robotAccessToken}`,
+        },
+        retries: 2,
+      }
+    ).catch(err => {
+      Sentry.capture('Failed to report turtle build metric', err, {
        extras: { metrics },
      });
    });

-    pendingUploads.push(uploadPromise);
-  },
-
-  log(message: string, tags: Record<string, string> = {}): void {
-    if (!setupOptions) {
-      return;
-    }
-    const { expoApiV2BaseUrl, robotAccessToken, target } = setupOptions;
-    const tagsWithTarget = withTargetTag(tags, target);
-    const log =
-      target.kind === 'build'
-        ? { buildId: target.turtleBuildId, message, tags: tagsWithTarget }
-        : { jobRunId: target.turtleJobRunId, message, tags: tagsWithTarget };
-    const logsPath = target.kind === 'build' ? 'turtle-builds/logs' : 'turtle-job-runs/logs';
-
-    const uploadPromise = turtleFetch(new URL(logsPath, expoApiV2BaseUrl).toString(), 'POST', {
-      json: log,
-      headers: {
-        Authorization: `Bearer ${robotAccessToken}`,
-      },
-      shouldThrowOnNotOk: false,
-    }).catch(err => {
-      Sentry.capture(`Failed to report turtle ${target.kind} log`, err, {
-        extras: { log },
-      });
-    });
-
-    pendingUploads.push(uploadPromise);
+    pendingMetricUploads.push(uploadPromise);
  },

  async flushAsync(): Promise<void> {
-    // Rotate so each flush only awaits its own batch; uploads enqueued during the
-    // await land in the fresh array for a later flush.
-    const uploads = pendingUploads;
-    pendingUploads = [];
-    await Promise.allSettled(uploads);
+    await Promise.allSettled(pendingMetricUploads);
  },
 };
@@ -27,4 +27,3 @@ export * from './generic';

 export { Datadog } from './datadog';
 export { Sentry } from './sentry';
-export * from './runtimeSettings';
@@ -9,7 +9,6 @@ exports[`fastfile createFastfileForResigningBuild should create Fastfile with al
      "com.example.app" => "/path/to/profiles/main.mobileprovision",
      "com.example.app.widget" => "/path/to/profiles/widget.mobileprovision",
    },
-    use_app_entitlements: true,
    keychain_path: "/Users/expo/Library/Keychains/login.keychain"
  )
 end
@@ -23,7 +22,6 @@ exports[`fastfile createFastfileForResigningBuild should handle empty provisioni
    signing_identity: "iPhone Distribution",
    provisioning_profile: {
    },
-    use_app_entitlements: true,
    keychain_path: "/tmp/keychain"
  )
 end
@@ -41,7 +39,6 @@ exports[`fastfile createFastfileForResigningBuild should handle multiple provisi
      "com.example.app.extension" => "/profiles/extension.mobileprovision",
      "com.example.app.intents" => "/profiles/intents.mobileprovision",
    },
-    use_app_entitlements: true,
    keychain_path: "/tmp/keychain"
  )
 end
@@ -56,7 +53,6 @@ exports[`fastfile createFastfileForResigningBuild should handle paths with speci
    provisioning_profile: {
      "com.example.app" => "/path/with spaces/profile (1).mobileprovision",
    },
-    use_app_entitlements: true,
    keychain_path: "/Users/expo/Library/Keychains/login keychain.keychain"
  )
 end
@@ -71,7 +67,6 @@ exports[`fastfile createFastfileForResigningBuild should handle single provision
    provisioning_profile: {
      "com.example.app" => "/tmp/profile.mobileprovision",
    },
-    use_app_entitlements: true,
    keychain_path: "/tmp/keychain"
  )
 end
@@ -86,7 +81,6 @@ exports[`fastfile createFastfileForResigningBuild should produce valid Ruby synt
    provisioning_profile: {
      "com.example.app" => "/path/to/profile.mobileprovision",
    },
-    use_app_entitlements: true,
    keychain_path: "/tmp/keychain"
  )
 end
@@ -26,12 +26,10 @@ function makeIosBuildContext({
  expoVersion,
  cocoapodsCacheUrl,
  usePrecompiledModules = true,
-  expoUsePrecompiledModules,
 }: {
  expoVersion?: string;
  cocoapodsCacheUrl?: string;
  usePrecompiledModules?: boolean;
-  expoUsePrecompiledModules?: string;
 }): BuildContext<Ios.Job> {
  vol.fromJSON({
    [path.join(IOS_DIR, '.keep')]: '',
@@ -59,9 +57,6 @@ function makeIosBuildContext({
    logBuffer: { getLogs: () => [], getPhaseLogs: () => [] },
    env: {
      __API_SERVER_URL: 'http://api.expo.test',
-      ...(expoUsePrecompiledModules
-        ? { EXPO_USE_PRECOMPILED_MODULES: expoUsePrecompiledModules }
-        : {}),
      ...(cocoapodsCacheUrl ? { EAS_BUILD_COCOAPODS_CACHE_URL: cocoapodsCacheUrl } : {}),
    },
    uploadArtifact: jest.fn(),
@@ -131,14 +126,14 @@ describe(installPods, () => {
  });

  it('does not add precompiled modules env vars below the minimum Expo version', async () => {
-    const ctx = makeIosBuildContext({ expoVersion: '55.0.25' });
+    const ctx = makeIosBuildContext({ expoVersion: '55.0.17' });

    await installPods(ctx, {});

    expect((spawn as jest.Mock).mock.calls[0][2].env.EXPO_USE_PRECOMPILED_MODULES).toBeUndefined();
    expect(ctx.logger.info).toHaveBeenCalledWith(
      expect.stringMatching(
-        /^Detected expo=55\.0\.25; not enabling precompiled modules use because precompiled modules require expo>=55\.0\.26\./
+        /^Detected expo=55\.0\.17; not enabling precompiled modules use because precompiled modules require expo>=/
      )
    );
  });
@@ -181,23 +176,4 @@ describe(installPods, () => {
    ).toBeUndefined();
    expect(ctx.logger.info).not.toHaveBeenCalled();
  });
-
-  it('does not override EXPO_USE_PRECOMPILED_MODULES=0 even when builder flag is enabled', async () => {
-    const ctx = makeIosBuildContext({
-      expoVersion: '999.0.0',
-      usePrecompiledModules: true,
-      expoUsePrecompiledModules: '0',
-    });
-
-    await installPods(ctx, {});
-
-    expect((spawn as jest.Mock).mock.calls[0][2].env.EXPO_USE_PRECOMPILED_MODULES).toBe('0');
-    expect(
-      (spawn as jest.Mock).mock.calls[0][2].env.EXPO_PRECOMPILED_MODULES_BASE_URL
-    ).toBeUndefined();
-    expect(ctx.logger.info).toHaveBeenCalledWith(
-      'EXPO_USE_PRECOMPILED_MODULES=0 is set; not enabling precompiled modules use.'
-    );
-    expect(getInstalledExpoPackageVersionAsync).not.toHaveBeenCalled();
-  });
 });
@@ -10,8 +10,8 @@ import type { Credentials } from './credentials/manager';
 import { createFastfileForResigningBuild } from './fastfile';
 import { createGymfileForArchiveBuild, createGymfileForSimulatorBuild } from './gymfile';
 import { isTVOS } from './tvos';
+import { XcodeBuildLogger } from './xcpretty';
 import { COMMON_FASTLANE_ENV } from '../common/fastlane';
-import { XcodeBuildLogger } from '../common/xcpretty';
 import { BuildContext, SkipNativeBuildError } from '../context';

 export async function runFastlaneGym<TJob extends Ios.Job>(
@@ -5,7 +5,7 @@ import semver from 'semver';

 import { BuildContext } from '../context';

-const MIN_PRECOMPILED_MODULES_EXPO_VERSION = '55.0.26';
+const MIN_PRECOMPILED_MODULES_EXPO_VERSION = '55.0.21';
 const PRECOMPILED_MODULES_BASE_URL =
  'https://storage.googleapis.com/eas-build-precompiled-modules/';

@@ -46,12 +46,7 @@ export async function installPods<TJob extends Ios.Job>(
 async function resolvePrecompiledModulesPodInstallEnvAsync<TJob extends Ios.Job>(
  ctx: BuildContext<TJob>
 ): Promise<Env> {
-  if (ctx.env.EXPO_USE_PRECOMPILED_MODULES === '0') {
-    ctx.logger.info('EXPO_USE_PRECOMPILED_MODULES=0 is set; not enabling precompiled modules use.');
-    return {};
-  }
-
-  if (ctx.env.EAS_USE_PRECOMPILED_MODULES !== '1') {
+  if (ctx.job.builderEnvironment?.env?.EAS_USE_PRECOMPILED_MODULES !== '1') {
    return {};
  }

@@ -6,14 +6,11 @@ import fg from 'fast-glob';
 import fs from 'fs-extra';
 import path from 'path';

-import { Sentry } from '../sentry';
-
 const CHECK_FILE_INTERVAL_MS = 1000;

 export class XcodeBuildLogger {
  private loggerError?: Error;
  private flushing: boolean = false;
-  private reportedFormatterError: boolean = false;
  private logReaderPromise?: SpawnPromise<SpawnResult>;
  private logsPath?: string;

@@ -63,21 +60,9 @@ export class XcodeBuildLogger {
      this.logReaderPromise = spawnAsync('tail', ['-n', '+0', '-f', logsPath], { stdio: 'pipe' });
      assert(this.logReaderPromise.child.stdout, 'stdout is not available');
      this.logReaderPromise.child.stdout.on('data', (data: string) => {
-        try {
-          const lines = formatter.pipe(data.toString());
-          for (const line of lines) {
-            this.logger.info(line);
-          }
-        } catch (err: any) {
-          // The formatter can throw on unexpected xcodebuild output. Fall back to
-          // raw logs instead of crashing the process with an uncaught exception.
-          if (!this.reportedFormatterError) {
-            this.reportedFormatterError = true;
-            Sentry.capture('xcpretty formatter failed to parse xcodebuild logs', err, {
-              extras: { data: data.toString().slice(-2000) },
-            });
-          }
-          this.logger.info(data.toString());
+        const lines = formatter.pipe(data.toString());
+        for (const line of lines) {
+          this.logger.info(line);
        }
      });
      await this.logReaderPromise;
@@ -1,138 +0,0 @@
-import { Env } from '@expo/eas-build-job';
-import fetch from 'node-fetch';
-import { z } from 'zod';
-
-import { Sentry } from './sentry';
-
-const ENVIRONMENT_TO_RUNTIME_SETTINGS_URL: Record<string, string | undefined> = {
-  staging: 'https://storage.googleapis.com/eas-workflows-staging/runtime-settings.json',
-  production: 'https://storage.googleapis.com/eas-workflows-production/runtime-settings.json',
-};
-
-const RuntimeSettingsSchema = z
-  .object({
-    caches: z.record(
-      z.string(),
-      z
-        .object({
-          npm: z.boolean(),
-          nodejs: z.boolean(),
-          maven: z.boolean(),
-          cocoapods: z.boolean(),
-        })
-        .partial()
-    ),
-    iosPrecompiledModules: z.boolean(),
-  })
-  .partial();
-
-let runtimeSettings: z.infer<typeof RuntimeSettingsSchema> = {};
-let runtimeEnvironment: Env = {};
-
-export namespace RuntimeSettings {
-  export async function loadAsync({
-    environment,
-    env: nextRuntimeEnvironment = {},
-  }: {
-    environment: string;
-    env?: Env;
-  }): Promise<void> {
-    runtimeEnvironment = nextRuntimeEnvironment;
-    const url = ENVIRONMENT_TO_RUNTIME_SETTINGS_URL[environment];
-    if (!url) {
-      return;
-    }
-
-    try {
-      const response = await fetch(url, {
-        signal: AbortSignal.timeout(1000),
-      });
-
-      if (!response.ok) {
-        Sentry.capture('Failed to fetch worker runtime settings', {
-          extras: { url, status: response.status },
-          level: 'warning',
-        });
-        return;
-      }
-
-      runtimeSettings = RuntimeSettingsSchema.parse(await response.json());
-      if (runtimeSettings.caches && !runtimeSettings.caches[process.platform]) {
-        Sentry.capture(
-          new Error(
-            `Runtime settings are missing cache settings for platform "${process.platform}"`
-          ),
-          {
-            extras: {
-              configuredPlatforms: Object.keys(runtimeSettings.caches),
-              platform: process.platform,
-            },
-            level: 'error',
-          }
-        );
-      }
-    } catch (err) {
-      Sentry.capture(
-        'Failed to load worker runtime settings',
-        err instanceof Error ? err : new Error(String(err)),
-        {
-          extras: { url },
-          level: 'warning',
-        }
-      );
-    }
-  }
-
-  export function isUsingIosPrecompiledModulesEnabled(): boolean {
-    return runtimeSettings.iosPrecompiledModules ?? false;
-  }
-
-  export function getNpmCacheUrl(): string | null {
-    if (runtimeEnvironment['EAS_BUILD_DISABLE_NPM_CACHE'] === '1') {
-      return null;
-    }
-    const runtimeEnabled = runtimeSettings.caches?.[process.platform]?.npm;
-    if (runtimeEnabled === false) {
-      return null;
-    }
-    const envOverride = runtimeEnvironment['EAS_USE_NPM_CACHE'];
-    const enabled = envOverride === '1' || (envOverride !== '0' && runtimeEnabled);
-    return enabled ? process.env.EAS_NPM_CACHE_URL || null : null;
-  }
-
-  export function getNodeJsCacheUrl(): string | null {
-    const runtimeEnabled = runtimeSettings.caches?.[process.platform]?.nodejs;
-    if (runtimeEnabled === false) {
-      return null;
-    }
-    const envOverride = runtimeEnvironment['EAS_USE_NODEJS_CACHE'];
-    const enabled = envOverride === '1' || (envOverride !== '0' && runtimeEnabled);
-    return enabled ? process.env.EAS_NODEJS_CACHE_URL || null : null;
-  }
-
-  export function getMavenCacheUrl(): string | null {
-    if (runtimeEnvironment['EAS_BUILD_DISABLE_MAVEN_CACHE'] === '1') {
-      return null;
-    }
-    const runtimeEnabled = runtimeSettings.caches?.[process.platform]?.maven;
-    if (runtimeEnabled === false) {
-      return null;
-    }
-    const envOverride = runtimeEnvironment['EAS_USE_MAVEN_CACHE'];
-    const enabled = envOverride === '1' || (envOverride !== '0' && runtimeEnabled);
-    return enabled ? process.env.EAS_MAVEN_CACHE_URL || null : null;
-  }
-
-  export function getCocoapodsCacheUrl(): string | null {
-    if (runtimeEnvironment['EAS_BUILD_DISABLE_COCOAPODS_CACHE'] === '1') {
-      return null;
-    }
-    const runtimeEnabled = runtimeSettings.caches?.[process.platform]?.cocoapods;
-    if (runtimeEnabled === false) {
-      return null;
-    }
-    const envOverride = runtimeEnvironment['EAS_USE_COCOAPODS_CACHE'];
-    const enabled = envOverride === '1' || (envOverride !== '0' && runtimeEnabled);
-    return enabled ? process.env.EAS_COCOAPODS_CACHE_URL || null : null;
-  }
-}
@@ -41,7 +41,6 @@ import { createSaveCacheFunction } from './functions/saveCache';
 import { createSendSlackMessageFunction } from './functions/sendSlackMessage';
 import { createStartAgentDeviceRemoteSessionBuildFunction } from './functions/startAgentDeviceRemoteSession';
 import { createStartAndroidEmulatorBuildFunction } from './functions/startAndroidEmulator';
-import { createStartArgentRemoteSessionBuildFunction } from './functions/startArgentRemoteSession';
 import { createStartCuttlefishDeviceBuildFunction } from './functions/startCuttlefishDevice';
 import { createStartIosSimulatorBuildFunction } from './functions/startIosSimulator';
 import { createStartServeSimRemoteSessionBuildFunction } from './functions/startServeSimRemoteSession';
@@ -61,7 +60,7 @@ export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
    createInstallNodeModulesBuildFunction(),
    createPrebuildBuildFunction(),
    createReadIpaInfoBuildFunction(),
-    createDownloadBuildFunction(ctx),
+    createDownloadBuildFunction(),
    createEasExportBuildFunction(),
    createEasDeployBuildFunction(),
    createRepackBuildFunction(),
@@ -82,7 +81,6 @@ export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
    runFastlaneFunction(),
    parseXcactivitylogFunction(),
    createStartAgentDeviceRemoteSessionBuildFunction(ctx),
-    createStartArgentRemoteSessionBuildFunction(ctx),
    createStartAndroidEmulatorBuildFunction(),
    createStartCuttlefishDeviceBuildFunction(),
    createStartIosSimulatorBuildFunction(),
@@ -98,7 +96,7 @@ export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
    createUploadToAscBuildFunction(),

    createReportMaestroTestResultsFunction(ctx),
-    createMaestroTestsBuildFunction(ctx),
+    createMaestroTestsBuildFunction(),
  ];

  if (ctx.hasBuildJob()) {
@@ -1,6 +1,4 @@
-import { SystemError, UserError } from '@expo/eas-build-job';
 import { createLogger } from '@expo/logger';
-import { Client, CombinedError } from '@urql/core';
 import fetch, { Response } from 'node-fetch';
 import { randomUUID } from 'node:crypto';
 import fs from 'node:fs';
@@ -19,63 +17,22 @@ const APP_TAR_GZ_BUFFER = Buffer.from(
  'base64'
 );

-const APPLICATION_ARCHIVE_URL = `https://expo.dev/artifacts/eas/${randomUUID()}.tar.gz`;
-
-function createMockGraphqlClient({
-  applicationArchiveUrl,
-  error,
-}: {
-  applicationArchiveUrl?: string | null;
-  error?: Error;
-}): Client {
-  const toPromise = jest.fn().mockResolvedValue(
-    error
-      ? { error, data: undefined }
-      : {
-          data: {
-            builds: {
-              byId: {
-                id: randomUUID(),
-                platform: 'IOS',
-                artifacts: {
-                  applicationArchiveUrl: applicationArchiveUrl ?? null,
-                },
-              },
-            },
-          },
-        }
-  );
-
-  return {
-    query: jest.fn().mockReturnValue({ toPromise }),
-  } as unknown as Client;
-}
-
 describe('downloadBuild', () => {
-  it('downloads from applicationArchiveUrl returned by GraphQL', async () => {
-    const buildId = randomUUID();
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-    });
-
+  it('should handle an archive', async () => {
    jest.mocked(fetch).mockResolvedValue({
      ok: true,
      body: Readable.from(APP_TAR_GZ_BUFFER),
-      url: APPLICATION_ARCHIVE_URL,
+      url: `https://storage.googleapis.com/eas-workflows-production/artifacts/${randomUUID()}/${randomUUID()}/application-${randomUUID()}.tar.gz?X-Goog-Algorithm=GOOG4-RSA-SHA256`,
    } as unknown as Response);

    const { artifactPath } = await downloadBuildAsync({
      logger: createLogger({ name: 'test' }),
-      buildId,
-      graphqlClient,
+      buildId: randomUUID(),
+      expoApiServerURL: 'http://api.expo.test',
      robotAccessToken: null,
      extensions: ['app'],
    });

-    expect(jest.mocked(fetch)).toHaveBeenCalledWith(
-      APPLICATION_ARCHIVE_URL,
-      expect.objectContaining({ headers: undefined })
-    );
    expect(artifactPath).toBeDefined();
    expect(await fs.promises.readFile(path.join(artifactPath, 'TestApp'), 'utf8')).toBe(
      'i am executable\n'
@@ -83,21 +40,16 @@ describe('downloadBuild', () => {
  });

  it('should handle a straight-up file', async () => {
-    const applicationArchiveUrl = `https://expo.dev/artifacts/eas/${randomUUID()}.apk`;
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl,
-    });
-
    jest.mocked(fetch).mockResolvedValue({
      ok: true,
      body: Readable.from(Buffer.from('hello')),
-      url: applicationArchiveUrl,
+      url: `https://storage.googleapis.com/eas-workflows-production/artifacts/${randomUUID()}/${randomUUID()}/application-${randomUUID()}.txt?X-Goog-Algorithm=GOOG4-RSA-SHA256`,
    } as unknown as Response);

    const { artifactPath } = await downloadBuildAsync({
      logger: createLogger({ name: 'test' }),
      buildId: randomUUID(),
-      graphqlClient,
+      expoApiServerURL: 'http://api.expo.test',
      robotAccessToken: null,
      extensions: ['app'],
    });
@@ -106,114 +58,18 @@ describe('downloadBuild', () => {
    expect(await fs.promises.readFile(artifactPath, 'utf-8')).toBe('hello');
  });

-  it('throws UserError when the build has no application archive url', async () => {
-    const graphqlClient = createMockGraphqlClient({ applicationArchiveUrl: null });
-
-    await expect(
-      downloadBuildAsync({
-        logger: createLogger({ name: 'test' }),
-        buildId: randomUUID(),
-        graphqlClient,
-        robotAccessToken: null,
-        extensions: ['app'],
-      })
-    ).rejects.toMatchObject({
-      errorCode: 'EAS_DOWNLOAD_BUILD_NO_APPLICATION_ARCHIVE',
-      message: 'Build does not have an application archive url',
-    });
-
-    expect(jest.mocked(fetch)).not.toHaveBeenCalled();
-  });
-
-  it('throws SystemError when GraphQL request fails with a network error', async () => {
-    const buildId = randomUUID();
-    const graphqlClient = createMockGraphqlClient({
-      error: new CombinedError({
-        networkError: new Error('Network request failed'),
-      }),
-    });
-
-    const promise = downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      buildId,
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['app'],
-    });
-
-    await expect(promise).rejects.toBeInstanceOf(SystemError);
-    await expect(promise).rejects.toMatchObject({
-      message: `Could not fetch build ${buildId}: [Network] Network request failed`,
-    });
-
-    expect(jest.mocked(fetch)).not.toHaveBeenCalled();
-  });
-
-  it('throws SystemError when GraphQL request returns 5xx', async () => {
-    const buildId = randomUUID();
-    const graphqlClient = createMockGraphqlClient({
-      error: Object.assign(new Error('Internal Server Error'), {
-        response: { status: 500 },
-      }),
-    });
-
-    const promise = downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      buildId,
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['app'],
-    });
-
-    await expect(promise).rejects.toBeInstanceOf(SystemError);
-    await expect(promise).rejects.toMatchObject({
-      message: `Could not fetch build ${buildId}: Internal Server Error`,
-    });
-
-    expect(jest.mocked(fetch)).not.toHaveBeenCalled();
-  });
-
-  it('throws UserError when GraphQL returns a client error', async () => {
-    const buildId = randomUUID();
-    const graphqlClient = createMockGraphqlClient({
-      error: new CombinedError({
-        graphQLErrors: [{ message: 'Build not found' }],
-      }),
-    });
-
-    const promise = downloadBuildAsync({
-      logger: createLogger({ name: 'test' }),
-      buildId,
-      graphqlClient,
-      robotAccessToken: null,
-      extensions: ['app'],
-    });
-
-    await expect(promise).rejects.toBeInstanceOf(UserError);
-    await expect(promise).rejects.toMatchObject({
-      errorCode: 'EAS_DOWNLOAD_BUILD_FETCH_FAILED',
-      message: `Could not fetch build ${buildId}: [GraphQL] Build not found`,
-    });
-
-    expect(jest.mocked(fetch)).not.toHaveBeenCalled();
-  });
-
  it('should throw an error if no matching files are found', async () => {
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-    });
-
    jest.mocked(fetch).mockResolvedValue({
      ok: true,
      body: Readable.from(APP_TAR_GZ_BUFFER),
-      url: APPLICATION_ARCHIVE_URL,
+      url: `https://storage.googleapis.com/eas-workflows-production/artifacts/${randomUUID()}/${randomUUID()}/application-${randomUUID()}.tar.gz?X-Goog-Algorithm=GOOG4-RSA-SHA256`,
    } as unknown as Response);

    await expect(
      downloadBuildAsync({
        logger: createLogger({ name: 'test' }),
        buildId: randomUUID(),
-        graphqlClient,
+        expoApiServerURL: 'http://api.expo.test',
        robotAccessToken: null,
        extensions: ['apk'],
      })
@@ -223,11 +79,7 @@ describe('downloadBuild', () => {

 describe('createDownloadBuildFunction', () => {
  it('should download a build', async () => {
-    const buildId = randomUUID();
-    const graphqlClient = createMockGraphqlClient({
-      applicationArchiveUrl: APPLICATION_ARCHIVE_URL,
-    });
-    const downloadBuild = createDownloadBuildFunction({ graphqlClient } as any);
+    const downloadBuild = createDownloadBuildFunction();
    const logger = createMockLogger();

    const buildStep = downloadBuild.createBuildStepFromFunctionCall(
@@ -240,7 +92,7 @@ describe('createDownloadBuildFunction', () => {
      }),
      {
        callInputs: {
-          build_id: buildId,
+          build_id: randomUUID(),
          extensions: ['app'],
        },
      }
@@ -253,9 +105,5 @@ describe('createDownloadBuildFunction', () => {
    } as unknown as Response);

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

 import {
  copyLatestAttemptXml,
-  isFileAttrRun,
-  junitFileHasFileAttrs,
  mergeJUnitReports,
-  parseFailedFlowsFromFileAttrs,
  parseFailedFlowsFromJUnit,
  parseJUnitTestCases,
  parseMaestroResults,
-  parseMaestroResultsFromFileAttrs,
 } from '../maestroResultParser';

 describe(parseMaestroResults, () => {
@@ -302,169 +298,7 @@ describe(parseMaestroResults, () => {
  });
 });

-describe(parseMaestroResultsFromFileAttrs, () => {
-  it('uses file= as the path', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file=".maestro/login.yaml" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const results = await parseMaestroResultsFromFileAttrs('/junit');
-    expect(results[0]).toEqual(
-      expect.objectContaining({ name: 'login', path: '.maestro/login.yaml' })
-    );
-  });
-
-  it('keeps two same-named flows separate by their file= path', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file="a/login.yaml" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="login" file="b/login.yaml" status="ERROR" time="1.0"><failure>x</failure></testcase>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const results = await parseMaestroResultsFromFileAttrs('/junit');
-    expect(results.map(r => r.path).sort()).toEqual(['a/login.yaml', 'b/login.yaml']);
-  });
-
-  it('returns per-attempt results keyed by file= across attempt files', async () => {
-    vol.fromJSON({
-      '/junit/android-maestro-junit-attempt-0.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file="flows/login.yaml" time="1.0"><failure>x</failure></testcase>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-      '/junit/android-maestro-junit-attempt-1.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file="flows/login.yaml" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const results = await parseMaestroResultsFromFileAttrs('/junit');
-    expect(results).toEqual([
-      expect.objectContaining({ path: 'flows/login.yaml', status: 'failed', retryCount: 0 }),
-      expect.objectContaining({ path: 'flows/login.yaml', status: 'passed', retryCount: 1 }),
-    ]);
-  });
-
-  it('returns empty array when the directory does not exist', async () => {
-    const results = await parseMaestroResultsFromFileAttrs('/nope');
-    expect(results).toEqual([]);
-  });
-
-  it('skips testcases without file= instead of emitting an undefined path (contract guard)', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="a" file="a.yaml" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="b" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const results = await parseMaestroResultsFromFileAttrs('/junit');
-    expect(results).toEqual([expect.objectContaining({ name: 'a', path: 'a.yaml' })]);
-  });
-});
-
-describe('junitFileHasFileAttrs', () => {
-  it('returns true when every testcase has a non-empty file= attribute', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="a" file="a.yaml" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="b" file="b.yaml" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    expect(await junitFileHasFileAttrs('/junit/report.xml')).toBe(true);
-  });
-
-  it('returns false when any testcase lacks file= (mixed report)', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="a" file="a.yaml" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="b" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    expect(await junitFileHasFileAttrs('/junit/report.xml')).toBe(false);
-  });
-
-  it('returns false when file= is an empty string', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="a" file="" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    expect(await junitFileHasFileAttrs('/junit/report.xml')).toBe(false);
-  });
-
-  it('returns false for a legacy report with no file= attributes', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="a" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    expect(await junitFileHasFileAttrs('/junit/report.xml')).toBe(false);
-  });
-
-  it('returns false when the file cannot be read', async () => {
-    expect(await junitFileHasFileAttrs('/missing.xml')).toBe(false);
-  });
-});
-
-describe('isFileAttrRun', () => {
-  it('returns false for an empty list (an empty report is not a file-attr run)', () => {
-    expect(isFileAttrRun([])).toBe(false);
-  });
-});
-
 describe(parseJUnitTestCases, () => {
-  it('extracts the file= attribute when present', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file=".maestro/login.yaml" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const results = await parseJUnitTestCases('/junit');
-    expect(results[0].file).toBe('.maestro/login.yaml');
-  });
-
-  it('treats a missing or empty file= attribute as undefined', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="a" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="b" file="" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const results = await parseJUnitTestCases('/junit');
-    expect(results.find(r => r.name === 'a')!.file).toBeUndefined();
-    expect(results.find(r => r.name === 'b')!.file).toBeUndefined();
-  });
-
  it('parses a single testcase with SUCCESS status', async () => {
    vol.fromJSON({
      '/junit/report.xml': [
@@ -748,100 +582,6 @@ describe(parseJUnitTestCases, () => {
  });
 });

-describe(parseFailedFlowsFromFileAttrs, () => {
-  it('returns the failing flows by file= (duplicate names retry correctly)', async () => {
-    vol.fromJSON({
-      '/tmp/jr/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="login" file="a/login.yaml" status="SUCCESS" time="1.0"/>
-  <testcase name="login" file="b/login.yaml" time="1.0"><failure>x</failure></testcase>
-</testsuite></testsuites>`,
-      '/proj/b/login.yaml': '',
-    });
-    const result = await parseFailedFlowsFromFileAttrs({
-      junitFile: '/tmp/jr/attempt-0.xml',
-      workingDirectory: '/proj',
-    });
-    expect(result).toEqual(['b/login.yaml']);
-  });
-
-  it('returns null when a file= path does not exist on disk (dumb retry, never legacy)', async () => {
-    vol.fromJSON({
-      '/tmp/jr/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="gone" file="missing/flow.yaml" time="1.0"><failure>x</failure></testcase>
-</testsuite></testsuites>`,
-    });
-    const result = await parseFailedFlowsFromFileAttrs({
-      junitFile: '/tmp/jr/attempt-0.xml',
-      workingDirectory: '/proj',
-    });
-    expect(result).toBeNull();
-  });
-
-  it('returns null when the report lacks file= attributes (callers must pre-check)', async () => {
-    vol.fromJSON({
-      '/tmp/jr/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="A" file="a.yaml" time="1.0"><failure>x</failure></testcase>
-  <testcase name="B" time="1.0"><failure>y</failure></testcase>
-</testsuite></testsuites>`,
-      '/proj/a.yaml': '',
-    });
-    const result = await parseFailedFlowsFromFileAttrs({
-      junitFile: '/tmp/jr/attempt-0.xml',
-      workingDirectory: '/proj',
-    });
-    expect(result).toBeNull();
-  });
-
-  it('dedupes repeated failing file= paths (same flow failed twice in one attempt)', async () => {
-    vol.fromJSON({
-      '/tmp/jr/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="login" file="flows/login.yaml" time="1.0"><failure>x</failure></testcase>
-  <testcase name="login" file="flows/login.yaml" time="1.0"><failure>y</failure></testcase>
-</testsuite></testsuites>`,
-      '/proj/flows/login.yaml': '',
-    });
-    const result = await parseFailedFlowsFromFileAttrs({
-      junitFile: '/tmp/jr/attempt-0.xml',
-      workingDirectory: '/proj',
-    });
-    expect(result).toEqual(['flows/login.yaml']);
-  });
-
-  it('resolves and existence-checks an absolute file= path', async () => {
-    vol.fromJSON({
-      '/tmp/jr/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="ext" file="/outside/flow.yaml" time="1.0"><failure>x</failure></testcase>
-</testsuite></testsuites>`,
-      '/outside/flow.yaml': '',
-    });
-    const result = await parseFailedFlowsFromFileAttrs({
-      junitFile: '/tmp/jr/attempt-0.xml',
-      workingDirectory: '/proj',
-    });
-    expect(result).toEqual(['/outside/flow.yaml']);
-  });
-
-  it('returns null when junit XML is truncated mid-tag (partial parse risk)', async () => {
-    vol.fromJSON({
-      '/tmp/jr/attempt-0.xml': `<?xml version="1.0"?>
-<testsuites><testsuite>
-  <testcase name="A" file="a.yaml" time="1.0"><failure>x</failure></testcase>
-  <testcase name="B" file="b.yaml"`, // intentionally truncated mid-tag
-      '/proj/a.yaml': '',
-    });
-    const result = await parseFailedFlowsFromFileAttrs({
-      junitFile: '/tmp/jr/attempt-0.xml',
-      workingDirectory: '/proj',
-    });
-    expect(result).toBeNull();
-  });
-});
-
 describe('parseFailedFlowsFromJUnit', () => {
  it('returns the subset of input flow paths whose testcases failed', async () => {
    vol.fromJSON({
@@ -1025,28 +765,6 @@ describe('mergeJUnitReports', () => {
    expect(b.failure).toBeUndefined();
  });

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

 import { createGlobalContextMock } from '../../../__tests__/utils/context';
 import { createMockLogger } from '../../../__tests__/utils/logger';
-import { CustomBuildContext } from '../../../customBuildContext';
 import * as discovery from '../maestroFlowDiscovery';
 import * as parser from '../maestroResultParser';
-import * as maestroScreenshots from '../maestroScreenshots';
 import { createMaestroTestsBuildFunction } from '../maestroTests';

 jest.mock('@expo/turtle-spawn', () => ({
@@ -22,29 +17,7 @@ jest.mock('../../../utils/retry', () => ({
  sleepAsync: jest.fn().mockResolvedValue(undefined),
 }));

-// Partial mock: stub the harvest (filesystem) but keep the real reduction helpers
-// (computePureFailureFlowNames / selectFailureScreenshots) the step now calls post-loop.
-jest.mock('../maestroScreenshots', () => ({
-  ...jest.requireActual('../maestroScreenshots'),
-  harvestFailureScreenshotsAsync: jest.fn(),
-}));
-
 const mockedSpawn = jest.mocked(spawn);
-const mockedHarvest = jest.mocked(maestroScreenshots.harvestFailureScreenshotsAsync);
-const mockUploadArtifact = jest.fn();
-
-function makeShot(index: number): maestroScreenshots.HarvestedScreenshot {
-  return {
-    fileAbsPath: path.join(os.tmpdir(), `src-screenshot-${index}.png`),
-    displayName: 'Failure Screenshot: Login (attempt 1)',
-    metadata: {
-      kind: 'maestro-test-screenshot',
-      flowName: 'Login',
-      attemptIndex: 0,
-      capturedAtMs: 1781186692250,
-    },
-  };
-}

 const SPAWN_SUCCESS = {
  status: 0,
@@ -68,10 +41,7 @@ function createStep(
  ReturnType<typeof createMaestroTestsBuildFunction>['createBuildStepFromFunctionCall']
 > {
  const logger = createMockLogger();
-  const ctx = {
-    runtimeApi: { uploadArtifact: mockUploadArtifact },
-  } as unknown as CustomBuildContext;
-  const fn = createMaestroTestsBuildFunction(ctx);
+  const fn = createMaestroTestsBuildFunction();
  const globalCtx = createGlobalContextMock({ logger });
  globalCtx.updateEnv(options.env ?? { HOME: '/home/expo' });
  return fn.createBuildStepFromFunctionCall(globalCtx, { callInputs });
@@ -84,18 +54,10 @@ describe('createMaestroTestsBuildFunction', () => {
    // hit the real disk. Individual tests override this.
    jest.restoreAllMocks();
    jest.spyOn(parser, 'mergeJUnitReports').mockResolvedValue();
-    mockedHarvest.mockReset();
-    mockedHarvest.mockResolvedValue([]);
-    mockUploadArtifact.mockReset();
-    mockUploadArtifact.mockResolvedValue({ artifactId: 'artifact-1' });
  });

  it('exports a factory that returns a BuildFunction instance', () => {
-    expect(
-      createMaestroTestsBuildFunction({
-        runtimeApi: { uploadArtifact: mockUploadArtifact },
-      } as unknown as CustomBuildContext)
-    ).toBeDefined();
+    expect(createMaestroTestsBuildFunction()).toBeDefined();
  });

  it('sets all outputs before running any flows', async () => {
@@ -311,33 +273,6 @@ describe('createMaestroTestsBuildFunction', () => {
    );
  });

-  it('uses the file= path on reports that carry it, without scanning flow files', async () => {
-    mockedSpawn.mockRejectedValueOnce(rejectExit1()).mockResolvedValueOnce(SPAWN_SUCCESS);
-    jest.spyOn(parser, 'junitFileHasFileAttrs').mockResolvedValue(true);
-    const discoverySpy = jest.spyOn(discovery, 'buildFlowNameToPathMap');
-    const legacyParseSpy = jest.spyOn(parser, 'parseFailedFlowsFromJUnit');
-    const newParseSpy = jest
-      .spyOn(parser, 'parseFailedFlowsFromFileAttrs')
-      .mockResolvedValue(['flows/b.yaml']);
-
-    const step = createStep({
-      flow_path: ['flows/a.yaml', 'flows/b.yaml'],
-      retries: 1,
-      output_format: 'junit',
-      retry_failed_only: true,
-      platform: 'android',
-    });
-    await step.executeAsync();
-
-    expect(newParseSpy).toHaveBeenCalledTimes(1);
-    // The new branch needs no name→path map: no scan, no legacy parser.
-    expect(discoverySpy).not.toHaveBeenCalled();
-    expect(legacyParseSpy).not.toHaveBeenCalled();
-    const a1 = mockedSpawn.mock.calls[1][1]!;
-    expect(a1).toContain('flows/b.yaml');
-    expect(a1).not.toContain('flows/a.yaml');
-  });
-
  it('falls back to all-flows retry when nameToPath is null (duplicate flow names)', async () => {
    mockedSpawn.mockRejectedValueOnce(rejectExit1()).mockResolvedValueOnce(SPAWN_SUCCESS);
    jest.spyOn(discovery, 'buildFlowNameToPathMap').mockResolvedValue(null);
@@ -358,44 +293,6 @@ describe('createMaestroTestsBuildFunction', () => {
    );
  });

-  it('never scans flow files when all attempts succeed', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    const discoverySpy = jest.spyOn(discovery, 'buildFlowNameToPathMap');
-
-    const step = createStep({ flow_path: ['flows/a.yaml'], platform: 'android' });
-    await step.executeAsync();
-
-    expect(discoverySpy).not.toHaveBeenCalled();
-  });
-
-  it('memoizes the flow scan across retries (legacy reports)', async () => {
-    // Routing note: the step lands in the legacy arm because the real
-    // junitFileHasFileAttrs returns false — the attempt XML does not exist on
-    // the mock fs. Creating that file with file= attrs would flip the branch.
-    mockedSpawn
-      .mockRejectedValueOnce(rejectExit1())
-      .mockRejectedValueOnce(rejectExit1())
-      .mockResolvedValueOnce(SPAWN_SUCCESS);
-    const discoverySpy = jest
-      .spyOn(discovery, 'buildFlowNameToPathMap')
-      .mockResolvedValue(new Map([['a', 'flows/a.yaml']]));
-    const parseSpy = jest
-      .spyOn(parser, 'parseFailedFlowsFromJUnit')
-      .mockResolvedValue(['flows/a.yaml']);
-
-    const step = createStep({
-      flow_path: ['flows/a.yaml'],
-      retries: 2,
-      output_format: 'junit',
-      platform: 'android',
-    });
-    await step.executeAsync();
-
-    // Two failed attempts hit the legacy branch twice; the scan runs once.
-    expect(parseSpy).toHaveBeenCalledTimes(2);
-    expect(discoverySpy).toHaveBeenCalledTimes(1);
-  });
-
  it('defaults retry_failed_only to true when omitted from inputs', async () => {
    mockedSpawn.mockRejectedValueOnce(rejectExit1()).mockResolvedValueOnce(SPAWN_SUCCESS);
    jest.spyOn(parser, 'parseFailedFlowsFromJUnit').mockResolvedValue(['flows/b.yaml']);
@@ -742,149 +639,4 @@ describe('createMaestroTestsBuildFunction', () => {
    const step = createStep({ flow_path: ['a.yaml'], platform: 'android' }); // no shards
    await step.executeAsync(); // should succeed, not throw
  });
-
-  it('uploads harvested screenshots after the retry loop with metadata', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    const shot = makeShot(0);
-    await fs.writeFile(shot.fileAbsPath, '');
-    mockedHarvest.mockResolvedValue([shot]);
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-    await step.executeAsync();
-
-    expect(mockUploadArtifact).toHaveBeenCalledTimes(1);
-    expect(mockUploadArtifact).toHaveBeenCalledWith(
-      expect.objectContaining({
-        artifact: expect.objectContaining({
-          type: GenericArtifactType.OTHER,
-          name: shot.displayName,
-          metadata: shot.metadata,
-        }),
-      })
-    );
-  });
-
-  it('uploads screenshots even when all attempts fail, before throwing ERR_MAESTRO_TESTS_FAILED', async () => {
-    mockedSpawn.mockRejectedValue(rejectExit1());
-    const shot = makeShot(0);
-    await fs.writeFile(shot.fileAbsPath, '');
-    mockedHarvest.mockResolvedValue([shot]);
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-    await expect(step.executeAsync()).rejects.toThrow(UserError);
-
-    expect(mockUploadArtifact).toHaveBeenCalledTimes(1);
-  });
-
-  it('swallows upload errors without affecting the test verdict', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    const shot = makeShot(0);
-    await fs.writeFile(shot.fileAbsPath, '');
-    mockedHarvest.mockResolvedValue([shot]);
-    mockUploadArtifact.mockRejectedValue(new Error('upload boom'));
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-    await step.executeAsync();
-
-    expect(mockUploadArtifact).toHaveBeenCalledTimes(1);
-  });
-
-  it('skips screenshot upload but preserves the verdict when the JUnit re-parse throws', async () => {
-    mockedSpawn.mockRejectedValue(rejectExit1());
-    mockedHarvest.mockResolvedValue([makeShot(0)]);
-    jest.spyOn(parser, 'parseJUnitTestCases').mockRejectedValue(new Error('malformed junit'));
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-
-    // The classify throw is swallowed; the maestro failure verdict still surfaces.
-    await expect(step.executeAsync()).rejects.toThrow(UserError);
-    expect(mockUploadArtifact).not.toHaveBeenCalled();
-  });
-
-  it('skips screenshot upload but preserves the verdict when the staging dir cannot be created', async () => {
-    mockedSpawn.mockRejectedValue(rejectExit1());
-    mockedHarvest.mockResolvedValue([makeShot(0)]);
-    jest.spyOn(parser, 'parseJUnitTestCases').mockResolvedValue([]);
-    jest.spyOn(fs, 'mkdtemp').mockRejectedValue(new Error('no tmp space'));
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-
-    // mkdtemp failure is swallowed; the maestro failure verdict still surfaces.
-    await expect(step.executeAsync()).rejects.toThrow(UserError);
-    expect(mockUploadArtifact).not.toHaveBeenCalled();
-  });
-
-  it('caps uploads at 30 screenshots (excess dropped)', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    const shots = Array.from({ length: 35 }, (_, index) => makeShot(index));
-    await Promise.all(shots.map(shot => fs.writeFile(shot.fileAbsPath, '')));
-    mockedHarvest.mockResolvedValue(shots);
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-    await step.executeAsync();
-
-    expect(mockUploadArtifact).toHaveBeenCalledTimes(30);
-  });
-
-  it('does not harvest or upload screenshots when output_format is not junit', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'html' });
-    await step.executeAsync();
-
-    expect(mockedHarvest).not.toHaveBeenCalled();
-    expect(mockUploadArtifact).not.toHaveBeenCalled();
-  });
-
-  it('uploads only the final attempt for a pure-failure flow, but every attempt for a flaky flow', async () => {
-    mockedSpawn.mockResolvedValue(SPAWN_SUCCESS);
-    const tc = (name: string, status: 'passed' | 'failed'): parser.JUnitTestCaseResult => ({
-      name,
-      file: undefined,
-      status,
-      duration: 0,
-      errorMessage: null,
-      tags: [],
-      properties: {},
-    });
-    jest
-      .spyOn(parser, 'parseJUnitTestCases')
-      .mockResolvedValue([
-        tc('PureFlow', 'failed'),
-        tc('FlakyFlow', 'failed'),
-        tc('FlakyFlow', 'passed'),
-      ]);
-
-    const makeShotFor = (
-      flowName: string,
-      attemptIndex: number
-    ): maestroScreenshots.HarvestedScreenshot => ({
-      fileAbsPath: path.join(os.tmpdir(), `wiring-${flowName}-${attemptIndex}.png`),
-      displayName: `Failure Screenshot: ${flowName} (attempt ${attemptIndex + 1})`,
-      metadata: {
-        kind: 'maestro-test-screenshot',
-        flowName,
-        attemptIndex,
-        capturedAtMs: 1781186692250 + attemptIndex,
-      },
-    });
-    const shots = [
-      makeShotFor('PureFlow', 0),
-      makeShotFor('PureFlow', 1),
-      makeShotFor('FlakyFlow', 0),
-      makeShotFor('FlakyFlow', 1),
-    ];
-    await Promise.all(shots.map(shot => fs.writeFile(shot.fileAbsPath, '')));
-    mockedHarvest.mockResolvedValue(shots);
-
-    const step = createStep({ flow_path: ['a.yaml'], platform: 'android', output_format: 'junit' });
-    await step.executeAsync();
-
-    // PureFlow keeps only its final attempt (1); FlakyFlow keeps every failed attempt.
-    // Uploads run concurrently, so compare the set, not the order.
-    const uploaded = mockUploadArtifact.mock.calls
-      .map(([arg]) => `${arg.artifact.metadata.flowName}#${arg.artifact.metadata.attemptIndex}`)
-      .sort();
-    expect(uploaded).toEqual(['FlakyFlow#0', 'FlakyFlow#1', 'PureFlow#1']);
-  });
 });
@@ -3,7 +3,6 @@ import { vol } from 'memfs';

 import { createGlobalContextMock } from '../../../__tests__/utils/context';
 import { createMockLogger } from '../../../__tests__/utils/logger';
-import * as discovery from '../maestroFlowDiscovery';
 import { createReportMaestroTestResultsFunction } from '../reportMaestroTestResults';

 const JUNIT_PASS = [
@@ -44,24 +43,15 @@ describe(createReportMaestroTestResultsFunction, () => {
    } as unknown as Client;
  });

-  // Returns a mock logger whose child() is itself, so step-level log calls can
-  // be asserted on the returned object.
-  function createSelfChildedLogger(): ReturnType<typeof createMockLogger> {
-    const logger = createMockLogger();
-    (logger.child as jest.Mock).mockReturnValue(logger);
-    return logger;
-  }
-
  function createStep(overrides?: {
    callInputs?: Record<string, unknown>;
    staticContextContent?: Record<string, unknown>;
    env?: Record<string, string>;
-    logger?: ReturnType<typeof createMockLogger>;
  }) {
    const ctx = { graphqlClient: mockGraphqlClient };
    const fn = createReportMaestroTestResultsFunction(ctx as any);
    const globalCtx = createGlobalContextMock({
-      logger: overrides?.logger ?? createMockLogger(),
+      logger: createMockLogger(),
      projectTargetDirectory: '/root/project',
      staticContextContent: {
        expoApiServerURL: 'https://api.expo.test',
@@ -115,54 +105,6 @@ describe(createReportMaestroTestResultsFunction, () => {
    ]);
  });

-  it('reports both flows when two share a name but have distinct file= paths', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file="a/login.yaml" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="login" file="b/login.yaml" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    mockMutationFn.mockResolvedValue({
-      data: {
-        workflowDeviceTestCaseResult: {
-          createWorkflowDeviceTestCaseResults: [{ id: '1' }, { id: '2' }],
-        },
-      },
-    });
-    await createStep().executeAsync();
-    expect(mockGraphqlClient.mutation).toHaveBeenCalledTimes(1);
-    const [, variables] = (mockGraphqlClient.mutation as jest.Mock).mock.calls[0];
-    expect(variables.input.testCaseResults.map((r: any) => r.path).sort()).toEqual([
-      'a/login.yaml',
-      'b/login.yaml',
-    ]);
-  });
-
-  it('never scans flow files for a file= report, even when flow_path is provided', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file="flows/login.yaml" status="SUCCESS" time="1.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-    const discoverySpy = jest.spyOn(discovery, 'buildFlowNameToPathMap');
-    mockMutationFn.mockResolvedValue({
-      data: {
-        workflowDeviceTestCaseResult: { createWorkflowDeviceTestCaseResults: [{ id: '1' }] },
-      },
-    });
-
-    await createStep({ callInputs: { flow_path: ['flows/login.yaml'] } }).executeAsync();
-
-    expect(mockGraphqlClient.mutation).toHaveBeenCalledTimes(1);
-    expect(discoverySpy).not.toHaveBeenCalled();
-  });
-
  it('sends tags and properties from JUnit XML', async () => {
    vol.fromJSON({
      '/junit/report.xml': [
@@ -279,7 +221,7 @@ describe(createReportMaestroTestResultsFunction, () => {
    await createStep().executeAsync();
  });

-  it('skips report when duplicate testcase names found (legacy), advising unique names', async () => {
+  it('skips report when duplicate testcase names found', async () => {
    vol.fromJSON({
      '/junit/report.xml': [
        '<?xml version="1.0"?>',
@@ -296,27 +238,8 @@ describe(createReportMaestroTestResultsFunction, () => {
      }),
    });

-    const logger = createSelfChildedLogger();
-    await createStep({ logger }).executeAsync();
+    await createStep().executeAsync();
    expect(mockGraphqlClient.mutation).not.toHaveBeenCalled();
-    expect(logger.error).toHaveBeenCalledWith(expect.stringContaining('unique name'));
-  });
-
-  it('skips report when the same flow file appears twice in one attempt, advising flow_path check', async () => {
-    vol.fromJSON({
-      '/junit/report.xml': [
-        '<?xml version="1.0"?>',
-        '<testsuites><testsuite>',
-        '  <testcase name="login" file="flows/login.yaml" status="SUCCESS" time="1.0"/>',
-        '  <testcase name="login" file="flows/login.yaml" status="SUCCESS" time="2.0"/>',
-        '</testsuite></testsuites>',
-      ].join('\n'),
-    });
-
-    const logger = createSelfChildedLogger();
-    await createStep({ logger }).executeAsync();
-    expect(mockGraphqlClient.mutation).not.toHaveBeenCalled();
-    expect(logger.error).toHaveBeenCalledWith(expect.stringContaining('flow_path entries'));
  });

  it('sends per-attempt results with same name but different retryCount', async () => {
@@ -1,72 +0,0 @@
-import { SystemError } from '@expo/eas-build-job';
-import { type bunyan } from '@expo/logger';
-
-import {
-  MIN_ARGENT_REMOTE_SESSION_VERSION,
-  warnIfArgentPackageVersionCannotBeVerified,
-} from '../startArgentRemoteSession';
-
-describe(warnIfArgentPackageVersionCannotBeVerified, () => {
-  const warn = jest.fn();
-  const logger = { warn } as unknown as bunyan;
-  const supportedVersion = '999.0.0';
-  const oldVersion = '0.0.0';
-
-  beforeEach(() => {
-    warn.mockClear();
-  });
-
-  it('allows the default latest package version', () => {
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: undefined, logger })
-    ).not.toThrow();
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: 'latest', logger })
-    ).not.toThrow();
-    expect(warn).not.toHaveBeenCalled();
-  });
-
-  it('allows exact supported semver versions', () => {
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({
-        packageVersion: MIN_ARGENT_REMOTE_SESSION_VERSION,
-        logger,
-      })
-    ).not.toThrow();
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: supportedVersion, logger })
-    ).not.toThrow();
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({
-        packageVersion: `v${supportedVersion}`,
-        logger,
-      })
-    ).not.toThrow();
-    expect(warn).not.toHaveBeenCalled();
-  });
-
-  it('rejects exact semver versions that are too old', () => {
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: oldVersion, logger })
-    ).toThrow(SystemError);
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: oldVersion, logger })
-    ).toThrow(`Use "latest" or pass an exact version >= ${MIN_ARGENT_REMOTE_SESSION_VERSION}`);
-  });
-
-  it('warns for package tags or ranges that cannot be verified', () => {
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion: 'next', logger })
-    ).not.toThrow();
-    expect(() =>
-      warnIfArgentPackageVersionCannotBeVerified({
-        packageVersion: `^${MIN_ARGENT_REMOTE_SESSION_VERSION}`,
-        logger,
-      })
-    ).not.toThrow();
-    expect(warn).toHaveBeenCalledTimes(2);
-    expect(warn).toHaveBeenCalledWith(
-      expect.stringContaining('Continuing and letting bunx resolve it.')
-    );
-  });
-});
@@ -1,76 +0,0 @@
-import spawn from '@expo/turtle-spawn';
-
-import { createGlobalContextMock } from '../../../__tests__/utils/context';
-import { createMockLogger } from '../../../__tests__/utils/logger';
-import { IosSimulatorUtils } from '../../../utils/IosSimulatorUtils';
-import { createStartIosSimulatorBuildFunction } from '../startIosSimulator';
-
-jest.mock('@expo/turtle-spawn', () => ({
-  __esModule: true,
-  default: jest.fn(),
-}));
-
-jest.mock('../../../utils/IosSimulatorUtils', () => ({
-  IosSimulatorUtils: {
-    getAvailableDevicesAsync: jest.fn(),
-    getDeviceAsync: jest.fn(),
-    cloneAsync: jest.fn(),
-    startAsync: jest.fn(),
-    waitForReadyAsync: jest.fn(),
-    disableApsdAsync: jest.fn(),
-  },
-}));
-
-const mockedSpawn = jest.mocked(spawn);
-const mockedUtils = jest.mocked(IosSimulatorUtils);
-
-function createStep(callInputs?: Record<string, unknown>) {
-  const logger = createMockLogger();
-  const fn = createStartIosSimulatorBuildFunction();
-  const globalCtx = createGlobalContextMock({ logger });
-  const step = fn.createBuildStepFromFunctionCall(globalCtx, { callInputs });
-  return Object.assign(step, { logger });
-}
-
-describe(createStartIosSimulatorBuildFunction, () => {
-  beforeEach(() => {
-    mockedSpawn.mockResolvedValue({ stdout: '', stderr: '' } as any);
-    mockedUtils.getAvailableDevicesAsync.mockResolvedValue([]);
-    mockedUtils.getDeviceAsync.mockResolvedValue(null);
-    mockedUtils.cloneAsync.mockResolvedValue(undefined);
-    mockedUtils.startAsync.mockResolvedValue({ udid: 'test-udid' as any });
-    mockedUtils.waitForReadyAsync.mockResolvedValue(undefined);
-    mockedUtils.disableApsdAsync.mockResolvedValue(undefined);
-  });
-
-  it('disables apsd on the main device and every clone', async () => {
-    mockedUtils.startAsync
-      .mockResolvedValueOnce({ udid: 'base' as any })
-      .mockResolvedValueOnce({ udid: 'clone-1' as any })
-      .mockResolvedValueOnce({ udid: 'clone-2' as any });
-
-    await createStep({ device_identifier: 'iPhone 15', count: 2 }).executeAsync();
-
-    expect(mockedUtils.disableApsdAsync).toHaveBeenCalledWith({
-      udid: 'base',
-      env: expect.any(Object),
-    });
-    expect(mockedUtils.disableApsdAsync).toHaveBeenCalledWith({
-      udid: 'clone-1',
-      env: expect.any(Object),
-    });
-    expect(mockedUtils.disableApsdAsync).toHaveBeenCalledWith({
-      udid: 'clone-2',
-      env: expect.any(Object),
-    });
-  });
-
-  it('continues when disabling apsd fails', async () => {
-    mockedUtils.disableApsdAsync.mockRejectedValue(new Error('apsd disable failed'));
-
-    await createStep({ device_identifier: 'iPhone 15', count: 2 }).executeAsync();
-
-    // Startup is not aborted: readiness is still awaited for each device.
-    expect(mockedUtils.waitForReadyAsync).toHaveBeenCalled();
-  });
-});
@@ -120,44 +120,4 @@ describe(createUploadArtifactBuildFunction, () => {
    const typeInput = buildStep.inputs?.find(input => input.id === 'type')!;
    expect(typeInput.isRawValueOneOfAllowedValues()).toBe(false);
  });
-
-  it('passes the metadata input through to runtimeApi.uploadArtifact', async () => {
-    contextUploadArtifact.mockClear();
-    const metadata = { kind: 'screen-recording', startedAtMs: '123', device: 'emulator-5554' };
-    const buildStep = uploadArtifact.createBuildStepFromFunctionCall(createGlobalContextMock({}), {
-      callInputs: {
-        // Generic ('other') artifact: only generic artifacts persist metadata in the worker
-        // (the managed-type upload paths drop it), so that's the type metadata is meant for.
-        type: 'other',
-        key: 'Screen Recording',
-        path: '/',
-        metadata,
-      },
-    });
-
-    await buildStep.executeAsync();
-
-    expect(contextUploadArtifact).toHaveBeenCalledWith(
-      expect.objectContaining({ artifact: expect.objectContaining({ metadata }) })
-    );
-  });
-
-  it('does not attach metadata to managed artifact types (the worker drops it)', async () => {
-    contextUploadArtifact.mockClear();
-    const buildStep = uploadArtifact.createBuildStepFromFunctionCall(createGlobalContextMock({}), {
-      callInputs: {
-        type: 'build-artifact',
-        path: '/',
-        metadata: { kind: 'screen-recording' },
-      },
-    });
-
-    await buildStep.executeAsync();
-
-    expect(contextUploadArtifact).toHaveBeenCalledWith(
-      expect.objectContaining({
-        artifact: expect.not.objectContaining({ metadata: expect.anything() }),
-      })
-    );
-  });
 });
@@ -1,4 +1,4 @@
-import { SystemError, UserError } from '@expo/eas-build-job';
+import { UserError } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
 import { asyncResult } from '@expo/results';
 import {
@@ -7,9 +7,7 @@ import {
  BuildStepInputValueTypeName,
  BuildStepOutput,
 } from '@expo/steps';
-import { Client } from '@urql/core';
 import { glob } from 'fast-glob';
-import { graphql } from 'gql.tada';
 import fetch from 'node-fetch';
 import fs from 'node:fs';
 import os from 'node:os';
@@ -18,7 +16,6 @@ import stream from 'stream';
 import { promisify } from 'util';
 import { z } from 'zod';

-import { CustomBuildContext } from '../../customBuildContext';
 import { formatBytes } from '../../utils/artifacts';
 import { decompressTarAsync, isFileTarGzAsync } from '../../utils/files';
 import { retryOnDNSFailure } from '../../utils/retryOnDNSFailure';
@@ -26,21 +23,7 @@ import { pluralize } from '../../utils/strings';

 const streamPipeline = promisify(stream.pipeline);

-const BUILD_BY_ID_QUERY = graphql(`
-  query DownloadBuildByIdQuery($buildId: ID!) {
-    builds {
-      byId(buildId: $buildId) {
-        id
-        platform
-        artifacts {
-          applicationArchiveUrl
-        }
-      }
-    }
-  }
-`);
-
-export function createDownloadBuildFunction(ctx: CustomBuildContext): BuildFunction {
+export function createDownloadBuildFunction(): BuildFunction {
  return new BuildFunction({
    namespace: 'eas',
    id: 'download_build',
@@ -76,7 +59,7 @@ export function createDownloadBuildFunction(ctx: CustomBuildContext): BuildFunct
      const { artifactPath } = await downloadBuildAsync({
        logger,
        buildId,
-        graphqlClient: ctx.graphqlClient,
+        expoApiServerURL: stepsCtx.global.staticContext.expoApiServerURL,
        robotAccessToken: stepsCtx.global.staticContext.job.secrets?.robotAccessToken ?? null,
        extensions,
      });
@@ -86,45 +69,16 @@ export function createDownloadBuildFunction(ctx: CustomBuildContext): BuildFunct
  });
 }

-async function fetchApplicationArchiveUrlAsync({
-  buildId,
-  graphqlClient,
-}: {
-  buildId: string;
-  graphqlClient: Client;
-}): Promise<string> {
-  const result = await graphqlClient.query(BUILD_BY_ID_QUERY, { buildId }).toPromise();
-
-  if (result.error) {
-    const { error } = result;
-    const message = `Could not fetch build ${buildId}: ${error.message}`;
-
-    throw error.networkError || result.error.response?.status >= 500
-      ? new SystemError(message, { cause: error })
-      : new UserError('EAS_DOWNLOAD_BUILD_FETCH_FAILED', message, { cause: error });
-  }
-
-  const applicationArchiveUrl = result.data?.builds.byId?.artifacts?.applicationArchiveUrl;
-  if (!applicationArchiveUrl) {
-    throw new UserError(
-      'EAS_DOWNLOAD_BUILD_NO_APPLICATION_ARCHIVE',
-      'Build does not have an application archive url'
-    );
-  }
-
-  return applicationArchiveUrl;
-}
-
 export async function downloadBuildAsync({
  logger,
  buildId,
-  graphqlClient,
+  expoApiServerURL,
  robotAccessToken,
  extensions,
 }: {
  logger: bunyan;
  buildId: string;
-  graphqlClient: Client;
+  expoApiServerURL: string;
  robotAccessToken: string | null;
  extensions: string[];
 }): Promise<{ artifactPath: string }> {
@@ -132,11 +86,12 @@ export async function downloadBuildAsync({
    path.join(os.tmpdir(), 'download_build-downloaded-')
  );

-  const downloadUrl = await fetchApplicationArchiveUrlAsync({ buildId, graphqlClient });
-
-  const response = await retryOnDNSFailure(fetch)(downloadUrl, {
-    headers: robotAccessToken ? { Authorization: `Bearer ${robotAccessToken}` } : undefined,
-  });
+  const response = await retryOnDNSFailure(fetch)(
+    new URL(`/v2/artifacts/eas/${buildId}`, expoApiServerURL),
+    {
+      headers: robotAccessToken ? { Authorization: `Bearer ${robotAccessToken}` } : undefined,
+    }
+  );

  if (!response.ok) {
    const textResult = await asyncResult(response.text());
@@ -26,14 +26,14 @@ export function createFindAndUploadBuildArtifactsBuildFunction(
      try {
        await uploadApplicationArchivesAsync({ ctx, stepCtx });
      } catch (err: unknown) {
-        stepCtx.logger.error({ err }, `Failed to upload application archives.`);
+        stepCtx.logger.error(`Failed to upload application archives.`, err);
        firstError ||= err;
      }

      try {
        await uploadBuildArtifacts({ ctx, stepCtx });
      } catch (err: unknown) {
-        stepCtx.logger.error({ err }, `Failed to upload build artifacts.`);
+        stepCtx.logger.error(`Failed to upload build artifacts.`, err);
        firstError ||= err;
      }

@@ -15,8 +15,6 @@ import fs from 'fs';
 import os from 'os';
 import path from 'path';

-import { Datadog } from '../../datadog';
-
 export function createInstallMaestroBuildFunction(): BuildFunction {
  return new BuildFunction({
    namespace: 'eas',
@@ -125,24 +123,13 @@ export function createInstallMaestroBuildFunction(): BuildFunction {

      logger.info(`Maestro ${maestroVersionResult.value} is ready.`);
      outputs.maestro_version.set(maestroVersionResult.value);
-
-      Datadog.distribution('eas.maestro.install', 1, {
-        maestro_version: maestroVersionResult.value,
-      });
    },
  });
 }

 async function getMaestroVersion({ env }: { env: BuildStepEnv }): Promise<string> {
-  const { stdout } = await spawn('maestro', ['--version'], { stdio: 'pipe', env });
-  // `maestro --version` can print an analytics notice to stdout before the version,
-  // e.g. "Anonymous analytics enabled. To opt out, set MAESTRO_CLI_NO_ANALYTICS...\n2.0.10".
-  // Take the last version-looking token: the real version is printed after the notice, so
-  // this stays correct even if the notice itself contains a version-like string. Keeps the
-  // step output and the eas.maestro.install metric tag clean. Best-effort only: fall back to
-  // the raw output if none is found, so we never fail the build over a version string.
-  const versions = stdout.match(/\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?/g);
-  return versions?.at(-1) ?? stdout.trim();
+  const maestroVersion = await spawn('maestro', ['--version'], { stdio: 'pipe', env });
+  return maestroVersion.stdout.trim();
 }

 async function installMaestro({
@@ -1,4 +1,3 @@
-import { asyncResult } from '@expo/results';
 import { XMLBuilder, XMLParser, XMLValidator } from 'fast-xml-parser';
 import fs from 'fs/promises';
 import path from 'path';
@@ -19,7 +18,6 @@ const ATTEMPT_PATTERN = /attempt-(\d+)/;

 export interface JUnitTestCaseResult {
  name: string;
-  file: string | undefined;
  status: 'passed' | 'failed';
  duration: number; // milliseconds
  errorMessage: string | null;
@@ -34,12 +32,6 @@ const xmlParser = new XMLParser({
  isArray: name => ['testsuite', 'testcase', 'property'].includes(name),
 });

-// A `file=` attribute counts as present only when it is a non-empty string.
-function fileAttrOf(tc: any): string | undefined {
-  const f = tc?.['@_file'];
-  return typeof f === 'string' && f.length > 0 ? f : undefined;
-}
-
 function parseJUnitContent(content: string): JUnitTestCaseResult[] {
  const results: JUnitTestCaseResult[] = [];
  try {
@@ -62,8 +54,6 @@ function parseJUnitContent(content: string): JUnitTestCaseResult[] {
          continue;
        }

-        const file = fileAttrOf(tc);
-
        const timeStr = tc['@_time'];
        const timeSeconds = timeStr ? parseFloat(timeStr) : 0;
        const duration = Number.isFinite(timeSeconds) ? Math.round(timeSeconds * 1000) : 0;
@@ -104,7 +94,7 @@ function parseJUnitContent(content: string): JUnitTestCaseResult[] {
          : [];
        delete properties['tags'];

-        results.push({ name, file, status, duration, errorMessage, tags, properties });
+        results.push({ name, status, duration, errorMessage, tags, properties });
      }
    }
  } catch {
@@ -141,142 +131,6 @@ export async function parseJUnitTestCases(junitDirectory: string): Promise<JUnit
  return perFile.flat();
 }

-// ---------------------------------------------------------------------------
-// Maestro >= 2.6.0 code path: every <testcase> carries a `file=` attribute with
-// its flow's own path (all-or-none per run). Callers check the report first
-// (isFileAttrRun / junitFileHasFileAttrs) and route here; the legacy name→path
-// scan is then never consulted.
-// ---------------------------------------------------------------------------
-
-export function isFileAttrRun(
-  testcases: JUnitTestCaseResult[]
-): testcases is (JUnitTestCaseResult & { file: string })[] {
-  return testcases.length > 0 && testcases.every(tc => tc.file !== undefined);
-}
-
-// Unreadable or attribute-less reports ⇒ false: the caller then takes the
-// legacy path, whose own guards degrade safely.
-export async function junitFileHasFileAttrs(junitFile: string): Promise<boolean> {
-  return isFileAttrRun(await parseJUnitFile(junitFile));
-}
-
-async function fileExists(absPath: string): Promise<boolean> {
-  return (await asyncResult(fs.stat(absPath))).ok;
-}
-
-// Group by `file=` so two same-named flows in different files stay separate.
-export async function parseMaestroResultsFromFileAttrs(
-  junitDirectory: string
-): Promise<MaestroFlowResult[]> {
-  interface JUnitEntry {
-    result: JUnitTestCaseResult;
-    sourceFile: string;
-  }
-
-  let junitEntries: string[];
-  try {
-    junitEntries = await fs.readdir(junitDirectory);
-  } catch {
-    return [];
-  }
-  const xmlFiles = junitEntries.filter(f => f.endsWith('.xml')).sort();
-
-  const entries: JUnitEntry[] = [];
-  for (const xmlFile of xmlFiles) {
-    const fileResults = await parseJUnitFile(path.join(junitDirectory, xmlFile));
-    for (const result of fileResults) {
-      entries.push({ result, sourceFile: xmlFile });
-    }
-  }
-
-  const byPath = new Map<string, JUnitEntry[]>();
-  for (const entry of entries) {
-    // Callers verify the report with isFileAttrRun/junitFileHasFileAttrs first;
-    // skip (rather than emit an undefined path) if that contract is violated.
-    const flowPath = entry.result.file;
-    if (flowPath === undefined) {
-      continue;
-    }
-    const group = byPath.get(flowPath) ?? [];
-    group.push(entry);
-    byPath.set(flowPath, group);
-  }
-
-  const results: MaestroFlowResult[] = [];
-  for (const [flowPath, group] of byPath) {
-    // retryCount is derived from each entry's source filename (`attempt-N`);
-    // a single entry from `report.xml` (no marker) collapses to attempt 0.
-    const sorted = group
-      .map(entry => {
-        const match = entry.sourceFile.match(ATTEMPT_PATTERN);
-        const attemptIndex = match ? parseInt(match[1], 10) : 0;
-        return { ...entry, attemptIndex };
-      })
-      .sort((a, b) => a.attemptIndex - b.attemptIndex);
-
-    for (const { result, attemptIndex } of sorted) {
-      results.push({
-        name: result.name,
-        path: flowPath,
-        status: result.status,
-        errorMessage: result.errorMessage,
-        duration: result.duration,
-        retryCount: attemptIndex,
-        tags: result.tags,
-        properties: result.properties,
-      });
-    }
-  }
-  return results;
-}
-
-/**
- * Returns the `file=` paths of the failing testcases in the given attempt's
- * JUnit file, or `null` when the result cannot be trusted (caller then falls
- * back to dumb retry — re-run everything; never the legacy scan).
- *
- * Callers verify the report carries `file=` attributes first
- * (junitFileHasFileAttrs).
- */
-export async function parseFailedFlowsFromFileAttrs(args: {
-  junitFile: string;
-  workingDirectory: string;
-}): Promise<string[] | null> {
-  // Same hardening as the legacy parser: fast-xml-parser is lenient — a
-  // truncated XML could drop testcases, and trusting that partial failing set
-  // would skip retries for cut-off flows.
-  let content: string;
-  try {
-    content = await fs.readFile(args.junitFile, 'utf-8');
-  } catch {
-    return null;
-  }
-  if (XMLValidator.validate(content) !== true) {
-    return null;
-  }
-
-  const testcases = parseJUnitContent(content);
-  if (!isFileAttrRun(testcases)) {
-    return null;
-  }
-
-  const failing = testcases.filter(tc => tc.status === 'failed');
-  if (failing.length === 0) {
-    return [];
-  }
-
-  // Each failing testcase is self-identifying via `file=`, so duplicate flow
-  // names retry correctly. path.resolve (not join): `file=` may be absolute
-  // when the flow lives outside the working directory.
-  const paths = [...new Set(failing.map(tc => tc.file))];
-  for (const p of paths) {
-    if (!(await fileExists(path.resolve(args.workingDirectory, p)))) {
-      return null;
-    }
-  }
-  return paths;
-}
-
 export async function parseMaestroResults(
  junitDirectory: string,
  nameToPath: Map<string, string> | null
@@ -459,13 +313,6 @@ export async function mergeJUnitReports(args: {
    }
    const match = filename.match(ATTEMPT_PATTERN);
    const attemptIndex = match ? parseInt(match[1], 10) : 0;
-    // Maestro >= 2.6.0 reports: key by `file=` so two same-named flows in
-    // different files merge separately. Legacy reports keep name keying.
-    const allCases = testsuites.flatMap((suite: any) =>
-      Array.isArray(suite?.testcase) ? suite.testcase : []
-    );
-    const useFileKeys =
-      allCases.length > 0 && allCases.every((tc: any) => fileAttrOf(tc) !== undefined);
    const testcasesByName = new Map<string, unknown[]>();
    for (const suite of testsuites) {
      const cases = suite?.testcase;
@@ -477,10 +324,9 @@ export async function mergeJUnitReports(args: {
        if (typeof name !== 'string') {
          continue;
        }
-        const key = useFileKeys ? fileAttrOf(tc)! : name;
-        const group = testcasesByName.get(key) ?? [];
+        const group = testcasesByName.get(name) ?? [];
        group.push(tc);
-        testcasesByName.set(key, group);
+        testcasesByName.set(name, group);
      }
    }
    if (testcasesByName.size === 0) {
@@ -1,159 +0,0 @@
-import { bunyan } from '@expo/logger';
-import { type Dirent } from 'fs';
-import fs from 'fs/promises';
-import path from 'path';
-
-export interface ParsedFailureScreenshot {
-  flowName: string;
-  capturedAtMs: number;
-}
-
-// Maestro failure screenshot: `screenshot-[shard-N-]❌-<epochMillis>-(<flowName>).png`.
-// The flow name may contain parentheses, so anchor on the `-(` after the epoch and the
-// `).png` suffix rather than scanning for parens.
-const FAILURE_SCREENSHOT_PATTERN = /^screenshot-(?:shard-\d+-)?❌-(\d+)-\((.+)\)\.png$/u;
-
-export function parseFailureScreenshotFilename(filename: string): ParsedFailureScreenshot | null {
-  const match = filename.match(FAILURE_SCREENSHOT_PATTERN);
-  if (!match) {
-    return null;
-  }
-  const capturedAtMs = Number(match[1]);
-  if (!Number.isFinite(capturedAtMs)) {
-    return null;
-  }
-  return {
-    flowName: match[2],
-    capturedAtMs,
-  };
-}
-
-export interface HarvestedScreenshot {
-  fileAbsPath: string;
-  displayName: string; // `Failure Screenshot: <flowName> (attempt <n>)`
-  metadata: {
-    kind: 'maestro-test-screenshot';
-    // The Maestro flow name straight from the filename (already '/'->'_' substituted by
-    // Maestro). The website matches this against `attempt.name` (normalized the same way).
-    flowName: string;
-    attemptIndex: number;
-    capturedAtMs: number;
-  };
-}
-
-// Scans every debug dir under testsDirectory whose mtime is recent enough (mtime-based to cover
-// the maestro <2.5.0 bug that splits one invocation across two dirs), then keeps only screenshots
-// whose own capturedAtMs is at/after capturedSinceMs. Never throws: an unreadable dir is logged
-// and skipped so a screenshot harvest can't affect the maestro step outcome.
-export async function harvestFailureScreenshotsAsync(args: {
-  testsDirectory: string;
-  capturedSinceMs: number;
-  attemptIndex: number;
-  logger: bunyan;
-}): Promise<HarvestedScreenshot[]> {
-  // Gate dirs by mtime floored to the second, so a dir created within the same second as the
-  // attempt start isn't stat'd below the baseline. The exact capturedAtMs gate below is what
-  // prevents mis-attributing an earlier attempt's screenshot.
-  const dirSinceMtimeMs = Math.floor(args.capturedSinceMs / 1000) * 1000;
-  let entries: Dirent[];
-  try {
-    entries = await fs.readdir(args.testsDirectory, { withFileTypes: true });
-  } catch (err: any) {
-    args.logger.info({ err }, `Skipping screenshot harvest: cannot read ${args.testsDirectory}.`);
-    return [];
-  }
-
-  const results: HarvestedScreenshot[] = [];
-  for (const entry of entries) {
-    if (!entry.isDirectory()) {
-      continue;
-    }
-    const dirPath = path.join(args.testsDirectory, entry.name);
-    let filenames: string[];
-    try {
-      if ((await fs.stat(dirPath)).mtimeMs < dirSinceMtimeMs) {
-        continue;
-      }
-      filenames = await fs.readdir(dirPath);
-    } catch (err: any) {
-      args.logger.info({ err }, `Skipping unreadable debug dir ${dirPath}.`);
-      continue;
-    }
-    for (const filename of filenames) {
-      const parsed = parseFailureScreenshotFilename(filename);
-      // Re-check capture time per file: a dir's mtime can advance after this attempt began (or
-      // fall within the floored-second dir baseline), so the dir gate alone would re-attribute an
-      // earlier attempt's screenshot to this one.
-      if (parsed === null || parsed.capturedAtMs < args.capturedSinceMs) {
-        continue;
-      }
-      results.push({
-        fileAbsPath: path.join(dirPath, filename),
-        displayName: `Failure Screenshot: ${parsed.flowName} (attempt ${args.attemptIndex + 1})`,
-        metadata: {
-          kind: 'maestro-test-screenshot',
-          flowName: parsed.flowName,
-          attemptIndex: args.attemptIndex,
-          capturedAtMs: parsed.capturedAtMs,
-        },
-      });
-    }
-  }
-  return results;
-}
-
-// Maestro substitutes '/' -> '_' in screenshot filenames (so HarvestedScreenshot.flowName
-// is already in that form) but keeps '/' in the JUnit testcase name. Normalize the JUnit
-// name the same way before comparing — matching the website's own normalization.
-function normalizeFlowName(name: string): string {
-  return name.replace(/\//g, '_');
-}
-
-// A flow is a "pure failure" when it failed and never passed across all attempts. The website
-// surfaces only the final screenshot for such a flow, so keeping its earlier attempts would
-// spend the per-job artifact budget on screenshots that are never shown — we keep only the final
-// one (selectFailureScreenshots). A flow that passed at least once (flaky / fail-pass-fail) is
-// NOT pure: each of its failed attempts is a distinct failure and is kept.
-export function computePureFailureFlowNames(
-  testCases: readonly { name: string; status: 'passed' | 'failed' }[]
-): Set<string> {
-  const passed = new Set<string>();
-  const failed = new Set<string>();
-  for (const testCase of testCases) {
-    const flowName = normalizeFlowName(testCase.name);
-    if (testCase.status === 'passed') {
-      passed.add(flowName);
-    } else {
-      failed.add(flowName);
-    }
-  }
-  const pure = new Set<string>();
-  for (const flowName of failed) {
-    if (!passed.has(flowName)) {
-      pure.add(flowName);
-    }
-  }
-  return pure;
-}
-
-// Keep every harvested screenshot for flaky/mixed flows; for pure-failure flows keep only
-// the final (highest attemptIndex) screenshot.
-export function selectFailureScreenshots(
-  harvested: readonly HarvestedScreenshot[],
-  pureFailureFlowNames: ReadonlySet<string>
-): HarvestedScreenshot[] {
-  const finalAttemptByPureFlow = new Map<string, number>();
-  for (const shot of harvested) {
-    if (!pureFailureFlowNames.has(shot.metadata.flowName)) {
-      continue;
-    }
-    const finalAttempt = finalAttemptByPureFlow.get(shot.metadata.flowName);
-    if (finalAttempt === undefined || shot.metadata.attemptIndex > finalAttempt) {
-      finalAttemptByPureFlow.set(shot.metadata.flowName, shot.metadata.attemptIndex);
-    }
-  }
-  return harvested.filter(shot => {
-    const finalAttempt = finalAttemptByPureFlow.get(shot.metadata.flowName);
-    return finalAttempt === undefined || shot.metadata.attemptIndex === finalAttempt;
-  });
-}
@@ -1,5 +1,4 @@
-import { GenericArtifactType, SystemError, UserError } from '@expo/eas-build-job';
-import { bunyan } from '@expo/logger';
+import { SystemError, UserError } from '@expo/eas-build-job';
 import {
  BuildFunction,
  BuildRuntimePlatform,
@@ -9,26 +8,15 @@ import {
 } from '@expo/steps';
 import spawn from '@expo/turtle-spawn';
 import fs from 'fs/promises';
-import os from 'os';
 import path from 'path';
 import { z } from 'zod';

 import { buildFlowNameToPathMap } from './maestroFlowDiscovery';
 import {
  copyLatestAttemptXml,
-  junitFileHasFileAttrs,
  mergeJUnitReports,
-  parseFailedFlowsFromFileAttrs,
  parseFailedFlowsFromJUnit,
-  parseJUnitTestCases,
 } from './maestroResultParser';
-import {
-  type HarvestedScreenshot,
-  computePureFailureFlowNames,
-  harvestFailureScreenshotsAsync,
-  selectFailureScreenshots,
-} from './maestroScreenshots';
-import { CustomBuildContext } from '../../customBuildContext';
 import { sleepAsync } from '../../utils/retry';

 const FlowPathSchema = z.array(z.string().min(1)).min(1);
@@ -91,7 +79,7 @@ function buildMaestroArgs(args: {
  return out;
 }

-export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildFunction {
+export function createMaestroTestsBuildFunction(): BuildFunction {
  return new BuildFunction({
    namespace: 'eas',
    id: 'maestro_tests',
@@ -212,10 +200,13 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
        throw new SystemError('Failed to create JUnit report directory', { cause: err });
      }

-      // Legacy-only (Maestro < 2.6.0 reports carry no `file=` attribute): the
-      // flow scan is built lazily in the retry branch below and memoized so
-      // retries share one scan. Never runs when the report has `file=`.
-      let nameToPathPromise: Promise<Map<string, string> | null> | undefined;
+      // null → duplicate flow names; retry-failed-only disabled, fall through to
+      // dumb retry (re-run everything) on failure.
+      const nameToPath = await buildFlowNameToPathMap({
+        inputFlowPaths: flowPaths,
+        projectRoot: stepCtx.workingDirectory,
+        logger,
+      });

      // Retry loop. spawn-async error shapes:
      //   ENOENT/EACCES → infra (binary missing/not executable) → SystemError.
@@ -223,11 +214,10 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
      //   else (signal-only, OOM kill, unknown) → infra → SystemError, never
      //     downgraded to "tests failed".
      // Retry-failed-only (junit mode): after a failed attempt, subset to the failing
-      // flows. The failed-flow parsers return null when the JUnit cannot be
+      // flows. parseFailedFlowsFromJUnit returns null when the JUnit cannot be
      // trusted; we then fall through to dumb retry (re-run everything).
      let flowsToRun: string[] = flowPaths;
      let lastAttemptExitCode: number | null = null;
-      const harvested: HarvestedScreenshot[] = [];

      const totalAttempts = retries + 1;
      for (let attempt = 0; attempt <= retries; attempt++) {
@@ -250,8 +240,6 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
          `Running maestro (attempt ${attempt + 1}/${totalAttempts}): maestro ${maestroArgs.join(' ')}`
        );

-        const attemptStartedAtMs = Date.now();
-
        try {
          await spawn('maestro', maestroArgs, {
            cwd: stepCtx.workingDirectory,
@@ -271,44 +259,15 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
          }
        }

-        // Harvest this attempt's failure screenshots before any retry subsetting. Gated on
-        // junit: test-case-result rows (and therefore the summary icons) only exist for junit
-        // runs, so harvesting other formats would just create orphan artifacts the website hides.
-        if (outputFormat === 'junit') {
-          harvested.push(
-            ...(await harvestFailureScreenshotsAsync({
-              testsDirectory,
-              capturedSinceMs: attemptStartedAtMs,
-              attemptIndex: attempt,
-              logger,
-            }))
-          );
-        }
-
        if (lastAttemptExitCode === 0 || attempt === retries) {
          break;
        }

-        if (retryFailedOnly && outputFormat === 'junit' && outputPath) {
-          let failed: string[] | null;
-          if (await junitFileHasFileAttrs(outputPath)) {
-            failed = await parseFailedFlowsFromFileAttrs({
-              junitFile: outputPath,
-              workingDirectory: stepCtx.workingDirectory,
-            });
-          } else {
-            // Legacy (Maestro < 2.6.0): map failed testcase names back to flow
-            // paths via the flow-file scan. DELETE this arm once the fleet is
-            // on >= 2.6.0.
-            const nameToPath = await (nameToPathPromise ??= buildFlowNameToPathMap({
-              inputFlowPaths: flowPaths,
-              projectRoot: stepCtx.workingDirectory,
-              logger,
-            }));
-            failed = nameToPath
-              ? await parseFailedFlowsFromJUnit({ junitFile: outputPath, nameToPath })
-              : null;
-          }
+        if (retryFailedOnly && outputFormat === 'junit' && outputPath && nameToPath) {
+          const failed = await parseFailedFlowsFromJUnit({
+            junitFile: outputPath,
+            nameToPath,
+          });
          if (failed !== null && failed.length > 0) {
            flowsToRun = failed;
            logger.info(
@@ -357,12 +316,6 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
        }
      }

-      // Upload before the ERR_MAESTRO_TESTS_FAILED throw below so fully-failed runs (which need
-      // screenshots most) still upload. Harvest only ran for junit, so guard the same way.
-      if (outputFormat === 'junit') {
-        await uploadFailureScreenshotsAsync({ harvested, junitReportDirectory, ctx, logger });
-      }
-
      // The retry loop exits via success (0), numeric status (retryable),
      // or throw (infra). A non-null non-zero status means the user's tests
      // failed every attempt.
@@ -375,82 +328,3 @@ export function createMaestroTestsBuildFunction(ctx: CustomBuildContext): BuildF
    },
  });
 }
-
-// Reduce harvested failure screenshots to what's worth uploading, then upload them as workflow
-// artifacts. Best-effort and verdict-neutral: never throws, so a screenshot problem can't mask
-// the maestro test result. Caller guards on junit (harvest only runs for junit).
-async function uploadFailureScreenshotsAsync({
-  harvested,
-  junitReportDirectory,
-  ctx,
-  logger,
-}: {
-  harvested: HarvestedScreenshot[];
-  junitReportDirectory: string;
-  ctx: CustomBuildContext;
-  logger: bunyan;
-}): Promise<void> {
-  // Reduce to the attempts worth uploading — every failed attempt for flaky flows, only the final
-  // attempt for all-failed flows. See computePureFailureFlowNames / selectFailureScreenshots.
-  // Guard the JUnit re-parse so a malformed/missing report can't throw past here and mask the
-  // test verdict (the whole step is verdict-neutral for screenshots).
-  let selected: HarvestedScreenshot[];
-  try {
-    const pureFailureFlowNames = computePureFailureFlowNames(
-      await parseJUnitTestCases(junitReportDirectory)
-    );
-    selected = selectFailureScreenshots(harvested, pureFailureFlowNames);
-  } catch (err: any) {
-    logger.warn({ err }, 'Failed to classify failure screenshots; skipping screenshot upload.');
-    return;
-  }
-  if (selected.length === 0) {
-    return;
-  }
-
-  // Cap well under www's 50-artifact-per-job limit.
-  const MAX_SCREENSHOT_UPLOADS = 30;
-  const toUpload = selected.slice(0, MAX_SCREENSHOT_UPLOADS);
-  if (selected.length > toUpload.length) {
-    logger.warn(
-      `Found ${selected.length} failure screenshots; uploading only the first ${toUpload.length}.`
-    );
-  }
-
-  // Copy each shot to an ASCII-safe name outside testsDirectory (the originals contain a
-  // non-ASCII marker and testsDirectory is uploaded wholesale as the tarball).
-  let safeScreenshotDir: string;
-  try {
-    safeScreenshotDir = await fs.mkdtemp(path.join(os.tmpdir(), 'eas-maestro-screenshots-'));
-  } catch (err: any) {
-    logger.warn(
-      { err },
-      'Failed to create the failure-screenshot staging dir; skipping screenshot upload.'
-    );
-    return;
-  }
-
-  await Promise.all(
-    toUpload.map(async (shot, index) => {
-      try {
-        // `index` disambiguates two flows that fail within the same millisecond of an attempt.
-        const safePath = path.join(
-          safeScreenshotDir,
-          `failure-attempt-${shot.metadata.attemptIndex}-${index}-${shot.metadata.capturedAtMs}.png`
-        );
-        await fs.copyFile(shot.fileAbsPath, safePath);
-        await ctx.runtimeApi.uploadArtifact({
-          artifact: {
-            type: GenericArtifactType.OTHER,
-            name: shot.displayName,
-            paths: [safePath],
-            metadata: shot.metadata,
-          },
-          logger,
-        });
-      } catch (err: any) {
-        logger.warn({ err }, 'Failed to upload failure screenshot.');
-      }
-    })
-  );
-}
@@ -57,16 +57,6 @@ export function createRepackBuildFunction(): BuildFunction {
        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
        required: false,
      }),
-      BuildStepInput.createProvider({
-        id: 'ios_signing_use_source_app_entitlements',
-        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
-        required: false,
-      }),
-      BuildStepInput.createProvider({
-        id: 'ios_signing_app_entitlements_path',
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-        required: false,
-      }),
      BuildStepInput.createProvider({
        id: 'repack_version',
        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
@@ -148,12 +138,6 @@ export function createRepackBuildFunction(): BuildFunction {
            iosSigningOptions: await resolveIosSigningOptionsAsync({
              job: stepsCtx.global.staticContext.job,
              logger: stepsCtx.logger,
-              useAppEntitlements: inputs.ios_signing_use_source_app_entitlements.value as
-                | boolean
-                | undefined,
-              entitlementsPath: inputs.ios_signing_app_entitlements_path.value as
-                | string
-                | undefined,
            }),
            logger: stepsCtx.logger,
            spawnAsync: repackSpawnAsync,
@@ -291,13 +275,9 @@ export async function resolveAndroidSigningOptionsAsync({
 export async function resolveIosSigningOptionsAsync({
  job,
  logger,
-  useAppEntitlements,
-  entitlementsPath,
 }: {
  job: Job;
  logger: bunyan;
-  useAppEntitlements?: boolean;
-  entitlementsPath?: string;
 }): Promise<IosSigningOptions | undefined> {
  const iosJob = job as Ios.Job;
  const buildCredentials = iosJob.secrets?.buildCredentials;
@@ -315,7 +295,5 @@ export async function resolveIosSigningOptionsAsync({
    provisioningProfile,
    keychainPath: credentials.keychainPath,
    signingIdentity: credentials.applicationTargetProvisioningProfile.data.certificateCommonName,
-    useAppEntitlements,
-    entitlementsPath,
  };
 }
@@ -3,13 +3,7 @@ import { graphql } from 'gql.tada';
 import { z } from 'zod';

 import { buildFlowNameToPathMap } from './maestroFlowDiscovery';
-import {
-  MaestroFlowResult,
-  isFileAttrRun,
-  parseJUnitTestCases,
-  parseMaestroResults,
-  parseMaestroResultsFromFileAttrs,
-} from './maestroResultParser';
+import { MaestroFlowResult, parseMaestroResults } from './maestroResultParser';
 import { CustomBuildContext } from '../../customBuildContext';

 const FlowPathSchema = z.array(z.string().min(1)).min(1);
@@ -67,64 +61,47 @@ export function createReportMaestroTestResultsFunction(ctx: CustomBuildContext):
        return;
      }

-      try {
-        // Maestro >= 2.6.0 stamps every <testcase> with its flow's path in a
-        // `file=` attribute; older reports need the legacy flow-file scan to
-        // map testcase names back to paths.
-        const usedFileAttrs = isFileAttrRun(await parseJUnitTestCases(junitDirectory));
-
-        let flowResults: MaestroFlowResult[];
-        if (usedFileAttrs) {
-          flowResults = await parseMaestroResultsFromFileAttrs(junitDirectory);
+      const flowPathRaw = inputs.flow_path.value;
+      let nameToPath: Map<string, string> | null = null;
+      if (flowPathRaw !== undefined) {
+        const parsed = FlowPathSchema.safeParse(flowPathRaw);
+        if (parsed.success) {
+          nameToPath = await buildFlowNameToPathMap({
+            inputFlowPaths: parsed.data,
+            projectRoot: stepsCtx.workingDirectory,
+            logger,
+          });
        } else {
-          // Legacy (Maestro < 2.6.0) — DELETE this arm once the fleet is on >= 2.6.0.
-          const flowPathRaw = inputs.flow_path.value;
-          let nameToPath: Map<string, string> | null = null;
-          if (flowPathRaw !== undefined) {
-            const parsed = FlowPathSchema.safeParse(flowPathRaw);
-            if (parsed.success) {
-              nameToPath = await buildFlowNameToPathMap({
-                inputFlowPaths: parsed.data,
-                projectRoot: stepsCtx.workingDirectory,
-                logger,
-              });
-            } else {
-              logger.warn(
-                'Ignoring malformed flow_path input (expected a non-empty array of non-empty strings).'
-              );
-            }
-          }
-          flowResults = await parseMaestroResults(junitDirectory, nameToPath);
+          logger.warn(
+            'Ignoring malformed flow_path input (expected a non-empty array of non-empty strings).'
+          );
        }
+      }

+      try {
+        const flowResults = await parseMaestroResults(junitDirectory, nameToPath);
        if (flowResults.length === 0) {
          logger.info('No maestro test results found, skipping report');
          return;
        }

-        // Detect truly conflicting results: the same (path, retryCount) twice means two
-        // flow files resolved to the same path, which we can't disambiguate and the API
-        // rejects as a duplicate. Same path with different retryCount is expected
-        // (per-attempt results from retries).
+        // Detect truly conflicting results: same (name, retryCount) pair means different flow files
+        // share the same name (Maestro config override), which we can't disambiguate.
+        // Same name with different retryCount is expected (per-attempt results from retries).
        const seen = new Set<string>();
        const conflicting = new Set<string>();
        for (const r of flowResults) {
-          const key = `${r.path}:${r.retryCount}`;
+          const key = `${r.name}:${r.retryCount}`;
          if (seen.has(key)) {
-            conflicting.add(r.path);
+            conflicting.add(r.name);
          }
          seen.add(key);
        }
        if (conflicting.size > 0) {
-          const conflictList = [...conflicting].join(', ');
          logger.error(
-            usedFileAttrs
-              ? `The same flow file was reported more than once in a single attempt: ` +
-                  `${conflictList}. Skipping report. Check for duplicate flow_path entries ` +
-                  `or leftover XML files in the JUnit report directory.`
-              : `Duplicate Maestro flow names found: ${conflictList}. Skipping report. ` +
-                  `Give each flow a unique name, or upgrade Maestro to >= 2.6.0 (flows are ` +
-                  `then identified by file path, so duplicate names are fine).`
+            `Duplicate test case names found in JUnit output: ${[...conflicting].join(
+              ', '
+            )}. Skipping report. Ensure each Maestro flow has a unique name.`
          );
          return;
        }
@@ -19,7 +19,6 @@ import {
  generateDefaultBuildCacheKeyAsync,
  getCcachePath,
 } from '../../utils/cacheKey';
-import { Datadog } from '../../datadog';
 import { GRADLE_CACHE_KEY_PREFIX, generateGradleCacheKeyAsync } from '../../utils/gradleCacheKey';
 import { TurtleFetchError, turtleFetch } from '../../utils/turtleFetch';

@@ -206,16 +205,16 @@ export async function restoreGradleCacheAsync({
  }

  try {
-    // Enable build cache via user-level gradle.properties.
-    // This avoids mutating android/gradle.properties which affects fingerprinting.
-    const gradleUserHome = path.join(os.homedir(), '.gradle');
-    await fs.promises.mkdir(gradleUserHome, { recursive: true });
-    const userGradlePropertiesPath = path.join(gradleUserHome, 'gradle.properties');
-    await fs.promises.appendFile(userGradlePropertiesPath, '\norg.gradle.caching=true\n');
+    const gradlePropertiesPath = path.join(workingDirectory, 'android', 'gradle.properties');
+    const gradlePropertiesContent = await fs.promises.readFile(gradlePropertiesPath, 'utf-8');
+    await fs.promises.writeFile(
+      gradlePropertiesPath,
+      `${gradlePropertiesContent}\n\norg.gradle.caching=true\n`
+    );

-    // Configure cache cleanup via init script.
-    // Works with both Gradle 8 and 9 (org.gradle.cache.cleanup property was removed in Gradle 9).
-    const initScriptDir = path.join(gradleUserHome, 'init.d');
+    // Configure cache cleanup via init script (works with both Gradle 8 and 9,
+    // org.gradle.cache.cleanup property was removed in Gradle 9)
+    const initScriptDir = path.join(os.homedir(), '.gradle', 'init.d');
    await fs.promises.mkdir(initScriptDir, { recursive: true });
    await fs.promises.writeFile(
      path.join(initScriptDir, 'eas-cache-cleanup.gradle'),
@@ -283,10 +282,22 @@ export async function restoreGradleCacheAsync({
      `Gradle cache restored to ${gradleCachesPath} (${hitType === 'direct_hit' ? 'direct hit' : 'prefix match'})`
    );

-    Datadog.log(`Gradle cache restored (${hitType})`, {
-      event: 'gradle_cache_restored',
-      cache_hit_type: hitType,
-    });
+    try {
+      await turtleFetch(new URL('v2/turtle-builds/logs', expoApiServerURL).toString(), 'POST', {
+        json: {
+          buildId: jobId,
+          message: `Gradle cache restored (${hitType})`,
+          tags: {
+            event: 'gradle_cache_restored',
+            cache_hit_type: hitType,
+          },
+        },
+        headers: {
+          Authorization: `Bearer ${robotAccessToken}`,
+        },
+        shouldThrowOnNotOk: false,
+      });
+    } catch {}
  } catch (err: unknown) {
    if (err instanceof TurtleFetchError && err.response?.status === 404) {
      logger.info('No Gradle cache found for this key');
@@ -1,9 +1,9 @@
 import { SystemError } from '@expo/eas-build-job';
-import { type bunyan } from '@expo/logger';
+import { bunyan } from '@expo/logger';
 import {
  BuildFunction,
  BuildRuntimePlatform,
-  type BuildStepEnv,
+  BuildStepEnv,
  BuildStepInput,
  BuildStepInputValueTypeName,
 } from '@expo/steps';
@@ -12,25 +12,22 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';

-import { type CustomBuildContext } from '../../customBuildContext';
-import { Sentry } from '../../sentry';
+import { CustomBuildContext } from '../../customBuildContext';
+import { sleepAsync } from '../../utils/retry';
 import {
-  type DetachedProcessHandle,
+  DetachedProcessHandle,
+  ensureBrewPackageInstalledAsync,
  getDeviceRunSessionIdOrThrow,
-  getNgrokAuthtokenOrThrow,
-  getNgrokTunnelDomainOrThrow,
-  selectXcodeDeveloperDirectoryAsync,
  spawnDetached,
-  startNgrokTunnelAsync,
  startServeSimWithTunnelAsync,
  uploadRemoteSessionConfigAsync,
-  waitForFileAsync,
 } from '../utils/remoteDeviceRunSession';

-const AGENT_DEVICE_PACKAGE_NAME = 'agent-device';
 const AGENT_DEVICE_REPO_URL = 'https://github.com/callstackincubator/agent-device.git';
 const SRC_DIR = '/tmp/agent-device-src';
 const DAEMON_JSON_PATH = path.join(os.homedir(), '.agent-device', 'daemon.json');
+const XCODE_DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer';
+const CLOUDFLARED_LINUX_INSTALL_PATH = '/usr/local/bin/cloudflared';
 const STARTUP_TIMEOUT_MS = 60_000;

 export function createStartAgentDeviceRemoteSessionBuildFunction(
@@ -49,13 +46,10 @@ export function createStartAgentDeviceRemoteSessionBuildFunction(
      }),
    ],
    fn: async ({ logger, global }, { inputs, env }) => {
-      // Fail fast before any expensive setup if the injected env
-      // vars are missing: DEVICE_RUN_SESSION_ID (to report the remote config
-      // back to the API server), EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN (base domain
-      // for our ngrok tunnels), and NGROK_AUTHTOKEN (to authenticate them).
+      // Fail fast before any expensive setup if the orchestrator-injected
+      // DEVICE_RUN_SESSION_ID env var is missing — without it we cannot
+      // report the remote config back to the API server.
      const deviceRunSessionId = getDeviceRunSessionIdOrThrow(env);
-      const ngrokTunnelDomain = getNgrokTunnelDomainOrThrow(env);
-      const ngrokAuthtoken = getNgrokAuthtokenOrThrow(env);

      const packageVersion = inputs.package_version.value as string | undefined;
      const { runtimePlatform } = global;
@@ -64,24 +58,61 @@ export function createStartAgentDeviceRemoteSessionBuildFunction(
      );

      if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
-        await selectXcodeDeveloperDirectoryAsync({ env, logger });
+        logger.info(`Selecting Xcode developer directory: ${XCODE_DEVELOPER_DIR}.`);
+        await spawn('sudo', ['xcode-select', '-s', XCODE_DEVELOPER_DIR], { env, logger });
      }

+      logger.info('Ensuring cloudflared is installed.');
+      const cloudflaredCommand = await ensureCloudflaredInstalledAsync({
+        runtimePlatform,
+        env,
+        logger,
+      });
+
+      logger.info(
+        packageVersion
+          ? `Cloning agent-device @ v${packageVersion} into ${SRC_DIR}.`
+          : `Cloning agent-device (latest) into ${SRC_DIR}.`
+      );
+      await cloneAgentDeviceAsync({ packageVersion, env, logger });
+
+      logger.info('Installing agent-device dependencies.');
+      await spawn('bun', ['install', '--production'], {
+        cwd: SRC_DIR,
+        env,
+        logger,
+      });
+
      logger.info('Launching agent-device daemon.');
-      const daemonProcess = await startAgentDeviceDaemonAsync({ packageVersion, env, logger });
+      spawnDetached({
+        command: 'bun',
+        args: ['run', 'src/daemon.ts'],
+        cwd: SRC_DIR,
+        env: { ...env, AGENT_DEVICE_DAEMON_SERVER_MODE: 'http' },
+      });

      logger.info(`Waiting for daemon credentials at ${DAEMON_JSON_PATH}.`);
-      const { port: daemonPort, token: daemonToken } = await waitForDaemonInfoAsync({
-        daemonProcess,
+      await waitForFileAsync({
+        filePath: DAEMON_JSON_PATH,
+        timeoutMs: STARTUP_TIMEOUT_MS,
+        description: 'agent-device daemon',
      });
+      const { port: daemonPort, token: daemonToken } = readDaemonInfo(DAEMON_JSON_PATH);
      logger.info(`Daemon is listening on port ${daemonPort}; loaded auth token.`);

-      const agentDeviceRemoteSessionUrl = await startNgrokTunnelAsync({
-        port: daemonPort,
-        subdomainPrefix: 'agent-device',
-        baseDomain: ngrokTunnelDomain,
-        authtoken: ngrokAuthtoken,
-        logger,
+      logger.info(`Starting cloudflared tunnel to http://localhost:${daemonPort}.`);
+      const cloudflared = spawnDetached({
+        command: cloudflaredCommand,
+        args: ['tunnel', '--url', `http://localhost:${daemonPort}`],
+        env,
+      });
+
+      logger.info('Waiting for a public tunnel URL.');
+      const agentDeviceRemoteSessionUrl = await waitForMatchInOutputAsync({
+        process: cloudflared,
+        pattern: /https:\/\/[a-z0-9-]+\.trycloudflare\.com/,
+        timeoutMs: STARTUP_TIMEOUT_MS,
+        description: 'cloudflared tunnel',
      });
      logger.info(`Tunnel is ready at ${agentDeviceRemoteSessionUrl}.`);

@@ -89,8 +120,7 @@ export function createStartAgentDeviceRemoteSessionBuildFunction(
      // on Darwin. Android sessions go without a preview URL.
      let webPreviewUrl: string | undefined;
      if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
-        const { previewUrl } = await startServeSimWithTunnelAsync(ctx, {
-          baseDomain: ngrokTunnelDomain,
+        const { previewUrl } = await startServeSimWithTunnelAsync({
          env,
          logger,
          timeoutMs: STARTUP_TIMEOUT_MS,
@@ -118,91 +148,60 @@ export function createStartAgentDeviceRemoteSessionBuildFunction(
  });
 }

-async function startAgentDeviceDaemonAsync({
-  packageVersion,
+async function ensureCloudflaredInstalledAsync({
+  runtimePlatform,
  env,
  logger,
 }: {
-  packageVersion: string | undefined;
+  runtimePlatform: BuildRuntimePlatform;
  env: BuildStepEnv;
  logger: bunyan;
-}): Promise<DetachedProcessHandle> {
-  const packageSpec = createAgentDevicePackageSpec(packageVersion);
-  try {
-    logger.info(`Installing ${packageSpec} globally with Bun.`);
-    await spawn('bun', ['add', '--global', packageSpec], {
-      env,
-      logger,
-    });
-
-    const daemonPath = getGlobalAgentDeviceDaemonPath(env);
-    if (!fs.existsSync(daemonPath)) {
-      throw new SystemError(`Expected agent-device daemon entry at ${daemonPath}.`);
-    }
-
-    logger.info(`Launching daemon from ${daemonPath}.`);
-    return spawnDetached({
-      command: 'node',
-      args: [daemonPath],
-      env: { ...env, AGENT_DEVICE_DAEMON_SERVER_MODE: 'http' },
-    });
-  } catch (err) {
-    const error = err instanceof Error ? err : new Error(String(err));
-    const bunVersion = await getBunVersionForDiagnosticsAsync(env);
-    Sentry.capture(
-      'Failed to start agent-device daemon from global Bun package; falling back to git clone',
-      error,
-      {
-        level: 'warning',
-        tags: {
-          phase: 'agent-device-daemon-start',
-          fallback: 'git-clone',
-        },
-        extras: {
-          packageSpec,
-          packageVersion: packageVersion ?? 'latest',
-          bunVersion,
-          bunInstallConfigured: Boolean(env.BUN_INSTALL?.trim()),
-        },
-      }
-    );
-    logger.warn(
-      `Failed to start daemon from global ${packageSpec}; falling back to git clone: ${error.message}`
-    );
-    return await startAgentDeviceDaemonFromGitAsync({ packageVersion, env, logger });
+}): Promise<string> {
+  if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
+    await ensureBrewPackageInstalledAsync({ name: 'cloudflared', env, logger });
+    return 'cloudflared';
  }
-}
-
-async function startAgentDeviceDaemonFromGitAsync({
-  packageVersion,
-  env,
-  logger,
-}: {
-  packageVersion: string | undefined;
-  env: BuildStepEnv;
-  logger: bunyan;
-}): Promise<DetachedProcessHandle> {
-  logger.info(
-    packageVersion
-      ? `Cloning agent-device @ v${packageVersion} into ${SRC_DIR}.`
-      : `Cloning agent-device (latest) into ${SRC_DIR}.`
-  );
-  await cloneAgentDeviceAsync({ packageVersion, env, logger });
-
-  logger.info('Installing agent-device dependencies.');
-  await spawn('bun', ['install', '--production'], {
-    cwd: SRC_DIR,
+  if (await isCommandAvailableAsync({ command: 'cloudflared', env })) {
+    return 'cloudflared';
+  }
+  const cloudflaredArch = cloudflaredLinuxArchForNodeArch(os.arch());
+  const downloadUrl = `https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-${cloudflaredArch}`;
+  logger.info(`Downloading cloudflared from ${downloadUrl} to ${CLOUDFLARED_LINUX_INSTALL_PATH}.`);
+  await spawn('sudo', ['curl', '-fsSL', '-o', CLOUDFLARED_LINUX_INSTALL_PATH, downloadUrl], {
    env,
    logger,
  });
+  await spawn('sudo', ['chmod', '+x', CLOUDFLARED_LINUX_INSTALL_PATH], { env, logger });
+  // Return the absolute install path so the tunnel command works even when
+  // /usr/local/bin is not on the step's PATH.
+  return CLOUDFLARED_LINUX_INSTALL_PATH;
+}

-  logger.info('Launching daemon from cloned agent-device source.');
-  return spawnDetached({
-    command: 'bun',
-    args: ['run', 'src/daemon.ts'],
-    cwd: SRC_DIR,
-    env: { ...env, AGENT_DEVICE_DAEMON_SERVER_MODE: 'http' },
-  });
+function cloudflaredLinuxArchForNodeArch(arch: string): 'amd64' | 'arm64' {
+  if (arch === 'x64') {
+    return 'amd64';
+  }
+  if (arch === 'arm64') {
+    return 'arm64';
+  }
+  throw new SystemError(
+    `Unsupported architecture for cloudflared on Linux: "${arch}". Expected "x64" or "arm64".`
+  );
+}
+
+async function isCommandAvailableAsync({
+  command,
+  env,
+}: {
+  command: string;
+  env: BuildStepEnv;
+}): Promise<boolean> {
+  try {
+    await spawn('bash', ['-c', `command -v ${command}`], { env, ignoreStdio: true });
+    return true;
+  } catch {
+    return false;
+  }
 }

 async function cloneAgentDeviceAsync({
@@ -221,64 +220,54 @@ async function cloneAgentDeviceAsync({
  });
 }

-async function waitForDaemonInfoAsync({
-  daemonProcess,
+async function waitForMatchInOutputAsync({
+  process,
+  pattern,
+  timeoutMs,
+  description,
 }: {
-  daemonProcess: DetachedProcessHandle;
-}): Promise<{ port: number; token: string }> {
-  try {
-    return await waitForFileAsync({
-      filePath: DAEMON_JSON_PATH,
-      timeoutMs: STARTUP_TIMEOUT_MS,
-      description: 'agent-device daemon credentials',
-      parse: parseDaemonInfo,
-    });
-  } catch (err) {
-    const output = daemonProcess.getOutput();
-    throw new SystemError(
-      `${
-        err instanceof Error
-          ? err.message
-          : `Timed out waiting for agent-device daemon credentials.`
-      }${output ? `\nagent-device daemon output:\n${output}` : ''}`
-    );
+  process: DetachedProcessHandle;
+  pattern: RegExp;
+  timeoutMs: number;
+  description: string;
+}): Promise<string> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const match = pattern.exec(process.getOutput());
+    if (match) {
+      return match[1] ?? match[0];
+    }
+    await sleepAsync(1_000);
  }
-}
-
-async function getBunVersionForDiagnosticsAsync(env: BuildStepEnv): Promise<string> {
-  try {
-    const result = await spawn('bun', ['--version'], { stdio: 'pipe', env, cwd: os.tmpdir() });
-    return result.stdout.trim() || 'unknown';
-  } catch {
-    return 'unknown';
-  }
-}
-
-function createAgentDevicePackageSpec(packageVersion: string | undefined): string {
-  const versionSpec = packageVersion ? packageVersion.replace(/^v(?=\d)/, '') : 'latest';
-  return `${AGENT_DEVICE_PACKAGE_NAME}@${versionSpec}`;
-}
-
-function getGlobalAgentDeviceDaemonPath(env: BuildStepEnv): string {
-  return path.join(
-    getBunInstallDirectory(env),
-    'install',
-    'global',
-    'node_modules',
-    AGENT_DEVICE_PACKAGE_NAME,
-    'dist',
-    'src',
-    'internal',
-    'daemon.js'
+  throw new SystemError(
+    `Timed out waiting for ${description} to start. Last output:\n${process.getOutput() || '<empty>'}`
  );
 }

-function getBunInstallDirectory(env: BuildStepEnv): string {
-  const bunInstall = env.BUN_INSTALL?.trim();
-  return bunInstall ? bunInstall : path.join(os.homedir(), '.bun');
+async function waitForFileAsync({
+  filePath,
+  timeoutMs,
+  description,
+}: {
+  filePath: string;
+  timeoutMs: number;
+  description: string;
+}): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    try {
+      await fs.promises.access(filePath);
+      return;
+    } catch {
+      // not yet; keep polling
+    }
+    await sleepAsync(1_000);
+  }
+  throw new SystemError(`Timed out waiting for ${description} to write ${filePath}.`);
 }

-function parseDaemonInfo(raw: string): { port: number; token: string } {
+function readDaemonInfo(filePath: string): { port: number; token: string } {
+  const raw = fs.readFileSync(filePath, 'utf8');
  const parsed = JSON.parse(raw) as unknown;
  if (
    !parsed ||
@@ -287,7 +276,7 @@ function parseDaemonInfo(raw: string): { port: number; token: string } {
    typeof (parsed as { token: unknown }).token !== 'string'
  ) {
    throw new SystemError(
-      'Expected daemon credentials to contain { "httpPort": <number>, "token": "..." }.'
+      `Expected ${filePath} to contain { "httpPort": <number>, "token": "..." }.`
    );
  }
  const { httpPort, token } = parsed as { httpPort: number; token: string };
@@ -1,210 +0,0 @@
-import { SystemError } from '@expo/eas-build-job';
-import { type bunyan } from '@expo/logger';
-import {
-  BuildFunction,
-  BuildRuntimePlatform,
-  BuildStepInput,
-  BuildStepInputValueTypeName,
-} from '@expo/steps';
-import spawn from '@expo/turtle-spawn';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import semver from 'semver';
-import { z } from 'zod';
-
-import { CustomBuildContext } from '../../customBuildContext';
-import { pollArgentArtifactsForUploadAsync } from '../utils/argentArtifacts';
-import {
-  getDeviceRunSessionIdOrThrow,
-  getNgrokAuthtokenOrThrow,
-  getNgrokTunnelDomainOrThrow,
-  selectXcodeDeveloperDirectoryAsync,
-  spawnDetached,
-  startNgrokTunnelAsync,
-  startServeSimWithTunnelAsync,
-  uploadRemoteSessionConfigAsync,
-  waitForFileAsync,
-} from '../utils/remoteDeviceRunSession';
-
-const ARGENT_PACKAGE_NAME = '@swmansion/argent';
-export const MIN_ARGENT_REMOTE_SESSION_VERSION = '0.12.0';
-const ARGENT_ARTIFACTS_LIST_ENDPOINT_FLAG = 'artifacts-list-endpoint';
-const ARGENT_STATE_FILE = path.join(os.homedir(), '.argent', 'tool-server.json');
-const STARTUP_TIMEOUT_MS = 60_000;
-
-const ArgentToolServerStateSchema = z.object({
-  port: z.number(),
-  token: z.string().optional(),
-});
-
-export function createStartArgentRemoteSessionBuildFunction(
-  ctx: CustomBuildContext
-): BuildFunction {
-  return new BuildFunction({
-    namespace: 'eas',
-    id: 'start_argent_remote_session',
-    name: 'Start argent remote session',
-    __metricsId: 'eas/start_argent_remote_session',
-    inputProviders: [
-      BuildStepInput.createProvider({
-        id: 'package_version',
-        required: false,
-        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
-      }),
-    ],
-    fn: async ({ logger, global }, { inputs, env }) => {
-      // Fail fast before any expensive setup if the injected env
-      // vars are missing: DEVICE_RUN_SESSION_ID (to report the remote config
-      // back to the API server), EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN (base domain
-      // for our ngrok tunnels), and NGROK_AUTHTOKEN (to authenticate them).
-      const deviceRunSessionId = getDeviceRunSessionIdOrThrow(env);
-      const ngrokTunnelDomain = getNgrokTunnelDomainOrThrow(env);
-      const ngrokAuthtoken = getNgrokAuthtokenOrThrow(env);
-
-      const packageVersion = inputs.package_version.value as string | undefined;
-      warnIfArgentPackageVersionCannotBeVerified({ packageVersion, logger });
-      const versionSpec = packageVersion ?? 'latest';
-      const { runtimePlatform } = global;
-      logger.info(
-        `Starting argent remote session (version: ${versionSpec}, runtime: ${runtimePlatform}).`
-      );
-
-      if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
-        await selectXcodeDeveloperDirectoryAsync({ env, logger });
-      }
-
-      // Stale state from a previous run would mask the new server's port.
-      await fs.promises.rm(ARGENT_STATE_FILE, { force: true });
-      logger.info('Enabling the Argent artifacts list endpoint flag.');
-      await spawn(
-        'bunx',
-        [`${ARGENT_PACKAGE_NAME}@${versionSpec}`, 'enable', ARGENT_ARTIFACTS_LIST_ENDPOINT_FLAG],
-        { env, logger }
-      );
-
-      logger.info(`Launching ${ARGENT_PACKAGE_NAME}@${versionSpec} tool-server via bunx.`);
-      const argentServer = spawnDetached({
-        command: 'bunx',
-        args: [
-          `${ARGENT_PACKAGE_NAME}@${versionSpec}`,
-          'server',
-          'start',
-          '--port',
-          '0',
-          '--idle-timeout',
-          '0',
-          '--detach',
-        ],
-        env,
-      });
-
-      logger.info(`Waiting for argent tool-server state at ${ARGENT_STATE_FILE}.`);
-      let toolServerPort: number;
-      let toolServerToken: string | undefined;
-      try {
-        const toolServerState = await waitForFileAsync({
-          filePath: ARGENT_STATE_FILE,
-          timeoutMs: STARTUP_TIMEOUT_MS,
-          description: 'argent tool-server state',
-          parse: parseArgentToolServerState,
-        });
-        toolServerPort = toolServerState.port;
-        toolServerToken = toolServerState.token;
-      } catch (err) {
-        const output = argentServer.getOutput();
-        throw new SystemError(
-          `${
-            err instanceof Error ? err.message : `Timed out waiting for argent tool-server state.`
-          }${output ? `\nArgent tool-server output:\n${output}` : ''}`
-        );
-      }
-      logger.info(`Argent tool-server is listening on port ${toolServerPort}.`);
-      void pollArgentArtifactsForUploadAsync(ctx, {
-        deviceRunSessionId,
-        toolsUrl: `http://127.0.0.1:${toolServerPort}`,
-        toolsAuthToken: toolServerToken,
-        logger,
-      });
-
-      const publicToolsUrl = await startNgrokTunnelAsync({
-        port: toolServerPort,
-        subdomainPrefix: 'argent',
-        baseDomain: ngrokTunnelDomain,
-        authtoken: ngrokAuthtoken,
-        rewriteHostHeader: true,
-        logger,
-      });
-      logger.info(`Tunnel is ready at ${publicToolsUrl}.`);
-
-      // serve-sim is iOS-only — Android sessions go without a preview URL.
-      let webPreviewUrl: string | undefined;
-      if (runtimePlatform === BuildRuntimePlatform.DARWIN) {
-        const serveSim = await startServeSimWithTunnelAsync(ctx, {
-          baseDomain: ngrokTunnelDomain,
-          env,
-          logger,
-          timeoutMs: STARTUP_TIMEOUT_MS,
-        });
-        webPreviewUrl = serveSim.previewUrl;
-        logger.info(`Web preview URL: ${webPreviewUrl}`);
-      }
-
-      await uploadRemoteSessionConfigAsync({
-        ctx,
-        deviceRunSessionId,
-        remoteConfig: {
-          toolsUrl: publicToolsUrl,
-          ...(toolServerToken ? { toolsAuthToken: toolServerToken } : {}),
-          ...(webPreviewUrl ? { webPreviewUrl } : {}),
-        },
-        logger,
-      });
-
-      logger.info('Remote session is live. Keeping the job alive until the session is stopped.');
-      // Keep the turtle job alive so the tool-server and tunnel stay reachable
-      // until stopDeviceRunSession cancels the run.
-      await new Promise<never>(() => {});
-    },
-  });
-}
-
-export function warnIfArgentPackageVersionCannotBeVerified({
-  packageVersion,
-  logger,
-}: {
-  packageVersion: string | undefined;
-  logger: bunyan;
-}): void {
-  if (!packageVersion || packageVersion === 'latest') {
-    return;
-  }
-
-  const validVersion = semver.valid(packageVersion);
-  if (!validVersion) {
-    logger.warn(
-      `Argent remote simulator sessions require ${ARGENT_PACKAGE_NAME}@${MIN_ARGENT_REMOTE_SESSION_VERSION} or newer, ` +
-        `but package_version "${packageVersion}" is not an exact semver version that EAS can verify. ` +
-        `Continuing and letting bunx resolve it.`
-    );
-    return;
-  }
-
-  if (semver.lt(validVersion, MIN_ARGENT_REMOTE_SESSION_VERSION)) {
-    throw new SystemError(
-      `Argent remote simulator sessions require ${ARGENT_PACKAGE_NAME}@${MIN_ARGENT_REMOTE_SESSION_VERSION} or newer. ` +
-        `The requested package_version "${packageVersion}" is too old for the EAS remote-session API. ` +
-        `Use "latest" or pass an exact version >= ${MIN_ARGENT_REMOTE_SESSION_VERSION}.`
-    );
-  }
-}
-
-function parseArgentToolServerState(raw: string): { port: number; token?: string } {
-  const result = ArgentToolServerStateSchema.safeParse(JSON.parse(raw));
-  if (!result.success) {
-    throw new SystemError(
-      `Expected tool-server state to contain { "port": <number>, ... }: ${result.error.message}`
-    );
-  }
-  return result.data;
-}
@@ -65,12 +65,6 @@ export function createStartIosSimulatorBuildFunction(): BuildFunction {
        env,
      });

-      try {
-        await IosSimulatorUtils.disableApsdAsync({ udid, env });
-      } catch (err) {
-        logger.warn({ err }, 'Failed to disable apsd in the Simulator.');
-      }
-
      await IosSimulatorUtils.waitForReadyAsync({ udid, env });

      logger.info('');
@@ -102,12 +96,6 @@ export function createStartIosSimulatorBuildFunction(): BuildFunction {
            env,
          });

-          try {
-            await IosSimulatorUtils.disableApsdAsync({ udid: cloneUdid, env });
-          } catch (err) {
-            logger.warn({ err }, 'Failed to disable apsd in the Simulator.');
-          }
-
          await IosSimulatorUtils.waitForReadyAsync({
            udid: cloneUdid,
            env,
@@ -1,14 +1,15 @@
 import { BuildFunction, BuildRuntimePlatform } from '@expo/steps';
+import spawn from '@expo/turtle-spawn';

 import { CustomBuildContext } from '../../customBuildContext';
 import {
  getDeviceRunSessionIdOrThrow,
-  getNgrokTunnelDomainOrThrow,
-  selectXcodeDeveloperDirectoryAsync,
+  ensureBrewPackageInstalledAsync,
  startServeSimWithTunnelAsync,
  uploadRemoteSessionConfigAsync,
 } from '../utils/remoteDeviceRunSession';

+const XCODE_DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer';
 const STARTUP_TIMEOUT_MS = 60_000;

 export function createStartServeSimRemoteSessionBuildFunction(
@@ -22,14 +23,16 @@ export function createStartServeSimRemoteSessionBuildFunction(
    supportedRuntimePlatforms: [BuildRuntimePlatform.DARWIN],
    fn: async ({ logger }, { env }) => {
      const deviceRunSessionId = getDeviceRunSessionIdOrThrow(env);
-      const ngrokTunnelDomain = getNgrokTunnelDomainOrThrow(env);

      logger.info('Starting serve-sim remote session.');

-      await selectXcodeDeveloperDirectoryAsync({ env, logger });
+      logger.info(`Selecting Xcode developer directory: ${XCODE_DEVELOPER_DIR}.`);
+      await spawn('sudo', ['xcode-select', '-s', XCODE_DEVELOPER_DIR], { env, logger });

-      const { previewUrl, streamUrl } = await startServeSimWithTunnelAsync(ctx, {
-        baseDomain: ngrokTunnelDomain,
+      logger.info('Ensuring cloudflared is installed.');
+      await ensureBrewPackageInstalledAsync({ name: 'cloudflared', env, logger });
+
+      const { previewUrl, streamUrl } = await startServeSimWithTunnelAsync({
        env,
        logger,
        timeoutMs: STARTUP_TIMEOUT_MS,
@@ -1,9 +1,4 @@
-import {
-  GenericArtifactType,
-  Job,
-  ManagedArtifactType,
-  isGenericArtifact,
-} from '@expo/eas-build-job';
+import { GenericArtifactType, Job, ManagedArtifactType } from '@expo/eas-build-job';
 import {
  BuildFunction,
  BuildStepInput,
@@ -70,11 +65,6 @@ export function createUploadArtifactBuildFunction(ctx: CustomBuildContext): Buil
        required: false,
        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
      }),
-      BuildStepInput.createProvider({
-        id: 'metadata',
-        required: false,
-        allowedValueTypeName: BuildStepInputValueTypeName.JSON,
-      }),
    ],
    outputProviders: [
      BuildStepOutput.createProvider({
@@ -118,7 +108,7 @@ export function createUploadArtifactBuildFunction(ctx: CustomBuildContext): Buil
        throw result.reason;
      });

-      const artifactSpec = {
+      const artifact = {
        type: parseArtifactTypeInput({
          platform: ctx.job.platform,
          inputValue: `${inputs.type.value ?? ''}`,
@@ -126,22 +116,19 @@ export function createUploadArtifactBuildFunction(ctx: CustomBuildContext): Buil
        paths: artifactPaths,
        name: (inputs.name.value || inputs.key.value) as string,
      };
-      const artifact = isGenericArtifact(artifactSpec)
-        ? {
-            ...artifactSpec,
-            metadata: inputs.metadata.value as Record<string, unknown> | undefined,
-          }
-        : artifactSpec;

      try {
-        const { artifactId } = await ctx.runtimeApi.uploadArtifact({ artifact, logger });
+        const { artifactId } = await ctx.runtimeApi.uploadArtifact({
+          artifact,
+          logger,
+        });

        if (artifactId) {
          outputs.artifact_id.set(artifactId);
        }
      } catch (error) {
        if (inputs.ignore_error.value) {
-          logger.error({ err: error }, `Failed to upload ${artifact.type}. Ignoring error.`);
+          logger.error(`Failed to upload ${artifact.type}. Ignoring error.`, error);
          // Ignoring error.
          return;
        }
@@ -1,111 +0,0 @@
-import { bunyan } from '@expo/logger';
-import fetch from 'node-fetch';
-import { Readable } from 'node:stream';
-
-import { CustomBuildContext } from '../../../customBuildContext';
-import { uploadDeviceRunSessionArtifactAsync } from '../deviceRunSessionArtifacts';
-import { listArgentArtifactsAsync, uploadArgentArtifactAsync } from '../argentArtifacts';
-
-jest.mock('../deviceRunSessionArtifacts');
-jest.mock('node-fetch');
-
-const { Response } = jest.requireActual('node-fetch') as typeof import('node-fetch');
-
-async function readStreamAsync(stream: NodeJS.ReadableStream): Promise<void> {
-  for await (const chunk of stream as Readable) {
-    void chunk;
-  }
-}
-
-function createLoggerMock(): bunyan {
-  return {
-    info: jest.fn(),
-    warn: jest.fn(),
-    error: jest.fn(),
-    debug: jest.fn(),
-  } as unknown as bunyan;
-}
-
-describe(listArgentArtifactsAsync, () => {
-  beforeEach(() => {
-    jest.mocked(fetch).mockReset();
-  });
-
-  it('lists Argent artifacts with bearer auth', async () => {
-    jest.mocked(fetch).mockResolvedValue(
-      new Response(
-        JSON.stringify({
-          artifacts: [
-            {
-              id: 'artifact-id',
-              filename: 'report.json',
-              mimeType: 'application/json',
-              isDirectory: false,
-            },
-          ],
-        })
-      )
-    );
-
-    const artifacts = await listArgentArtifactsAsync({
-      toolsUrl: 'http://127.0.0.1:1234',
-      toolsAuthToken: 'tools-token',
-    });
-
-    expect(artifacts).toEqual([
-      {
-        id: 'artifact-id',
-        filename: 'report.json',
-        mimeType: 'application/json',
-        isDirectory: false,
-      },
-    ]);
-    expect(jest.mocked(fetch)).toHaveBeenCalledWith('http://127.0.0.1:1234/artifacts', {
-      headers: { Authorization: 'Bearer tools-token' },
-    });
-  });
-});
-
-describe(uploadArgentArtifactAsync, () => {
-  beforeEach(() => {
-    jest.mocked(fetch).mockReset();
-    jest.mocked(uploadDeviceRunSessionArtifactAsync).mockReset();
-  });
-
-  it('downloads an Argent artifact and uploads it as a device run session artifact', async () => {
-    const data = Buffer.from('artifact-data');
-    const logger = createLoggerMock();
-    const ctx = {} as unknown as CustomBuildContext;
-
-    jest.mocked(fetch).mockResolvedValueOnce(new Response(Readable.from([data])));
-    jest
-      .mocked(uploadDeviceRunSessionArtifactAsync)
-      .mockImplementationOnce(async (_ctx, { stream }) => {
-        await readStreamAsync(stream);
-      });
-
-    await uploadArgentArtifactAsync(ctx, {
-      deviceRunSessionId: 'drs-id',
-      toolsUrl: 'http://127.0.0.1:1234',
-      toolsAuthToken: 'tools-token',
-      logger,
-      artifact: {
-        id: 'artifact-id',
-        filename: 'report.json',
-        mimeType: 'application/json',
-      },
-    });
-
-    expect(jest.mocked(fetch)).toHaveBeenCalledWith('http://127.0.0.1:1234/artifacts/artifact-id', {
-      headers: { Authorization: 'Bearer tools-token' },
-    });
-    expect(jest.mocked(uploadDeviceRunSessionArtifactAsync)).toHaveBeenCalledWith(ctx, {
-      deviceRunSessionId: 'drs-id',
-      artifactId: 'artifact-id',
-      name: 'report.json (artifact-id)',
-      filename: 'report.json',
-      size: data.length,
-      stream: expect.anything(),
-    });
-  });
-});
@@ -1,72 +0,0 @@
-import fetch from 'node-fetch';
-import { Readable } from 'node:stream';
-
-import { CustomBuildContext } from '../../../customBuildContext';
-import { uploadDeviceRunSessionArtifactAsync } from '../deviceRunSessionArtifacts';
-
-jest.mock('node-fetch');
-
-const { Response } = jest.requireActual('node-fetch') as typeof import('node-fetch');
-
-describe(uploadDeviceRunSessionArtifactAsync, () => {
-  beforeEach(() => {
-    jest.mocked(fetch).mockReset();
-  });
-
-  it('streams an artifact through a signed upload URL', async () => {
-    const stream = Readable.from(Buffer.from('artifact-data'));
-    const reportedSize = 1024;
-    const mutation = jest.fn().mockReturnValue({
-      toPromise: async () => ({
-        data: {
-          deviceRunSession: {
-            createArtifactUploadSession: {
-              uploadSession: {
-                url: 'https://uploads.expo.test/artifact',
-                headers: {
-                  'Content-Length': String(reportedSize),
-                  'Content-Type': 'application/octet-stream',
-                },
-              },
-            },
-          },
-        },
-      }),
-    });
-    const ctx = {
-      graphqlClient: {
-        mutation,
-      },
-    } as unknown as CustomBuildContext;
-
-    jest.mocked(fetch).mockResolvedValueOnce(new Response('', { status: 200 }));
-
-    await uploadDeviceRunSessionArtifactAsync(ctx, {
-      deviceRunSessionId: 'drs-id',
-      artifactId: 'artifact-id',
-      name: 'Artifact report.json (artifact-id)',
-      filename: 'report.json',
-      size: reportedSize,
-      stream,
-    });
-
-    expect(mutation).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({
-        deviceRunSessionId: 'drs-id',
-        input: {
-          name: 'Artifact report.json (artifact-id)',
-          filename: 'report.json',
-          size: reportedSize,
-        },
-      })
-    );
-    expect(jest.mocked(fetch)).toHaveBeenCalledWith(
-      'https://uploads.expo.test/artifact',
-      expect.objectContaining({
-        method: 'PUT',
-        body: stream,
-      })
-    );
-  });
-});
@@ -1,154 +0,0 @@
-import { bunyan } from '@expo/logger';
-import { BuildStepEnv } from '@expo/steps';
-
-import { CustomBuildContext } from '../../../customBuildContext';
-import { Sentry } from '../../../sentry';
-import { turtleFetch } from '../../../utils/turtleFetch';
-import {
-  fetchServeSimTurnArgsAsync,
-  turnIceServersToServeSimArgs,
-} from '../remoteDeviceRunSession';
-
-jest.mock('../../../utils/turtleFetch');
-jest.mock('../../../sentry');
-
-function createLoggerMock(): bunyan {
-  return {
-    info: jest.fn(),
-    warn: jest.fn(),
-    error: jest.fn(),
-    debug: jest.fn(),
-  } as unknown as bunyan;
-}
-
-function createCtxMock(): CustomBuildContext {
-  return {
-    env: {
-      __API_SERVER_URL: 'https://api.expo.test',
-    },
-    job: {
-      secrets: { robotAccessToken: 'robot-token' },
-    },
-  } as unknown as CustomBuildContext;
-}
-
-function createEnvMock(): BuildStepEnv {
-  return { DEVICE_RUN_SESSION_ID: 'drs-id' } as unknown as BuildStepEnv;
-}
-
-describe(turnIceServersToServeSimArgs, () => {
-  it('returns no args for an empty ICE server list', () => {
-    expect(turnIceServersToServeSimArgs([])).toEqual([]);
-  });
-
-  it('builds --stun-url and --turn-url flags from Cloudflare ICE servers', () => {
-    expect(
-      turnIceServersToServeSimArgs([
-        { urls: ['stun:stun.cloudflare.com:3478', 'stun:stun.cloudflare.com:53'] },
-        {
-          urls: [
-            'turn:turn.cloudflare.com:3478?transport=udp',
-            'turns:turn.cloudflare.com:443?transport=tcp',
-          ],
-          username: 'user-123',
-          credential: 'cred-456',
-        },
-      ])
-    ).toEqual([
-      '--stun-url',
-      'stun:stun.cloudflare.com:3478,stun:stun.cloudflare.com:53',
-      '--turn-url',
-      'turn:turn.cloudflare.com:3478?transport=udp,turns:turn.cloudflare.com:443?transport=tcp',
-      '--turn-username',
-      'user-123',
-      '--turn-credential',
-      'cred-456',
-    ]);
-  });
-
-  it('emits only --turn-url flags when no credential-less (STUN) entry is present', () => {
-    expect(
-      turnIceServersToServeSimArgs([
-        {
-          urls: ['turns:turn.cloudflare.com:443?transport=tcp'],
-          username: 'u',
-          credential: 'c',
-        },
-      ])
-    ).toEqual([
-      '--turn-url',
-      'turns:turn.cloudflare.com:443?transport=tcp',
-      '--turn-username',
-      'u',
-      '--turn-credential',
-      'c',
-    ]);
-  });
-
-  it('emits only --stun-url when there is no credentialed TURN entry', () => {
-    expect(turnIceServersToServeSimArgs([{ urls: ['stun:stun.cloudflare.com:3478'] }])).toEqual([
-      '--stun-url',
-      'stun:stun.cloudflare.com:3478',
-    ]);
-  });
-});
-
-describe(fetchServeSimTurnArgsAsync, () => {
-  beforeEach(() => {
-    jest.mocked(turtleFetch).mockReset();
-  });
-
-  it('requests TURN ICE servers from the device run session endpoint and returns serve-sim args', async () => {
-    jest.mocked(turtleFetch).mockResolvedValue({
-      json: async () => ({
-        data: {
-          iceServers: [
-            { urls: ['stun:stun.cloudflare.com:3478'] },
-            {
-              urls: ['turns:turn.cloudflare.com:443?transport=tcp'],
-              username: 'u',
-              credential: 'c',
-            },
-          ],
-        },
-      }),
-    } as unknown as Awaited<ReturnType<typeof turtleFetch>>);
-
-    const args = await fetchServeSimTurnArgsAsync(createCtxMock(), {
-      env: createEnvMock(),
-      logger: createLoggerMock(),
-    });
-
-    expect(args).toEqual([
-      '--stun-url',
-      'stun:stun.cloudflare.com:3478',
-      '--turn-url',
-      'turns:turn.cloudflare.com:443?transport=tcp',
-      '--turn-username',
-      'u',
-      '--turn-credential',
-      'c',
-    ]);
-    expect(jest.mocked(turtleFetch)).toHaveBeenCalledWith(
-      'https://api.expo.test/v2/device-run-sessions/drs-id/turn-ice-servers',
-      'POST',
-      expect.objectContaining({
-        headers: { Authorization: 'Bearer robot-token' },
-      })
-    );
-  });
-
-  it('returns [] and warns when the request fails so serve-sim falls back to P2P/STUN', async () => {
-    jest.mocked(turtleFetch).mockRejectedValue(new Error('boom'));
-    const logger = createLoggerMock();
-
-    const args = await fetchServeSimTurnArgsAsync(createCtxMock(), {
-      env: createEnvMock(),
-      logger,
-    });
-
-    expect(args).toEqual([]);
-    expect(logger.warn).toHaveBeenCalled();
-    expect(jest.mocked(Sentry).capture).toHaveBeenCalled();
-  });
-});
@@ -1,174 +0,0 @@
-import { SystemError } from '@expo/eas-build-job';
-import { type bunyan } from '@expo/logger';
-import { createReadStream, createWriteStream } from 'node:fs';
-import { mkdtemp, rm, stat } from 'node:fs/promises';
-import fetch from 'node-fetch';
-import os from 'node:os';
-import path from 'node:path';
-import { pipeline } from 'node:stream/promises';
-import { z } from 'zod';
-
-import { CustomBuildContext } from '../../customBuildContext';
-import { Sentry } from '../../sentry';
-import { formatBytes } from '../../utils/artifacts';
-import { sleepAsync } from '../../utils/retry';
-import { uploadDeviceRunSessionArtifactAsync } from './deviceRunSessionArtifacts';
-
-const ARGENT_ARTIFACT_UPLOAD_POLL_INTERVAL_MS = 5_000;
-
-const ArgentArtifactSchema = z.object({
-  id: z.string(),
-  filename: z.string(),
-  mimeType: z.string(),
-  isDirectory: z.boolean().optional(),
-});
-const ArgentArtifactsListResponseSchema = z.object({
-  artifacts: z.array(ArgentArtifactSchema),
-});
-
-type ArgentArtifact = z.infer<typeof ArgentArtifactSchema>;
-
-export async function pollArgentArtifactsForUploadAsync(
-  ctx: CustomBuildContext,
-  {
-    deviceRunSessionId,
-    toolsUrl,
-    toolsAuthToken,
-    logger,
-  }: {
-    deviceRunSessionId: string;
-    toolsUrl: string;
-    toolsAuthToken?: string;
-    logger: bunyan;
-  }
-): Promise<never> {
-  logger.info('Started polling Argent tool-server for artifacts.');
-  const seenArtifactIds = new Set<string>();
-  let listArtifactsErrorCount = 0;
-
-  for (;;) {
-    try {
-      const artifacts = await listArgentArtifactsAsync({ toolsUrl, toolsAuthToken });
-      listArtifactsErrorCount = 0;
-      for (const artifact of artifacts) {
-        if (seenArtifactIds.has(artifact.id)) {
-          continue;
-        }
-        seenArtifactIds.add(artifact.id);
-        void uploadArgentArtifactAsync(ctx, {
-          deviceRunSessionId,
-          toolsUrl,
-          toolsAuthToken,
-          artifact,
-          logger,
-        }).catch(err => {
-          const error = err instanceof Error ? err : new Error(String(err));
-          Sentry.capture('Could not upload Argent remote session artifact', error);
-          logger.warn({ err: error }, 'Could not upload Argent remote session artifact.');
-        });
-      }
-    } catch (err) {
-      const error = err instanceof Error ? err : new Error(String(err));
-      listArtifactsErrorCount += 1;
-      if (listArtifactsErrorCount === 1 || listArtifactsErrorCount % 5 === 0) {
-        Sentry.capture('Could not list Argent remote session artifacts', error);
-        logger.warn(
-          { err: error, failedArtifactListCount: listArtifactsErrorCount },
-          'Could not list Argent remote session artifacts.'
-        );
-      }
-    }
-    await sleepAsync(ARGENT_ARTIFACT_UPLOAD_POLL_INTERVAL_MS);
-  }
-}
-
-export async function listArgentArtifactsAsync({
-  toolsUrl,
-  toolsAuthToken,
-}: {
-  toolsUrl: string;
-  toolsAuthToken?: string;
-}): Promise<ArgentArtifact[]> {
-  const response = await fetch(new URL('/artifacts', toolsUrl).toString(), {
-    headers: toolsAuthToken ? { Authorization: `Bearer ${toolsAuthToken}` } : {},
-  });
-  if (!response.ok) {
-    throw new SystemError(
-      `Failed to list Argent artifacts: ${response.status} ${response.statusText}`
-    );
-  }
-  const result = ArgentArtifactsListResponseSchema.safeParse(await response.json());
-  if (!result.success) {
-    throw new SystemError(`Invalid Argent artifacts response: ${result.error.message}`);
-  }
-  return result.data.artifacts;
-}
-
-export async function uploadArgentArtifactAsync(
-  ctx: CustomBuildContext,
-  {
-    deviceRunSessionId,
-    toolsUrl,
-    toolsAuthToken,
-    artifact,
-    logger,
-  }: {
-    deviceRunSessionId: string;
-    toolsUrl: string;
-    toolsAuthToken?: string;
-    artifact: ArgentArtifact;
-    logger: bunyan;
-  }
-): Promise<void> {
-  const filename = artifact.isDirectory ? `${artifact.filename}.tar.gz` : artifact.filename;
-  logger.info(`Downloading artifact ${filename}.`);
-  const temporaryDirectory = await mkdtemp(path.join(os.tmpdir(), 'argent-artifact-'));
-  try {
-    const temporaryArtifactPath = path.join(temporaryDirectory, path.basename(filename));
-    await downloadArgentArtifactToFileAsync({
-      artifact,
-      toolsUrl,
-      toolsAuthToken,
-      destinationPath: temporaryArtifactPath,
-    });
-    const { size } = await stat(temporaryArtifactPath);
-    logger.info(`Uploading artifact ${filename} (${formatBytes(size)}).`);
-    await uploadDeviceRunSessionArtifactAsync(ctx, {
-      deviceRunSessionId,
-      artifactId: artifact.id,
-      name: `${filename} (${artifact.id})`,
-      filename,
-      size,
-      stream: createReadStream(temporaryArtifactPath),
-    });
-  } finally {
-    await rm(temporaryDirectory, { recursive: true, force: true });
-  }
-}
-
-async function downloadArgentArtifactToFileAsync({
-  artifact,
-  toolsUrl,
-  toolsAuthToken,
-  destinationPath,
-}: {
-  artifact: ArgentArtifact;
-  toolsUrl: string;
-  toolsAuthToken?: string;
-  destinationPath: string;
-}): Promise<void> {
-  const response = await fetch(new URL(`/artifacts/${artifact.id}`, toolsUrl).toString(), {
-    headers: toolsAuthToken ? { Authorization: `Bearer ${toolsAuthToken}` } : {},
-  });
-  if (!response.ok) {
-    throw new SystemError(
-      `Failed to download Argent artifact ${artifact.id}: ${response.status} ${response.statusText}`
-    );
-  }
-  if (!response.body) {
-    throw new SystemError(
-      `Argent artifact ${artifact.id} response did not include a readable body.`
-    );
-  }
-  await pipeline(response.body, createWriteStream(destinationPath));
-}
@@ -1,94 +0,0 @@
-import { SystemError } from '@expo/eas-build-job';
-import { graphql } from 'gql.tada';
-import fetch, { Headers } from 'node-fetch';
-
-import { CustomBuildContext } from '../../customBuildContext';
-
-const CREATE_DEVICE_RUN_SESSION_ARTIFACT_UPLOAD_SESSION_MUTATION = graphql(`
-  mutation CreateDeviceRunSessionArtifactUploadSession(
-    $deviceRunSessionId: ID!
-    $input: CreateDeviceRunSessionArtifactUploadSessionInput!
-  ) {
-    deviceRunSession {
-      createArtifactUploadSession(deviceRunSessionId: $deviceRunSessionId, input: $input) {
-        uploadSession {
-          url
-          headers
-        }
-      }
-    }
-  }
-`);
-
-export async function uploadDeviceRunSessionArtifactAsync(
-  ctx: CustomBuildContext,
-  {
-    deviceRunSessionId,
-    artifactId,
-    name,
-    filename,
-    size,
-    stream,
-  }: {
-    deviceRunSessionId: string;
-    artifactId: string;
-    name: string;
-    filename: string;
-    size: number;
-    stream: NodeJS.ReadableStream;
-  }
-): Promise<void> {
-  const uploadSession = await createDeviceRunSessionArtifactUploadSessionAsync(ctx, {
-    deviceRunSessionId,
-    artifactId,
-    name,
-    filename,
-    size,
-  });
-  const response = await fetch(uploadSession.url, {
-    method: 'PUT',
-    headers: new Headers(uploadSession.headers as Record<string, string>),
-    body: stream,
-  });
-  if (!response.ok) {
-    throw new SystemError(
-      `Failed to upload device run session artifact ${artifactId}: ${response.status} ${response.statusText}`,
-      { cause: response }
-    );
-  }
-}
-
-async function createDeviceRunSessionArtifactUploadSessionAsync(
-  ctx: CustomBuildContext,
-  {
-    deviceRunSessionId,
-    artifactId,
-    name,
-    filename,
-    size,
-  }: {
-    deviceRunSessionId: string;
-    artifactId: string;
-    name: string;
-    filename: string;
-    size: number;
-  }
-) {
-  const result = await ctx.graphqlClient
-    .mutation(CREATE_DEVICE_RUN_SESSION_ARTIFACT_UPLOAD_SESSION_MUTATION, {
-      deviceRunSessionId,
-      input: {
-        name,
-        filename,
-        size,
-      },
-    })
-    .toPromise();
-  if (result.error) {
-    throw new SystemError(
-      `Failed to create upload session for device run session artifact ${artifactId}: ${result.error.message}`,
-      { cause: result.error }
-    );
-  }
-  return result.data!.deviceRunSession.createArtifactUploadSession.uploadSession;
-}
@@ -7,9 +7,9 @@ import { createMockLogger } from '../../../../__tests__/utils/logger';
 import { Sentry } from '../../../../sentry';
 import {
  buildTargetMetrics,
+  isCompileStep,
  collectTopLevelCompileSteps,
  formatReport,
-  isCompileStep,
  parseAndReportXcactivitylog,
 } from '../xcactivitylog';

@@ -200,21 +200,13 @@ const TEST_ENV = { PATH: '/custom/bin:/usr/bin' };
 function mockFilesystem({
  tempDir = '/tmp/xclogparser-123',
  jsonOutput = JSON.stringify(FIXTURE_TWO_MODULES),
-  buildLogEntries = ['12345-abc.xcactivitylog'] as string[] | Error,
 }: {
  tempDir?: string;
  jsonOutput?: string;
-  buildLogEntries?: string[] | Error;
 } = {}) {
  jest.spyOn(fs, 'mkdtemp').mockImplementation(async () => tempDir);
  jest.spyOn(fs, 'chmod').mockImplementation(async () => undefined);
  jest.spyOn(fs, 'readFile').mockImplementation(async () => jsonOutput);
-  jest.spyOn(fs, 'readdir').mockImplementation((async () => {
-    if (buildLogEntries instanceof Error) {
-      throw buildLogEntries;
-    }
-    return buildLogEntries;
-  }) as any);
  jest.spyOn(fs, 'rm').mockImplementation(async () => undefined);

  return {
@@ -242,14 +234,13 @@ describe('parseAndReportXcactivitylog', () => {
    mockedSpawn.mockRejectedValueOnce(new Error('xclogparser not found'));
    mockedSpawn.mockResolvedValue({ stdout: '', stderr: '' } as any);

-    const result = await parseAndReportXcactivitylog({
+    await parseAndReportXcactivitylog({
      derivedDataPath: '/tmp/derived-data',
      workspacePath: '/tmp/workspace',
      logger,
      env: TEST_ENV,
    });

-    expect(result).toEqual({ skipped: false });
    expect(mockedSpawn).toHaveBeenNthCalledWith(1, 'xclogparser', ['version'], {
      stdio: 'pipe',
      env: TEST_ENV,
@@ -276,9 +267,6 @@ describe('parseAndReportXcactivitylog', () => {
        '/tmp/workspace',
        '--reporter',
        'json',
-        '--omit_warnings',
-        '--omit_notes',
-        '--trunc_large_issues',
        '--output',
        reportPath,
      ],
@@ -387,14 +375,14 @@ describe('parseAndReportXcactivitylog', () => {
        logger,
        env: TEST_ENV,
      })
-    ).resolves.toEqual({ skipped: true });
+    ).resolves.toBeUndefined();

    expect(logger.info).toHaveBeenCalledWith('Build performance analysis skipped.');
    expect(logger.warn).not.toHaveBeenCalled();
    expect(Sentry.capture).toHaveBeenCalledWith(
      'Build performance analysis failed during "parsing_xclogparser_output"',
      expect.any(Error),
-      expect.objectContaining({ tags: { phase: 'parsing_xclogparser_output' } })
+      { tags: { phase: 'parsing_xclogparser_output' } }
    );
  });

@@ -418,14 +406,14 @@ describe('parseAndReportXcactivitylog', () => {
        logger,
        env: TEST_ENV,
      })
-    ).resolves.toEqual({ skipped: true });
+    ).resolves.toBeUndefined();

    expect(logger.info).toHaveBeenCalledWith('Build performance analysis skipped.');
    expect(logger.warn).not.toHaveBeenCalled();
    expect(Sentry.capture).toHaveBeenCalledWith(
      'Build performance analysis failed during "parsing_xclogparser_output"',
      expect.any(Error),
-      expect.objectContaining({ tags: { phase: 'parsing_xclogparser_output' } })
+      { tags: { phase: 'parsing_xclogparser_output' } }
    );
  });

@@ -446,154 +434,14 @@ describe('parseAndReportXcactivitylog', () => {
        logger,
        env: TEST_ENV,
      })
-    ).resolves.toEqual({ skipped: true });
+    ).resolves.toBeUndefined();

    expect(logger.info).toHaveBeenCalledWith('Build performance analysis skipped.');
    expect(logger.warn).not.toHaveBeenCalled();
    expect(Sentry.capture).toHaveBeenCalledWith(
      'Build performance analysis failed during "running_xclogparser"',
      expect.objectContaining({ message: 'spawn xclogparser ENOENT' }),
-      expect.objectContaining({ tags: { phase: 'running_xclogparser' } })
-    );
-  });
-
-  it('surfaces spawn error stderr/stdout/status/signal as Sentry extras', async () => {
-    const logger = createMockLogger();
-    mockFilesystem();
-
-    const spawnError: any = new Error('xclogparser exited with non-zero code: 1');
-    spawnError.stderr = 'XCLogParser fatal: missing xcactivitylog\n';
-    spawnError.stdout = 'some stdout';
-    spawnError.status = 1;
-    spawnError.signal = null;
-
-    mockedDownloadFile.mockResolvedValue(undefined);
-    mockedSpawn
-      .mockRejectedValueOnce(new Error('xclogparser not found')) // version detect
-      .mockResolvedValueOnce({ stdout: '', stderr: '' } as any) // unzip
-      .mockRejectedValueOnce(spawnError); // xclogparser run
-
-    await parseAndReportXcactivitylog({
-      derivedDataPath: '/tmp/derived-data',
-      workspacePath: '/tmp/workspace',
-      logger,
-      env: TEST_ENV,
-    });
-
-    expect(Sentry.capture).toHaveBeenCalledWith(
-      'Build performance analysis failed during "running_xclogparser"',
-      expect.any(Error),
-      {
-        tags: { phase: 'running_xclogparser' },
-        extras: {
-          exitStatus: 1,
-          signal: null,
-          stderr: 'XCLogParser fatal: missing xcactivitylog\n',
-          stdout: 'some stdout',
-        },
-      }
-    );
-  });
-
-  it('skips with actionable guidance when Logs/Build has no .xcactivitylog files', async () => {
-    const logger = createMockLogger();
-    mockFilesystem({ buildLogEntries: [] });
-
-    const result = await parseAndReportXcactivitylog({
-      derivedDataPath: '/tmp/derived-data',
-      workspacePath: '/tmp/workspace',
-      logger,
-      env: TEST_ENV,
-    });
-
-    expect(result).toEqual({ skipped: true });
-    expect(mockedSpawn).not.toHaveBeenCalled();
-    expect(mockedDownloadFile).not.toHaveBeenCalled();
-    expect(Sentry.capture).not.toHaveBeenCalled();
-    expect(logger.info).toHaveBeenCalledWith(
-      expect.stringContaining(
-        `Build performance analysis skipped: no .xcactivitylog files found at ${path.join(
-          '/tmp/derived-data',
-          'Logs',
-          'Build'
-        )}.`
-      )
-    );
-    expect(logger.info).toHaveBeenCalledWith(expect.stringContaining('custom ios/Gymfile'));
-    expect(logger.info).toHaveBeenCalledWith(
-      expect.stringContaining('derived_data_path("./build")')
-    );
-    expect(logger.info).toHaveBeenCalledWith(expect.stringContaining('result_bundle(true)'));
-    expect(logger.info).toHaveBeenCalledWith(
-      expect.stringContaining('result_bundle_path("./build/result-bundle.xcresult")')
-    );
-  });
-
-  it('skips when Logs/Build directory does not exist', async () => {
-    const logger = createMockLogger();
-    const enoent: any = new Error('ENOENT');
-    enoent.code = 'ENOENT';
-    mockFilesystem({ buildLogEntries: enoent });
-
-    const result = await parseAndReportXcactivitylog({
-      derivedDataPath: '/tmp/derived-data',
-      workspacePath: '/tmp/workspace',
-      logger,
-      env: TEST_ENV,
-    });
-
-    expect(result).toEqual({ skipped: true });
-    expect(mockedSpawn).not.toHaveBeenCalled();
-    expect(mockedDownloadFile).not.toHaveBeenCalled();
-    expect(Sentry.capture).not.toHaveBeenCalled();
-    expect(logger.info).toHaveBeenCalledWith(
-      expect.stringContaining('Build performance analysis skipped: no .xcactivitylog files found')
-    );
-  });
-
-  it('captures to Sentry and skips when readdir fails with a non-ENOENT error', async () => {
-    const logger = createMockLogger();
-    const eacces: any = new Error('EACCES: permission denied');
-    eacces.code = 'EACCES';
-    mockFilesystem({ buildLogEntries: eacces });
-
-    const result = await parseAndReportXcactivitylog({
-      derivedDataPath: '/tmp/derived-data',
-      workspacePath: '/tmp/workspace',
-      logger,
-      env: TEST_ENV,
-    });
-
-    expect(result).toEqual({ skipped: true });
-    expect(mockedSpawn).not.toHaveBeenCalled();
-    expect(mockedDownloadFile).not.toHaveBeenCalled();
-    expect(Sentry.capture).toHaveBeenCalledWith(
-      'Build performance analysis failed during "checking_xcactivitylog_existence"',
-      expect.objectContaining({ code: 'EACCES' }),
-      expect.objectContaining({
-        tags: { phase: 'checking_xcactivitylog_existence' },
-      })
-    );
-    expect(logger.info).toHaveBeenCalledWith('Build performance analysis skipped.');
-    expect(logger.info).not.toHaveBeenCalledWith(expect.stringContaining('custom ios/Gymfile'));
-  });
-
-  it('ignores non-xcactivitylog entries in Logs/Build when deciding to skip', async () => {
-    const logger = createMockLogger();
-    mockFilesystem({ buildLogEntries: ['LogStoreManifest.plist', 'some-other-file.txt'] });
-
-    const result = await parseAndReportXcactivitylog({
-      derivedDataPath: '/tmp/derived-data',
-      workspacePath: '/tmp/workspace',
-      logger,
-      env: TEST_ENV,
-    });
-
-    expect(result).toEqual({ skipped: true });
-    expect(mockedSpawn).not.toHaveBeenCalled();
-    expect(Sentry.capture).not.toHaveBeenCalled();
-    expect(logger.info).toHaveBeenCalledWith(
-      expect.stringContaining('Build performance analysis skipped: no .xcactivitylog files found')
+      { tags: { phase: 'running_xclogparser' } }
    );
  });

@@ -612,14 +460,14 @@ describe('parseAndReportXcactivitylog', () => {
        logger,
        env: TEST_ENV,
      })
-    ).resolves.toEqual({ skipped: true });
+    ).resolves.toBeUndefined();

    expect(logger.info).toHaveBeenCalledWith('Build performance analysis skipped.');
    expect(logger.warn).not.toHaveBeenCalled();
    expect(Sentry.capture).toHaveBeenCalledWith(
      'Build performance analysis failed during "downloading_xclogparser"',
      expect.objectContaining({ message: 'network unreachable' }),
-      expect.objectContaining({ tags: { phase: 'downloading_xclogparser' } })
+      { tags: { phase: 'downloading_xclogparser' } }
    );
  });

@@ -641,7 +489,7 @@ describe('parseAndReportXcactivitylog', () => {
        logger,
        env: TEST_ENV,
      })
-    ).resolves.toEqual({ skipped: false });
+    ).resolves.toBeUndefined();

    expect(logger.debug).not.toHaveBeenCalled();
    expect(logger.warn).not.toHaveBeenCalled();
@@ -676,9 +524,6 @@ describe('parseAndReportXcactivitylog', () => {
          '/tmp/workspace',
          '--reporter',
          'json',
-          '--omit_warnings',
-          '--omit_notes',
-          '--trunc_large_issues',
          '--output',
          reportPath,
        ],
@@ -3,8 +3,8 @@ import { BuildStepEnv } from '@expo/steps';
 import spawn, { SpawnResult } from '@expo/turtle-spawn';
 import path from 'path';

+import { XcodeBuildLogger } from './xcpretty';
 import { COMMON_FASTLANE_ENV } from '../../../common/fastlane';
-import { XcodeBuildLogger } from '../../../common/xcpretty';

 export async function runFastlaneGym({
  workingDir,
@@ -16,9 +16,9 @@ const XCLOGPARSER_DOWNLOAD_TIMEOUT_MS = 20_000;
 const XCLOGPARSER_OUTPUT_FILENAME = 'xcactivitylog.json';

 /**
- * Catches all internal failures (logged + routed to Sentry); returns
- * `{ skipped: true }` when analysis did not produce a report so callers can
- * mark the build phase skipped.
+ * Never throws — best-effort observability that does not affect build status.
+ * Failures route to Sentry via `Sentry.capture` for engineering triage;
+ * users see only a generic skip message.
 */
 export async function parseAndReportXcactivitylog({
  derivedDataPath,
@@ -34,38 +34,10 @@ export async function parseAndReportXcactivitylog({
  logger: bunyan;
  proxyBaseUrl?: string;
  env: BuildStepEnv;
-}): Promise<{ skipped: boolean }> {
+}): Promise<void> {
  let tempDir: string | undefined;
-  let phase = 'checking_xcactivitylog_existence';
+  let phase = 'creating_temp_directory';
  try {
-    const logsBuildDir = path.join(derivedDataPath, 'Logs', 'Build');
-    let buildLogEntries: string[];
-    try {
-      buildLogEntries = await fs.readdir(logsBuildDir);
-    } catch (err: any) {
-      if (err?.code !== 'ENOENT') {
-        throw err;
-      }
-      buildLogEntries = [];
-    }
-    const hasActivityLog = buildLogEntries.some(entry => entry.endsWith('.xcactivitylog'));
-    if (!hasActivityLog) {
-      logger.info(
-        [
-          `Build performance analysis skipped: no .xcactivitylog files found at ${logsBuildDir}.`,
-          '',
-          'This typically happens when your project has a custom ios/Gymfile. To enable',
-          'build performance analysis, add the following lines to your Gymfile:',
-          '',
-          '    derived_data_path("./build")',
-          '    result_bundle(true)',
-          '    result_bundle_path("./build/result-bundle.xcresult")',
-        ].join('\n')
-      );
-      return { skipped: true };
-    }
-
-    phase = 'creating_temp_directory';
    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'xclogparser-'));

    phase = 'resolving_xclogparser';
@@ -107,20 +79,10 @@ export async function parseAndReportXcactivitylog({
    );

    logger.info(formatReport(data));
-    return { skipped: false };
  } catch (err: any) {
    logger.info('Build performance analysis skipped.');
    const msg = `Build performance analysis failed during "${phase}"`;
-    Sentry.capture(msg, err, {
-      tags: { phase },
-      extras: {
-        exitStatus: err?.status,
-        signal: err?.signal,
-        stderr: err?.stderr?.slice(-4000),
-        stdout: err?.stdout?.slice(-4000),
-      },
-    });
-    return { skipped: true };
+    Sentry.capture(msg, err, { tags: { phase } });
  } finally {
    if (tempDir) {
      await asyncResult(fs.rm(tempDir, { force: true, recursive: true }));
@@ -241,9 +203,6 @@ async function runXclogparser({
      workspacePath,
      '--reporter',
      'json',
-      '--omit_warnings',
-      '--omit_notes',
-      '--trunc_large_issues',
      '--output',
      outputPath,
    ],
@@ -0,0 +1,91 @@
+import { bunyan } from '@expo/logger';
+import spawnAsync, { SpawnPromise, SpawnResult } from '@expo/spawn-async';
+import { ExpoRunFormatter } from '@expo/xcpretty';
+import assert from 'assert';
+import fg from 'fast-glob';
+import fs from 'fs-extra';
+import path from 'path';
+
+const CHECK_FILE_INTERVAL_MS = 1000;
+
+export class XcodeBuildLogger {
+  private loggerError?: Error;
+  private flushing: boolean = false;
+  private logReaderPromise?: SpawnPromise<SpawnResult>;
+  private logsPath?: string;
+
+  constructor(
+    private readonly logger: bunyan,
+    private readonly projectRoot: string
+  ) {}
+
+  public async watchLogFiles(logsDirectory: string): Promise<void> {
+    while (!this.flushing) {
+      const logsFilename = await this.getBuildLogFilename(logsDirectory);
+      if (logsFilename) {
+        this.logsPath = path.join(logsDirectory, logsFilename);
+        void this.startBuildLogger(this.logsPath);
+        return;
+      }
+      await new Promise(res => setTimeout(res, CHECK_FILE_INTERVAL_MS));
+    }
+  }
+
+  public async flush(): Promise<void> {
+    this.flushing = true;
+    if (this.loggerError) {
+      throw this.loggerError;
+    }
+    if (this.logReaderPromise) {
+      this.logReaderPromise.child.kill('SIGINT');
+      try {
+        await this.logReaderPromise;
+      } catch {}
+    }
+    if (this.logsPath) {
+      await this.findBundlerErrors(this.logsPath);
+    }
+  }
+  private async getBuildLogFilename(logsDirectory: string): Promise<string | undefined> {
+    const paths = await fg('*.log', { cwd: logsDirectory });
+    return paths.length >= 1 ? paths[0] : undefined;
+  }
+
+  private async startBuildLogger(logsPath: string): Promise<void> {
+    try {
+      const formatter = ExpoRunFormatter.create(this.projectRoot, {
+        // TODO: Can provide xcode project name for better parsing
+        isDebug: false,
+      });
+      this.logReaderPromise = spawnAsync('tail', ['-n', '+0', '-f', logsPath], { stdio: 'pipe' });
+      assert(this.logReaderPromise.child.stdout, 'stdout is not available');
+      this.logReaderPromise.child.stdout.on('data', (data: string) => {
+        const lines = formatter.pipe(data.toString());
+        for (const line of lines) {
+          this.logger.info(line);
+        }
+      });
+      await this.logReaderPromise;
+
+      this.logger.info(formatter.getBuildSummary());
+    } catch (err: any) {
+      if (!this.flushing) {
+        this.loggerError = err;
+      }
+    }
+  }
+
+  private async findBundlerErrors(logsPath: string): Promise<void> {
+    try {
+      const logFile = await fs.readFile(logsPath, 'utf-8');
+      const match = logFile.match(
+        /Welcome to Metro!\s* Fast - Scalable - Integrated\s*([\s\S]*)Run CLI with --verbose flag for more details.\nCommand PhaseScriptExecution failed with a nonzero exit code/
+      );
+      if (match) {
+        this.logger.info(match[1]);
+      }
+    } catch (err) {
+      this.logger.error({ err }, 'Failed to read Xcode logs');
+    }
+  }
+}
@@ -1,20 +1,13 @@
 import { SystemError } from '@expo/eas-build-job';
 import { bunyan } from '@expo/logger';
-import { BuildStepEnv, spawnAsync } from '@expo/steps';
+import { BuildStepEnv } from '@expo/steps';
 import spawn from '@expo/turtle-spawn';
-import * as ngrok from '@ngrok/ngrok';
 import { graphql } from 'gql.tada';
-import nullthrows from 'nullthrows';
-import { z } from 'zod';
-import { randomBytes } from 'node:crypto';
-import fs from 'node:fs';

 import { CustomBuildContext } from '../../customBuildContext';
-import { Sentry } from '../../sentry';
 import { sleepAsync } from '../../utils/retry';
-import { turtleFetch } from '../../utils/turtleFetch';

-const XCODE_DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer';
+const TRYCLOUDFLARE_URL_PATTERN = /https:\/\/[a-z0-9-]+\.trycloudflare\.com/;

 const START_DEVICE_RUN_SESSION_MUTATION = graphql(`
  mutation StartDeviceRunSession($deviceRunSessionId: ID!, $remoteConfig: JSONObject!) {
@@ -35,156 +28,13 @@ export function getDeviceRunSessionIdOrThrow(env: BuildStepEnv): string {
  if (!deviceRunSessionId) {
    throw new SystemError(
      'DEVICE_RUN_SESSION_ID is not set. ' +
-        'This step must run as part of a device run session ' +
+        'This step must run as part of a device run session created by the API server, ' +
        'which injects DEVICE_RUN_SESSION_ID into the job environment.'
    );
  }
  return deviceRunSessionId;
 }

-export function getNgrokTunnelDomainOrThrow(env: BuildStepEnv): string {
-  const baseDomain = env.EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN;
-  if (!baseDomain) {
-    throw new SystemError(
-      'EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN is not set. ' +
-        'This step must run as part of a device run session ' +
-        'which injects EAS_SIMULATOR_NGROK_TUNNEL_DOMAIN into the job environment.'
-    );
-  }
-  return baseDomain;
-}
-
-export function getNgrokAuthtokenOrThrow(env: BuildStepEnv): string {
-  const authtoken = env.NGROK_AUTHTOKEN;
-  if (!authtoken) {
-    throw new SystemError(
-      'NGROK_AUTHTOKEN is not set. ' +
-        'This step must run as part of a device run session ' +
-        'which injects NGROK_AUTHTOKEN into the job environment.'
-    );
-  }
-  return authtoken;
-}
-
-const TurnIceServersSchema = z.array(
-  z.object({
-    urls: z.array(z.string()),
-    username: z.string().optional(),
-    credential: z.string().optional(),
-  })
-);
-
-export type TurnIceServers = z.infer<typeof TurnIceServersSchema>;
-
-export async function selectXcodeDeveloperDirectoryAsync({
-  env,
-  logger,
-}: {
-  env: BuildStepEnv;
-  logger: bunyan;
-}): Promise<void> {
-  if (process.env.ENVIRONMENT === 'development') {
-    logger.info('Job running outside of EAS, not selecting Xcode developer directory.');
-    return;
-  }
-
-  logger.info(`Selecting Xcode developer directory: ${XCODE_DEVELOPER_DIR}.`);
-  await spawnAsync('sudo', ['xcode-select', '-s', XCODE_DEVELOPER_DIR], {
-    env,
-    logger,
-    stdio: ['ignore', 'pipe', 'pipe'],
-  });
-}
-
-const TurnIceServersResponseSchema = z.object({
-  data: z.object({
-    iceServers: TurnIceServersSchema,
-  }),
-});
-
-/**
- * Translate Cloudflare ICE servers into serve-sim CLI flags: `--stun-url` (the
- * credential-less entries) and `--turn-url`/`--turn-username`/`--turn-credential`
- * (the entry carrying the short-lived credentials).
- */
-export function turnIceServersToServeSimArgs(iceServers: TurnIceServers): string[] {
-  const stunUrls = iceServers
-    .filter(server => !server.username && !server.credential)
-    .flatMap(server => server.urls);
-  const turnServer = iceServers.find(server => server.username && server.credential);
-
-  const args: string[] = [];
-  if (stunUrls.length > 0) {
-    args.push('--stun-url', stunUrls.join(','));
-  }
-  if (turnServer?.username && turnServer.credential && turnServer.urls.length > 0) {
-    args.push(
-      '--turn-url',
-      turnServer.urls.join(','),
-      '--turn-username',
-      turnServer.username,
-      '--turn-credential',
-      turnServer.credential
-    );
-  }
-  return args;
-}
-
-/**
- * Fetch short-lived Cloudflare TURN ICE servers for this job run from www
- * (minted on demand, mirroring how the worker fetches project clone URLs) and
- * translate them into serve-sim CLI flags.
- *
- * Best-effort: on any failure we log and return [] so serve-sim falls back to
- * its built-in P2P/STUN behavior. The credential is passed to serve-sim as a
- * process arg and deliberately not logged (turtle-spawn never logs argv and the
- * worker is single-tenant).
- */
-export async function fetchServeSimTurnArgsAsync(
-  ctx: CustomBuildContext,
-  { env, logger }: { env: BuildStepEnv; logger: bunyan }
-): Promise<string[]> {
-  try {
-    const deviceRunSessionId = getDeviceRunSessionIdOrThrow(env);
-    const expoApiServerUrl = nullthrows(ctx.env.__API_SERVER_URL, '__API_SERVER_URL is not set');
-    const robotAccessToken = nullthrows(
-      ctx.job.secrets?.robotAccessToken,
-      'robot access token is not set'
-    );
-
-    const response = await turtleFetch(
-      new URL(
-        `/v2/device-run-sessions/${deviceRunSessionId}/turn-ice-servers`,
-        expoApiServerUrl
-      ).toString(),
-      'POST',
-      {
-        headers: {
-          Authorization: `Bearer ${robotAccessToken}`,
-        },
-        timeout: 5000,
-        retries: 1,
-        logger,
-      }
-    );
-
-    const { data } = TurnIceServersResponseSchema.parse(await response.json());
-    const args = turnIceServersToServeSimArgs(data.iceServers);
-    if (args.length > 0) {
-      logger.info('Configured serve-sim with Cloudflare TURN ICE servers.');
-    }
-    return args;
-  } catch (err) {
-    const error = err instanceof Error ? err : new Error(String(err));
-    Sentry.capture('Could not fetch Cloudflare TURN ICE servers', error, { level: 'warning' });
-    logger.warn(
-      { err: error },
-      'Could not fetch Cloudflare TURN ICE servers; serve-sim will fall back to P2P/STUN.'
-    );
-    return [];
-  }
-}
-
 export async function uploadRemoteSessionConfigAsync({
  ctx,
  deviceRunSessionId,
@@ -209,6 +59,22 @@ export async function uploadRemoteSessionConfigAsync({
  }
 }

+export async function ensureBrewPackageInstalledAsync({
+  name,
+  env,
+  logger,
+}: {
+  name: string;
+  env: BuildStepEnv;
+  logger: bunyan;
+}): Promise<void> {
+  await spawn(
+    'bash',
+    ['-c', `command -v ${name} >/dev/null 2>&1 || HOMEBREW_NO_AUTO_UPDATE=1 brew install ${name}`],
+    { env, logger }
+  );
+}
+
 export type DetachedProcessHandle = {
  getOutput: () => string;
 };
@@ -245,38 +111,27 @@ export function spawnDetached({
  return { getOutput: () => output };
 }

-export async function startServeSimWithTunnelAsync(
-  ctx: CustomBuildContext,
-  {
-    baseDomain,
-    env,
-    logger,
-    timeoutMs,
-  }: {
-    baseDomain: string;
-    env: BuildStepEnv;
-    logger: bunyan;
-    timeoutMs: number;
-  }
-): Promise<{ previewUrl: string; streamUrl: string }> {
+export async function startServeSimWithTunnelAsync({
+  env,
+  logger,
+  timeoutMs,
+}: {
+  env: BuildStepEnv;
+  logger: bunyan;
+  timeoutMs: number;
+}): Promise<{ previewUrl: string; streamUrl: string }> {
  logger.info('Launching serve-sim with tunnel.');
-  const turnArgs = await fetchServeSimTurnArgsAsync(ctx, { env, logger });
  const serveSim = spawnDetached({
    command: 'npx',
    args: [
      'serve-sim-szdziedzic@latest',
      '--tunnel',
-      '--tunnel-provider',
-      'ngrok',
-      '--tunnel-domain',
-      baseDomain,
+      '--tunnel-protocol',
+      'quic',
      '--stream-max-dimension',
      '1280',
      '--stream-quality',
      '0.55',
-      '--codec',
-      'webrtc',
-      ...turnArgs,
    ],
    env,
  });
@@ -285,8 +140,8 @@ export async function startServeSimWithTunnelAsync(
  const deadline = Date.now() + timeoutMs;
  while (Date.now() < deadline) {
    const output = serveSim.getOutput();
-    const previewUrl = matchLabeledUrl({ output, label: 'Tunnel', baseDomain });
-    const streamUrl = matchLabeledUrl({ output, label: 'Stream', baseDomain });
+    const previewUrl = matchLabeledUrl(output, 'Tunnel');
+    const streamUrl = matchLabeledUrl(output, 'Stream');
    if (previewUrl && streamUrl) {
      return { previewUrl, streamUrl };
    }
@@ -297,83 +152,8 @@ export async function startServeSimWithTunnelAsync(
  );
 }

-function matchLabeledUrl({
-  output,
-  label,
-  baseDomain,
-}: {
-  output: string;
-  label: string;
-  baseDomain: string;
-}): string | null {
-  const labelPattern = new RegExp(
-    `${label}:\\s*(https:\\/\\/[a-z0-9-]+\\.${escapeRegExp(baseDomain)})`
-  );
-  const match = labelPattern.exec(output);
+function matchLabeledUrl(content: string, label: string): string | null {
+  const labelPattern = new RegExp(`${label}:\\s*(${TRYCLOUDFLARE_URL_PATTERN.source})`);
+  const match = labelPattern.exec(content);
  return match ? match[1] : null;
 }
-
-export async function startNgrokTunnelAsync({
-  port,
-  subdomainPrefix,
-  baseDomain,
-  authtoken,
-  rewriteHostHeader,
-  logger,
-}: {
-  port: number;
-  subdomainPrefix: string;
-  baseDomain: string;
-  authtoken: string;
-  rewriteHostHeader?: boolean;
-  logger: bunyan;
-}): Promise<string> {
-  const domain = `${subdomainPrefix}-${randomBytes(8).toString('hex')}.${baseDomain}`;
-  logger.info(`Starting ngrok tunnel ${domain} -> http://localhost:${port}.`);
-  // Run the ngrok agent in-process via the SDK; it keeps the session alive until
-  // the process exits, and the step blocks forever to hold it open.
-  const listener = await ngrok.forward({
-    addr: port,
-    authtoken,
-    domain,
-    ...(rewriteHostHeader ? { request_header_add: [`Host:localhost:${port}`] } : {}),
-  });
-  const url = listener.url();
-  if (!url) {
-    throw new SystemError(`ngrok tunnel for ${domain} did not return a public URL.`);
-  }
-  return url;
-}
-
-function escapeRegExp(value: string): string {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
-export async function waitForFileAsync<T>({
-  filePath,
-  timeoutMs,
-  description,
-  parse,
-}: {
-  filePath: string;
-  timeoutMs: number;
-  description: string;
-  parse: (raw: string) => T;
-}): Promise<T> {
-  const deadline = Date.now() + timeoutMs;
-  let lastError: unknown;
-  while (Date.now() < deadline) {
-    try {
-      const raw = await fs.promises.readFile(filePath, 'utf8');
-      return parse(raw);
-    } catch (err) {
-      lastError = err;
-    }
-    await sleepAsync(1_000);
-  }
-  throw new SystemError(
-    `Timed out waiting for ${description} to be ready at ${filePath}${
-      lastError instanceof Error ? `: ${lastError.message}` : ''
-    }.`
-  );
-}
@@ -5,7 +5,6 @@ export const FastfileResignTemplate = `lane :do_resign do
    provisioning_profile: {<% _.forEach(PROFILES, function(profile) { %>
      "<%- profile.BUNDLE_ID %>" => "<%- profile.PATH %>",<% }); %>
    },
-    use_app_entitlements: true,
    keychain_path: "<%- KEYCHAIN_PATH %>"
  )
 end
@@ -122,10 +122,9 @@ export namespace IosSimulatorUtils {
    udid: IosSimulatorUuid;
    env: NodeJS.ProcessEnv;
  }): Promise<void> {
-    const readinessScreenshotPath = path.join(os.tmpdir(), 'eas-simulator-readiness.png');
    await retryAsync(
      async () => {
-        await spawn('xcrun', ['simctl', 'io', udid, 'screenshot', readinessScreenshotPath], {
+        await spawn('xcrun', ['simctl', 'io', udid, 'screenshot', '/dev/null'], {
          env,
        });
      },
@@ -137,7 +136,6 @@ export namespace IosSimulatorUtils {
        },
      }
    );
-    await fs.promises.rm(readinessScreenshotPath, { force: true });

    // Wait for data migration to complete before declaring the simulator ready
    // Based on WebKit's approach: https://trac.webkit.org/changeset/231452/webkit
@@ -157,25 +155,6 @@ export namespace IosSimulatorUtils {
    );
  }

-  export async function disableApsdAsync({
-    udid,
-    env,
-  }: {
-    udid: IosSimulatorUuid;
-    env: NodeJS.ProcessEnv;
-  }): Promise<void> {
-    await spawn(
-      'xcrun',
-      ['simctl', 'spawn', udid, 'launchctl', 'disable', 'system/com.apple.apsd'],
-      { env }
-    );
-    await spawn(
-      'xcrun',
-      ['simctl', 'spawn', udid, 'launchctl', 'bootout', 'system/com.apple.apsd'],
-      { env }
-    );
-  }
-
  export async function collectLogsAsync({
    deviceIdentifier,
    env,
@@ -1,64 +0,0 @@
-import spawn from '@expo/turtle-spawn';
-import os from 'node:os';
-import path from 'node:path';
-
-import { IosSimulatorUtils } from '../IosSimulatorUtils';
-import { retryAsync } from '../retry';
-
-jest.mock('@expo/turtle-spawn', () => ({
-  __esModule: true,
-  default: jest.fn(),
-}));
-
-jest.mock('../retry', () => ({
-  retryAsync: jest.fn(async fn => await fn(0)),
-}));
-
-const mockedSpawn = jest.mocked(spawn);
-
-describe('IosSimulatorUtils', () => {
-  beforeEach(() => {
-    mockedSpawn.mockResolvedValue({ stdout: '', stderr: '' } as any);
-  });
-
-  describe(IosSimulatorUtils.waitForReadyAsync, () => {
-    it('takes the readiness screenshot into a writable temp file, not /dev/null', async () => {
-      await IosSimulatorUtils.waitForReadyAsync({
-        udid: 'test-udid' as any,
-        env: process.env,
-      });
-
-      expect(mockedSpawn).toHaveBeenCalledWith(
-        'xcrun',
-        [
-          'simctl',
-          'io',
-          'test-udid',
-          'screenshot',
-          path.join(os.tmpdir(), 'eas-simulator-readiness.png'),
-        ],
-        { env: process.env }
-      );
-    });
-  });
-
-  describe(IosSimulatorUtils.disableApsdAsync, () => {
-    it('disables and boots out apsd in the simulator', async () => {
-      await IosSimulatorUtils.disableApsdAsync({
-        udid: 'test-udid' as any,
-        env: process.env,
-      });
-
-      expect(mockedSpawn).toHaveBeenCalledWith(
-        'xcrun',
-        ['simctl', 'spawn', 'test-udid', 'launchctl', 'disable', 'system/com.apple.apsd'],
-        { env: process.env }
-      );
-      expect(mockedSpawn).toHaveBeenCalledWith(
-        'xcrun',
-        ['simctl', 'spawn', 'test-udid', 'launchctl', 'bootout', 'system/com.apple.apsd'],
-        { env: process.env }
-      );
-    });
-  });
-});
@@ -71,26 +71,6 @@ describe(findArtifacts, () => {
    expect(paths.length).toBe(2);
  });

-  test('with absolute glob pattern', async () => {
-    await fs.mkdirp('/tmp');
-    await fs.mkdirp('/tmp/maestro_xctestrunner_xcodebuild_output123');
-    await fs.mkdirp('/tmp/maestro_xctestrunner_xcodebuild_output456');
-    const loggerMock = {
-      info: jest.fn(),
-      error: jest.fn(),
-    };
-    const paths = await findArtifacts({
-      rootDir: '/Users/expo/build',
-      patternOrPath: '/tmp/maestro_xctestrunner_xcodebuild_output*',
-      logger: loggerMock as any,
-    });
-    expect(loggerMock.error).toHaveBeenCalledTimes(0);
-    expect(paths).toEqual([
-      '/tmp/maestro_xctestrunner_xcodebuild_output123',
-      '/tmp/maestro_xctestrunner_xcodebuild_output456',
-    ]);
-  });
-
  test('with missing file in empty directory', async () => {
    await fs.mkdirp('/dir1/dir2/dir3');
    let errMsg = '';
@@ -1,273 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-
-import { BuildContext } from '../../context';
-import * as expoUpdates from '../expoUpdates';
-import { uploadEmbeddedBundleAsync } from '../expoUpdatesEmbedded';
-import * as easCli from '../easCli';
-import * as artifacts from '../artifacts';
-
-jest.mock('../expoUpdates');
-jest.mock('../easCli');
-jest.mock('../artifacts');
-
-const mockZipEntries = jest.fn();
-const mockZipExtract = jest.fn();
-const mockZipClose = jest.fn();
-
-jest.mock('node-stream-zip', () => ({
-  __esModule: true,
-  default: {
-    async: jest.fn(() => ({
-      entries: mockZipEntries,
-      extract: mockZipExtract,
-      close: mockZipClose,
-    })),
-  },
-}));
-
-function zipEntryMap(entries: Record<string, true>): Record<string, { name: string }> {
-  return Object.fromEntries(Object.keys(entries).map(name => [name, { name }]));
-}
-
-function makeCtx(overrides: {
-  platform: Platform;
-  simulator?: boolean;
-  channel?: string;
-  env?: Record<string, string>;
-}): BuildContext<any> {
-  const job =
-    overrides.platform === Platform.IOS
-      ? {
-          platform: Platform.IOS,
-          simulator: overrides.simulator ?? false,
-          updates: overrides.channel ? { channel: overrides.channel } : undefined,
-        }
-      : {
-          platform: Platform.ANDROID,
-          updates: overrides.channel ? { channel: overrides.channel } : undefined,
-        };
-
-  return {
-    job,
-    env: overrides.env ?? {},
-    appConfig: Promise.resolve({
-      updates: { url: 'https://u.expo.dev/project-id' },
-    }),
-    logger: {
-      info: jest.fn(),
-      warn: jest.fn(),
-    },
-    markBuildPhaseSkipped: jest.fn(),
-    markBuildPhaseHasWarnings: jest.fn(),
-    getReactNativeProjectDirectory: () => '/project',
-  } as any;
-}
-
-describe('uploadEmbeddedBundleAsync', () => {
-  beforeEach(() => {
-    jest.mocked(expoUpdates.isEASUpdateConfigured).mockResolvedValue(true);
-    jest.mocked(easCli.runEasCliCommand).mockResolvedValue({} as any);
-    jest.mocked(artifacts.findArtifacts).mockResolvedValue([]);
-    mockZipEntries.mockResolvedValue({});
-    mockZipExtract.mockResolvedValue(undefined);
-    mockZipClose.mockResolvedValue(undefined);
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-    jest.restoreAllMocks();
-  });
-
-  it('skips when EAS Update is not configured', async () => {
-    jest.mocked(expoUpdates.isEASUpdateConfigured).mockResolvedValue(false);
-    const ctx = makeCtx({ platform: Platform.ANDROID, channel: 'production' });
-
-    await uploadEmbeddedBundleAsync(ctx);
-
-    expect(ctx.markBuildPhaseSkipped).toHaveBeenCalled();
-    expect(artifacts.findArtifacts).not.toHaveBeenCalled();
-  });
-
-  it('warns when no channel is configured and does not look for the archive', async () => {
-    const ctx = makeCtx({ platform: Platform.ANDROID });
-
-    await uploadEmbeddedBundleAsync(ctx);
-
-    expect(ctx.logger.warn).toHaveBeenCalledWith(
-      'Skipping embedded bundle upload: no channel configured for this build profile.'
-    );
-    expect(ctx.markBuildPhaseHasWarnings).toHaveBeenCalled();
-    expect(artifacts.findArtifacts).not.toHaveBeenCalled();
-  });
-
-  it('throws for an unsupported platform', async () => {
-    const ctx = makeCtx({ platform: Platform.ANDROID, channel: 'production' });
-    (ctx.job as { platform: string }).platform = 'web';
-
-    await expect(uploadEmbeddedBundleAsync(ctx)).rejects.toThrow(
-      'Uploading embedded updates is not supported for the web platform.'
-    );
-    expect(artifacts.findArtifacts).not.toHaveBeenCalled();
-  });
-
-  it('uploads from Android APK archives', async () => {
-    jest.mocked(artifacts.findArtifacts).mockResolvedValue(['/tmp/app-release.apk']);
-    mockZipEntries.mockResolvedValue(
-      zipEntryMap({
-        'assets/index.android.bundle': true,
-        'assets/app.manifest': true,
-      })
-    );
-    const ctx = makeCtx({
-      platform: Platform.ANDROID,
-      channel: 'production',
-      env: { EAS_BUILD_ID: 'build-123' },
-    });
-
-    await uploadEmbeddedBundleAsync(ctx);
-
-    expect(mockZipExtract).toHaveBeenCalledWith(
-      'assets/index.android.bundle',
-      expect.stringContaining('index.android.bundle')
-    );
-    expect(easCli.runEasCliCommand).toHaveBeenCalledWith(
-      expect.objectContaining({
-        args: expect.arrayContaining([
-          'update:embedded:upload',
-          '--platform',
-          Platform.ANDROID,
-          '--channel',
-          'production',
-          '--build-id',
-          'build-123',
-        ]),
-      })
-    );
-  });
-
-  it('uploads from Android AAB archives', async () => {
-    jest.mocked(artifacts.findArtifacts).mockResolvedValue(['/tmp/app-release.aab']);
-    mockZipEntries.mockResolvedValue(
-      zipEntryMap({
-        'base/assets/index.android.bundle': true,
-        'base/assets/app.manifest': true,
-      })
-    );
-    const ctx = makeCtx({ platform: Platform.ANDROID, channel: 'production' });
-
-    await uploadEmbeddedBundleAsync(ctx);
-
-    expect(mockZipExtract).toHaveBeenCalledWith(
-      'base/assets/index.android.bundle',
-      expect.stringContaining('index.android.bundle')
-    );
-    expect(easCli.runEasCliCommand).toHaveBeenCalled();
-  });
-
-  it('uploads from iOS IPA archives', async () => {
-    jest.mocked(artifacts.findArtifacts).mockResolvedValue(['/tmp/App.ipa']);
-    mockZipEntries.mockResolvedValue(
-      zipEntryMap({
-        'Payload/App.app/main.jsbundle': true,
-        'Payload/App.app/EXUpdates.bundle/app.manifest': true,
-      })
-    );
-    const ctx = makeCtx({ platform: Platform.IOS, channel: 'production' });
-
-    await uploadEmbeddedBundleAsync(ctx);
-
-    expect(easCli.runEasCliCommand).toHaveBeenCalledWith(
-      expect.objectContaining({
-        args: expect.arrayContaining(['--platform', Platform.IOS]),
-      })
-    );
-  });
-
-  it('skips simulator builds', async () => {
-    const ctx = makeCtx({ platform: Platform.IOS, simulator: true, channel: 'preview' });
-
-    await uploadEmbeddedBundleAsync(ctx);
-
-    expect(ctx.markBuildPhaseSkipped).toHaveBeenCalled();
-    expect(artifacts.findArtifacts).not.toHaveBeenCalled();
-  });
-
-  it('warns when bundle or manifest is missing from the archive', async () => {
-    jest.mocked(artifacts.findArtifacts).mockResolvedValue(['/tmp/app-release.apk']);
-    mockZipEntries.mockResolvedValue(
-      zipEntryMap({
-        'assets/app.manifest': true,
-      })
-    );
-    const ctx = makeCtx({ platform: Platform.ANDROID, channel: 'production' });
-
-    await uploadEmbeddedBundleAsync(ctx);
-
-    expect(ctx.logger.warn).toHaveBeenCalledWith(
-      'Skipping embedded bundle upload: bundle or manifest not found in archive.'
-    );
-    expect(easCli.runEasCliCommand).not.toHaveBeenCalled();
-  });
-
-  it('warns when build archive is not found', async () => {
-    jest.mocked(artifacts.findArtifacts).mockResolvedValue([]);
-    const ctx = makeCtx({ platform: Platform.ANDROID, channel: 'production' });
-
-    await uploadEmbeddedBundleAsync(ctx);
-
-    expect(ctx.logger.warn).toHaveBeenCalledWith(
-      'Skipping embedded bundle upload: build archive not found.'
-    );
-    expect(ctx.markBuildPhaseHasWarnings).toHaveBeenCalled();
-    expect(easCli.runEasCliCommand).not.toHaveBeenCalled();
-  });
-
-  it('treats findArtifacts errors as no archive found', async () => {
-    jest.mocked(artifacts.findArtifacts).mockRejectedValue(new Error('glob failed'));
-    const ctx = makeCtx({ platform: Platform.ANDROID, channel: 'production' });
-
-    await uploadEmbeddedBundleAsync(ctx);
-
-    expect(ctx.logger.warn).toHaveBeenCalledWith(
-      'Skipping embedded bundle upload: build archive not found.'
-    );
-    expect(ctx.markBuildPhaseHasWarnings).toHaveBeenCalled();
-    expect(easCli.runEasCliCommand).not.toHaveBeenCalled();
-  });
-
-  it('warns and continues when CLI upload throws', async () => {
-    jest.mocked(artifacts.findArtifacts).mockResolvedValue(['/tmp/app-release.apk']);
-    mockZipEntries.mockResolvedValue(
-      zipEntryMap({
-        'assets/index.android.bundle': true,
-        'assets/app.manifest': true,
-      })
-    );
-    jest.mocked(easCli.runEasCliCommand).mockRejectedValue(new Error('upload failed'));
-    const ctx = makeCtx({ platform: Platform.ANDROID, channel: 'production' });
-
-    await uploadEmbeddedBundleAsync(ctx);
-
-    expect(ctx.logger.warn).toHaveBeenCalledWith(
-      expect.objectContaining({ err: expect.any(Error) }),
-      'Failed to upload embedded bundle.'
-    );
-    expect(ctx.markBuildPhaseHasWarnings).toHaveBeenCalled();
-  });
-
-  it('swallows zip.close() failures so they do not mask the upload result', async () => {
-    jest.mocked(artifacts.findArtifacts).mockResolvedValue(['/tmp/app-release.apk']);
-    mockZipEntries.mockResolvedValue(
-      zipEntryMap({
-        'assets/index.android.bundle': true,
-        'assets/app.manifest': true,
-      })
-    );
-    mockZipClose.mockRejectedValue(new Error('close failed'));
-    const ctx = makeCtx({ platform: Platform.ANDROID, channel: 'production' });
-
-    await expect(uploadEmbeddedBundleAsync(ctx)).resolves.toBeUndefined();
-    expect(easCli.runEasCliCommand).toHaveBeenCalled();
-    expect(mockZipClose).toHaveBeenCalled();
-  });
-});
@@ -19,12 +19,11 @@ export async function findArtifacts({
  /** If provided, will log error suggesting possible files to upload. */
  logger: bunyan | null;
 }): Promise<string[]> {
-  const files =
-    path.isAbsolute(patternOrPath) && !fg.isDynamicPattern(patternOrPath)
-      ? (await fs.pathExists(patternOrPath))
-        ? [patternOrPath]
-        : []
-      : await fg(patternOrPath, { cwd: rootDir, onlyFiles: false });
+  const files = path.isAbsolute(patternOrPath)
+    ? (await fs.pathExists(patternOrPath))
+      ? [patternOrPath]
+      : []
+    : await fg(patternOrPath, { cwd: rootDir, onlyFiles: false });
  if (files.length === 0) {
    if (fg.isDynamicPattern(patternOrPath)) {
      throw new FindArtifactsError(`There are no files matching pattern "${patternOrPath}"`);
@@ -1,118 +0,0 @@
-import { Android, BuildJob, Ios, Platform } from '@expo/eas-build-job';
-import { PipeMode } from '@expo/logger';
-import { asyncResult } from '@expo/results';
-import fs from 'fs-extra';
-import os from 'os';
-import path from 'path';
-import StreamZip from 'node-stream-zip';
-
-import { findArtifacts } from './artifacts';
-import { runEasCliCommand } from './easCli';
-import { resolveArtifactPath } from '../ios/resolve';
-import { BuildContext } from '../context';
-import { isEASUpdateConfigured } from './expoUpdates';
-
-export async function uploadEmbeddedBundleAsync(ctx: BuildContext<BuildJob>): Promise<void> {
-  if (!(await isEASUpdateConfigured(ctx))) {
-    ctx.markBuildPhaseSkipped();
-    return;
-  }
-
-  const { platform } = ctx.job;
-  if (platform === Platform.IOS && (ctx.job as Ios.Job).simulator) {
-    ctx.markBuildPhaseSkipped();
-    return;
-  }
-
-  const channel = ctx.job.updates?.channel;
-  if (!channel) {
-    ctx.logger.warn(
-      'Skipping embedded bundle upload: no channel configured for this build profile.'
-    );
-    ctx.markBuildPhaseHasWarnings();
-    return;
-  }
-
-  const projectDir = ctx.getReactNativeProjectDirectory();
-
-  let archivePattern: string;
-  if (platform === Platform.IOS) {
-    archivePattern = resolveArtifactPath(ctx as BuildContext<Ios.Job>);
-  } else if (platform === Platform.ANDROID) {
-    archivePattern =
-      (ctx as BuildContext<Android.Job>).job.applicationArchivePath ??
-      'android/app/build/outputs/**/*.{apk,aab}';
-  } else {
-    throw new Error(`Uploading embedded updates is not supported for the ${platform} platform.`);
-  }
-
-  const [archivePath] = await findArtifacts({
-    rootDir: projectDir,
-    patternOrPath: archivePattern,
-    logger: null,
-  }).catch(() => [] as string[]);
-
-  if (!archivePath) {
-    ctx.logger.warn('Skipping embedded bundle upload: build archive not found.');
-    ctx.markBuildPhaseHasWarnings();
-    return;
-  }
-
-  const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'eas-embedded-bundle-'));
-  const bundleName = platform === Platform.IOS ? 'main.jsbundle' : 'index.android.bundle';
-  const bundlePath = path.join(tmpDir, bundleName);
-  const manifestPath = path.join(tmpDir, 'app.manifest');
-  const zip = new StreamZip.async({ file: archivePath });
-  try {
-    const entries = Object.values(await zip.entries());
-    const bundleEntry = entries.find(e =>
-      platform === Platform.IOS
-        ? e.name.endsWith('/main.jsbundle')
-        : e.name.endsWith('assets/index.android.bundle')
-    );
-    const manifestEntry = entries.find(e =>
-      platform === Platform.IOS
-        ? e.name.includes('EXUpdates.bundle/app.manifest')
-        : e.name.endsWith('assets/app.manifest')
-    );
-
-    if (!bundleEntry || !manifestEntry) {
-      ctx.logger.warn('Skipping embedded bundle upload: bundle or manifest not found in archive.');
-      ctx.markBuildPhaseHasWarnings();
-      return;
-    }
-
-    await zip.extract(bundleEntry.name, bundlePath);
-    await zip.extract(manifestEntry.name, manifestPath);
-
-    const args = [
-      'update:embedded:upload',
-      '--platform',
-      platform,
-      '--bundle',
-      bundlePath,
-      '--manifest',
-      manifestPath,
-      '--channel',
-      channel,
-      '--non-interactive',
-    ];
-    if (ctx.env.EAS_BUILD_ID) {
-      args.push('--build-id', ctx.env.EAS_BUILD_ID);
-    }
-    await runEasCliCommand({
-      args,
-      options: {
-        cwd: projectDir,
-        env: ctx.env,
-        logger: ctx.logger,
-        mode: PipeMode.STDERR_ONLY_AS_STDOUT,
-      },
-    });
-  } catch (err: any) {
-    ctx.logger.warn({ err }, 'Failed to upload embedded bundle.');
-    ctx.markBuildPhaseHasWarnings();
-  } finally {
-    await asyncResult(zip.close());
-  }
-}
@@ -1,6 +1,6 @@
 {
  "name": "create-eas-build-function",
-  "version": "20.1.0",
+  "version": "19.0.0",
  "description": "Create functions for use in EAS Build custom builds.",
  "keywords": [
    "expo",
@@ -35,7 +35,7 @@
    "clean": "rimraf ./build/ \"*.tsbuildinfo\""
  },
  "dependencies": {
-    "@expo/steps": "20.1.0"
+    "@expo/steps": "19.0.0"
  },
  "devDependencies": {
    "@expo/package-manager": "1.9.10",
@@ -1,6 +1,6 @@
 {
  "name": "@expo/downloader",
-  "version": "20.0.0",
+  "version": "19.0.0",
  "bugs": "https://github.com/expo/eas-cli/issues",
  "license": "BUSL-1.1",
  "author": "Expo <[email protected]>",
@@ -1,6 +1,6 @@
 {
  "name": "eas-build-cache-provider",
-  "version": "20.0.0",
+  "version": "19.0.0",
  "description": "A build cache provider plugin for the Expo CLI",
  "homepage": "https://github.com/expo/eas-cli",
  "bugs": "https://github.com/expo/eas-cli/issues",
@@ -1,6 +1,6 @@
 {
  "name": "@expo/eas-build-job",
-  "version": "20.1.0",
+  "version": "19.0.0",
  "bugs": "https://github.com/expo/eas-cli/issues",
  "license": "MIT",
  "author": "Expo <[email protected]>",
@@ -25,9 +25,9 @@
    "clean": "rimraf node_modules dist coverage \"*.tsbuildinfo\""
  },
  "dependencies": {
-    "@expo/logger": "20.0.0",
+    "@expo/logger": "19.0.0",
    "@expo/results": "1.0.0",
-    "@expo/turtle-spawn": "20.0.0",
+    "@expo/turtle-spawn": "19.0.0",
    "joi": "^17.13.1",
    "semver": "^7.6.2",
    "zod": "^4.3.5"
@@ -534,47 +534,4 @@ describe('Ios.JobSchema', () => {
    expect(value).toMatchObject(job);
    expect(error).toBeFalsy();
  });
-
-  test('accepts optional refreshAdHocProvisioningProfile', () => {
-    const job = {
-      secrets: {
-        buildCredentials,
-      },
-      type: Workflow.GENERIC,
-      platform: Platform.IOS,
-      projectArchive: {
-        type: ArchiveSourceType.URL,
-        url: 'http://localhost:3000',
-      },
-      projectRootDirectory: '.',
-      initiatingUserId: randomUUID(),
-      appId: randomUUID(),
-      refreshAdHocProvisioningProfile: true,
-    };
-
-    const { value, error } = Ios.JobSchema.validate(job, joiOptions);
-    expect(value.refreshAdHocProvisioningProfile).toBe(true);
-    expect(error).toBeFalsy();
-  });
-
-  test('does not require refreshAdHocProvisioningProfile', () => {
-    const job = {
-      secrets: {
-        buildCredentials,
-      },
-      type: Workflow.GENERIC,
-      platform: Platform.IOS,
-      projectArchive: {
-        type: ArchiveSourceType.URL,
-        url: 'http://localhost:3000',
-      },
-      projectRootDirectory: '.',
-      initiatingUserId: randomUUID(),
-      appId: randomUUID(),
-    };
-
-    const { value, error } = Ios.JobSchema.validate(job, joiOptions);
-    expect(value.refreshAdHocProvisioningProfile).toBeUndefined();
-    expect(error).toBeFalsy();
-  });
 });
@@ -181,6 +181,12 @@ export const CacheSchema = Joi.object({
  paths: Joi.array().items(Joi.string()).default([]),
 });

+export interface BuildPhaseStats {
+  buildPhase: BuildPhase;
+  result: BuildPhaseResult;
+  durationMs: number;
+}
+
 const GitHubContextZ = z.object({
  triggering_actor: z.string().optional(),
  event_name: z.enum(['push', 'pull_request', 'workflow_dispatch', 'schedule']),
@@ -5,6 +5,7 @@ export {
  ArchiveSource,
  ArchiveSourceSchemaZ,
  BuildMode,
+  BuildPhaseStats,
  BuildTrigger,
  EasCliNpmTags,
  Env,
@@ -144,8 +144,6 @@ export interface Job {
  appId: string;

  environment?: string;
-
-  refreshAdHocProvisioningProfile?: boolean;
 }

 const SecretsSchema = Joi.object({
@@ -231,8 +229,6 @@ export const JobSchema = Joi.object({

  environment: Joi.string(),

-  refreshAdHocProvisioningProfile: Joi.boolean(),
-
  workflowInterpolationContext: Joi.object().custom(workflowInterpolationContext =>
    StaticWorkflowInterpolationContextZ.optional().parse(workflowInterpolationContext)
  ),
@@ -27,7 +27,6 @@ export enum BuildPhase {
   */
  UPLOAD_ARTIFACTS = 'UPLOAD_ARTIFACTS',
  UPLOAD_APPLICATION_ARCHIVE = 'UPLOAD_APPLICATION_ARCHIVE',
-  UPLOAD_EMBEDDED_BUNDLE = 'UPLOAD_EMBEDDED_BUNDLE',
  UPLOAD_BUILD_ARTIFACTS = 'UPLOAD_BUILD_ARTIFACTS',
  PREPARE_ARTIFACTS = 'PREPARE_ARTIFACTS',
  CLEAN_UP_CREDENTIALS = 'CLEAN_UP_CREDENTIALS',
@@ -92,7 +91,6 @@ export const buildPhaseDisplayName: Record<BuildPhase, string> = {
  [BuildPhase.CACHE_STATS]: 'Cache stats',
  [BuildPhase.UPLOAD_ARTIFACTS]: 'Upload artifacts',
  [BuildPhase.UPLOAD_APPLICATION_ARCHIVE]: 'Upload application archive',
-  [BuildPhase.UPLOAD_EMBEDDED_BUNDLE]: 'Upload embedded bundle',
  [BuildPhase.UPLOAD_BUILD_ARTIFACTS]: 'Upload build artifacts',
  [BuildPhase.PREPARE_ARTIFACTS]: 'Prepare artifacts',
  [BuildPhase.CLEAN_UP_CREDENTIALS]: 'Clean up credentials',
@@ -159,7 +157,6 @@ export const buildPhaseWebsiteId: Record<BuildPhase, string> = {
  [BuildPhase.CACHE_STATS]: 'cache-stats',
  [BuildPhase.UPLOAD_ARTIFACTS]: 'upload-artifacts',
  [BuildPhase.UPLOAD_APPLICATION_ARCHIVE]: 'upload-application-archive',
-  [BuildPhase.UPLOAD_EMBEDDED_BUNDLE]: 'upload-embedded-bundle',
  [BuildPhase.UPLOAD_BUILD_ARTIFACTS]: 'upload-build-artifacts',
  [BuildPhase.PREPARE_ARTIFACTS]: 'prepare-artifacts',
  [BuildPhase.CLEAN_UP_CREDENTIALS]: 'clean-up-credentials',
@@ -1,6 +1,6 @@
 {
  "name": "eas-cli",
-  "version": "20.5.0",
+  "version": "19.0.1",
  "description": "EAS command line tool",
  "keywords": [
    "cli",
@@ -27,7 +27,7 @@
  ],
  "scripts": {
    "postpack": "rimraf oclif.manifest.json",
-    "prepack": "yarn sync-agent-templates && yarn rebuild && node ./scripts/prepack.js",
+    "prepack": "yarn rebuild && node ./scripts/prepack.js",
    "rebuild": "rimraf build \"*.tsbuildinfo\" && yarn build",
    "build": "yarn typecheck-for-build && yarn copy-new-templates",
    "build-allow-unused": "tsc --project tsconfig.allowUnused.json",
@@ -36,7 +36,6 @@
    "typecheck": "tsc",
    "typecheck-for-build": "tsc --project tsconfig.build.json",
    "test": "jest",
-    "sync-agent-templates": "node scripts/sync-agent-templates.js",
    "version": "yarn run -T oclif readme && node scripts/patch-readme && git add README.md",
    "generate-graphql-code": "graphql-codegen --config graphql-codegen.ts",
    "verify-graphql-code": "./scripts/verify-graphql.sh",
@@ -48,11 +47,11 @@
    "@expo/code-signing-certificates": "0.0.5",
    "@expo/config": "55.0.10",
    "@expo/config-plugins": "55.0.7",
-    "@expo/eas-build-job": "20.1.0",
-    "@expo/eas-json": "20.1.0",
+    "@expo/eas-build-job": "19.0.0",
+    "@expo/eas-json": "19.0.0",
    "@expo/env": "^1.0.0",
    "@expo/json-file": "8.3.3",
-    "@expo/logger": "20.0.0",
+    "@expo/logger": "19.0.0",
    "@expo/multipart-body-parser": "2.0.0",
    "@expo/osascript": "2.1.4",
    "@expo/package-manager": "1.9.10",
@@ -64,7 +63,7 @@
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
    "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "20.1.0",
+    "@expo/steps": "19.0.0",
    "@expo/timeago.js": "1.0.0",
    "@oclif/core": "^4.8.3",
    "@oclif/plugin-autocomplete": "^3.2.40",
@@ -222,12 +221,12 @@
      "secret": {
        "description": "manage project and account secrets"
      },
+      "simulator": {
+        "description": "manage remote simulator sessions"
+      },
      "update": {
        "description": "manage individual updates"
      },
-      "update:embedded": {
-        "description": "manage embedded updates registered with EAS Update"
-      },
      "webhook": {
        "description": "manage webhooks"
      },
@@ -1,31 +0,0 @@
-const fs = require('fs/promises');
-const path = require('path');
-
-const LLM_CONFIGS_EXPO_APP_TEMPLATE_BASE_URL =
-  'https://raw.githubusercontent.com/expo/llm-configs/main/expo-app';
-const AGENT_TEMPLATE_FILE_NAMES = ['AGENTS.md', 'CLAUDE.md'];
-
-async function fetchTemplateAsync(fileName) {
-  const url = `${LLM_CONFIGS_EXPO_APP_TEMPLATE_BASE_URL}/${fileName}`;
-  const response = await fetch(url);
-
-  if (!response.ok) {
-    throw new Error(`Failed to fetch ${url}: ${response.status} ${response.statusText}`);
-  }
-
-  return await response.text();
-}
-
-(async () => {
-  const templatesDir = path.join(__dirname, '..', 'src', 'commandUtils', 'new', 'templates');
-
-  await Promise.all(
-    AGENT_TEMPLATE_FILE_NAMES.map(async fileName => {
-      const content = await fetchTemplateAsync(fileName);
-      await fs.writeFile(path.join(templatesDir, fileName), content);
-    })
-  );
-
-  // eslint-disable-next-line no-console
-  console.log('Synced new app agent templates from expo/llm-configs');
-})();
@@ -1,197 +0,0 @@
-import { getConfigFilePaths } from '@expo/config';
-
-import { getWorkflowRunUrl } from '../../build/utils/url';
-import Go from '../../commands/go';
-import { WorkflowRunStatus } from '../../graphql/generated';
-import { WorkflowRunMutation } from '../../graphql/mutations/WorkflowRunMutation';
-import { WorkflowRunQuery } from '../../graphql/queries/WorkflowRunQuery';
-import Log from '../../log';
-import { selectAsync } from '../../prompts';
-import { getPrivateExpoConfigAsync } from '../../project/expoConfig';
-import { uploadAccountScopedFileAsync } from '../../project/uploadAccountScopedFileAsync';
-import { uploadAccountScopedProjectSourceAsync } from '../../project/uploadAccountScopedProjectSourceAsync';
-import { ensureActorHasPrimaryAccount } from '../../user/actions';
-import { detectProjectSdkVersionAsync } from '../../commands/go';
-import { mockTestCommand } from './utils';
-
-jest.mock('@expo/config', () => ({
-  ...jest.requireActual('@expo/config'),
-  getConfigFilePaths: jest.fn(),
-}));
-jest.mock('../../project/expoConfig');
-jest.mock('../../log', () => ({
-  __esModule: true,
-  default: {
-    log: jest.fn(),
-    withTick: jest.fn(),
-    newLine: jest.fn(),
-    succeed: jest.fn(),
-    debug: jest.fn(),
-    markFreshLine: jest.fn(),
-    error: jest.fn(),
-  },
-  learnMore: jest.fn().mockReturnValue(''),
-}));
-jest.mock('../../ora', () => ({
-  ora: jest.fn().mockReturnValue({
-    start: jest.fn().mockReturnThis(),
-    stop: jest.fn().mockReturnThis(),
-    fail: jest.fn().mockReturnThis(),
-    succeed: jest.fn().mockReturnThis(),
-  }),
-}));
-jest.mock('fs-extra', () => ({
-  ensureDir: jest.fn().mockResolvedValue(undefined),
-  writeFile: jest.fn().mockResolvedValue(undefined),
-  remove: jest.fn().mockResolvedValue(undefined),
-}));
-jest.mock('../../user/actions');
-jest.mock('../../graphql/queries/WorkflowRunQuery');
-jest.mock('../../graphql/mutations/WorkflowRunMutation');
-jest.mock('../../project/uploadAccountScopedFileAsync');
-jest.mock('../../project/uploadAccountScopedProjectSourceAsync');
-jest.mock('../../build/utils/url');
-jest.mock('../../prompts');
-
-const mockGetConfigFilePaths = jest.mocked(getConfigFilePaths);
-const mockGetPrivateExpoConfigAsync = jest.mocked(getPrivateExpoConfigAsync);
-
-describe('detectProjectSdkVersionAsync', () => {
-  it('returns undefined when no config file exists', async () => {
-    mockGetConfigFilePaths.mockReturnValue({ staticConfigPath: null, dynamicConfigPath: null });
-    await expect(detectProjectSdkVersionAsync('/project')).resolves.toBeUndefined();
-  });
-
-  it('returns the sdkVersion from the project config', async () => {
-    mockGetConfigFilePaths.mockReturnValue({
-      staticConfigPath: '/project/app.json',
-      dynamicConfigPath: null,
-    });
-    mockGetPrivateExpoConfigAsync.mockResolvedValue({ sdkVersion: '55.0.0' } as any);
-    await expect(detectProjectSdkVersionAsync('/project')).resolves.toBe('55.0.0');
-  });
-
-  it('returns undefined when reading the config throws', async () => {
-    mockGetConfigFilePaths.mockReturnValue({
-      staticConfigPath: '/project/app.json',
-      dynamicConfigPath: null,
-    });
-    mockGetPrivateExpoConfigAsync.mockRejectedValue(new Error('config error'));
-    await expect(detectProjectSdkVersionAsync('/project')).resolves.toBeUndefined();
-  });
-});
-
-const mockAccount = { id: 'account-id', name: 'testuser' };
-const mockActor = {
-  __typename: 'User' as const,
-  id: 'user-id',
-  username: 'testuser',
-  primaryAccount: mockAccount,
-};
-
-describe('Go command', () => {
-  beforeEach(() => {
-    jest.mocked(ensureActorHasPrimaryAccount).mockReturnValue(mockAccount as any);
-    jest.mocked(WorkflowRunQuery.expoGoRepackConfigurationAsync).mockResolvedValue({
-      files: [],
-      sdkVersion: '55.0.0',
-    } as any);
-    jest.mocked(WorkflowRunMutation.createExpoGoRepackWorkflowRunAsync).mockResolvedValue({
-      id: 'run-id',
-    } as any);
-    jest.mocked(uploadAccountScopedProjectSourceAsync).mockResolvedValue({
-      projectArchiveBucketKey: 'archive-key',
-    });
-    jest
-      .mocked(uploadAccountScopedFileAsync)
-      .mockResolvedValue({ fileBucketKey: 'file-key' } as any);
-    jest.mocked(getWorkflowRunUrl).mockReturnValue('https://expo.dev/run/123');
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  function makeCmd(argv: string[] = []) {
-    const ctx = {
-      loggedIn: { actor: mockActor as any, graphqlClient: {} as any },
-      analytics: {} as any,
-    };
-    const cmd = mockTestCommand(Go, ['--bundle-id', 'com.test.go', ...argv], ctx);
-    jest.spyOn(cmd as any, 'ensureEasProjectAsync').mockResolvedValue('project-id');
-    jest.spyOn(cmd as any, 'setupCredentialsAsync').mockResolvedValue({ id: 'asc-app-id' });
-    jest.spyOn(cmd as any, 'monitorWorkflowJobsAsync').mockResolvedValue(WorkflowRunStatus.Success);
-    return cmd;
-  }
-
-  it('logs auto-selected SDK message and reports resolved version after dispatch', async () => {
-    mockGetConfigFilePaths.mockReturnValue({
-      staticConfigPath: '/app.json',
-      dynamicConfigPath: null,
-    });
-    mockGetPrivateExpoConfigAsync.mockResolvedValue({ sdkVersion: '55.0.0' } as any);
-
-    await makeCmd().run();
-
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('SDK 55'));
-    expect(Log.withTick).toHaveBeenCalledWith(expect.stringContaining('Using Expo Go SDK'));
-  });
-
-  it('skips auto-select log when --sdk-version flag is provided', async () => {
-    mockGetConfigFilePaths.mockReturnValue({
-      staticConfigPath: '/app.json',
-      dynamicConfigPath: null,
-    });
-    mockGetPrivateExpoConfigAsync.mockResolvedValue({ sdkVersion: '55.0.0' } as any);
-
-    await makeCmd(['--sdk-version', '55.0.0']).run();
-
-    expect(Log.log).not.toHaveBeenCalledWith(expect.stringContaining('Auto-selected'));
-  });
-
-  it('prompts for SDK version when no project config is found', async () => {
-    mockGetConfigFilePaths.mockReturnValue({ staticConfigPath: null, dynamicConfigPath: null });
-    jest.mocked(WorkflowRunQuery.expoGoSupportedSdkVersionsAsync).mockResolvedValue([
-      { sdkVersion: '54.0.0', isLatest: false, isBeta: false, isDeprecated: false },
-      { sdkVersion: '55.0.0', isLatest: true, isBeta: false, isDeprecated: false },
-      { sdkVersion: '56.0.0', isLatest: false, isBeta: true, isDeprecated: false },
-    ]);
-    jest.mocked(selectAsync).mockResolvedValue('55.0.0');
-
-    await makeCmd().run();
-
-    expect(selectAsync).toHaveBeenCalledWith(
-      'Select an Expo SDK version',
-      expect.arrayContaining([
-        expect.objectContaining({ title: 'SDK 54', value: '54.0.0' }),
-        expect.objectContaining({ title: 'SDK 55 (latest)', value: '55.0.0' }),
-        expect.objectContaining({ title: 'SDK 56 (beta)', value: '56.0.0' }),
-      ]),
-      expect.objectContaining({ initial: '55.0.0' })
-    );
-  });
-
-  it('skips prompt when all versions are deprecated', async () => {
-    mockGetConfigFilePaths.mockReturnValue({ staticConfigPath: null, dynamicConfigPath: null });
-    jest
-      .mocked(WorkflowRunQuery.expoGoSupportedSdkVersionsAsync)
-      .mockResolvedValue([
-        { sdkVersion: '54.0.0', isLatest: false, isBeta: false, isDeprecated: true },
-      ]);
-
-    await makeCmd().run();
-
-    expect(selectAsync).not.toHaveBeenCalled();
-  });
-
-  it('falls back gracefully when supportedSdkVersions fetch fails', async () => {
-    mockGetConfigFilePaths.mockReturnValue({ staticConfigPath: null, dynamicConfigPath: null });
-    jest
-      .mocked(WorkflowRunQuery.expoGoSupportedSdkVersionsAsync)
-      .mockRejectedValue(new Error('network error'));
-
-    await makeCmd().run();
-
-    expect(selectAsync).not.toHaveBeenCalled();
-  });
-});
@@ -42,7 +42,6 @@ export async function createBuildContextAsync<T extends Platform>({
  customBuildConfigMetadata,
  buildLoggerLevel,
  freezeCredentials,
-  refreshAdHocProvisioningProfile: refreshAdHocProvisioningProfileFlag,
  isVerboseLoggingEnabled,
  whatToTest,
  env,
@@ -66,7 +65,6 @@ export async function createBuildContextAsync<T extends Platform>({
  customBuildConfigMetadata?: CustomBuildConfigMetadata;
  buildLoggerLevel?: LoggerLevel;
  freezeCredentials: boolean;
-  refreshAdHocProvisioningProfile?: boolean;
  isVerboseLoggingEnabled: boolean;
  whatToTest?: string;
  env: Record<string, string>;
@@ -92,8 +90,6 @@ export async function createBuildContextAsync<T extends Platform>({

  const requiredPackageManager = resolvePackageManager(projectDir);

-  const refreshAdHocProvisioningProfile = refreshAdHocProvisioningProfileFlag ?? false;
-
  const credentialsCtx = new CredentialsContext({
    projectInfo: { exp, projectId },
    nonInteractive,
@@ -105,7 +101,6 @@ export async function createBuildContextAsync<T extends Platform>({
    easJsonCliConfig,
    vcsClient,
    freezeCredentials,
-    refreshAdHocProvisioningProfile,
  });

  const devClientProperties = getDevClientEventProperties({
@@ -1,40 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { CredentialsSource } from '@expo/eas-json';
-
-import { BuildContext } from '../../context';
-import { ensureIosCredentialsAsync } from '../credentials';
-
-describe(ensureIosCredentialsAsync, () => {
-  it('errors when refresh is enabled with local credentials source', async () => {
-    const buildCtx = {
-      buildProfile: {
-        credentialsSource: CredentialsSource.LOCAL,
-        simulator: false,
-        withoutCredentials: false,
-      },
-      credentialsCtx: {
-        refreshAdHocProvisioningProfile: true,
-      },
-    } as BuildContext<Platform.IOS>;
-
-    await expect(ensureIosCredentialsAsync(buildCtx, [])).rejects.toThrow(
-      '--refresh-ad-hoc-provisioning-profile cannot be used with credentialsSource "local". Use remote credentials or omit the flag.'
-    );
-  });
-
-  it('does not reject refresh when credentials source is remote', async () => {
-    const buildCtx = {
-      buildProfile: {
-        credentialsSource: CredentialsSource.REMOTE,
-        simulator: true,
-        withoutCredentials: false,
-        distribution: 'internal',
-      },
-      credentialsCtx: {
-        refreshAdHocProvisioningProfile: true,
-      },
-    } as BuildContext<Platform.IOS>;
-
-    await expect(ensureIosCredentialsAsync(buildCtx, [])).resolves.toBeUndefined();
-  });
-});
@@ -17,16 +17,6 @@ export async function ensureIosCredentialsAsync(
    return;
  }

-  const { credentialsSource } = buildCtx.buildProfile;
-  if (
-    buildCtx.credentialsCtx.refreshAdHocProvisioningProfile &&
-    credentialsSource === 'local'
-  ) {
-    throw new Error(
-      '--refresh-ad-hoc-provisioning-profile cannot be used with credentialsSource "local". Use remote credentials or omit the flag.'
-    );
-  }
-
  const provider = new IosCredentialsProvider(buildCtx.credentialsCtx, {
    app: await getAppFromContextAsync(buildCtx.credentialsCtx),
    targets,
@@ -34,6 +24,8 @@ export async function ensureIosCredentialsAsync(
    enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
  });

+  const { credentialsSource } = buildCtx.buildProfile;
+
  logCredentialsSource(credentialsSource, Platform.IOS);
  return {
    credentials: await provider.getCredentialsAsync(credentialsSource),
@@ -112,9 +112,6 @@ export async function prepareJobAsync(
    // See: https://github.com/expo/eas-build/pull/454
    appId: ctx.projectId,
    initiatingUserId: ctx.user.id,
-    ...(ctx.credentialsCtx.refreshAdHocProvisioningProfile && {
-      refreshAdHocProvisioningProfile: true,
-    }),
  };
  return sanitizeBuildJob(job) as Ios.Job;
 }
@@ -103,7 +103,6 @@ export interface BuildFlags {
  message?: string;
  buildLoggerLevel?: LoggerLevel;
  freezeCredentials: boolean;
-  refreshAdHocProvisioningProfile?: boolean;
  isVerboseLoggingEnabled?: boolean;
  whatToTest?: string;
  simulator?: SimulatorRunTarget;
@@ -414,7 +413,6 @@ async function prepareAndStartBuildAsync({
    customBuildConfigMetadata,
    buildLoggerLevel: flags.buildLoggerLevel ?? (Log.isDebug ? LoggerLevel.DEBUG : undefined),
    freezeCredentials: flags.freezeCredentials,
-    refreshAdHocProvisioningProfile: flags.refreshAdHocProvisioningProfile,
    isVerboseLoggingEnabled: flags.isVerboseLoggingEnabled ?? false,
    whatToTest: flags.whatToTest,
    env,
@@ -35,5 +35,4 @@ export interface BuildFlags {
  message?: string;
  buildLoggerLevel?: LoggerLevel;
  freezeCredentials: boolean;
-  refreshAdHocProvisioningProfile?: boolean;
 }
@@ -64,19 +64,6 @@ export function getWorkflowRunUrl(
  ).toString();
 }

-export function getDeviceRunSessionUrl(
-  accountName: string,
-  projectName: string,
-  deviceRunSessionId: string
-): string {
-  return new URL(
-    `/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
-      projectName
-    )}/simulator-sessions/${encodeURIComponent(deviceRunSessionId)}`,
-    getExpoWebsiteBaseUrl()
-  ).toString();
-}
-
 /**
 * @deprecated Links to the raw job-run page; prefer a higher-level URL (e.g. the workflow run
 * or the feature-specific dashboard) that gives users more context. Use this only for internal
@@ -1,41 +1,162 @@
+# AGENTS.md
+
+## Project Overview
+
 This is an Expo/React Native mobile application. Prioritize mobile-first patterns, performance, and cross-platform compatibility.

-## Expo has changed — do not trust your training data
+## Documentation Resources

-Expo ships breaking changes every SDK release. APIs you remember are likely renamed, moved, or removed. Before writing any code that touches an Expo, EAS, or React Native API:
+When working on this project, **always consult the official Expo documentation** available at:

-1. Read the major version of the `expo` package in `package.json`.
-2. Fetch the matching versioned docs: `https://docs.expo.dev/versions/v<major>.0.0/`
-3. For anything else, fetch https://docs.expo.dev/llms.txt — an index of all Expo docs with corrections to common LLM misconceptions. Follow its links to the specific page you need; never answer from memory.
+- **https://docs.expo.dev/llms.txt** - Index of all available documentation files
+- **https://docs.expo.dev/llms-full.txt** - Complete Expo documentation including Expo Router, Expo Modules API, development process
+- **https://docs.expo.dev/llms-eas.txt** - Complete EAS (Expo Application Services) documentation
+- **https://docs.expo.dev/llms-sdk.txt** - Complete Expo SDK documentation
+- **https://reactnative.dev/docs/getting-started** - Complete React Native documentation

-## Commands
+These documentation files are specifically formatted for AI agents and should be your **primary reference** for:

-Use `bunx` instead of `npx` if the project uses bun (`bun.lock` present).
+- Expo APIs and best practices
+- Expo Router navigation patterns
+- EAS Build, Submit, and Update workflows
+- Expo SDK modules and their usage
+- Development and deployment processes

-```bash
-npx expo install <package>  # ALWAYS use instead of npm/yarn/pnpm/bun add — resolves SDK-compatible versions
-npx expo start              # start the dev server
-npx expo lint               # lint
-npx tsc --noEmit            # typecheck
-npx expo-doctor             # diagnose dependency and config issues
-npx expo install --fix      # fix incompatible package versions
+## Project Structure
+
+```
+/
+├── app/                   # Expo Router file-based routing
+│   ├── (tabs)/            # Tab-based navigation screens
+│   │   ├── index.tsx      # Home screen
+│   │   ├── explore.tsx    # Explore screen
+│   │   └── _layout.tsx    # Tabs layout
+│   ├── _layout.tsx        # Root layout with theme provider
+│   └── modal.tsx          # Modal screen example
+├── components/            # Reusable React components
+│   ├── ui/                # UI primitives (IconSymbol, Collapsible)
+│   └── ...                # Feature components (themed, haptic, parallax)
+├── constants/             # App-wide constants (theme, colors)
+├── hooks/                 # Custom React hooks (color scheme, theme)
+├── assets/                # Static assets (images, fonts)
+├── scripts/               # Utility scripts (reset-project)
+├── .eas/workflows/        # EAS Workflows (CI/CD automation)
+├── app.json               # Expo configuration
+├── eas.json               # EAS Build/Submit configuration
+└── package.json           # Dependencies and scripts
 ```

-Run lint and typecheck before declaring any task done.
+## Essential Commands

-## Navigation & Routing
+### Development

- Use **Expo Router** for all navigation. Routes live in `src/app/` — every file there is a screen, `_layout.tsx` files define navigators. Keep non-route code (components, hooks, utils) outside `src/app/`.
- Import `Link`, `router`, and `useLocalSearchParams` from `expo-router`.
- Docs: https://docs.expo.dev/router/introduction.md
+```bash
+npx expo start                  # Start dev server
+npx expo start --clear          # Clear cache and start dev server
+npx expo install <package>      # Install packages with compatible versions
+npx expo install --check        # Check which installed packages need to be updated
+npx expo install --fix          # Automatically update any invalid package versions
+npm run development-builds      # Create development builds (workflow)
+npm run reset-project           # Reset to blank template
+```

-## Building with EAS
+### Building & Testing

-Use EAS to build, sign, and submit the app in the cloud (`eas build`, `eas submit`) and to ship over-the-air updates (`eas update`) — no local Xcode or Android Studio required. Run EAS CLI as `bunx eas-cli <command>` in Bun projects, or `npx eas-cli@latest <command>` otherwise; substitute that for bare `eas` in docs examples.
-Docs: https://docs.expo.dev/eas/index.md
+```bash
+npx expo doctor      # Check project health and dependencies
+npx expo lint        # Run ESLint
+npm run draft        # Publish preview update and website (workflow)
+```

-## Rules
+### Production

- If `ios/` and `android/` directories do not exist, they are generated (Continuous Native Generation). Never create or edit them by hand — configure native behavior in `app.json` and config plugins.
- Expo Go only includes its bundled native modules. After adding a library with native code, the app needs a development build: `npx expo run:ios|android` locally, or `eas build --profile development`.
- Prefer recommended Expo modules over third-party libraries, and check your available skills before adding dependencies. Docs: https://docs.expo.dev/versions/latest/index.md
+```bash
+npx eas-cli@latest build --platform ios -s          # Use EAS to build for iOS platform and submit to App Store
+npx eas-cli@latest build --platform android -s      # Use EAS to build for Android platform and submit to Google Play Store
+npm run deploy                                      # Deploy to production (workflow)
+```
+
+## Development Guidelines
+
+### Code Style & Standards
+
+- **TypeScript First**: Use TypeScript for all new code with strict type checking
+- **Naming Conventions**: Use meaningful, descriptive names for variables, functions, and components
+- **Self-Documenting Code**: Write clear, readable code that explains itself; only add comments for complex business logic or design decisions
+- **React 19 Patterns**: Follow modern React patterns including:
+  - Function components with hooks
+  - Enable React Compiler
+  - Proper dependency arrays in useEffect
+  - Memoization when appropriate (useMemo, useCallback)
+  - Error boundaries for better error handling
+
+### Navigation & Routing
+
+- Use **Expo Router** for all navigation
+- Import `Link`, `router`, and `useLocalSearchParams` from `expo-router`
+- Docs: https://docs.expo.dev/router/introduction/
+
+### Recommended Libraries
+
+- **Navigation**: `expo-router` for navigation
+- **Images**: `expo-image` for optimized image handling and caching
+- **Animations**: `react-native-reanimated` for performant animations on native thread
+- **Gestures**: `react-native-gesture-handler` for native gesture recognition
+- **Storage**: Use `expo-sqlite` for persistent storage, `expo-sqlite/kv-store` for simple key-value storage
+
+## Debugging & Development Tools
+
+### DevTools Integration
+
+- **React Native DevTools**: Use MCP `open_devtools` command to launch debugging tools
+- **Network Inspection**: Monitor API calls and network requests in DevTools
+- **Element Inspector**: Debug component hierarchy and styles
+- **Performance Profiler**: Identify performance bottlenecks
+- **Logging**: Use `console.log` for debugging (remove before production), `console.warn` for deprecation notices, `console.error` for actual errors, and implement error boundaries for production error handling
+
+### Testing & Quality Assurance
+
+#### Automated Testing with MCP Tools
+
+Developers can configure the Expo MCP server with the following doc: https://docs.expo.dev/eas/ai/mcp/
+
+- **Component Testing**: Add `testID` props to components for automation
+- **Visual Testing**: Use MCP `automation_take_screenshot` to verify UI appearance
+- **Interaction Testing**: Use MCP `automation_tap_by_testid` to simulate user interactions
+- **View Verification**: Use MCP `automation_find_view_by_testid` to validate component rendering
+
+## EAS Workflows CI/CD
+
+This project is pre-configured with **EAS Workflows** for automating development and release processes. Workflows are defined in `.eas/workflows/` directory.
+
+When working with EAS Workflows, **always refer to**:
+
+- https://docs.expo.dev/eas/workflows/ for workflow examples
+- The `.eas/workflows/` directory for existing workflow configurations
+- You can check that a workflow YAML is valid using the workflows schema: https://exp.host/--/api/v2/workflows/schema
+
+### Build Profiles (eas.json)
+
+- **development**: Development builds with dev client
+- **development-simulator**: Development builds for iOS simulator
+- **preview**: Internal distribution preview builds
+- **production**: Production builds with auto-increment
+
+## Troubleshooting
+
+### Expo Go Errors & Development Builds
+
+If there are errors in **Expo Go** or the project is not running, create a **development build**. **Expo Go** is a sandbox environment with a limited set of native modules. To create development builds, run `eas build:dev`. Additionally, after installing new packages or adding config plugins, new development builds are often required.
+
+## AI Agent Instructions
+
+When working on this project:
+
+1. **Always start by consulting the appropriate documentation**:
+   - For general Expo questions: https://docs.expo.dev/llms-full.txt
+   - For EAS/deployment questions: https://docs.expo.dev/llms-eas.txt
+   - For SDK/API questions: https://docs.expo.dev/llms-sdk.txt
+
+2. **Understand before implementing**: Read the relevant docs section before writing code
+
+3. **Follow existing patterns**: Look at existing components and screens for patterns to follow
@@ -1 +1,9 @@
-@AGENTS.md
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+**Note**: This project uses `AGENTS.md` files for detailed guidance.
+
+## Primary Reference
+
+Please see `AGENTS.md` in this same directory for the main project documentation and guidance.
@@ -1,22 +0,0 @@
-import chalk from 'chalk';
-
-import { PostHogProjectData } from '../graphql/types/PostHogConnection';
-import Log, { link } from '../log';
-
-export function getPostHogProjectDashboardUrl(project: PostHogProjectData): string {
-  const host = project.posthogHost.replace(/\/$/, '');
-  return `${host}/project/${encodeURIComponent(project.posthogProjectIdentifier)}`;
-}
-
-export function formatPostHogProject(project: PostHogProjectData): string {
-  return [
-    `${chalk.bold('Name')}: ${project.posthogProjectName}`,
-    `${chalk.bold('Host')}: ${project.posthogHost}`,
-    `${chalk.bold('Region')}: ${project.posthogOrganizationConnection.posthogRegion}`,
-    `${chalk.bold('Dashboard')}: ${link(getPostHogProjectDashboardUrl(project), { dim: false })}`,
-  ].join('\n');
-}
-
-export function logNoPostHogProject(projectName: string): void {
-  Log.warn(`No PostHog project is linked to Expo app ${chalk.bold(projectName)} on EAS.`);
-}
@@ -1,149 +0,0 @@
-import { Args, Flags } from '@oclif/core';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { EASNonInteractiveFlag, EasJsonOnlyFlag } from '../../commandUtils/flags';
-import { getLimitFlagWithCustomValues } from '../../commandUtils/pagination';
-import { AuditLogFragment } from '../../graphql/generated';
-import { AuditLogQuery } from '../../graphql/queries/AuditLogQuery';
-import Log from '../../log';
-import { ora } from '../../ora';
-import { confirmAsync, selectAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import renderTextTable from '../../utils/renderTextTable';
-
-const AUDIT_LOGS_LIMIT = 50;
-
-export default class AccountAudit extends EasCommand {
-  static override description = 'view the audit logs for an account';
-
-  static override args = {
-    ACCOUNT_NAME: Args.string({
-      description:
-        'Account name to view audit logs for. If not provided, the account will be selected interactively (or defaults to the only account if there is just one)',
-    }),
-  };
-
-  static override flags = {
-    limit: getLimitFlagWithCustomValues({ defaultTo: AUDIT_LOGS_LIMIT, limit: 100 }),
-    after: Flags.string({
-      description:
-        'Cursor for pagination. Use the endCursor from a previous query to fetch the next page.',
-    }),
-    ...EasJsonOnlyFlag,
-    ...EASNonInteractiveFlag,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      args: { ACCOUNT_NAME: accountName },
-      flags: { limit, after, json: jsonFlag, 'non-interactive': nonInteractive },
-    } = await this.parse(AccountAudit);
-
-    const json = jsonFlag || nonInteractive;
-    if (json) {
-      enableJsonOutput();
-    }
-
-    const {
-      loggedIn: { graphqlClient, actor },
-    } = await this.getContextAsync(AccountAudit, { nonInteractive });
-
-    const pageSize = limit ?? AUDIT_LOGS_LIMIT;
-
-    let targetAccount: { id: string; name: string };
-    const availableAccounts = actor.accounts.map(a => a.name).join(', ');
-    if (accountName) {
-      const found = actor.accounts.find(a => a.name === accountName);
-      if (!found) {
-        throw new Error(
-          `Account "${accountName}" not found or you don't have access. Available accounts: ${availableAccounts}`
-        );
-      }
-      targetAccount = found;
-    } else if (nonInteractive) {
-      throw new Error(
-        'ACCOUNT_NAME argument must be provided when running in `--non-interactive` mode.'
-      );
-    } else if (actor.accounts.length === 1) {
-      targetAccount = actor.accounts[0];
-    } else {
-      targetAccount = await selectAsync(
-        'Select account to view audit logs for:',
-        actor.accounts.map(account => ({
-          title: account.name,
-          value: account,
-        }))
-      );
-    }
-
-    if (json) {
-      const spinner = ora(`Fetching audit logs for account ${targetAccount.name}`).start();
-      try {
-        const connection = await AuditLogQuery.getAllForAccountAsync(
-          graphqlClient,
-          targetAccount.id,
-          {
-            first: pageSize,
-            after,
-          }
-        );
-        spinner.stop();
-        printJsonOnlyOutput({
-          auditLogs: connection.edges.map(edge => edge.node),
-          pageInfo: connection.pageInfo,
-        });
-      } catch (error) {
-        spinner.fail(`Failed to fetch audit logs for account ${targetAccount.name}`);
-        throw error;
-      }
-      return;
-    }
-
-    let cursor = after;
-    do {
-      const spinner = ora(`Fetching audit logs for account ${targetAccount.name}`).start();
-      const connection = await AuditLogQuery.getAllForAccountAsync(
-        graphqlClient,
-        targetAccount.id,
-        {
-          first: pageSize,
-          after: cursor,
-        }
-      );
-      spinner.stop();
-
-      const logs = connection.edges.map(edge => edge.node);
-      renderPageOfAuditLogs(logs);
-
-      if (!connection.pageInfo.hasNextPage) {
-        break;
-      }
-      cursor = connection.pageInfo.endCursor ?? undefined;
-    } while (cursor && (await confirmAsync({ message: 'Load more audit logs?' })));
-  }
-}
-
-function renderPageOfAuditLogs(logs: AuditLogFragment[]): void {
-  if (logs.length === 0) {
-    Log.log('No audit logs found.');
-    return;
-  }
-
-  Log.log(
-    renderTextTable(
-      ['Date', 'Actor', 'Action', 'Entity', 'Message'],
-      logs.map(log => [
-        new Date(log.createdAt).toLocaleString(),
-        log.actor?.displayName ?? 'Unknown',
-        log.targetEntityMutationType,
-        log.targetEntityTypePublicName,
-        log.websiteMessage,
-      ])
-    )
-  );
-  Log.addNewLineIfNone();
-}
@@ -40,7 +40,6 @@ interface RawBuildFlags {
  message?: string;
  'build-logger-level'?: LoggerLevel;
  'freeze-credentials': boolean;
-  'refresh-ad-hoc-provisioning-profile': boolean;
  'verbose-logs'?: boolean;
  'what-to-test'?: string;
 }
@@ -122,11 +121,6 @@ export default class Build extends EasCommand {
      default: false,
      description: 'Prevent the build from updating credentials in non-interactive mode',
    }),
-    'refresh-ad-hoc-provisioning-profile': Flags.boolean({
-      default: false,
-      description:
-        'Refresh managed ad-hoc provisioning profiles from App Store Connect before gathering build credentials',
-    }),
    'verbose-logs': Flags.boolean({
      default: false,
      description: 'Use verbose logs for the build process',
@@ -194,20 +188,6 @@ export default class Build extends EasCommand {
    flags: RawBuildFlags
  ): Omit<BuildFlags, 'requestedPlatform'> & { requestedPlatform?: RequestedPlatform } {
    const { json, nonInteractive } = resolveNonInteractiveAndJsonFlags(flags);
-    if (flags['refresh-ad-hoc-provisioning-profile']) {
-      if (!nonInteractive) {
-        Errors.error(
-          '--refresh-ad-hoc-provisioning-profile can only be used in non-interactive mode.',
-          { exit: 1 }
-        );
-      }
-      if (flags['freeze-credentials']) {
-        Errors.error(
-          'Cannot use --refresh-ad-hoc-provisioning-profile with --freeze-credentials.',
-          { exit: 1 }
-        );
-      }
-    }
    if (!flags.local && flags.output) {
      Errors.error('--output is allowed only for local builds', { exit: 1 });
    }
@@ -269,7 +249,6 @@ export default class Build extends EasCommand {
      message,
      buildLoggerLevel: flags['build-logger-level'],
      freezeCredentials: flags['freeze-credentials'],
-      refreshAdHocProvisioningProfile: flags['refresh-ad-hoc-provisioning-profile'],
      isVerboseLoggingEnabled: flags['verbose-logs'],
      whatToTest: flags['what-to-test'],
    };
@@ -40,11 +40,6 @@ export default class BuildInternal extends EasCommand {
      helpValue: 'PROFILE_NAME',
      exclusive: ['auto-submit'],
    }),
-    'refresh-ad-hoc-provisioning-profile': Flags.boolean({
-      default: false,
-      description:
-        'Refresh managed ad-hoc provisioning profiles from App Store Connect before gathering build credentials',
-    }),
  };

  static override contextDefinition = {
@@ -90,7 +85,6 @@ export default class BuildInternal extends EasCommand {
        profile: flags.profile,
        nonInteractive: true,
        freezeCredentials: false,
-        refreshAdHocProvisioningProfile: flags['refresh-ad-hoc-provisioning-profile'],
        wait: false,
        clearCache: false,
        json: true,
@@ -1,4 +1,4 @@
-import { ExpoConfig, getConfigFilePaths } from '@expo/config';
+import { ExpoConfig } from '@expo/config';
 import { App, User, UserRole } from '@expo/apple-utils';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
@@ -26,9 +26,8 @@ import { AppMutation } from '../graphql/mutations/AppMutation';
 import { WorkflowRunMutation } from '../graphql/mutations/WorkflowRunMutation';
 import { WorkflowRunQuery } from '../graphql/queries/WorkflowRunQuery';
 import Log, { learnMore } from '../log';
-import { confirmAsync, selectAsync } from '../prompts';
+import { confirmAsync } from '../prompts';
 import { ora } from '../ora';
-import { getPrivateExpoConfigAsync } from '../project/expoConfig';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { uploadAccountScopedFileAsync } from '../project/uploadAccountScopedFileAsync';
 import { uploadAccountScopedProjectSourceAsync } from '../project/uploadAccountScopedProjectSourceAsync';
@@ -46,20 +45,6 @@ function deriveBundleIdSlug(bundleId: string): string {
  return bundleId.split('.').filter(Boolean).pop()!;
 }

-export async function detectProjectSdkVersionAsync(
-  projectDir: string
-): Promise<string | undefined> {
-  const paths = getConfigFilePaths(projectDir);
-  if (!paths.staticConfigPath && !paths.dynamicConfigPath) {
-    return;
-  }
-  try {
-    return (await getPrivateExpoConfigAsync(projectDir)).sdkVersion;
-  } catch {
-    return;
-  }
-}
-
 const TESTFLIGHT_GROUP_NAME = 'Team (Expo)';

 async function setupTestFlightAsync(ascApp: App): Promise<void> {
@@ -204,16 +189,7 @@ export default class Go extends EasCommand {
    });
    Log.withTick(`Logged in as ${chalk.cyan(getActorDisplayName(actor))}`);

-    const detectedSdkVersion = await detectProjectSdkVersionAsync(process.cwd());
-    if (detectedSdkVersion && !flags['sdk-version']) {
-      Log.log(
-        `Current project using SDK ${detectedSdkVersion.split('.')[0]}. Auto-selected same version. To use a different version, pass --sdk-version.`
-      );
-    }
-    let sdkVersion = flags['sdk-version'] ?? detectedSdkVersion;
-    if (!sdkVersion) {
-      ({ sdkVersion } = await this.selectSdkVersionAsync(graphqlClient));
-    }
+    const sdkVersion = flags['sdk-version'];
    const bundleId = flags['bundle-id'] ?? this.generateBundleId(actor);
    if (!isBundleIdentifierValid(bundleId)) {
      throw new Error(
@@ -255,11 +231,7 @@ export default class Go extends EasCommand {
        }
      );

-      const {
-        workflowUrl,
-        workflowRunId,
-        sdkVersion: resolvedSdkVersion,
-      } = await this.dispatchWorkflowAsync(
+      const { workflowUrl, workflowRunId } = await this.dispatchWorkflowAsync(
        graphqlClient,
        projectId,
        actor,
@@ -270,7 +242,6 @@ export default class Go extends EasCommand {
        tmpDir,
        vcsClient
      );
-      Log.withTick(`Using Expo Go SDK ${chalk.cyan(resolvedSdkVersion.split('.')[0])}`);
      Log.withTick(`Build started: ${chalk.cyan(workflowUrl)}`);

      const status = await this.monitorWorkflowJobsAsync(graphqlClient, workflowRunId);
@@ -304,37 +275,6 @@ export default class Go extends EasCommand {
    }
  }

-  private async selectSdkVersionAsync(
-    graphqlClient: ExpoGraphqlClient
-  ): Promise<{ sdkVersion: string | undefined }> {
-    let versions;
-    try {
-      versions = await WorkflowRunQuery.expoGoSupportedSdkVersionsAsync(graphqlClient);
-    } catch {
-      return { sdkVersion: undefined };
-    }
-    const selectable = versions.filter(v => !v.isDeprecated);
-    if (selectable.length === 0) {
-      return { sdkVersion: undefined };
-    }
-    const defaultVersion = selectable.find(v => v.isLatest) ?? selectable.at(-1);
-    return {
-      sdkVersion: await selectAsync(
-        'Select an Expo SDK version',
-        selectable.map(v => {
-          const major = v.sdkVersion.split('.')[0];
-          const title = v.isLatest
-            ? `SDK ${major} (latest)`
-            : v.isBeta
-              ? `SDK ${major} (beta)`
-              : `SDK ${major}`;
-          return { title, value: v.sdkVersion };
-        }),
-        { initial: defaultVersion?.sdkVersion }
-      ),
-    };
-  }
-
  private generateBundleId(actor: Actor): string {
    const username = ensureActorHasPrimaryAccount(actor).name;
    const sanitizedUsername = username
@@ -461,7 +401,7 @@ export default class Go extends EasCommand {
    sdkVersion: string | undefined,
    tmpDir: string,
    vcsClient: Client
-  ): Promise<{ workflowUrl: string; workflowRunId: string; sdkVersion: string }> {
+  ): Promise<{ workflowUrl: string; workflowRunId: string }> {
    const account = ensureActorHasPrimaryAccount(actor);

    const repackConfig = await WorkflowRunQuery.expoGoRepackConfigurationAsync(graphqlClient, {
@@ -511,7 +451,7 @@ export default class Go extends EasCommand {

    const workflowUrl = getWorkflowRunUrl(account.name, deriveBundleIdSlug(bundleId), result.id);

-    return { workflowUrl, workflowRunId: result.id, sdkVersion: repackConfig.sdkVersion };
+    return { workflowUrl, workflowRunId: result.id };
  }

  private async monitorWorkflowJobsAsync(
@@ -1,765 +0,0 @@
-import spawnAsync from '@expo/spawn-async';
-import openBrowserAsync from 'better-opn';
-import * as fs from 'fs-extra';
-
-import { getMockOclifConfig } from '../../../../__tests__/commands/utils';
-import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { testProjectId } from '../../../../credentials/__tests__/fixtures-constants';
-import {
-  EnvironmentVariableScope,
-  EnvironmentVariableVisibility,
-  PostHogRegion,
-  Role,
-} from '../../../../graphql/generated';
-import { EnvironmentVariableMutation } from '../../../../graphql/mutations/EnvironmentVariableMutation';
-import { PostHogMutation } from '../../../../graphql/mutations/PostHogMutation';
-import { EnvironmentVariablesQuery } from '../../../../graphql/queries/EnvironmentVariablesQuery';
-import { PostHogQuery } from '../../../../graphql/queries/PostHogQuery';
-import {
-  PostHogOrganizationConnectionData,
-  PostHogProjectData,
-  StartPostHogConnectionResult,
-} from '../../../../graphql/types/PostHogConnection';
-import Log from '../../../../log';
-import { createOrModifyExpoConfigAsync } from '../../../../project/expoConfig';
-import { getOwnerAccountForProjectIdAsync } from '../../../../project/projectUtils';
-import { confirmAsync, promptAsync, selectAsync } from '../../../../prompts';
-import { Actor } from '../../../../user/User';
-import { printJsonOnlyOutput } from '../../../../utils/json';
-import IntegrationsPostHogConnect from '../connect';
-
-jest.mock('@expo/spawn-async');
-jest.mock('better-opn');
-jest.mock('fs-extra');
-jest.mock('../../../../project/expoConfig');
-jest.mock('../../../../graphql/queries/PostHogQuery');
-jest.mock('../../../../graphql/queries/EnvironmentVariablesQuery');
-jest.mock('../../../../graphql/mutations/PostHogMutation');
-jest.mock('../../../../graphql/mutations/EnvironmentVariableMutation');
-jest.mock('../../../../project/projectUtils');
-jest.mock('../../../../prompts');
-jest.mock('../../../../log');
-jest.mock('../../../../utils/json');
-jest.mock('../../../../ora', () => ({
-  ora: () => ({
-    start: jest.fn().mockReturnThis(),
-    succeed: jest.fn().mockReturnThis(),
-    fail: jest.fn().mockReturnThis(),
-    stop: jest.fn().mockReturnThis(),
-  }),
-}));
-
-describe(IntegrationsPostHogConnect, () => {
-  const graphqlClient = {} as ExpoGraphqlClient;
-  const mockConfig = getMockOclifConfig();
-  const testAccountId = 'test-account-id';
-  const testAccountName = 'testuser';
-
-  const mockActor: Actor = {
-    __typename: 'User',
-    id: 'test-user-id',
-    username: testAccountName,
-    email: '[email protected]',
-    featureGates: {},
-    isExpoAdmin: false,
-    primaryAccount: { id: testAccountId, name: testAccountName, ownerUserActor: null, users: [] },
-    preferences: { onboarding: null },
-    accounts: [],
-  };
-
-  const mockAccount = {
-    id: testAccountId,
-    name: testAccountName,
-    ownerUserActor: { id: 'test-user-id', username: testAccountName },
-    users: [{ role: Role.Owner, actor: { id: 'test-user-id' } }],
-  };
-
-  const mockConnection: PostHogOrganizationConnectionData = {
-    id: 'connection-1',
-    posthogOrganizationIdentifier: 'org-123',
-    posthogOrganizationName: 'Test Org',
-    posthogRegion: PostHogRegion.Us,
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-  };
-
-  const mockConnectionResult: StartPostHogConnectionResult = {
-    __typename: 'PostHogOrganizationConnection',
-    ...mockConnection,
-  };
-
-  const mockPendingResult: StartPostHogConnectionResult = {
-    __typename: 'PostHogPendingConnection',
-    url: 'https://us.posthog.com/login?next=/oauth/authorize',
-  };
-
-  const mockProject: PostHogProjectData = {
-    id: 'project-1',
-    posthogProjectIdentifier: '467657',
-    posthogProjectName: 'testapp',
-    posthogProjectToken: 'phc_public_key',
-    posthogHost: 'https://us.posthog.com',
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    posthogOrganizationConnection: mockConnection,
-  };
-
-  function createCommand(argv: string[], actor: Actor = mockActor): IntegrationsPostHogConnect {
-    const command = new IntegrationsPostHogConnect(argv, mockConfig);
-    jest.spyOn(command as any, 'getContextAsync').mockReturnValue({
-      privateProjectConfig: {
-        projectId: testProjectId,
-        exp: { name: 'testapp', slug: 'testapp', plugins: [] },
-        projectDir: '/test/project',
-      },
-      loggedIn: { graphqlClient, actor },
-    } as never);
-    return command;
-  }
-
-  // Helper: which features the interactive multiselect returns.
-  function mockFeatureSelection(features: string[]): void {
-    jest.mocked(promptAsync).mockImplementation((async (opts: any) => {
-      if (opts.name === 'features') {
-        return { features };
-      }
-      if (opts.name === 'apiKey') {
-        return { apiKey: 'phx_personal_key' };
-      }
-      return {};
-    }) as any);
-  }
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.spyOn(Log, 'log').mockImplementation(() => {});
-    jest.spyOn(Log, 'warn').mockImplementation(() => {});
-    jest.spyOn(Log, 'error').mockImplementation(() => {});
-    jest.spyOn(Log, 'withTick').mockImplementation(() => {});
-    jest.spyOn(Log, 'addNewLineIfNone').mockImplementation(() => {});
-    jest.spyOn(Log, 'newLine').mockImplementation(() => {});
-
-    jest.mocked(getOwnerAccountForProjectIdAsync).mockResolvedValue(mockAccount as any);
-    jest.mocked(selectAsync).mockResolvedValue(PostHogRegion.Us);
-    jest.mocked(confirmAsync).mockResolvedValue(true);
-    jest.mocked(spawnAsync).mockResolvedValue({} as any);
-    jest.mocked(fs.pathExists).mockResolvedValue(false as never);
-    jest.mocked(fs.writeFile).mockResolvedValue(undefined as never);
-    jest.mocked(createOrModifyExpoConfigAsync).mockResolvedValue({ type: 'success' } as any);
-    // Default: reuse an existing connection + project.
-    jest
-      .mocked(PostHogQuery.getPostHogOrganizationConnectionByAccountIdAsync)
-      .mockResolvedValue(mockConnection);
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(mockProject);
-    jest
-      .mocked(PostHogMutation.startPostHogConnectionAsync)
-      .mockResolvedValue(mockConnectionResult);
-    jest.mocked(PostHogMutation.setupPostHogProjectAsync).mockResolvedValue(mockProject);
-    jest.mocked(openBrowserAsync).mockResolvedValue(true as never);
-    jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValue([]);
-    jest.mocked(EnvironmentVariableMutation.createForAppAsync).mockResolvedValue({
-      id: 'env-var-1',
-      scope: EnvironmentVariableScope.Project,
-    } as any);
-    mockFeatureSelection(['analytics', 'session-replay', 'error-tracking']);
-  });
-
-  it('sets up all features: installs SDK + replay pkg, adds plugin, writes EXPO_PUBLIC_ + POSTHOG_CLI_ vars', async () => {
-    await createCommand([]).runAsync();
-
-    const installArgs = jest.mocked(spawnAsync).mock.calls[0][1];
-    expect(installArgs).toContain('posthog-react-native');
-    expect(installArgs).toContain('posthog-react-native-session-replay');
-    expect(createOrModifyExpoConfigAsync).toHaveBeenCalled();
-    expect(fs.writeFile).toHaveBeenCalled();
-
-    const createdNames = jest
-      .mocked(EnvironmentVariableMutation.createForAppAsync)
-      .mock.calls.map(call => call[1].name);
-    expect(createdNames).toEqual(
-      expect.arrayContaining([
-        'EXPO_PUBLIC_POSTHOG_API_KEY',
-        'EXPO_PUBLIC_POSTHOG_HOST',
-        'POSTHOG_CLI_API_KEY',
-        'POSTHOG_CLI_PROJECT_ID',
-        'POSTHOG_CLI_HOST',
-      ])
-    );
-    const cliKeyVar = jest
-      .mocked(EnvironmentVariableMutation.createForAppAsync)
-      .mock.calls.find(call => call[1].name === 'POSTHOG_CLI_API_KEY');
-    expect(cliKeyVar?.[1].visibility).toBe(EnvironmentVariableVisibility.Sensitive);
-    // The pasted personal key flows through verbatim — to EAS and to .env.local.
-    expect(cliKeyVar?.[1].value).toBe('phx_personal_key');
-    const written = jest.mocked(fs.writeFile).mock.calls[0][1] as string;
-    expect(written).toContain('POSTHOG_CLI_API_KEY=phx_personal_key');
-  });
-
-  it('asks for features only after provisioning (fast-forward ordering)', async () => {
-    jest
-      .mocked(PostHogQuery.getPostHogOrganizationConnectionByAccountIdAsync)
-      .mockResolvedValue(null);
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-    let provisionedBeforePrompt = false;
-    jest.mocked(promptAsync).mockImplementation((async (opts: any) => {
-      if (opts.name === 'features') {
-        provisionedBeforePrompt =
-          jest.mocked(PostHogMutation.startPostHogConnectionAsync).mock.calls.length > 0 &&
-          jest.mocked(PostHogMutation.setupPostHogProjectAsync).mock.calls.length > 0;
-        return { features: ['analytics'] };
-      }
-      return {};
-    }) as any);
-
-    await createCommand(['--region', 'US']).runAsync();
-
-    expect(provisionedBeforePrompt).toBe(true);
-  });
-
-  it('analytics only: no replay pkg, no CLI vars, no key prompt', async () => {
-    mockFeatureSelection(['analytics']);
-
-    await createCommand([]).runAsync();
-
-    expect(jest.mocked(spawnAsync).mock.calls[0][1]).not.toContain(
-      'posthog-react-native-session-replay'
-    );
-    const createdNames = jest
-      .mocked(EnvironmentVariableMutation.createForAppAsync)
-      .mock.calls.map(call => call[1].name);
-    expect(createdNames).toEqual(['EXPO_PUBLIC_POSTHOG_API_KEY', 'EXPO_PUBLIC_POSTHOG_HOST']);
-    expect(promptAsync).not.toHaveBeenCalledWith(expect.objectContaining({ name: 'apiKey' }));
-  });
-
-  it('adds the config plugin and public env vars for session-replay-only (analytics deselected)', async () => {
-    mockFeatureSelection(['session-replay']);
-
-    await createCommand([]).runAsync();
-
-    // The plugin wires native modules replay needs, so it must be added even without analytics.
-    expect(createOrModifyExpoConfigAsync).toHaveBeenCalled();
-    expect(jest.mocked(spawnAsync).mock.calls[0][1]).toContain(
-      'posthog-react-native-session-replay'
-    );
-    // The public key + host initialize the SDK for any feature, so they're still written.
-    const createdNames = jest
-      .mocked(EnvironmentVariableMutation.createForAppAsync)
-      .mock.calls.map(call => call[1].name);
-    expect(createdNames).toEqual(['EXPO_PUBLIC_POSTHOG_API_KEY', 'EXPO_PUBLIC_POSTHOG_HOST']);
-  });
-
-  it('captures the install child output so --json stdout stays clean', async () => {
-    await createCommand(['--json', '--posthog-cli-api-key', 'phx_x']).runAsync();
-
-    expect(jest.mocked(spawnAsync).mock.calls[0][2]).not.toHaveProperty('stdio');
-  });
-
-  it('non-interactive defaults: analytics + replay, error tracking auto-skipped', async () => {
-    await createCommand(['--non-interactive']).runAsync();
-
-    expect(promptAsync).not.toHaveBeenCalled();
-    const createdNames = jest
-      .mocked(EnvironmentVariableMutation.createForAppAsync)
-      .mock.calls.map(call => call[1].name);
-    expect(createdNames).not.toContain('POSTHOG_CLI_API_KEY');
-    expect(Log.warn).toHaveBeenCalledWith(expect.stringContaining('Skipping error tracking'));
-    // Session replay defaults on, so its package is still installed.
-    expect(jest.mocked(spawnAsync).mock.calls[0][1]).toContain(
-      'posthog-react-native-session-replay'
-    );
-  });
-
-  it('non-interactive --error-tracking without a key fails before any provisioning', async () => {
-    jest
-      .mocked(PostHogQuery.getPostHogOrganizationConnectionByAccountIdAsync)
-      .mockResolvedValue(null);
-
-    await expect(
-      createCommand(['--non-interactive', '--error-tracking']).runAsync()
-    ).rejects.toThrow(/personal API key in non-interactive/);
-
-    expect(PostHogMutation.startPostHogConnectionAsync).not.toHaveBeenCalled();
-  });
-
-  it('non-interactive --error-tracking with --posthog-cli-api-key sets up CLI vars without prompting', async () => {
-    await createCommand([
-      '--non-interactive',
-      '--error-tracking',
-      '--posthog-cli-api-key',
-      'phx_from_flag',
-    ]).runAsync();
-
-    expect(promptAsync).not.toHaveBeenCalled();
-    const cliKeyVar = jest
-      .mocked(EnvironmentVariableMutation.createForAppAsync)
-      .mock.calls.find(call => call[1].name === 'POSTHOG_CLI_API_KEY');
-    expect(cliKeyVar?.[1].value).toBe('phx_from_flag');
-  });
-
-  it('treats a whitespace-only --posthog-cli-api-key as absent (fails like no key)', async () => {
-    await expect(
-      createCommand([
-        '--non-interactive',
-        '--error-tracking',
-        '--posthog-cli-api-key',
-        '   ',
-      ]).runAsync()
-    ).rejects.toThrow(/personal API key in non-interactive/);
-  });
-
-  it('surfaces a manual plugin step and still writes env vars when the app config is dynamic', async () => {
-    mockFeatureSelection(['analytics']);
-    jest.mocked(createOrModifyExpoConfigAsync).mockResolvedValue({
-      type: 'warn',
-      message: 'Cannot automatically write to dynamic config',
-    } as any);
-
-    await createCommand([]).runAsync();
-
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('Add "posthog-react-native/expo" to the "plugins"')
-    );
-    expect(EnvironmentVariableMutation.createForAppAsync).toHaveBeenCalled();
-    expect(fs.writeFile).toHaveBeenCalled();
-  });
-
-  it('surfaces the plugin manual step (without a cause) when the config write fails', async () => {
-    mockFeatureSelection(['analytics']);
-    jest.mocked(createOrModifyExpoConfigAsync).mockResolvedValue({ type: 'fail' } as any);
-
-    await createCommand([]).runAsync();
-
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('Add "posthog-react-native/expo" to the "plugins"')
-    );
-    expect(EnvironmentVariableMutation.createForAppAsync).toHaveBeenCalled();
-  });
-
-  it('reuses an existing connection + project without provisioning', async () => {
-    await createCommand([]).runAsync();
-
-    expect(PostHogMutation.startPostHogConnectionAsync).not.toHaveBeenCalled();
-    expect(PostHogMutation.setupPostHogProjectAsync).not.toHaveBeenCalled();
-  });
-
-  it('completes an existing-account connection via the browser, then provisions the project', async () => {
-    // No connection at the first check; the start mutation hands off to the browser, and
-    // polling then finds the connection the website callback created.
-    jest
-      .mocked(PostHogQuery.getPostHogOrganizationConnectionByAccountIdAsync)
-      .mockResolvedValueOnce(null)
-      .mockResolvedValue(mockConnection);
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-    jest.mocked(PostHogMutation.startPostHogConnectionAsync).mockResolvedValue(mockPendingResult);
-    mockFeatureSelection(['analytics']);
-
-    await createCommand(['--region', 'US']).runAsync();
-
-    expect(openBrowserAsync).toHaveBeenCalledWith(mockPendingResult.url);
-    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('Opened'));
-    expect(PostHogMutation.setupPostHogProjectAsync).toHaveBeenCalledWith(graphqlClient, {
-      appId: testProjectId,
-      posthogOrganizationConnectionId: mockConnection.id,
-    });
-    expect(EnvironmentVariableMutation.createForAppAsync).toHaveBeenCalled();
-  });
-
-  it('still prints the approval URL when a browser cannot be opened', async () => {
-    jest
-      .mocked(PostHogQuery.getPostHogOrganizationConnectionByAccountIdAsync)
-      .mockResolvedValueOnce(null)
-      .mockResolvedValue(mockConnection);
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-    jest.mocked(PostHogMutation.startPostHogConnectionAsync).mockResolvedValue(mockPendingResult);
-    jest.mocked(openBrowserAsync).mockResolvedValue(false as never);
-    mockFeatureSelection(['analytics']);
-
-    await createCommand(['--region', 'US']).runAsync();
-
-    expect(Log.log).toHaveBeenCalledWith(
-      expect.stringContaining('Open this URL to approve the connection')
-    );
-    expect(PostHogMutation.setupPostHogProjectAsync).toHaveBeenCalled();
-  });
-
-  it('retries polling after a transient failure, then completes', async () => {
-    jest.useFakeTimers();
-    const debugSpy = jest.spyOn(Log, 'debug').mockImplementation(() => {});
-    try {
-      // No connection initially; the first poll throws (transient), the next finds it.
-      jest
-        .mocked(PostHogQuery.getPostHogOrganizationConnectionByAccountIdAsync)
-        .mockResolvedValueOnce(null)
-        .mockRejectedValueOnce(new Error('network blip'))
-        .mockResolvedValue(mockConnection);
-      jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-      jest.mocked(PostHogMutation.startPostHogConnectionAsync).mockResolvedValue(mockPendingResult);
-      mockFeatureSelection(['analytics']);
-
-      const promise = createCommand(['--region', 'US']).runAsync();
-      // Flush the poll interval so the retry runs after the transient failure.
-      await jest.advanceTimersByTimeAsync(3_000);
-      await promise;
-
-      expect(debugSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Polling for the PostHog connection failed')
-      );
-      expect(PostHogMutation.setupPostHogProjectAsync).toHaveBeenCalled();
-    } finally {
-      debugSpy.mockRestore();
-      jest.useRealTimers();
-    }
-  });
-
-  it('refuses the browser handoff non-interactively and provisions nothing', async () => {
-    jest
-      .mocked(PostHogQuery.getPostHogOrganizationConnectionByAccountIdAsync)
-      .mockResolvedValue(null);
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-    jest.mocked(PostHogMutation.startPostHogConnectionAsync).mockResolvedValue(mockPendingResult);
-
-    await expect(createCommand(['--non-interactive', '--region', 'US']).runAsync()).rejects.toThrow(
-      /already has a PostHog account.*interactively/s
-    );
-
-    expect(openBrowserAsync).not.toHaveBeenCalled();
-    expect(PostHogMutation.setupPostHogProjectAsync).not.toHaveBeenCalled();
-    expect(EnvironmentVariableMutation.createForAppAsync).not.toHaveBeenCalled();
-    expect(fs.writeFile).not.toHaveBeenCalled();
-  });
-
-  it('times out (and provisions nothing) if the connection is never approved', async () => {
-    jest.useFakeTimers();
-    try {
-      // Connection never appears: null at the first check and on every poll.
-      jest
-        .mocked(PostHogQuery.getPostHogOrganizationConnectionByAccountIdAsync)
-        .mockResolvedValue(null);
-      jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-      jest.mocked(PostHogMutation.startPostHogConnectionAsync).mockResolvedValue(mockPendingResult);
-      mockFeatureSelection(['analytics']);
-
-      const promise = createCommand(['--region', 'US']).runAsync();
-      const assertion = expect(promise).rejects.toThrow(/Timed out waiting for the PostHog/);
-      // Advance past the 15-minute poll window, flushing each poll iteration's awaits.
-      await jest.advanceTimersByTimeAsync(16 * 60 * 1_000);
-      await assertion;
-
-      expect(PostHogMutation.setupPostHogProjectAsync).not.toHaveBeenCalled();
-      expect(EnvironmentVariableMutation.createForAppAsync).not.toHaveBeenCalled();
-      expect(fs.writeFile).not.toHaveBeenCalled();
-    } finally {
-      jest.useRealTimers();
-    }
-  });
-
-  it('emits JSON output with --json', async () => {
-    await createCommand(['--json', '--posthog-cli-api-key', 'phx_x']).runAsync();
-
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith(
-      expect.objectContaining({
-        project: expect.objectContaining({ apiKey: 'phc_public_key' }),
-        // --json supplies the key, so error tracking is on and its vars are reported.
-        features: expect.objectContaining({ analytics: true, errorTracking: true }),
-        dashboardUrl: expect.any(String),
-        environmentVariables: expect.arrayContaining([
-          'EXPO_PUBLIC_POSTHOG_API_KEY',
-          'POSTHOG_CLI_API_KEY',
-          'POSTHOG_CLI_PROJECT_ID',
-          'POSTHOG_CLI_HOST',
-        ]),
-      })
-    );
-  });
-
-  it('requires --region in non-interactive mode when provisioning', async () => {
-    jest
-      .mocked(PostHogQuery.getPostHogOrganizationConnectionByAccountIdAsync)
-      .mockResolvedValue(null);
-
-    await expect(createCommand(['--non-interactive']).runAsync()).rejects.toThrow(
-      /region is required in non-interactive/
-    );
-  });
-
-  it('warns when --region differs from the already-connected region', async () => {
-    await createCommand(['--region', 'EU']).runAsync();
-
-    expect(Log.warn).toHaveBeenCalledWith(expect.stringContaining('already connected to PostHog'));
-  });
-
-  it('provisions a new connection and project when none exist', async () => {
-    jest
-      .mocked(PostHogQuery.getPostHogOrganizationConnectionByAccountIdAsync)
-      .mockResolvedValue(null);
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-    mockFeatureSelection(['analytics']);
-
-    await createCommand(['--region', 'US']).runAsync();
-
-    expect(PostHogMutation.startPostHogConnectionAsync).toHaveBeenCalledWith(graphqlClient, {
-      accountId: testAccountId,
-      region: PostHogRegion.Us,
-    });
-    expect(PostHogMutation.setupPostHogProjectAsync).toHaveBeenCalledWith(graphqlClient, {
-      appId: testProjectId,
-      posthogOrganizationConnectionId: mockConnection.id,
-    });
-  });
-
-  it('rethrows a non-dead-end provisioning failure', async () => {
-    jest
-      .mocked(PostHogQuery.getPostHogOrganizationConnectionByAccountIdAsync)
-      .mockResolvedValue(null);
-    jest
-      .mocked(PostHogMutation.startPostHogConnectionAsync)
-      .mockRejectedValue(new Error('network down'));
-
-    await expect(createCommand(['--region', 'US']).runAsync()).rejects.toThrow('network down');
-  });
-
-  it('rethrows when project setup fails', async () => {
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-    jest
-      .mocked(PostHogMutation.setupPostHogProjectAsync)
-      .mockRejectedValue(new Error('setup failed'));
-
-    await expect(createCommand([]).runAsync()).rejects.toThrow('setup failed');
-  });
-
-  it('honors explicit --no-session-replay without showing the feature multiselect', async () => {
-    await createCommand(['--no-session-replay']).runAsync();
-
-    expect(promptAsync).not.toHaveBeenCalledWith(expect.objectContaining({ name: 'features' }));
-    expect(jest.mocked(spawnAsync).mock.calls[0][1]).not.toContain(
-      'posthog-react-native-session-replay'
-    );
-  });
-
-  it('prompts for a personal API key and validates it', async () => {
-    await createCommand([]).runAsync();
-
-    const apiKeyPrompt = jest
-      .mocked(promptAsync)
-      .mock.calls.map(call => call[0])
-      .find((opts: any) => opts.name === 'apiKey') as any;
-    expect(apiKeyPrompt).toBeDefined();
-    expect(apiKeyPrompt.validate('')).toBe('Personal API key cannot be empty');
-    expect(apiKeyPrompt.validate('phx_real')).toBe(true);
-  });
-
-  it('continues (does not abort) and still writes env vars when SDK installation fails', async () => {
-    mockFeatureSelection(['analytics']);
-    jest.mocked(spawnAsync).mockRejectedValue(new Error('npm exploded'));
-
-    await createCommand([]).runAsync();
-
-    // Install failure is non-fatal: provisioning + env vars still happen, with a manual follow-up.
-    expect(EnvironmentVariableMutation.createForAppAsync).toHaveBeenCalled();
-    expect(fs.writeFile).toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(expect.stringContaining('npx expo install'));
-  });
-
-  it('on a dynamic config, surfaces only the plugin step (not a reinstall step) when expo install reports the dynamic-config error', async () => {
-    mockFeatureSelection(['analytics']);
-    jest.mocked(spawnAsync).mockRejectedValue(
-      Object.assign(new Error('Process exited with non-zero code: 1'), {
-        stdout: 'Cannot automatically write to dynamic config at: app.config.js\n',
-        stderr: '',
-      })
-    );
-    jest.mocked(createOrModifyExpoConfigAsync).mockResolvedValue({
-      type: 'warn',
-      message: 'Cannot automatically write to dynamic config at: app.config.js',
-    } as any);
-
-    await createCommand([]).runAsync();
-
-    expect(EnvironmentVariableMutation.createForAppAsync).toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('Add "posthog-react-native/expo" to the "plugins"')
-    );
-    expect(Log.warn).not.toHaveBeenCalledWith(expect.stringContaining("didn't install"));
-  });
-
-  it('skips the config plugin when it is already configured', async () => {
-    mockFeatureSelection(['analytics']);
-    const command = createCommand([]);
-    jest.spyOn(command as any, 'getContextAsync').mockReturnValue({
-      privateProjectConfig: {
-        projectId: testProjectId,
-        exp: { name: 'testapp', slug: 'testapp', plugins: ['posthog-react-native/expo'] },
-        projectDir: '/test/project',
-      },
-      loggedIn: { graphqlClient, actor: mockActor },
-    } as never);
-
-    await command.runAsync();
-
-    expect(createOrModifyExpoConfigAsync).not.toHaveBeenCalled();
-  });
-
-  it('does nothing local when no features are selected (no install, no writes)', async () => {
-    mockFeatureSelection([]);
-
-    await createCommand([]).runAsync();
-
-    expect(spawnAsync).not.toHaveBeenCalled();
-    expect(createOrModifyExpoConfigAsync).not.toHaveBeenCalled();
-    expect(fs.writeFile).not.toHaveBeenCalled();
-    expect(EnvironmentVariableMutation.createForAppAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(expect.stringContaining('No PostHog features selected'));
-    // Doesn't falsely claim the SDK is wired up when nothing was configured.
-    expect(Log.log).not.toHaveBeenCalledWith(expect.stringContaining('PostHog is connected!'));
-    expect(Log.warn).toHaveBeenCalledWith(expect.stringContaining('Re-run to add'));
-  });
-
-  it('merges into an existing .env.local, replacing matching keys and appending new ones', async () => {
-    mockFeatureSelection(['analytics']);
-    jest.mocked(fs.pathExists).mockResolvedValue(true as never);
-    jest
-      .mocked(fs.readFile)
-      .mockResolvedValue('EXPO_PUBLIC_POSTHOG_API_KEY=old_value\nOTHER=keep' as never);
-
-    await createCommand([]).runAsync();
-
-    const written = jest.mocked(fs.writeFile).mock.calls[0][1] as string;
-    expect(written).toContain('EXPO_PUBLIC_POSTHOG_API_KEY=phc_public_key');
-    expect(written).toContain('OTHER=keep');
-    expect(written).toContain('EXPO_PUBLIC_POSTHOG_HOST=https://us.posthog.com');
-  });
-
-  it('prompts for a region interactively when provisioning without --region', async () => {
-    jest
-      .mocked(PostHogQuery.getPostHogOrganizationConnectionByAccountIdAsync)
-      .mockResolvedValue(null);
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-    mockFeatureSelection(['analytics']);
-
-    await createCommand([]).runAsync();
-
-    expect(selectAsync).toHaveBeenCalledWith('Select a PostHog region', expect.any(Array));
-    expect(PostHogMutation.startPostHogConnectionAsync).toHaveBeenCalledWith(graphqlClient, {
-      accountId: testAccountId,
-      region: PostHogRegion.Us,
-    });
-  });
-
-  it('skips .env.local when the user declines to overwrite a conflict', async () => {
-    mockFeatureSelection(['analytics']);
-    jest.mocked(fs.pathExists).mockResolvedValue(true as never);
-    jest.mocked(fs.readFile).mockResolvedValue('EXPO_PUBLIC_POSTHOG_API_KEY=old_value\n' as never);
-    jest.mocked(confirmAsync).mockResolvedValue(false);
-
-    await createCommand([]).runAsync();
-
-    expect(fs.writeFile).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(expect.stringContaining('Skipped updating'));
-  });
-
-  it('--overwrite writes .env.local without prompting on a conflict', async () => {
-    mockFeatureSelection(['analytics']);
-    jest.mocked(fs.pathExists).mockResolvedValue(true as never);
-    jest.mocked(fs.readFile).mockResolvedValue('EXPO_PUBLIC_POSTHOG_API_KEY=old_value\n' as never);
-
-    await createCommand(['--overwrite']).runAsync();
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-    const written = jest.mocked(fs.writeFile).mock.calls[0][1] as string;
-    expect(written).toContain('EXPO_PUBLIC_POSTHOG_API_KEY=phc_public_key');
-  });
-
-  it('non-interactively skips an existing .env.local key without --overwrite', async () => {
-    jest.mocked(fs.pathExists).mockResolvedValue(true as never);
-    jest.mocked(fs.readFile).mockResolvedValue('EXPO_PUBLIC_POSTHOG_API_KEY=old_value\n' as never);
-
-    await createCommand(['--non-interactive']).runAsync();
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-    expect(fs.writeFile).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(expect.stringContaining('pass --overwrite to replace'));
-  });
-
-  it('non-interactively overwrites an existing .env.local key with --overwrite', async () => {
-    jest.mocked(fs.pathExists).mockResolvedValue(true as never);
-    jest.mocked(fs.readFile).mockResolvedValue('EXPO_PUBLIC_POSTHOG_API_KEY=old_value\n' as never);
-
-    await createCommand(['--non-interactive', '--overwrite']).runAsync();
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-    const written = jest.mocked(fs.writeFile).mock.calls[0][1] as string;
-    expect(written).toContain('EXPO_PUBLIC_POSTHOG_API_KEY=phc_public_key');
-  });
-
-  it('writes a personal API key containing $ verbatim (no replacement-pattern expansion)', async () => {
-    const command = createCommand([]);
-    const merged = (command as any).mergeEnvContent('POSTHOG_CLI_API_KEY=old\n', {
-      POSTHOG_CLI_API_KEY: 'phx_a$2b$&c',
-    });
-    expect(merged).toContain('POSTHOG_CLI_API_KEY=phx_a$2b$&c');
-  });
-
-  it('updates an existing EAS environment variable with --overwrite', async () => {
-    mockFeatureSelection(['analytics']);
-    jest
-      .mocked(EnvironmentVariablesQuery.byAppIdAsync)
-      .mockResolvedValue([{ id: 'existing-1', scope: EnvironmentVariableScope.Project }] as any);
-    jest
-      .mocked(EnvironmentVariableMutation.updateAsync)
-      .mockResolvedValue({ id: 'existing-1' } as any);
-
-    await createCommand(['--overwrite']).runAsync();
-
-    expect(EnvironmentVariableMutation.updateAsync).toHaveBeenCalled();
-    expect(EnvironmentVariableMutation.createForAppAsync).not.toHaveBeenCalled();
-  });
-
-  it('honors explicit --error-tracking interactively and detects an array-form plugin', async () => {
-    const command = createCommand(['--error-tracking', '--posthog-cli-api-key', 'phx_flag']);
-    jest.spyOn(command as any, 'getContextAsync').mockReturnValue({
-      privateProjectConfig: {
-        projectId: testProjectId,
-        exp: { name: 'testapp', slug: 'testapp', plugins: [['expo-router', {}]] },
-        projectDir: '/test/project',
-      },
-      loggedIn: { graphqlClient, actor: mockActor },
-    } as never);
-
-    await command.runAsync();
-
-    expect(promptAsync).not.toHaveBeenCalledWith(expect.objectContaining({ name: 'features' }));
-    const cliKeyVar = jest
-      .mocked(EnvironmentVariableMutation.createForAppAsync)
-      .mock.calls.find(call => call[1].name === 'POSTHOG_CLI_API_KEY');
-    expect(cliKeyVar?.[1].value).toBe('phx_flag');
-    expect(createOrModifyExpoConfigAsync).toHaveBeenCalled();
-  });
-
-  it('skips an existing EAS environment variable non-interactively without --overwrite', async () => {
-    jest
-      .mocked(EnvironmentVariablesQuery.byAppIdAsync)
-      .mockResolvedValue([{ id: 'existing-1', scope: EnvironmentVariableScope.Project }] as any);
-
-    await createCommand(['--non-interactive', '--region', 'US']).runAsync();
-
-    expect(EnvironmentVariableMutation.updateAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('pass --overwrite to replace it')
-    );
-  });
-
-  it('skips an existing EAS environment variable when overwrite is declined', async () => {
-    mockFeatureSelection(['analytics']);
-    jest
-      .mocked(EnvironmentVariablesQuery.byAppIdAsync)
-      .mockResolvedValue([{ id: 'existing-1', scope: EnvironmentVariableScope.Project }] as any);
-    jest.mocked(confirmAsync).mockResolvedValue(false);
-
-    await createCommand([]).runAsync();
-
-    expect(EnvironmentVariableMutation.updateAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('Skipped updating EAS environment variable')
-    );
-  });
-});
@@ -1,160 +0,0 @@
-import openBrowserAsync from 'better-opn';
-
-import { getMockOclifConfig } from '../../../../__tests__/commands/utils';
-import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { testProjectId } from '../../../../credentials/__tests__/fixtures-constants';
-import { PostHogRegion } from '../../../../graphql/generated';
-import { PostHogQuery } from '../../../../graphql/queries/PostHogQuery';
-import {
-  PostHogOrganizationConnectionData,
-  PostHogProjectData,
-} from '../../../../graphql/types/PostHogConnection';
-import Log from '../../../../log';
-import { ora } from '../../../../ora';
-import { printJsonOnlyOutput } from '../../../../utils/json';
-import IntegrationsPostHogDashboard from '../dashboard';
-
-jest.mock('better-opn');
-jest.mock('../../../../graphql/queries/PostHogQuery');
-jest.mock('../../../../log');
-jest.mock('../../../../utils/json');
-jest.mock('../../../../ora', () => ({
-  ora: jest.fn(() => ({
-    start: jest.fn().mockReturnThis(),
-    succeed: jest.fn().mockReturnThis(),
-    fail: jest.fn().mockReturnThis(),
-  })),
-}));
-
-describe(IntegrationsPostHogDashboard, () => {
-  const graphqlClient = {} as ExpoGraphqlClient;
-  const mockConfig = getMockOclifConfig();
-
-  const mockConnection: PostHogOrganizationConnectionData = {
-    id: 'connection-1',
-    posthogOrganizationIdentifier: 'org-123',
-    posthogOrganizationName: 'Test Org',
-    posthogRegion: PostHogRegion.Us,
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-  };
-
-  const mockProject: PostHogProjectData = {
-    id: 'project-1',
-    posthogProjectIdentifier: 'res-123',
-    posthogProjectName: 'Test Project',
-    posthogProjectToken: 'phc_public_key',
-    posthogHost: 'https://us.posthog.com',
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    posthogOrganizationConnection: mockConnection,
-  };
-
-  function createCommand(argv: string[] = []): IntegrationsPostHogDashboard {
-    const command = new IntegrationsPostHogDashboard(argv, mockConfig);
-    jest.spyOn(command as any, 'getContextAsync').mockReturnValue({
-      privateProjectConfig: {
-        projectId: testProjectId,
-        exp: { slug: 'testapp' },
-      },
-      loggedIn: { graphqlClient },
-    } as never);
-    return command;
-  }
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.spyOn(Log, 'warn').mockImplementation(() => {});
-    jest.spyOn(Log, 'log').mockImplementation(() => {});
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(mockProject);
-    jest.mocked(openBrowserAsync).mockResolvedValue({} as never);
-    jest.mocked(ora).mockReturnValue({
-      start: jest.fn().mockReturnThis(),
-      succeed: jest.fn().mockReturnThis(),
-      fail: jest.fn().mockReturnThis(),
-    } as any);
-  });
-
-  it('opens the linked PostHog project dashboard', async () => {
-    await createCommand().runAsync();
-
-    expect(openBrowserAsync).toHaveBeenCalledWith('https://us.posthog.com/project/res-123');
-  });
-
-  it('normalizes a trailing-slash host and percent-encodes the project identifier', async () => {
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue({
-      ...mockProject,
-      posthogHost: 'https://us.posthog.com/',
-      posthogProjectIdentifier: 'team a/b',
-    });
-
-    await createCommand().runAsync();
-
-    expect(openBrowserAsync).toHaveBeenCalledWith('https://us.posthog.com/project/team%20a%2Fb');
-  });
-
-  it('logs an empty state when no project link exists', async () => {
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-
-    await createCommand().runAsync();
-
-    expect(openBrowserAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('No PostHog project is linked to Expo app')
-    );
-  });
-
-  it('fails the spinner when the browser cannot be opened', async () => {
-    jest.mocked(openBrowserAsync).mockResolvedValue(false);
-    const spinner = {
-      start: jest.fn().mockReturnThis(),
-      succeed: jest.fn().mockReturnThis(),
-      fail: jest.fn().mockReturnThis(),
-    };
-    jest.mocked(ora).mockReturnValue(spinner as any);
-
-    await createCommand().runAsync();
-
-    expect(spinner.fail).toHaveBeenCalledWith(
-      expect.stringContaining('Unable to open a web browser')
-    );
-  });
-
-  it('prints the dashboard URL in non-interactive mode without opening a browser', async () => {
-    await createCommand(['--non-interactive']).runAsync();
-
-    expect(openBrowserAsync).not.toHaveBeenCalled();
-    expect(Log.log).toHaveBeenCalledWith('https://us.posthog.com/project/res-123');
-  });
-
-  it('emits the dashboard URL as JSON with --json', async () => {
-    await createCommand(['--json']).runAsync();
-
-    expect(openBrowserAsync).not.toHaveBeenCalled();
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith({
-      dashboardUrl: 'https://us.posthog.com/project/res-123',
-    });
-  });
-
-  it('emits a null dashboardUrl as JSON when no project is linked', async () => {
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-
-    await createCommand(['--json']).runAsync();
-
-    expect(openBrowserAsync).not.toHaveBeenCalled();
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith({ dashboardUrl: null });
-  });
-
-  it('fails the spinner and rethrows when opening the browser throws', async () => {
-    jest.mocked(openBrowserAsync).mockRejectedValue(new Error('no browser'));
-    const spinner = {
-      start: jest.fn().mockReturnThis(),
-      succeed: jest.fn().mockReturnThis(),
-      fail: jest.fn().mockReturnThis(),
-    };
-    jest.mocked(ora).mockReturnValue(spinner as any);
-
-    await expect(createCommand().runAsync()).rejects.toThrow('no browser');
-    expect(spinner.fail).toHaveBeenCalled();
-  });
-});
@@ -1,158 +0,0 @@
-import { getMockOclifConfig } from '../../../../__tests__/commands/utils';
-import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { testProjectId } from '../../../../credentials/__tests__/fixtures-constants';
-import { PostHogRegion } from '../../../../graphql/generated';
-import { PostHogMutation } from '../../../../graphql/mutations/PostHogMutation';
-import { PostHogQuery } from '../../../../graphql/queries/PostHogQuery';
-import {
-  PostHogOrganizationConnectionData,
-  PostHogProjectData,
-} from '../../../../graphql/types/PostHogConnection';
-import Log from '../../../../log';
-import { confirmAsync } from '../../../../prompts';
-import { printJsonOnlyOutput } from '../../../../utils/json';
-import IntegrationsPostHogDisconnect from '../disconnect';
-
-jest.mock('../../../../graphql/queries/PostHogQuery');
-jest.mock('../../../../graphql/mutations/PostHogMutation');
-jest.mock('../../../../prompts');
-jest.mock('../../../../log');
-jest.mock('../../../../utils/json');
-jest.mock('../../../../ora', () => ({
-  ora: () => ({
-    start: jest.fn().mockReturnThis(),
-    succeed: jest.fn().mockReturnThis(),
-    fail: jest.fn().mockReturnThis(),
-  }),
-}));
-
-describe(IntegrationsPostHogDisconnect, () => {
-  const graphqlClient = {} as ExpoGraphqlClient;
-  const mockConfig = getMockOclifConfig();
-
-  const mockConnection: PostHogOrganizationConnectionData = {
-    id: 'connection-1',
-    posthogOrganizationIdentifier: 'org-123',
-    posthogOrganizationName: 'Test Org',
-    posthogRegion: PostHogRegion.Us,
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-  };
-
-  const mockProject: PostHogProjectData = {
-    id: 'project-1',
-    posthogProjectIdentifier: 'res-123',
-    posthogProjectName: 'Test Project',
-    posthogProjectToken: 'phc_public_key',
-    posthogHost: 'https://us.posthog.com',
-    createdAt: '2024-01-01T00:00:00.000Z',
-    updatedAt: '2024-01-01T00:00:00.000Z',
-    posthogOrganizationConnection: mockConnection,
-  };
-
-  function createCommand(argv: string[]): IntegrationsPostHogDisconnect {
-    const command = new IntegrationsPostHogDisconnect(argv, mockConfig);
-    jest.spyOn(command as any, 'getContextAsync').mockReturnValue({
-      privateProjectConfig: {
-        projectId: testProjectId,
-        exp: { slug: 'testapp' },
-      },
-      loggedIn: { graphqlClient },
-    } as never);
-    return command;
-  }
-
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.spyOn(Log, 'log').mockImplementation(() => {});
-    jest.spyOn(Log, 'warn').mockImplementation(() => {});
-    jest.spyOn(Log, 'error').mockImplementation(() => {});
-    jest.spyOn(Log, 'addNewLineIfNone').mockImplementation(() => {});
-    jest.spyOn(Log, 'newLine').mockImplementation(() => {});
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(mockProject);
-    jest.mocked(PostHogMutation.deletePostHogProjectAsync).mockResolvedValue(mockProject.id);
-    jest.mocked(confirmAsync).mockResolvedValue(true);
-  });
-
-  it('removes the project link after confirmation', async () => {
-    await createCommand([]).runAsync();
-
-    expect(PostHogMutation.deletePostHogProjectAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      mockProject.id
-    );
-  });
-
-  it('skips the prompt with --yes', async () => {
-    await createCommand(['--yes']).runAsync();
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-    expect(PostHogMutation.deletePostHogProjectAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      mockProject.id
-    );
-  });
-
-  it('does nothing when the user declines confirmation', async () => {
-    jest.mocked(confirmAsync).mockResolvedValue(false);
-
-    await createCommand([]).runAsync();
-
-    expect(PostHogMutation.deletePostHogProjectAsync).not.toHaveBeenCalled();
-  });
-
-  it('deletes after a warning in non-interactive mode, noting PostHog data is preserved', async () => {
-    await createCommand(['--non-interactive']).runAsync();
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('does not delete the project on PostHog')
-    );
-    expect(PostHogMutation.deletePostHogProjectAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      mockProject.id
-    );
-  });
-
-  it('logs an empty state when no project link exists', async () => {
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-
-    await createCommand([]).runAsync();
-
-    expect(PostHogMutation.deletePostHogProjectAsync).not.toHaveBeenCalled();
-    expect(Log.warn).toHaveBeenCalledWith(
-      expect.stringContaining('No PostHog project is linked to Expo app')
-    );
-  });
-
-  it('emits JSON output with --json and skips the prompt', async () => {
-    await createCommand(['--json']).runAsync();
-
-    expect(confirmAsync).not.toHaveBeenCalled();
-    expect(PostHogMutation.deletePostHogProjectAsync).toHaveBeenCalledWith(
-      graphqlClient,
-      mockProject.id
-    );
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith({
-      id: mockProject.id,
-      name: mockProject.posthogProjectName,
-    });
-  });
-
-  it('emits a null id as JSON when no project is linked', async () => {
-    jest.mocked(PostHogQuery.getPostHogProjectByAppIdAsync).mockResolvedValue(null);
-
-    await createCommand(['--json']).runAsync();
-
-    expect(PostHogMutation.deletePostHogProjectAsync).not.toHaveBeenCalled();
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith({ id: null });
-  });
-
-  it('rethrows when the delete mutation fails', async () => {
-    jest
-      .mocked(PostHogMutation.deletePostHogProjectAsync)
-      .mockRejectedValue(new Error('delete boom'));
-
-    await expect(createCommand(['--yes']).runAsync()).rejects.toThrow('delete boom');
-  });
-});