v7.1.1

Revert "[eas-json] validate EAS Submit inputs better" (#2200 )
* Revert "[eas-json] validate EAS Submit inputs better" * revert changelog revert * update CHANGELOG.md
2026-11-14 10:08:06 -10:00 · 2024-01-26 21:11:12 +01:00 · 2024-01-26 21:03:43 +01:00 · 2024-01-26 09:58:59 +00:00 · 2024-01-26 10:53:35 +01:00 · 2024-01-26 10:48:01 +01:00
280 changed files with 9696 additions and 6747 deletions
@@ -14,9 +14,9 @@ jobs:
          token: ${{ secrets.EXPO_BOT_PAT }}
      - uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: 20
      - name: Checkout Pull Request
-        run: hub pr checkout ${{ github.event.issue.number }}
+        run: gh pr checkout ${{ github.event.issue.number }}
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Install dependencies
@@ -8,6 +8,10 @@ on:
      - labeled
      - unlabeled

+concurrency:
+  group: changelog-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
  pr-changelog-entry:
    name: Check CHANGELOG.md updated
@@ -16,7 +20,7 @@ jobs:
      - uses: actions/checkout@v2
      - name: Check if CHANGELOG.md was updated
        id: changelog-updated
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v41
        with:
          files: CHANGELOG.md
      - name: Fail if CHANGELOG.md was not updated and the "no changelog" label is absent
@@ -27,9 +27,9 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: 20
      - run: yarn install --frozen-lockfile --check-files
-      - run: yarn build-ci
+      - run: yarn build
      - name: Build tarballs
        working-directory: ${{ github.workspace }}/packages/eas-cli
        run: |
@@ -68,9 +68,9 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: 20
      - run: yarn install --frozen-lockfile --check-files
-      - run: yarn build-ci
+      - run: yarn build
      - name: Build tarballs
        working-directory: ${{ github.workspace }}/packages/eas-cli
        run: |
@@ -96,10 +96,10 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: 20
      - run: yarn install --frozen-lockfile --check-files
      - run: sudo apt-get install nsis
-      - run: yarn build-ci
+      - run: yarn build
      - run: |
          yarn pretarball-ci
          yarn oclif pack:win
@@ -138,11 +138,11 @@ jobs:
        with:
          registry-url: 'https://registry.npmjs.org/'
          scope: 'expo'
-          node-version: 18
+          node-version: 20
      - name: Install dependencies
        run: yarn install --frozen-lockfile --check-files
      - name: Build
-        run: yarn build-ci
+        run: yarn build
      - name: Publish packages to npm
        run: yarn lerna publish from-package --yes --no-verify-access
        env:
@@ -165,7 +165,7 @@ jobs:
          token: ${{ secrets.EXPO_BOT_PAT }}
      - uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: 20
      - name: Install dependencies
        working-directory: ./scripts
        run: yarn install --frozen-lockfile --check-files
@@ -175,7 +175,7 @@ jobs:
        working-directory: ./scripts
        run: yarn --silent release-changelog $EAS_CLI_VERSION > /tmp/current-changelog
      - name: Publish release
-        run: hub release edit v$EAS_CLI_VERSION --draft=false -F /tmp/current-changelog
+        run: gh release edit v$EAS_CLI_VERSION --draft=false -F /tmp/current-changelog
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      - name: Commit and push
@@ -2,6 +2,9 @@ name: Size
 on:
  pull_request:
    types: [synchronize, opened]
+concurrency:
+  group: size-${{ github.ref }}
+  cancel-in-progress: true
 jobs:
  compare:
    runs-on: ubuntu-latest
@@ -9,7 +12,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: 20
      - uses: preactjs/compressed-size-action@v2
        with:
          build-script: 'build:tarballs:linux'
@@ -13,6 +13,10 @@ on:
    paths:
      - 'scripts/**'

+concurrency:
+  group: test-scripts-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
  test:
    runs-on: ubuntu-latest
@@ -21,6 +25,6 @@ jobs:
      - name: Setup node
        uses: actions/setup-node@v2
        with:
-          node-version: 18
+          node-version: 20
      - run: yarn install --frozen-lockfile --check-files
      - run: yarn typecheck
@@ -6,14 +6,18 @@ on:
  pull_request:
    types: [opened, synchronize]

+concurrency:
+  group: test-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
  test:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        node: ['14', '16', '18']
+        node: ['16', '18', '20']
        include:
-          - node: '18'
+          - node: '20'
            coverage: true
    name: Test with Node ${{ matrix.node }}
    steps:
@@ -10,8 +10,156 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🐛 Bug fixes

+- Revert incorrect EAS Submit input validation changes. ([#2200](https://github.com/expo/eas-cli/pull/2200) by [@szdziedzic](https://github.com/szdziedzic))
+
 ### 🧹 Chores

+## [7.1.0](https://github.com/expo/eas-cli/releases/tag/v7.1.0) - 2024-01-26
+
+### 🎉 New features
+
+- Support requireCommit for EAS Update. ([#2196](https://github.com/expo/eas-cli/pull/2196) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Remove support for classic updates release channel in 50+. ([#2189](https://github.com/expo/eas-cli/pull/2189) by [@wschurman](https://github.com/wschurman))
+- Validate EAS Submit inputs better. ([#2198](https://github.com/expo/eas-cli/pull/2198) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [7.0.0](https://github.com/expo/eas-cli/releases/tag/v7.0.0) - 2024-01-19
+
+### 🛠 Breaking changes
+
+- Stop generating eas-update-metadata.json on publish. ([#2187](https://github.com/expo/eas-cli/pull/2187) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Use branch mapping utility fn. ([#2186](https://github.com/expo/eas-cli/pull/2186) by [@quinlanj](https://github.com/quinlanj))
+
+## [6.1.0](https://github.com/expo/eas-cli/releases/tag/v6.1.0) - 2024-01-18
+
+### 🎉 New features
+
+- Add `build:delete` command. ([#2178](https://github.com/expo/eas-cli/pull/2178) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+- Add filter flags for `platform` and `profile` to `build:cancel` and `build:delete` commands. ([#2178](https://github.com/expo/eas-cli/pull/2178) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+### 🧹 Chores
+
+- Remove "bare"-specific **eas.json** template. ([#2179](https://github.com/expo/eas-cli/pull/2179) by [@sjchmiela](https://github.com/sjchmiela))
+- Prompt users if they want to continue if EAS CLI fails to provision the devices. ([#2181](https://github.com/expo/eas-cli/pull/2181) by [@szdziedzic](https://github.com/szdziedzic))
+- Update `eas-cli` and `@expo/eas-json` dependencies. ([#2176](https://github.com/expo/eas-cli/pull/2176) by [@szdziedzic](https://github.com/szdziedzic))
+- Update `eas.schema.json` to after adding Xcode 15.2 image. ([#2184](https://github.com/expo/eas-cli/pull/2184) by [@szdziedzic](https://github.com/szdziedzic))
+- Upgrade packages from the expo/expo repo. ([#2145](https://github.com/expo/eas-cli/pull/2145) by [@wschurman](https://github.com/wschurman))
+
+## [6.0.0](https://github.com/expo/eas-cli/releases/tag/v6.0.0) - 2024-01-12
+
+### 🛠 Breaking changes
+
+- Drop support for Node 14. ([#2175](https://github.com/expo/eas-cli/pull/2175) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🎉 New features
+
+- Allow undefined update message for EAS Update publishing when no VCS. ([#2148](https://github.com/expo/eas-cli/pull/2148) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Upgrade `@expo/eas-build-job` to `1.0.56`, thus removing unused (since [#1524](https://github.com/expo/eas-cli/pull/1524)) support for S3 project archives. ([#2165](https://github.com/expo/eas-cli/pull/2165) by [@sjchmiela](https://github.com/sjchmiela))
+
+## [5.9.3](https://github.com/expo/eas-cli/releases/tag/v5.9.3) - 2023-12-19
+
+### 🧹 Chores
+
+- Rename getUpdateGroupJsonInfo. ([#2157](https://github.com/expo/eas-cli/pull/2157) by [@quinlanj](https://github.com/quinlanj))
+- Add new Xcode 15.1 image to `eas.schema.json`. ([#2155](https://github.com/expo/eas-cli/pull/2155) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [5.9.2](https://github.com/expo/eas-cli/releases/tag/v5.9.2) - 2023-12-15
+
+### 🧹 Chores
+
+- Throw error if custom build config is gitignored. ([#2123](https://github.com/expo/eas-cli/pull/2123) by [@szdziedzic](https://github.com/szdziedzic))
+- Update `@expo/steps` library to `1.0.51`. ([#2130](https://github.com/expo/eas-cli/pull/2130) by [@szdziedzic](https://github.com/szdziedzic))
+- Update `eas.schema.json` to include changes after some of our images were migrated from Ubuntu 18.04 to Ubuntu 20.04. ([#2137](https://github.com/expo/eas-cli/pull/2137) by [@szdziedzic](https://github.com/szdziedzic))
+- Update oclif dependencies. ([#2008](https://github.com/expo/eas-cli/pull/2008) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+- Upgrade `eas-build-job` and unify how we're handling `buildMode`. ([#2138](https://github.com/expo/eas-cli/pull/2138) by [@sjchmiela](https://github.com/sjchmiela))
+
+## [5.9.1](https://github.com/expo/eas-cli/releases/tag/v5.9.1) - 2023-11-20
+
+### 🐛 Bug fixes
+
+- Don't ask a user to install the dev client if running in non-interactive mode. ([#2124](https://github.com/expo/eas-cli/pull/2124) by [@szdziedzic](https://github.com/szdziedzic))
+- Always refresh existing provisioning profile before use. ([#2125](https://github.com/expo/eas-cli/pull/2125) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+## [5.9.0](https://github.com/expo/eas-cli/releases/tag/v5.9.0) - 2023-11-15
+
+### 🎉 New features
+
+- Add `--profile` flag to `eas build:run` command. ([#2035](https://github.com/expo/eas-cli/pull/2035) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [5.8.0](https://github.com/expo/eas-cli/releases/tag/v5.8.0) - 2023-11-13
+
+### 🎉 New features
+
+- Move channel:rollout out of developer preview. ([#2114](https://github.com/expo/eas-cli/pull/2114) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Fixed provisioning of new devices into an existing profile. ([#2119](https://github.com/expo/eas-cli/pull/2119) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+### 🧹 Chores
+
+- Update `@expo/package-manager` to `1.1.2` to change package manager resolution order. ([#2118](https://github.com/expo/eas-cli/pull/2118) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [5.7.0](https://github.com/expo/eas-cli/releases/tag/v5.7.0) - 2023-11-08
+
+### 🎉 New features
+
+- Add `EXPO_APPLE_TEAM_ID` and `EXPO_APPLE_PROVIDER_ID` support. ([#2091](https://github.com/expo/eas-cli/pull/2091) by [@EvanBacon](https://github.com/EvanBacon))
+
+### 🧹 Chores
+
+- Add link to SDK upgrade page for SDK-gated command error. ([#2106](https://github.com/expo/eas-cli/pull/2106) by [@wschurman](https://github.com/wschurman))
+- Add `selectedImage` and `customNodeVersion` information to build metadata. ([#2113](https://github.com/expo/eas-cli/pull/2113) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [5.6.0](https://github.com/expo/eas-cli/releases/tag/v5.6.0) - 2023-10-27
+
+### 🎉 New features
+
+- Use corresponding submit profile when selecting build from EAS. ([#2101](https://github.com/expo/eas-cli/pull/2101) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+### 🐛 Bug fixes
+
+- Added `buildArtifactsUrl` to `eas-cli build:view --json` output. ([#2102](https://github.com/expo/eas-cli/pull/2102) by [@sjchmiela](https://github.com/sjchmiela))
+
+## [5.5.0](https://github.com/expo/eas-cli/releases/tag/v5.5.0) - 2023-10-25
+
+### 🎉 New features
+
+- Add account type to the items in the prompt to select project owner. ([#2083](https://github.com/expo/eas-cli/pull/2083) by [@alanjhughes](https://github.com/alanjhughes))
+- Gate roll back to embedded to expo-updates >= 0.19.0. ([#2094](https://github.com/expo/eas-cli/pull/2094) by [@wschurman](https://github.com/wschurman))
+
+### 🐛 Bug fixes
+
+- EAS Update: Increase asset upload timeout to 90s and reset on upload retry for slow connections. ([#2085](https://github.com/expo/eas-cli/pull/2085) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Add `requiredPackageManager` to metadata. ([#2067](https://github.com/expo/eas-cli/pull/2067) by [@kadikraman](https://github.com/kadikraman))
+- Move `getVcsClient` into command context. ([#2086](https://github.com/expo/eas-cli/pull/2086) by [@Josh-McFarlin](https://github.com/Josh-McFarlin))
+- Display Apple device creation date when listing devices. ([#2092](https://github.com/expo/eas-cli/pull/2092) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+- Clean up Intel resource classes code after their deletion. ([#2093](https://github.com/expo/eas-cli/pull/2093) by [@szdziedzic](https://github.com/szdziedzic))
+- Update images descriptions in `eas.schema.json` and add info about the new JDK 17 image. ([#2099](https://github.com/expo/eas-cli/pull/2099) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [5.4.0](https://github.com/expo/eas-cli/releases/tag/v5.4.0) - 2023-09-28
+
+### 🎉 New features
+
+- Add support for the Tap to Pay on iPhone iOS entitlement. ([#2069](https://github.com/expo/eas-cli/pull/2069) by [@fobos531](https://github.com/fobos531))
+
+## [5.3.1](https://github.com/expo/eas-cli/releases/tag/v5.3.1) - 2023-09-28
+
+### 🧹 Chores
+
+- Update EAS Build images description in our VSCode plugin. Add new `macos-ventura-13.6-xcode-15.0` image. ([#2068](https://github.com/expo/eas-cli/pull/2068) by [@szdziedzic](https://github.com/szdziedzic))
+
 ## [5.3.0](https://github.com/expo/eas-cli/releases/tag/v5.3.0) - 2023-09-25

 ### 🎉 New features
@@ -18,6 +18,25 @@ If you're making changes to `packages/eas-json` or prefer/need to work with prod
 yarn start
 ```

+If it is easier for you to work with the code locally with compiler options set to:
+
+```json
+...
+"compilerOptions": {
+    ...
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    ...
+}
+...
+```
+
+you can consider using:
+
+```
+yarn start-allow-unused
+```
+
 ## Format

 - Be sure to update the [`CHANGELOG.md`](./CHANGELOG.md) with changes for every PR. There is a changelog bot that can generate the proper entry for you. The instructions on how to use it are in the PR description placeholder.
@@ -1,7 +0,0 @@
-module.exports = {
-  projects: [
-    require('./packages/eas-cli/jest.config.js'),
-    require('./packages/eas-json/jest.config.js'),
-  ],
-  testPathIgnorePatterns: ['.*'],
-};
@@ -0,0 +1,15 @@
+import type { Config } from 'jest';
+
+// eslint-disable-next-line import/no-relative-packages
+import easCliConfig from './packages/eas-cli/jest.config';
+// eslint-disable-next-line import/no-relative-packages
+import easJsonConfig from './packages/eas-json/jest.config';
+
+const config: Config = {
+  projects: [easCliConfig, easJsonConfig],
+  testPathIgnorePatterns: ['.*'],
+  watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
+  collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx,js,jsx}'],
+};
+
+export default config;
@@ -1,7 +0,0 @@
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
-  watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
-  collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx,js,jsx}'],
-};
@@ -0,0 +1,9 @@
+import type { Config } from 'jest';
+
+const config: Config = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
+};
+
+export default config;
@@ -1,6 +1,5 @@
 {
  "npmClient": "yarn",
-  "useWorkspaces": true,
-  "version": "5.3.0",
+  "version": "7.1.1",
  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
@@ -6,11 +6,11 @@
  ],
  "scripts": {
    "build": "lerna run build",
-    "build-ci": "lerna run build-ci",
    "build:tarballs:linux": "yarn build-for-size-check",
    "build-for-size-check": "yarn build && yarn workspace eas-cli pretarball-ci && CLI_SIZE_CHECK=1 yarn workspace eas-cli oclif pack:tarballs --no-xz --targets linux-x64",
    "typecheck": "lerna run typecheck",
    "start": "lerna run watch --stream --parallel",
+    "start-allow-unused": "lerna run watch-allow-unused --stream --parallel",
    "watch": "yarn start",
    "eas": "packages/eas-cli/bin/run",
    "lint": "eslint .",
@@ -20,22 +20,22 @@
    "clean": "lerna run clean && rm -rf node_modules coverage"
  },
  "devDependencies": {
-    "@types/jest": "29.2.5",
-    "@types/node": "18.11.18",
-    "eslint": "8.31.0",
-    "eslint-config-universe": "11.1.1",
-    "eslint-plugin-async-protect": "3.0.0",
+    "@types/jest": "29.5.11",
+    "@types/node": "20.11.0",
+    "eslint": "8.56.0",
+    "eslint-config-universe": "12.0.0",
+    "eslint-plugin-async-protect": "3.1.0",
    "eslint-plugin-node": "11.1.0",
-    "jest": "29.3.1",
-    "jest-watch-typeahead": "2.2.1",
-    "lerna": "6.4.1",
-    "oclif": "3.4.3",
-    "prettier": "2.8.2",
-    "ts-jest": "29.0.3",
-    "typescript": "4.9.4"
+    "jest": "29.7.0",
+    "jest-watch-typeahead": "2.2.2",
+    "lerna": "7.4.2",
+    "oclif": "^3.9.0",
+    "prettier": "3.1.1",
+    "ts-jest": "29.1.1",
+    "typescript": "5.3.3"
  },
  "volta": {
-    "node": "18.6.0",
-    "yarn": "1.22.19"
+    "node": "20.11.0",
+    "yarn": "1.22.21"
  }
 }
@@ -68,6 +68,7 @@ eas --help COMMAND
 * [`eas build`](#eas-build)
 * [`eas build:cancel [BUILD_ID]`](#eas-buildcancel-build_id)
 * [`eas build:configure`](#eas-buildconfigure)
+* [`eas build:delete [BUILD_ID]`](#eas-builddelete-build_id)
 * [`eas build:inspect`](#eas-buildinspect)
 * [`eas build:list`](#eas-buildlist)
 * [`eas build:resign`](#eas-buildresign)
@@ -110,6 +111,8 @@ eas --help COMMAND
 * [`eas update:delete GROUPID`](#eas-updatedelete-groupid)
 * [`eas update:list`](#eas-updatelist)
 * [`eas update:republish`](#eas-updaterepublish)
+* [`eas update:roll-back-to-embedded`](#eas-updateroll-back-to-embedded)
+* [`eas update:rollback`](#eas-updaterollback)
 * [`eas update:view GROUPID`](#eas-updateview-groupid)
 * [`eas webhook:create`](#eas-webhookcreate)
 * [`eas webhook:delete [ID]`](#eas-webhookdelete-id)
@@ -133,7 +136,7 @@ ALIASES
  $ eas login
 ```

-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/account/login.ts)_

 ## `eas account:logout`

@@ -150,7 +153,7 @@ ALIASES
  $ eas logout
 ```

-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/account/logout.ts)_

 ## `eas account:view`

@@ -167,7 +170,7 @@ ALIASES
  $ eas whoami
 ```

-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/account/view.ts)_

 ## `eas analytics [STATUS]`

@@ -181,7 +184,7 @@ DESCRIPTION
  display or change analytics settings
 ```

-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/analytics.ts)_

 ## `eas autocomplete [SHELL]`

@@ -192,7 +195,7 @@ USAGE
  $ eas autocomplete [SHELL] [-r]

 ARGUMENTS
-  SHELL  shell type
+  SHELL  (zsh|bash|powershell) Shell type

 FLAGS
  -r, --refresh-cache  Refresh cache (ignores displaying instructions)
@@ -207,10 +210,12 @@ EXAMPLES

  $ eas autocomplete zsh

+  $ eas autocomplete powershell
+
  $ eas autocomplete --refresh-cache
 ```

-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.3.10/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v2.3.10/src/commands/autocomplete/index.ts)_

 ## `eas branch:create [NAME]`

@@ -231,7 +236,7 @@ DESCRIPTION
  create a branch
 ```

-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/branch/create.ts)_

 ## `eas branch:delete [NAME]`

@@ -252,7 +257,7 @@ DESCRIPTION
  delete a branch
 ```

-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/branch/delete.ts)_

 ## `eas branch:list`

@@ -272,7 +277,7 @@ DESCRIPTION
  list all branches
 ```

-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/branch/list.ts)_

 ## `eas branch:rename`

@@ -292,7 +297,7 @@ DESCRIPTION
  rename a branch
 ```

-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/branch/rename.ts)_

 ## `eas branch:view [NAME]`

@@ -315,7 +320,7 @@ DESCRIPTION
  view a branch
 ```

-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/branch/view.ts)_

 ## `eas build`

@@ -345,7 +350,7 @@ DESCRIPTION
  start a build
 ```

-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/build/index.ts)_

 ## `eas build:cancel [BUILD_ID]`

@@ -353,16 +358,18 @@ cancel a build

 ```
 USAGE
-  $ eas build:cancel [BUILD_ID] [--non-interactive]
+  $ eas build:cancel [BUILD_ID] [--non-interactive] [-p android|ios|all] [-e <value>]

 FLAGS
-  --non-interactive  Run the command in non-interactive mode.
+  -e, --profile=PROFILE_NAME        Filter builds by build profile if build ID is not provided
+  -p, --platform=(android|ios|all)  Filter builds by the platform if build ID is not provided
+  --non-interactive                 Run the command in non-interactive mode.

 DESCRIPTION
  cancel a build
 ```

-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/build/cancel.ts)_

 ## `eas build:configure`

@@ -379,7 +386,26 @@ DESCRIPTION
  configure the project to support EAS Build
 ```

-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/build/configure.ts)_
+
+## `eas build:delete [BUILD_ID]`
+
+delete a build
+
+```
+USAGE
+  $ eas build:delete [BUILD_ID] [--non-interactive] [-p android|ios|all] [-e <value>]
+
+FLAGS
+  -e, --profile=PROFILE_NAME        Filter builds by build profile if build ID is not provided
+  -p, --platform=(android|ios|all)  Filter builds by the platform if build ID is not provided
+  --non-interactive                 Run the command in non-interactive mode.
+
+DESCRIPTION
+  delete a build
+```
+
+_See code: [src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/build/delete.ts)_

 ## `eas build:inspect`

@@ -414,7 +440,7 @@ DESCRIPTION
  inspect the state of the project at specific build stages, useful for troubleshooting
 ```

-_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/build/inspect.ts)_

 ## `eas build:list`

@@ -452,7 +478,7 @@ DESCRIPTION
  list all builds for your project
 ```

-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/build/list.ts)_

 ## `eas build:resign`

@@ -478,7 +504,7 @@ DESCRIPTION
  re-sign a build archive
 ```

-_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/build/resign.ts)_
+_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/build/resign.ts)_

 ## `eas build:run`

@@ -486,10 +512,12 @@ run simulator/emulator builds from eas-cli

 ```
 USAGE
-  $ eas build:run [--latest | --id <value> | --path <value> | --url <value>] [-p android|ios] [--offset
-    <value>] [--limit <value>]
+  $ eas build:run [--latest | --id <value> | --path <value> | --url <value>] [-p android|ios] [-e <value>]
+    [--offset <value>] [--limit <value>]

 FLAGS
+  -e, --profile=PROFILE_NAME    Name of the build profile used to create the build to run. When specified, only builds
+                                created with the specified build profile will be queried.
  -p, --platform=(android|ios)
  --id=<value>                  ID of the simulator/emulator build to run
  --latest                      Run the latest simulator/emulator build for specified platform
@@ -502,7 +530,7 @@ DESCRIPTION
  run simulator/emulator builds from eas-cli
 ```

-_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/build/run.ts)_
+_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/build/run.ts)_

 ## `eas build:submit`

@@ -551,7 +579,7 @@ DESCRIPTION
  get the latest version from EAS servers
 ```

-_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/build/version/get.ts)_
+_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/build/version/get.ts)_

 ## `eas build:version:set`

@@ -570,7 +598,7 @@ DESCRIPTION
  update version of an app
 ```

-_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/build/version/set.ts)_
+_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/build/version/set.ts)_

 ## `eas build:version:sync`

@@ -589,7 +617,7 @@ DESCRIPTION
  update a version in native code with a value stored on EAS servers
 ```

-_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/build/version/sync.ts)_
+_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/build/version/sync.ts)_

 ## `eas build:view [BUILD_ID]`

@@ -606,7 +634,7 @@ DESCRIPTION
  view a build for your project
 ```

-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/build/view.ts)_

 ## `eas channel:create [NAME]`

@@ -627,7 +655,7 @@ DESCRIPTION
  create a channel
 ```

-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/channel/create.ts)_

 ## `eas channel:edit [NAME]`

@@ -649,7 +677,7 @@ DESCRIPTION
  point a channel at a new branch
 ```

-_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/channel/edit.ts)_

 ## `eas channel:list`

@@ -669,7 +697,7 @@ DESCRIPTION
  list all channels
 ```

-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/channel/list.ts)_

 ## `eas channel:rollout [CHANNEL]`

@@ -701,7 +729,7 @@ DESCRIPTION
  Roll a new branch out on a channel incrementally.
 ```

-_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/channel/rollout.ts)_
+_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/channel/rollout.ts)_

 ## `eas channel:view [NAME]`

@@ -724,7 +752,7 @@ DESCRIPTION
  view a channel
 ```

-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/channel/view.ts)_

 ## `eas config`

@@ -745,7 +773,7 @@ DESCRIPTION
  display project configuration (app.json + eas.json)
 ```

-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/config.ts)_

 ## `eas credentials`

@@ -762,7 +790,7 @@ DESCRIPTION
  manage credentials
 ```

-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/credentials.ts)_

 ## `eas device:create`

@@ -776,7 +804,7 @@ DESCRIPTION
  register new Apple Devices to use for internal distribution
 ```

-_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/device/create.ts)_

 ## `eas device:delete`

@@ -796,7 +824,7 @@ DESCRIPTION
  remove a registered device from your account
 ```

-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/device/delete.ts)_

 ## `eas device:list`

@@ -817,7 +845,7 @@ DESCRIPTION
  list all registered devices for your account
 ```

-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/device/list.ts)_

 ## `eas device:rename`

@@ -838,7 +866,7 @@ DESCRIPTION
  rename a registered device
 ```

-_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/device/rename.ts)_
+_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/device/rename.ts)_

 ## `eas device:view [UDID]`

@@ -852,7 +880,7 @@ DESCRIPTION
  view a device for your project
 ```

-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/device/view.ts)_

 ## `eas diagnostics`

@@ -866,11 +894,11 @@ DESCRIPTION
  display environment info
 ```

-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/diagnostics.ts)_

 ## `eas help [COMMAND]`

-display help for eas-cli
+Display help for eas.

 ```
 USAGE
@@ -883,10 +911,10 @@ FLAGS
  -n, --nested-commands  Include all nested commands in the output.

 DESCRIPTION
-  display help for eas-cli
+  Display help for eas.
 ```

-_See code: [@expo/plugin-help](https://github.com/expo/oclif-plugin-help/blob/v5.1.22/src/commands/help.ts)_
+_See code: [@expo/plugin-help](https://github.com/expo/oclif-plugin-help/blob/v5.1.23/src/commands/help.ts)_

 ## `eas init`

@@ -954,7 +982,7 @@ DESCRIPTION
  validate the local store configuration
 ```

-_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/metadata/lint.ts)_
+_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/metadata/lint.ts)_

 ## `eas metadata:pull`

@@ -971,7 +999,7 @@ DESCRIPTION
  generate the local store configuration from the app stores
 ```

-_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/metadata/pull.ts)_

 ## `eas metadata:push`

@@ -988,7 +1016,7 @@ DESCRIPTION
  sync the local store configuration to the app stores
 ```

-_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/metadata/push.ts)_

 ## `eas open`

@@ -1002,7 +1030,7 @@ DESCRIPTION
  open the project page in a web browser
 ```

-_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/open.ts)_
+_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/open.ts)_

 ## `eas project:info`

@@ -1016,7 +1044,7 @@ DESCRIPTION
  information about the current project
 ```

-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/project/info.ts)_

 ## `eas project:init`

@@ -1038,7 +1066,7 @@ ALIASES
  $ eas init
 ```

-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/project/init.ts)_

 ## `eas secret:create`

@@ -1061,7 +1089,7 @@ DESCRIPTION
  create an environment secret on the current project or owner account
 ```

-_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/secret/create.ts)_

 ## `eas secret:delete`

@@ -1079,7 +1107,7 @@ DESCRIPTION
  delete an environment secret by ID
 ```

-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/secret/delete.ts)_

 ## `eas secret:list`

@@ -1093,7 +1121,7 @@ DESCRIPTION
  list environment secrets available for your current app
 ```

-_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/secret/list.ts)_

 ## `eas secret:push`

@@ -1113,7 +1141,7 @@ DESCRIPTION
  read environment secrets from env file and store on the server
 ```

-_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/secret/push.ts)_
+_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/secret/push.ts)_

 ## `eas submit`

@@ -1143,7 +1171,7 @@ ALIASES
  $ eas build:submit
 ```

-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/submit.ts)_

 ## `eas update`

@@ -1177,7 +1205,7 @@ DESCRIPTION
  publish an update group
 ```

-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/update/index.ts)_

 ## `eas update:configure`

@@ -1195,7 +1223,7 @@ DESCRIPTION
  configure the project to support EAS Update
 ```

-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/update/configure.ts)_

 ## `eas update:delete GROUPID`

@@ -1203,7 +1231,7 @@ delete all the updates in an update group

 ```
 USAGE
-  $ eas update:delete [GROUPID] [--json --non-interactive]
+  $ eas update:delete GROUPID [--json --non-interactive]

 ARGUMENTS
  GROUPID  The ID of an update group to delete.
@@ -1216,7 +1244,7 @@ DESCRIPTION
  delete all the updates in an update group
 ```

-_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/update/delete.ts)_

 ## `eas update:list`

@@ -1238,7 +1266,7 @@ DESCRIPTION
  view the recent updates
 ```

-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/update/list.ts)_

 ## `eas update:republish`

@@ -1265,7 +1293,53 @@ DESCRIPTION
  roll back to an existing update
 ```

-_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/update/republish.ts)_
+_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/update/republish.ts)_
+
+## `eas update:roll-back-to-embedded`
+
+roll back to the embedded update
+
+```
+USAGE
+  $ eas update:roll-back-to-embedded [--branch <value>] [--channel <value>] [--message <value>] [-p android|ios|all] [--auto]
+    [--private-key-path <value>] [--json --non-interactive]
+
+FLAGS
+  -p, --platform=(android|ios|all)  [default: all]
+  --auto                            Use the current git branch and commit message for the EAS branch and update message
+  --branch=<value>                  Branch to publish the rollback to embedded update group on
+  --channel=<value>                 Channel that the published rollback to embedded update should affect
+  --json                            Enable JSON output, non-JSON messages will be printed to stderr.
+  --message=<value>                 A short message describing the rollback to embedded update
+  --non-interactive                 Run the command in non-interactive mode.
+  --private-key-path=<value>        File containing the PEM-encoded private key corresponding to the certificate in
+                                    expo-updates' configuration. Defaults to a file named "private-key.pem" in the
+                                    certificate's directory.
+
+DESCRIPTION
+  roll back to the embedded update
+```
+
+_See code: [src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/update/roll-back-to-embedded.ts)_
+
+## `eas update:rollback`
+
+roll back to an embedded update or an existing update
+
+```
+USAGE
+  $ eas update:rollback [--private-key-path <value>]
+
+FLAGS
+  --private-key-path=<value>  File containing the PEM-encoded private key corresponding to the certificate in
+                              expo-updates' configuration. Defaults to a file named "private-key.pem" in the
+                              certificate's directory.
+
+DESCRIPTION
+  roll back to an embedded update or an existing update
+```
+
+_See code: [src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/update/rollback.ts)_

 ## `eas update:view GROUPID`

@@ -1273,7 +1347,7 @@ update group details

 ```
 USAGE
-  $ eas update:view [GROUPID] [--json]
+  $ eas update:view GROUPID [--json]

 ARGUMENTS
  GROUPID  The ID of an update group.
@@ -1285,7 +1359,7 @@ DESCRIPTION
  update group details
 ```

-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/update/view.ts)_

 ## `eas webhook:create`

@@ -1306,7 +1380,7 @@ DESCRIPTION
  create a webhook
 ```

-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/webhook/create.ts)_

 ## `eas webhook:delete [ID]`

@@ -1326,7 +1400,7 @@ DESCRIPTION
  delete a webhook
 ```

-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/webhook/delete.ts)_

 ## `eas webhook:list`

@@ -1344,7 +1418,7 @@ DESCRIPTION
  list webhooks
 ```

-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/webhook/list.ts)_

 ## `eas webhook:update`

@@ -1366,7 +1440,7 @@ DESCRIPTION
  update a webhook
 ```

-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/webhook/update.ts)_

 ## `eas webhook:view ID`

@@ -1374,7 +1448,7 @@ view a webhook

 ```
 USAGE
-  $ eas webhook:view [ID]
+  $ eas webhook:view ID

 ARGUMENTS
  ID  ID of the webhook to view
@@ -1383,7 +1457,7 @@ DESCRIPTION
  view a webhook
 ```

-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v5.3.0/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v7.1.1/src/commands/webhook/view.ts)_

 ## `eas whoami`

@@ -1,7 +0,0 @@
-module.exports = {
-  ...require('../../jest/jest.config.js'),
-  rootDir: __dirname,
-  roots: ['src', '__mocks__'],
-  globalSetup: './jest/global-setup.ts',
-  setupFilesAfterEnv: ['./jest/setup-after-env.ts'],
-};
@@ -0,0 +1,14 @@
+import type { Config } from 'jest';
+
+// eslint-disable-next-line import/no-relative-packages
+import baseConfig from '../../jest/jest.config';
+
+const config: Config = {
+  ...baseConfig,
+  rootDir: __dirname,
+  roots: ['src', '__mocks__'],
+  globalSetup: './jest/global-setup.ts',
+  setupFilesAfterEnv: ['./jest/setup-after-env.ts'],
+};
+
+export default config;
@@ -1,36 +1,36 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "5.3.0",
+  "version": "7.1.1",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
  },
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
-    "@expo/apple-utils": "1.3.1",
+    "@expo/apple-utils": "1.3.2",
    "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "8.1.2",
-    "@expo/config-plugins": "7.2.4",
-    "@expo/config-types": "49.0.0",
-    "@expo/eas-build-job": "1.0.43",
-    "@expo/eas-json": "5.3.0",
+    "@expo/config": "8.5.4",
+    "@expo/config-plugins": "7.8.4",
+    "@expo/config-types": "50.0.0",
+    "@expo/eas-build-job": "1.0.59",
+    "@expo/eas-json": "7.1.1",
    "@expo/json-file": "8.2.37",
    "@expo/multipart-body-parser": "1.1.0",
    "@expo/osascript": "2.0.33",
-    "@expo/package-manager": "0.0.57",
+    "@expo/package-manager": "1.1.2",
    "@expo/pkcs12": "0.0.8",
    "@expo/plist": "0.0.20",
-    "@expo/plugin-help": "5.1.22",
-    "@expo/plugin-warn-if-update-available": "2.5.0",
-    "@expo/prebuild-config": "6.2.5",
+    "@expo/plugin-help": "5.1.23",
+    "@expo/plugin-warn-if-update-available": "2.5.1",
+    "@expo/prebuild-config": "6.7.3",
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
    "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.34",
+    "@expo/steps": "1.0.51",
    "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "1.23.2",
-    "@oclif/plugin-autocomplete": "1.3.10",
+    "@oclif/core": "^1.26.2",
+    "@oclif/plugin-autocomplete": "^2.3.10",
    "@segment/ajv-human-errors": "^2.1.2",
    "@urql/core": "4.0.11",
    "@urql/exchange-retry": "1.2.0",
@@ -38,26 +38,27 @@
    "ajv-formats": "2.1.1",
    "better-opn": "3.0.2",
    "chalk": "4.1.2",
-    "cli-progress": "3.11.2",
+    "cli-progress": "3.12.0",
    "dateformat": "4.6.3",
-    "dotenv": "16.0.3",
+    "dotenv": "16.3.1",
    "env-paths": "2.2.0",
-    "envinfo": "7.8.1",
+    "envinfo": "7.11.0",
    "fast-deep-equal": "3.1.3",
-    "fast-glob": "3.2.12",
+    "fast-glob": "3.3.2",
    "figures": "3.2.0",
    "form-data": "4.0.0",
-    "fs-extra": "10.1.0",
+    "fs-extra": "11.2.0",
    "getenv": "1.0.0",
    "gradle-to-js": "2.0.1",
-    "graphql": "16.6.0",
+    "graphql": "16.8.1",
    "graphql-tag": "2.12.6",
    "https-proxy-agent": "5.0.1",
-    "ignore": "5.2.4",
+    "ignore": "5.3.0",
    "indent-string": "4.0.0",
    "jks-js": "1.1.0",
-    "joi": "17.7.0",
-    "keychain": "1.3.0",
+    "joi": "17.11.0",
+    "jsonwebtoken": "9.0.0",
+    "keychain": "1.5.0",
    "log-symbols": "4.1.0",
    "mime": "3.0.0",
    "minimatch": "5.1.2",
@@ -67,58 +68,59 @@
    "nullthrows": "1.1.1",
    "ora": "5.1.0",
    "pkg-dir": "4.2.0",
-    "pngjs": "6.0.0",
+    "pngjs": "7.0.0",
    "promise-limit": "2.7.0",
    "promise-retry": "2.0.1",
    "prompts": "2.4.2",
    "qrcode-terminal": "0.12.0",
    "resolve-from": "5.0.0",
-    "semver": "7.5.2",
+    "semver": "7.5.4",
    "slash": "3.0.0",
-    "tar": "6.1.13",
+    "tar": "6.2.0",
    "terminal-link": "2.1.1",
-    "tslib": "2.4.1",
-    "turndown": "7.1.1",
+    "tslib": "2.6.2",
+    "turndown": "7.1.2",
    "untildify": "4.0.0",
-    "uuid": "9.0.0",
+    "uuid": "9.0.1",
    "wrap-ansi": "7.0.0"
  },
  "devDependencies": {
-    "@graphql-codegen/cli": "2.16.3",
-    "@graphql-codegen/introspection": "2.2.3",
-    "@graphql-codegen/typescript": "2.8.7",
-    "@graphql-codegen/typescript-operations": "2.5.12",
-    "@types/cli-progress": "3.11.0",
+    "@graphql-codegen/cli": "5.0.0",
+    "@graphql-codegen/introspection": "4.0.0",
+    "@graphql-codegen/typescript": "4.0.1",
+    "@graphql-codegen/typescript-operations": "4.0.1",
+    "@types/cli-progress": "3.11.5",
    "@types/dateformat": "3.0.1",
-    "@types/envinfo": "7.8.1",
+    "@types/envinfo": "7.8.3",
    "@types/express": "4.17.15",
-    "@types/fs-extra": "9.0.13",
+    "@types/fs-extra": "11.0.4",
    "@types/getenv": "^1.0.0",
+    "@types/jsonwebtoken": "8.5.1",
    "@types/mime": "3.0.1",
    "@types/node-fetch": "2.6.2",
    "@types/node-forge": "1.3.1",
-    "@types/pngjs": "6.0.1",
+    "@types/pngjs": "6.0.4",
    "@types/promise-retry": "1.1.3",
    "@types/prompts": "2.4.2",
-    "@types/semver": "7.3.13",
-    "@types/tar": "6.1.3",
+    "@types/semver": "7.5.6",
+    "@types/tar": "6.1.10",
    "@types/tough-cookie": "4.0.2",
-    "@types/uuid": "9.0.0",
+    "@types/uuid": "9.0.7",
    "@types/wrap-ansi": "3.0.0",
    "axios": "0.27.2",
    "eslint-plugin-graphql": "4.0.0",
    "express": "4.18.2",
    "memfs": "3.4.13",
    "mockdate": "3.0.5",
-    "nock": "13.2.9",
+    "nock": "13.4.0",
    "rimraf": "3.0.2",
-    "ts-deepmerge": "4.0.0",
+    "ts-deepmerge": "6.2.0",
    "ts-mockito": "2.6.1",
-    "ts-node": "10.9.1",
-    "typescript": "4.9.4"
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3"
  },
  "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
  },
  "files": [
    "/bin",
@@ -204,19 +206,20 @@
  "scripts": {
    "postpack": "rimraf oclif.manifest.json",
    "prepack": "yarn rebuild && node ./scripts/prepack.js",
-    "rebuild": "rimraf build && yarn build-ci",
+    "rebuild": "rimraf build && yarn build",
    "pretarball-ci": "./scripts/pretarball-ci.sh",
    "build": "tsc --project tsconfig.build.json",
-    "build-ci": "tsc --project tsconfig.build-ci.json",
+    "build-allow-unused": "tsc --project tsconfig.allowUnused.json",
    "watch": "yarn build --watch --preserveWatchOutput",
-    "typecheck": "tsc --project tsconfig.build-ci.json",
+    "watch-allow-unused": "yarn build-allow-unused --watch --preserveWatchOutput",
+    "typecheck": "tsc",
    "test": "jest",
    "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
    "clean": "rimraf dist build tmp node_modules yarn-error.log"
  },
  "volta": {
-    "node": "18.6.0",
-    "yarn": "1.22.19"
+    "node": "20.11.0",
+    "yarn": "1.22.21"
  }
 }
@@ -1,11 +1,11 @@
 import { AppVersionSource, EasJson } from '@expo/eas-json';
 import chalk from 'chalk';

+import { getMockEasJson, mockCommandContext, mockProjectId, mockTestCommand } from './utils';
 import BuildVersionGetView from '../../commands/build/version/get';
 import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
 import Log from '../../log';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { getMockEasJson, mockCommandContext, mockProjectId, mockTestCommand } from './utils';

 jest.mock('../../project/applicationIdentifier');
 jest.mock('fs');
@@ -2,12 +2,6 @@ import { AppVersionSource, EasJson } from '@expo/eas-json';
 import fs from 'fs-extra';
 import path from 'path';

-import BuildVersionSetView from '../../commands/build/version/set';
-import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
-import Log from '../../log';
-import * as prompts from '../../prompts';
 import {
  getMockAppFragment,
  getMockEasJson,
@@ -15,6 +9,12 @@ import {
  mockProjectId,
  mockTestCommand,
 } from './utils';
+import BuildVersionSetView from '../../commands/build/version/set';
+import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
+import { AppQuery } from '../../graphql/queries/AppQuery';
+import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
+import Log from '../../log';
+import * as prompts from '../../prompts';

 jest.mock('../../project/applicationIdentifier');
 jest.mock('../../graphql/queries/AppVersionQuery');
@@ -3,6 +3,13 @@ import { AppVersionSource, EasJson } from '@expo/eas-json';
 import fs from 'fs-extra';
 import path from 'path';

+import {
+  getMockAppFragment,
+  getMockEasJson,
+  mockCommandContext,
+  mockProjectId,
+  mockTestCommand,
+} from './utils';
 import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../build/android/version';
 import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../build/ios/version';
 import BuildVersionSyncView from '../../commands/build/version/sync';
@@ -14,13 +21,6 @@ import { getAppBuildGradleAsync } from '../../project/android/gradleUtils';
 import { resolveTargetsAsync } from '../../project/ios/target';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import * as prompts from '../../prompts';
-import {
-  getMockAppFragment,
-  getMockEasJson,
-  mockCommandContext,
-  mockProjectId,
-  mockTestCommand,
-} from './utils';

 jest.mock('../../build/android/version');
 jest.mock('../../build/ios/version');
@@ -59,7 +59,7 @@ export interface LocalProjectContext {
 export function mockCommandContext<
  C extends {
    [name: string]: any;
-  } = object
+  } = object,
 >(
  commandClass: { contextDefinition: ContextInput<C> },
  overrides: {
@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import gql from 'graphql-tag';

+import { BranchNotFoundError } from './utils';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { withErrorHandlingAsync } from '../graphql/client';
@@ -19,7 +20,6 @@ import {
  paginatedQueryWithConfirmPromptAsync,
  paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
-import { BranchNotFoundError } from './utils';

 export const BRANCHES_LIMIT = 50;

@@ -1,9 +1,8 @@
-import { getVcsClient } from '../vcs';
+import { Client } from '../vcs/vcs';

-export async function getDefaultBranchNameAsync(): Promise<string> {
+export async function getDefaultBranchNameAsync(vcsClient: Client): Promise<string> {
  return (
-    (await getVcsClient().getBranchNameAsync()) ||
-    `branch-${Math.random().toString(36).substring(2, 4)}`
+    (await vcsClient.getBranchNameAsync()) || `branch-${Math.random().toString(36).substring(2, 4)}`
  );
 }

@@ -0,0 +1,96 @@
+import { instance, mock } from 'ts-mockito';
+import { v4 as uuid } from 'uuid';
+
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { selectBuildToDeleteAsync } from '../../commands/build/delete';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildPriority,
+  BuildResourceClass,
+  BuildStatus,
+} from '../../graphql/generated';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
+import { confirmAsync, selectAsync } from '../../prompts';
+
+jest.mock('../../ora', () => ({
+  ora: jest.fn().mockImplementation(() => ({
+    start: jest.fn().mockImplementation(() => ({
+      stop: jest.fn(),
+      fail: jest.fn(),
+    })),
+  })),
+}));
+jest.mock('../../prompts', () => {
+  return {
+    selectAsync: jest.fn(),
+    confirmAsync: jest.fn(),
+  };
+});
+
+jest.mock('../../graphql/queries/BuildQuery', () => {
+  const actual = jest.requireActual('../../graphql/queries/BuildQuery');
+  return {
+    BuildQuery: {
+      ...actual.BuildQuery,
+      viewBuildsOnAppAsync: jest.fn(),
+    },
+  };
+});
+
+describe(selectBuildToDeleteAsync.name, () => {
+  const selectedBuildId = uuid();
+  const projectId = uuid();
+
+  beforeEach(() => {
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockImplementation(async () => [
+        createMockBuildFragment({ projectId, buildId: selectedBuildId }),
+      ]);
+  });
+
+  it('does not return build id when confirmation is rejected', async () => {
+    const graphqlClient = instance(mock<ExpoGraphqlClient>());
+    jest.mocked(confirmAsync).mockResolvedValueOnce(false);
+    expect(selectBuildToDeleteAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(null);
+  });
+
+  it('returns build id when confirmation is confirmed', async () => {
+    const graphqlClient = instance(mock<ExpoGraphqlClient>());
+    jest.mocked(selectAsync).mockResolvedValueOnce(selectedBuildId);
+    jest.mocked(confirmAsync).mockResolvedValueOnce(true);
+    expect(selectBuildToDeleteAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(
+      selectedBuildId
+    );
+  });
+});
+
+function createMockBuildFragment({
+  projectId,
+  buildId,
+}: {
+  projectId: string;
+  buildId?: string;
+}): BuildFragment {
+  return {
+    createdAt: new Date().toISOString(),
+    updatedAt: new Date().toISOString(),
+    platform: AppPlatform.Android,
+    id: buildId ?? uuid(),
+    priority: BuildPriority.Normal,
+    project: {
+      __typename: 'App',
+      slug: 'test-project',
+      id: projectId,
+      name: 'test-project',
+      ownerAccount: {
+        __typename: 'Account',
+        id: uuid(),
+        name: 'test-account',
+      },
+    },
+    status: BuildStatus.InQueue,
+    resourceClass: BuildResourceClass.AndroidMedium,
+  };
+}
@@ -8,6 +8,7 @@ import os from 'os';
 import path from 'path';

 import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
+import { getVcsClient } from '../../../vcs';
 import {
  BumpStrategy,
  bumpVersionAsync,
@@ -18,6 +19,8 @@ import {
 const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');

+const vcsClient = getVcsClient();
+
 afterAll(async () => {
  // do not remove the following line
  // this fixes a weird error with tempy in @expo/image-utils
@@ -191,7 +194,8 @@ describe(maybeResolveVersionsAsync, () => {
      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
        '/app',
        exp,
-        {} as BuildProfile<Platform.ANDROID>
+        {} as BuildProfile<Platform.ANDROID>,
+        vcsClient
      );
      expect(appVersion).toBe('3.0.0');
      expect(appBuildVersion).toBe('123');
@@ -203,7 +207,8 @@ describe(maybeResolveVersionsAsync, () => {
      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
        '/app',
        exp,
-        {} as BuildProfile<Platform.ANDROID>
+        {} as BuildProfile<Platform.ANDROID>,
+        vcsClient
      );
      expect(appVersion).toBe('5.0.0');
      expect(appBuildVersion).toBe('126');
@@ -3,6 +3,10 @@ import { AppVersionSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';

+import { transformJob } from './graphql';
+import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
+import { resolveRemoteVersionCodeAsync } from './version';
 import AndroidCredentialsProvider, {
  AndroidCredentials,
 } from '../../credentials/android/AndroidCredentialsProvider';
@@ -29,10 +33,6 @@ import {
  checkNodeEnvVariable,
  validatePNGsForManagedProjectAsync,
 } from '../validate';
-import { transformJob } from './graphql';
-import { prepareJobAsync } from './prepareJob';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
-import { resolveRemoteVersionCodeAsync } from './version';

 export async function createAndroidContextAsync(
  ctx: CommonContext<Platform.ANDROID>
@@ -59,13 +59,22 @@ This means that it will most likely produce an AAB and you will not be able to i
  await checkGoogleServicesFileAsync(ctx);
  await validatePNGsForManagedProjectAsync(ctx);

-  const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
+  const gradleContext = await resolveGradleBuildContextAsync(
+    ctx.projectDir,
+    buildProfile,
+    ctx.vcsClient
+  );

  if (ctx.workflow === Workflow.MANAGED) {
    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx);
  }

-  const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
+  const applicationId = await getApplicationIdAsync(
+    ctx.projectDir,
+    ctx.exp,
+    ctx.vcsClient,
+    gradleContext
+  );
  const versionCodeOverride =
    ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
      ? await resolveRemoteVersionCodeAsync(ctx.graphqlClient, {
@@ -74,6 +83,7 @@ This means that it will most likely produce an AAB and you will not be able to i
          exp: ctx.exp,
          applicationId,
          buildProfile,
+          vcsClient: ctx.vcsClient,
        })
      : undefined;

@@ -89,14 +99,14 @@ export async function prepareAndroidBuildAsync(
      return await ensureAndroidCredentialsAsync(ctx);
    },
    syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync(ctx.graphqlClient, {
+      await syncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
        localAutoIncrement:
          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
            ? false
            : ctx.buildProfile.autoIncrement,
-        projectId: ctx.projectId,
+        vcsClient: ctx.vcsClient,
      });
    },
    prepareJobAsync: async (
@@ -136,6 +146,7 @@ async function ensureAndroidCredentialsAsync(
  const androidApplicationIdentifier = await getApplicationIdAsync(
    ctx.projectDir,
    ctx.exp,
+    ctx.vcsClient,
    ctx.android.gradleContext
  );
  const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {
@@ -14,7 +14,6 @@ import slash from 'slash';
 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
 import { getCustomBuildConfigPath } from '../../project/customBuildConfig';
 import { getUsername } from '../../project/projectUtils';
-import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';

 interface JobData {
@@ -34,7 +33,7 @@ export async function prepareJobAsync(
  const username = getUsername(ctx.exp, ctx.user);
  const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
  const projectRootDirectory =
-    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
+    slash(path.relative(await ctx.vcsClient.getRootPathAsync(), ctx.projectDir)) || '.';
  const { credentials } = jobData;
  const buildCredentials = credentials
    ? {
@@ -6,34 +6,31 @@ import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';

-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 import Log from '../../log';
 import { isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { syncUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
+import { Client } from '../../vcs/vcs';

-export async function syncProjectConfigurationAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectDir,
-    exp,
-    localAutoIncrement,
-    projectId,
-  }: {
-    projectDir: string;
-    exp: ExpoConfig;
-    localAutoIncrement?: AndroidVersionAutoIncrement;
-    projectId: string;
-  }
-): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+export async function syncProjectConfigurationAsync({
+  projectDir,
+  exp,
+  localAutoIncrement,
+  vcsClient,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  localAutoIncrement?: AndroidVersionAutoIncrement;
+  vcsClient: Client;
+}): Promise<void> {
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
    await cleanUpOldEasBuildGradleScriptAsync(projectDir);
    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
+      await syncUpdatesConfigurationAsync(projectDir, exp);
    }
    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
  } else {
@@ -18,6 +18,7 @@ import {
 } from '../../project/android/gradleUtils';
 import { getNextVersionCode } from '../../project/android/versions';
 import { resolveWorkflowAsync } from '../../project/workflow';
+import { Client } from '../../vcs/vcs';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';

@@ -96,9 +97,10 @@ export async function bumpVersionInAppJsonAsync({
 export async function maybeResolveVersionsAsync(
  projectDir: string,
  exp: ExpoConfig,
-  buildProfile: BuildProfile<Platform.ANDROID>
+  buildProfile: BuildProfile<Platform.ANDROID>,
+  vcsClient: Client
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
  if (workflow === Workflow.GENERIC) {
    const buildGradle = await getAppBuildGradleAsync(projectDir);
    try {
@@ -183,12 +185,14 @@ export async function resolveRemoteVersionCodeAsync(
    exp,
    applicationId,
    buildProfile,
+    vcsClient,
  }: {
    projectDir: string;
    projectId: string;
    exp: ExpoConfig;
    applicationId: string;
    buildProfile: BuildProfile<Platform.ANDROID>;
+    vcsClient: Client;
  }
 ): Promise<string> {
  const remoteVersions = await AppVersionQuery.latestVersionAsync(
@@ -198,7 +202,7 @@ export async function resolveRemoteVersionCodeAsync(
    applicationId
  );

-  const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile);
+  const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile, vcsClient);
  let currentBuildVersion: string;
  if (remoteVersions?.buildVersion) {
    currentBuildVersion = remoteVersions.buildVersion;
@@ -228,7 +232,9 @@ export async function resolveRemoteVersionCodeAsync(
        applicationIdentifier: applicationId,
        storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
        buildVersion: currentBuildVersion,
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
+        runtimeVersion:
+          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
+          undefined,
      });
      spinner.succeed(`Initialized versionCode with ${chalk.bold(currentBuildVersion)}.`);
    } catch (err) {
@@ -250,7 +256,9 @@ export async function resolveRemoteVersionCodeAsync(
        applicationIdentifier: applicationId,
        storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
        buildVersion: String(nextBuildVersion),
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
+        runtimeVersion:
+          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
+          undefined,
      });
      spinner.succeed(
        `Incremented versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
@@ -1,5 +1,5 @@
 import { ArchiveSource, ArchiveSourceType, Job, Metadata, Platform } from '@expo/eas-build-job';
-import { CredentialsSource, EasJsonAccessor, EasJsonUtils, ResourceClass } from '@expo/eas-json';
+import { CredentialsSource } from '@expo/eas-json';
 import assert from 'assert';
 import chalk from 'chalk';
 import cliProgress from 'cli-progress';
@@ -7,36 +7,6 @@ import fs from 'fs-extra';
 import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';

-import { BuildEvent } from '../analytics/AnalyticsManager';
-import { withAnalyticsAsync } from '../analytics/common';
-import { getExpoWebsiteBaseUrl } from '../api';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { EasCommandError } from '../commandUtils/errors';
-import {
-  AppPlatform,
-  BuildFragment,
-  BuildParamsInput,
-  BuildPriority,
-  BuildResourceClass,
-  BuildStatus,
-  UploadSessionType,
-} from '../graphql/generated';
-import { BuildMutation, BuildResult } from '../graphql/mutations/BuildMutation';
-import { BuildQuery } from '../graphql/queries/BuildQuery';
-import Log, { learnMore, link } from '../log';
-import { Ora, ora } from '../ora';
-import {
-  appPlatformDisplayNames,
-  appPlatformEmojis,
-  requestedPlatformDisplayNames,
-} from '../platform';
-import { confirmAsync } from '../prompts';
-import { uploadFileAtPathToGCSAsync } from '../uploads';
-import { formatBytes } from '../utils/files';
-import { printJsonOnlyOutput } from '../utils/json';
-import { createProgressTracker } from '../utils/progress';
-import { sleepAsync } from '../utils/promise';
-import { getVcsClient } from '../vcs';
 import { BuildContext } from './context';
 import {
  EasBuildDownForMaintenanceError,
@@ -57,6 +27,33 @@ import { LocalBuildMode, runLocalBuildAsync } from './local';
 import { collectMetadataAsync } from './metadata';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
 import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
+import { BuildEvent } from '../analytics/AnalyticsManager';
+import { withAnalyticsAsync } from '../analytics/common';
+import { getExpoWebsiteBaseUrl } from '../api';
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+import { EasCommandError } from '../commandUtils/errors';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildParamsInput,
+  BuildPriority,
+  BuildStatus,
+  UploadSessionType,
+} from '../graphql/generated';
+import { BuildMutation, BuildResult } from '../graphql/mutations/BuildMutation';
+import { BuildQuery } from '../graphql/queries/BuildQuery';
+import Log, { learnMore, link } from '../log';
+import { Ora, ora } from '../ora';
+import {
+  appPlatformDisplayNames,
+  appPlatformEmojis,
+  requestedPlatformDisplayNames,
+} from '../platform';
+import { uploadFileAtPathToGCSAsync } from '../uploads';
+import { formatBytes } from '../utils/files';
+import { printJsonOnlyOutput } from '../utils/json';
+import { createProgressTracker } from '../utils/progress';
+import { sleepAsync } from '../utils/promise';

 export interface CredentialsResult<Credentials> {
  source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
@@ -100,7 +97,7 @@ function resolveBuildParamsInput<T extends Platform>(
 export async function prepareBuildRequestForPlatformAsync<
  TPlatform extends Platform,
  Credentials,
-  TJob extends Job
+  TJob extends Job,
 >(builder: Builder<TPlatform, Credentials, TJob>): Promise<BuildRequestSender> {
  const { ctx } = builder;
  const credentialsResult = await withAnalyticsAsync(
@@ -125,9 +122,10 @@ export async function prepareBuildRequestForPlatformAsync<
    }
  );

-  if (await getVcsClient().isCommitRequiredAsync()) {
+  if (await ctx.vcsClient.isCommitRequiredAsync()) {
    Log.addNewLineIfNone();
    await reviewAndCommitChangesAsync(
+      ctx.vcsClient,
      `[EAS Build] Run EAS Build for ${requestedPlatformDisplayNames[ctx.platform as Platform]}`,
      { nonInteractive: ctx.nonInteractive }
    );
@@ -137,7 +135,7 @@ export async function prepareBuildRequestForPlatformAsync<
  if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
    projectArchive = {
      type: ArchiveSourceType.PATH,
-      path: (await makeProjectTarballAsync()).path,
+      path: (await makeProjectTarballAsync(ctx.vcsClient)).path,
    };
  } else if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
    projectArchive = {
@@ -245,7 +243,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
            'https://expo.fyi/eas-build-archive'
          )}`
        );
-        const projectTarball = await makeProjectTarballAsync();
+        const projectTarball = await makeProjectTarballAsync(ctx.vcsClient);

        if (projectTarball.size > 1024 * 1024 * 100) {
          Log.warn(
@@ -335,12 +333,7 @@ export type MaybeBuildFragment = BuildFragment | null;

 export async function waitForBuildEndAsync(
  graphqlClient: ExpoGraphqlClient,
-  {
-    buildIds,
-    accountName,
-    projectDir,
-    nonInteractive,
-  }: { buildIds: string[]; accountName: string; projectDir: string; nonInteractive: boolean },
+  { buildIds, accountName }: { buildIds: string[]; accountName: string },
  { intervalSec = 10 } = {}
 ): Promise<MaybeBuildFragment[]> {
  let spinner;
@@ -357,10 +350,7 @@ export async function waitForBuildEndAsync(
    const builds = await getBuildsSafelyAsync(graphqlClient, buildIds);
    const { refetch } =
      builds.length === 1
-        ? await handleSingleBuildProgressAsync(
-            { build: builds[0], accountName, projectDir, nonInteractive },
-            { spinner }
-          )
+        ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
        : await handleMultipleBuildsProgressAsync({ builds }, { spinner, originalSpinnerText });
    if (!refetch) {
      return builds;
@@ -398,13 +388,9 @@ async function handleSingleBuildProgressAsync(
  {
    build,
    accountName,
-    projectDir,
-    nonInteractive,
  }: {
    build: MaybeBuildFragment;
    accountName: string;
-    projectDir: string;
-    nonInteractive: boolean;
  },
  { spinner }: { spinner: Ora }
 ): Promise<BuildProgressResult> {
@@ -458,54 +444,6 @@ async function handleSingleBuildProgressAsync(
          );
        }

-        if (
-          build.platform === AppPlatform.Ios &&
-          [BuildResourceClass.IosIntelLarge, BuildResourceClass.IosIntelMedium].includes(
-            build.resourceClass
-          )
-        ) {
-          let askToSwitchToM1 = false;
-          if (
-            build.priority === BuildPriority.High &&
-            build.estimatedWaitTimeLeftSeconds >= /* 10 minutes */ 10 * 60
-          ) {
-            Log.newLine();
-            Log.warn(
-              `Warning: Priority queue wait time for legacy iOS Intel workers is longer than usual (more than 10 minutes).`
-            );
-            Log.warn(`We recommend switching to the new, faster M1 workers for iOS builds.`);
-            Log.warn(
-              learnMore('https://blog.expo.dev/m1-workers-on-eas-build-dcaa2c1333ad', {
-                learnMoreMessage: 'Learn more on switching to M1 workers.',
-              })
-            );
-            askToSwitchToM1 = true;
-          } else if (
-            build.priority !== BuildPriority.High &&
-            build.estimatedWaitTimeLeftSeconds >= /* 120 minutes */ 120 * 60
-          ) {
-            Log.newLine();
-            Log.warn(
-              `Warning: Free tier queue wait time for legacy iOS Intel workers is longer than usual.`
-            );
-            Log.warn(`We recommend switching to the new, faster M1 workers for iOS builds.`);
-            Log.warn(
-              learnMore('https://blog.expo.dev/m1-workers-on-eas-build-dcaa2c1333ad', {
-                learnMoreMessage: 'Learn more on switching to M1 workers.',
-              })
-            );
-            askToSwitchToM1 = true;
-          }
-          if (!nonInteractive && askToSwitchToM1) {
-            const shouldSwitchToM1 = await confirmAsync({
-              message: `Switch iOS builds to M1 workers (modifies build profiles in eas.json)?`,
-            });
-            if (shouldSwitchToM1) {
-              await updateIosBuildProfilesToUseM1WorkersAsync(projectDir);
-            }
-          }
-        }
-
        Log.newLine();
        Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
        queueProgressBar.start(
@@ -654,21 +592,3 @@ function formatAccountSubscriptionsUrl(accountName: string): string {
    getExpoWebsiteBaseUrl()
  ).toString();
 }
-
-async function updateIosBuildProfilesToUseM1WorkersAsync(projectDir: string): Promise<void> {
-  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-  await easJsonAccessor.readRawJsonAsync();
-
-  const profileNames = await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
-  easJsonAccessor.patch(easJsonRawObject => {
-    for (const profileName of profileNames) {
-      easJsonRawObject.build[profileName].ios = {
-        ...easJsonRawObject.build[profileName].ios,
-        resourceClass: ResourceClass.M_MEDIUM,
-      };
-    }
-    return easJsonRawObject;
-  });
-  await easJsonAccessor.writeAsync();
-  Log.withTick('Updated eas.json. Your next builds will run on M1 workers.');
-}
@@ -1,17 +1,16 @@
-import { Platform, Workflow } from '@expo/eas-build-job';
 import { EasJson, EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';

-import Log, { learnMore } from '../log';
-import { resolveWorkflowAsync } from '../project/workflow';
-import { easCliVersion } from '../utils/easCli';
-import { getVcsClient } from '../vcs';
 import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
+import Log, { learnMore } from '../log';
+import { easCliVersion } from '../utils/easCli';
+import { Client } from '../vcs/vcs';

 interface ConfigureParams {
  projectDir: string;
  nonInteractive: boolean;
+  vcsClient: Client;
 }

 export async function easJsonExistsAsync(projectDir: string): Promise<boolean> {
@@ -36,20 +35,24 @@ export async function ensureProjectConfiguredAsync(
  return true;
 }

-async function configureAsync({ projectDir, nonInteractive }: ConfigureParams): Promise<void> {
-  await maybeBailOnRepoStatusAsync();
+async function configureAsync({
+  projectDir,
+  nonInteractive,
+  vcsClient,
+}: ConfigureParams): Promise<void> {
+  await maybeBailOnRepoStatusAsync(vcsClient);

-  await createEasJsonAsync(projectDir);
+  await createEasJsonAsync(projectDir, vcsClient);

-  if (await getVcsClient().isCommitRequiredAsync()) {
+  if (await vcsClient.isCommitRequiredAsync()) {
    Log.newLine();
-    await reviewAndCommitChangesAsync('Configure EAS Build', {
+    await reviewAndCommitChangesAsync(vcsClient, 'Configure EAS Build', {
      nonInteractive,
    });
  }
 }

-const EAS_JSON_MANAGED_DEFAULT: EasJson = {
+const EAS_JSON_DEFAULT: EasJson = {
  cli: {
    version: `>= ${easCliVersion}`,
  },
@@ -68,44 +71,11 @@ const EAS_JSON_MANAGED_DEFAULT: EasJson = {
  },
 };

-const EAS_JSON_BARE_DEFAULT: EasJson = {
-  cli: {
-    version: `>= ${easCliVersion}`,
-  },
-  build: {
-    development: {
-      distribution: 'internal',
-      android: {
-        gradleCommand: ':app:assembleDebug',
-      },
-      ios: {
-        buildConfiguration: 'Debug',
-      },
-    },
-    preview: {
-      distribution: 'internal',
-    },
-    production: {},
-  },
-  submit: {
-    production: {},
-  },
-};
-
-async function createEasJsonAsync(projectDir: string): Promise<void> {
+async function createEasJsonAsync(projectDir: string, vcsClient: Client): Promise<void> {
  const easJsonPath = EasJsonAccessor.formatEasJsonPath(projectDir);

-  const hasAndroidNativeProject =
-    (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
-  const hasIosNativeProject =
-    (await resolveWorkflowAsync(projectDir, Platform.IOS)) === Workflow.GENERIC;
-  const easJson =
-    hasAndroidNativeProject || hasIosNativeProject
-      ? EAS_JSON_BARE_DEFAULT
-      : EAS_JSON_MANAGED_DEFAULT;
-
-  await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
-  await getVcsClient().trackFileAsync(easJsonPath);
+  await fs.writeFile(easJsonPath, `${JSON.stringify(EAS_JSON_DEFAULT, null, 2)}\n`);
+  await vcsClient.trackFileAsync(easJsonPath);
  Log.withTick(
    `Generated ${chalk.bold('eas.json')}. ${learnMore(
      'https://docs.expo.dev/build-reference/eas-json/'
@@ -1,7 +1,9 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, EasJson } from '@expo/eas-json';
+import { NodePackageManager } from '@expo/package-manager';

+import { LocalBuildOptions } from './local';
 import { Analytics, AnalyticsEventProperties } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
@@ -11,7 +13,7 @@ import { GradleBuildContext } from '../project/android/gradle';
 import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
-import { LocalBuildOptions } from './local';
+import { Client } from '../vcs/vcs';

 export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;

@@ -56,4 +58,6 @@ export interface BuildContext<T extends Platform> {
  android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
  ios: T extends Platform.IOS ? IosBuildContext : undefined;
  developmentClient: boolean;
+  requiredPackageManager: NodePackageManager['name'] | null;
+  vcsClient: Client;
 }
@@ -1,10 +1,16 @@
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile, EasJson, ResourceClass } from '@expo/eas-json';
 import JsonFile from '@expo/json-file';
+import { resolvePackageManager } from '@expo/package-manager';
 import getenv from 'getenv';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';

+import { createAndroidContextAsync } from './android/build';
+import { BuildContext, CommonContext } from './context';
+import { createIosContextAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
+import { resolveBuildResourceClassAsync } from './utils/resourceClass';
 import { Analytics, AnalyticsEventProperties, BuildEvent } from '../analytics/AnalyticsManager';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
@@ -13,11 +19,7 @@ import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { Actor } from '../user/User';
-import { createAndroidContextAsync } from './android/build';
-import { BuildContext, CommonContext } from './context';
-import { createIosContextAsync } from './ios/build';
-import { LocalBuildOptions } from './local';
-import { resolveBuildResourceClassAsync } from './utils/resourceClass';
+import { Client } from '../vcs/vcs';

 export async function createBuildContextAsync<T extends Platform>({
  buildProfileName,
@@ -34,6 +36,7 @@ export async function createBuildContextAsync<T extends Platform>({
  actor,
  graphqlClient,
  analytics,
+  vcsClient,
  getDynamicPrivateProjectConfigAsync,
  customBuildConfigMetadata,
 }: {
@@ -51,13 +54,14 @@ export async function createBuildContextAsync<T extends Platform>({
  actor: Actor;
  graphqlClient: ExpoGraphqlClient;
  analytics: Analytics;
+  vcsClient: Client;
  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
  customBuildConfigMetadata?: CustomBuildConfigMetadata;
 }): Promise<BuildContext<T>> {
  const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
  const projectName = exp.slug;
  const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-  const workflow = await resolveWorkflowAsync(projectDir, platform);
+  const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient);
  const accountId = account.id;
  const runFromCI = getenv.boolish('CI', false);
  const developmentClient =
@@ -67,6 +71,8 @@ export async function createBuildContextAsync<T extends Platform>({
      : (buildProfile as BuildProfile<Platform.IOS>)?.buildConfiguration === 'Debug') ??
    false;

+  const requiredPackageManager = resolvePackageManager(projectDir);
+
  const credentialsCtx = new CredentialsContext({
    projectInfo: { exp, projectId },
    nonInteractive,
@@ -76,6 +82,7 @@ export async function createBuildContextAsync<T extends Platform>({
    analytics,
    env: buildProfile.env,
    easJsonCliConfig,
+    vcsClient,
  });

  const devClientProperties = getDevClientEventProperties({
@@ -122,11 +129,13 @@ export async function createBuildContextAsync<T extends Platform>({
    user: actor,
    graphqlClient,
    analytics,
+    vcsClient,
    workflow,
    message,
    runFromCI,
    customBuildConfigMetadata,
    developmentClient,
+    requiredPackageManager,
  };
  if (platform === Platform.ANDROID) {
    const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -1,30 +1,27 @@
 import {
  ArchiveSource,
  ArchiveSourceType,
+  BuildMode,
  BuildTrigger,
  Metadata,
  Workflow,
 } from '@expo/eas-build-job';
+import assert from 'assert';

 import {
  BuildCredentialsSource,
  BuildIosEnterpriseProvisioning,
  BuildMetadataInput,
-  BuildMode,
  BuildWorkflow,
  DistributionType,
+  BuildMode as GraphQLBuildMode,
  BuildTrigger as GraphQLBuildTrigger,
  ProjectArchiveSourceInput,
  ProjectArchiveSourceType,
 } from '../graphql/generated';

 export function transformProjectArchive(archiveSource: ArchiveSource): ProjectArchiveSourceInput {
-  if (archiveSource.type === ArchiveSourceType.S3) {
-    return {
-      type: ProjectArchiveSourceType.S3,
-      bucketKey: archiveSource.bucketKey,
-    };
-  } else if (archiveSource.type === ArchiveSourceType.GCS) {
+  if (archiveSource.type === ArchiveSourceType.GCS) {
    return {
      type: ProjectArchiveSourceType.Gcs,
      bucketKey: archiveSource.bucketKey,
@@ -42,7 +39,6 @@ export function transformProjectArchive(archiveSource: ArchiveSource): ProjectAr
 export function transformMetadata(metadata: Metadata): BuildMetadataInput {
  return {
    ...metadata,
-    buildMode: metadata.buildMode && transformBuildMode(metadata.buildMode),
    credentialsSource:
      metadata.credentialsSource && transformCredentialsSource(metadata.credentialsSource),
    distribution: metadata.distribution && transformDistribution(metadata.distribution),
@@ -91,17 +87,16 @@ export function transformIosEnterpriseProvisioning(
  }
 }

-// TODO: check what in metadata
-export function transformBuildMode(buildMode: string): BuildMode {
-  if (buildMode === 'build') {
-    return BuildMode.Build;
-  } else if (buildMode === 'resign') {
-    return BuildMode.Resign;
-  } else if (buildMode === 'custom') {
-    return BuildMode.Custom;
-  } else {
-    throw new Error(`Unsupported build mode: ${buildMode}`);
-  }
+const buildModeToGraphQLBuildMode: Record<BuildMode, GraphQLBuildMode> = {
+  [BuildMode.BUILD]: GraphQLBuildMode.Build,
+  [BuildMode.CUSTOM]: GraphQLBuildMode.Custom,
+  [BuildMode.RESIGN]: GraphQLBuildMode.Resign,
+};
+
+export function transformBuildMode(buildMode: BuildMode): GraphQLBuildMode {
+  const graphQLBuildMode = buildModeToGraphQLBuildMode[buildMode];
+  assert(graphQLBuildMode, `Unsupported build mode: ${buildMode}`);
+  return graphQLBuildMode;
 }

 export function transformBuildTrigger(buildTrigger: BuildTrigger): GraphQLBuildTrigger {
@@ -6,6 +6,7 @@ import os from 'os';
 import type { XCBuildConfiguration } from 'xcode';

 import { readPlistAsync } from '../../../utils/plist';
+import { getVcsClient } from '../../../vcs';
 import {
  BumpStrategy,
  bumpVersionAsync,
@@ -18,6 +19,8 @@ import {

 jest.mock('fs');

+const vcsClient = getVcsClient();
+
 const getXCBuildConfigurationFromPbxproj = jest.spyOn(
  IOSConfig.Target,
  'getXCBuildConfigurationFromPbxproj'
@@ -59,7 +62,7 @@ describe(evaluateTemplateString, () => {
 // bare workflow
 describe(bumpVersionAsync, () => {
  beforeEach(() => {
-    getPbxproj.mockImplementation(() => ({} as any));
+    getPbxproj.mockImplementation((): any => {});
  });
  afterEach(() => {
    getXCBuildConfigurationFromPbxproj.mockReset();
@@ -73,7 +76,7 @@ describe(bumpVersionAsync, () => {
          buildSettings: {
            INFOPLIST_FILE: 'myproject/Info.plist',
          },
-        } as XCBuildConfiguration)
+        }) as XCBuildConfiguration
    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
@@ -109,7 +112,7 @@ describe(bumpVersionAsync, () => {
          buildSettings: {
            INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
          },
-        } as XCBuildConfiguration)
+        }) as XCBuildConfiguration
    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
@@ -144,7 +147,7 @@ describe(bumpVersionAsync, () => {
          buildSettings: {
            INFOPLIST_FILE: 'myproject/Info.plist',
          },
-        } as XCBuildConfiguration)
+        }) as XCBuildConfiguration
    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.APP_VERSION,
@@ -179,7 +182,7 @@ describe(bumpVersionAsync, () => {
          buildSettings: {
            INFOPLIST_FILE: 'myproject/Info.plist',
          },
-        } as XCBuildConfiguration)
+        }) as XCBuildConfiguration
    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.NOOP,
@@ -262,7 +265,7 @@ describe(readBuildNumberAsync, () => {
  describe('bare project', () => {
    it('reads the build number from native code', async () => {
      const exp = initBareWorkflowProject();
-      const buildNumber = await readBuildNumberAsync('/app', exp, {});
+      const buildNumber = await readBuildNumberAsync('/app', exp, {}, vcsClient);
      expect(buildNumber).toBe('1');
    });
  });
@@ -270,7 +273,7 @@ describe(readBuildNumberAsync, () => {
  describe('managed project', () => {
    it('reads the build number from expo config', async () => {
      const exp = initManagedProject();
-      const buildNumber = await readBuildNumberAsync('/app', exp, {});
+      const buildNumber = await readBuildNumberAsync('/app', exp, {}, vcsClient);
      expect(buildNumber).toBe('1');
    });
  });
@@ -280,16 +283,21 @@ describe(readShortVersionAsync, () => {
  describe('bare project', () => {
    it('reads the short version from native code', async () => {
      const exp = initBareWorkflowProject();
-      const appVersion = await readShortVersionAsync('/app', exp, {});
+      const appVersion = await readShortVersionAsync('/app', exp, {}, vcsClient);
      expect(appVersion).toBe('1.0.0');
    });
    it('evaluates interpolated build number', async () => {
      const exp = initBareWorkflowProject({
        appVersion: '$(CURRENT_PROJECT_VERSION)',
      });
-      const buildNumber = await readShortVersionAsync('/app', exp, {
-        CURRENT_PROJECT_VERSION: '1.0.0',
-      });
+      const buildNumber = await readShortVersionAsync(
+        '/app',
+        exp,
+        {
+          CURRENT_PROJECT_VERSION: '1.0.0',
+        },
+        vcsClient
+      );
      expect(buildNumber).toBe('1.0.0');
    });

@@ -299,9 +307,14 @@ describe(readShortVersionAsync, () => {
      });

      await expect(
-        readShortVersionAsync('/app', exp, {
-          CURRENT_PROJECT_VERSION: '0.0.7.1.028',
-        })
+        readShortVersionAsync(
+          '/app',
+          exp,
+          {
+            CURRENT_PROJECT_VERSION: '0.0.7.1.028',
+          },
+          vcsClient
+        )
      ).rejects.toThrowError(
        'CFBundleShortVersionString (version field in app.json/app.config.js) must be a period-separated list of three non-negative integers. Current value: 0.0.7.1.028'
      );
@@ -311,7 +324,7 @@ describe(readShortVersionAsync, () => {
  describe('managed project', () => {
    it('reads the version from app config', async () => {
      const exp = initBareWorkflowProject();
-      const appVersion = await readShortVersionAsync('/app', exp, {});
+      const appVersion = await readShortVersionAsync('/app', exp, {}, vcsClient);
      expect(appVersion).toBe('1.0.0');
    });
  });
@@ -1,6 +1,11 @@
 import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import { AppVersionSource } from '@expo/eas-json';

+import { ensureIosCredentialsAsync } from './credentials';
+import { transformJob } from './graphql';
+import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
+import { resolveRemoteBuildNumberAsync } from './version';
 import { IosCredentials } from '../../credentials/ios/types';
 import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
@@ -15,11 +20,6 @@ import {
  checkNodeEnvVariable,
  validatePNGsForManagedProjectAsync,
 } from '../validate';
-import { ensureIosCredentialsAsync } from './credentials';
-import { transformJob } from './graphql';
-import { prepareJobAsync } from './prepareJob';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
-import { resolveRemoteBuildNumberAsync } from './version';

 export async function createIosContextAsync(
  ctx: CommonContext<Platform.IOS>
@@ -39,6 +39,7 @@ export async function createIosContextAsync(
      projectDir: ctx.projectDir,
      nonInteractive: ctx.nonInteractive,
      exp: ctx.exp,
+      vcsClient: ctx.vcsClient,
    },
    buildProfile
  );
@@ -47,6 +48,7 @@ export async function createIosContextAsync(
    exp: ctx.exp,
    xcodeBuildContext,
    env: buildProfile.env,
+    vcsClient: ctx.vcsClient,
  });
  const applicationTarget = findApplicationTarget(targets);
  const buildNumberOverride =
@@ -57,6 +59,7 @@ export async function createIosContextAsync(
          exp: ctx.exp,
          applicationTarget,
          buildProfile,
+          vcsClient: ctx.vcsClient,
        })
      : undefined;
  return {
@@ -77,7 +80,7 @@ export async function prepareIosBuildAsync(
      return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
    },
    syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync(ctx.graphqlClient, {
+      await syncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
        targets: ctx.ios.targets,
@@ -85,7 +88,7 @@ export async function prepareIosBuildAsync(
          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
            ? false
            : ctx.buildProfile.autoIncrement,
-        projectId: ctx.projectId,
+        vcsClient: ctx.vcsClient,
      });
    },
    prepareJobAsync: async (
@@ -16,7 +16,6 @@ import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
 import { IosJobSecretsInput } from '../../graphql/generated';
 import { getCustomBuildConfigPath } from '../../project/customBuildConfig';
 import { getUsername } from '../../project/projectUtils';
-import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';

 interface JobData {
@@ -37,7 +36,7 @@ export async function prepareJobAsync(
  const username = getUsername(ctx.exp, ctx.user);
  const buildProfile: BuildProfile<Platform.IOS> = ctx.buildProfile;
  const projectRootDirectory =
-    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
+    slash(path.relative(await ctx.vcsClient.getRootPathAsync(), ctx.projectDir)) || '.';
  const buildCredentials: Ios.BuildSecrets['buildCredentials'] = {};
  if (jobData.credentials) {
    const targetNames = Object.keys(jobData.credentials);
@@ -2,35 +2,32 @@ import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { IosVersionAutoIncrement } from '@expo/eas-json';

-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 import { Target } from '../../credentials/ios/types';
 import { isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
+import { Client } from '../../vcs/vcs';

-export async function syncProjectConfigurationAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectDir,
-    exp,
-    targets,
-    localAutoIncrement,
-    projectId,
-  }: {
-    projectDir: string;
-    exp: ExpoConfig;
-    targets: Target[];
-    localAutoIncrement?: IosVersionAutoIncrement;
-    projectId: string;
-  }
-): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+export async function syncProjectConfigurationAsync({
+  projectDir,
+  exp,
+  targets,
+  localAutoIncrement,
+  vcsClient,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  targets: Target[];
+  localAutoIncrement?: IosVersionAutoIncrement;
+  vcsClient: Client;
+}): Promise<void> {
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
+      await syncUpdatesConfigurationAsync(vcsClient, projectDir, exp);
    }
    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
  } else {
@@ -19,6 +19,7 @@ import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import uniqBy from '../../utils/expodash/uniqBy';
 import { readPlistAsync, writePlistAsync } from '../../utils/plist';
+import { Client } from '../../vcs/vcs';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';

@@ -110,9 +111,10 @@ function validateShortVersion(shortVersion: string | undefined): void {
 export async function readShortVersionAsync(
  projectDir: string,
  exp: ExpoConfig,
-  buildSettings: XCBuildConfiguration['buildSettings']
+  buildSettings: XCBuildConfiguration['buildSettings'],
+  vcsClient: Client
 ): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
  if (workflow === Workflow.GENERIC) {
    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);

@@ -131,9 +133,10 @@ export async function readShortVersionAsync(
 export async function readBuildNumberAsync(
  projectDir: string,
  exp: ExpoConfig,
-  buildSettings: XCBuildConfiguration['buildSettings']
+  buildSettings: XCBuildConfiguration['buildSettings'],
+  vcsClient: Client
 ): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
  if (workflow === Workflow.GENERIC) {
    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
    return (
@@ -147,7 +150,8 @@ export async function readBuildNumberAsync(
 export async function maybeResolveVersionsAsync(
  projectDir: string,
  exp: ExpoConfig,
-  targets: Target[]
+  targets: Target[],
+  vcsClient: Client
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
  const applicationTarget = findApplicationTarget(targets);
  try {
@@ -155,12 +159,14 @@ export async function maybeResolveVersionsAsync(
      appBuildVersion: await readBuildNumberAsync(
        projectDir,
        exp,
-        applicationTarget.buildSettings ?? {}
+        applicationTarget.buildSettings ?? {},
+        vcsClient
      ),
      appVersion: await readShortVersionAsync(
        projectDir,
        exp,
-        applicationTarget.buildSettings ?? {}
+        applicationTarget.buildSettings ?? {},
+        vcsClient
      ),
    };
  } catch (err: any) {
@@ -278,12 +284,14 @@ export async function resolveRemoteBuildNumberAsync(
    exp,
    applicationTarget,
    buildProfile,
+    vcsClient,
  }: {
    projectDir: string;
    projectId: string;
    exp: ExpoConfig;
    applicationTarget: Target;
    buildProfile: BuildProfile<Platform.IOS>;
+    vcsClient: Client;
  }
 ): Promise<string> {
  const remoteVersions = await AppVersionQuery.latestVersionAsync(
@@ -296,12 +304,14 @@ export async function resolveRemoteBuildNumberAsync(
  const localBuildNumber = await readBuildNumberAsync(
    projectDir,
    exp,
-    applicationTarget.buildSettings ?? {}
+    applicationTarget.buildSettings ?? {},
+    vcsClient
  );
  const localShortVersion = await readShortVersionAsync(
    projectDir,
    exp,
-    applicationTarget.buildSettings ?? {}
+    applicationTarget.buildSettings ?? {},
+    vcsClient
  );
  let currentBuildVersion: string;
  if (remoteVersions?.buildVersion) {
@@ -332,7 +342,9 @@ export async function resolveRemoteBuildNumberAsync(
        applicationIdentifier: applicationTarget.bundleIdentifier,
        storeVersion: localShortVersion ?? '1.0.0',
        buildVersion: currentBuildVersion,
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
+        runtimeVersion:
+          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.IOS)) ??
+          undefined,
      });
      spinner.succeed(`Initialized buildNumber with ${chalk.bold(currentBuildVersion)}.`);
    } catch (err) {
@@ -354,7 +366,9 @@ export async function resolveRemoteBuildNumberAsync(
        applicationIdentifier: applicationTarget.bundleIdentifier,
        storeVersion: localShortVersion ?? '1.0.0',
        buildVersion: nextBuildVersion,
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
+        runtimeVersion:
+          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.IOS)) ??
+          undefined,
      });
      spinner.succeed(
        `Incremented buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
@@ -6,7 +6,7 @@ import semver from 'semver';
 import { ora } from '../ora';

 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '1.0.44';
+const PLUGIN_PACKAGE_VERSION = '1.0.60';

 export enum LocalBuildMode {
  /**
@@ -1,11 +1,19 @@
 import { Updates } from '@expo/config-plugins';
-import { BuildMode, Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
+import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
 import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';

+import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
+import { BuildContext } from './context';
+import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
+import { LocalBuildMode } from './local';
 import Log from '../log';
-import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
+import {
+  getUsername,
+  isClassicUpdatesSupportedAsync,
+  isExpoUpdatesInstalled,
+} from '../project/projectUtils';
 import {
  readChannelSafelyAsync as readAndroidChannelSafelyAsync,
  readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
@@ -15,16 +23,10 @@ import {
  readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
 } from '../update/ios/UpdatesModule';
 import { easCliVersion } from '../utils/easCli';
-import { getVcsClient } from '../vcs';
-import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
-import { BuildContext } from './context';
-import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
-import { LocalBuildMode } from './local';

 export async function collectMetadataAsync<T extends Platform>(
  ctx: BuildContext<T>
 ): Promise<Metadata> {
-  const vcsClient = getVcsClient();
  const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
  const distribution =
    ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
@@ -37,21 +39,23 @@ export async function collectMetadataAsync<T extends Platform>(
    workflow: ctx.workflow,
    credentialsSource: ctx.buildProfile.credentialsSource,
    sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: Updates.getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
+    runtimeVersion:
+      (await Updates.getRuntimeVersionNullableAsync(ctx.projectDir, ctx.exp, ctx.platform)) ??
+      undefined,
    reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
    ...channelOrReleaseChannel,
    distribution,
    appName: ctx.exp.name,
    appIdentifier: resolveAppIdentifier(ctx),
    buildProfile: ctx.buildProfileName,
-    gitCommitHash: await vcsClient.getCommitHashAsync(),
+    gitCommitHash: await ctx.vcsClient.getCommitHashAsync(),
    gitCommitMessage: truncateGitCommitMessage(
-      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
+      (await ctx.vcsClient.getLastCommitMessageAsync()) ?? undefined
    ),
    isGitWorkingTreeDirty:
      ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL
        ? false
-        : await vcsClient.hasUncommittedChangesAsync(),
+        : await ctx.vcsClient.hasUncommittedChangesAsync(),
    username: getUsername(ctx.exp, ctx.user),
    message: ctx.message,
    ...(ctx.platform === Platform.IOS && {
@@ -61,9 +65,11 @@ export async function collectMetadataAsync<T extends Platform>(
    }),
    runWithNoWaitFlag: ctx.noWait,
    runFromCI: ctx.runFromCI,
-    buildMode: ctx.buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
    customWorkflowName: ctx.customBuildConfigMetadata?.workflowName,
    developmentClient: ctx.developmentClient,
+    requiredPackageManager: ctx.requiredPackageManager ?? undefined,
+    selectedImage: ctx.buildProfile.image,
+    customNodeVersion: ctx.buildProfile.node,
  };
  return sanitizeMetadata(metadata);
 }
@@ -76,7 +82,8 @@ async function maybeResolveVersionsAsync<T extends Platform>(
    const resolvedVersion = await maybeResolveIosVersionsAsync(
      ctx.projectDir,
      ctx.exp,
-      iosContext.ios.targets
+      iosContext.ios.targets,
+      ctx.vcsClient
    );
    if (iosContext.ios.buildNumberOverride) {
      return {
@@ -90,7 +97,8 @@ async function maybeResolveVersionsAsync<T extends Platform>(
    const resolvedVersion = await maybeResolveAndroidVersionsAsync(
      ctx.projectDir,
      ctx.exp,
-      androidCtx.buildProfile
+      androidCtx.buildProfile,
+      ctx.vcsClient
    );
    if (androidCtx.android.versionCodeOverride) {
      return {
@@ -121,13 +129,19 @@ async function resolveChannelOrReleaseChannelAsync<T extends Platform>(
  if (ctx.buildProfile.channel) {
    return { channel: ctx.buildProfile.channel };
  }
-  if (ctx.buildProfile.releaseChannel) {
-    return { releaseChannel: ctx.buildProfile.releaseChannel };
-  }
  const channel = await getNativeChannelAsync(ctx);
  if (channel) {
    return { channel };
  }
+
+  if (!(await isClassicUpdatesSupportedAsync(ctx.projectDir))) {
+    return null;
+  }
+
+  if (ctx.buildProfile.releaseChannel) {
+    return { releaseChannel: ctx.buildProfile.releaseChannel };
+  }
+
  const releaseChannel = await getNativeReleaseChannelAsync(ctx);
  return { releaseChannel };
 }
@@ -1,5 +1,6 @@
 import chalk from 'chalk';

+import { formatGraphQLBuild } from './utils/formatBuild';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { AppPlatform, BuildFilter, BuildFragment } from '../graphql/generated';
@@ -11,7 +12,6 @@ import {
  paginatedQueryWithConfirmPromptAsync,
  paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
-import { formatGraphQLBuild } from './utils/formatBuild';

 export const BUILDS_LIMIT = 50;

@@ -13,6 +13,16 @@ import assert from 'assert';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';

+import { prepareAndroidBuildAsync } from './android/build';
+import { BuildRequestSender, MaybeBuildFragment, waitForBuildEndAsync } from './build';
+import { ensureProjectConfiguredAsync } from './configure';
+import { BuildContext } from './context';
+import { createBuildContextAsync } from './createContext';
+import { prepareIosBuildAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
+import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
+import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
+import { ensureRepoIsCleanAsync } from './utils/repository';
 import { Analytics } from '../analytics/AnalyticsManager';
 import { createAndLinkChannelAsync, doesChannelExistAsync } from '../channel/queries';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
@@ -66,17 +76,7 @@ import { downloadAndMaybeExtractAppAsync } from '../utils/download';
 import { truthy } from '../utils/expodash/filter';
 import { printJsonOnlyOutput } from '../utils/json';
 import { ProfileData, getProfilesAsync } from '../utils/profiles';
-import { getVcsClient } from '../vcs';
-import { prepareAndroidBuildAsync } from './android/build';
-import { BuildRequestSender, MaybeBuildFragment, waitForBuildEndAsync } from './build';
-import { ensureProjectConfiguredAsync } from './configure';
-import { BuildContext } from './context';
-import { createBuildContextAsync } from './createContext';
-import { prepareIosBuildAsync } from './ios/build';
-import { LocalBuildOptions } from './local';
-import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
-import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
-import { ensureRepoIsCleanAsync } from './utils/repository';
+import { Client } from '../vcs/vcs';

 let metroConfigValidated = false;
 let sdkVersionChecked = false;
@@ -98,17 +98,19 @@ export interface BuildFlags {
 export async function runBuildAndSubmitAsync(
  graphqlClient: ExpoGraphqlClient,
  analytics: Analytics,
+  vcsClient: Client,
  projectDir: string,
  flags: BuildFlags,
  actor: Actor,
  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn
 ): Promise<void> {
-  await getVcsClient().ensureRepoExistsAsync();
-  await ensureRepoIsCleanAsync(flags.nonInteractive);
+  await vcsClient.ensureRepoExistsAsync();
+  await ensureRepoIsCleanAsync(vcsClient, flags.nonInteractive);

  await ensureProjectConfiguredAsync({
    projectDir,
    nonInteractive: flags.nonInteractive,
+    vcsClient,
  });
  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
  const easJsonCliConfig: EasJson['cli'] =
@@ -134,13 +136,18 @@ export async function runBuildAndSubmitAsync(
    projectDir,
    nonInteractive: flags.nonInteractive,
    buildProfiles,
+    vcsClient,
  });

  const customBuildConfigMetadataByPlatform: { [p in AppPlatform]?: CustomBuildConfigMetadata } =
    {};
  for (const buildProfile of buildProfiles) {
    validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
-    const maybeMetadata = await validateCustomBuildConfigAsync(projectDir, buildProfile.profile);
+    const maybeMetadata = await validateCustomBuildConfigAsync({
+      projectDir,
+      profile: buildProfile.profile,
+      vcsClient,
+    });
    if (maybeMetadata) {
      customBuildConfigMetadataByPlatform[toAppPlatform(buildProfile.platform)] = maybeMetadata;
    }
@@ -163,6 +170,7 @@ export async function runBuildAndSubmitAsync(
      actor,
      graphqlClient,
      analytics,
+      vcsClient,
      getDynamicPrivateProjectConfigAsync,
      customBuildConfigMetadata: customBuildConfigMetadataByPlatform[platform],
    });
@@ -227,8 +235,6 @@ export async function runBuildAndSubmitAsync(
  const builds = await waitForBuildEndAsync(graphqlClient, {
    buildIds: startedBuilds.map(({ build }) => build.id),
    accountName,
-    projectDir,
-    nonInteractive: flags.nonInteractive,
  });
  if (!flags.json) {
    printBuildResults(builds);
@@ -274,6 +280,7 @@ async function prepareAndStartBuildAsync({
  actor,
  graphqlClient,
  analytics,
+  vcsClient,
  getDynamicPrivateProjectConfigAsync,
  customBuildConfigMetadata,
 }: {
@@ -285,6 +292,7 @@ async function prepareAndStartBuildAsync({
  actor: Actor;
  graphqlClient: ExpoGraphqlClient;
  analytics: Analytics;
+  vcsClient: Client;
  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
  customBuildConfigMetadata?: CustomBuildConfigMetadata;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
@@ -303,6 +311,7 @@ async function prepareAndStartBuildAsync({
    actor,
    graphqlClient,
    analytics,
+    vcsClient,
    getDynamicPrivateProjectConfigAsync,
    customBuildConfigMetadata,
  });
@@ -325,10 +334,10 @@ async function prepareAndStartBuildAsync({
  );
  if (buildProfile.profile.channel) {
    await validateExpoUpdatesInstalledAsProjectDependencyAsync({
-      graphqlClient,
      exp: buildCtx.exp,
      projectId: buildCtx.projectId,
      projectDir,
+      vcsClient: buildCtx.vcsClient,
      sdkVersion: buildCtx.exp.sdkVersion,
      nonInteractive: flags.nonInteractive,
      buildProfile,
@@ -411,6 +420,7 @@ async function prepareAndStartSubmissionAsync({
    analytics: buildCtx.analytics,
    projectId: buildCtx.projectId,
    exp: buildCtx.exp,
+    vcsClient: buildCtx.vcsClient,
  });

  if (moreBuilds) {
@@ -468,17 +478,17 @@ async function maybeDownloadAndRunSimulatorBuildsAsync(

 async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
  exp,
-  graphqlClient,
  projectId,
  projectDir,
+  vcsClient,
  buildProfile,
  nonInteractive,
  sdkVersion,
 }: {
-  graphqlClient: ExpoGraphqlClient;
  exp: ExpoConfig;
  projectId: string;
  projectDir: string;
+  vcsClient: Client;
  buildProfile: ProfileData<'build'>;
  nonInteractive: boolean;
  sdkVersion?: string;
@@ -503,11 +513,12 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
      message: `Would you like to install the "expo-updates" package and configure EAS Update now?`,
    });
    if (installExpoUpdates) {
-      await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+      await ensureEASUpdateIsConfiguredAsync({
        exp,
        projectId,
        projectDir,
        platform: RequestedPlatform.All,
+        vcsClient,
      });
      Log.withTick('Installed expo-updates and configured EAS Update.');
      throw new Error('Command must be re-run to pick up new updates configuration.');
@@ -3,6 +3,7 @@ import { Errors } from '@oclif/core';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';

+import { reviewAndCommitChangesAsync } from './repository';
 import { toAppPlatform } from '../../graphql/types/AppPlatform';
 import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
@@ -10,15 +11,16 @@ import { resolveWorkflowAsync } from '../../project/workflow';
 import { confirmAsync } from '../../prompts';
 import { expoCommandAsync } from '../../utils/expoCli';
 import { ProfileData } from '../../utils/profiles';
-import { getVcsClient } from '../../vcs';
-import { reviewAndCommitChangesAsync } from './repository';
+import { Client } from '../../vcs/vcs';

 export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
  projectDir,
+  vcsClient,
  nonInteractive = false,
  buildProfiles = [],
 }: {
  projectDir: string;
+  vcsClient: Client;
  nonInteractive?: boolean;
  buildProfiles?: ProfileData<'build'>[];
 }): Promise<void> {
@@ -41,7 +43,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
  );

  const workflowPerPlatformList = await Promise.all(
-    platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform))
+    platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform, vcsClient))
  );

  Log.newLine();
@@ -55,6 +57,19 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
      'expo-dev-client'
    )} installed for your project.`
  );
+  if (nonInteractive) {
+    Log.error(`You'll need to install ${chalk.bold('expo-dev-client')} manually.`);
+    Log.error(
+      learnMore('https://docs.expo.dev/clients/installation/', {
+        learnMoreMessage: 'See installation instructions on how to do it.',
+        dim: false,
+      })
+    );
+    Errors.error(`Install ${chalk.bold('expo-dev-client')} manually and try again later.`, {
+      exit: 1,
+    });
+  }
+
  const areAllManaged = workflowPerPlatformList.every(i => i === Workflow.MANAGED);
  if (areAllManaged) {
    const install = await confirmAsync({
@@ -62,7 +77,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
      instructions: 'The command will abort unless you agree.',
    });
    if (install) {
-      await installExpoDevClientAsync(projectDir, { nonInteractive });
+      await installExpoDevClientAsync(projectDir, vcsClient, { nonInteractive });
    } else {
      Errors.error(`Install ${chalk.bold('expo-dev-client')} manually and come back later.`, {
        exit: 1,
@@ -100,6 +115,7 @@ async function isExpoDevClientInstalledAsync(projectDir: string): Promise<boolea

 async function installExpoDevClientAsync(
  projectDir: string,
+  vcsClient: Client,
  { nonInteractive }: { nonInteractive: boolean }
 ): Promise<void> {
  Log.newLine();
@@ -107,8 +123,8 @@ async function installExpoDevClientAsync(
  Log.newLine();
  await expoCommandAsync(projectDir, ['install', 'expo-dev-client']);
  Log.newLine();
-  if (await getVcsClient().isCommitRequiredAsync()) {
-    await reviewAndCommitChangesAsync('Install expo-dev-client', {
+  if (await vcsClient.isCommitRequiredAsync()) {
+    await reviewAndCommitChangesAsync(vcsClient, 'Install expo-dev-client', {
      nonInteractive,
    });
  }
@@ -1,5 +1,6 @@
 import chalk from 'chalk';

+import { getBuildLogsUrl } from './url';
 import {
  AppPlatform,
  BuildFragment,
@@ -7,7 +8,6 @@ import {
 } from '../../graphql/generated';
 import { appPlatformDisplayNames } from '../../platform';
 import formatFields from '../../utils/formatFields';
-import { getBuildLogsUrl } from './url';

 export function formatGraphQLBuild(build: BuildFragment): string {
  const actor = getActorName(build);
@@ -2,6 +2,7 @@ import assert from 'assert';
 import indentString from 'indent-string';
 import qrcodeTerminal from 'qrcode-terminal';

+import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 import {
  AppPlatform,
  BuildError,
@@ -13,7 +14,6 @@ import {
 } from '../../graphql/generated';
 import Log, { learnMore, link } from '../../log';
 import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
-import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';

 function terminalLinkFallback(url: string, text: string): string {
  return `${text} (${url})`;
@@ -10,10 +10,10 @@ import { confirmAsync, promptAsync } from '../../prompts';
 import { formatBytes } from '../../utils/files';
 import { getTmpDirectory } from '../../utils/paths';
 import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
-import { getVcsClient } from '../../vcs';
+import { Client } from '../../vcs/vcs';

-export async function maybeBailOnRepoStatusAsync(): Promise<void> {
-  if (!(await getVcsClient().isCommitRequiredAsync())) {
+export async function maybeBailOnRepoStatusAsync(vcsClient: Client): Promise<void> {
+  if (!(await vcsClient.isCommitRequiredAsync())) {
    return;
  }
  Log.addNewLineIfNone();
@@ -32,8 +32,11 @@ export async function maybeBailOnRepoStatusAsync(): Promise<void> {
  }
 }

-export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<void> {
-  if (!(await getVcsClient().isCommitRequiredAsync())) {
+export async function ensureRepoIsCleanAsync(
+  vcsClient: Client,
+  nonInteractive = false
+): Promise<void> {
+  if (!(await vcsClient.isCommitRequiredAsync())) {
    return;
  }
  Log.addNewLineIfNone();
@@ -50,19 +53,22 @@ export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<vo
    message: `Commit changes to git?`,
  });
  if (answer) {
-    await commitPromptAsync({ commitAllFiles: true });
+    await commitPromptAsync(vcsClient, { commitAllFiles: true });
  } else {
    throw new Error('Commit all changes. Aborting...');
  }
 }

-export async function commitPromptAsync({
-  initialCommitMessage,
-  commitAllFiles,
-}: {
-  initialCommitMessage?: string;
-  commitAllFiles?: boolean;
-} = {}): Promise<void> {
+export async function commitPromptAsync(
+  vcsClient: Client,
+  {
+    initialCommitMessage,
+    commitAllFiles,
+  }: {
+    initialCommitMessage?: string;
+    commitAllFiles?: boolean;
+  } = {}
+): Promise<void> {
  const { message } = await promptAsync({
    type: 'text',
    name: 'message',
@@ -70,14 +76,16 @@ export async function commitPromptAsync({
    initial: initialCommitMessage,
    validate: (input: string) => input !== '',
  });
-  await getVcsClient().commitAsync({
+  await vcsClient.commitAsync({
    commitAllFiles,
    commitMessage: message,
    nonInteractive: false,
  });
 }

-export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
+export async function makeProjectTarballAsync(
+  vcsClient: Client
+): Promise<{ path: string; size: number }> {
  const spinner = ora('Compressing project files');

  await fs.mkdirp(getTmpDirectory());
@@ -99,7 +107,7 @@ export async function makeProjectTarballAsync(): Promise<{ path: string; size: n
  startTimer(compressTimerLabel);

  try {
-    await getVcsClient().makeShallowCopyAsync(shallowClonePath);
+    await vcsClient.makeShallowCopyAsync(shallowClonePath);
    await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
      '.',
    ]);
@@ -133,11 +141,12 @@ enum ShouldCommitChanges {
 }

 export async function reviewAndCommitChangesAsync(
+  vcsClient: Client,
  initialCommitMessage: string,
  { nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
 ): Promise<void> {
  if (process.env.EAS_BUILD_AUTOCOMMIT) {
-    await getVcsClient().commitAsync({
+    await vcsClient.commitAsync({
      commitMessage: initialCommitMessage,
      commitAllFiles: false,
      nonInteractive,
@@ -171,11 +180,11 @@ export async function reviewAndCommitChangesAsync(
      "Aborting, run the command again once you're ready. Make sure to commit any changes you've made."
    );
  } else if (selected === ShouldCommitChanges.Yes) {
-    await commitPromptAsync({ initialCommitMessage });
+    await commitPromptAsync(vcsClient, { initialCommitMessage });
    Log.withTick('Committed changes.');
  } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await getVcsClient().showDiffAsync();
-    await reviewAndCommitChangesAsync(initialCommitMessage, {
+    await vcsClient.showDiffAsync();
+    await reviewAndCommitChangesAsync(vcsClient, initialCommitMessage, {
      nonInteractive,
      askedFirstTime: false,
    });
@@ -7,21 +7,13 @@ import Log, { link } from '../../log';

 type AndroidResourceClass = Exclude<
  ResourceClass,
-  | ResourceClass.M1_EXPERIMENTAL
-  | ResourceClass.M1_MEDIUM
-  | ResourceClass.M1_LARGE
-  | ResourceClass.INTEL_MEDIUM
-  | ResourceClass.M_MEDIUM
-  | ResourceClass.M_LARGE
+  ResourceClass.M1_MEDIUM | ResourceClass.M_MEDIUM | ResourceClass.M_LARGE
 >;

 const iosResourceClassToBuildResourceClassMapping: Record<ResourceClass, BuildResourceClass> = {
  [ResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
  [ResourceClass.LARGE]: BuildResourceClass.IosLarge,
-  [ResourceClass.M1_EXPERIMENTAL]: BuildResourceClass.IosMMedium,
  [ResourceClass.M1_MEDIUM]: BuildResourceClass.IosMMedium,
-  [ResourceClass.M1_LARGE]: BuildResourceClass.IosMLarge,
-  [ResourceClass.INTEL_MEDIUM]: BuildResourceClass.IosIntelMedium,
  [ResourceClass.MEDIUM]: BuildResourceClass.IosMedium,
  [ResourceClass.M_MEDIUM]: BuildResourceClass.IosMMedium,
  [ResourceClass.M_LARGE]: BuildResourceClass.IosMLarge,
@@ -57,15 +49,7 @@ export async function resolveBuildResourceClassAsync<T extends Platform>(
 }

 function resolveAndroidResourceClass(selectedResourceClass?: ResourceClass): BuildResourceClass {
-  if (
-    selectedResourceClass &&
-    [
-      ResourceClass.M1_EXPERIMENTAL,
-      ResourceClass.M1_MEDIUM,
-      ResourceClass.M1_LARGE,
-      ResourceClass.INTEL_MEDIUM,
-    ].includes(selectedResourceClass)
-  ) {
+  if (selectedResourceClass && ResourceClass.M1_MEDIUM === selectedResourceClass) {
    throw new Error(`Resource class ${selectedResourceClass} is only available for iOS builds`);
  }

@@ -88,7 +72,7 @@ function resolveIosResourceClass(
    );
  }

-  if ([ResourceClass.M1_EXPERIMENTAL, ResourceClass.M1_MEDIUM].includes(resourceClass)) {
+  if (ResourceClass.M1_MEDIUM === resourceClass) {
    Log.warn(
      `Resource class ${chalk.bold(resourceClass)} is deprecated. Use ${chalk.bold(
        'm-medium'
@@ -96,7 +80,7 @@ function resolveIosResourceClass(
    );
  }

-  if ([ResourceClass.M_LARGE, ResourceClass.M1_LARGE].includes(resourceClass)) {
+  if (ResourceClass.M_LARGE === resourceClass) {
    Log.warn(
      `Resource class ${chalk.bold(resourceClass)} is deprecated. Use ${chalk.bold(
        'large'
@@ -3,9 +3,9 @@ import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 import semver from 'semver';

+import { updateAppJsonConfigAsync } from './appJson';
 import Log from '../../log';
 import { promptAsync } from '../../prompts';
-import { updateAppJsonConfigAsync } from './appJson';

 export function ensureStaticConfigExists(projectDir: string): void {
  const paths = getConfigFilePaths(projectDir);
@@ -4,10 +4,9 @@ import fs from 'fs-extra';
 import path from 'path';
 import semver from 'semver';

+import { CommonContext } from './context';
 import Log, { learnMore } from '../log';
 import { isPNGAsync } from '../utils/image';
-import { getVcsClient } from '../vcs';
-import { CommonContext } from './context';

 export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
  if (ctx.buildProfile.env?.NODE_ENV === 'production') {
@@ -28,12 +27,12 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
  if (!googleServicesFilePath) {
    return;
  }
-  const rootDir = path.normalize(await getVcsClient().getRootPathAsync());
+  const rootDir = path.normalize(await ctx.vcsClient.getRootPathAsync());
  const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
  if (
    (await fs.pathExists(absGoogleServicesFilePath)) &&
    (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-      (await getVcsClient().isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
+      (await ctx.vcsClient.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
  ) {
    Log.warn(
      `File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`
@@ -1,3 +1,4 @@
+import { testChannelBasicInfo } from './branch-mapping-fixtures';
 import {
  emptyBranchMapping,
  rolloutBranchMapping,
@@ -13,7 +14,6 @@ import {
  isAlwaysTrueBranchMapping,
  isEmptyBranchMapping,
 } from '../branch-mapping';
-import { testChannelBasicInfo } from './branch-mapping-fixtures';

 describe(assertVersion, () => {
  it('throws if the branch mapping is not the correct version', () => {
@@ -1,8 +1,8 @@
 import { format } from '@expo/timeago.js';

+import { testChannelObject, testUpdateBranch1, testUpdateBranch2 } from './fixtures';
 import { getAlwaysTrueBranchMapping, getEmptyBranchMapping } from '../branch-mapping';
 import { getDescriptionByBranchId } from '../print-utils';
-import { testChannelObject, testUpdateBranch1, testUpdateBranch2 } from './fixtures';

 describe(getDescriptionByBranchId, () => {
  it('should get descriptions for multiple branches with multiple update groups', () => {
@@ -1,5 +1,5 @@
-import { getUpdateBranch } from '../utils';
 import { channelInfoWithBranches, testBasicBranchInfo1 } from './branch-mapping-fixtures';
+import { getUpdateBranch } from '../utils';

 describe(getUpdateBranch, () => {
  it('gets the update branch', () => {
@@ -41,7 +41,7 @@ export type AlwaysTrueBranchMapping = {
    {
      branchId: string;
      branchMappingLogic: BranchMappingAlwaysTrue;
-    }
+    },
  ];
 };

@@ -1,5 +1,6 @@
 import chalk from 'chalk';

+import { assertVersion, hasEmptyBranchMap, hasStandardBranchMap } from './branch-mapping';
 import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
 import Log from '../log';
 import { getRollout, isRollout } from '../rollout/branch-mapping';
@@ -8,7 +9,6 @@ import {
  formatBranch,
  getUpdateGroupDescriptionsWithBranch,
 } from '../update/utils';
-import { assertVersion, hasEmptyBranchMap, hasStandardBranchMap } from './branch-mapping';

 /**
 * Log all the branches associated with the channel and their most recent update group
@@ -38,31 +38,34 @@ export function logChannelDetails(channel: UpdateChannelObject): void {
 export function getDescriptionByBranchId(
  channel: UpdateChannelObject
 ): Record<string, FormattedBranchDescription> {
-  return channel.updateBranches.reduce((acc, branch) => {
-    const maybeRollout = isRollout(channel) ? getRollout(channel) : null;
-    let maybePercentOnBranch: number | undefined = undefined;
-    if (maybeRollout) {
-      maybePercentOnBranch =
-        maybeRollout.rolledOutBranchId === branch.id
-          ? maybeRollout.percentRolledOut
-          : 100 - maybeRollout.percentRolledOut;
-    }
+  return channel.updateBranches.reduce(
+    (acc, branch) => {
+      const maybeRollout = isRollout(channel) ? getRollout(channel) : null;
+      let maybePercentOnBranch: number | undefined = undefined;
+      if (maybeRollout) {
+        maybePercentOnBranch =
+          maybeRollout.rolledOutBranchId === branch.id
+            ? maybeRollout.percentRolledOut
+            : 100 - maybeRollout.percentRolledOut;
+      }

-    if (branch.updateGroups.length === 0) {
-      acc[branch.id] = { branch: branch.name, branchRolloutPercentage: maybePercentOnBranch };
+      if (branch.updateGroups.length === 0) {
+        acc[branch.id] = { branch: branch.name, branchRolloutPercentage: maybePercentOnBranch };
+        return acc;
+      }
+      const updateGroupsWithBranchDescriptions = getUpdateGroupDescriptionsWithBranch(
+        branch.updateGroups
+      );
+      // display the most recent update group
+      const updateGroupWithBranchDescription = updateGroupsWithBranchDescriptions[0];
+      const { branch: branchName, ...updateGroup } = updateGroupWithBranchDescription;
+      acc[branch.id] = {
+        branch: branchName,
+        branchRolloutPercentage: maybePercentOnBranch,
+        update: updateGroup,
+      };
      return acc;
-    }
-    const updateGroupsWithBranchDescriptions = getUpdateGroupDescriptionsWithBranch(
-      branch.updateGroups
-    );
-    // display the most recent update group
-    const updateGroupWithBranchDescription = updateGroupsWithBranchDescriptions[0];
-    const { branch: branchName, ...updateGroup } = updateGroupWithBranchDescription;
-    acc[branch.id] = {
-      branch: branchName,
-      branchRolloutPercentage: maybePercentOnBranch,
-      update: updateGroup,
-    };
-    return acc;
-  }, {} as Record<string, FormattedBranchDescription>);
+    },
+    {} as Record<string, FormattedBranchDescription>
+  );
 }
@@ -2,6 +2,9 @@ import chalk from 'chalk';
 import { print } from 'graphql';
 import gql from 'graphql-tag';

+import { ChannelNotFoundError } from './errors';
+import { logChannelDetails } from './print-utils';
+import { ChannelBasicInfo } from './utils';
 import { createUpdateBranchOnAppAsync } from '../branch/queries';
 import { BranchNotFoundError } from '../branch/utils';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
@@ -24,9 +27,6 @@ import {
  paginatedQueryWithConfirmPromptAsync,
  paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
-import { ChannelNotFoundError } from './errors';
-import { logChannelDetails } from './print-utils';
-import { ChannelBasicInfo } from './utils';

 export const CHANNELS_LIMIT = 25;

@@ -3,13 +3,6 @@ import { CombinedError } from '@urql/core';
 import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';

-import {
-  AnalyticsWithOrchestration,
-  CommandEvent,
-  createAnalyticsAsync,
-} from '../analytics/AnalyticsManager';
-import Log from '../log';
-import SessionManager from '../user/SessionManager';
 import AnalyticsContextField from './context/AnalyticsContextField';
 import ContextField from './context/ContextField';
 import {
@@ -22,12 +15,20 @@ import { OptionalPrivateProjectConfigContextField } from './context/OptionalPriv
 import { PrivateProjectConfigContextField } from './context/PrivateProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
+import VcsClientContextField from './context/VcsClientContextField';
 import { EasCommandError } from './errors';
+import {
+  AnalyticsWithOrchestration,
+  CommandEvent,
+  createAnalyticsAsync,
+} from '../analytics/AnalyticsManager';
+import Log from '../log';
+import SessionManager from '../user/SessionManager';

 export type ContextInput<
  T extends {
    [name: string]: any;
-  } = object
+  } = object,
 > = {
  [P in keyof T]: ContextField<T[P]>;
 };
@@ -35,7 +36,7 @@ export type ContextInput<
 export type ContextOutput<
  T extends {
    [name: string]: any;
-  } = object
+  } = object,
 > = {
  [P in keyof T]: T[P];
 };
@@ -101,6 +102,9 @@ export default abstract class EasCommand extends Command {
    Analytics: {
      analytics: new AnalyticsContextField(),
    },
+    Vcs: {
+      vcsClient: new VcsClientContextField(),
+    },
  };

  /**
@@ -132,7 +136,7 @@ export default abstract class EasCommand extends Command {
  protected async getContextAsync<
    C extends {
      [name: string]: any;
-    } = object
+    } = object,
  >(
    commandClass: { contextDefinition: ContextInput<C> },
    { nonInteractive }: { nonInteractive: boolean }
@@ -0,0 +1,99 @@
+import chalk from 'chalk';
+
+import { ExpoGraphqlClient } from './context/contextUtils/createGraphqlClient';
+import {
+  AppPlatform,
+  Build,
+  BuildFilter,
+  BuildFragment,
+  BuildStatus,
+  InputMaybe,
+} from '../graphql/generated';
+import { BuildQuery } from '../graphql/queries/BuildQuery';
+import { RequestedPlatform, appPlatformEmojis } from '../platform';
+
+const platformToAppPlatform: Record<
+  Exclude<RequestedPlatform, RequestedPlatform.All>,
+  AppPlatform
+> = {
+  android: AppPlatform.Android,
+  ios: AppPlatform.Ios,
+};
+
+export async function ensureBuildExistsAsync(
+  graphqlClient: ExpoGraphqlClient,
+  buildId: string
+): Promise<void> {
+  try {
+    await BuildQuery.byIdAsync(graphqlClient, buildId);
+  } catch {
+    throw new Error(`Couldn't find a build matching the id ${buildId}`);
+  }
+}
+
+export async function fetchBuildsAsync({
+  graphqlClient,
+  projectId,
+  filters,
+}: {
+  graphqlClient: ExpoGraphqlClient;
+  projectId: string;
+  filters?: { statuses?: BuildStatus[]; platform?: RequestedPlatform; profile?: string };
+}): Promise<BuildFragment[]> {
+  let builds: BuildFragment[];
+  const queryFilters: InputMaybe<BuildFilter> = {};
+  if (filters?.platform && filters.platform !== 'all') {
+    queryFilters['platform'] = platformToAppPlatform[filters.platform];
+  }
+  if (filters?.profile) {
+    queryFilters['buildProfile'] = filters.profile;
+  }
+  if (!filters?.statuses) {
+    builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+      appId: projectId,
+      offset: 0,
+      limit: 10,
+      filter: queryFilters ? queryFilters : undefined,
+    });
+  } else {
+    builds = (
+      await Promise.all(
+        filters.statuses.map(status =>
+          BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+            appId: projectId,
+            offset: 0,
+            limit: 10,
+            filter: queryFilters ? { ...queryFilters, status } : { status },
+          })
+        )
+      )
+    ).flat();
+  }
+  builds.sort((buildA, buildB) => (buildA.createdAt > buildB.createdAt ? -1 : 1));
+  return builds;
+}
+
+export function formatBuild(
+  build: Pick<Build, 'id' | 'platform' | 'status' | 'createdAt'>
+): string {
+  const platform = appPlatformEmojis[build.platform];
+  const startTime = new Date(build.createdAt).toLocaleString();
+  let statusText: string;
+  if (build.status === BuildStatus.New) {
+    statusText = 'new';
+  } else if (build.status === BuildStatus.InQueue) {
+    statusText = 'in queue';
+  } else if (build.status === BuildStatus.InProgress) {
+    statusText = 'in progress';
+  } else if (build.status === BuildStatus.Finished) {
+    statusText = 'finished';
+  } else if (build.status === BuildStatus.Errored) {
+    statusText = 'errored';
+  } else if ([BuildStatus.PendingCancel, BuildStatus.Canceled].includes(build.status)) {
+    statusText = 'canceled';
+  } else {
+    statusText = 'unknown';
+  }
+  const status = chalk.blue(statusText);
+  return `${platform} Started at: ${startTime}, Status: ${status}, Id: ${build.id}`;
+}
@@ -1,5 +1,5 @@
-import { Analytics } from '../../analytics/AnalyticsManager';
 import ContextField, { ContextOptions } from './ContextField';
+import { Analytics } from '../../analytics/AnalyticsManager';

 export default class AnalyticsContextField extends ContextField<Analytics> {
  async getValueAsync({ analytics }: ContextOptions): Promise<Analytics> {
@@ -1,13 +1,13 @@
 import { ExpoConfig } from '@expo/config-types';

+import ContextField, { ContextOptions } from './ContextField';
+import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
+import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 import {
  ExpoConfigOptions,
  getPrivateExpoConfig,
  getPublicExpoConfig,
 } from '../../project/expoConfig';
-import ContextField, { ContextOptions } from './ContextField';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';

 export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
  projectId: string;
@@ -1,8 +1,8 @@
+import ContextField, { ContextOptions } from './ContextField';
+import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { Actor } from '../../user/User';
 import FeatureGateEnvOverrides from '../gating/FeatureGateEnvOverrides';
 import FeatureGating from '../gating/FeatureGating';
-import ContextField, { ContextOptions } from './ContextField';
-import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';

 export default class LoggedInContextField extends ContextField<{
  actor: Actor;
@@ -1,8 +1,8 @@
+import ContextField, { ContextOptions } from './ContextField';
+import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { Actor } from '../../user/User';
 import FeatureGateEnvOverrides from '../gating/FeatureGateEnvOverrides';
 import FeatureGating from '../gating/FeatureGating';
-import ContextField, { ContextOptions } from './ContextField';
-import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';

 export default class MaybeLoggedInContextField extends ContextField<{
  actor: Actor | null;
@@ -1,10 +1,10 @@
 import { ExpoConfig } from '@expo/config-types';
 import { InvalidEasJsonError } from '@expo/eas-json/build/errors';

-import { getPrivateExpoConfig } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
+import { getPrivateExpoConfig } from '../../project/expoConfig';

 export class OptionalPrivateProjectConfigContextField extends ContextField<
  | {
@@ -1,9 +1,9 @@
 import { ExpoConfig } from '@expo/config-types';

-import { getPrivateExpoConfig } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
+import { getPrivateExpoConfig } from '../../project/expoConfig';

 export class PrivateProjectConfigContextField extends ContextField<{
  projectId: string;
@@ -1,5 +1,5 @@
-import SessionManager from '../../user/SessionManager';
 import ContextField, { ContextOptions } from './ContextField';
+import SessionManager from '../../user/SessionManager';

 export default class SessionManagementContextField extends ContextField<SessionManager> {
  async getValueAsync({ sessionManager }: ContextOptions): Promise<SessionManager> {
@@ -0,0 +1,9 @@
+import ContextField from './ContextField';
+import { getVcsClient } from '../../vcs';
+import { Client } from '../../vcs/vcs';
+
+export default class VcsClientContextField extends ContextField<Client> {
+  async getValueAsync(): Promise<Client> {
+    return getVcsClient();
+  }
+}
@@ -3,6 +3,8 @@ import { ExpoConfig } from '@expo/config-types';
 import { Env } from '@expo/eas-build-job';
 import chalk from 'chalk';

+import { createGraphqlClient } from './createGraphqlClient';
+import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import Log, { learnMore } from '../../../log';
 import { ora } from '../../../ora';
@@ -11,8 +13,6 @@ import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../
 import { toAppPrivacy } from '../../../project/projectUtils';
 import SessionManager from '../../../user/SessionManager';
 import { Actor, getActorUsername } from '../../../user/User';
-import { createGraphqlClient } from './createGraphqlClient';
-import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';

 /**
 * Save an EAS project ID to the appropriate field in the app config.
@@ -1,7 +1,7 @@
 import nullthrows from 'nullthrows';

-import env from '../../env';
 import { FeatureGateKey } from './FeatureGateKey';
+import env from '../../env';

 function parseFeatureGateEnvVariableValue(value: string | undefined): string[] {
  if (!value) {
@@ -27,6 +27,7 @@ export default class BranchCreate extends EasCommand {
  static override contextDefinition = {
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -37,6 +38,7 @@ export default class BranchCreate extends EasCommand {
    const {
      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
+      vcsClient,
    } = await this.getContextAsync(BranchCreate, {
      nonInteractive,
    });
@@ -56,7 +58,7 @@ export default class BranchCreate extends EasCommand {
        type: 'text',
        name: 'name',
        message: 'Provide a branch name:',
-        initial: await getDefaultBranchNameAsync(),
+        initial: await getDefaultBranchNameAsync(vcsClient),
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -1,7 +1,8 @@
-import chalk from 'chalk';
+import { Flags } from '@oclif/core';
 import gql from 'graphql-tag';

 import EasCommand from '../../commandUtils/EasCommand';
+import { ensureBuildExistsAsync, fetchBuildsAsync, formatBuild } from '../../commandUtils/builds';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
 import { withErrorHandlingAsync } from '../../graphql/client';
@@ -11,10 +12,9 @@ import {
  CancelBuildMutation,
  CancelBuildMutationVariables,
 } from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { appPlatformEmojis } from '../../platform';
+import { RequestedPlatform } from '../../platform';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { confirmAsync, selectAsync } from '../../prompts';

@@ -42,54 +42,28 @@ async function cancelBuildAsync(
  return data.build!.cancel;
 }

-function formatUnfinishedBuild(
-  build: Pick<Build, 'id' | 'platform' | 'status' | 'createdAt'>
-): string {
-  const platform = appPlatformEmojis[build.platform];
-  const startTime = new Date(build.createdAt).toLocaleString();
-  let statusText: string;
-  if (build.status === BuildStatus.New) {
-    statusText = 'new';
-  } else if (build.status === BuildStatus.InQueue) {
-    statusText = 'in queue';
-  } else {
-    statusText = 'in progress';
-  }
-  const status = chalk.blue(statusText);
-  return `${platform} Started at: ${startTime}, Status: ${status}, Id: ${build.id}`;
-}
-
 export async function selectBuildToCancelAsync(
  graphqlClient: ExpoGraphqlClient,
  projectId: string,
-  projectDisplayName: string
+  projectDisplayName: string,
+  filters?: {
+    platform?: RequestedPlatform;
+    profile?: string;
+  }
 ): Promise<string | null> {
  const spinner = ora().start('Fetching the uncompleted builds…');

  let builds;
  try {
-    const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
-      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-        appId: projectId,
-        offset: 0,
-        limit: 10,
-        filter: { status: BuildStatus.New },
-      }),
-      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-        appId: projectId,
-        offset: 0,
-        limit: 10,
-        filter: { status: BuildStatus.InQueue },
-      }),
-      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-        appId: projectId,
-        offset: 0,
-        limit: 10,
-        filter: { status: BuildStatus.InProgress },
-      }),
-    ]);
+    builds = await fetchBuildsAsync({
+      graphqlClient,
+      projectId,
+      filters: {
+        ...filters,
+        statuses: [BuildStatus.New, BuildStatus.InQueue, BuildStatus.InProgress],
+      },
+    });
    spinner.stop();
-    builds = [...newBuilds, ...inQueueBuilds, ...inProgressBuilds];
  } catch (error) {
    spinner.fail(
      `Something went wrong and we couldn't fetch the builds for the project ${projectDisplayName}.`
@@ -97,13 +71,13 @@ export async function selectBuildToCancelAsync(
    throw error;
  }
  if (builds.length === 0) {
-    Log.warn(`There aren't any uncompleted builds for the project ${projectDisplayName}.`);
+    Log.warn(`We couldn't find any uncompleted builds for the project ${projectDisplayName}.`);
    return null;
  } else {
    const buildId = await selectAsync<string>(
      'Which build do you want to cancel?',
      builds.map(build => ({
-        title: formatUnfinishedBuild(build),
+        title: formatBuild(build),
        value: build.id,
      }))
    );
@@ -116,17 +90,6 @@ export async function selectBuildToCancelAsync(
  }
 }

-async function ensureBuildExistsAsync(
-  graphqlClient: ExpoGraphqlClient,
-  buildId: string
-): Promise<void> {
-  try {
-    await BuildQuery.byIdAsync(graphqlClient, buildId);
-  } catch {
-    throw new Error(`Couldn't find a build matching the id ${buildId}`);
-  }
-}
-
 export default class BuildCancel extends EasCommand {
  static override description = 'cancel a build';

@@ -134,18 +97,36 @@ export default class BuildCancel extends EasCommand {

  static override flags = {
    ...EASNonInteractiveFlag,
+    platform: Flags.enum({
+      char: 'p',
+      description: 'Filter builds by the platform if build ID is not provided',
+      options: Object.values(RequestedPlatform),
+    }),
+    profile: Flags.string({
+      char: 'e',
+      description: 'Filter builds by build profile if build ID is not provided',
+      helpValue: 'PROFILE_NAME',
+    }),
  };

  static override contextDefinition = {
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
    const {
      args: { BUILD_ID: buildIdFromArg },
-      flags: { 'non-interactive': nonInteractive },
+      flags: { 'non-interactive': nonInteractive, platform, profile },
    } = await this.parse(BuildCancel);
+
+    if (buildIdFromArg && (platform || profile)) {
+      throw new Error(
+        'Build ID cannot be used together with platform and profile flags. They are used to filter the list of builds when not providing the build ID'
+      );
+    }
+
    const {
      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
@@ -162,10 +143,13 @@ export default class BuildCancel extends EasCommand {
    let buildId: string | null = buildIdFromArg;
    if (!buildId) {
      if (nonInteractive) {
-        throw new Error('BUILD_ID must not be empty in non-interactive mode');
+        throw new Error('Build ID must be provided in non-interactive mode');
      }

-      buildId = await selectBuildToCancelAsync(graphqlClient, projectId, displayName);
+      buildId = await selectBuildToCancelAsync(graphqlClient, projectId, displayName, {
+        platform,
+        profile,
+      });
      if (!buildId) {
        return;
      }
@@ -11,12 +11,8 @@ import { isExpoUpdatesInstalled, isUsingEASUpdate } from '../../project/projectU
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
-import {
-  ensureEASUpdateIsConfiguredInEasJsonAsync,
-  ensureUseClassicUpdatesIsRemovedAsync,
-} from '../../update/configure';
+import { ensureEASUpdateIsConfiguredInEasJsonAsync } from '../../update/configure';
 import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
-import { getVcsClient } from '../../vcs';

 export default class BuildConfigure extends EasCommand {
  static override description = 'configure the project to support EAS Build';
@@ -32,13 +28,14 @@ export default class BuildConfigure extends EasCommand {
  static override contextDefinition = {
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildConfigure);
    const {
      privateProjectConfig: { exp, projectId, projectDir },
-      loggedIn: { graphqlClient },
+      vcsClient,
    } = await this.getContextAsync(BuildConfigure, {
      nonInteractive: false,
    });
@@ -47,7 +44,9 @@ export default class BuildConfigure extends EasCommand {
      '💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.'
    );

-    await getVcsClient().ensureRepoExistsAsync();
+    // BuildConfigure.ContextOptions.Vcs.client.getValueAsync()
+
+    await vcsClient.ensureRepoExistsAsync();

    const expoUpdatesIsInstalled = isExpoUpdatesInstalled(projectDir);

@@ -64,30 +63,25 @@ export default class BuildConfigure extends EasCommand {
    const didCreateEasJson = await ensureProjectConfiguredAsync({
      projectDir,
      nonInteractive: false,
+      vcsClient,
    });
    if (didCreateEasJson && isUsingEASUpdate(exp, projectId)) {
-      if (exp.updates?.useClassicUpdates) {
-        // NOTE: this method modifies the Expo config; be sure to use this function's return value
-        // if the config object is used later in the future
-        await ensureUseClassicUpdatesIsRemovedAsync({ exp, projectDir });
-      }
-
      await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);
    }

    // configure expo-updates
    if (expoUpdatesIsInstalled) {
      if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
        if (workflow === Workflow.GENERIC) {
-          await syncAndroidUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
+          await syncAndroidUpdatesConfigurationAsync(projectDir, exp);
        }
      }

      if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
        if (workflow === Workflow.GENERIC) {
-          await syncIosUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
+          await syncIosUpdatesConfigurationAsync(vcsClient, projectDir, exp);
        }
      }
    }
@@ -0,0 +1,148 @@
+import { Flags } from '@oclif/core';
+import gql from 'graphql-tag';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { ensureBuildExistsAsync, fetchBuildsAsync, formatBuild } from '../../commandUtils/builds';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import { withErrorHandlingAsync } from '../../graphql/client';
+import { Build, DeleteBuildMutation, DeleteBuildMutationVariables } from '../../graphql/generated';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { RequestedPlatform } from '../../platform';
+import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { confirmAsync, selectAsync } from '../../prompts';
+
+async function deleteBuildAsync(
+  graphqlClient: ExpoGraphqlClient,
+  buildId: string
+): Promise<Pick<Build, 'id'>> {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .mutation<DeleteBuildMutation, DeleteBuildMutationVariables>(
+        gql`
+          mutation DeleteBuildMutation($buildId: ID!) {
+            build(buildId: $buildId) {
+              deleteBuild(buildId: $buildId) {
+                id
+              }
+            }
+          }
+        `,
+        { buildId }
+      )
+      .toPromise()
+  );
+  return data.build!.deleteBuild;
+}
+
+export async function selectBuildToDeleteAsync(
+  graphqlClient: ExpoGraphqlClient,
+  projectId: string,
+  projectDisplayName: string,
+  filters?: {
+    platform?: RequestedPlatform;
+    profile?: string;
+  }
+): Promise<string | null> {
+  const spinner = ora().start('Fetching builds…');
+
+  let builds;
+  try {
+    builds = await fetchBuildsAsync({ graphqlClient, projectId, filters });
+    spinner.stop();
+  } catch (error) {
+    spinner.fail(
+      `Something went wrong and we couldn't fetch the builds for the project ${projectDisplayName}.`
+    );
+    throw error;
+  }
+  if (builds.length === 0) {
+    Log.warn(`We couldn't find any builds for the project ${projectDisplayName}.`);
+    return null;
+  } else {
+    const buildId = await selectAsync<string>(
+      'Which build do you want to delete?',
+      builds.map(build => ({
+        title: formatBuild(build),
+        value: build.id,
+      }))
+    );
+
+    return (await confirmAsync({
+      message: 'Are you sure you want to delete it?',
+    }))
+      ? buildId
+      : null;
+  }
+}
+
+export default class BuildDelete extends EasCommand {
+  static override description = 'delete a build';
+  static override args = [{ name: 'BUILD_ID' }];
+  static override flags = {
+    ...EASNonInteractiveFlag,
+    platform: Flags.enum({
+      char: 'p',
+      description: 'Filter builds by the platform if build ID is not provided',
+      options: Object.values(RequestedPlatform),
+    }),
+    profile: Flags.string({
+      char: 'e',
+      description: 'Filter builds by build profile if build ID is not provided',
+      helpValue: 'PROFILE_NAME',
+    }),
+  };
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
+  };
+
+  async runAsync(): Promise<void> {
+    const {
+      args: { BUILD_ID: buildIdFromArg },
+      flags: { 'non-interactive': nonInteractive, platform, profile },
+    } = await this.parse(BuildDelete);
+
+    if (buildIdFromArg && (platform || profile)) {
+      throw new Error(
+        'Build ID cannot be used together with platform and profile flags. They are used to filter the list of builds when not providing the build ID'
+      );
+    }
+
+    const {
+      privateProjectConfig: { projectId },
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(BuildDelete, { nonInteractive });
+    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+
+    if (buildIdFromArg) {
+      await ensureBuildExistsAsync(graphqlClient, buildIdFromArg);
+    }
+
+    let buildId: string | null = buildIdFromArg;
+    if (!buildId) {
+      if (nonInteractive) {
+        throw new Error('Build ID must be provided in non-interactive mode');
+      }
+
+      buildId = await selectBuildToDeleteAsync(graphqlClient, projectId, displayName, {
+        platform,
+        profile,
+      });
+      if (!buildId) {
+        return;
+      }
+    }
+
+    const spinner = ora().start('Deleting the build...');
+    try {
+      await deleteBuildAsync(graphqlClient, buildId);
+      spinner.succeed('Build deleted');
+    } catch (error) {
+      spinner.fail(`Something went wrong and we couldn't delete your build ${buildId}`);
+      throw error;
+    }
+  }
+}
@@ -106,6 +106,7 @@ export default class Build extends EasCommand {
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.ProjectDir,
    ...this.ContextOptions.Analytics,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -121,6 +122,7 @@ export default class Build extends EasCommand {
      getDynamicPrivateProjectConfigAsync,
      projectDir,
      analytics,
+      vcsClient,
    } = await this.getContextAsync(Build, {
      nonInteractive: flags.nonInteractive,
    });
@@ -141,6 +143,7 @@ export default class Build extends EasCommand {
    await runBuildAndSubmitAsync(
      graphqlClient,
      analytics,
+      vcsClient,
      projectDir,
      flagsWithPlatform,
      actor,
@@ -11,7 +11,6 @@ import Log from '../../log';
 import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
 import { getTmpDirectory } from '../../utils/paths';
-import { getVcsClient } from '../../vcs';

 enum InspectStage {
  ARCHIVE = 'archive',
@@ -67,6 +66,7 @@ export default class BuildInspect extends EasCommand {
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.ProjectDir,
    ...this.ContextOptions.Analytics,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -76,6 +76,7 @@ export default class BuildInspect extends EasCommand {
      getDynamicPrivateProjectConfigAsync,
      projectDir,
      analytics,
+      vcsClient,
    } = await this.getContextAsync(BuildInspect, {
      nonInteractive: false,
    });
@@ -92,15 +93,15 @@ export default class BuildInspect extends EasCommand {
    await this.prepareOutputDirAsync(outputDirectory, flags.force);

    if (flags.stage === InspectStage.ARCHIVE) {
-      const vcs = getVcsClient();
-      await vcs.ensureRepoExistsAsync();
-      await vcs.makeShallowCopyAsync(tmpWorkingdir);
+      await vcsClient.ensureRepoExistsAsync();
+      await vcsClient.makeShallowCopyAsync(tmpWorkingdir);
      await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
    } else {
      try {
        await runBuildAndSubmitAsync(
          graphqlClient,
          analytics,
+          vcsClient,
          projectDir,
          {
            nonInteractive: false,
@@ -37,6 +37,7 @@ export default class BuildInternal extends EasCommand {
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.ProjectDir,
    ...this.ContextOptions.Analytics,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -49,6 +50,7 @@ export default class BuildInternal extends EasCommand {
      getDynamicPrivateProjectConfigAsync,
      projectDir,
      analytics,
+      vcsClient,
    } = await this.getContextAsync(BuildInternal, {
      nonInteractive: true,
    });
@@ -60,6 +62,7 @@ export default class BuildInternal extends EasCommand {
    await runBuildAndSubmitAsync(
      graphqlClient,
      analytics,
+      vcsClient,
      projectDir,
      {
        requestedPlatform: flags.platform as RequestedPlatform,
@@ -56,6 +56,7 @@ export default class BuildList extends EasCommand {
  static override contextDefinition = {
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -88,6 +88,7 @@ export default class BuildResign extends EasCommand {
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.ProjectDir,
    ...this.ContextOptions.Analytics,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -104,6 +105,7 @@ export default class BuildResign extends EasCommand {
      getDynamicPrivateProjectConfigAsync,
      projectDir,
      analytics,
+      vcsClient,
    } = await this.getContextAsync(BuildResign, {
      nonInteractive: flags.nonInteractive,
    });
@@ -145,6 +147,7 @@ export default class BuildResign extends EasCommand {
      analytics,
      env: buildProfile.env,
      easJsonCliConfig,
+      vcsClient,
    });
    if (buildProfile.credentialsSource !== CredentialsSource.LOCAL && !nonInteractive) {
      await credentialsCtx.appStore.ensureAuthenticatedAsync();
@@ -154,6 +157,7 @@ export default class BuildResign extends EasCommand {
        projectDir,
        nonInteractive,
        exp,
+        vcsClient,
      },
      buildProfile
    );
@@ -162,6 +166,7 @@ export default class BuildResign extends EasCommand {
      exp,
      xcodeBuildContext,
      env: buildProfile.env,
+      vcsClient,
    });
    const credentialsResult = await ensureIosCredentialsForBuildResignAsync(
      credentialsCtx,
@@ -199,8 +204,6 @@ export default class BuildResign extends EasCommand {
    const buildResult = await waitForBuildEndAsync(graphqlClient, {
      buildIds: [newBuild.id],
      accountName: account.name,
-      nonInteractive,
-      projectDir,
    });
    if (!flags.json) {
      printBuildResults(buildResult);
@@ -33,6 +33,7 @@ interface RawRunFlags {
  platform?: string;
  limit?: number;
  offset?: number;
+  profile?: string;
 }

 interface RunCommandFlags {
@@ -40,6 +41,7 @@ interface RunCommandFlags {
  runArchiveFlags: RunArchiveFlags;
  limit?: number;
  offset?: number;
+  profile?: string;
 }

 export default class Run extends EasCommand {
@@ -66,6 +68,12 @@ export default class Run extends EasCommand {
      char: 'p',
      options: ['android', 'ios'],
    }),
+    profile: Flags.string({
+      char: 'e',
+      description:
+        'Name of the build profile used to create the build to run. When specified, only builds created with the specified build profile will be queried.',
+      helpValue: 'PROFILE_NAME',
+    }),
    ...EasPaginatedQueryFlags,
  };

@@ -73,6 +81,7 @@ export default class Run extends EasCommand {
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -97,7 +106,7 @@ export default class Run extends EasCommand {
  }

  private async sanitizeFlagsAsync(flags: RawRunFlags): Promise<RunCommandFlags> {
-    const { platform, limit, offset, ...runArchiveFlags } = flags;
+    const { platform, limit, offset, profile, ...runArchiveFlags } = flags;

    const selectedPlatform = await resolvePlatformAsync(platform);

@@ -121,11 +130,16 @@ export default class Run extends EasCommand {
      });
    }

+    if (profile && (runArchiveFlags.id || runArchiveFlags.path || runArchiveFlags.url)) {
+      Log.warn('The --profile flag is ignored when using --id, --path, or --url flags.');
+    }
+
    return {
      selectedPlatform,
      runArchiveFlags,
      limit,
      offset,
+      profile,
    };
  }
 }
@@ -207,6 +221,7 @@ async function maybeGetBuildAsync(
        platform: flags.selectedPlatform,
        distribution: distributionType,
        status: BuildStatus.Finished,
+        buildProfile: flags.profile,
      },
      paginatedQueryOptions,
      selectPromptDisabledFunction: build => !isRunnableOnSimulatorOrEmulator(build),
@@ -222,6 +237,7 @@ async function maybeGetBuildAsync(
        platform: flags.selectedPlatform,
        distribution: distributionType,
        status: BuildStatus.Finished,
+        buildProfile: flags.profile,
      },
    });

@@ -38,6 +38,7 @@ export default class BuildVersionGetView extends EasCommand {
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.Vcs,
  };

  public async runAsync(): Promise<void> {
@@ -49,6 +50,7 @@ export default class BuildVersionGetView extends EasCommand {
      loggedIn: { graphqlClient },
      getDynamicPrivateProjectConfigAsync,
      projectDir,
+      vcsClient,
    } = await this.getContextAsync(BuildVersionGetView, {
      nonInteractive: true,
    });
@@ -85,6 +87,7 @@ export default class BuildVersionGetView extends EasCommand {
        exp,
        buildProfile: profile,
        platform,
+        vcsClient,
      });
      const remoteVersions = await AppVersionQuery.latestVersionAsync(
        graphqlClient,
@@ -1,4 +1,4 @@
-import { getRuntimeVersionNullable } from '@expo/config-plugins/build/utils/Updates';
+import { getRuntimeVersionNullableAsync } from '@expo/config-plugins/build/utils/Updates';
 import { Platform } from '@expo/eas-build-job';
 import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
@@ -41,6 +41,7 @@ export default class BuildVersionSetView extends EasCommand {
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.Vcs,
  };

  public async runAsync(): Promise<void> {
@@ -49,6 +50,7 @@ export default class BuildVersionSetView extends EasCommand {
      loggedIn: { graphqlClient },
      getDynamicPrivateProjectConfigAsync,
      projectDir,
+      vcsClient,
    } = await this.getContextAsync(BuildVersionSetView, {
      nonInteractive: false,
    });
@@ -74,6 +76,7 @@ export default class BuildVersionSetView extends EasCommand {
      exp,
      buildProfile: profile,
      platform,
+      vcsClient,
    });
    const remoteVersions = await AppVersionQuery.latestVersionAsync(
      graphqlClient,
@@ -113,7 +116,8 @@ export default class BuildVersionSetView extends EasCommand {
      applicationIdentifier,
      storeVersion: exp.version ?? '1.0.0',
      buildVersion: String(version),
-      runtimeVersion: getRuntimeVersionNullable(exp, platform) ?? undefined,
+      runtimeVersion:
+        (await getRuntimeVersionNullableAsync(projectDir, exp, platform)) ?? undefined,
    });
  }
 }
@@ -28,6 +28,7 @@ import {
 } from '../../../project/remoteVersionSource';
 import { resolveWorkflowAsync } from '../../../project/workflow';
 import { getProfilesAsync } from '../../../utils/profiles';
+import { Client } from '../../../vcs/vcs';

 interface SyncContext<T extends Platform> {
  projectDir: string;
@@ -35,6 +36,7 @@ interface SyncContext<T extends Platform> {
  workflow: Workflow;
  profile: BuildProfile<T>;
  buildVersion: string;
+  vcsClient: Client;
 }

 export default class BuildVersionSyncView extends EasCommand {
@@ -58,6 +60,7 @@ export default class BuildVersionSyncView extends EasCommand {
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.Vcs,
  };

  public async runAsync(): Promise<void> {
@@ -66,6 +69,7 @@ export default class BuildVersionSyncView extends EasCommand {
      loggedIn: { graphqlClient },
      getDynamicPrivateProjectConfigAsync,
      projectDir,
+      vcsClient,
    } = await this.getContextAsync(BuildVersionSyncView, {
      nonInteractive: true,
    });
@@ -97,6 +101,7 @@ export default class BuildVersionSyncView extends EasCommand {
        exp,
        buildProfile: profileInfo.profile,
        platform: profileInfo.platform,
+        vcsClient,
      });
      const remoteVersions = await AppVersionQuery.latestVersionAsync(
        graphqlClient,
@@ -104,7 +109,7 @@ export default class BuildVersionSyncView extends EasCommand {
        toAppPlatform(profileInfo.platform),
        applicationIdentifier
      );
-      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform);
+      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform, vcsClient);
      if (!remoteVersions?.buildVersion) {
        Log.warn(
          `Skipping versions sync for ${platformDisplayName}. There are no versions configured on Expo servers, use "eas build:version:set" or run a build to initialize it.`
@@ -128,6 +133,7 @@ export default class BuildVersionSyncView extends EasCommand {
          profile: profileInfo.profile as BuildProfile<Platform.ANDROID>,
          workflow,
          buildVersion: remoteVersions.buildVersion,
+          vcsClient,
        });
      } else {
        this.syncIosAsync({
@@ -136,6 +142,7 @@ export default class BuildVersionSyncView extends EasCommand {
          profile: profileInfo.profile as BuildProfile<Platform.IOS>,
          workflow,
          buildVersion: remoteVersions.buildVersion,
+          vcsClient,
        });
      }
      Log.withTick(
@@ -152,9 +159,10 @@ export default class BuildVersionSyncView extends EasCommand {
    exp,
    profile,
    buildVersion,
+    vcsClient,
  }: SyncContext<Platform.IOS>): Promise<void> {
    const xcodeBuildContext = await resolveXcodeBuildContextAsync(
-      { exp, projectDir, nonInteractive: false },
+      { exp, projectDir, nonInteractive: false, vcsClient },
      profile
    );
    const targets = await resolveTargetsAsync({
@@ -162,6 +170,7 @@ export default class BuildVersionSyncView extends EasCommand {
      exp,
      xcodeBuildContext,
      env: profile.env,
+      vcsClient,
    });

    if (!isValidBuildNumber(buildVersion)) {
@@ -20,6 +20,7 @@ export default class BuildView extends EasCommand {
  static override contextDefinition = {
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -4,7 +4,11 @@ import { print } from 'graphql';
 import gql from 'graphql-tag';

 import { selectBranchOnAppAsync } from '../../branch/queries';
-import { hasEmptyBranchMap, hasStandardBranchMap } from '../../channel/branch-mapping';
+import {
+  getAlwaysTrueBranchMapping,
+  hasEmptyBranchMap,
+  hasStandardBranchMap,
+} from '../../channel/branch-mapping';
 import { selectChannelOnAppAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
@@ -124,11 +128,7 @@ export default class ChannelEdit extends EasCommand {

    const channel = await updateChannelBranchMappingAsync(graphqlClient, {
      channelId: existingChannel.id,
-      // todo: move branch mapping logic to utility
-      branchMapping: JSON.stringify({
-        data: [{ branchId: branch.id, branchMappingLogic: 'true' }],
-        version: 0,
-      }),
+      branchMapping: JSON.stringify(getAlwaysTrueBranchMapping(branch.id)),
    });

    if (json) {
@@ -2,7 +2,6 @@ import { Flags } from '@oclif/core';

 import EasCommand from '../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import Log from '../../log';
 import { NonInteractiveOptions as CreateRolloutNonInteractiveOptions } from '../../rollout/actions/CreateRollout';
 import { NonInteractiveOptions as EditRolloutNonInteractiveOptions } from '../../rollout/actions/EditRollout';
 import {
@@ -133,7 +132,7 @@ export default class ChannelRollout extends EasCommand {
    const { args, flags } = await this.parse(ChannelRollout);
    const argsAndFlags = this.sanitizeArgsAndFlags({ ...flags, ...args });
    const {
-      privateProjectConfig: { exp, projectId },
+      privateProjectConfig: { exp, projectId, projectDir },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelRollout, {
      nonInteractive: argsAndFlags.nonInteractive,
@@ -142,9 +141,8 @@ export default class ChannelRollout extends EasCommand {
      enableJsonOutput();
    }

-    const app = { projectId, exp };
+    const app = { projectId, exp, projectDir };
    const ctx = {
-      projectId,
      nonInteractive: argsAndFlags.nonInteractive,
      graphqlClient,
      app,
@@ -152,11 +150,6 @@ export default class ChannelRollout extends EasCommand {
    if (argsAndFlags.nonInteractive) {
      await new NonInteractiveRollout(argsAndFlags).runAsync(ctx);
    } else {
-      Log.addNewLineIfNone();
-      Log.warn(
-        `✨ This command is in Developer Preview and has not been released to production yet. Website support is coming soon.`
-      );
-      Log.addNewLineIfNone();
      await new RolloutMainMenu(argsAndFlags).runAsync(ctx);
    }
  }
@@ -50,9 +50,7 @@ export default class Config extends EasCommand {
      maybeProfile ??
      (await selectAsync(
        'Select build profile',
-        (
-          await EasJsonUtils.getBuildProfileNamesAsync(accessor)
-        ).map(profileName => ({
+        (await EasJsonUtils.getBuildProfileNamesAsync(accessor)).map(profileName => ({
          title: profileName,
          value: profileName,
        }))
@@ -15,6 +15,7 @@ export default class Credentials extends EasCommand {
    ...this.ContextOptions.OptionalProjectConfig,
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.Analytics,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -24,6 +25,7 @@ export default class Credentials extends EasCommand {
      privateProjectConfig,
      getDynamicPrivateProjectConfigAsync,
      analytics,
+      vcsClient,
    } = await this.getContextAsync(Credentials, {
      nonInteractive: false,
    });
@@ -31,6 +33,7 @@ export default class Credentials extends EasCommand {
    await new SelectPlatform(
      actor,
      graphqlClient,
+      vcsClient,
      analytics,
      privateProjectConfig ?? null,
      getDynamicPrivateProjectConfigAsync,
@@ -5,16 +5,18 @@ import EasCommand from '../commandUtils/EasCommand';
 import Log from '../log';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';
+import { Client } from '../vcs/vcs';

 export default class Diagnostics extends EasCommand {
  static override description = 'display environment info';

  static override contextDefinition = {
    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
-    const { projectDir } = await this.getContextAsync(Diagnostics, {
+    const { projectDir, vcsClient } = await this.getContextAsync(Diagnostics, {
      nonInteractive: true,
    });

@@ -43,13 +45,13 @@ export default class Diagnostics extends EasCommand {
    );

    Log.log(info.trimEnd());
-    await this.printWorkflowAsync(projectDir);
+    await this.printWorkflowAsync(projectDir, vcsClient);
    Log.newLine();
  }

-  private async printWorkflowAsync(projectDir: string): Promise<void> {
-    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
-    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+  private async printWorkflowAsync(projectDir: string, vcsClient: Client): Promise<void> {
+    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);

    if (androidWorkflow === iosWorkflow) {
      Log.log(`    Project workflow: ${androidWorkflow}`);
@@ -27,6 +27,7 @@ export default class MetadataPull extends EasCommand {
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.Analytics,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -37,12 +38,13 @@ export default class MetadataPull extends EasCommand {
      loggedIn: { actor, graphqlClient },
      privateProjectConfig: { exp, projectId, projectDir },
      analytics,
+      vcsClient,
    } = await this.getContextAsync(MetadataPull, {
      nonInteractive: false,
    });

    // this command is interactive (all nonInteractive flags passed to utility functions are false)
-    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false });
+    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false, vcsClient });

    const submitProfiles = await getProfilesAsync({
      type: 'submit',
@@ -64,6 +66,7 @@ export default class MetadataPull extends EasCommand {
      graphqlClient,
      analytics,
      nonInteractive: false,
+      vcsClient,
    });

    try {
@@ -25,6 +25,7 @@ export default class MetadataPush extends EasCommand {
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.Analytics,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -35,12 +36,13 @@ export default class MetadataPush extends EasCommand {
      loggedIn: { actor, graphqlClient },
      privateProjectConfig: { exp, projectId, projectDir },
      analytics,
+      vcsClient,
    } = await this.getContextAsync(MetadataPush, {
      nonInteractive: false,
    });

    // this command is interactive (all nonInteractive flags passed to utility functions are false)
-    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false });
+    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false, vcsClient });

    const submitProfiles = await getProfilesAsync({
      type: 'submit',
@@ -62,6 +64,7 @@ export default class MetadataPush extends EasCommand {
      graphqlClient,
      analytics,
      nonInteractive: false,
+      vcsClient,
    });

    try {
@@ -37,7 +37,6 @@ export default class Open extends EasCommand {
      } else {
        spinner.fail(failedMessage);
      }
-      return;
    } catch (error) {
      spinner.fail(failedMessage);
      throw error;
@@ -16,7 +16,7 @@ import { ora } from '../../ora';
 import { createOrModifyExpoConfigAsync, getPrivateExpoConfig } from '../../project/expoConfig';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { toAppPrivacy } from '../../project/projectUtils';
-import { confirmAsync, promptAsync } from '../../prompts';
+import { Choice, confirmAsync, promptAsync } from '../../prompts';
 import { Actor } from '../../user/User';

 type InitializeMethodOptions = {
@@ -234,21 +234,11 @@ export default class ProjectInit extends EasCommand {
      if (allAccounts.length === 1) {
        accountName = allAccounts[0].name;
      } else {
-        // if regular user, put primary account first
-        const sortedAccounts =
-          actor.__typename === 'Robot'
-            ? allAccounts
-            : [...allAccounts].sort((a, _b) =>
-                actor.__typename === 'User' ? (a.name === actor.username ? -1 : 1) : 0
-              );
+        const choices = ProjectInit.getAccountChoices(
+          actor,
+          accountNamesWhereUserHasSufficientPermissionsToCreateApp
+        );

-        const choices = sortedAccounts.map(account => ({
-          title: account.name,
-          value: account,
-          description: !accountNamesWhereUserHasSufficientPermissionsToCreateApp.has(account.name)
-            ? '(Viewer Role)'
-            : undefined,
-        }));
        accountName = (
          await promptAsync({
            type: 'select',
@@ -321,6 +311,71 @@ export default class ProjectInit extends EasCommand {
    return createdProjectId;
  }

+  private static getAccountChoices(
+    actor: Actor,
+    namesWithSufficientPermissions: Set<string>
+  ): Choice[] {
+    const allAccounts = actor.accounts;
+
+    const sortedAccounts =
+      actor.__typename === 'Robot'
+        ? allAccounts
+        : [...allAccounts].sort((a, _b) =>
+            actor.__typename === 'User' ? (a.name === actor.username ? -1 : 1) : 0
+          );
+
+    if (actor.__typename !== 'Robot') {
+      const personalAccount = allAccounts?.find(
+        account => account?.ownerUserActor?.id === actor.id
+      );
+
+      const personalAccountChoice = personalAccount
+        ? {
+            title: personalAccount.name,
+            value: personalAccount,
+            description: !namesWithSufficientPermissions.has(personalAccount.name)
+              ? '(Personal) (Viewer Role)'
+              : '(Personal)',
+          }
+        : undefined;
+
+      const userAccounts = allAccounts
+        ?.filter(account => account.ownerUserActor && account.name !== actor.username)
+        .map(account => ({
+          title: account.name,
+          value: account,
+          description: !namesWithSufficientPermissions.has(account.name)
+            ? '(Team) (Viewer Role)'
+            : '(Team)',
+        }));
+
+      const organizationAccounts = allAccounts
+        ?.filter(account => account.name !== actor.username && !account.ownerUserActor)
+        .map(account => ({
+          title: account.name,
+          value: account,
+          description: !namesWithSufficientPermissions.has(account.name)
+            ? '(Organization) (Viewer Role)'
+            : '(Organization)',
+        }));
+
+      let choices: Choice[] = [];
+      if (personalAccountChoice) {
+        choices = [personalAccountChoice];
+      }
+
+      return [...choices, ...userAccounts, ...organizationAccounts].sort((a, _b) =>
+        actor.__typename === 'User' ? (a.value.name === actor.username ? -1 : 1) : 0
+      );
+    }
+
+    return sortedAccounts.map(account => ({
+      title: account.name,
+      value: account,
+      description: !namesWithSufficientPermissions.has(account.name) ? '(Viewer Role)' : undefined,
+    }));
+  }
+
  async runAsync(): Promise<void> {
    const {
      flags: { id: idArgument, force, 'non-interactive': nonInteractive },
@@ -94,6 +94,7 @@ export default class Submit extends EasCommand {
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.ProjectDir,
    ...this.ContextOptions.Analytics,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -102,6 +103,7 @@ export default class Submit extends EasCommand {
      loggedIn: { actor, graphqlClient },
      privateProjectConfig: { exp, projectId, projectDir },
      analytics,
+      vcsClient,
    } = await this.getContextAsync(Submit, {
      nonInteractive: false,
    });
@@ -135,6 +137,8 @@ export default class Submit extends EasCommand {
        analytics,
        exp,
        projectId,
+        vcsClient,
+        specifiedProfile: flagsWithPlatform.profile,
      });

      if (submissionProfiles.length > 1) {
@@ -1,27 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { instance, mock } from 'ts-mockito';
-
-import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { ensureEASUpdateIsConfiguredAsync } from '../../../update/configure';
-
-describe(ensureEASUpdateIsConfiguredAsync, () => {
-  it('errors with "useClassicUpdates" set and no app.json', async () => {
-    const graphqlClient = instance(mock<ExpoGraphqlClient>({}));
-    const exp: ExpoConfig = {
-      name: 'test',
-      slug: 'test',
-      updates: { useClassicUpdates: true },
-    };
-
-    await expect(async () => {
-      await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
-        exp,
-        projectId: 'test',
-        projectDir: '/tmp/test',
-        platform: null,
-      });
-    }).rejects.toThrow(
-      `Your app config sets "updates.useClassicUpdates" but EAS Update does not support classic updates. Remove "useClassicUpdates" from your app config and run this command again.`
-    );
-  });
-});
@@ -324,7 +324,7 @@ function mockTestExport({
    uniqueUploadedAssetPaths: [],
  });

-  jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+  jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);

  return { inputDir: exportDir, platforms, runtimeVersion };
 }
@@ -43,6 +43,10 @@ jest.mock('@expo/config');
 jest.mock('@expo/config-plugins');
 jest.mock('../../../branch/queries');
 jest.mock('../../../commandUtils/context/contextUtils/getProjectIdAsync');
+jest.mock('../../../project/projectUtils', () => ({
+  ...jest.requireActual('../../../project/projectUtils'),
+  enforceRollBackToEmbeddedUpdateSupportAsync: jest.fn(),
+}));
 jest.mock('../../../update/configure');
 jest.mock('../../../update/getBranchNameFromChannelNameAsync');
 jest.mock('../../../graphql/mutations/PublishMutation');
@@ -80,7 +84,7 @@ describe(UpdateRollBackToEmbedded.name, () => {
    mockTestProject();
    const platforms = ['android', 'ios'];
    const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);

    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
      branchId: 'branch123',
@@ -102,7 +106,7 @@ describe(UpdateRollBackToEmbedded.name, () => {
    const { projectId } = mockTestProject();
    const platforms = ['android', 'ios'];
    const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);

    jest.mocked(getBranchNameFromChannelNameAsync).mockResolvedValue('branchFromChannel');
    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
@@ -150,7 +154,7 @@ describe(UpdateRollBackToEmbedded.name, () => {

    const platforms = ['ios'];
    const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);

    // Mock an existing branch, so we don't create a new one
    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
@@ -10,7 +10,6 @@ import {
  ensureEASUpdateIsConfiguredAsync,
  ensureEASUpdateIsConfiguredInEasJsonAsync,
 } from '../../update/configure';
-import { getVcsClient } from '../../vcs';

 export default class UpdateConfigure extends EasCommand {
  static override description = 'configure the project to support EAS Update';
@@ -28,6 +27,7 @@ export default class UpdateConfigure extends EasCommand {
  static override contextDefinition = {
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -35,7 +35,7 @@ export default class UpdateConfigure extends EasCommand {
    const platform = flags.platform as RequestedPlatform;
    const {
      privateProjectConfig: { projectId, exp, projectDir },
-      loggedIn: { graphqlClient },
+      vcsClient,
    } = await this.getContextAsync(UpdateConfigure, {
      nonInteractive: flags['non-interactive'],
    });
@@ -44,13 +44,14 @@ export default class UpdateConfigure extends EasCommand {
      '💡 The following process will configure your project to use EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
    );

-    await getVcsClient().ensureRepoExistsAsync();
+    await vcsClient.ensureRepoExistsAsync();

-    await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+    await ensureEASUpdateIsConfiguredAsync({
      exp,
      projectId,
      projectDir,
      platform,
+      vcsClient,
    });

    await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);
@@ -4,6 +4,7 @@ import chalk from 'chalk';
 import nullthrows from 'nullthrows';

 import { ensureBranchExistsAsync } from '../../branch/queries';
+import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
 import { getUpdateGroupUrl } from '../../build/utils/url';
 import { ensureChannelExistsAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
@@ -40,7 +41,7 @@ import {
  uploadAssetsAsync,
 } from '../../project/publish';
 import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
-import { getUpdateGroupJsonInfo } from '../../update/utils';
+import { getUpdateJsonInfosForUpdates } from '../../update/utils';
 import {
  checkManifestBodyAgainstUpdateInfoGroup,
  getCodeSigningInfoAsync,
@@ -52,7 +53,6 @@ import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
-import { getVcsClient } from '../../vcs';

 type RawUpdateFlags = {
  auto: boolean;
@@ -155,6 +155,7 @@ export default class UpdatePublish extends EasCommand {
  static override contextDefinition = {
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -179,6 +180,7 @@ export default class UpdatePublish extends EasCommand {
      getDynamicPublicProjectConfigAsync,
      getDynamicPrivateProjectConfigAsync,
      loggedIn: { graphqlClient },
+      vcsClient,
    } = await this.getContextAsync(UpdatePublish, {
      nonInteractive,
    });
@@ -187,6 +189,9 @@ export default class UpdatePublish extends EasCommand {
      enableJsonOutput();
    }

+    await vcsClient.ensureRepoExistsAsync();
+    await ensureRepoIsCleanAsync(vcsClient, nonInteractive);
+
    const {
      exp: expPossiblyWithoutEasUpdateConfigured,
      projectId,
@@ -195,11 +200,12 @@ export default class UpdatePublish extends EasCommand {

    await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);

-    await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+    await ensureEASUpdateIsConfiguredAsync({
      exp: expPossiblyWithoutEasUpdateConfigured,
      platform: getRequestedPlatform(platformFlag),
      projectDir,
      projectId,
+      vcsClient,
    });

    const { exp } = await getDynamicPublicProjectConfigAsync();
@@ -208,6 +214,7 @@ export default class UpdatePublish extends EasCommand {

    const branchName = await getBranchNameForCommandAsync({
      graphqlClient,
+      vcsClient,
      projectId,
      channelNameArg,
      branchNameArg,
@@ -216,7 +223,7 @@ export default class UpdatePublish extends EasCommand {
      paginatedQueryOptions,
    });

-    const updateMessage = await getUpdateMessageForCommandAsync({
+    const updateMessage = await getUpdateMessageForCommandAsync(vcsClient, {
      updateMessageArg,
      autoFlag,
      nonInteractive,
@@ -250,20 +257,22 @@ export default class UpdatePublish extends EasCommand {
      realizedPlatforms = Object.keys(assets) as PublishPlatform[];

      // Timeout mechanism:
-      // - Start with 60 second timeout. 60 seconds is chosen because the cloud function that processes
-      //   uploaded assets has a timeout of 60 seconds.
-      // - Each time one or more assets reports as ready, reset the timeout to 60 seconds.
-      // - Start upload. Internally, uploadAssetsAsync uploads them all and then checks for successful
+      // - Start with NO_ACTIVITY_TIMEOUT. 90 seconds is chosen because the cloud function that processes
+      //   uploaded assets has a timeout of 60 seconds and uploading can take some time on a slow connection.
+      // - Each time one or more assets reports as ready, reset the timeout.
+      // - Each time an asset upload begins, reset the timeout. This includes retries.
+      // - Start upload. Internally, uploadAssetsAsync uploads them all first and then checks for successful
      //   processing every (5 + n) seconds with a linear backoff of n + 1 second.
      // - At the same time as upload is started, start timeout checker which checks every 1 second to see
      //   if timeout has been reached. When timeout expires, send a cancellation signal to currently running
      //   upload function call to instruct it to stop uploading or checking for successful processing.
+      const NO_ACTIVITY_TIMEOUT = 90 * 1000; // 90 seconds
      let lastUploadedStorageKeys = new Set<string>();
      let lastAssetUploadResults: {
        asset: RawAsset & { storageKey: string };
        finished: boolean;
      }[] = [];
-      let timeAtWhichToTimeout = Date.now() + 60 * 1000; // sixty seconds from now
+      let timeAtWhichToTimeout = Date.now() + NO_ACTIVITY_TIMEOUT;
      const cancelationToken = { isCanceledOrFinished: false };

      const uploadResults = await Promise.race([
@@ -277,7 +286,7 @@ export default class UpdatePublish extends EasCommand {
              assetUploadResults.filter(r => r.finished).map(r => r.asset.storageKey)
            );
            if (!areSetsEqual(currentUploadedStorageKeys, lastUploadedStorageKeys)) {
-              timeAtWhichToTimeout = Date.now() + 60 * 1000; // reset timeout to sixty seconds from now
+              timeAtWhichToTimeout = Date.now() + NO_ACTIVITY_TIMEOUT; // reset timeout to NO_ACTIVITY_TIMEOUT
              lastUploadedStorageKeys = currentUploadedStorageKeys;
              lastAssetUploadResults = assetUploadResults;
            }
@@ -285,6 +294,10 @@ export default class UpdatePublish extends EasCommand {
            const totalAssets = assetUploadResults.length;
            const missingAssetCount = assetUploadResults.filter(a => !a.finished).length;
            assetSpinner.text = `Uploading (${totalAssets - missingAssetCount}/${totalAssets})`;
+          },
+          () => {
+            // when an upload is retried, reset the timeout as we know this will now need more time
+            timeAtWhichToTimeout = Date.now() + NO_ACTIVITY_TIMEOUT; // reset timeout to NO_ACTIVITY_TIMEOUT
          }
        ),
        (async () => {
@@ -353,7 +366,12 @@ export default class UpdatePublish extends EasCommand {
      throw e;
    }

-    const runtimeVersions = await getRuntimeVersionObjectAsync(exp, realizedPlatforms, projectDir);
+    const runtimeVersions = await getRuntimeVersionObjectAsync(
+      exp,
+      realizedPlatforms,
+      projectDir,
+      vcsClient
+    );
    const runtimeToPlatformMapping =
      getRuntimeToPlatformMappingFromRuntimeVersions(runtimeVersions);

@@ -372,8 +390,6 @@ export default class UpdatePublish extends EasCommand {
      );
    }

-    const vcsClient = getVcsClient();
-
    const gitCommitHash = await vcsClient.getCommitHashAsync();
    const isGitWorkingTreeDirty = await vcsClient.hasUncommittedChangesAsync();

@@ -457,7 +473,7 @@ export default class UpdatePublish extends EasCommand {
    }

    if (jsonFlag) {
-      printJsonOnlyOutput(getUpdateGroupJsonInfo(newUpdates));
+      printJsonOnlyOutput(getUpdateJsonInfosForUpdates(newUpdates));
    } else {
      if (new Set(newUpdates.map(update => update.group)).size > 1) {
        Log.addNewLineIfNone();
@@ -499,7 +515,7 @@ export default class UpdatePublish extends EasCommand {
              ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
              : []),
            ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
-            { label: 'Message', value: updateMessage },
+            { label: 'Message', value: updateMessage ?? '' },
            ...(gitCommitHash
              ? [
                  {
@@ -20,7 +20,10 @@ import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import Log, { link } from '../../log';
 import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
-import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
+import {
+  enforceRollBackToEmbeddedUpdateSupportAsync,
+  getOwnerAccountForProjectIdAsync,
+} from '../../project/projectUtils';
 import {
  ExpoCLIExportPlatformFlag,
  defaultPublishPlatforms,
@@ -31,7 +34,7 @@ import {
  getUpdateMessageForCommandAsync,
 } from '../../project/publish';
 import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
-import { getUpdateGroupJsonInfo } from '../../update/utils';
+import { getUpdateJsonInfosForUpdates } from '../../update/utils';
 import {
  CodeSigningInfo,
  checkDirectiveBodyAgainstUpdateInfoGroup,
@@ -43,7 +46,6 @@ import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
-import { getVcsClient } from '../../vcs';

 type RawUpdateFlags = {
  auto: boolean;
@@ -68,7 +70,6 @@ type UpdateFlags = {
 };

 export default class UpdateRollBackToEmbedded extends EasCommand {
-  static override hidden = true; // until we launch
  static override description = 'roll back to the embedded update';

  static override flags = {
@@ -109,6 +110,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
  static override contextDefinition = {
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
  };

  async runAsync(): Promise<void> {
@@ -129,6 +131,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      getDynamicPublicProjectConfigAsync,
      getDynamicPrivateProjectConfigAsync,
      loggedIn: { graphqlClient },
+      vcsClient,
    } = await this.getContextAsync(UpdateRollBackToEmbedded, {
      nonInteractive,
    });
@@ -145,19 +148,24 @@ export default class UpdateRollBackToEmbedded extends EasCommand {

    await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);

-    await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+    await ensureEASUpdateIsConfiguredAsync({
      exp: expPossiblyWithoutEasUpdateConfigured,
      platform: getRequestedPlatform(platformFlag),
      projectDir,
      projectId,
+      vcsClient,
    });

+    // check that the expo-updates package version supports roll back to embedded
+    await enforceRollBackToEmbeddedUpdateSupportAsync(projectDir);
+
    const { exp } = await getDynamicPublicProjectConfigAsync();
    const { exp: expPrivate } = await getDynamicPrivateProjectConfigAsync();
    const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);

    const branchName = await getBranchNameForCommandAsync({
      graphqlClient,
+      vcsClient,
      projectId,
      channelNameArg,
      branchNameArg,
@@ -166,7 +174,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      paginatedQueryOptions,
    });

-    const updateMessage = await getUpdateMessageForCommandAsync({
+    const updateMessage = await getUpdateMessageForCommandAsync(vcsClient, {
      updateMessageArg,
      autoFlag,
      nonInteractive,
@@ -190,12 +198,15 @@ export default class UpdateRollBackToEmbedded extends EasCommand {

    Log.withTick(`Channel: ${chalk.bold(branchName)} pointed at branch: ${chalk.bold(branchName)}`);

-    const vcsClient = getVcsClient();
-
    const gitCommitHash = await vcsClient.getCommitHashAsync();
    const isGitWorkingTreeDirty = await vcsClient.hasUncommittedChangesAsync();

-    const runtimeVersions = await getRuntimeVersionObjectAsync(exp, realizedPlatforms, projectDir);
+    const runtimeVersions = await getRuntimeVersionObjectAsync(
+      exp,
+      realizedPlatforms,
+      projectDir,
+      vcsClient
+    );

    let newUpdates: UpdatePublishMutation['updateBranch']['publishUpdateGroups'];
    const publishSpinner = ora('Publishing...').start();
@@ -217,7 +228,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
    }

    if (jsonFlag) {
-      printJsonOnlyOutput(getUpdateGroupJsonInfo(newUpdates));
+      printJsonOnlyOutput(getUpdateJsonInfosForUpdates(newUpdates));
    } else {
      if (new Set(newUpdates.map(update => update.group)).size > 1) {
        Log.addNewLineIfNone();
@@ -259,7 +270,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
              ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
              : []),
            ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
-            { label: 'Message', value: updateMessage },
+            { label: 'Message', value: updateMessage ?? '' },
            ...(gitCommitHash
              ? [
                  {
@@ -289,7 +300,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
    graphqlClient: ExpoGraphqlClient;
    isGitWorkingTreeDirty: boolean | undefined;
    gitCommitHash: string | undefined;
-    updateMessage: string;
+    updateMessage: string | undefined;
    branchId: string;
    codeSigningInfo: CodeSigningInfo | undefined;
    runtimeVersions: { platform: string; runtimeVersion: string }[];