v2.2.1

actually read file when creating secret file (#1423 )
* actually read file when creating secret file * update CHANGELOG.md
2026-11-13 20:28:08 -10:00 · 2022-10-05 11:14:27 +02:00 · 2022-10-05 11:12:59 +02:00 · 2022-10-05 09:26:03 +02:00 · 2022-10-05 00:11:41 +02:00 · 2022-10-04 18:10:49 +00:00
592 changed files with 23163 additions and 11797 deletions
@@ -1 +1,2 @@
+* text eol=lf
 **/yarn.lock linguist-generated
@@ -1,20 +0,0 @@
-name: Installer tests
-on:
-  push:
-    branches: [main]
-  pull_request:
-    types: [opened, synchronize]
-
-jobs:
-  test:
-    name: Run the installer
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-    steps:
-      - uses: actions/checkout@v2
-      - run: bash bin/install.sh
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - run: eas --version
@@ -27,8 +27,11 @@ jobs:
        if: ${{ !matrix.coverage }}
      - run: yarn test --coverage
        if: ${{ matrix.coverage }}
+        env:
+          # Oclif seems to cause OOM errors when testing with coverage enabled.
+          # Remove this whenever we solved those OOM errors.
+          NODE_OPTIONS: --max-old-space-size=4096
      - run: yarn lint --max-warnings=0
-      - run: shellcheck bin/*.sh
      - uses: codecov/codecov-action@v1
        if: ${{ matrix.coverage }}
        with:
@@ -19,6 +19,3 @@ node_modules

 # Tests
 coverage
-
-# Copies of script for testing ESM imports
-packages/*/scripts/testESMImports.ts
@@ -4,5 +4,6 @@
  "singleQuote": true,
  "bracketSameLine": true,
  "trailingComma": "es5",
-  "arrowParens": "avoid"
+  "arrowParens": "avoid",
+  "endOfLine": "auto"
 }
@@ -8,11 +8,225 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

+### 🐛 Bug fixes
+
+- Make Apple Platform detection more robust. ([#1417](https://github.com/expo/eas-cli/pull/1417) by [@quinlanj](https://github.com/quinlanj))
+- Fix creating EAS secret from file. ([#1423](https://github.com/expo/eas-cli/pull/1423) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+## [2.2.0](https://github.com/expo/eas-cli/releases/tag/v2.2.0) - 2022-10-04
+
+### 🛠 Breaking changes
+
+- Prompt before configuring EAS project. ([#1356](https://github.com/expo/eas-cli/pull/1356) by [@wschurman](https://github.com/wschurman))
+- Adds paginated support to device commands. Removes the ability to delete multiple devices at once. ([#1381](https://github.com/expo/eas-cli/pull/1381) by [@kgc00](https://github.com/kgc00))
+
+### 🎉 New features
+
+- Add `-e` as a shortcut for `--profile` flag. ([#1342](https://github.com/expo/eas-cli/pull/1342) by [@szdziedzic](https://github.com/szdziedzic))
+- Support JSON5 in **eas.json**. ([#1350](https://github.com/expo/eas-cli/pull/1350) by [@dsokal](https://github.com/dsokal))
+- Add pagination and interactivity to update commands. ([#1323](https://github.com/expo/eas-cli/pull/1323) by [@kgc00](https://github.com/kgc00))
+- Add support for uploading files to EAS Secret. ([#1354](https://github.com/expo/eas-cli/pull/1354) by [@dsokal](https://github.com/dsokal))
+- Add pagination to channel commands. ([#1352](https://github.com/expo/eas-cli/pull/1352) by [@kgc00](https://github.com/kgc00))
+- Add pagination to build commands. ([#1353](https://github.com/expo/eas-cli/pull/1353) by [@kgc00](https://github.com/kgc00))
+- Provide suggestions for developers when archive size is large. ([#1363](https://github.com/expo/eas-cli/pull/1363) by [@szdziedzic](https://github.com/szdziedzic))
+- Improve `eas init` command. ([#1376](https://github.com/expo/eas-cli/pull/1376) by [@wschurman](https://github.com/wschurman))
+- Warn about outdated channel configuration before build when using eas update. ([#1397](https://github.com/expo/eas-cli/pull/1397) by [@kbrandwijk](https://github.com/kbrandwijk))
+- Validate that owner and projectId and slug all are in alignment. ([#1405](https://github.com/expo/eas-cli/pull/1405) by [@wschurman](https://github.com/wschurman))
+
+### 🐛 Bug fixes
+
+- Fix automatic eas.json generation when running `eas build`. ([#1415](https://github.com/expo/eas-cli/pull/1415) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Standardize the GQL 'Update' schema using UpdateFragmentNode. ([#1348](https://github.com/expo/eas-cli/pull/1348) by [@kgc00](https://github.com/kgc00))
+- Remove 'owner' app config field dependency. ([#1368](https://github.com/expo/eas-cli/pull/1368), [#1369](https://github.com/expo/eas-cli/pull/1369), [#1371](https://github.com/expo/eas-cli/pull/1371), [#1372](https://github.com/expo/eas-cli/pull/1372), [#1373](https://github.com/expo/eas-cli/pull/1373), by [@wschurman](https://github.com/wschurman))
+- Add Xcode 14 image. ([#1365](https://github.com/expo/eas-cli/pull/1365) by [@szdziedzic](https://github.com/szdziedzic))
+- Update max `versionCode` for Android. ([#1400](https://github.com/expo/eas-cli/pull/1400) by [@wkozyra95](https://github.com/wkozyra95))
+- Add and use command context to declare command dependencies. ([#1383](https://github.com/expo/eas-cli/pull/1383), [#1384](https://github.com/expo/eas-cli/pull/1384), [#1387](https://github.com/expo/eas-cli/pull/1387), [#1388](https://github.com/expo/eas-cli/pull/1388), [#1390](https://github.com/expo/eas-cli/pull/1390), [#1391](https://github.com/expo/eas-cli/pull/1391), [#1394](https://github.com/expo/eas-cli/pull/1394), [#1402](https://github.com/expo/eas-cli/pull/1402), [#1403](https://github.com/expo/eas-cli/pull/1403), by [@wschurman](https://github.com/wschurman))
+- Fix typo in the ad hoc build message. ([#1407](https://github.com/expo/eas-cli/pull/1407) by [@Simek](https://github.com/Simek))
+- Improve errors and error messages formatting related to **eas.json**. ([#1414](https://github.com/expo/eas-cli/pull/1414) by [@Simek](https://github.com/Simek))
+- Handle errors from platform-specific kill switches to disable free tier builds. ([#1401](https://github.com/expo/eas-cli/pull/1401) by [@szdziedzic](https://github.com/szdziedzic))
+- Surface invalid eas.json errors in an optional project context. ([#1418](https://github.com/expo/eas-cli/pull/1418) by [@quinlanj](https://github.com/quinlanj))
+- Improve message when project ID doesn't match either slug or owner. ([#1420](https://github.com/expo/eas-cli/pull/1420) by [@brentvatne](https://github.com/brentvatne))
+
+## [2.1.0](https://github.com/expo/eas-cli/releases/tag/v2.1.0) - 2022-09-05
+
+### 🎉 New features
+
+- Add tvOS credentials compatibility for Adhoc and App store builds. ([#1325](https://github.com/expo/eas-cli/pull/1325) by [@quinlanj](https://github.com/quinlanj))
+- Add `eas open` command for opening project page in web browser. ([#1337](https://github.com/expo/eas-cli/pull/1337) by [@dsokal](https://github.com/dsokal))
+- Add support for buildArtifactPaths. Rename artifactPath to applicationArchivePath. ([#1321](https://github.com/expo/eas-cli/pull/1321) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix viewing branch list when a branch has no associated platforms. ([#1326](https://github.com/expo/eas-cli/pull/1326) by [@hbiede](https://github.com/hbiede))
+- Fix description of `help` command in help prompt. ([#1341](https://github.com/expo/eas-cli/pull/1341) by [@Simek](https://github.com/Simek))
+- Resolve paths from the root when checking for gitignored values. ([#1336](https://github.com/expo/eas-cli/pull/1336) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add noImplicitOverride to tsconfigs. ([#1327](https://github.com/expo/eas-cli/pull/1327) by [@wschurman](https://github.com/wschurman))
+- Fix typos. ([#1340](https://github.com/expo/eas-cli/pull/1340) by [@hbiede](https://github.com/hbiede))
+
+## [2.0.0](https://github.com/expo/eas-cli/releases/tag/v2.0.0) - 2022-09-01
+
+### 🛠 Breaking changes
+
+- Fix typo in `cli.promptToConfigurePushNotifications` field in **eas.json**. EAS CLI will throw an error if the old field name is in **eas.json**. ([#1332](https://github.com/expo/eas-cli/pull/1332) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix dynamic config update warning. ([#1322](https://github.com/expo/eas-cli/pull/1322) by [@wschurman](https://github.com/wschurman))
+
+## [1.2.0](https://github.com/expo/eas-cli/releases/tag/v1.2.0) - 2022-08-29
+
+### 🎉 New features
+
+- Add 2022 Apple capabilities. ([#1307](https://github.com/expo/eas-cli/pull/1307) by [@EvanBacon](https://github.com/EvanBacon))
+- Print warning when eas-cli is installed as project dependency. ([#1310](https://github.com/expo/eas-cli/pull/1310) by [@dsokal](https://github.com/dsokal))
+- Add eas.json to skip push notifications credentials setup. ([#1315](https://github.com/expo/eas-cli/pull/1315) by [@dsokal](https://github.com/dsokal))
+- Warn about EAS outages when running `build`, `submit`, and `update` commands. ([#1312](https://github.com/expo/eas-cli/pull/1312) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🐛 Bug fixes
+
+- Replace promptToCreateProjectIfNotExistsAsync with getProjectIdAsync. ([#1303](https://github.com/expo/eas-cli/pull/1303) by [@wschurman](https://github.com/wschurman))
+- Use AppQuery instead of ProjectQuery. ([#1304](https://github.com/expo/eas-cli/pull/1304) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Improve instructions on setting `extra.eas.projectId` in app configuration. ([#1316](https://github.com/expo/eas-cli/pull/1316) by [@dsokal](https://github.com/dsokal))
+- Improve copy in EAS Submit - "e-mail" -> email, and make the link to app on App Store go directly to the TestFlight tab. ([#1318](https://github.com/expo/eas-cli/pull/1318) by [@brentvatne](https://github.com/brentvatne))
+
+## [1.1.1](https://github.com/expo/eas-cli/releases/tag/v1.1.1) - 2022-08-23
+
+### 🎉 New features
+
+- Add support for `autoIncrement` option at the root of the build profile. ([#1298](https://github.com/expo/eas-cli/pull/1298) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🐛 Bug fixes
+
+- Handle trailing backslash in `.gitignore`. ([#1306](https://github.com/expo/eas-cli/pull/1306) by [@wkozyra95](https://github.com/wkozyra95))
+- Retry ASC Api Key downloads if it has not fully propagated on Apple's infrastructure. ([#1302](https://github.com/expo/eas-cli/pull/1302) by [@quinlanj](https://github.com/quinlanj))
+
+## [1.1.0](https://github.com/expo/eas-cli/releases/tag/v1.1.0) - 2022-08-23
+
+### 🎉 New features
+
+- Add support for passing platform flag to `credentials` command. ([#1277](https://github.com/expo/eas-cli/pull/1277) by [@Simek](https://github.com/Simek))
+
+### 🐛 Bug fixes
+
+- Prevent throwing dynamic app config write error when configuring project ID. ([#1301](https://github.com/expo/eas-cli/pull/1301) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Remove unused dependency and devDependency from the CLI. ([#1297](https://github.com/expo/eas-cli/pull/1297) by [@Simek](https://github.com/Simek))
+
+## [1.0.0](https://github.com/expo/eas-cli/releases/tag/v1.0.0) - 2022-08-22
+
+### 🛠 Breaking changes
+
+- Remove timeout when waiting for build / submission. ([#1289](https://github.com/expo/eas-cli/pull/1289) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Add metadata support for dynamic store.config.js files. ([#1270](https://github.com/expo/eas-cli/pull/1270) by [@byCedric](https://github.com/byCedric))
+- Improve reliability of update asset presigned upload requests. ([#1278](https://github.com/expo/eas-cli/pull/1278) by [@wschurman](https://github.com/wschurman))
+
+### 🐛 Bug fixes
+
+- Rebind `console.info` correctly after `ora` instance stops. ([#1113](https://github.com/expo/eas-cli/pull/1113) by [@EvanBacon](https://github.com/EvanBacon))
+- Fix initializing git repository in monorepo. ([#1279](https://github.com/expo/eas-cli/pull/1279) by [@dsokal](https://github.com/dsokal))
+- Limit the number of SignedAssetUploadSpecifications fetched at a time. ([#1287](https://github.com/expo/eas-cli/pull/1287) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Remove unused install script. ([#1280](https://github.com/expo/eas-cli/pull/1280), [#1281](https://github.com/expo/eas-cli/pull/1281) by [@wkozyra95](https://github.com/wkozyra95))
+- Remove "please" from output ([#1250](https://github.com/expo/eas-cli/pull/1250) by [@jonsamp](https://github.com/jonsamp))
+
+## [0.60.0](https://github.com/expo/eas-cli/releases/tag/v0.60.0) - 2022-08-12
+
+### 🎉 New features
+
+- Add `appVersion` runtime policy. ([#1267](https://github.com/expo/eas-cli/pull/1267) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add JSON Schema `metadataPath` to iOS submission profile. ([#1269](https://github.com/expo/eas-cli/pull/1269) by [@byCedric](https://github.com/byCedric))
+- Add warning when `appVersion` runtime policy is not supported. ([#1271](https://github.com/expo/eas-cli/pull/1271) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.59.0](https://github.com/expo/eas-cli/releases/tag/v0.59.0) - 2022-08-10
+
+### 🐛 Bug fixes
+
+- Fix building Android projects locally that don't have execute permissions set for `gradlew`. ([82231](https://github.com/expo/eas-cli/commit/822313e90e94bd6ddd3872061a0c25a8aa4db7cd) by [@dsokal](https://github.com/dsokal))
+- Disable `nativeVersion` policy only for remote version source. ([#1261](https://github.com/expo/eas-cli/pull/1261) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Improve wording on version auto-increment. ([#1260](https://github.com/expo/eas-cli/pull/1260) by [@wkozyra95](https://github.com/wkozyra95))
+- Upgrade dependencies. ([#1262](https://github.com/expo/eas-cli/pull/1262) by [@dsokal](https://github.com/dsokal))
+
+## [0.58.0](https://github.com/expo/eas-cli/releases/tag/v0.58.0) - 2022-08-09
+
+### 🎉 New features
+
+- Managed app versions support. ([#1209](https://github.com/expo/eas-cli/pull/1209), [#1219](https://github.com/expo/eas-cli/pull/1219), [#1232](https://github.com/expo/eas-cli/pull/1232) by [@wkozyra95](https://github.com/wkozyra95))
+- Add a warning when publishing an update with too many assets. ([#1243](https://github.com/expo/eas-cli/pull/1243) by [@kgc00](https://github.com/kgc00))
+- Add submission info when building with `--json` option. ([#1246](https://github.com/expo/eas-cli/pull/1246) by [@wkozyra95](https://github.com/wkozyra95))
+- Set all environment variables (documented in https://docs.expo.dev/build-reference/variables/) when running local build. ([#1256](https://github.com/expo/eas-cli/pull/1256) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Do not include sources in `eas-json` npm package. ([#1248](https://github.com/expo/eas-cli/pull/1248) by [@wkozyra95](https://github.com/wkozyra95))
+- Swallow error when unable to track file in no commit workflow. ([#1109](https://github.com/expo/eas-cli/pull/1109) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.57.0](https://github.com/expo/eas-cli/releases/tag/v0.57.0) - 2022-08-03
+
+### 🎉 New features
+
+- Add new option to `eas device:create` - allow importing devices from Apple Developer Portal. ([#1236](https://github.com/expo/eas-cli/pull/1236) by [@dsokal](https://github.com/dsokal))
+- Add support for attaching messages to builds. ([#1237](https://github.com/expo/eas-cli/pull/1237) by [@dsokal](https://github.com/dsokal))
+- Introduce interactive pagination for `branch` commands. ([#1213](https://github.com/expo/eas-cli/pull/1213) by [@kgc00](https://github.com/kgc00))
+
+## [0.56.0](https://github.com/expo/eas-cli/releases/tag/v0.56.0) - 2022-07-28
+
+### 🎉 New features
+
+- Display build queue type when waiting. ([#1217](https://github.com/expo/eas-cli/pull/1217) by [@dsokal](https://github.com/dsokal))
+- Add better message on how to upgrade EAS CLI. ([#1222](https://github.com/expo/eas-cli/pull/1222) by [@jeremybarbet](https://github.com/jeremybarbet), [#1231](https://github.com/expo/eas-cli/pull/1231) by [@wkozyra95](https://github.com/wkozyra95))
+- Invoke export with sourcemaps on update. ([#1228](https://github.com/expo/eas-cli/pull/1228) by [@kbrandwijk](https://github.com/kbrandwijk))
+
+### 🐛 Bug fixes
+
+- Show spinner instead of silently timing out during asset upload. ([#1206](https://github.com/expo/eas-cli/pull/1206) by [@wschurman](https://github.com/wschurman))
+- Fix build archive S3 URLs. ([#1207](https://github.com/expo/eas-cli/pull/1207) by [@dsokal](https://github.com/dsokal))
+- `autoIncrement` option on iOS will update versions of all targets that depend on an application target. ([#1219](https://github.com/expo/eas-cli/pull/1219) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Increase max number of chained "extends" in build profiles. ([#1208](https://github.com/expo/eas-cli/pull/1208) by [@wkozyra95](https://github.com/wkozyra95))
+- Change wording on build warning for bundle id/package name. ([#1211](https://github.com/expo/eas-cli/pull/1211) by [@kbrandwijk](https://github.com/kbrandwijk))
+
+## [0.55.1](https://github.com/expo/eas-cli/releases/tag/v0.55.1) - 2022-07-12
+
+### 🐛 Bug fixes
+
+- Fix asset upload crash. ([#1205](https://github.com/expo/eas-cli/pull/1205) by [@wschurman](https://github.com/wschurman))
+
+## [0.55.0](https://github.com/expo/eas-cli/releases/tag/v0.55.0) - 2022-07-11
+
+### 🎉 New features
+
 - Show bundler output by default for eas update command. ([#1171](https://github.com/expo/eas-cli/pull/1171) by [@kgc00](https://github.com/kgc00/))
 - Allow users to skip metadata validation. ([#1175](https://github.com/expo/eas-cli/pull/1175) by [@byCedric](https://github.com/byCedric))
 - Add experimental `--resource-class` flag for Build commands. ([#1138](https://github.com/expo/eas-cli/pull/1138) by [@christopherwalter](https://github.com/christopherwalter))
 - Truncate long messages for `eas update` command, rather than failing. ([#1178](https://github.com/expo/eas-cli/pull/1178) by [@kgc00](https://github.com/kgc00))
 - Add review details to metadata store configuration. ([#1184](https://github.com/expo/eas-cli/pull/1184) by [@byCedric](https://github.com/byCedric))
+- Override applicationId via env. ([#1203](https://github.com/expo/eas-cli/pull/1203) by [@wkozyra95](https://github.com/wkozyra95))

 ### 🐛 Bug fixes

@@ -3,8 +3,11 @@
 packages/eas-cli/src/build @dsokal @wkozyra95
 packages/eas-cli/src/commands/build @dsokal @wkozyra95

-packages/eas-cli/src/submit @barthap @dsokal
-packages/eas-cli/src/commands/submit.ts @barthap @dsokal
+packages/eas-cli/src/submit @dsokal
+packages/eas-cli/src/commands/submit.ts @dsokal
+
+packages/eas-cli/src/update @kgc00 @wschurman
+packages/eas-cli/src/commands/update @kgc00 @wschurman

 packages/eas-cli/schema @bycedric
 packages/eas-cli/src/metadata @bycedric
@@ -1,130 +0,0 @@
-#!/bin/bash
-
-# This script downloads the latest release version of EAS CLI from GitHub and
-# installs it in /usr/local/bin
-
-{
-  # All code is inside a block to ensure the script executes only when
-  # downloaded completely.
-
-  set -euo pipefail
-
-  prefix="${EAS_PREFIX:-/usr/local}"
-  temp_dir="$(mktemp -d)"
-
-  if  [ -t 1 ] && [ -z "${NO_COLOR:-}" ]
-  then
-    # Use colors when stdout is a terminal and NO_COLOR isn't set.
-    text_bold=$'\033[1m'
-    text_normal=$'\033[22m'
-    text_red=$'\033[31m'
-    text_default_color=$'\033[39m'
-  else
-    # Disable colors
-    text_bold=""
-    text_normal=""
-    text_red=""
-    text_default_color=""
-  fi
-
-  abort() {
-    echo -e "$text_bold$text_red$1$text_normal$text_default_color"
-    exit 1
-  }
-
-  install() {
-    needs_sudo=""
-    # Make sure path exists and can be written to by the current user.
-    if ! mkdir -p "$prefix/lib" || [[ ! -w "$prefix/lib" ]]
-    then
-      needs_sudo=true
-    fi
-    if ! mkdir -p "$prefix/bin" || [[ ! -w "$prefix/bin" ]]
-    then
-      needs_sudo=true
-    fi
-    if ! rm -rf "$prefix/lib/eas"
-    then
-      needs_sudo=true
-    fi
-    # Run commands with sudo if necessary.
-    if [ -n "$needs_sudo" ]
-    then
-      if [ "$EUID" -ne 0 ]
-      then
-        echo "Installing requires superuser access."
-        echo "The sudo command will prompt for your password."
-      fi
-      sudo rm -rf "$prefix/lib/eas"
-      sudo mv "$temp_dir/eas" "$prefix/lib/eas"
-      sudo ln -fs "$prefix/lib/eas/bin/eas" "$prefix/bin/eas"
-    else
-      mv "$temp_dir/eas" "$prefix/lib/eas"
-      ln -fs "$prefix/lib/eas/bin/eas" "$prefix/bin/eas"
-    fi
-  }
-
-  if [[ ! ":$PATH:" == *":$prefix/bin:"* ]]; then
-    abort "Your path is missing $prefix/bin, you need to add this to \$PATH use this installer."
-  fi
-
-  hardware="$(uname -m)"
-  case "$hardware" in
-    x86_64)
-      arch="x64"
-      ;;
-    arm*)
-      arch="arm"
-      ;;
-    *)
-      abort "Unsupported CPU architecture $hardware."
-      ;;
-  esac
-
-  case "$(uname -s)" in
-    Darwin*)
-      platform="darwin"
-      if [[ "$arch" != "x64" ]]; then
-        abort "Unsupported CPU architecture $hardware on macOS."
-      fi
-      ;;
-    Linux*)
-      platform="linux"
-      ;;
-    *)
-      abort "This installer is supported only on macOS, Linux, and Windows Subsystem for Linux."
-      ;;
-  esac
-  url=$(hub release -L 1 | xargs hub release show --show-downloads | grep "${platform}-${arch}.tar.gz")
-  echo "Installing EAS CLI from $url"
-
-  mkdir -p "$temp_dir"
-  cd "$temp_dir"
-
-  echo
-  echo "Downloading..."
-  if [ "$(command -v curl)" ]
-  then
-    curl --location --progress-bar "$url" | tar xz
-  else
-    wget -O- "$url" | tar xz
-  fi
-
-  # Move the installation over and link the executable (may require sudo)
-  install
-
-  # Test the bundled node binary and if it doesn't work remove it (fall back to
-  # node installed in path).
-  "$prefix/lib/eas/bin/node" -v > /dev/null || {
-    rm "$prefix/lib/eas/bin/node"
-  }
-
-  # Test the CLI
-  executable=$(command -v eas) || abort "Could not run eas after installation."
-  echo
-  echo -e "EAS CLI is installed to ${executable}"
-  eas --version
-
-  echo
-  echo -e "Type ${text_bold}eas --help${text_normal} to get started."
-}
@@ -1,7 +0,0 @@
-module.exports = {
-  projects: [
-    require('./packages/eas-cli/jest.config.cjs'),
-    require('./packages/eas-json/jest.config.cjs'),
-  ],
-  testPathIgnorePatterns: ['.*'],
-};
@@ -0,0 +1,7 @@
+module.exports = {
+  projects: [
+    require('./packages/eas-cli/jest.config.js'),
+    require('./packages/eas-json/jest.config.js'),
+  ],
+  testPathIgnorePatterns: ['.*'],
+};
@@ -1,15 +1,7 @@
 module.exports = {
-  preset: 'ts-jest/presets/default-esm',
+  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}'],
-  globals: {
-    'ts-jest': {
-      useESM: true,
-    },
-  },
-  moduleNameMapper: {
-    '^(\\.{1,2}/.*)\\.js$': '$1',
-  },
 };
@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "0.54.1"
+  "version": "2.2.1"
 }
@@ -1,6 +1,5 @@
 {
  "private": true,
-  "type": "module",
  "workspaces": [
    "packages/*"
  ],
@@ -14,27 +13,26 @@
    "eas": "packages/eas-cli/bin/run",
    "lint": "eslint .",
    "release": "./scripts/bin/run update-local-plugin && lerna version --exact",
-    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
-    "clean": "lerna run clean && rm -rf node_modules coverage",
-    "test-esm-imports": "lerna run test-esm-imports"
+    "test": "jest",
+    "clean": "lerna run clean && rm -rf node_modules coverage"
  },
  "devDependencies": {
-    "@types/jest": "27.5.0",
-    "@types/node": "17.0.32",
-    "eslint": "8.15.0",
-    "eslint-config-universe": "11.0.0",
-    "eslint-plugin-async-protect": "1.1.0",
+    "@types/jest": "28.1.6",
+    "@types/node": "18.6.5",
+    "eslint": "8.21.0",
+    "eslint-config-universe": "11.1.0",
+    "eslint-plugin-async-protect": "2.1.0",
    "eslint-plugin-node": "11.1.0",
-    "jest": "28.1.0",
-    "jest-watch-typeahead": "1.1.0",
+    "jest": "28.1.3",
+    "jest-watch-typeahead": "2.0.0",
    "lerna": "4.0.0",
-    "oclif": "3.0.1",
-    "prettier": "2.6.2",
-    "ts-jest": "28.0.2",
+    "oclif": "3.1.2",
+    "prettier": "2.7.1",
+    "ts-jest": "28.0.7",
    "typescript": "4.7.4"
  },
  "volta": {
-    "node": "18.2.0",
-    "yarn": "1.22.18"
+    "node": "18.6.0",
+    "yarn": "1.22.19"
  }
 }
@@ -1,7 +1,25 @@
-const rootEslintrc = require('../../.eslintrc.cjs');
+const rootEslintrc = require('../../.eslintrc.js');

 module.exports = {
  rules: {
+    'no-restricted-properties': [
+      'warn',
+      {
+        object: 'it',
+        property: 'only',
+        message: 'it.only should not be committed to main.',
+      },
+      {
+        object: 'test',
+        property: 'only',
+        message: 'test.only should not be committed to main.',
+      },
+      {
+        object: 'describe',
+        property: 'only',
+        message: 'describe.only should not be committed to main.',
+      },
+    ],
    'no-restricted-imports': [
      'error',
      {
@@ -19,6 +19,28 @@ npm install -g eas-cli
 yarn global add eas-cli
 ```

+## Enforcing eas-cli version for your project
+
+If you want to enforce the `eas-cli` version for your project, use the `"cli.version"` field in **eas.json**. Installing `eas-cli` to your project dependencies is strongly discouraged because it may cause dependency conflicts that are difficult to debug.
+
+An example of **eas.json** that enforces `eas-cli` in version `1.0.0` or newer:
+
+```json
+{
+  "cli": {
+    "version": ">=1.0.0"
+  },
+  "build": {
+    // build profiles
+  },
+  "submit": {
+    // submit profiles
+  }
+}
+```
+
+Learn more: https://docs.expo.dev/build-reference/eas-json/
+
 # Usage

 ```sh
@@ -49,6 +71,8 @@ eas --help COMMAND
 * [`eas build:inspect`](#eas-buildinspect)
 * [`eas build:list`](#eas-buildlist)
 * [`eas build:submit`](#eas-buildsubmit)
+* [`eas build:version:set`](#eas-buildversionset)
+* [`eas build:version:sync`](#eas-buildversionsync)
 * [`eas build:view [BUILD_ID]`](#eas-buildview-build_id)
 * [`eas channel:create [NAME]`](#eas-channelcreate-name)
 * [`eas channel:edit [NAME]`](#eas-channeledit-name)
@@ -67,6 +91,7 @@ eas --help COMMAND
 * [`eas logout`](#eas-logout)
 * [`eas metadata:pull`](#eas-metadatapull)
 * [`eas metadata:push`](#eas-metadatapush)
+* [`eas open`](#eas-open)
 * [`eas project:info`](#eas-projectinfo)
 * [`eas project:init`](#eas-projectinit)
 * [`eas secret:create`](#eas-secretcreate)
@@ -100,7 +125,7 @@ ALIASES
  $ eas login
 ```

-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/account/login.ts)_

 ## `eas account:logout`

@@ -117,7 +142,7 @@ ALIASES
  $ eas logout
 ```

-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/account/logout.ts)_

 ## `eas account:view`

@@ -134,7 +159,7 @@ ALIASES
  $ eas whoami
 ```

-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/account/view.ts)_

 ## `eas analytics [STATUS]`

@@ -148,7 +173,7 @@ DESCRIPTION
  display or change analytics settings
 ```

-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/analytics.ts)_

 ## `eas autocomplete [SHELL]`

@@ -185,19 +210,20 @@ create a branch

 ```
 USAGE
-  $ eas branch:create [NAME] [--json]
+  $ eas branch:create [NAME] [--json --non-interactive]

 ARGUMENTS
  NAME  Name of the branch to create

 FLAGS
-  --json  return a json with the new branch ID and name.
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --non-interactive  Run the command in non-interactive mode.

 DESCRIPTION
  create a branch
 ```

-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/branch/create.ts)_

 ## `eas branch:delete [NAME]`

@@ -205,19 +231,20 @@ delete a branch

 ```
 USAGE
-  $ eas branch:delete [NAME] [--json]
+  $ eas branch:delete [NAME] [--json --non-interactive]

 ARGUMENTS
  NAME  Name of the branch to delete

 FLAGS
-  --json  return JSON with the edited branch's ID and name.
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --non-interactive  Run the command in non-interactive mode.

 DESCRIPTION
  delete a branch
 ```

-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/branch/delete.ts)_

 ## `eas branch:list`

@@ -225,16 +252,19 @@ list all branches

 ```
 USAGE
-  $ eas branch:list [--json]
+  $ eas branch:list [--offset <value>] [--limit <value>] [--json --non-interactive]

 FLAGS
-  --json  return output as JSON
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --limit=<value>    The number of items to fetch each query. Defaults to 50 and is capped at 100.
+  --non-interactive  Run the command in non-interactive mode.
+  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.

 DESCRIPTION
  list all branches
 ```

-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/branch/list.ts)_

 ## `eas branch:rename`

@@ -242,18 +272,19 @@ rename a branch

 ```
 USAGE
-  $ eas branch:rename [--from <value>] [--to <value>] [--json]
+  $ eas branch:rename [--from <value>] [--to <value>] [--json --non-interactive]

 FLAGS
-  --from=<value>  current name of the branch.
-  --json          return a json with the edited branch's ID and name.
-  --to=<value>    new name of the branch.
+  --from=<value>     current name of the branch.
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --non-interactive  Run the command in non-interactive mode.
+  --to=<value>       new name of the branch.

 DESCRIPTION
  rename a branch
 ```

-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/branch/rename.ts)_

 ## `eas branch:view [NAME]`

@@ -261,19 +292,22 @@ view a branch

 ```
 USAGE
-  $ eas branch:view [NAME] [--json]
+  $ eas branch:view [NAME] [--offset <value>] [--limit <value>] [--json --non-interactive]

 ARGUMENTS
  NAME  Name of the branch to view

 FLAGS
-  --json  return a json with the branch's ID name and recent update groups.
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --limit=<value>    The number of items to fetch each query. Defaults to 25 and is capped at 50.
+  --non-interactive  Run the command in non-interactive mode.
+  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.

 DESCRIPTION
  view a branch
 ```

-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/branch/view.ts)_

 ## `eas build`

@@ -281,28 +315,29 @@ start a build

 ```
 USAGE
-  $ eas build [-p android|ios|all] [--json] [--profile <value>] [--non-interactive] [--local] [--output
-    <value>] [--wait] [--clear-cache] [--auto-submit | --auto-submit-with-profile <value>]
+  $ eas build [-p android|ios|all] [-e <value>] [--local] [--output <value>] [--wait] [--clear-cache]
+    [--auto-submit | --auto-submit-with-profile <value>] [-m <value>] [--json --non-interactive]

 FLAGS
+  -e, --profile=PROFILE_NAME               Name of the build profile from eas.json. Defaults to "production" if defined
+                                           in eas.json.
+  -m, --message=<value>                    A short message describing the build
  -p, --platform=(android|ios|all)
  --auto-submit                            Submit on build complete using the submit profile with the same name as the
                                           build profile
  --auto-submit-with-profile=PROFILE_NAME  Submit on build complete using the submit profile with provided name
  --clear-cache                            Clear cache before the build
-  --json                                   Enable JSON output, non-JSON messages will be printed to stderr
+  --json                                   Enable JSON output, non-JSON messages will be printed to stderr.
  --local                                  Run build locally [experimental]
-  --non-interactive                        Run command in non-interactive mode
+  --non-interactive                        Run the command in non-interactive mode.
  --output=<value>                         Output path for local build
-  --profile=PROFILE_NAME                   Name of the build profile from eas.json. Defaults to "production" if defined
-                                           in eas.json.
  --[no-]wait                              Wait for build(s) to complete

 DESCRIPTION
  start a build
 ```

-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/build/index.ts)_

 ## `eas build:cancel [BUILD_ID]`

@@ -310,13 +345,16 @@ cancel a build

 ```
 USAGE
-  $ eas build:cancel [BUILD_ID]
+  $ eas build:cancel [BUILD_ID] [--non-interactive]
+
+FLAGS
+  --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/v0.54.1/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/build/cancel.ts)_

 ## `eas build:configure`

@@ -333,7 +371,7 @@ DESCRIPTION
  configure the project to support EAS Build
 ```

-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/build/configure.ts)_

 ## `eas build:inspect`

@@ -341,9 +379,12 @@ inspect the state of the project at specific build stages, useful for troublesho

 ```
 USAGE
-  $ eas build:inspect -p android|ios -s archive|pre-build|post-build -o <value> [--profile <value>] [--force] [-v]
+  $ eas build:inspect -p android|ios -s archive|pre-build|post-build -o <value> [-e <value>] [--force] [-v]

 FLAGS
+  -e, --profile=PROFILE_NAME
+      Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.
+
  -o, --output=OUTPUT_DIRECTORY
      (required) Output directory.

@@ -361,14 +402,11 @@ FLAGS
  --force
      Delete OUTPUT_DIRECTORY if it already exists.

-  --profile=PROFILE_NAME
-      Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.
-
 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/v0.54.1/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/build/inspect.ts)_

 ## `eas build:list`

@@ -376,10 +414,10 @@ list all builds for your project

 ```
 USAGE
-  $ eas build:list [--platform all|android|ios] [--json] [--status
-    new|in-queue|in-progress|errored|finished|canceled] [--distribution store|internal|simulator] [--channel <value>]
-    [--appVersion <value>] [--appBuildVersion <value>] [--sdkVersion <value>] [--runtimeVersion <value>]
-    [--appIdentifier <value>] [--buildProfile <value>] [--gitCommitHash <value>] [--limit <value>]
+  $ eas build:list [--platform all|android|ios] [--status new|in-queue|in-progress|errored|finished|canceled]
+    [--distribution store|internal|simulator] [--channel <value>] [--appVersion <value>] [--appBuildVersion <value>]
+    [--sdkVersion <value>] [--runtimeVersion <value>] [--appIdentifier <value>] [--buildProfile <value>]
+    [--gitCommitHash <value>] [--offset <value>] [--limit <value>] [--json --non-interactive]

 FLAGS
  --appBuildVersion=<value>
@@ -390,8 +428,12 @@ FLAGS
  --distribution=(store|internal|simulator)
  --gitCommitHash=<value>
  --json                                                         Enable JSON output, non-JSON messages will be printed
-                                                                 to stderr
-  --limit=<value>
+                                                                 to stderr.
+  --limit=<value>                                                The number of items to fetch each query. Defaults to 10
+                                                                 and is capped at 50.
+  --non-interactive                                              Run the command in non-interactive mode.
+  --offset=<value>                                               Start queries from specified index. Use for paginating
+                                                                 results. Defaults to 0.
  --platform=(all|android|ios)
  --runtimeVersion=<value>
  --sdkVersion=<value>
@@ -401,7 +443,7 @@ DESCRIPTION
  list all builds for your project
 ```

-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/build/list.ts)_

 ## `eas build:submit`

@@ -409,17 +451,17 @@ submit app binary to App Store and/or Play Store

 ```
 USAGE
-  $ eas build:submit [-p android|ios|all] [--profile <value>] [--latest | --id <value> | --path <value> | --url
-    <value>] [--verbose] [--wait] [--non-interactive]
+  $ eas build:submit [-p android|ios|all] [-e <value>] [--latest | --id <value> | --path <value> | --url <value>]
+    [--verbose] [--wait] [--non-interactive]

 FLAGS
+  -e, --profile=<value>             Name of the submit profile from eas.json. Defaults to "production" if defined in
+                                    eas.json.
  -p, --platform=(android|ios|all)
  --id=<value>                      ID of the build to submit
  --latest                          Submit the latest build for specified platform
  --non-interactive                 Run command in non-interactive mode
  --path=<value>                    Path to the .apk/.aab/.ipa file
-  --profile=<value>                 Name of the submit profile from eas.json. Defaults to "production" if defined in
-                                    eas.json.
  --url=<value>                     App archive url
  --verbose                         Always print logs from Submission Service
  --[no-]wait                       Wait for submission to complete
@@ -431,6 +473,44 @@ ALIASES
  $ eas build:submit
 ```

+## `eas build:version:set`
+
+Update version of an app.
+
+```
+USAGE
+  $ eas build:version:set [-p android|ios] [-e <value>]
+
+FLAGS
+  -e, --profile=PROFILE_NAME    Name of the build profile from eas.json. Defaults to "production" if defined in
+                                eas.json.
+  -p, --platform=(android|ios)
+
+DESCRIPTION
+  Update version of an app.
+```
+
+_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/build/version/set.ts)_
+
+## `eas build:version:sync`
+
+Update a version in native code with a value stored on EAS servers
+
+```
+USAGE
+  $ eas build:version:sync [-p android|ios|all] [-e <value>]
+
+FLAGS
+  -e, --profile=PROFILE_NAME        Name of the build profile from eas.json. Defaults to "production" if defined in
+                                    eas.json.
+  -p, --platform=(android|ios|all)
+
+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/v2.2.1/packages/eas-cli/src/commands/build/version/sync.ts)_
+
 ## `eas build:view [BUILD_ID]`

 view a build for your project
@@ -440,13 +520,13 @@ USAGE
  $ eas build:view [BUILD_ID] [--json]

 FLAGS
-  --json  Enable JSON output, non-JSON messages will be printed to stderr
+  --json  Enable JSON output, non-JSON messages will be printed to stderr.

 DESCRIPTION
  view a build for your project
 ```

-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/build/view.ts)_

 ## `eas channel:create [NAME]`

@@ -454,19 +534,20 @@ create a channel

 ```
 USAGE
-  $ eas channel:create [NAME] [--json]
+  $ eas channel:create [NAME] [--json --non-interactive]

 ARGUMENTS
  NAME  Name of the channel to create

 FLAGS
-  --json  print output as a JSON object with the new channel ID, name and branch mapping.
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --non-interactive  Run the command in non-interactive mode.

 DESCRIPTION
  create a channel
 ```

-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/channel/create.ts)_

 ## `eas channel:edit [NAME]`

@@ -474,20 +555,21 @@ point a channel at a new branch

 ```
 USAGE
-  $ eas channel:edit [NAME] [--branch <value>] [--json]
+  $ eas channel:edit [NAME] [--branch <value>] [--json --non-interactive]

 ARGUMENTS
  NAME  Name of the channel to edit

 FLAGS
-  --branch=<value>  Name of the branch to point to
-  --json            Print output as a JSON object with the channel ID, name and branch mapping
+  --branch=<value>   Name of the branch to point to
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --non-interactive  Run the command in non-interactive mode.

 DESCRIPTION
  point a channel at a new branch
 ```

-_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/channel/edit.ts)_

 ## `eas channel:list`

@@ -495,16 +577,19 @@ list all channels

 ```
 USAGE
-  $ eas channel:list [--json]
+  $ eas channel:list [--offset <value>] [--limit <value>] [--json --non-interactive]

 FLAGS
-  --json  print output as a JSON object with the channel ID, name and branch mapping.
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --limit=<value>    The number of items to fetch each query. Defaults to 10 and is capped at 25.
+  --non-interactive  Run the command in non-interactive mode.
+  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.

 DESCRIPTION
  list all channels
 ```

-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/channel/list.ts)_

 ## `eas channel:view [NAME]`

@@ -512,19 +597,22 @@ view a channel

 ```
 USAGE
-  $ eas channel:view [NAME] [--json]
+  $ eas channel:view [NAME] [--json --non-interactive] [--offset <value>] [--limit <value>]

 ARGUMENTS
  NAME  Name of the channel to view

 FLAGS
-  --json  print output as a JSON object with the channel ID, name and branch mapping.
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --limit=<value>    The number of items to fetch each query. Defaults to 50 and is capped at 100.
+  --non-interactive  Run the command in non-interactive mode.
+  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.

 DESCRIPTION
  view a channel
 ```

-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/channel/view.ts)_

 ## `eas config`

@@ -532,17 +620,18 @@ display project configuration (app.json + eas.json)

 ```
 USAGE
-  $ eas config [-p android|ios] [--profile <value>]
+  $ eas config [-p android|ios] [-e <value>]

 FLAGS
+  -e, --profile=PROFILE_NAME    Name of the build profile from eas.json. Defaults to "production" if defined in
+                                eas.json.
  -p, --platform=(android|ios)
-  --profile=<value>

 DESCRIPTION
  display project configuration (app.json + eas.json)
 ```

-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/config.ts)_

 ## `eas credentials`

@@ -550,13 +639,16 @@ manage credentials

 ```
 USAGE
-  $ eas credentials
+  $ eas credentials [-p android|ios]
+
+FLAGS
+  -p, --platform=(android|ios)

 DESCRIPTION
  manage credentials
 ```

-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/credentials.ts)_

 ## `eas device:create`

@@ -570,7 +662,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/v0.54.1/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/device/create.ts)_

 ## `eas device:delete`

@@ -578,17 +670,19 @@ remove a registered device from your account

 ```
 USAGE
-  $ eas device:delete [--apple-team-id <value>] [--udid <value>]
+  $ eas device:delete [--apple-team-id <value>] [--udid <value>] [--json --non-interactive]

 FLAGS
-  --apple-team-id=<value>
-  --udid=<value>...
+  --apple-team-id=<value>  The Apple team ID on which to find the device
+  --json                   Enable JSON output, non-JSON messages will be printed to stderr.
+  --non-interactive        Run the command in non-interactive mode.
+  --udid=<value>           The Apple device ID to disable

 DESCRIPTION
  remove a registered device from your account
 ```

-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/device/delete.ts)_

 ## `eas device:list`

@@ -596,16 +690,20 @@ list all registered devices for your account

 ```
 USAGE
-  $ eas device:list [--apple-team-id <value>]
+  $ eas device:list [--apple-team-id <value>] [--offset <value>] [--limit <value>] [--json --non-interactive]

 FLAGS
  --apple-team-id=<value>
+  --json                   Enable JSON output, non-JSON messages will be printed to stderr.
+  --limit=<value>          The number of items to fetch each query. Defaults to 50 and is capped at 100.
+  --non-interactive        Run the command in non-interactive mode.
+  --offset=<value>         Start queries from specified index. Use for paginating results. Defaults to 0.

 DESCRIPTION
  list all registered devices for your account
 ```

-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/device/list.ts)_

 ## `eas device:view [UDID]`

@@ -619,7 +717,7 @@ DESCRIPTION
  view a device for your project
 ```

-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/device/view.ts)_

 ## `eas diagnostics`

@@ -633,11 +731,11 @@ DESCRIPTION
  display environment info
 ```

-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/diagnostics.ts)_

 ## `eas help [COMMAND]`

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

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

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

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

 ## `eas init`

@@ -661,7 +759,12 @@ create or link an EAS project

 ```
 USAGE
-  $ eas init
+  $ eas init [--force --id <value>] [--non-interactive ]
+
+FLAGS
+  --force            Whether to overwrite any existing project ID
+  --id=<value>       ID of the EAS project to link
+  --non-interactive  Run the command in non-interactive mode.

 DESCRIPTION
  create or link an EAS project
@@ -706,16 +809,16 @@ generate the local store configuration from the app stores

 ```
 USAGE
-  $ eas metadata:pull [--profile <value>]
+  $ eas metadata:pull [-e <value>]

 FLAGS
-  --profile=<value>  Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.
+  -e, --profile=<value>  Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.

 DESCRIPTION
  generate the local store configuration from the app stores
 ```

-_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/metadata/pull.ts)_

 ## `eas metadata:push`

@@ -723,16 +826,30 @@ sync the local store configuration to the app stores

 ```
 USAGE
-  $ eas metadata:push [--profile <value>]
+  $ eas metadata:push [-e <value>]

 FLAGS
-  --profile=<value>  Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.
+  -e, --profile=<value>  Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.

 DESCRIPTION
  sync the local store configuration to the app stores
 ```

-_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/metadata/push.ts)_
+
+## `eas open`
+
+open the project page in a web browser
+
+```
+USAGE
+  $ eas open
+
+DESCRIPTION
+  open the project page in a web browser
+```
+
+_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/open.ts)_

 ## `eas project:info`

@@ -746,7 +863,7 @@ DESCRIPTION
  information about the current project
 ```

-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/project/info.ts)_

 ## `eas project:init`

@@ -754,7 +871,12 @@ create or link an EAS project

 ```
 USAGE
-  $ eas project:init
+  $ eas project:init [--force --id <value>] [--non-interactive ]
+
+FLAGS
+  --force            Whether to overwrite any existing project ID
+  --id=<value>       ID of the EAS project to link
+  --non-interactive  Run the command in non-interactive mode.

 DESCRIPTION
  create or link an EAS project
@@ -763,7 +885,7 @@ ALIASES
  $ eas init
 ```

-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/project/init.ts)_

 ## `eas secret:create`

@@ -771,19 +893,22 @@ create an environment secret on the current project or owner account

 ```
 USAGE
-  $ eas secret:create [--scope account|project] [--name <value>] [--value <value>] [--force]
+  $ eas secret:create [--scope account|project] [--name <value>] [--value <value>] [--type string|file] [--force]
+    [--non-interactive]

 FLAGS
  --force                    Delete and recreate existing secrets
  --name=<value>             Name of the secret
+  --non-interactive          Run the command in non-interactive mode.
  --scope=(account|project)  [default: project] Scope for the secret
-  --value=<value>            Value of the secret
+  --type=(string|file)       The type of secret
+  --value=<value>            Text value or path to a file to store in the secret

 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/v0.54.1/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/secret/create.ts)_

 ## `eas secret:delete`

@@ -791,16 +916,17 @@ delete an environment secret by ID

 ```
 USAGE
-  $ eas secret:delete [--id <value>]
+  $ eas secret:delete [--id <value>] [--non-interactive]

 FLAGS
-  --id=<value>  ID of the secret to delete
+  --id=<value>       ID of the secret to delete
+  --non-interactive  Run the command in non-interactive mode.

 DESCRIPTION
  delete an environment secret by ID
 ```

-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/secret/delete.ts)_

 ## `eas secret:list`

@@ -814,7 +940,7 @@ DESCRIPTION
  list environment secrets available for your current app
 ```

-_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/secret/list.ts)_

 ## `eas submit`

@@ -822,17 +948,17 @@ submit app binary to App Store and/or Play Store

 ```
 USAGE
-  $ eas submit [-p android|ios|all] [--profile <value>] [--latest | --id <value> | --path <value> | --url
-    <value>] [--verbose] [--wait] [--non-interactive]
+  $ eas submit [-p android|ios|all] [-e <value>] [--latest | --id <value> | --path <value> | --url <value>]
+    [--verbose] [--wait] [--non-interactive]

 FLAGS
+  -e, --profile=<value>             Name of the submit profile from eas.json. Defaults to "production" if defined in
+                                    eas.json.
  -p, --platform=(android|ios|all)
  --id=<value>                      ID of the build to submit
  --latest                          Submit the latest build for specified platform
  --non-interactive                 Run command in non-interactive mode
  --path=<value>                    Path to the .apk/.aab/.ipa file
-  --profile=<value>                 Name of the submit profile from eas.json. Defaults to "production" if defined in
-                                    eas.json.
  --url=<value>                     App archive url
  --verbose                         Always print logs from Submission Service
  --[no-]wait                       Wait for submission to complete
@@ -844,7 +970,7 @@ ALIASES
  $ eas build:submit
 ```

-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/submit.ts)_

 ## `eas update`

@@ -853,7 +979,7 @@ publish an update group
 ```
 USAGE
  $ eas update [--branch <value>] [--message <value>] [--republish | --input-dir <value> | --skip-bundler]
-    [--group <value> |  | ] [-p android|ios|all] [--json] [--auto] [--private-key-path <value>] [--non-interactive]
+    [--group <value> |  | ] [-p android|ios|all] [--auto] [--private-key-path <value>] [--json --non-interactive]

 FLAGS
  -p, --platform=(android|ios|all)  [default: all]
@@ -861,9 +987,9 @@ FLAGS
  --branch=<value>                  Branch to publish the update group on
  --group=<value>                   Update group to republish
  --input-dir=<value>               [default: dist] Location of the bundle
-  --json                            Enable JSON output, non-JSON messages will be printed to stderr
+  --json                            Enable JSON output, non-JSON messages will be printed to stderr.
  --message=<value>                 A short message describing the update
-  --non-interactive                 Run command in non-interactive mode
+  --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.
@@ -874,7 +1000,7 @@ DESCRIPTION
  publish an update group
 ```

-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/update/index.ts)_

 ## `eas update:configure`

@@ -891,7 +1017,7 @@ DESCRIPTION
  configure the project to support EAS Update
 ```

-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/update/configure.ts)_

 ## `eas update:delete GROUPID`

@@ -899,38 +1025,42 @@ delete all the updates in an update group

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

 ARGUMENTS
  GROUPID  The ID of an update group to delete.

 FLAGS
-  --json  Return a json with the group ID of the deleted updates.
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --non-interactive  Run the command in non-interactive mode.

 DESCRIPTION
  delete all the updates in an update group
 ```

-_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/update/delete.ts)_

 ## `eas update:list`

-view the recent updates for a branch
+view the recent updates

 ```
 USAGE
-  $ eas update:list [--branch <value> | --all] [--json]
+  $ eas update:list [--branch <value> | --all] [--offset <value>] [--limit <value>] [--json --non-interactive]

 FLAGS
-  --all             List all updates associated with this project
-  --branch=<value>  List all updates on this branch
-  --json            Return a json with all of the recent update groups.
+  --all              List updates on all branches
+  --branch=<value>   List updates only on this branch
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --limit=<value>    The number of items to fetch each query. Defaults to 25 and is capped at 50.
+  --non-interactive  Run the command in non-interactive mode.
+  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.

 DESCRIPTION
-  view the recent updates for a branch
+  view the recent updates
 ```

-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/update/list.ts)_

 ## `eas update:view GROUPID`

@@ -944,13 +1074,13 @@ ARGUMENTS
  GROUPID  The ID of an update group.

 FLAGS
-  --json  Return a json with the updates belonging to the group.
+  --json  Enable JSON output, non-JSON messages will be printed to stderr.

 DESCRIPTION
  update group details
 ```

-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/update/view.ts)_

 ## `eas webhook:create`

@@ -958,10 +1088,11 @@ create a webhook

 ```
 USAGE
-  $ eas webhook:create [--event BUILD|SUBMIT] [--url <value>] [--secret <value>]
+  $ eas webhook:create [--event BUILD|SUBMIT] [--url <value>] [--secret <value>] [--non-interactive]

 FLAGS
  --event=(BUILD|SUBMIT)  Event type that triggers the webhook
+  --non-interactive       Run the command in non-interactive mode.
  --secret=<value>        Secret used to create a hash signature of the request payload, provided in the
                          'Expo-Signature' header.
  --url=<value>           Webhook URL
@@ -970,7 +1101,7 @@ DESCRIPTION
  create a webhook
 ```

-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/webhook/create.ts)_

 ## `eas webhook:delete [ID]`

@@ -978,16 +1109,19 @@ delete a webhook

 ```
 USAGE
-  $ eas webhook:delete [ID]
+  $ eas webhook:delete [ID] [--non-interactive]

 ARGUMENTS
  ID  ID of the webhook to delete

+FLAGS
+  --non-interactive  Run the command in non-interactive mode.
+
 DESCRIPTION
  delete a webhook
 ```

-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/webhook/delete.ts)_

 ## `eas webhook:list`

@@ -1004,7 +1138,7 @@ DESCRIPTION
  list webhooks
 ```

-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/webhook/list.ts)_

 ## `eas webhook:update`

@@ -1012,11 +1146,12 @@ update a webhook

 ```
 USAGE
-  $ eas webhook:update --id <value> [--event BUILD|SUBMIT] [--url <value>] [--secret <value>]
+  $ eas webhook:update --id <value> [--event BUILD|SUBMIT] [--url <value>] [--secret <value>] [--non-interactive]

 FLAGS
  --event=(BUILD|SUBMIT)  Event type that triggers the webhook
  --id=<value>            (required) Webhook ID
+  --non-interactive       Run the command in non-interactive mode.
  --secret=<value>        Secret used to create a hash signature of the request payload, provided in the
                          'Expo-Signature' header.
  --url=<value>           Webhook URL
@@ -1025,7 +1160,7 @@ DESCRIPTION
  update a webhook
 ```

-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/webhook/update.ts)_

 ## `eas webhook:view ID`

@@ -1042,7 +1177,7 @@ DESCRIPTION
  view a webhook
 ```

-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v2.2.1/packages/eas-cli/src/commands/webhook/view.ts)_

 ## `eas whoami`

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+
+require('@oclif/core')
+  .run()
+  .then(require('@oclif/core/flush'))
+  .catch(require('@oclif/core/handle'));
@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-
-import { Errors, flush, run } from '@oclif/core';
-
-run(undefined, import.meta.url)
-  .then(flush)
-  .catch(Errors.handle);
@@ -14,7 +14,7 @@ generates:
      dedupeOperationSuffix: true
    hooks:
      afterOneFileWrite:
-        - ./annotate-graphql-codegen.sh
+        - 'node ./scripts/annotate-graphql-codegen.js'
  ./graphql.schema.json:
    plugins:
      - 'introspection'
@@ -1,5 +1,5 @@
 module.exports = {
-  ...require('../../jest/jest.config.cjs'),
+  ...require('../../jest/jest.config.js'),
  rootDir: __dirname,
  roots: ['src', '__mocks__'],
  globalSetup: './jest/global-setup.ts',
@@ -1,5 +1,3 @@
-import { jest } from '@jest/globals';
-
 /* eslint-disable no-console */
 beforeAll(() => {
  console.log = jest.fn();
@@ -1,39 +1,40 @@
 {
  "name": "eas-cli",
-  "type": "module",
  "description": "EAS command line tool",
-  "version": "0.54.1",
+  "version": "2.2.1",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
  },
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
-    "@expo/apple-utils": "0.0.0-alpha.33",
+    "@expo/apple-utils": "0.0.0-alpha.34",
    "@expo/code-signing-certificates": "0.0.2",
-    "@expo/config": "6.0.23",
-    "@expo/config-plugins": "4.1.4",
-    "@expo/config-types": "45.0.0",
-    "@expo/eas-build-job": "0.2.77",
-    "@expo/eas-json": "0.54.0",
+    "@expo/config": "7.0.1",
+    "@expo/config-plugins": "5.0.1",
+    "@expo/config-types": "46.0.2",
+    "@expo/eas-build-job": "0.2.94",
+    "@expo/eas-json": "2.2.0",
    "@expo/json-file": "8.2.36",
    "@expo/multipart-body-parser": "1.1.0",
+    "@expo/package-manager": "0.0.56",
    "@expo/pkcs12": "0.0.8",
    "@expo/plist": "0.0.18",
    "@expo/plugin-autocomplete": "1.4.0",
-    "@expo/plugin-help": "5.2.0",
+    "@expo/plugin-help": "5.3.0",
    "@expo/plugin-warn-if-update-available": "2.3.0",
-    "@expo/prebuild-config": "3.1.6",
+    "@expo/prebuild-config": "5.0.3",
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
-    "@expo/spawn-async": "1.6.0",
+    "@expo/spawn-async": "1.7.0",
    "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "1.9.5",
-    "@urql/core": "2.4.4",
+    "@oclif/core": "1.13.10",
+    "@urql/core": "2.6.1",
    "@urql/exchange-retry": "0.3.3",
    "ajv": "^6.12.6",
+    "better-opn": "3.0.2",
    "chalk": "4.1.2",
-    "cli-progress": "3.11.0",
+    "cli-progress": "3.11.2",
    "cli-table3": "0.6.2",
    "dateformat": "4.6.3",
    "env-paths": "2.2.0",
@@ -55,7 +56,7 @@
    "keychain": "1.3.0",
    "log-symbols": "4.1.0",
    "mime": "3.0.0",
-    "minimatch": "5.0.1",
+    "minimatch": "5.1.0",
    "nanoid": "3.3.4",
    "node-fetch": "2.6.7",
    "node-forge": "1.3.1",
@@ -63,12 +64,12 @@
    "ora": "5.1.0",
    "pkg-dir": "4.2.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.3.7",
    "slash": "3.0.0",
-    "strip-ansi": "6.0.0",
    "tar": "6.1.11",
    "terminal-link": "2.1.1",
    "tslib": "2.4.0",
@@ -78,39 +79,38 @@
    "wrap-ansi": "7.0.0"
  },
  "devDependencies": {
-    "@graphql-codegen/cli": "2.6.2",
-    "@graphql-codegen/introspection": "2.1.1",
-    "@graphql-codegen/typescript": "2.4.11",
-    "@graphql-codegen/typescript-operations": "2.4.0",
-    "@jest/globals": "28.1.2",
-    "@types/cli-progress": "3.9.2",
+    "@graphql-codegen/cli": "2.11.5",
+    "@graphql-codegen/introspection": "2.2.1",
+    "@graphql-codegen/typescript": "2.7.3",
+    "@graphql-codegen/typescript-operations": "2.5.3",
+    "@types/cli-progress": "3.11.0",
    "@types/dateformat": "3.0.1",
    "@types/envinfo": "7.8.1",
    "@types/fs-extra": "9.0.13",
    "@types/getenv": "^1.0.0",
    "@types/mime": "2.0.3",
-    "@types/node-fetch": "^2.5.7",
-    "@types/node-forge": "1.0.2",
+    "@types/node-fetch": "2.6.2",
+    "@types/node-forge": "1.0.4",
+    "@types/promise-retry": "1.1.3",
    "@types/prompts": "2.0.14",
-    "@types/semver": "7.3.9",
-    "@types/tar": "6.1.1",
+    "@types/semver": "7.3.10",
+    "@types/tar": "6.1.2",
    "@types/tough-cookie": "4.0.2",
    "@types/uuid": "8.3.4",
    "@types/wrap-ansi": "3.0.0",
    "axios": "0.27.2",
    "eslint-plugin-graphql": "4.0.0",
-    "form-data": "4.0.0",
-    "globby": "13.1.2",
-    "memfs": "3.4.3",
+    "memfs": "3.4.7",
    "mockdate": "3.0.5",
-    "nock": "13.2.4",
-    "tempy": "0.7.0",
-    "ts-deepmerge": "2.0.1",
-    "ts-node": "10.8.2",
+    "nock": "13.2.9",
+    "rimraf": "3.0.2",
+    "ts-deepmerge": "2.0.5",
+    "ts-mockito": "2.6.1",
+    "ts-node": "10.9.1",
    "typescript": "4.7.4"
  },
  "engines": {
-    "node": ">=14.16"
+    "node": ">=14.0.0"
  },
  "files": [
    "/bin",
@@ -170,11 +170,11 @@
    },
    "warn-if-update-available": {
      "timeoutInDays": 0.5,
-      "message": "<%= chalk.bold('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available, please upgrade.') %>\n<%= chalk.dim('Proceeding with outdated version') %>\n"
+      "message": "<%= chalk('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available.') %>\n<%= chalk.dim('To upgrade, run ') %><%= chalk.dim(chalk.bold('npm install -g eas-cli')) %><%= chalk.dim('.') %>\n<%= chalk.dim('Proceeding with outdated version.') %>\n"
    },
    "update": {
      "node": {
-        "version": "12.13.0"
+        "version": "18.6.0"
      },
      "s3": {
        "templates": {
@@ -194,20 +194,19 @@
  },
  "repository": "expo/eas-cli",
  "scripts": {
-    "postpack": "rm -f oclif.manifest.json",
-    "prepack": "./scripts/prepack.sh",
+    "postpack": "rimraf oclif.manifest.json",
+    "prepack": "rimraf build && yarn build && node ./scripts/prepack.js",
    "pretarball-ci": "./scripts/pretarball-ci.sh",
    "build": "tsc --project tsconfig.build.json",
    "watch": "yarn build --watch --preserveWatchOutput",
    "typecheck": "tsc",
-    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
-    "version": "yarn oclif readme && node scripts/patch-readme.cjs && git add README.md",
+    "test": "jest",
+    "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
-    "clean": "rm -rf dist build tmp node_modules yarn-error.log",
-    "test-esm-imports": "cp ../../scripts/src/testESMImports.ts scripts/ && ts-node-esm ./scripts/testESMImports.ts 'build/**/*.js'"
+    "clean": "rimraf dist build tmp node_modules yarn-error.log"
  },
  "volta": {
-    "node": "18.2.0",
-    "yarn": "1.22.18"
+    "node": "18.6.0",
+    "yarn": "1.22.19"
  }
 }
@@ -3,21 +3,6 @@
  "type": "object",
  "definitions": {
    "apple": {
-      "AppleLocalizedPreviewFolder": {
-        "anyOf": [
-          {
-            "description": "Path to folder containing preview files",
-            "type": "string"
-          },
-          {
-            "type": "array",
-            "uniqueItems": true,
-            "items": {
-              "type": "string"
-            }
-          }
-        ]
-      },
      "AppleKidsAge": {
        "enum": [
          "FIVE_AND_UNDER",
@@ -464,62 +449,43 @@
      },
      "AppleRelease": {
        "type": "object",
+        "description": "Configure how the app is released in the app store.",
        "additionalProperties": false,
-        "defaultSnippets": [
-          {
-            "body": {
-              "automaticRelease": true,
-              "usesThirdPartyContent": false,
-              "usesNonExemptEncryption": false
-            }
-          }
-        ],
        "properties": {
-          "autoReleaseDate": {
-            "description": "ISO Date to release the app automatically. Leave undefined to manually release the app to the public.",
-            "defaultSnippets": [
-              {
-                "body": "$CURRENT_YEAR-${1:$CURRENT_MONTH}-${2:$CURRENT_DATE}"
-              }
-            ],
-            "anyOf": [
+          "automaticRelease": {
+            "description": "If and how the app should automatically be released when approved by App Store review.",
+            "markdownDescription": "If and how the app should automatically be released when approved by App Store review.\n- `false` - Manually release the app after store approval. (default behavior)\n- `true` - Automatically release after store approval.\n- `Date` - Automatically schedule release on this date, after store approval.\n\nApple does not guarantee that your app is available at the chosen scheduled release date.",
+            "oneOf": [
              {
                "type": "string",
                "format": "date-time"
              },
              {
-                "type": "string",
-                "format": "date"
+                "type": "boolean"
+              }
+            ],
+            "defaultSnippets": [
+              {
+                "label": "Manual release",
+                "description": "Manually release the app after store approval",
+                "body": false
              },
              {
-                "type": "number"
+                "label": "Automatic release",
+                "description": "Automatically release the app after store approval",
+                "body": true
+              },
+              {
+                "label": "Scheduled release",
+                "description": "Automatically release the app on this date, and store approval",
+                "body": "$CURRENT_YEAR-${1:$CURRENT_MONTH}-${2:$CURRENT_DATE}T${3:$CURRENT_HOUR}:00:00+00:00"
              }
            ]
          },
-          "isPhasedReleaseEnabled": {
+          "phasedRelease": {
            "type": "boolean",
-            "description": "Release update over 7-day period instead of instantly.",
-            "meta": {
-              "storeInfo": "Phased release for automatic updates lets you gradually release this update over a 7-day period to users who have turned on automatic updates. Keep in mind that this version will still be available to all users as a manual update from the App Store. You can pause the phased release for up to 30 days or release this update to all users at any time. [Learn More](https://help.apple.com/app-store-connect/#/dev3d65fcee1)."
-            }
-          },
-          "shouldResetRatings": {
-            "type": "boolean",
-            "description": "Should App Store ratings be reset for this version of the app.",
-            "meta": {
-              "storeInfo": "You can reset your app’s summary rating for all countries or regions when you release this version. Keep in mind that once this version is released, you won’t be able to restore the rating. Your app’s existing customer reviews will still appear on the App Store."
-            }
-          },
-          "usesThirdPartyContent": {
-            "type": "boolean"
-          },
-          "automaticRelease": {
-            "type": "boolean",
-            "description": "Should the app automatically be released when approved by App Store review."
-          },
-          "usesNonExemptEncryption": {
-            "type": "boolean",
-            "description": "Alternative to setting `ITSAppUsesNonExemptEncryption` in the binary's `Info.plist`."
+            "description": "Phased release for automatic updates lets you gradually release this update over a 7-day period to users who have turned on automatic updates. Keep in mind that this version will still be available to all users as a manual update from the App Store. You can pause the phased release for up to 30 days or release this update to all users at any time.\n@see https://help.apple.com/app-store-connect/#/dev3d65fcee1",
+            "markdownDescription": "Phased release for automatic updates lets you gradually release this update over a 7-day period to users who have turned on automatic updates.\n\nKeep in mind that this version will still be available to all users as a manual update from the App Store.\n\nYou can pause the phased release for up to 30 days or release this update to all users at any time.\n\n[Learn More](https://help.apple.com/app-store-connect/#/dev3d65fcee1)"
          }
        }
      },
@@ -606,11 +572,15 @@
      "description": "Configuration that is specific to the Apple App Store.",
      "additionalProperties": false,
      "properties": {
-        "advisory": {
-          "$ref": "#/definitions/apple/AppleAdvisory"
-        },
-        "categories": {
-          "$ref": "#/definitions/apple/AppleCategory"
+        "version": {
+          "type": "string",
+          "description": "The version string to edit, or create, if it doesn't exist. All the metadata will be stored on this app version.",
+          "minLength": 1,
+          "defaultSnippets": [
+            {
+              "body": "${1:1}.${2:0}"
+            }
+          ]
        },
        "copyright": {
          "type": "string",
@@ -626,6 +596,12 @@
            "storeInfo": "The name of the person or entity that owns the exclusive rights to your app, preceded by the year the rights were obtained (for example, \"2008 Acme Inc.\"). Do not provide a URL."
          }
        },
+        "advisory": {
+          "$ref": "#/definitions/apple/AppleAdvisory"
+        },
+        "categories": {
+          "$ref": "#/definitions/apple/AppleCategory"
+        },
        "info": {
          "description": "Localized core app info",
          "type": "object",
@@ -789,177 +765,6 @@
            }
          }
        },
-        "preview": {
-          "anyOf": [
-            {
-              "description": "Path to localized folders containing preview files",
-              "type": "string"
-            },
-            {
-              "description": "Localized previews object. Ex: `\"en-US\": [\"image.png\"]`",
-              "type": "object",
-              "additionalProperties": false,
-              "properties": {
-                "ar-SA": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Arabic"
-                },
-                "ca": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Catalan"
-                },
-                "zh-Hans": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Chinese (Simplified)"
-                },
-                "zh-Hant": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Chinese (Traditional)"
-                },
-                "hr": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Croatian"
-                },
-                "cs": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Czech"
-                },
-                "da": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Danish"
-                },
-                "nl-NL": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Dutch"
-                },
-                "en-AU": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "English (Australia)"
-                },
-                "en-CA": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "English (Canada)"
-                },
-                "en-GB": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "English (U.K.)"
-                },
-                "en-US": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "English (U.S.)"
-                },
-                "fi": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Finnish"
-                },
-                "fr-FR": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "French"
-                },
-                "fr-CA": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "French (Canada)"
-                },
-                "de-DE": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "German"
-                },
-                "el": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Greek"
-                },
-                "he": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Hebrew"
-                },
-                "hi": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Hindi"
-                },
-                "hu": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Hungarian"
-                },
-                "id": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Indonesian"
-                },
-                "it": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Italian"
-                },
-                "ja": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Japanese"
-                },
-                "ko": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Korean"
-                },
-                "ms": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Malay"
-                },
-                "no": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Norwegian"
-                },
-                "pl": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Polish"
-                },
-                "pt-BR": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Portuguese (Brazil)"
-                },
-                "pt-PT": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Portuguese (Portugal)"
-                },
-                "ro": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Romanian"
-                },
-                "ru": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Russian"
-                },
-                "sk": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Slovak"
-                },
-                "es-MX": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Spanish (Mexico)"
-                },
-                "es-ES": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Spanish (Spain)"
-                },
-                "sv": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Swedish"
-                },
-                "th": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Thai"
-                },
-                "tr": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Turkish"
-                },
-                "uk": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Ukrainian"
-                },
-                "vi": {
-                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
-                  "description": "Vietnamese"
-                }
-              }
-            }
-          ]
-        },
        "release": {
          "$ref": "#/definitions/apple/AppleRelease",
          "description": "Release strategy"
@@ -1,13 +1,15 @@
-#!/usr/bin/env sh
+const fs = require('fs/promises');

-OUTFILE="src/graphql/generated.ts"
+const path = './src/graphql/generated.ts';

-content="/**
+(async () => {
+  const generatedCode = await fs.readFile(path, 'utf8');
+  const comment = `/**
 * This file was generated using GraphQL Codegen
 * Command: yarn generate-graphql-code
 * Run this during development for automatic type generation when editing GraphQL documents
 * For more info and docs, visit https://graphql-code-generator.com/
- */
-"
+ */\n\n`;

-printf '%s\n%s\n' "$content" "$(cat $OUTFILE)" > $OUTFILE
+  await fs.writeFile(path, comment + generatedCode);
+})();
@@ -1,4 +1,4 @@
-const { promises: fs } = require('fs');
+const fs = require('fs/promises');

 (async () => {
  // Patch `oclif readme` path and link generation
@@ -0,0 +1,7 @@
+const spawn = require('@expo/spawn-async');
+
+(async () => {
+  if (!process.env.CLI_SIZE_CHECK) {
+    await spawn('yarn', ['oclif', 'manifest'], { stdio: 'inherit' });
+  }
+})();
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-rm -rf build
-yarn build
-
-if [ -z "$CLI_SIZE_CHECK" ]; then
-  yarn oclif manifest
-fi
@@ -1,7 +1,7 @@
 import assert from 'assert';
 import nock from 'nock';

-import { ApiV2Error, api, getExpoApiBaseUrl } from '../api.js';
+import { ApiV2Error, api, getExpoApiBaseUrl } from '../api';

 describe('apiClient', () => {
  it('converts Expo APIv2 error to ApiV2Error', async () => {
@@ -1,60 +0,0 @@
-import { Actor } from '../user/User.js';
-
-interface MockProject {
-  projectRoot: string;
-  projectTree: Record<string, string>;
-  appJSON: AppJSON;
-  packageJSON: PackageJSON;
-}
-
-interface PackageJSON {
-  name: string;
-  version: string;
-  description: string;
-  main: string;
-}
-
-interface AppJSON {
-  expo: {
-    name: string;
-    version: string;
-    slug: string;
-    sdkVersion: string;
-    owner?: string;
-    [key: string]: any;
-  };
-}
-
-export function createTestProject(
-  user: Actor,
-  appJSONExtraData?: Record<string, object | string>
-): MockProject {
-  const projectRoot = '/test-project';
-  const packageJSON: PackageJSON = {
-    name: 'testing123',
-    version: '0.1.0',
-    description: 'fake description',
-    main: 'index.js',
-  };
-
-  const owner = appJSONExtraData?.owner as string | undefined;
-  const appJSON: AppJSON = {
-    expo: {
-      name: 'testing 123',
-      version: '0.1.0',
-      slug: 'testing-123',
-      sdkVersion: '33.0.0',
-      owner: owner ?? (user.__typename === 'User' ? user.username : undefined),
-      ...appJSONExtraData,
-    },
-  };
-  return {
-    appJSON,
-    packageJSON,
-    projectRoot,
-    projectTree: {
-      [projectRoot + '/package.json']: JSON.stringify(packageJSON, null, 2),
-      [projectRoot + '/app.json']: JSON.stringify(appJSON, null, 2),
-    },
-  };
-}
@@ -1,17 +1,17 @@
-import { fixArchiveUrl } from '../uploads.js';
+import { fixS3Url } from '../uploads';

-describe(fixArchiveUrl, () => {
+describe(fixS3Url, () => {
  it('fixes broken links', () => {
    const input =
      'https://submission-service-archives.s3.amazonaws.com/production%2Fdc98ca84-1473-4cb3-ae81-8c7b291cb27e%2F4424aa95-b985-4e2f-8755-9507b1037c1c';
    const expectedOutput =
      'https://submission-service-archives.s3.amazonaws.com/production/dc98ca84-1473-4cb3-ae81-8c7b291cb27e/4424aa95-b985-4e2f-8755-9507b1037c1c';
-    expect(fixArchiveUrl(input)).toBe(expectedOutput);
+    expect(fixS3Url(input)).toBe(expectedOutput);
  });

  it('does not change correct urls', () => {
    const correctUrl =
      'https://submission-service-archives.s3.amazonaws.com/production/dc98ca84-1473-4cb3-ae81-8c7b291cb27e/4424aa95-b985-4e2f-8755-9507b1037c1c';
-    expect(fixArchiveUrl(correctUrl)).toBe(correctUrl);
+    expect(fixS3Url(correctUrl)).toBe(correctUrl);
  });
 });
@@ -1,4 +1,4 @@
-import { Analytics, Event } from './events.js';
+import { Analytics, Event } from './events';

 export type TrackingContext = Record<string, string | number | boolean>;

@@ -1,4 +1,4 @@
-import { logEvent } from './rudderstackClient.js';
+import { logEvent } from './rudderstackClient';
 export type Event = BuildEvent | SubmissionEvent | MetadataEvent;

 export enum SubmissionEvent {
@@ -15,6 +15,9 @@ export enum SubmissionEvent {
  SUBMIT_REQUEST_ATTEMPT = 'submit cli request attempt',
  SUBMIT_REQUEST_SUCCESS = 'submit cli request success',
  SUBMIT_REQUEST_FAIL = 'submit cli request fail',
+  API_KEY_DOWNLOAD_FAIL = 'submit cli credentials api key download fail',
+  API_KEY_DOWNLOAD_RETRY = 'submit cli credentials api key download fail temporary',
+  API_KEY_DOWNLOAD_SUCCESS = 'submit cli credentials api key download succeed',
 }

 export enum BuildEvent {
@@ -1,12 +1,10 @@
-import RudderAnalyticsModule from '@expo/rudder-sdk-node';
+import RudderAnalytics from '@expo/rudder-sdk-node';
 import os from 'os';
 import { URL } from 'url';
 import { v4 as uuidv4 } from 'uuid';

-import UserSettings from '../user/UserSettings.js';
-import { easCliVersion } from '../utils/easCli.js';
-
-const RudderAnalytics = RudderAnalyticsModule.default;
+import UserSettings from '../user/UserSettings';
+import { easCliVersion } from '../utils/easCli';

 const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
  darwin: 'Mac',
@@ -14,7 +12,7 @@ const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
  linux: 'Linux',
 };

-let rudderstackClient: RudderAnalyticsModule.default | null = null;
+let rudderstackClient: RudderAnalytics | null = null;
 let userIdentified = false;
 let identifyData: {
  userId: string;
@@ -1,10 +1,10 @@
 import { JSONValue } from '@expo/json-file';

-import fetch, { RequestError, RequestInit } from './fetch.js';
-import { getAccessToken, getSessionSecret } from './user/sessionStorage.js';
+import fetch, { RequestError, RequestInit } from './fetch';
+import { getAccessToken, getSessionSecret } from './user/sessionStorage';

 export class ApiV2Error extends Error {
-  readonly name = 'ApiV2Error';
+  override readonly name = 'ApiV2Error';
  readonly expoApiV2ErrorCode: string;
  readonly expoApiV2ErrorDetails?: JSONValue;
  readonly expoApiV2ErrorServerStack?: string;
@@ -0,0 +1,124 @@
+import chalk from 'chalk';
+import CliTable from 'cli-table3';
+
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
+import { UpdateBranchFragment } from '../graphql/generated';
+import { BranchQuery } from '../graphql/queries/BranchQuery';
+import Log from '../log';
+import { UPDATE_COLUMNS, formatUpdateMessage, getPlatformsForGroup } from '../update/utils';
+import { printJsonOnlyOutput } from '../utils/json';
+import {
+  paginatedQueryWithConfirmPromptAsync,
+  paginatedQueryWithSelectPromptAsync,
+} from '../utils/queries';
+
+export const BRANCHES_LIMIT = 50;
+
+export async function selectBranchOnAppAsync({
+  projectId,
+  promptTitle,
+  displayTextForListItem,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  displayTextForListItem: (queryItem: UpdateBranchFragment) => string;
+  promptTitle: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<UpdateBranchFragment> {
+  if (paginatedQueryOptions.nonInteractive) {
+    throw new Error('Unable to select a branch in non-interactive mode.');
+  }
+
+  const selectedBranch = await paginatedQueryWithSelectPromptAsync({
+    limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
+    offset: paginatedQueryOptions.offset,
+    queryToPerform: (limit, offset) => queryBranchesOnProjectAsync(limit, offset, projectId),
+    promptOptions: {
+      title: promptTitle,
+      getIdentifierForQueryItem: updateBranchFragment => updateBranchFragment.id,
+      createDisplayTextForSelectionPromptListItem: displayTextForListItem,
+    },
+  });
+  if (!selectedBranch) {
+    throw new Error(`Could not find any branches for project "${projectId}"`);
+  }
+  return selectedBranch;
+}
+
+export async function listAndRenderBranchesOnAppAsync({
+  projectId,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  if (paginatedQueryOptions.nonInteractive) {
+    const branches = await queryBranchesOnProjectAsync(
+      paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
+      paginatedQueryOptions.offset,
+      projectId
+    );
+    renderPageOfBranches(branches, paginatedQueryOptions);
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      queryToPerform: (limit, offset) => queryBranchesOnProjectAsync(limit, offset, projectId),
+      promptOptions: {
+        title: 'Load more branches?',
+        renderListItems: branches => renderPageOfBranches(branches, paginatedQueryOptions),
+      },
+    });
+  }
+}
+
+async function queryBranchesOnProjectAsync(
+  limit: number,
+  offset: number,
+  projectId: string
+): Promise<UpdateBranchFragment[]> {
+  return await BranchQuery.listBranchesOnAppAsync({
+    appId: projectId,
+    limit,
+    offset,
+  });
+}
+
+function renderPageOfBranches(
+  currentPage: UpdateBranchFragment[],
+  { json }: PaginatedQueryOptions
+): void {
+  if (json) {
+    printJsonOnlyOutput(currentPage);
+  } else {
+    const table = new CliTable({
+      head: ['Branch', ...UPDATE_COLUMNS],
+      wordWrap: true,
+    });
+
+    table.push(
+      ...currentPage.map(branch => {
+        if (branch.updates.length === 0) {
+          return [branch.name, 'N/A', 'N/A', 'N/A', 'N/A'];
+        }
+
+        const latestUpdateOnBranch = branch.updates[0];
+        return [
+          branch.name,
+          formatUpdateMessage(latestUpdateOnBranch),
+          latestUpdateOnBranch.runtimeVersion,
+          latestUpdateOnBranch.group,
+          getPlatformsForGroup({
+            group: latestUpdateOnBranch.group,
+            updates: branch.updates,
+          }),
+        ];
+      })
+    );
+
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('Branches:'));
+    Log.addNewLineIfNone();
+    Log.log(table.toString());
+  }
+}
@@ -0,0 +1,14 @@
+import { getVcsClient } from '../vcs';
+
+export async function getDefaultBranchNameAsync(): Promise<string> {
+  return (
+    (await getVcsClient().getBranchNameAsync()) ||
+    `branch-${Math.random().toString(36).substring(2, 4)}`
+  );
+}
+
+export class BranchNotFoundError extends Error {
+  constructor(message?: string) {
+    super(message ?? 'Branch not found.');
+  }
+}
@@ -0,0 +1,83 @@
+import { v4 as uuid } from 'uuid';
+
+import { selectBuildToCancelAsync } from '../../commands/build/cancel';
+import { AppPlatform, BuildFragment, BuildPriority, 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(selectBuildToCancelAsync.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 () => {
+    jest.mocked(confirmAsync).mockResolvedValueOnce(false);
+    expect(selectBuildToCancelAsync(projectId, 'blah')).resolves.toEqual(null);
+  });
+
+  it('returns build id when confirmation is confirmed', async () => {
+    jest.mocked(selectAsync).mockResolvedValueOnce(selectedBuildId);
+    jest.mocked(confirmAsync).mockResolvedValueOnce(true);
+    expect(selectBuildToCancelAsync(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,
+  };
+}
@@ -0,0 +1,14 @@
+import { truncateGitCommitMessage } from '../metadata';
+
+describe(truncateGitCommitMessage, () => {
+  it('returns undefined if no message was passed', () => {
+    expect(truncateGitCommitMessage(undefined)).toBeUndefined();
+  });
+  it('returns commit message', () => {
+    expect(truncateGitCommitMessage('a'.repeat(10))).toBe('a'.repeat(10));
+  });
+
+  it('truncates long commit messages', () => {
+    expect(truncateGitCommitMessage('a'.repeat(5000))).toBe(`${'a'.repeat(4093)}...`);
+  });
+});
@@ -7,16 +7,13 @@ import { vol } from 'memfs';
 import os from 'os';
 import path from 'path';

-import {
-  getAppBuildGradleAsync,
-  resolveConfigValue,
-} from '../../../project/android/gradleUtils.js';
+import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
 import {
  BumpStrategy,
  bumpVersionAsync,
  bumpVersionInAppJsonAsync,
  maybeResolveVersionsAsync,
-} from '../version.js';
+} from '../version';

 const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');
@@ -76,39 +73,39 @@ describe(bumpVersionAsync, () => {

    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.VERSION_CODE,
-      projectDir: '/repo',
+      projectDir: '/app',
      exp: fakeExp,
    });

-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
    expect(fakeExp.version).toBe('3.0.0');
    expect(fakeExp.android?.versionCode).toBe(124);
    expect(appJSON.expo.version).toBe('3.0.0');
    expect(appJSON.expo.android.versionCode).toBe(124);

-    const buildGradle = await getAppBuildGradleAsync('/repo');
+    const buildGradle = await getAppBuildGradleAsync('/app');
    assert(buildGradle);
    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('124');
    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
  });

-  it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.SHORT_VERSION', async () => {
+  it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.APP_VERSION', async () => {
    const nativeVersionName = '1.0.0'; // this should be overwritten by bumpVersionAsync
    const fakeExp = initBareWorkflowProject({ versionName: nativeVersionName });

    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.APP_VERSION,
-      projectDir: '/repo',
+      projectDir: '/app',
      exp: fakeExp,
    });

-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
    expect(fakeExp.version).toBe('3.0.1');
    expect(fakeExp.android?.versionCode).toBe(123);
    expect(appJSON.expo.version).toBe('3.0.1');
    expect(appJSON.expo.android.versionCode).toBe(123);

-    const buildGradle = await getAppBuildGradleAsync('/repo');
+    const buildGradle = await getAppBuildGradleAsync('/app');
    assert(buildGradle);
    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('123');
    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.1');
@@ -119,17 +116,17 @@ describe(bumpVersionAsync, () => {

    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.NOOP,
-      projectDir: '/repo',
+      projectDir: '/app',
      exp: fakeExp,
    });

-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
    expect(fakeExp.version).toBe('3.0.0');
    expect(fakeExp.android?.versionCode).toBe(123);
    expect(appJSON.expo.version).toBe('3.0.0');
    expect(appJSON.expo.android.versionCode).toBe(123);

-    const buildGradle = await getAppBuildGradleAsync('/repo');
+    const buildGradle = await getAppBuildGradleAsync('/app');
    assert(buildGradle);
    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('123');
    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
@@ -143,11 +140,11 @@ describe(bumpVersionInAppJsonAsync, () => {

    await bumpVersionInAppJsonAsync({
      bumpStrategy: BumpStrategy.VERSION_CODE,
-      projectDir: '/repo',
+      projectDir: '/app',
      exp: fakeExp,
    });

-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
    expect(fakeExp.version).toBe('5.0.0');
    expect(fakeExp.android?.versionCode).toBe(127);
    expect(appJSON.expo.version).toBe('5.0.0');
@@ -159,11 +156,11 @@ describe(bumpVersionInAppJsonAsync, () => {

    await bumpVersionInAppJsonAsync({
      bumpStrategy: BumpStrategy.APP_VERSION,
-      projectDir: '/repo',
+      projectDir: '/app',
      exp: fakeExp,
    });

-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
    expect(fakeExp.version).toBe('5.0.1');
    expect(fakeExp.android?.versionCode).toBe(126);
    expect(appJSON.expo.version).toBe('5.0.1');
@@ -175,11 +172,11 @@ describe(bumpVersionInAppJsonAsync, () => {

    await bumpVersionInAppJsonAsync({
      bumpStrategy: BumpStrategy.NOOP,
-      projectDir: '/repo',
+      projectDir: '/app',
      exp: fakeExp,
    });

-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
    expect(fakeExp.version).toBe('5.0.0');
    expect(fakeExp.android?.versionCode).toBe(126);
    expect(appJSON.expo.version).toBe('5.0.0');
@@ -192,7 +189,7 @@ describe(maybeResolveVersionsAsync, () => {
    it('reads the versions from native code', async () => {
      const exp = initBareWorkflowProject();
      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
-        '/repo',
+        '/app',
        exp,
        {} as BuildProfile<Platform.ANDROID>
      );
@@ -204,7 +201,7 @@ describe(maybeResolveVersionsAsync, () => {
    it('reads the versions from expo config', async () => {
      const exp = initManagedProject();
      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
-        '/repo',
+        '/app',
        exp,
        {} as BuildProfile<Platform.ANDROID>
      );
@@ -243,7 +240,7 @@ function initBareWorkflowProject({
 }`,
      './android/app/src/main/AndroidManifest.xml': 'fake',
    },
-    '/repo'
+    '/app'
  );

  return fakeExp;
@@ -264,7 +261,7 @@ function initManagedProject(): ExpoConfig {
        expo: fakeExp,
      }),
    },
-    '/repo'
+    '/app'
  );

  return fakeExp;
@@ -1,33 +1,34 @@
 import { Android, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import { AppVersionSource } from '@expo/eas-json';
 import chalk from 'chalk';
+import nullthrows from 'nullthrows';

 import AndroidCredentialsProvider, {
  AndroidCredentials,
-} from '../../credentials/android/AndroidCredentialsProvider.js';
-import { BuildParamsInput } from '../../graphql/generated.js';
-import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation.js';
-import Log from '../../log.js';
+} from '../../credentials/android/AndroidCredentialsProvider';
+import { BuildParamsInput } from '../../graphql/generated';
+import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
+import Log from '../../log';
 import {
  ensureApplicationIdIsDefinedForManagedProjectAsync,
  getApplicationIdAsync,
-} from '../../project/android/applicationId.js';
-import { resolveGradleBuildContextAsync } from '../../project/android/gradle.js';
-import { toggleConfirmAsync } from '../../prompts.js';
-import { findAccountByName } from '../../user/Account.js';
-import { nullthrows } from '../../utils/nullthrows.js';
+} from '../../project/android/applicationId';
+import { resolveGradleBuildContextAsync } from '../../project/android/gradle';
+import { toggleConfirmAsync } from '../../prompts';
 import {
  BuildRequestSender,
  CredentialsResult,
  JobData,
  prepareBuildRequestForPlatformAsync,
-} from '../build.js';
-import { AndroidBuildContext, BuildContext, CommonContext } from '../context.js';
-import { transformMetadata } from '../graphql.js';
-import { logCredentialsSource } from '../utils/credentials.js';
-import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate.js';
-import { transformJob } from './graphql.js';
-import { prepareJobAsync } from './prepareJob.js';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration.js';
+} from '../build';
+import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
+import { transformMetadata } from '../graphql';
+import { logCredentialsSource } from '../utils/credentials';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } 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>
@@ -45,7 +46,7 @@ This means that it will most likely produce an AAB and you will not be able to i
    Log.newLine();
    const confirmed = await toggleConfirmAsync({ message: 'Would you like to proceed?' });
    if (!confirmed) {
-      Log.error('Please update eas.json and come back again.');
+      Log.error('Update eas.json and come back again.');
      process.exit(1);
    }
  }
@@ -56,12 +57,22 @@ This means that it will most likely produce an AAB and you will not be able to i
  const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);

  if (ctx.workflow === Workflow.MANAGED) {
-    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp, ctx.user);
  }

  const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
+  const versionCodeOverride =
+    ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
+      ? await resolveRemoteVersionCodeAsync({
+          projectDir: ctx.projectDir,
+          projectId: ctx.projectId,
+          exp: ctx.exp,
+          applicationId,
+          buildProfile,
+        })
+      : undefined;

-  return { applicationId, gradleContext };
+  return { applicationId, gradleContext, versionCodeOverride };
 }

 export async function prepareAndroidBuildAsync(
@@ -76,7 +87,11 @@ export async function prepareAndroidBuildAsync(
      await syncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
-        buildProfile: ctx.buildProfile,
+        localAutoIncrement:
+          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
+            ? false
+            : ctx.buildProfile.autoIncrement,
+        projectId: ctx.projectId,
      });
    },
    prepareJobAsync: async (
@@ -121,7 +136,7 @@ async function ensureAndroidCredentialsAsync(
  const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {
    app: {
      account: nullthrows(
-        findAccountByName(ctx.user.accounts, ctx.accountName),
+        ctx.user.accounts.find(a => a.name === ctx.accountName),
        `You do not have access to account: ${ctx.accountName}`
      ),
      projectName: ctx.projectName,
@@ -1,7 +1,7 @@
 import { Android } from '@expo/eas-build-job';

-import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated.js';
-import { transformProjectArchive, transformWorkflow } from '../graphql.js';
+import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated';
+import { transformProjectArchive, transformWorkflow } from '../graphql';

 export function transformJob(job: Android.Job): AndroidJobInput {
  return {
@@ -13,8 +13,10 @@ export function transformJob(job: Android.Job): AndroidJobInput {
    secrets: job.secrets,
    builderEnvironment: job.builderEnvironment,
    cache: job.cache,
+    version: job.version?.versionCode ? { versionCode: job.version.versionCode } : undefined,
    gradleCommand: job.gradleCommand,
-    artifactPath: job.artifactPath,
+    applicationArchivePath: job.applicationArchivePath,
+    buildArtifactPaths: job.buildArtifactPaths,
    username: job.username,
    buildType: job.buildType && transformBuildType(job.buildType),
    developmentClient: job.developmentClient,
@@ -3,11 +3,10 @@ import { BuildProfile } from '@expo/eas-json';
 import path from 'path';
 import slash from 'slash';

-import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider.js';
-import { getUsername } from '../../project/projectUtils.js';
-import { ensureLoggedInAsync } from '../../user/actions.js';
-import { getVcsClient } from '../../vcs/index.js';
-import { BuildContext } from '../context.js';
+import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
+import { getUsername } from '../../project/projectUtils';
+import { getVcsClient } from '../../vcs';
+import { BuildContext } from '../context';

 interface JobData {
  projectArchive: ArchiveSource;
@@ -24,7 +23,7 @@ export async function prepareJobAsync(
  ctx: BuildContext<Platform.ANDROID>,
  jobData: JobData
 ): Promise<Job> {
-  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
+  const username = getUsername(ctx.exp, ctx.user);
  const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
  const projectRootDirectory =
    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
@@ -72,9 +71,15 @@ export async function prepareJobAsync(
    updates: { channel: ctx.buildProfile.channel },
    developmentClient: buildProfile.developmentClient,
    gradleCommand: buildProfile.gradleCommand,
-    artifactPath: buildProfile.artifactPath,
+    applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
+    buildArtifactPaths: buildProfile.buildArtifactPaths,
    buildType,
    username,
+    ...(ctx.android.versionCodeOverride && {
+      version: {
+        versionCode: ctx.android.versionCodeOverride,
+      },
+    }),
    experimental: {
      prebuildCommand: ctx.buildProfile.prebuildCommand,
    },
@@ -1,36 +1,35 @@
 import { ExpoConfig } from '@expo/config';
-import ConfigPlugins from '@expo/config-plugins';
+import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { AndroidVersionAutoIncrement, BuildProfile } from '@expo/eas-json';
+import { AndroidVersionAutoIncrement } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';

-import Log from '../../log.js';
-import { isExpoUpdatesInstalled } from '../../project/projectUtils.js';
-import { resolveWorkflowAsync } from '../../project/workflow.js';
-import { syncUpdatesConfigurationAsync } from '../../update/android/UpdatesModule.js';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version.js';
-
-const { AndroidConfig } = ConfigPlugins;
+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';

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

  if (workflow === Workflow.GENERIC) {
    await cleanUpOldEasBuildGradleScriptAsync(projectDir);
    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(projectDir, exp);
+      await syncUpdatesConfigurationAsync(projectDir, exp, projectId);
    }
    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
  } else {
@@ -1,21 +1,24 @@
 import { ExpoConfig } from '@expo/config';
-import ConfigPlugins from '@expo/config-plugins';
+import { AndroidConfig, Updates } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';

-import Log from '../../log.js';
+import { AppPlatform } from '../../graphql/generated';
+import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
+import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
+import Log from '../../log';
+import { ora } from '../../ora';
 import {
  getAppBuildGradleAsync,
  parseGradleCommand,
  resolveConfigValue,
-} from '../../project/android/gradleUtils.js';
-import { resolveWorkflowAsync } from '../../project/workflow.js';
-import { updateAppJsonConfigAsync } from '../utils/appJson.js';
-import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version.js';
-
-const { AndroidConfig } = ConfigPlugins;
+} from '../../project/android/gradleUtils';
+import { getNextVersionCode } from '../../project/android/versions';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { updateAppJsonConfigAsync } from '../utils/appJson';
+import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';

 export enum BumpStrategy {
  APP_VERSION,
@@ -48,9 +51,10 @@ export async function bumpVersionAsync({

  await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
  Log.log('Updated versions in app.json');
-  await writeVersionsToBuildGradleAsync({
+  await updateNativeVersionsAsync({
    projectDir,
-    exp,
+    version: exp.version,
+    versionCode: exp.android?.versionCode,
  });
  Log.log('Synchronized versions with build gradle');
 }
@@ -76,7 +80,7 @@ export async function bumpVersionInAppJsonAsync({
    await bumpAppVersionAsync({ appVersion, projectDir, exp });
  } else {
    const versionCode = AndroidConfig.Version.getVersionCode(exp);
-    const bumpedVersionCode = versionCode + 1;
+    const bumpedVersionCode = getNextVersionCode(versionCode);
    Log.log(
      `Bumping ${chalk.bold('expo.android.versionCode')} from ${chalk.bold(
        versionCode
@@ -118,21 +122,33 @@ export async function maybeResolveVersionsAsync(
  }
 }

-async function writeVersionsToBuildGradleAsync({
+export async function updateNativeVersionsAsync({
  projectDir,
-  exp,
+  version,
+  versionCode,
 }: {
  projectDir: string;
-  exp: ExpoConfig;
-}): Promise<string> {
+  version?: string;
+  versionCode?: number;
+}): Promise<void> {
  const buildGradle = await readBuildGradleAsync(projectDir);
  if (!buildGradle) {
    throw new Error('This project is missing a build.gradle file.');
  }
-  let updatedBuildGradle = AndroidConfig.Version.setVersionName(exp, buildGradle);
-  updatedBuildGradle = AndroidConfig.Version.setVersionCode(exp, updatedBuildGradle);
+  let updatedBuildGradle = buildGradle;
+  if (version !== undefined) {
+    updatedBuildGradle = updatedBuildGradle.replace(
+      new RegExp(`versionName ".*"`),
+      `versionName "${version}"`
+    );
+  }
+  if (versionCode !== undefined) {
+    updatedBuildGradle = updatedBuildGradle.replace(
+      new RegExp(`versionCode.*`),
+      `versionCode ${versionCode}`
+    );
+  }
  await writeBuildGradleAsync({ projectDir, buildGradle: updatedBuildGradle });
-  return updatedBuildGradle;
 }

 async function readBuildGradleAsync(projectDir: string): Promise<string | undefined> {
@@ -153,3 +169,97 @@ async function writeBuildGradleAsync({
  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
  await fs.writeFile(buildGradlePath, buildGradle);
 }
+
+/**
+ * Returns buildNumber that will be used for the next build. If current build profile
+ * has an 'autoIncrement' option set, it increments the version on server.
+ */
+export async function resolveRemoteVersionCodeAsync({
+  projectDir,
+  projectId,
+  exp,
+  applicationId,
+  buildProfile,
+}: {
+  projectDir: string;
+  projectId: string;
+  exp: ExpoConfig;
+  applicationId: string;
+  buildProfile: BuildProfile<Platform.ANDROID>;
+}): Promise<string> {
+  const remoteVersions = await AppVersionQuery.latestVersionAsync(
+    projectId,
+    AppPlatform.Android,
+    applicationId
+  );
+
+  const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile);
+  let currentBuildVersion: string;
+  if (remoteVersions?.buildVersion) {
+    currentBuildVersion = remoteVersions.buildVersion;
+  } else {
+    if (localVersions.appBuildVersion) {
+      Log.warn(
+        'No remote versions are configured for this project, versionCode will be initialized based on the value from the local project.'
+      );
+      currentBuildVersion = localVersions.appBuildVersion;
+    } else {
+      Log.error(
+        `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
+      );
+      throw new Error('Remote versions are not configured.');
+    }
+  }
+  if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
+    return currentBuildVersion;
+  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
+    const spinner = ora(
+      `Initializing versionCode with ${chalk.bold(currentBuildVersion)}.`
+    ).start();
+    try {
+      await AppVersionMutation.createAppVersionAsync({
+        appId: projectId,
+        platform: AppPlatform.Android,
+        applicationIdentifier: applicationId,
+        storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
+        buildVersion: currentBuildVersion,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
+      });
+      spinner.succeed(`Initialized versionCode with ${chalk.bold(currentBuildVersion)}.`);
+    } catch (err) {
+      spinner.fail(`Failed to initialize versionCode with ${chalk.bold(currentBuildVersion)}.`);
+      throw err;
+    }
+    return currentBuildVersion;
+  } else {
+    const nextBuildVersion = getNextVersionCode(currentBuildVersion);
+    const spinner = ora(
+      `Incrementing versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
+        nextBuildVersion
+      )}.`
+    ).start();
+    try {
+      await AppVersionMutation.createAppVersionAsync({
+        appId: projectId,
+        platform: AppPlatform.Android,
+        applicationIdentifier: applicationId,
+        storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
+        buildVersion: String(nextBuildVersion),
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
+      });
+      spinner.succeed(
+        `Incremented versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
+          nextBuildVersion
+        )}.`
+      );
+    } catch (err) {
+      spinner.fail(
+        `Failed to increment versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
+          nextBuildVersion
+        )}.`
+      );
+      throw err;
+    }
+    return String(nextBuildVersion);
+  }
+}
@@ -3,10 +3,11 @@ import { CredentialsSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import cliProgress from 'cli-progress';
 import fs from 'fs-extra';
+import nullthrows from 'nullthrows';

-import { withAnalyticsAsync } from '../analytics/common.js';
-import { BuildEvent } from '../analytics/events.js';
-import { getExpoWebsiteBaseUrl } from '../api.js';
+import { withAnalyticsAsync } from '../analytics/common';
+import { BuildEvent } from '../analytics/events';
+import { getExpoWebsiteBaseUrl } from '../api';
 import {
  AppPlatform,
  BuildFragment,
@@ -14,27 +15,26 @@ import {
  BuildPriority,
  BuildStatus,
  UploadSessionType,
-} from '../graphql/generated.js';
-import { BuildResult } from '../graphql/mutations/BuildMutation.js';
-import { BuildQuery } from '../graphql/queries/BuildQuery.js';
-import Log, { learnMore } from '../log.js';
-import { Ora, ora } from '../ora.js';
+} from '../graphql/generated';
+import { 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.js';
-import { uploadAsync } from '../uploads.js';
-import { formatBytes } from '../utils/files.js';
-import { nullthrows } from '../utils/nullthrows.js';
-import { createProgressTracker } from '../utils/progress.js';
-import { sleepAsync } from '../utils/promise.js';
-import { getVcsClient } from '../vcs/index.js';
-import { BuildContext } from './context.js';
-import { runLocalBuildAsync } from './local.js';
-import { collectMetadataAsync } from './metadata.js';
-import { printDeprecationWarnings } from './utils/printBuildInfo.js';
-import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository.js';
+} from '../platform';
+import { uploadFileAtPathToS3Async } from '../uploads';
+import { formatBytes } from '../utils/files';
+import { createProgressTracker } from '../utils/progress';
+import { sleepAsync } from '../utils/promise';
+import { getVcsClient } from '../vcs';
+import { BuildContext } from './context';
+import { runLocalBuildAsync } from './local';
+import { collectMetadataAsync } from './metadata';
+import { printDeprecationWarnings } from './utils/printBuildInfo';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';

 export interface CredentialsResult<Credentials> {
  source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
@@ -120,7 +120,7 @@ export async function prepareBuildRequestForPlatformAsync<

  return async () => {
    if (ctx.localBuildOptions.enable) {
-      await runLocalBuildAsync(job, ctx.localBuildOptions);
+      await runLocalBuildAsync(job, metadata, ctx.localBuildOptions);
      return undefined;
    } else {
      try {
@@ -134,18 +134,40 @@ export async function prepareBuildRequestForPlatformAsync<

 function handleBuildRequestError(error: any, platform: Platform): never {
  if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
-    Log.error('EAS Build API has changed, please upgrade to the latest eas-cli version.');
+    Log.error('EAS Build API has changed. Upgrade to the latest eas-cli version.');
    throw new Error('Build request failed.');
  } else if (
    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE'
  ) {
    Log.error(
-      'EAS Build is down for maintenance, please try again later. Check https://status.expo.dev/ for updates.'
+      `EAS Build is down for maintenance. Try again later. Check ${link(
+        'https://status.expo.dev/'
+      )} for updates.`
    );
    throw new Error('Build request failed.');
  } else if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED') {
    Log.error(
-      'EAS Build free tier is temporarily disabled, please try again later. Check https://status.expo.dev/ for updates.'
+      `EAS Build free tier is temporarily disabled and we are not accepting any new builds. Try again later. ${learnMore(
+        'https://expo.fyi/eas-build-queues'
+      )}`
+    );
+    throw new Error('Build request failed.');
+  } else if (
+    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED_IOS'
+  ) {
+    Log.error(
+      `EAS Build free tier is temporarily disabled for iOS and we are not accepting any new builds. Try again later. ${learnMore(
+        'https://expo.fyi/eas-build-queues'
+      )}`
+    );
+    throw new Error('Build request failed.');
+  } else if (
+    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED_ANDROID'
+  ) {
+    Log.error(
+      `EAS Build free tier is temporarily disabled for Android and we are not accepting any new builds. Try again later. ${learnMore(
+        'https://expo.fyi/eas-build-queues'
+      )}`
    );
    throw new Error('Build request failed.');
  } else if (
@@ -157,7 +179,7 @@ function handleBuildRequestError(error: any, platform: Platform): never {
    throw new Error('Build request failed.');
  } else if (error?.graphQLErrors) {
    Log.error(
-      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, please report the issue.'
+      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.'
    );
  }
  throw error;
@@ -177,9 +199,20 @@ async function uploadProjectAsync<TPlatform extends Platform>(
          )}`
        );
        const projectTarball = await makeProjectTarballAsync();
+
+        if (projectTarball.size > 1024 * 1024 * 100) {
+          Log.warn(
+            `Your project archive is ${formatBytes(
+              projectTarball.size
+            )}. You can reduce its size and the time it takes to upload by excluding files that are unnecessary for the build process in ${chalk.bold(
+              '.easignore'
+            )} file. ${learnMore('https://expo.fyi/eas-build-archive')}`
+          );
+        }
+
        projectTarballPath = projectTarball.path;

-        const { bucketKey } = await uploadAsync(
+        const { bucketKey } = await uploadFileAtPathToS3Async(
          UploadSessionType.EasBuildProjectSources,
          projectTarball.path,
          createProgressTracker({
@@ -243,11 +276,7 @@ type MaybeBuildFragment = BuildFragment | null;

 export async function waitForBuildEndAsync(
  { buildIds, accountName }: { buildIds: string[]; accountName: string },
-  {
-    // 2 hours (max build time limit) + 10 minutes (possible queue time)
-    timeoutSec = 2 * 60 * 60 + 10 * 60,
-    intervalSec = 10,
-  } = {}
+  { intervalSec = 10 } = {}
 ): Promise<MaybeBuildFragment[]> {
  let spinner;
  let originalSpinnerText;
@@ -259,8 +288,7 @@ export async function waitForBuildEndAsync(
    originalSpinnerText = 'Waiting for builds to complete. You can press Ctrl+C to exit.';
    spinner = ora('Waiting for builds to complete. You can press Ctrl+C to exit.').start();
  }
-  const endTime = new Date().getTime() + timeoutSec * 1000;
-  while (new Date().getTime() <= endTime) {
+  while (true) {
    const builds = await getBuildsSafelyAsync(buildIds);
    const { refetch } =
      builds.length === 1
@@ -271,10 +299,6 @@ export async function waitForBuildEndAsync(
    }
    await sleepAsync(intervalSec * 1000);
  }
-  spinner.fail('Timed out');
-  throw new Error(
-    'Timeout reached! It is taking longer than expected to finish the build, aborting...'
-  );
 }

 async function getBuildsSafelyAsync(buildIds: string[]): Promise<MaybeBuildFragment[]> {
@@ -352,7 +376,7 @@ async function handleSingleBuildProgressAsync(
          );
        }
        Log.newLine();
-        Log.log('Waiting in queue');
+        Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
        queueProgressBar.start(
          build.initialQueuePosition + 1,
          build.initialQueuePosition - build.queuePosition + 1,
@@ -385,6 +409,12 @@ async function handleSingleBuildProgressAsync(
  return { refetch: true };
 }

+const priorityToQueueDisplayName: Record<BuildPriority, string> = {
+  [BuildPriority.Normal]: 'queue',
+  [BuildPriority.NormalPlus]: 'queue',
+  [BuildPriority.High]: 'priority queue',
+};
+
 const statusToDisplayName: Record<BuildStatus, string> = {
  [BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
  [BuildStatus.InQueue]: 'in queue',
@@ -1,13 +1,13 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { EasJson, EasJsonReader } from '@expo/eas-json';
+import { EasJson, EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';

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

 interface ConfigureParams {
  projectDir: string;
@@ -24,7 +24,7 @@ interface ConfigureParams {
 export async function ensureProjectConfiguredAsync(
  configureParams: ConfigureParams
 ): Promise<boolean> {
-  if (await fs.pathExists(EasJsonReader.formatEasJsonPath(configureParams.projectDir))) {
+  if (await fs.pathExists(EasJsonAccessor.formatEasJsonPath(configureParams.projectDir))) {
    return false;
  }

@@ -89,7 +89,7 @@ const EAS_JSON_BARE_DEFAULT: EasJson = {
 };

 async function createEasJsonAsync(projectDir: string): Promise<void> {
-  const easJsonPath = EasJsonReader.formatEasJsonPath(projectDir);
+  const easJsonPath = EasJsonAccessor.formatEasJsonPath(projectDir);

  const hasAndroidNativeProject =
    (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
@@ -1,34 +1,35 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
+import { BuildProfile, EasJson } from '@expo/eas-json';

-import { TrackingContext } from '../analytics/common.js';
-import { CredentialsContext } from '../credentials/context.js';
-import { Target } from '../credentials/ios/types.js';
-import { BuildResourceClass } from '../graphql/generated.js';
-import { GradleBuildContext } from '../project/android/gradle.js';
-import { XcodeBuildContext } from '../project/ios/scheme.js';
-import { Actor } from '../user/User.js';
-import { LocalBuildOptions } from './local.js';
+import { TrackingContext } from '../analytics/common';
+import { CredentialsContext } from '../credentials/context';
+import { Target } from '../credentials/ios/types';
+import { BuildResourceClass } from '../graphql/generated';
+import { GradleBuildContext } from '../project/android/gradle';
+import { XcodeBuildContext } from '../project/ios/scheme';
+import { Actor } from '../user/User';
+import { LocalBuildOptions } from './local';

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

 export interface AndroidBuildContext {
  applicationId: string;
  gradleContext?: GradleBuildContext;
+  versionCodeOverride?: string;
 }

 export interface IosBuildContext {
  bundleIdentifier: string;
-  applicationTargetBuildSettings: XCBuildConfiguration['buildSettings'];
  applicationTarget: Target;
  targets: Target[];
  xcodeBuildContext: XcodeBuildContext;
+  buildNumberOverride?: string;
 }

 export interface BuildContext<T extends Platform> {
  accountName: string;
+  easJsonCliConfig: EasJson['cli'];
  buildProfile: BuildProfile<T>;
  buildProfileName: string;
  resourceClass: BuildResourceClass;
@@ -37,10 +38,13 @@ export interface BuildContext<T extends Platform> {
  exp: ExpoConfig;
  localBuildOptions: LocalBuildOptions;
  nonInteractive: boolean;
+  noWait: boolean;
+  runFromCI: boolean;
  platform: T;
  projectDir: string;
  projectId: string;
  projectName: string;
+  message?: string;
  trackingCtx: TrackingContext;
  user: Actor;
  workflow: Workflow;
@@ -1,59 +1,67 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-import JsonFileModule from '@expo/json-file';
+import { BuildProfile, EasJson } from '@expo/eas-json';
+import JsonFile from '@expo/json-file';
+import getenv from 'getenv';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';

-import { TrackingContext } from '../analytics/common.js';
-import { Analytics, BuildEvent } from '../analytics/events.js';
-import { CredentialsContext } from '../credentials/context.js';
-import { BuildResourceClass } from '../graphql/generated.js';
-import { getExpoConfig } from '../project/expoConfig.js';
-import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils.js';
-import { resolveWorkflowAsync } from '../project/workflow.js';
-import { findAccountByName } from '../user/Account.js';
-import { ensureLoggedInAsync } from '../user/actions.js';
-import { createAndroidContextAsync } from './android/build.js';
-import { BuildContext, CommonContext } from './context.js';
-import { createIosContextAsync } from './ios/build.js';
-import { LocalBuildOptions } from './local.js';
-
-const JsonFile = JsonFileModule.default;
+import { TrackingContext } from '../analytics/common';
+import { Analytics, BuildEvent } from '../analytics/events';
+import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
+import { CredentialsContext } from '../credentials/context';
+import { BuildResourceClass } from '../graphql/generated';
+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';

 export async function createBuildContextAsync<T extends Platform>({
  buildProfileName,
  buildProfile,
+  easJsonCliConfig,
  clearCache = false,
  localBuildOptions,
-  nonInteractive = false,
+  nonInteractive,
+  noWait,
  platform,
  projectDir,
  resourceClass,
+  message,
+  actor,
+  getDynamicProjectConfigAsync,
 }: {
  buildProfileName: string;
  buildProfile: BuildProfile<T>;
+  easJsonCliConfig: EasJson['cli'];
  clearCache: boolean;
  localBuildOptions: LocalBuildOptions;
  nonInteractive: boolean;
+  noWait: boolean;
  platform: T;
  projectDir: string;
  resourceClass: BuildResourceClass;
+  message?: string;
+  actor: Actor;
+  getDynamicProjectConfigAsync: DynamicConfigContextFn;
 }): Promise<BuildContext<T>> {
-  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
+  const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });

-  const user = await ensureLoggedInAsync();
-  const accountName = getProjectAccountName(exp, user);
  const projectName = exp.slug;
-  const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
+  const account = await getOwnerAccountForProjectIdAsync(projectId);
  const workflow = await resolveWorkflowAsync(projectDir, platform);
-  const accountId = findAccountByName(user.accounts, accountName)?.id;
+  const accountId = account.id;
+  const runFromCI = getenv.boolish('CI', false);

  const credentialsCtx = new CredentialsContext({
-    exp,
+    projectInfo: { exp, projectId },
    nonInteractive,
    projectDir,
-    user,
+    user: actor,
    env: buildProfile.env,
+    easJsonCliConfig,
  });

  const devClientProperties = getDevClientEventProperties({
@@ -68,26 +76,32 @@ export async function createBuildContextAsync<T extends Platform>({
    project_id: projectId,
    project_type: workflow,
    ...devClientProperties,
+    no_wait: noWait,
+    run_from_ci: runFromCI,
  };
  Analytics.logEvent(BuildEvent.BUILD_COMMAND, trackingCtx);

  const commonContext: CommonContext<T> = {
-    accountName,
+    accountName: account.name,
    buildProfile,
    buildProfileName,
    resourceClass,
+    easJsonCliConfig,
    clearCache,
    credentialsCtx,
    exp,
    localBuildOptions,
    nonInteractive,
+    noWait,
    platform,
    projectDir,
    projectId,
    projectName,
    trackingCtx,
-    user,
+    user: actor,
    workflow,
+    message,
+    runFromCI,
  };
  if (platform === Platform.ANDROID) {
    const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -8,7 +8,7 @@ import {
  DistributionType,
  ProjectArchiveSourceInput,
  ProjectArchiveSourceType,
-} from '../graphql/generated.js';
+} from '../graphql/generated';

 export function transformProjectArchive(archiveSource: ArchiveSource): ProjectArchiveSourceInput {
  if (archiveSource.type === ArchiveSourceType.S3) {
@@ -1,10 +1,11 @@
 import { ExpoConfig } from '@expo/config';
-import { InfoPlist } from '@expo/config-plugins';
+import { IOSConfig } from '@expo/config-plugins';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
+import type { XCBuildConfiguration } from 'xcode';

-import { readPlistAsync } from '../../../utils/plist.js';
+import { readPlistAsync } from '../../../utils/plist';
 import {
  BumpStrategy,
  bumpVersionAsync,
@@ -13,10 +14,16 @@ import {
  getInfoPlistPath,
  readBuildNumberAsync,
  readShortVersionAsync,
-} from '../version.js';
+} from '../version';

 jest.mock('fs');

+const getXCBuildConfigurationFromPbxproj = jest.spyOn(
+  IOSConfig.Target,
+  'getXCBuildConfigurationFromPbxproj'
+);
+const getPbxproj = jest.spyOn(IOSConfig.XcodeUtils, 'getPbxproj');
+
 afterAll(async () => {
  // do not remove the following line
  // this fixes a weird error with tempy in @expo/image-utils
@@ -51,18 +58,40 @@ describe(evaluateTemplateString, () => {

 // bare workflow
 describe(bumpVersionAsync, () => {
+  beforeEach(() => {
+    getPbxproj.mockImplementation(() => ({} as any));
+  });
+  afterEach(() => {
+    getXCBuildConfigurationFromPbxproj.mockReset();
+    getPbxproj.mockReset();
+  });
  it('bumps expo.ios.buildNumber and CFBundleVersion when strategy = BumpStrategy.BUILD_NUMBER', async () => {
    const fakeExp = initBareWorkflowProject();
-
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: 'myproject/Info.plist',
+          },
+        } as XCBuildConfiguration)
+    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
      projectDir: '/repo',
      exp: fakeExp,
-      buildSettings: {},
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
    });

    const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync('/repo/ios/myproject/Info.plist')) as InfoPlist;
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info.plist'
+    )) as IOSConfig.InfoPlist;
    expect(fakeExp.version).toBe('1.0.0');
    expect(fakeExp.ios?.buildNumber).toBe('2');
    expect(appJSON.expo.version).toBe('1.0.0');
@@ -74,17 +103,31 @@ describe(bumpVersionAsync, () => {
  it('bumps expo.ios.buildNumber and CFBundleVersion for non default Info.plist location', async () => {
    const fakeExp = initBareWorkflowProject({ infoPlistName: 'Info2.plist' });

+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
+          },
+        } as XCBuildConfiguration)
+    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
      projectDir: '/repo',
      exp: fakeExp,
-      buildSettings: {
-        INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
-      },
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
    });

    const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync('/repo/ios/myproject/Info2.plist')) as InfoPlist;
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info2.plist'
+    )) as IOSConfig.InfoPlist;
    expect(fakeExp.version).toBe('1.0.0');
    expect(fakeExp.ios?.buildNumber).toBe('2');
    expect(appJSON.expo.version).toBe('1.0.0');
@@ -93,18 +136,33 @@ describe(bumpVersionAsync, () => {
    expect(infoPlist['CFBundleVersion']).toBe('2');
  });

-  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
+  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.APP_VERSION', async () => {
    const fakeExp = initBareWorkflowProject();
-
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: 'myproject/Info.plist',
+          },
+        } as XCBuildConfiguration)
+    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.APP_VERSION,
      projectDir: '/repo',
      exp: fakeExp,
-      buildSettings: {},
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
    });

    const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync('/repo/ios/myproject/Info.plist')) as InfoPlist;
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info.plist'
+    )) as IOSConfig.InfoPlist;
    expect(fakeExp.version).toBe('1.0.1');
    expect(fakeExp.ios?.buildNumber).toBe('1');
    expect(appJSON.expo.version).toBe('1.0.1');
@@ -115,16 +173,31 @@ describe(bumpVersionAsync, () => {

  it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
    const fakeExp = initBareWorkflowProject();
-
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: 'myproject/Info.plist',
+          },
+        } as XCBuildConfiguration)
+    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.NOOP,
      projectDir: '/repo',
      exp: fakeExp,
-      buildSettings: {},
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
    });

    const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync('/repo/ios/myproject/Info.plist')) as InfoPlist;
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info.plist'
+    )) as IOSConfig.InfoPlist;
    expect(fakeExp.version).toBe('1.0.0');
    expect(fakeExp.ios?.buildNumber).toBe('1');
    expect(appJSON.expo.version).toBe('1.0.0');
@@ -280,9 +353,9 @@ describe(getInfoPlistPath, () => {

 function initBareWorkflowProject({
  appVersion = '1.0.0',
-  version = '1',
+  buildNumber = '1',
  infoPlistName = 'Info.plist',
-}: { appVersion?: string; version?: string; infoPlistName?: string } = {}): ExpoConfig {
+}: { appVersion?: string; buildNumber?: string; infoPlistName?: string } = {}): ExpoConfig {
  const fakeExp: ExpoConfig = {
    name: 'myproject',
    slug: 'myproject',
@@ -303,7 +376,7 @@ function initBareWorkflowProject({
  <key>CFBundleShortVersionString</key>
  <string>${appVersion}</string>
  <key>CFBundleVersion</key>
-  <string>${version}</string>
+  <string>${buildNumber}</string>
 </dict>
 </plist>`,
    },
@@ -1,23 +1,21 @@
-import ConfigPlugins from '@expo/config-plugins';
 import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
-import type { XCBuildConfiguration } from 'xcode';
+import { AppVersionSource } from '@expo/eas-json';

-import { IosCredentials, Target } from '../../credentials/ios/types.js';
-import { BuildParamsInput } from '../../graphql/generated.js';
-import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation.js';
-import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier.js';
-import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme.js';
-import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target.js';
-import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build.js';
-import { BuildContext, CommonContext, IosBuildContext } from '../context.js';
-import { transformMetadata } from '../graphql.js';
-import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate.js';
-import { ensureIosCredentialsAsync } from './credentials.js';
-import { transformJob } from './graphql.js';
-import { prepareJobAsync } from './prepareJob.js';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration.js';
-
-const { IOSConfig } = ConfigPlugins;
+import { IosCredentials } from '../../credentials/ios/types';
+import { BuildParamsInput } from '../../graphql/generated';
+import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
+import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
+import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
+import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target';
+import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
+import { BuildContext, CommonContext, IosBuildContext } from '../context';
+import { transformMetadata } from '../graphql';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } 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>
@@ -25,7 +23,7 @@ export async function createIosContextAsync(
  const { buildProfile } = ctx;

  if (ctx.workflow === Workflow.MANAGED) {
-    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
+    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp, ctx.user);
  }

  checkNodeEnvVariable(ctx);
@@ -46,14 +44,22 @@ export async function createIosContextAsync(
    env: buildProfile.env,
  });
  const applicationTarget = findApplicationTarget(targets);
-  const applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);
-
+  const buildNumberOverride =
+    ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
+      ? await resolveRemoteBuildNumberAsync({
+          projectDir: ctx.projectDir,
+          projectId: ctx.projectId,
+          exp: ctx.exp,
+          applicationTarget,
+          buildProfile,
+        })
+      : undefined;
  return {
    bundleIdentifier: applicationTarget.bundleIdentifier,
    applicationTarget,
-    applicationTargetBuildSettings,
    targets,
    xcodeBuildContext,
+    buildNumberOverride,
  };
 }

@@ -69,8 +75,12 @@ export async function prepareIosBuildAsync(
      await syncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
-        buildProfile: ctx.buildProfile,
-        buildSettings: ctx.ios.applicationTargetBuildSettings,
+        targets: ctx.ios.targets,
+        localAutoIncrement:
+          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
+            ? false
+            : ctx.buildProfile.autoIncrement,
+        projectId: ctx.projectId,
      });
    },
    prepareJobAsync: async (
@@ -99,18 +109,3 @@ export async function prepareIosBuildAsync(
    },
  });
 }
-
-function resolveBuildSettings(
-  ctx: CommonContext<Platform.IOS>,
-  applicationTarget: Target
-): XCBuildConfiguration['buildSettings'] {
-  if (ctx.workflow === Workflow.MANAGED) {
-    return {};
-  }
-  const project = IOSConfig.XcodeUtils.getPbxproj(ctx.projectDir);
-  const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
-    targetName: applicationTarget.targetName,
-    buildConfiguration: applicationTarget.buildConfiguration,
-  });
-  return xcBuildConfiguration?.buildSettings ?? {};
-}
@@ -1,11 +1,11 @@
 import { Platform } from '@expo/eas-build-job';

-import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider.js';
-import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils.js';
-import { IosCredentials, Target } from '../../credentials/ios/types.js';
-import { CredentialsResult } from '../build.js';
-import { BuildContext } from '../context.js';
-import { logCredentialsSource } from '../utils/credentials.js';
+import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
+import { getAppFromContextAsync } from '../../credentials/ios/actions/BuildCredentialsUtils';
+import { IosCredentials, Target } from '../../credentials/ios/types';
+import { CredentialsResult } from '../build';
+import { BuildContext } from '../context';
+import { logCredentialsSource } from '../utils/credentials';

 export async function ensureIosCredentialsAsync(
  buildCtx: BuildContext<Platform.IOS>,
@@ -16,7 +16,7 @@ export async function ensureIosCredentialsAsync(
  }

  const provider = new IosCredentialsProvider(buildCtx.credentialsCtx, {
-    app: getAppFromContext(buildCtx.credentialsCtx),
+    app: await getAppFromContextAsync(buildCtx.credentialsCtx),
    targets,
    distribution: buildCtx.buildProfile.distribution ?? 'store',
    enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
@@ -1,8 +1,8 @@
-import { Env, Ios } from '@expo/eas-build-job';
+import { Ios } from '@expo/eas-build-job';
+import nullthrows from 'nullthrows';

-import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated.js';
-import { nullthrows } from '../../utils/nullthrows.js';
-import { transformProjectArchive, transformWorkflow } from '../graphql.js';
+import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
+import { transformProjectArchive, transformWorkflow } from '../graphql';

 export function transformJob(job: Ios.Job): IosJobInput {
  return {
@@ -14,9 +14,11 @@ export function transformJob(job: Ios.Job): IosJobInput {
    secrets: transformIosSecrets(job.secrets),
    builderEnvironment: job.builderEnvironment,
    cache: job.cache,
+    version: job.version?.buildNumber ? { buildNumber: job.version.buildNumber } : undefined,
    scheme: job.scheme,
    buildConfiguration: job.buildConfiguration,
-    artifactPath: job.artifactPath,
+    applicationArchivePath: job.applicationArchivePath,
+    buildArtifactPaths: job.buildArtifactPaths,
    username: job.username,
    developmentClient: job.developmentClient,
    simulator: job.simulator,
@@ -26,7 +28,6 @@ export function transformJob(job: Ios.Job): IosJobInput {

 function transformIosSecrets(secrets: {
  buildCredentials?: Ios.BuildCredentials;
-  env?: Env;
 }): IosJobSecretsInput {
  const buildCredentials: IosJobSecretsInput['buildCredentials'] = [];

@@ -42,6 +43,5 @@ function transformIosSecrets(secrets: {

  return {
    buildCredentials,
-    environmentSecrets: secrets.env,
  };
 }
@@ -2,11 +2,10 @@ import { ArchiveSource, Ios, Job, Platform, sanitizeJob } from '@expo/eas-build-
 import path from 'path';
 import slash from 'slash';

-import { IosCredentials, TargetCredentials } from '../../credentials/ios/types.js';
-import { getUsername } from '../../project/projectUtils.js';
-import { ensureLoggedInAsync } from '../../user/actions.js';
-import { getVcsClient } from '../../vcs/index.js';
-import { BuildContext } from '../context.js';
+import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
+import { getUsername } from '../../project/projectUtils';
+import { getVcsClient } from '../../vcs';
+import { BuildContext } from '../context';

 interface JobData {
  projectArchive: ArchiveSource;
@@ -26,7 +25,7 @@ export async function prepareJobAsync(
 ): Promise<Job> {
  const projectRootDirectory =
    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
-  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
+  const username = getUsername(ctx.exp, ctx.user);
  const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
  if (jobData.credentials) {
    const targetNames = Object.keys(jobData.credentials);
@@ -64,8 +63,15 @@ export async function prepareJobAsync(
    simulator: ctx.buildProfile.simulator,
    scheme: jobData.buildScheme,
    buildConfiguration: ctx.buildProfile.buildConfiguration,
-    artifactPath: ctx.buildProfile.artifactPath,
+    applicationArchivePath:
+      ctx.buildProfile.applicationArchivePath ?? ctx.buildProfile.artifactPath,
+    buildArtifactPaths: ctx.buildProfile.buildArtifactPaths,
    username,
+    ...(ctx.ios.buildNumberOverride && {
+      version: {
+        buildNumber: ctx.ios.buildNumberOverride,
+      },
+    }),
    experimental: {
      prebuildCommand: ctx.buildProfile.prebuildCommand,
    },
@@ -1,33 +1,34 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
+import { IosVersionAutoIncrement } from '@expo/eas-json';

-import { isExpoUpdatesInstalled } from '../../project/projectUtils.js';
-import { resolveWorkflowAsync } from '../../project/workflow.js';
-import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule.js';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version.js';
+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';

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

  if (workflow === Workflow.GENERIC) {
    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(projectDir, exp);
+      await syncUpdatesConfigurationAsync(projectDir, exp, projectId);
    }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, buildSettings });
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
  } else {
    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
  }
@@ -1,18 +1,25 @@
-import { ExpoConfig, getConfigFilePaths } from '@expo/config';
-import ConfigPlugins, { InfoPlist } from '@expo/config-plugins';
+import { ExpoConfig } from '@expo/config';
+import { IOSConfig, Updates } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import path from 'path';
 import type { XCBuildConfiguration } from 'xcode';

-import Log from '../../log.js';
-import { resolveWorkflowAsync } from '../../project/workflow.js';
-import { promptAsync } from '../../prompts.js';
-import { readPlistAsync, writePlistAsync } from '../../utils/plist.js';
-import { updateAppJsonConfigAsync } from '../utils/appJson.js';
-import { bumpAppVersionAsync } from '../utils/version.js';
-
-const { IOSConfig } = ConfigPlugins;
+import { Target } from '../../credentials/ios/types';
+import { AppPlatform } from '../../graphql/generated';
+import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
+import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { findApplicationTarget } from '../../project/ios/target';
+import { getNextBuildNumber, isValidBuildNumber } from '../../project/ios/versions';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { promptAsync } from '../../prompts';
+import uniqBy from '../../utils/expodash/uniqBy';
+import { readPlistAsync, writePlistAsync } from '../../utils/plist';
+import { updateAppJsonConfigAsync } from '../utils/appJson';
+import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';

 export enum BumpStrategy {
  APP_VERSION,
@@ -24,21 +31,25 @@ export async function bumpVersionAsync({
  bumpStrategy,
  projectDir,
  exp,
-  buildSettings,
+  targets,
 }: {
  projectDir: string;
  exp: ExpoConfig;
  bumpStrategy: BumpStrategy;
-  buildSettings: XCBuildConfiguration['buildSettings'];
+  targets: Target[];
 }): Promise<void> {
  if (bumpStrategy === BumpStrategy.NOOP) {
    return;
  }
  ensureStaticConfigExists(projectDir);
-  const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
  await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
  Log.log('Updated versions in app.json');
-  await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist, buildSettings });
+  await updateNativeVersionsAsync({
+    projectDir,
+    version: exp.version,
+    buildNumber: exp.ios?.buildNumber,
+    targets,
+  });
  Log.log('Synchronized versions with Info.plist');
 }

@@ -61,10 +72,8 @@ export async function bumpVersionInAppJsonAsync({
    await bumpAppVersionAsync({ appVersion, projectDir, exp });
  } else {
    const buildNumber = IOSConfig.Version.getBuildNumber(exp);
-    if (buildNumber.match(/^\d+(\.\d+)*$/)) {
-      const comps = buildNumber.split('.');
-      comps[comps.length - 1] = String(Number(comps[comps.length - 1]) + 1);
-      const bumpedBuildNumber = comps.join('.');
+    if (isValidBuildNumber(buildNumber)) {
+      const bumpedBuildNumber = getNextBuildNumber(buildNumber);
      Log.log(
        `Bumping ${chalk.bold('expo.ios.buildNumber')} from ${chalk.bold(
          buildNumber
@@ -123,12 +132,21 @@ export async function readBuildNumberAsync(
 export async function maybeResolveVersionsAsync(
  projectDir: string,
  exp: ExpoConfig,
-  buildSettings: XCBuildConfiguration['buildSettings']
+  targets: Target[]
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
+  const applicationTarget = findApplicationTarget(targets);
  try {
    return {
-      appBuildVersion: await readBuildNumberAsync(projectDir, exp, buildSettings),
-      appVersion: await readShortVersionAsync(projectDir, exp, buildSettings),
+      appBuildVersion: await readBuildNumberAsync(
+        projectDir,
+        exp,
+        applicationTarget.buildSettings ?? {}
+      ),
+      appVersion: await readShortVersionAsync(
+        projectDir,
+        exp,
+        applicationTarget.buildSettings ?? {}
+      ),
    };
  } catch (err: any) {
    Log.warn('Failed to read app versions.');
@@ -139,23 +157,6 @@ export async function maybeResolveVersionsAsync(
  }
 }

-async function writeVersionsToInfoPlistAsync({
-  projectDir,
-  exp,
-  infoPlist,
-  buildSettings,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  infoPlist: InfoPlist;
-  buildSettings: XCBuildConfiguration['buildSettings'];
-}): Promise<InfoPlist> {
-  let updatedInfoPlist = IOSConfig.Version.setVersion(exp, infoPlist);
-  updatedInfoPlist = IOSConfig.Version.setBuildNumber(exp, updatedInfoPlist);
-  await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist, buildSettings });
-  return updatedInfoPlist;
-}
-
 export function getInfoPlistPath(
  projectDir: string,
  buildSettings: XCBuildConfiguration['buildSettings']
@@ -178,29 +179,60 @@ export function getInfoPlistPath(
 async function readInfoPlistAsync(
  projectDir: string,
  buildSettings: XCBuildConfiguration['buildSettings']
-): Promise<InfoPlist> {
+): Promise<IOSConfig.InfoPlist> {
  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
-  return ((await readPlistAsync(infoPlistPath)) ?? {}) as InfoPlist;
+  return ((await readPlistAsync(infoPlistPath)) ?? {}) as IOSConfig.InfoPlist;
 }

-async function writeInfoPlistAsync({
+export async function updateNativeVersionsAsync({
  projectDir,
-  infoPlist,
-  buildSettings,
+  version,
+  buildNumber,
+  targets,
 }: {
  projectDir: string;
-  infoPlist: InfoPlist;
-  buildSettings: XCBuildConfiguration['buildSettings'];
+  version?: string;
+  buildNumber?: string;
+  targets: Target[];
 }): Promise<void> {
-  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
-  await writePlistAsync(infoPlistPath, infoPlist);
+  const project = IOSConfig.XcodeUtils.getPbxproj(projectDir);
+  const iosDir = path.join(projectDir, 'ios');
+
+  const infoPlistFiles: string[] = [];
+  for (const target of targets) {
+    const { targetName, buildConfiguration } = target;
+    const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
+      targetName,
+      buildConfiguration,
+    });
+    const infoPlist = xcBuildConfiguration?.buildSettings?.INFOPLIST_FILE;
+    if (infoPlist) {
+      const evaluatedInfoPlistPath = trimQuotes(
+        evaluateTemplateString(infoPlist, {
+          SRCROOT: iosDir,
+        })
+      );
+      const absolutePath = path.isAbsolute(evaluatedInfoPlistPath)
+        ? evaluatedInfoPlistPath
+        : path.join(iosDir, evaluatedInfoPlistPath);
+      infoPlistFiles.push(path.normalize(absolutePath));
+    }
+  }
+  const uniqueInfoPlistPaths = uniqBy(infoPlistFiles, i => i);
+  for (const infoPlistPath of uniqueInfoPlistPaths) {
+    const infoPlist = (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
+    if (buildNumber) {
+      infoPlist.CFBundleVersion = buildNumber;
+    }
+    if (version) {
+      infoPlist.CFBundleShortVersionString = version;
+    }
+    await writePlistAsync(infoPlistPath, infoPlist);
+  }
 }

-function ensureStaticConfigExists(projectDir: string): void {
-  const paths = getConfigFilePaths(projectDir);
-  if (!paths.staticConfigPath) {
-    throw new Error('autoIncrement option is not supported when using app.config.js');
-  }
+function trimQuotes(s: string): string {
+  return s?.startsWith('"') && s.endsWith('"') ? s.slice(1, -1) : s;
 }

 export function evaluateTemplateString(
@@ -218,3 +250,106 @@ export function evaluateTemplateString(
    }
  });
 }
+
+/**
+ * Returns buildNumber that will be used for the next build. If current build profile
+ * has an 'autoIncrement' option set, it increments the version on server.
+ */
+export async function resolveRemoteBuildNumberAsync({
+  projectDir,
+  projectId,
+  exp,
+  applicationTarget,
+  buildProfile,
+}: {
+  projectDir: string;
+  projectId: string;
+  exp: ExpoConfig;
+  applicationTarget: Target;
+  buildProfile: BuildProfile<Platform.IOS>;
+}): Promise<string> {
+  const remoteVersions = await AppVersionQuery.latestVersionAsync(
+    projectId,
+    AppPlatform.Ios,
+    applicationTarget.bundleIdentifier
+  );
+
+  const localBuildNumber = await readBuildNumberAsync(
+    projectDir,
+    exp,
+    applicationTarget.buildSettings ?? {}
+  );
+  const localShortVersion = await readShortVersionAsync(
+    projectDir,
+    exp,
+    applicationTarget.buildSettings ?? {}
+  );
+  let currentBuildVersion: string;
+  if (remoteVersions?.buildVersion) {
+    currentBuildVersion = remoteVersions.buildVersion;
+  } else {
+    if (localBuildNumber) {
+      Log.warn(
+        'No remote versions are configured for this project, buildNumber will be initialized based on the value from the local project.'
+      );
+      currentBuildVersion = localBuildNumber;
+    } else {
+      Log.error(
+        `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
+      );
+      throw new Error('Remote versions are not configured.');
+    }
+  }
+  if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
+    return currentBuildVersion;
+  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
+    const spinner = ora(
+      `Initializing buildNumber with ${chalk.bold(currentBuildVersion)}.`
+    ).start();
+    try {
+      await AppVersionMutation.createAppVersionAsync({
+        appId: projectId,
+        platform: AppPlatform.Ios,
+        applicationIdentifier: applicationTarget.bundleIdentifier,
+        storeVersion: localShortVersion ?? '1.0.0',
+        buildVersion: currentBuildVersion,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
+      });
+      spinner.succeed(`Initialized buildNumber with ${chalk.bold(currentBuildVersion)}.`);
+    } catch (err) {
+      spinner.fail(`Failed to initialize buildNumber with ${chalk.bold(currentBuildVersion)}.`);
+      throw err;
+    }
+    return currentBuildVersion;
+  } else {
+    const nextBuildVersion = getNextBuildNumber(currentBuildVersion);
+    const spinner = ora(
+      `Incrementing buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
+        nextBuildVersion
+      )}.`
+    ).start();
+    try {
+      await AppVersionMutation.createAppVersionAsync({
+        appId: projectId,
+        platform: AppPlatform.Ios,
+        applicationIdentifier: applicationTarget.bundleIdentifier,
+        storeVersion: localShortVersion ?? '1.0.0',
+        buildVersion: nextBuildVersion,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
+      });
+      spinner.succeed(
+        `Incremented buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
+          nextBuildVersion
+        )}.`
+      );
+    } catch (err) {
+      spinner.fail(
+        `Failed to increment buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
+          nextBuildVersion
+        )}.`
+      );
+      throw err;
+    }
+    return nextBuildVersion;
+  }
+}
@@ -1,12 +1,12 @@
-import { Job } from '@expo/eas-build-job';
-import { default as spawnAsync } from '@expo/spawn-async';
+import { Job, Metadata } from '@expo/eas-build-job';
+import spawnAsync from '@expo/spawn-async';
 import { ChildProcess } from 'child_process';
 import semver from 'semver';

-import { ora } from '../ora.js';
+import { ora } from '../ora';

 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.85';
+const PLUGIN_PACKAGE_VERSION = '0.0.110';

 export interface LocalBuildOptions {
  enable: boolean;
@@ -18,8 +18,12 @@ export interface LocalBuildOptions {
  verbose?: boolean;
 }

-export async function runLocalBuildAsync(job: Job, options: LocalBuildOptions): Promise<void> {
-  const { command, args } = await getCommandAndArgsAsync(job);
+export async function runLocalBuildAsync(
+  job: Job,
+  metadata: Metadata,
+  options: LocalBuildOptions
+): Promise<void> {
+  const { command, args } = await getCommandAndArgsAsync(job, metadata);
  let spinner;
  if (!options.verbose) {
    spinner = ora().start(options.skipNativeBuild ? 'Preparing project' : 'Building project');
@@ -53,15 +57,18 @@ export async function runLocalBuildAsync(job: Job, options: LocalBuildOptions):
  }
 }

-async function getCommandAndArgsAsync(job: Job): Promise<{ command: string; args: string[] }> {
-  const jobBase64 = Buffer.from(JSON.stringify({ job })).toString('base64');
+async function getCommandAndArgsAsync(
+  job: Job,
+  metadata: Metadata
+): Promise<{ command: string; args: string[] }> {
+  const jobAndMetadataBase64 = Buffer.from(JSON.stringify({ job, metadata })).toString('base64');
  if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
    return {
      command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
-      args: [jobBase64],
+      args: [jobAndMetadataBase64],
    };
  } else {
-    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64];
+    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobAndMetadataBase64];
    if (await isAtLeastNpm7Async()) {
      // npx shipped with npm >= 7.0.0 requires the "-y" flag to run commands without
      // prompting the user to install a package that is used for the first time
@@ -1,37 +1,35 @@
-import ConfigPlugins from '@expo/config-plugins';
+import { Updates } from '@expo/config-plugins';
 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 Log from '../log.js';
-import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils.js';
+import Log from '../log';
+import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
 import {
  readChannelSafelyAsync as readAndroidChannelSafelyAsync,
  readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
-} from '../update/android/UpdatesModule.js';
+} from '../update/android/UpdatesModule';
 import {
  readChannelSafelyAsync as readIosChannelSafelyAsync,
  readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
-} from '../update/ios/UpdatesModule.js';
-import { ensureLoggedInAsync } from '../user/actions.js';
-import { easCliVersion } from '../utils/easCli.js';
-import { getVcsClient } from '../vcs/index.js';
-import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version.js';
-import { BuildContext } from './context.js';
-import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version.js';
-
-const { Updates } = ConfigPlugins;
+} 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';

 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
      ? 'simulator'
      : ctx.buildProfile.distribution) ?? 'store';
-  const metadata = {
+  const metadata: Metadata = {
    trackingContext: ctx.trackingCtx,
    ...(await maybeResolveVersionsAsync(ctx)),
    cliVersion: easCliVersion,
@@ -45,14 +43,20 @@ export async function collectMetadataAsync<T extends Platform>(
    appName: ctx.exp.name,
    appIdentifier: resolveAppIdentifier(ctx),
    buildProfile: ctx.buildProfileName,
-    gitCommitHash: await getVcsClient().getCommitHashAsync(),
-    isGitWorkingTreeDirty: await getVcsClient().hasUncommittedChangesAsync(),
-    username: getUsername(ctx.exp, await ensureLoggedInAsync()),
+    gitCommitHash: await vcsClient.getCommitHashAsync(),
+    gitCommitMessage: truncateGitCommitMessage(
+      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
+    ),
+    isGitWorkingTreeDirty: await vcsClient.hasUncommittedChangesAsync(),
+    username: getUsername(ctx.exp, ctx.user),
+    message: ctx.message,
    ...(ctx.platform === Platform.IOS && {
      iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
        ctx as BuildContext<Platform.IOS>
      ),
    }),
+    runWithNoWaitFlag: ctx.noWait,
+    runFromCI: ctx.runFromCI,
  };
  return sanitizeMetadata(metadata);
 }
@@ -62,14 +66,32 @@ async function maybeResolveVersionsAsync<T extends Platform>(
 ): Promise<{ appBuildVersion?: string; appVersion?: string }> {
  if (ctx.platform === Platform.IOS) {
    const iosContext = ctx as BuildContext<Platform.IOS>;
-    return await maybeResolveIosVersionsAsync(
+    const resolvedVersion = await maybeResolveIosVersionsAsync(
      ctx.projectDir,
      ctx.exp,
-      iosContext.ios.applicationTargetBuildSettings
+      iosContext.ios.targets
    );
+    if (iosContext.ios.buildNumberOverride) {
+      return {
+        ...resolvedVersion,
+        appBuildVersion: iosContext.ios.buildNumberOverride,
+      };
+    }
+    return resolvedVersion;
  } else if (ctx.platform === Platform.ANDROID) {
    const androidCtx = ctx as BuildContext<Platform.ANDROID>;
-    return await maybeResolveAndroidVersionsAsync(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
+    const resolvedVersion = await maybeResolveAndroidVersionsAsync(
+      ctx.projectDir,
+      ctx.exp,
+      androidCtx.buildProfile
+    );
+    if (androidCtx.android.versionCodeOverride) {
+      return {
+        ...resolvedVersion,
+        appBuildVersion: androidCtx.android.versionCodeOverride,
+      };
+    }
+    return resolvedVersion;
  } else {
    throw new Error(`Unsupported platform ${ctx.platform}`);
  }
@@ -151,3 +173,13 @@ function resolveIosEnterpriseProvisioning(
 ): IosEnterpriseProvisioning | undefined {
  return ctx.buildProfile.enterpriseProvisioning;
 }
+
+export function truncateGitCommitMessage(
+  msg: string | undefined,
+  maxLength: number = 4096
+): string | undefined {
+  if (msg === undefined) {
+    return undefined;
+  }
+  return msg.length > maxLength ? `${msg.substring(0, maxLength - 3)}...` : msg;
+}
@@ -0,0 +1,70 @@
+import chalk from 'chalk';
+
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
+import { BuildFilter, BuildFragment } from '../graphql/generated';
+import { BuildQuery } from '../graphql/queries/BuildQuery';
+import Log from '../log';
+import { printJsonOnlyOutput } from '../utils/json';
+import { paginatedQueryWithConfirmPromptAsync } from '../utils/queries';
+import { formatGraphQLBuild } from './utils/formatBuild';
+
+export const BUILDS_LIMIT = 50;
+
+export async function listAndRenderBuildsOnAppAsync({
+  projectId,
+  projectDisplayName,
+  filter,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  projectDisplayName: string;
+  filter?: BuildFilter;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  if (paginatedQueryOptions.nonInteractive) {
+    const builds = await BuildQuery.viewBuildsOnAppAsync({
+      appId: projectId,
+      limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      filter,
+    });
+    renderPageOfBuilds({ builds, projectDisplayName, paginatedQueryOptions });
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      queryToPerform: (limit, offset) =>
+        BuildQuery.viewBuildsOnAppAsync({
+          appId: projectId,
+          limit,
+          offset,
+          filter,
+        }),
+      promptOptions: {
+        title: 'Load more builds?',
+        renderListItems: builds =>
+          renderPageOfBuilds({ builds, projectDisplayName, paginatedQueryOptions }),
+      },
+    });
+  }
+}
+
+function renderPageOfBuilds({
+  builds,
+  projectDisplayName,
+  paginatedQueryOptions,
+}: {
+  builds: BuildFragment[];
+  projectDisplayName: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): void {
+  if (paginatedQueryOptions.json) {
+    printJsonOnlyOutput(builds);
+  } else {
+    const list = builds.map(build => formatGraphQLBuild(build)).join(`\n\n${chalk.dim('———')}\n\n`);
+
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold(`Builds for ${projectDisplayName}:`));
+    Log.log(`\n${list}`);
+  }
+}
@@ -1,45 +1,63 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, EasJsonReader, SubmitProfile } from '@expo/eas-json';
+import {
+  AppVersionSource,
+  BuildProfile,
+  EasJson,
+  EasJsonAccessor,
+  EasJsonUtils,
+  SubmitProfile,
+} from '@expo/eas-json';
 import chalk from 'chalk';
+import nullthrows from 'nullthrows';

+import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import {
  AppPlatform,
  BuildFragment,
  BuildResourceClass,
  BuildStatus,
+  BuildWithSubmissionsFragment,
  SubmissionFragment,
-} from '../graphql/generated.js';
-import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform.js';
-import Log from '../log.js';
+} from '../graphql/generated';
+import { BuildQuery } from '../graphql/queries/BuildQuery';
+import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform';
+import Log from '../log';
 import {
  RequestedPlatform,
  appPlatformDisplayNames,
  appPlatformEmojis,
  toPlatforms,
-} from '../platform.js';
-import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk.js';
-import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig.js';
-import { createSubmissionContextAsync } from '../submit/context.js';
+} from '../platform';
+import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
+import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
+import { validateAppVersionRuntimePolicySupportAsync } from '../project/projectUtils';
 import {
+  validateAppConfigForRemoteVersionSource,
+  validateBuildProfileVersionSettings,
+} from '../project/remoteVersionSource';
+import { createSubmissionContextAsync } from '../submit/context';
+import {
+  exitWithNonZeroCodeIfSomeSubmissionsDidntFinish,
  submitAsync,
  waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
-} from '../submit/submit.js';
-import { printSubmissionDetailsUrls } from '../submit/utils/urls.js';
-import { printJsonOnlyOutput } from '../utils/json.js';
-import { nullthrows } from '../utils/nullthrows.js';
-import { ProfileData, getProfilesAsync } from '../utils/profiles.js';
-import { getVcsClient } from '../vcs/index.js';
-import { prepareAndroidBuildAsync } from './android/build.js';
-import { BuildRequestSender, waitForBuildEndAsync } from './build.js';
-import { ensureProjectConfiguredAsync } from './configure.js';
-import { BuildContext } from './context.js';
-import { createBuildContextAsync } from './createContext.js';
-import { prepareIosBuildAsync } from './ios/build.js';
-import { LocalBuildOptions } from './local.js';
-import { UserInputResourceClass } from './types.js';
-import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient.js';
-import { printBuildResults, printLogsUrls } from './utils/printBuildInfo.js';
-import { ensureRepoIsCleanAsync } from './utils/repository.js';
+} from '../submit/submit';
+import { printSubmissionDetailsUrls } from '../submit/utils/urls';
+import { validateBuildProfileConfigMatchesProjectConfigAsync } from '../update/utils';
+import { Actor } from '../user/User';
+import { printJsonOnlyOutput } from '../utils/json';
+import { ProfileData, getProfilesAsync } from '../utils/profiles';
+import { getVcsClient } from '../vcs';
+import { prepareAndroidBuildAsync } from './android/build';
+import { BuildRequestSender, 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 { UserInputResourceClass } from './types';
+import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
+import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
+import { ensureRepoIsCleanAsync } from './utils/repository';

 let metroConfigValidated = false;
 let sdkVersionChecked = false;
@@ -55,6 +73,7 @@ export interface BuildFlags {
  submitProfile?: string;
  localBuildOptions: LocalBuildOptions;
  userInputResourceClass?: UserInputResourceClass;
+  message?: string;
 }

 const platformToGraphQLResourceClassMapping: Record<
@@ -71,7 +90,12 @@ const platformToGraphQLResourceClassMapping: Record<
  },
 };

-export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFlags): Promise<void> {
+export async function runBuildAndSubmitAsync(
+  projectDir: string,
+  flags: BuildFlags,
+  actor: Actor,
+  getDynamicProjectConfigAsync: DynamicConfigContextFn
+): Promise<void> {
  await getVcsClient().ensureRepoExistsAsync();
  await ensureRepoIsCleanAsync(flags.nonInteractive);

@@ -79,12 +103,14 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
    projectDir,
    nonInteractive: flags.nonInteractive,
  });
-  const easJsonReader = new EasJsonReader(projectDir);
+  const easJsonAccessor = new EasJsonAccessor(projectDir);
+  const easJsonCliConfig: EasJson['cli'] =
+    (await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};

  const platforms = toPlatforms(flags.requestedPlatform);
  const buildProfiles = await getProfilesAsync({
    type: 'build',
-    easJsonReader,
+    easJsonAccessor,
    platforms,
    profileName: flags.profile ?? undefined,
  });
@@ -95,8 +121,12 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
    buildProfiles,
  });

+  for (const buildProfile of buildProfiles) {
+    validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
+  }
+
  const startedBuilds: {
-    build: BuildFragment;
+    build: BuildWithSubmissionsFragment | BuildFragment;
    buildProfile: ProfileData<'build'>;
  }[] = [];
  const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
@@ -111,6 +141,9 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
        platformToGraphQLResourceClassMapping[buildProfile.platform][
          flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
        ],
+      easJsonCliConfig,
+      actor,
+      getDynamicProjectConfigAsync,
    });
    if (maybeBuild) {
      startedBuilds.push({ build: maybeBuild, buildProfile });
@@ -129,7 +162,7 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
  const submissions: SubmissionFragment[] = [];
  if (flags.autoSubmit) {
    const submitProfiles = await getProfilesAsync({
-      easJsonReader,
+      easJsonAccessor,
      platforms,
      profileName: flags.submitProfile,
      type: 'submit',
@@ -149,6 +182,7 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
        submitProfile,
        nonInteractive: flags.nonInteractive,
      });
+      startedBuild.build = await BuildQuery.withSubmissionsByIdAsync(startedBuild.build.id);
      submissions.push(submission);
    }

@@ -169,16 +203,30 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
    buildIds: startedBuilds.map(({ build }) => build.id),
    accountName,
  });
-  printBuildResults(builds, flags.json);
+  if (!flags.json) {
+    printBuildResults(builds);
+  }

  const haveAllBuildsFailedOrCanceled = builds.every(
    build => build?.status && [BuildStatus.Errored, BuildStatus.Canceled].includes(build?.status)
  );
  if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
+    if (flags.json) {
+      printJsonOnlyOutput(builds);
+    }
    exitWithNonZeroCodeIfSomeBuildsFailed(builds);
  } else {
-    // the following function also exits with non zero code if any of the submissions failed
-    await waitForSubmissionsToCompleteAsync(submissions);
+    const completedSubmissions = await waitForSubmissionsToCompleteAsync(submissions);
+    if (flags.json) {
+      printJsonOnlyOutput(
+        await Promise.all(
+          builds
+            .filter((i): i is BuildWithSubmissionsFragment => !!i)
+            .map(build => BuildQuery.withSubmissionsByIdAsync(build.id))
+        )
+      );
+    }
+    exitWithNonZeroCodeIfSomeSubmissionsDidntFinish(completedSubmissions);
  }
 }

@@ -188,12 +236,18 @@ async function prepareAndStartBuildAsync({
  moreBuilds,
  buildProfile,
  resourceClass,
+  easJsonCliConfig,
+  actor,
+  getDynamicProjectConfigAsync,
 }: {
  projectDir: string;
  flags: BuildFlags;
  moreBuilds: boolean;
  buildProfile: ProfileData<'build'>;
  resourceClass: BuildResourceClass;
+  easJsonCliConfig: EasJson['cli'];
+  actor: Actor;
+  getDynamicProjectConfigAsync: DynamicConfigContextFn;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
  const buildCtx = await createBuildContextAsync({
    buildProfileName: buildProfile.profileName,
@@ -201,9 +255,14 @@ async function prepareAndStartBuildAsync({
    clearCache: flags.clearCache,
    buildProfile: buildProfile.profile,
    nonInteractive: flags.nonInteractive,
+    noWait: !flags.wait,
    platform: buildProfile.platform,
    projectDir,
    localBuildOptions: flags.localBuildOptions,
+    easJsonCliConfig,
+    message: flags.message,
+    actor,
+    getDynamicProjectConfigAsync,
  });

  if (moreBuilds) {
@@ -216,6 +275,17 @@ async function prepareAndStartBuildAsync({
    );
  }

+  await validateBuildProfileConfigMatchesProjectConfigAsync(
+    buildCtx.exp,
+    buildProfile,
+    buildCtx.projectId,
+    flags.nonInteractive
+  );
+
+  await validateAppVersionRuntimePolicySupportAsync(buildCtx.projectDir, buildCtx.exp);
+  if (easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE) {
+    validateAppConfigForRemoteVersionSource(buildCtx.exp, buildProfile.platform);
+  }
  if (buildCtx.workflow === Workflow.MANAGED) {
    if (!sdkVersionChecked) {
      await checkExpoSdkIsSupportedAsync(buildCtx);
@@ -265,13 +335,15 @@ async function prepareAndStartSubmissionAsync({
  const submissionCtx = await createSubmissionContextAsync({
    platform,
    projectDir,
-    projectId: build.project.id,
    profile: submitProfile,
    archiveFlags: { id: build.id },
    nonInteractive,
    env: buildProfile.env,
    credentialsCtx: buildCtx.credentialsCtx,
    applicationIdentifier: buildCtx.android?.applicationId ?? buildCtx.ios?.bundleIdentifier,
+    actor: buildCtx.user,
+    projectId: buildCtx.projectId,
+    exp: buildCtx.exp,
  });

  if (moreBuilds) {
@@ -1,9 +1,7 @@
 import * as ExpoConfig from '@expo/config';
-import JsonFileModule from '@expo/json-file';
+import JsonFile from '@expo/json-file';
 import assert from 'assert';

-const JsonFile = JsonFileModule.default;
-
 export async function updateAppJsonConfigAsync(
  {
    projectDir,
@@ -2,8 +2,8 @@ import { Platform } from '@expo/eas-build-job';
 import { CredentialsSource } from '@expo/eas-json';
 import chalk from 'chalk';

-import Log from '../../log.js';
-import { requestedPlatformDisplayNames } from '../../platform.js';
+import Log from '../../log';
+import { requestedPlatformDisplayNames } from '../../platform';

 export function logCredentialsSource(
  credentialsSource: CredentialsSource,
@@ -3,15 +3,15 @@ import { Errors } from '@oclif/core';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';

-import { toAppPlatform } from '../../graphql/types/AppPlatform.js';
-import Log, { learnMore } from '../../log.js';
-import { appPlatformDisplayNames } from '../../platform.js';
-import { resolveWorkflowAsync } from '../../project/workflow.js';
-import { confirmAsync } from '../../prompts.js';
-import { expoCommandAsync } from '../../utils/expoCli.js';
-import { ProfileData } from '../../utils/profiles.js';
-import { getVcsClient } from '../../vcs/index.js';
-import { reviewAndCommitChangesAsync } from './repository.js';
+import { toAppPlatform } from '../../graphql/types/AppPlatform';
+import Log, { learnMore } from '../../log';
+import { appPlatformDisplayNames } from '../../platform';
+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';

 export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
  projectDir,
@@ -4,10 +4,10 @@ import {
  AppPlatform,
  BuildFragment,
  BuildStatus as GraphQLBuildStatus,
-} from '../../graphql/generated.js';
-import { appPlatformDisplayNames } from '../../platform.js';
-import formatFields from '../../utils/formatFields.js';
-import { getBuildLogsUrl } from './url.js';
+} 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);
@@ -11,11 +11,10 @@ import {
  DistributionType,
  EasBuildDeprecationInfo,
  EasBuildDeprecationInfoType,
-} from '../../graphql/generated.js';
-import Log, { learnMore } from '../../log.js';
-import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform.js';
-import { printJsonOnlyOutput } from '../../utils/json.js';
-import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url.js';
+} from '../../graphql/generated';
+import Log, { learnMore } from '../../log';
+import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
+import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';

 export function printLogsUrls(builds: BuildFragment[]): void {
  if (builds.length === 1) {
@@ -32,18 +31,14 @@ export function printLogsUrls(builds: BuildFragment[]): void {
  }
 }

-export function printBuildResults(builds: (BuildFragment | null)[], json: boolean): void {
-  if (json) {
-    printJsonOnlyOutput(builds);
+export function printBuildResults(builds: (BuildFragment | null)[]): void {
+  Log.newLine();
+  if (builds.length === 1) {
+    const [build] = builds;
+    assert(build, 'Build should be defined');
+    printBuildResult(build);
  } else {
-    Log.newLine();
-    if (builds.length === 1) {
-      const [build] = builds;
-      assert(build, 'Build should be defined');
-      printBuildResult(build);
-    } else {
-      (builds.filter(i => i) as BuildFragment[]).forEach(build => printBuildResult(build));
-    }
+    (builds.filter(i => i) as BuildFragment[]).forEach(build => printBuildResult(build));
  }
 }

@@ -99,14 +94,14 @@ export function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationIn
    return;
  }
  if (deprecationInfo.type === EasBuildDeprecationInfoType.Internal) {
-    Log.warn('This command is using API that soon will be deprecated, please update eas-cli.');
+    Log.warn('This command is using API that soon will be deprecated. Upgrade EAS CLI.');
    Log.warn("Changes won't affect your project config.");
    Log.warn(deprecationInfo.message);
  } else if (deprecationInfo.type === EasBuildDeprecationInfoType.UserFacing) {
    Log.warn('This command is using API that soon will be deprecated.');
    Log.warn(deprecationInfo.message);
  } else {
-    Log.warn('An unexpected warning was encountered. Please report it as a bug:');
+    Log.warn('An unexpected warning was encountered. Report it as a bug:');
    Log.warn(deprecationInfo);
  }
 }
@@ -4,13 +4,13 @@ import path from 'path';
 import tar from 'tar';
 import { v4 as uuidv4 } from 'uuid';

-import Log from '../../log.js';
-import { ora } from '../../ora.js';
-import { confirmAsync, promptAsync } from '../../prompts.js';
-import { formatBytes } from '../../utils/files.js';
-import { getTmpDirectory } from '../../utils/paths.js';
-import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer.js';
-import { getVcsClient } from '../../vcs/index.js';
+import Log from '../../log';
+import { ora } from '../../ora';
+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';

 export async function maybeBailOnRepoStatusAsync(): Promise<void> {
  if (!(await getVcsClient().isCommitRequiredAsync())) {
@@ -28,7 +28,7 @@ export async function maybeBailOnRepoStatusAsync(): Promise<void> {
  });

  if (!answer) {
-    throw new Error('Please commit all changes. Aborting...');
+    throw new Error('Commit all changes. Aborting...');
  }
 }

@@ -39,12 +39,12 @@ export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<vo
  Log.addNewLineIfNone();
  Log.warn(`${chalk.bold('Warning!')} Your repository working tree is dirty.`);
  Log.log(
-    `This operation needs to be run on a clean working tree, please ${chalk.bold(
-      'commit all your changes before proceeding'
+    `This operation needs to be run on a clean working tree. ${chalk.bold(
+      'Commit all your changes before proceeding'
    )}.`
  );
  if (nonInteractive) {
-    throw new Error('Please commit all changes. Aborting...');
+    throw new Error('Commit all changes. Aborting...');
  }
  const answer = await confirmAsync({
    message: `Commit changes to git?`,
@@ -52,7 +52,7 @@ export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<vo
  if (answer) {
    await commitPromptAsync({ commitAllFiles: true });
  } else {
-    throw new Error('Please commit all changes. Aborting...');
+    throw new Error('Commit all changes. Aborting...');
  }
 }

@@ -70,7 +70,11 @@ export async function commitPromptAsync({
    initial: initialCommitMessage,
    validate: (input: string) => input !== '',
  });
-  await getVcsClient().commitAsync({ commitAllFiles, commitMessage: message });
+  await getVcsClient().commitAsync({
+    commitAllFiles,
+    commitMessage: message,
+    nonInteractive: false,
+  });
 }

 export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
@@ -1,7 +1,7 @@
 import assert from 'assert';

-import { getExpoApiBaseUrl, getExpoWebsiteBaseUrl } from '../../api.js';
-import { AppPlatform, BuildFragment } from '../../graphql/generated.js';
+import { getExpoApiBaseUrl, getExpoWebsiteBaseUrl } from '../../api';
+import { AppPlatform, BuildFragment } from '../../graphql/generated';

 export function getProjectDashboardUrl(accountName: string, projectName: string): string {
  return new URL(
@@ -1,11 +1,11 @@
 import { ExpoConfig, getConfigFilePaths } from '@expo/config';
 import chalk from 'chalk';
+import nullthrows from 'nullthrows';
 import semver from 'semver';

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

 export function ensureStaticConfigExists(projectDir: string): void {
  const paths = getConfigFilePaths(projectDir);
@@ -2,9 +2,9 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import fs from 'fs-extra';
 import path from 'path';

-import Log, { learnMore } from '../log.js';
-import { getVcsClient } from '../vcs/index.js';
-import { CommonContext } from './context.js';
+import Log, { learnMore } from '../log';
+import { getVcsClient } from '../vcs';
+import { CommonContext } from './context';

 export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
  if (ctx.buildProfile.env?.NODE_ENV === 'production') {
@@ -0,0 +1,194 @@
+import chalk from 'chalk';
+
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
+import {
+  ViewBranchesOnUpdateChannelQueryVariables,
+  ViewUpdateChannelsOnAppQueryVariables,
+} from '../graphql/generated';
+import { BranchQuery, UpdateBranchOnChannelObject } from '../graphql/queries/BranchQuery';
+import { ChannelQuery, UpdateChannelObject } from '../graphql/queries/ChannelQuery';
+import Log from '../log';
+import formatFields from '../utils/formatFields';
+import { printJsonOnlyOutput } from '../utils/json';
+import {
+  paginatedQueryWithConfirmPromptAsync,
+  paginatedQueryWithSelectPromptAsync,
+} from '../utils/queries';
+import { logChannelDetails } from './utils';
+
+export const CHANNELS_LIMIT = 25;
+
+export async function selectChannelOnAppAsync({
+  projectId,
+  selectionPromptTitle,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  selectionPromptTitle: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<UpdateChannelObject> {
+  if (paginatedQueryOptions.nonInteractive) {
+    throw new Error('Unable to select a channel in non-interactive mode.');
+  }
+
+  const updateChannel = await paginatedQueryWithSelectPromptAsync({
+    limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+    offset: paginatedQueryOptions.offset,
+    queryToPerform: (limit, offset) => queryChannelsOnAppAsync({ appId: projectId, limit, offset }),
+    promptOptions: {
+      title: selectionPromptTitle,
+      createDisplayTextForSelectionPromptListItem: updateChannel => updateChannel.name,
+      getIdentifierForQueryItem: updateChannel => updateChannel.id,
+    },
+  });
+
+  if (!updateChannel) {
+    throw new Error(`Could not find any channels for app "${projectId}"`);
+  }
+  return updateChannel;
+}
+
+export async function listAndRenderChannelsOnAppAsync({
+  projectId,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  if (paginatedQueryOptions.nonInteractive) {
+    const channels = await queryChannelsOnAppAsync({
+      appId: projectId,
+      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+    });
+    renderPageOfChannels(channels, paginatedQueryOptions);
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      queryToPerform: (limit, offset) =>
+        queryChannelsOnAppAsync({ limit, offset, appId: projectId }),
+      promptOptions: {
+        title: 'Load more channels?',
+        renderListItems: channels => renderPageOfChannels(channels, paginatedQueryOptions),
+      },
+    });
+  }
+}
+
+export async function listAndRenderBranchesAndUpdatesOnChannelAsync({
+  projectId: appId,
+  channelName,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  channelName: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  const channel = await ChannelQuery.viewUpdateChannelAsync({ appId, channelName });
+  renderChannelHeaderContent({ channelName: channel.name, channelId: channel.id });
+
+  if (paginatedQueryOptions.nonInteractive) {
+    const branches = await queryBranchesAndUpdateGroupsOnChannelAsync({
+      appId,
+      channelName,
+      offset: paginatedQueryOptions.offset,
+      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+    });
+    renderPageOfBranchesOnChannel(channel, branches, paginatedQueryOptions);
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      queryToPerform: (limit, offset) =>
+        queryBranchesAndUpdateGroupsOnChannelAsync({
+          channelName,
+          appId,
+          offset,
+          limit,
+        }),
+      promptOptions: {
+        title: 'Load more channels?',
+        renderListItems: branches =>
+          renderPageOfBranchesOnChannel(channel, branches, paginatedQueryOptions),
+      },
+    });
+  }
+}
+
+async function queryChannelsOnAppAsync({
+  appId,
+  offset,
+  limit,
+}: ViewUpdateChannelsOnAppQueryVariables): Promise<UpdateChannelObject[]> {
+  return await ChannelQuery.viewUpdateChannelsOnAppAsync({
+    appId,
+    offset,
+    limit,
+  });
+}
+
+async function queryBranchesAndUpdateGroupsOnChannelAsync(
+  args: ViewBranchesOnUpdateChannelQueryVariables
+): Promise<UpdateBranchOnChannelObject[]> {
+  return await BranchQuery.listBranchesOnChannelAsync(args);
+}
+
+function renderPageOfChannels(
+  currentPage: UpdateChannelObject[],
+  { json }: PaginatedQueryOptions
+): void {
+  if (json) {
+    printJsonOnlyOutput({ currentPage });
+  } else {
+    for (const channel of currentPage) {
+      Log.addNewLineIfNone();
+      Log.log(
+        formatFields([
+          { label: 'Name', value: channel.name },
+          { label: 'ID', value: channel.id },
+        ])
+      );
+      logChannelDetails(channel);
+    }
+  }
+}
+
+function renderPageOfBranchesOnChannel(
+  channel: UpdateChannelObject,
+  currentPage: UpdateBranchOnChannelObject[],
+  { json }: PaginatedQueryOptions
+): void {
+  const channelWithNewBranches = { ...channel, updateBranches: currentPage };
+  if (json) {
+    printJsonOnlyOutput({ currentPage: channelWithNewBranches });
+  } else {
+    Log.addNewLineIfNone();
+    Log.log(
+      formatFields([
+        { label: 'Name', value: channel.name },
+        { label: 'ID', value: channel.id },
+      ])
+    );
+    logChannelDetails(channelWithNewBranches);
+  }
+}
+
+function renderChannelHeaderContent({
+  channelName,
+  channelId,
+}: {
+  channelName: string;
+  channelId: string;
+}): void {
+  Log.addNewLineIfNone();
+  Log.log(chalk.bold('Channel:'));
+  Log.log(
+    formatFields([
+      { label: 'Name', value: channelName },
+      { label: 'ID', value: channelId },
+    ])
+  );
+  Log.addNewLineIfNone();
+  Log.log(chalk`{bold Branches pointed at this channel and their most recent update group:}`);
+}
@@ -0,0 +1,112 @@
+import assert from 'assert';
+import CliTable from 'cli-table3';
+
+import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
+import Log from '../log';
+import { UPDATE_COLUMNS, getUpdateGroupDescriptionsWithBranch } from '../update/utils';
+
+export type BranchMapping = {
+  version: number;
+  data: {
+    branchId: string;
+    branchMappingLogic: {
+      operand: number;
+      clientKey: string;
+      branchMappingOperator: string;
+    } & string;
+  }[];
+};
+
+/**
+ * Get the branch mapping and determine whether it is a rollout.
+ * Ensure that the branch mapping is properly formatted.
+ */
+export function getBranchMapping(branchMappingString?: string): {
+  branchMapping: BranchMapping;
+  isRollout: boolean;
+  rolloutPercent?: number;
+} {
+  if (!branchMappingString) {
+    throw new Error('Missing branch mapping.');
+  }
+  let branchMapping: BranchMapping;
+  try {
+    branchMapping = JSON.parse(branchMappingString);
+  } catch {
+    throw new Error(`Could not parse branchMapping string into a JSON: "${branchMappingString}"`);
+  }
+  assert(branchMapping, 'Branch Mapping must be defined.');
+
+  if (branchMapping.version !== 0) {
+    throw new Error('Branch mapping must be version 0.');
+  }
+
+  const isRollout = branchMapping.data.length === 2;
+  const rolloutPercent = branchMapping.data[0].branchMappingLogic.operand;
+
+  switch (branchMapping.data.length) {
+    case 0:
+      break;
+    case 1:
+      if (branchMapping.data[0].branchMappingLogic !== 'true') {
+        throw new Error('Branch mapping logic for a single branch must be "true"');
+      }
+      break;
+    case 2:
+      if (branchMapping.data[0].branchMappingLogic.clientKey !== 'rolloutToken') {
+        throw new Error('Client key of initial branch mapping must be "rolloutToken"');
+      }
+      if (branchMapping.data[0].branchMappingLogic.branchMappingOperator !== 'hash_lt') {
+        throw new Error('Branch mapping operator of initial branch mapping must be "hash_lt"');
+      }
+      if (rolloutPercent == null) {
+        throw new Error('Branch mapping is missing a "rolloutPercent"');
+      }
+      if (branchMapping.data[1].branchMappingLogic !== 'true') {
+        throw new Error('Branch mapping logic for a the second branch of a rollout must be "true"');
+      }
+      break;
+    default:
+      throw new Error('Branch mapping data must have length less than or equal to 2.');
+  }
+
+  return { branchMapping, isRollout, rolloutPercent };
+}
+
+export function logChannelDetails(channel: UpdateChannelObject): void {
+  const { branchMapping, isRollout, rolloutPercent } = getBranchMapping(channel.branchMapping);
+
+  const updateChannelsTable = new CliTable({
+    head: ['branch', ...(isRollout ? ['rollout percent'] : []), ...UPDATE_COLUMNS],
+    wordWrap: true,
+  });
+
+  if (branchMapping.data.length > 2) {
+    throw new Error('Branch Mapping data must have length less than or equal to 2.');
+  }
+
+  const rolloutBranchIds = branchMapping.data.map(data => data.branchId);
+
+  for (const currentBranch of channel.updateBranches) {
+    const updateGroupDescriptions = getUpdateGroupDescriptionsWithBranch(
+      currentBranch.updateGroups
+    );
+
+    const isRolloutBranch = isRollout && rolloutBranchIds.includes(currentBranch.id);
+    const isBaseBranch = rolloutBranchIds.length > 0 && rolloutBranchIds[0] === currentBranch.id;
+
+    updateGroupDescriptions.forEach(({ branch, message, runtimeVersion, group, platforms }) => {
+      updateChannelsTable.push([
+        branch,
+        ...(isRolloutBranch
+          ? [isBaseBranch ? `${rolloutPercent! * 100}%` : `${(1 - rolloutPercent!) * 100}%`]
+          : []),
+        message,
+        runtimeVersion,
+        group,
+        platforms,
+      ]);
+    });
+  }
+  Log.log(updateChannelsTable.toString());
+}
@@ -1,69 +1,124 @@
-import { EasJsonReader } from '@expo/eas-json';
 import { Command } from '@oclif/core';
-import semver from 'semver';

 import {
  AnalyticsEvent,
  flushAsync as flushAnalyticsAsync,
  initAsync as initAnalyticsAsync,
  logEvent,
-} from '../analytics/rudderstackClient.js';
-import { findProjectRootAsync } from '../project/projectUtils.js';
-import { getUserAsync } from '../user/User.js';
-import { ensureLoggedInAsync } from '../user/actions.js';
-import { easCliVersion } from '../utils/easCli.js';
-import GitClient from '../vcs/clients/git.js';
-import { setVcsClient } from '../vcs/index.js';
+} from '../analytics/rudderstackClient';
+import { getUserAsync } from '../user/User';
+import ActorContextField from './context/ActorContextField';
+import ContextField from './context/ContextField';
+import { DynamicProjectConfigContextField } from './context/DynamicProjectConfigContextField';
+import { OptionalProjectConfigContextField } from './context/OptionalProjectConfigContextField';
+import ProjectConfigContextField from './context/ProjectConfigContextField';
+import ProjectDirContextField from './context/ProjectDirContextField';
+
+type ContextInput<
+  T extends {
+    [name: string]: any;
+  } = object
+> = {
+  [P in keyof T]: ContextField<T[P]>;
+};
+
+type ContextOutput<
+  T extends {
+    [name: string]: any;
+  } = object
+> = {
+  [P in keyof T]: T[P];
+};

 export default abstract class EasCommand extends Command {
+  protected static readonly ContextOptions = {
+    /**
+     * Require this command to be run when logged-in. Returns the logged-in actor in the context.
+     */
+    LoggedIn: {
+      actor: new ActorContextField(),
+    },
+    /**
+     * Require the project to be identified and registered on server if this command is being
+     * run within a project directory, null otherwise.
+     */
+    OptionalProjectConfig: {
+      projectConfig: new OptionalProjectConfigContextField(),
+    },
+    /**
+     * Require this command to be run in a project directory. Return the project directory in the context.
+     */
+    ProjectDir: {
+      projectDir: new ProjectDirContextField(),
+    },
+    /**
+     * Provides functions to load the project config when dynamic config options are needed (custom Env for example).
+     */
+    DynamicProjectConfig: {
+      // eslint-disable-next-line async-protect/async-suffix
+      getDynamicProjectConfigAsync: new DynamicProjectConfigContextField(),
+    },
+    /**
+     * Require the project to be identified and registered on server. Returns the project config in the context.
+     */
+    ProjectConfig: {
+      projectConfig: new ProjectConfigContextField(),
+    },
+  };
+
  /**
-   * When user data is unavailable locally, determines if the command will
-   * force the user to log in
+   * Context allows for subclasses (commands) to declare their prerequisites in a type-safe manner.
+   * These declarative definitions each output a context property that is the result of the prerequisite being
+   * satisfied. These allow a unified common interface to be shared amongst commands in order to provide a more
+   * consistent CLI experience.
+   *
+   * For example, let's say a command needs the EAS project ID to make a GraphQL mutation. It should declare that
+   * it requires the `ProjectConfig` context, and then call `getContextAsync` to get the project ID.
   */
-  protected requiresAuthentication = true;
-  protected mustBeRunInsideProject = true;
+  static contextDefinition: ContextInput = {};
+
+  /**
+   * Execute the context in the contextDefinition to satisfy command prerequisites.
+   */
+  protected async getContextAsync<
+    C extends {
+      [name: string]: any;
+    } = object
+  >(
+    commandClass: { contextDefinition: ContextInput<C> },
+    { nonInteractive }: { nonInteractive: boolean }
+  ): Promise<ContextOutput<C>> {
+    const contextDefinition = commandClass.contextDefinition;
+
+    const contextValuePairs = await Promise.all(
+      Object.keys(contextDefinition).map(async contextKey => {
+        return [contextKey, await contextDefinition[contextKey].getValueAsync({ nonInteractive })];
+      })
+    );
+
+    return Object.fromEntries(contextValuePairs);
+  }

  protected abstract runAsync(): Promise<any>;

  // eslint-disable-next-line async-protect/async-suffix
  async run(): Promise<any> {
    await initAnalyticsAsync();
-    if (this.mustBeRunInsideProject) {
-      await this.applyCliConfigAsync();
-    }

-    if (this.requiresAuthentication) {
-      const { flags } = await this.parse();
-      const nonInteractive = (flags as any)['non-interactive'] ?? false;
-      await ensureLoggedInAsync({ nonInteractive });
-    } else {
-      await getUserAsync();
-    }
+    // this is needed for logEvent call below as it identifies the user in the analytics system
+    await getUserAsync();
    logEvent(AnalyticsEvent.ACTION, {
      // id is assigned by oclif in constructor based on the filepath:
      // commands/submit === submit, commands/build/list === build:list
      action: `eas ${this.id}`,
    });
+
    return this.runAsync();
  }

  // eslint-disable-next-line async-protect/async-suffix
-  async finally(err: Error): Promise<any> {
+  override async finally(err: Error): Promise<any> {
    await flushAnalyticsAsync();
    return super.finally(err);
  }
-
-  private async applyCliConfigAsync(): Promise<void> {
-    const projectDir = await findProjectRootAsync();
-    const easJsonReader = new EasJsonReader(projectDir);
-    const config = await easJsonReader.getCliConfigAsync();
-    if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
-      throw new Error(
-        `You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`
-      );
-    }
-    if (config?.requireCommit) {
-      setVcsClient(new GitClient());
-    }
-  }
 }
@@ -1,11 +1,9 @@
-import { flushAsync, initAsync, logEvent } from '../../analytics/rudderstackClient.js';
-import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants.js';
-import { getUserAsync } from '../../user/User.js';
-import { ensureLoggedInAsync } from '../../user/actions.js';
-import EasCommand from '../EasCommand.js';
+import { flushAsync, initAsync, logEvent } from '../../analytics/rudderstackClient';
+import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants';
+import { getUserAsync } from '../../user/User';
+import EasCommand from '../EasCommand';

 jest.mock('../../user/User');
-jest.mock('../../user/actions', () => ({ ensureLoggedInAsync: jest.fn() }));
 jest.mock('../../analytics/rudderstackClient', () => {
  const { AnalyticsEvent } = jest.requireActual('../../analytics/rudderstackClient');
  return {
@@ -32,19 +30,13 @@ beforeEach(() => {
    .mocked(getUserAsync)
    .mockReset()
    .mockImplementation(async () => mockJester);
-  jest
-    .mocked(ensureLoggedInAsync)
-    .mockReset()
-    .mockImplementation(async () => mockJester);
  jest.mocked(initAsync).mockReset();
  jest.mocked(flushAsync).mockReset();
  jest.mocked(logEvent).mockReset();
 });

-const createTestEasCommand = (authValue: boolean): typeof EasCommand => {
+const createTestEasCommand = (): typeof EasCommand => {
  class TestEasCommand extends EasCommand {
-    requiresAuthentication = authValue;
-
    async runAsync(): Promise<void> {}
  }

@@ -61,37 +53,29 @@ describe(EasCommand.name, () => {
    //
    // See https://github.com/oclif/command/blob/master/src/command.ts#L80
    // and look for "Config.load"
-    it('ensures the user is logged in', async () => {
-      const TestEasCommand = createTestEasCommand(true);
-      await TestEasCommand.run();
-
-      expect(ensureLoggedInAsync).toHaveBeenCalled();
-    }, 15_000);
-
-    it('ensures the user data is read from cache', async () => {
-      const TestEasCommand = createTestEasCommand(false);
+    it('ensures the user data is read', async () => {
+      const TestEasCommand = createTestEasCommand();
      await TestEasCommand.run();

      expect(jest.mocked(getUserAsync)).toBeCalledTimes(1);
-      expect(jest.mocked(ensureLoggedInAsync)).not.toBeCalled();
-    });
+    }, 15_000);

    it('initializes analytics', async () => {
-      const TestEasCommand = createTestEasCommand(true);
+      const TestEasCommand = createTestEasCommand();
      await TestEasCommand.run();

      expect(initAsync).toHaveBeenCalled();
    });

    it('flushes analytics', async () => {
-      const TestEasCommand = createTestEasCommand(true);
+      const TestEasCommand = createTestEasCommand();
      await TestEasCommand.run();

      expect(flushAsync).toHaveBeenCalled();
    });

    it('logs events', async () => {
-      const TestEasCommand = createTestEasCommand(true);
+      const TestEasCommand = createTestEasCommand();
      await TestEasCommand.run();

      expect(logEvent).toHaveBeenCalledWith('action', {
@@ -102,7 +86,7 @@ describe(EasCommand.name, () => {

  describe('after exceptions', () => {
    it('flushes analytics', async () => {
-      const TestEasCommand = createTestEasCommand(true);
+      const TestEasCommand = createTestEasCommand();
      try {
        await TestEasCommand.run().then(() => {
          throw new Error('foo');
@@ -0,0 +1,9 @@
+import { Actor } from '../../user/User';
+import ContextField, { ContextOptions } from './ContextField';
+import { ensureLoggedInAsync } from './contextUtils/ensureLoggedInAsync';
+
+export default class ActorContextField extends ContextField<Actor> {
+  async getValueAsync({ nonInteractive }: ContextOptions): Promise<Actor> {
+    return await ensureLoggedInAsync({ nonInteractive });
+  }
+}
@@ -0,0 +1,7 @@
+export interface ContextOptions {
+  nonInteractive: boolean;
+}
+
+export default abstract class ContextField<T> {
+  abstract getValueAsync(options: ContextOptions): Promise<T>;
+}
@@ -0,0 +1,31 @@
+import { ExpoConfig } from '@expo/config-types';
+
+import { ExpoConfigOptions, getExpoConfig } 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;
+  exp: ExpoConfig;
+  projectDir: string;
+}>;
+
+export class DynamicProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
+  async getValueAsync({ nonInteractive }: ContextOptions): Promise<DynamicConfigContextFn> {
+    return async (options?: ExpoConfigOptions) => {
+      const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
+      const expBefore = getExpoConfig(projectDir, options);
+      const projectId = await getProjectIdAsync(expBefore, {
+        nonInteractive,
+        env: options?.env,
+      });
+      const exp = getExpoConfig(projectDir, options);
+      return {
+        exp,
+        projectDir,
+        projectId,
+      };
+    };
+  }
+}
@@ -0,0 +1,49 @@
+import { ExpoConfig } from '@expo/config-types';
+import { InvalidEasJsonError } from '@expo/eas-json/build/errors';
+
+import { getExpoConfig } from '../../project/expoConfig';
+import ContextField, { ContextOptions } from './ContextField';
+import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
+import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
+
+export class OptionalProjectConfigContextField extends ContextField<
+  | {
+      projectId: string;
+      exp: ExpoConfig;
+      projectDir: string;
+    }
+  | undefined
+> {
+  async getValueAsync({ nonInteractive }: ContextOptions): Promise<
+    | {
+        projectId: string;
+        exp: ExpoConfig;
+        projectDir: string;
+      }
+    | undefined
+  > {
+    let projectDir: string;
+    try {
+      projectDir = await findProjectDirAndVerifyProjectSetupAsync();
+      if (!projectDir) {
+        return undefined;
+      }
+    } catch (e) {
+      if (e instanceof InvalidEasJsonError) {
+        throw e;
+      }
+      return undefined;
+    }
+
+    const expBefore = getExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(expBefore, {
+      nonInteractive,
+    });
+    const exp = getExpoConfig(projectDir);
+    return {
+      exp,
+      projectDir,
+      projectId,
+    };
+  }
+}
@@ -0,0 +1,31 @@
+import { ExpoConfig } from '@expo/config-types';
+
+import { getExpoConfig } from '../../project/expoConfig';
+import ContextField, { ContextOptions } from './ContextField';
+import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
+import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
+
+export default class ProjectConfigContextField extends ContextField<{
+  projectId: string;
+  exp: ExpoConfig;
+  projectDir: string;
+}> {
+  async getValueAsync({ nonInteractive }: ContextOptions): Promise<{
+    projectId: string;
+    exp: ExpoConfig;
+    projectDir: string;
+  }> {
+    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
+    const expBefore = getExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(expBefore, {
+      nonInteractive,
+    });
+    const exp = getExpoConfig(projectDir);
+
+    return {
+      projectId,
+      exp,
+      projectDir,
+    };
+  }
+}
@@ -0,0 +1,8 @@
+import ContextField from './ContextField';
+import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
+
+export default class ProjectDirContextField extends ContextField<string> {
+  async getValueAsync(): Promise<string> {
+    return await findProjectDirAndVerifyProjectSetupAsync();
+  }
+}
@@ -1,16 +1,20 @@
-import { ApiV2Error } from '../../api.js';
-import { promptAsync } from '../../prompts.js';
-import { Actor, loginAsync } from '../User.js';
-import { ensureActorHasUsername, showLoginPromptAsync } from '../actions.js';
-import { UserSecondFactorDeviceMethod, retryUsernamePasswordAuthWithOTPAsync } from '../otp.js';
+import { ApiV2Error } from '../../../../api';
+import { promptAsync } from '../../../../prompts';
+import { loginAsync } from '../../../../user/User';
+import {
+  UserSecondFactorDeviceMethod,
+  retryUsernamePasswordAuthWithOTPAsync,
+} from '../../../../user/otp';
+import { showLoginPromptAsync } from '../../contextUtils/ensureLoggedInAsync';

-jest.mock('../../prompts');
-jest.mock('../../api', () => ({
-  ApiV2Error: jest.requireActual('../../api').ApiV2Error,
+jest.mock('../../../../prompts');
+jest.mock('../../../../api', () => ({
+  ApiV2Error: jest.requireActual('../../../../api').ApiV2Error,
+  getExpoApiBaseUrl: jest.fn(),
 }));

-jest.mock('../otp');
-jest.mock('../User', () => ({
+jest.mock('../../../../user/otp');
+jest.mock('../../../../user/User', () => ({
  loginAsync: jest.fn(),
 }));

@@ -23,32 +27,6 @@ beforeEach(() => {
  jest.mocked(loginAsync).mockReset();
 });

-const userStub: Actor = {
-  __typename: 'User',
-  id: 'userId',
-  username: 'username',
-  accounts: [],
-  isExpoAdmin: false,
-};
-
-const robotStub: Actor = {
-  __typename: 'Robot',
-  id: 'userId',
-  firstName: 'GLaDOS',
-  accounts: [],
-  isExpoAdmin: false,
-};
-
-describe('ensureActorHasUsername', () => {
-  it('returns username for user actors', () => {
-    expect(ensureActorHasUsername(userStub)).toBe(userStub.username);
-  });
-
-  it('throws for robot actors', () => {
-    expect(() => ensureActorHasUsername(robotStub)).toThrow('not supported for robot');
-  });
-});
-
 describe(showLoginPromptAsync, () => {
  it('prompts for OTP when 2FA is enabled', async () => {
    jest
@@ -0,0 +1,62 @@
+import { vol } from 'memfs';
+
+import { findProjectRootAsync } from '../findProjectDirAndVerifyProjectSetupAsync';
+
+jest.mock('@expo/config');
+jest.mock('fs');
+
+jest.mock('../../../../prompts');
+
+beforeEach(() => {
+  jest.resetAllMocks();
+});
+
+describe(findProjectRootAsync, () => {
+  beforeEach(() => {
+    vol.reset();
+  });
+
+  it('throws if not inside the project directory', async () => {
+    vol.fromJSON(
+      {
+        './README.md': '1',
+      },
+      '/app'
+    );
+    await expect(findProjectRootAsync({ cwd: '/app' })).rejects.toThrow(
+      'Run this command inside a project directory.'
+    );
+  });
+
+  it('defaults to process.cwd() if defaultToProcessCwd = true', async () => {
+    const spy = jest.spyOn(process, 'cwd').mockReturnValue('/this/is/fake/process/cwd');
+    try {
+      vol.fromJSON(
+        {
+          './README.md': '1',
+        },
+        '/app'
+      );
+      const projectDir = await findProjectRootAsync({
+        cwd: '/app',
+        defaultToProcessCwd: true,
+      });
+      expect(projectDir).toBe('/this/is/fake/process/cwd');
+    } finally {
+      spy.mockRestore();
+    }
+  });
+
+  it('returns the root directory of the project', async () => {
+    vol.fromJSON(
+      {
+        './README.md': '1',
+        './package.json': '2',
+        './src/index.ts': '3',
+      },
+      '/app'
+    );
+    const projectRoot = await findProjectRootAsync({ cwd: '/app/src' });
+    expect(projectRoot).toBe('/app');
+  });
+});
@@ -0,0 +1,168 @@
+import { getConfig, modifyConfigAsync } from '@expo/config';
+import { vol } from 'memfs';
+
+import { Role } from '../../../../graphql/generated';
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
+import { learnMore } from '../../../../log';
+import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
+import { ensureLoggedInAsync } from '../../contextUtils/ensureLoggedInAsync';
+import { findProjectRootAsync } from '../findProjectDirAndVerifyProjectSetupAsync';
+import { getProjectIdAsync } from '../getProjectIdAsync';
+
+jest.mock('@expo/config');
+jest.mock('fs');
+
+jest.mock('../../../../graphql/queries/AppQuery');
+jest.mock('../../contextUtils/ensureLoggedInAsync');
+jest.mock('../../contextUtils/findProjectDirAndVerifyProjectSetupAsync');
+jest.mock('../../../../user/User');
+jest.mock('../../../../ora', () => ({
+  ora: () => ({
+    start: () => ({ succeed: () => {}, fail: () => {} }),
+  }),
+}));
+jest.mock('../../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync');
+
+describe(getProjectIdAsync, () => {
+  beforeEach(() => {
+    jest.mocked(ensureLoggedInAsync).mockResolvedValue({
+      __typename: 'User',
+      id: 'user_id',
+      username: 'notnotbrent',
+      primaryAccount: {
+        id: 'account_id_1',
+        name: 'notnotbrent',
+        users: [{ role: Role.Owner, actor: { id: 'user_id' } }],
+      },
+      accounts: [
+        {
+          id: 'account_id_1',
+          name: 'notnotbrent',
+          users: [{ role: Role.Owner, actor: { id: 'user_id' } }],
+        },
+        {
+          id: 'account_id_2',
+          name: 'dominik',
+          users: [{ role: Role.ViewOnly, actor: { id: 'user_id' } }],
+        },
+      ],
+      isExpoAdmin: false,
+    });
+
+    vol.fromJSON(
+      {
+        './README.md': '1',
+        './package.json': '2',
+        './src/index.ts': '3',
+      },
+      '/app'
+    );
+
+    jest.mocked(findProjectRootAsync).mockResolvedValue('/app');
+  });
+
+  it('gets the project ID from app config if exists', async () => {
+    jest.mocked(getConfig).mockReturnValue({
+      exp: { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
+    } as any);
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+      id: '1234',
+      fullName: '@notnotbrent/test',
+      slug: 'test',
+      ownerAccount: { name: 'notnotbrent' } as any,
+    });
+
+    await expect(
+      getProjectIdAsync(
+        { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
+        { nonInteractive: false }
+      )
+    ).resolves.toEqual('1234');
+  });
+
+  it('throws when the owner is out of sync', async () => {
+    jest.mocked(getConfig).mockReturnValue({
+      exp: { name: 'test', slug: 'test', owner: 'wat', extra: { eas: { projectId: '1234' } } },
+    } as any);
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+      id: '1234',
+      fullName: '@notnotbrent/test',
+      slug: 'test',
+      ownerAccount: { name: 'notnotbrent' } as any,
+    });
+
+    await expect(
+      getProjectIdAsync(
+        { name: 'test', slug: 'test', owner: 'wat', extra: { eas: { projectId: '1234' } } },
+        { nonInteractive: false }
+      )
+    ).rejects.toThrow(
+      `Project config: Project identified by "extra.eas.projectId" (notnotbrent) is not owned by owner specified in the "owner" field (wat). ${learnMore(
+        'https://expo.fyi/eas-project-id'
+      )}`
+    );
+  });
+
+  it('throws when the slug is out of sync', async () => {
+    jest.mocked(getConfig).mockReturnValue({
+      exp: { name: 'test', slug: 'wat', extra: { eas: { projectId: '1234' } } },
+    } as any);
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+      id: '1234',
+      fullName: '@notnotbrent/test',
+      slug: 'test',
+      ownerAccount: { name: 'notnotbrent' } as any,
+    });
+
+    await expect(
+      getProjectIdAsync(
+        { name: 'test', slug: 'wat', extra: { eas: { projectId: '1234' } } },
+        { nonInteractive: false }
+      )
+    ).rejects.toThrow(
+      `Project config: Slug for project identified by "extra.eas.projectId" (test) does not match the "slug" field (wat). ${learnMore(
+        'https://expo.fyi/eas-project-id'
+      )}`
+    );
+  });
+
+  it('fetches the project ID when not in app config, and sets it in the config', async () => {
+    jest.mocked(getConfig).mockReturnValue({ exp: { name: 'test', slug: 'test' } } as any);
+    jest.mocked(modifyConfigAsync).mockResolvedValue({
+      type: 'success',
+      config: { expo: { name: 'test', slug: 'test', extra: { eas: { projectId: '2345' } } } },
+    });
+    jest
+      .mocked(fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)
+      .mockImplementation(async () => '2345');
+
+    const projectId = await getProjectIdAsync(
+      { name: 'test', slug: 'test' },
+      {
+        nonInteractive: false,
+      }
+    );
+
+    expect(projectId).toEqual('2345');
+
+    expect(modifyConfigAsync).toHaveBeenCalledTimes(1);
+    expect(modifyConfigAsync).toHaveBeenCalledWith('/app', {
+      extra: { eas: { projectId: '2345' } },
+    });
+  });
+
+  it('throws if writing the ID back to the config fails', async () => {
+    jest.mocked(getConfig).mockReturnValue({ exp: { name: 'test', slug: 'test' } } as any);
+    jest.mocked(modifyConfigAsync).mockResolvedValue({
+      type: 'fail',
+      config: null,
+    });
+    jest
+      .mocked(fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)
+      .mockImplementation(async () => '4567');
+
+    await expect(
+      getProjectIdAsync({ name: 'test', slug: 'test' }, { nonInteractive: false })
+    ).rejects.toThrow();
+  });
+});
@@ -0,0 +1,91 @@
+import { Errors } from '@oclif/core';
+import chalk from 'chalk';
+import nullthrows from 'nullthrows';
+
+import { ApiV2Error } from '../../../api';
+import Log, { learnMore } from '../../../log';
+import { promptAsync } from '../../../prompts';
+import { Actor, getUserAsync, loginAsync } from '../../../user/User';
+import { retryUsernamePasswordAuthWithOTPAsync } from '../../../user/otp';
+
+/**
+ * Ensure that there is a logged-in actor. Show a login prompt if not.
+ *
+ * @param nonInteractive whether the log-in prompt if logged-out should be interactive
+ * @returns logged-in Actor
+ *
+ * @deprecated Should not be used outside of context functions.
+ */
+export async function ensureLoggedInAsync({
+  nonInteractive,
+}: {
+  nonInteractive: boolean;
+}): Promise<Actor> {
+  let user: Actor | undefined;
+  try {
+    user = await getUserAsync();
+  } catch {}
+
+  if (!user) {
+    Log.warn('An Expo user account is required to proceed.');
+    await showLoginPromptAsync({ nonInteractive, printNewLine: true });
+    user = await getUserAsync();
+  }
+
+  return nullthrows(user);
+}
+
+/**
+ * Prompt the user to log in.
+ *
+ * @deprecated Should not be used outside of context functions, except in the AccountLogin command.
+ */
+export async function showLoginPromptAsync({
+  nonInteractive = false,
+  printNewLine = false,
+} = {}): Promise<void> {
+  if (nonInteractive) {
+    Errors.error(
+      `Either log in with ${chalk.bold('eas login')} or set the ${chalk.bold(
+        'EXPO_TOKEN'
+      )} environment variable if you're using EAS CLI on CI (${learnMore(
+        'https://docs.expo.dev/accounts/programmatic-access/',
+        { dim: false }
+      )})`
+    );
+  }
+  if (printNewLine) {
+    Log.newLine();
+  }
+
+  Log.log('Log in to EAS');
+
+  const { username, password } = await promptAsync([
+    {
+      type: 'text',
+      name: 'username',
+      message: 'Email or username',
+    },
+    {
+      type: 'password',
+      name: 'password',
+      message: 'Password',
+    },
+  ]);
+  try {
+    await loginAsync({
+      username,
+      password,
+    });
+  } catch (e) {
+    if (e instanceof ApiV2Error && e.expoApiV2ErrorCode === 'ONE_TIME_PASSWORD_REQUIRED') {
+      await retryUsernamePasswordAuthWithOTPAsync(
+        username,
+        password,
+        e.expoApiV2ErrorMetadata as any
+      );
+    } else {
+      throw e;
+    }
+  }
+}
@@ -0,0 +1,118 @@
+import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
+import * as PackageManagerUtils from '@expo/package-manager';
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';
+import pkgDir from 'pkg-dir';
+import semver from 'semver';
+
+import { learnMore } from '../../../log';
+import { easCliVersion } from '../../../utils/easCli';
+import { getVcsClient, setVcsClient } from '../../../vcs';
+import GitClient from '../../../vcs/clients/git';
+
+async function applyCliConfigAsync(projectDir: string): Promise<void> {
+  const easJsonAccessor = new EasJsonAccessor(projectDir);
+  const config = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
+  if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
+    throw new Error(
+      `You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`
+    );
+  }
+  if (config?.requireCommit) {
+    setVcsClient(new GitClient());
+  }
+}
+
+async function ensureEasCliIsNotInDependenciesAsync(projectDir: string): Promise<void> {
+  let printCliVersionWarning = false;
+
+  const consoleWarn = (msg?: string): void => {
+    if (msg) {
+      // eslint-disable-next-line no-console
+      console.warn(chalk.yellow(msg));
+    } else {
+      // eslint-disable-next-line no-console
+      console.warn();
+    }
+  };
+
+  if (await isEasCliInDependenciesAsync(projectDir)) {
+    printCliVersionWarning = true;
+    consoleWarn(`Found ${chalk.bold('eas-cli')} in your project dependencies.`);
+  }
+
+  const maybeRepoRoot = PackageManagerUtils.findWorkspaceRoot(projectDir) ?? projectDir;
+  if (maybeRepoRoot !== projectDir && (await isEasCliInDependenciesAsync(maybeRepoRoot))) {
+    printCliVersionWarning = true;
+    consoleWarn(`Found ${chalk.bold('eas-cli')} in your monorepo dependencies.`);
+  }
+
+  if (printCliVersionWarning) {
+    consoleWarn(
+      `It's recommended to use the ${chalk.bold(
+        '"cli.version"'
+      )} field in eas.json to enforce the ${chalk.bold('eas-cli')} version for your project.`
+    );
+    consoleWarn(
+      learnMore('https://github.com/expo/eas-cli#enforcing-eas-cli-version-for-your-project')
+    );
+    consoleWarn();
+  }
+}
+
+async function isEasCliInDependenciesAsync(dir: string): Promise<boolean> {
+  const packageJsonPath = path.join(dir, 'package.json');
+  const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
+  return (
+    packageJson?.dependencies?.['eas-cli'] !== undefined ||
+    packageJson?.devDependencies?.['eas-cli'] !== undefined
+  );
+}
+
+/**
+ * @returns the project root directory.
+ *
+ * @deprecated Should not be used outside of context functions.
+ */
+export async function findProjectRootAsync({
+  cwd,
+  defaultToProcessCwd = false,
+}: {
+  cwd?: string;
+  defaultToProcessCwd?: boolean;
+} = {}): Promise<string> {
+  const projectRootDir = await pkgDir(cwd);
+  if (!projectRootDir) {
+    if (!defaultToProcessCwd) {
+      throw new Error('Run this command inside a project directory.');
+    } else {
+      return process.cwd();
+    }
+  } else {
+    let vcsRoot;
+    try {
+      vcsRoot = path.normalize(await getVcsClient().getRootPathAsync());
+    } catch {}
+    if (vcsRoot && vcsRoot.startsWith(projectRootDir) && vcsRoot !== projectRootDir) {
+      throw new Error(
+        `package.json is outside of the current git repository (project root: ${projectRootDir}, git root: ${vcsRoot}.`
+      );
+    }
+    return projectRootDir;
+  }
+}
+
+/**
+ * Determine the project root directory and ensure some constraints about the project setup
+ * like CLI version and dependencies.
+ * @returns the project root directory
+ *
+ * @deprecated Should not be used outside of context functions.
+ */
+export async function findProjectDirAndVerifyProjectSetupAsync(): Promise<string> {
+  const projectDir = await findProjectRootAsync();
+  await applyCliConfigAsync(projectDir);
+  await ensureEasCliIsNotInDependenciesAsync(projectDir);
+  return projectDir;
+}
@@ -0,0 +1,149 @@
+import { getProjectConfigDescription, modifyConfigAsync } from '@expo/config';
+import { ExpoConfig } from '@expo/config-types';
+import { Env } from '@expo/eas-build-job';
+import chalk from 'chalk';
+
+import { AppQuery } from '../../../graphql/queries/AppQuery';
+import Log, { learnMore } from '../../../log';
+import { ora } from '../../../ora';
+import { getExpoConfig } from '../../../project/expoConfig';
+import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
+import { toAppPrivacy } from '../../../project/projectUtils';
+import { Actor } from '../../../user/User';
+import { ensureLoggedInAsync } from './ensureLoggedInAsync';
+import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';
+
+/**
+ * Save an EAS project ID to the appropriate field in the app config.
+ *
+ * @deprecated Should not be used outside of context functions except in the init command.
+ */
+export async function saveProjectIdToAppConfigAsync(
+  projectDir: string,
+  projectId: string,
+  options: { env?: Env } = {}
+): Promise<void> {
+  const exp = getExpoConfig(projectDir, options);
+  const result = await modifyConfigAsync(projectDir, {
+    extra: { ...exp.extra, eas: { ...exp.extra?.eas, projectId } },
+  });
+
+  switch (result.type) {
+    case 'success':
+      break;
+    case 'warn': {
+      Log.warn();
+      Log.warn(
+        `Warning: Your project uses dynamic app configuration, and the EAS project ID can't automatically be added to it.`
+      );
+      Log.warn(
+        chalk.dim(
+          'https://docs.expo.dev/workflow/configuration/#dynamic-configuration-with-appconfigjs'
+        )
+      );
+      Log.warn();
+      Log.warn(
+        `To complete the setup process, set "${chalk.bold(
+          'extra.eas.projectId'
+        )}" in your ${chalk.bold(getProjectConfigDescription(projectDir))}:`
+      );
+      Log.warn();
+      Log.warn(chalk.bold(JSON.stringify({ expo: { extra: { eas: { projectId } } } }, null, 2)));
+      Log.warn();
+      throw new Error(result.message);
+    }
+    case 'fail':
+      throw new Error(result.message);
+    default:
+      throw new Error('Unexpected result type from modifyConfigAsync');
+  }
+}
+
+/**
+ * Get the EAS project ID from the app config. If the project ID is not set in the config,
+ * use the owner/slug to identify an EAS project on the server (asking for confirmation first),
+ * and attempt to save the EAS project ID to the appropriate field in the app config. If unable to
+ * save to the app config, throw an error.
+ *
+ * @returns the EAS project ID
+ *
+ * @deprecated Should not be used outside of context functions.
+ */
+export async function getProjectIdAsync(
+  exp: ExpoConfig,
+  options: { env?: Env; nonInteractive: boolean }
+): Promise<string> {
+  const localProjectId = exp.extra?.eas?.projectId;
+  if (localProjectId) {
+    // check that the local project ID matches account and slug
+    const appForProjectId = await AppQuery.byIdAsync(localProjectId);
+    if (exp.owner && exp.owner !== appForProjectId.ownerAccount.name) {
+      throw new Error(
+        `Project config: Project identified by "extra.eas.projectId" (${
+          appForProjectId.ownerAccount.name
+        }) is not owned by owner specified in the "owner" field (${exp.owner}). ${learnMore(
+          'https://expo.fyi/eas-project-id'
+        )}`
+      );
+    }
+
+    if (exp.slug && exp.slug !== appForProjectId.slug) {
+      throw new Error(
+        `Project config: Slug for project identified by "extra.eas.projectId" (${
+          appForProjectId.slug
+        }) does not match the "slug" field (${exp.slug}). ${learnMore(
+          'https://expo.fyi/eas-project-id'
+        )}`
+      );
+    }
+
+    return localProjectId;
+  }
+
+  const projectDir = await findProjectRootAsync();
+  if (!projectDir) {
+    throw new Error('This command must be run inside a project directory.');
+  }
+
+  Log.warn('EAS project not configured.');
+
+  const getAccountNameForEASProjectSync = (exp: ExpoConfig, user: Actor): string => {
+    if (exp.owner) {
+      return exp.owner;
+    }
+    switch (user.__typename) {
+      case 'User':
+        return user.username;
+      case 'Robot':
+        throw new Error(
+          'The "owner" manifest property is required when using robot users. See: https://docs.expo.dev/versions/latest/config/app/#owner'
+        );
+    }
+  };
+
+  const actor = await ensureLoggedInAsync({
+    nonInteractive: options.nonInteractive,
+  });
+  const projectId = await fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync(
+    {
+      accountName: getAccountNameForEASProjectSync(exp, actor),
+      projectName: exp.slug,
+      privacy: toAppPrivacy(exp.privacy),
+    },
+    {
+      nonInteractive: options.nonInteractive,
+    },
+    actor
+  );
+
+  const spinner = ora(`Linking local project to EAS project ${projectId}`).start();
+  try {
+    await saveProjectIdToAppConfigAsync(projectDir, projectId, options);
+    spinner.succeed(`Linked local project to EAS project ${projectId}`);
+  } catch (e: any) {
+    spinner.fail();
+    throw e;
+  }
+
+  return projectId;
+}
@@ -0,0 +1,23 @@
+import { Flags } from '@oclif/core';
+
+export const EasNonInteractiveAndJsonFlags = {
+  json: Flags.boolean({
+    description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
+    dependsOn: ['non-interactive'],
+  }),
+  'non-interactive': Flags.boolean({
+    description: 'Run the command in non-interactive mode.',
+  }),
+};
+
+export const EASNonInteractiveFlag = {
+  'non-interactive': Flags.boolean({
+    description: 'Run the command in non-interactive mode.',
+  }),
+};
+
+export const EasJsonOnlyFlag = {
+  json: Flags.boolean({
+    description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
+  }),
+};
@@ -0,0 +1,64 @@
+import { Flags } from '@oclif/core';
+
+import { EasNonInteractiveAndJsonFlags } from './flags';
+
+export const getPaginatedQueryOptions = (
+  flags: Partial<
+    Record<keyof typeof EasPaginatedQueryFlags | keyof typeof EasNonInteractiveAndJsonFlags, any>
+  >
+): PaginatedQueryOptions => {
+  return {
+    ...('limit' in flags && { limit: flags.limit }),
+    offset: flags.offset ?? 0,
+    nonInteractive: flags['non-interactive'] ?? false,
+    json: flags.json ?? false,
+  };
+};
+
+const parseFlagInputStringAsInteger = (
+  input: string,
+  flagName: string,
+  lowerLimit: number,
+  upperLimit: number
+): number => {
+  const inputAsNumber = Number(input);
+  if (isNaN(inputAsNumber)) {
+    throw new Error(`Unable to parse ${input} as a number`);
+  }
+  if (inputAsNumber < lowerLimit || inputAsNumber > upperLimit) {
+    throw new Error(`--${flagName} must be between ${lowerLimit} and ${upperLimit}`);
+  }
+  return inputAsNumber;
+};
+
+export const getLimitFlagWithCustomValues = ({
+  defaultTo,
+  limit,
+}: {
+  defaultTo: number;
+  limit: number;
+}): any =>
+  Flags.integer({
+    description: `The number of items to fetch each query. Defaults to ${defaultTo} and is capped at ${limit}.`,
+    // eslint-disable-next-line async-protect/async-suffix
+    parse: async input => parseFlagInputStringAsInteger(input, 'limit', 1, limit),
+  });
+
+export const EasPaginatedQueryFlags = {
+  offset: Flags.integer({
+    description: 'Start queries from specified index. Use for paginating results. Defaults to 0.',
+    // eslint-disable-next-line async-protect/async-suffix
+    parse: async input =>
+      parseFlagInputStringAsInteger(input, 'offset', 0, Number.MAX_SAFE_INTEGER),
+  }),
+  limit: getLimitFlagWithCustomValues({ defaultTo: 50, limit: 100 }),
+};
+
+// options required to control a paginated query
+// from user input
+export type PaginatedQueryOptions = {
+  nonInteractive: boolean;
+  json: boolean;
+  limit?: number;
+  offset: number;
+};
@@ -1,13 +1,10 @@
-import EasCommand from '../../commandUtils/EasCommand.js';
-import Log from '../../log.js';
-import { showLoginPromptAsync } from '../../user/actions.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { showLoginPromptAsync } from '../../commandUtils/context/contextUtils/ensureLoggedInAsync';
+import Log from '../../log';

 export default class AccountLogin extends EasCommand {
-  static description = 'log in with your Expo account';
-  static aliases = ['login'];
-
-  protected mustBeRunInsideProject = false;
-  protected requiresAuthentication = false;
+  static override description = 'log in with your Expo account';
+  static override aliases = ['login'];

  async runAsync(): Promise<void> {
    await showLoginPromptAsync();
@@ -1,13 +1,10 @@
-import EasCommand from '../../commandUtils/EasCommand.js';
-import Log from '../../log.js';
-import { logoutAsync } from '../../user/User.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import Log from '../../log';
+import { logoutAsync } from '../../user/User';

 export default class AccountLogout extends EasCommand {
-  static description = 'log out';
-  static aliases = ['logout'];
-
-  protected mustBeRunInsideProject = false;
-  protected requiresAuthentication = false;
+  static override description = 'log out';
+  static override aliases = ['logout'];

  async runAsync(): Promise<void> {
    await logoutAsync();
@@ -1,15 +1,12 @@
 import chalk from 'chalk';

-import EasCommand from '../../commandUtils/EasCommand.js';
-import Log from '../../log.js';
-import { getActorDisplayName, getUserAsync } from '../../user/User.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import Log from '../../log';
+import { getActorDisplayName, getUserAsync } from '../../user/User';

 export default class AccountView extends EasCommand {
-  static description = 'show the username you are logged in as';
-  static aliases = ['whoami'];
-
-  protected mustBeRunInsideProject = false;
-  protected requiresAuthentication = false;
+  static override description = 'show the username you are logged in as';
+  static override aliases = ['whoami'];

  async runAsync(): Promise<void> {
    const user = await getUserAsync();
@@ -1,13 +1,11 @@
-import EasCommand from '../commandUtils/EasCommand.js';
-import Log from '../log.js';
-import UserSettings from '../user/UserSettings.js';
+import EasCommand from '../commandUtils/EasCommand';
+import Log from '../log';
+import UserSettings from '../user/UserSettings';

 export default class AnalyticsView extends EasCommand {
-  static description = 'display or change analytics settings';
+  static override description = 'display or change analytics settings';

-  static args = [{ name: 'STATUS', options: ['on', 'off'] }];
-
-  protected requiresAuthentication = false;
+  static override args = [{ name: 'STATUS', options: ['on', 'off'] }];

  async runAsync(): Promise<void> {
    const { STATUS: status } = (await this.parse(AnalyticsView)).args;
@@ -1,24 +1,19 @@
-import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';

-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
+import { getDefaultBranchNameAsync } from '../../branch/utils';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  CreateUpdateBranchForAppMutation,
  CreateUpdateBranchForAppMutationVariables,
  UpdateBranch,
-} from '../../graphql/generated.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import {
-  findProjectRootAsync,
-  getProjectFullNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { promptAsync } from '../../prompts.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
-import { getVcsClient } from '../../vcs/index.js';
+} from '../../graphql/generated';
+import Log from '../../log';
+import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export async function createUpdateBranchOnAppAsync({
  appId,
@@ -52,9 +47,9 @@ export async function createUpdateBranchOnAppAsync({
 }

 export default class BranchCreate extends EasCommand {
-  static description = 'create a branch';
+  static override description = 'create a branch';

-  static args = [
+  static override args = [
    {
      name: 'name',
      required: false,
@@ -62,50 +57,54 @@ export default class BranchCreate extends EasCommand {
    },
  ];

-  static flags = {
-    json: Flags.boolean({
-      description: 'return a json with the new branch ID and name.',
-      default: false,
-    }),
+  static override flags = {
+    ...EasNonInteractiveAndJsonFlags,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
  };

  async runAsync(): Promise<void> {
    let {
      args: { name },
-      flags,
+      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(BranchCreate);
-    if (flags.json) {
+    const {
+      projectConfig: { projectId },
+    } = await this.getContextAsync(BranchCreate, {
+      nonInteractive,
+    });
+
+    if (jsonFlag) {
      enableJsonOutput();
    }

-    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
-    const fullName = await getProjectFullNameAsync(exp);
-    const projectId = await getProjectIdAsync(exp);
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);

    if (!name) {
      const validationMessage = 'Branch name may not be empty.';
-      if (flags.json) {
+      if (nonInteractive) {
        throw new Error(validationMessage);
      }
      ({ name } = await promptAsync({
        type: 'text',
        name: 'name',
-        message: 'Please name the branch:',
-        initial:
-          (await getVcsClient().getBranchNameAsync()) ||
-          `branch-${Math.random().toString(36).substr(2, 4)}`,
+        message: 'Provide a branch name:',
+        initial: await getDefaultBranchNameAsync(),
        validate: value => (value ? true : validationMessage),
      }));
    }

    const newBranch = await createUpdateBranchOnAppAsync({ appId: projectId, name });

-    if (flags.json) {
+    if (jsonFlag) {
      printJsonOnlyOutput(newBranch);
    } else {
      Log.withTick(
-        `️Created a new branch: ${chalk.bold(newBranch.name)} on project ${chalk.bold(fullName)}.`
+        `️Created a new branch: ${chalk.bold(newBranch.name)} on project ${chalk.bold(
+          projectDisplayName
+        )}.`
      );
    }
  }
@@ -1,25 +1,22 @@
-import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';

-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
+import { selectBranchOnAppAsync } from '../../branch/queries';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  DeleteUpdateBranchMutation,
  DeleteUpdateBranchMutationVariables,
  DeleteUpdateBranchResult,
  GetBranchInfoQuery,
  GetBranchInfoQueryVariables,
-} from '../../graphql/generated.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import {
-  findProjectRootAsync,
-  getProjectFullNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { promptAsync, toggleConfirmAsync } from '../../prompts.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+} from '../../graphql/generated';
+import Log from '../../log';
+import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { toggleConfirmAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 async function getBranchInfoAsync({
  appId,
@@ -77,65 +74,70 @@ async function deleteBranchOnAppAsync({
 }

 export default class BranchDelete extends EasCommand {
-  static description = 'delete a branch';
+  static override description = 'delete a branch';

-  static args = [
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
+  };
+
+  static override args = [
    {
      name: 'name',
      required: false,
      description: 'Name of the branch to delete',
    },
  ];
-  static flags = {
-    json: Flags.boolean({
-      description: `return JSON with the edited branch's ID and name.`,
-      default: false,
-    }),
+
+  static override flags = {
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
    let {
-      args: { name },
-      flags: { json: jsonFlag },
+      args: { name: branchName },
+      flags,
    } = await this.parse(BranchDelete);
+    const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
+
    if (jsonFlag) {
      enableJsonOutput();
    }

-    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
-    const fullName = await getProjectFullNameAsync(exp);
-    const projectId = await getProjectIdAsync(exp);
+    const {
+      projectConfig: { projectId },
+    } = await this.getContextAsync(BranchDelete, { nonInteractive });
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);

-    if (!name) {
+    if (!branchName) {
      const validationMessage = 'branch name may not be empty.';
-      if (jsonFlag) {
+      if (nonInteractive) {
        throw new Error(validationMessage);
      }
-      ({ name } = await promptAsync({
-        type: 'text',
-        name: 'name',
-        message: 'Please enter the name of the branch to delete:',
-        validate: value => (value ? true : validationMessage),
+      ({ name: branchName } = await selectBranchOnAppAsync({
+        projectId,
+        displayTextForListItem: updateBranch => updateBranch.name,
+        promptTitle: 'Which branch would you like to delete?',
+        paginatedQueryOptions,
      }));
    }

-    const data = await getBranchInfoAsync({ appId: projectId, name });
+    const data = await getBranchInfoAsync({ appId: projectId, name: branchName });
    const branchId = data.app?.byId.updateBranchByName?.id;
    if (!branchId) {
-      throw new Error(`Could not find branch ${name} on ${fullName}`);
+      throw new Error(`Could not find branch ${branchName} on ${projectDisplayName}`);
    }

-    if (!jsonFlag) {
+    if (!nonInteractive) {
      Log.addNewLineIfNone();
      Log.warn(
-        `You are about to permamently delete branch: "${name}" and all of the updates published on it.` +
+        `You are about to permanently delete branch: "${branchName}" and all of the updates published on it.` +
          `\nThis action is irreversible.`
      );
      Log.newLine();
      const confirmed = await toggleConfirmAsync({ message: 'Are you sure you wish to proceed?' });
      if (!confirmed) {
-        Log.error(`Cancelled deletion of branch: "${name}".`);
+        Log.error(`Cancelled deletion of branch: "${branchName}".`);
        process.exit(1);
      }
    }
@@ -148,7 +150,9 @@ export default class BranchDelete extends EasCommand {
      printJsonOnlyOutput(deletionResult);
    } else {
      Log.withTick(
-        `️Deleted branch "${name}" and all of its updates on project ${chalk.bold(fullName)}.`
+        `️Deleted branch "${branchName}" and all of its updates on project ${chalk.bold(
+          projectDisplayName
+        )}.`
      );
    }
  }
@@ -1,106 +1,34 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-import CliTable from 'cli-table3';
-import { print } from 'graphql';
-import { gql } from 'graphql-tag';
-
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
-import {
-  BranchesByAppQuery,
-  BranchesByAppQueryVariables,
-  UpdateBranchFragment,
-} from '../../graphql/generated.js';
-import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils.js';
-import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
-
-const BRANCHES_LIMIT = 10_000;
-
-export async function listBranchesAsync({
-  projectId,
-}: {
-  projectId: string;
-}): Promise<UpdateBranchFragment[]> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .query<BranchesByAppQuery, BranchesByAppQueryVariables>(
-        gql`
-          query BranchesByAppQuery($appId: String!, $limit: Int!) {
-            app {
-              byId(appId: $appId) {
-                id
-                updateBranches(offset: 0, limit: $limit) {
-                  id
-                  ...UpdateBranchFragment
-                }
-              }
-            }
-          }
-          ${print(UpdateBranchFragmentNode)}
-        `,
-        {
-          appId: projectId,
-          limit: BRANCHES_LIMIT,
-        },
-        { additionalTypenames: ['UpdateBranch'] }
-      )
-      .toPromise()
-  );
-
-  return data?.app?.byId.updateBranches ?? [];
-}
+import { listAndRenderBranchesOnAppAsync } from '../../branch/queries';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
+import { enableJsonOutput } from '../../utils/json';

 export default class BranchList extends EasCommand {
-  static description = 'list all branches';
+  static override description = 'list all branches';

-  static flags = {
-    json: Flags.boolean({
-      description: 'return output as JSON',
-      default: false,
-    }),
+  static override flags = {
+    ...EasPaginatedQueryFlags,
+    ...EasNonInteractiveAndJsonFlags,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
  };

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BranchList);
-    if (flags.json) {
+    const {
+      projectConfig: { projectId },
+    } = await this.getContextAsync(BranchList, {
+      nonInteractive: flags['non-interactive'],
+    });
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
+
+    if (paginatedQueryOptions.json) {
      enableJsonOutput();
    }

-    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
-    const branches = await listBranchesAsync({ projectId });
-    if (flags.json) {
-      printJsonOnlyOutput(branches);
-    } else {
-      const table = new CliTable({
-        head: ['Branch', ...UPDATE_COLUMNS],
-        wordWrap: true,
-      });
-
-      table.push(
-        ...branches.map(branch => [
-          branch.name,
-          formatUpdate(branch.updates[0]),
-          branch.updates[0]?.runtimeVersion ?? 'N/A',
-          branch.updates[0]?.group ?? 'N/A',
-          getPlatformsForGroup({
-            updates: branch.updates,
-            group: branch.updates[0]?.group,
-          }),
-        ])
-      );
-
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Branches with their most recent update group:'));
-      Log.log(table.toString());
-      if (branches.length >= BRANCHES_LIMIT) {
-        Log.warn(`Showing first ${BRANCHES_LIMIT} branches, some results might be omitted.`);
-      }
-    }
+    await listAndRenderBranchesOnAppAsync({ projectId, paginatedQueryOptions });
  }
 }
@@ -1,8 +1,8 @@
-import EasCommand from '../../commandUtils/EasCommand.js';
+import EasCommand from '../../commandUtils/EasCommand';

 export default class BranchPublish extends EasCommand {
-  static description = 'deprecated, use "eas update"';
-  static hidden = true;
+  static override description = 'deprecated, use "eas update"';
+  static override hidden = true;

  async runAsync(): Promise<void> {
    throw new Error(BranchPublish.description);
@@ -1,24 +1,20 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';

-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  EditUpdateBranchInput,
  EditUpdateBranchMutation,
  EditUpdateBranchMutationVariables,
  UpdateBranch,
-} from '../../graphql/generated.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import {
-  findProjectRootAsync,
-  getProjectFullNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { promptAsync } from '../../prompts.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+} from '../../graphql/generated';
+import Log from '../../log';
+import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 async function renameUpdateBranchOnAppAsync({
  appId,
@@ -52,9 +48,9 @@ async function renameUpdateBranchOnAppAsync({
 }

 export default class BranchRename extends EasCommand {
-  static description = 'rename a branch';
+  static override description = 'rename a branch';

-  static flags = {
+  static override flags = {
    from: Flags.string({
      description: 'current name of the branch.',
      required: false,
@@ -63,47 +59,50 @@ export default class BranchRename extends EasCommand {
      description: 'new name of the branch.',
      required: false,
    }),
-    json: Flags.boolean({
-      description: `return a json with the edited branch's ID and name.`,
-      default: false,
-    }),
+    ...EasNonInteractiveAndJsonFlags,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
  };

  async runAsync(): Promise<void> {
    let {
-      flags: { json: jsonFlag, from: currentName, to: newName },
+      flags: { json: jsonFlag, from: currentName, to: newName, 'non-interactive': nonInteractive },
    } = await this.parse(BranchRename);
+    const {
+      projectConfig: { projectId },
+    } = await this.getContextAsync(BranchRename, {
+      nonInteractive,
+    });
    if (jsonFlag) {
      enableJsonOutput();
    }

-    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
-    const fullName = await getProjectFullNameAsync(exp);
-    const projectId = await getProjectIdAsync(exp);
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);

    if (!currentName) {
      const validationMessage = 'current name may not be empty.';
-      if (jsonFlag) {
+      if (nonInteractive) {
        throw new Error(validationMessage);
      }
      ({ currentName } = await promptAsync({
        type: 'text',
        name: 'currentName',
-        message: 'Please enter the current name of the branch to rename:',
+        message: "Provide the name of the branch you'd like to rename:",
        validate: value => (value ? true : validationMessage),
      }));
    }

    if (!newName) {
      const validationMessage = 'new name may not be empty.';
-      if (jsonFlag) {
+      if (nonInteractive) {
        throw new Error(validationMessage);
      }
      ({ newName } = await promptAsync({
        type: 'text',
        name: 'newName',
-        message: `Please rename ${currentName}`,
+        message: `Rename ${currentName}`,
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -120,7 +119,7 @@ export default class BranchRename extends EasCommand {
      Log.withTick(
        `️Renamed branch from ${currentName} to ${chalk.bold(
          editedBranch.name
-        )} on project ${chalk.bold(fullName)}.`
+        )} on project ${chalk.bold(projectDisplayName)}.`
      );
    }
  }
@@ -1,22 +1,18 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-import Table from 'cli-table3';
-
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { UpdateQuery } from '../../graphql/queries/UpdateQuery.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils.js';
-import { promptAsync } from '../../prompts.js';
-import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils.js';
-import groupBy from '../../utils/expodash/groupBy.js';
-import formatFields from '../../utils/formatFields.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+import { selectBranchOnAppAsync } from '../../branch/queries';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import {
+  EasPaginatedQueryFlags,
+  getLimitFlagWithCustomValues,
+  getPaginatedQueryOptions,
+} from '../../commandUtils/pagination';
+import { listAndRenderUpdateGroupsOnBranchAsync } from '../../update/queries';
+import { enableJsonOutput } from '../../utils/json';

 export default class BranchView extends EasCommand {
-  static description = 'view a branch';
+  static override description = 'view a branch';

-  static args = [
+  static override args = [
    {
      name: 'name',
      required: false,
@@ -24,83 +20,55 @@ export default class BranchView extends EasCommand {
    },
  ];

-  static flags = {
-    json: Flags.boolean({
-      description: `return a json with the branch's ID name and recent update groups.`,
-      default: false,
-    }),
+  static override flags = {
+    ...EasPaginatedQueryFlags,
+    ...EasNonInteractiveAndJsonFlags,
+    limit: getLimitFlagWithCustomValues({ defaultTo: 25, limit: 50 }),
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
  };

  async runAsync(): Promise<void> {
    let {
-      args: { name },
-      flags: { json: jsonFlag },
+      args: { name: branchName },
+      flags,
    } = await this.parse(BranchView);
-    if (jsonFlag) {
+    const { 'non-interactive': nonInteractive } = flags;
+    const {
+      projectConfig: { projectId },
+    } = await this.getContextAsync(BranchView, {
+      nonInteractive,
+    });
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
+
+    if (paginatedQueryOptions.json) {
      enableJsonOutput();
    }

-    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
-
-    if (!name) {
-      const validationMessage = 'Branch name may not be empty.';
-      if (jsonFlag) {
-        throw new Error(validationMessage);
+    if (!branchName) {
+      if (nonInteractive) {
+        throw new Error('Branch name may not be empty.');
      }
-      ({ name } = await promptAsync({
-        type: 'text',
-        name: 'name',
-        message: 'Please enter the name of the branch to view:',
-        validate: value => (value ? true : validationMessage),
+
+      ({ name: branchName } = await selectBranchOnAppAsync({
+        projectId,
+        promptTitle: 'Which branch would you like to view?',
+        displayTextForListItem: updateBranch => updateBranch.name,
+        // discard limit and offset because this query is not their intended target
+        paginatedQueryOptions: {
+          json: paginatedQueryOptions.json,
+          nonInteractive,
+          offset: 0,
+        },
      }));
    }

-    const { app } = await UpdateQuery.viewBranchAsync({
-      appId: projectId,
-      name,
+    await listAndRenderUpdateGroupsOnBranchAsync({
+      projectId,
+      branchName,
+      paginatedQueryOptions,
    });
-    const UpdateBranch = app?.byId.updateBranchByName;
-    if (!UpdateBranch) {
-      throw new Error(`Could not find branch "${name}"`);
-    }
-
-    const updates = Object.values(groupBy(UpdateBranch.updates, u => u.group)).map(
-      group => group[0]
-    );
-
-    if (jsonFlag) {
-      printJsonOnlyOutput({ ...UpdateBranch, updates });
-    } else {
-      const groupTable = new Table({
-        head: UPDATE_COLUMNS,
-        wordWrap: true,
-      });
-
-      for (const update of updates) {
-        groupTable.push([
-          formatUpdate(update),
-          update.runtimeVersion,
-          update.group,
-          getPlatformsForGroup({
-            updates: UpdateBranch.updates,
-            group: update.group,
-          }),
-        ]);
-      }
-
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Branch:'));
-      Log.log(
-        formatFields([
-          { label: 'Name', value: UpdateBranch.name },
-          { label: 'ID', value: UpdateBranch.id },
-        ])
-      );
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Recently published update groups:'));
-      Log.log(groupTable.toString());
-    }
  }
 }
@@ -1,25 +1,21 @@
 import chalk from 'chalk';
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';

-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  Build,
  BuildStatus,
  CancelBuildMutation,
  CancelBuildMutationVariables,
-} from '../../graphql/generated.js';
-import { BuildQuery } from '../../graphql/queries/BuildQuery.js';
-import Log from '../../log.js';
-import { ora } from '../../ora.js';
-import { appPlatformEmojis } from '../../platform.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import {
-  findProjectRootAsync,
-  getProjectFullNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { confirmAsync, selectAsync } from '../../prompts.js';
+} from '../../graphql/generated';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { appPlatformEmojis } from '../../platform';
+import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { confirmAsync, selectAsync } from '../../prompts';

 async function cancelBuildAsync(buildId: string): Promise<Pick<Build, 'id' | 'status'>> {
  const data = await withErrorHandlingAsync(
@@ -59,36 +55,45 @@ function formatUnfinishedBuild(
  return `${platform} Started at: ${startTime}, Status: ${status}, Id: ${build.id}`;
 }

-async function selectBuildToCancelAsync(
+export async function selectBuildToCancelAsync(
  projectId: string,
-  projectFullName: string
+  projectDisplayName: string
 ): Promise<string | null> {
  const spinner = ora().start('Fetching the uncompleted builds…');
+
  let builds;
  try {
    const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
-      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.New } }),
-      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.InQueue } }),
-      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.InProgress } }),
+      BuildQuery.viewBuildsOnAppAsync({
+        appId: projectId,
+        offset: 0,
+        limit: 10,
+        filter: { status: BuildStatus.New },
+      }),
+      BuildQuery.viewBuildsOnAppAsync({
+        appId: projectId,
+        offset: 0,
+        limit: 10,
+        filter: { status: BuildStatus.InQueue },
+      }),
+      BuildQuery.viewBuildsOnAppAsync({
+        appId: projectId,
+        offset: 0,
+        limit: 10,
+        filter: { status: 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 ${projectFullName}.`
+      `Something went wrong and we couldn't fetch the builds for the project ${projectDisplayName}.`
    );
    throw error;
  }
  if (builds.length === 0) {
-    Log.warn(`There aren't any uncompleted builds for the project ${projectFullName}.`);
+    Log.warn(`There aren't any uncompleted builds for the project ${projectDisplayName}.`);
    return null;
-  } else if (builds.length === 1) {
-    Log.log('Found one build');
-    Log.log(formatUnfinishedBuild(builds[0]));
-    await confirmAsync({
-      message: 'Do you want to cancel it?',
-    });
-    return builds[0].id;
  } else {
    const buildId = await selectAsync<string>(
      'Which build do you want to cancel?',
@@ -97,7 +102,12 @@ async function selectBuildToCancelAsync(
        value: build.id,
      }))
    );
-    return buildId;
+
+    return (await confirmAsync({
+      message: 'Are you sure you want to cancel it?',
+    }))
+      ? buildId
+      : null;
  }
 }

@@ -110,25 +120,45 @@ async function ensureBuildExistsAsync(buildId: string): Promise<void> {
 }

 export default class BuildCancel extends EasCommand {
-  static description = 'cancel a build';
+  static override description = 'cancel a build';

-  static args = [{ name: 'BUILD_ID' }];
+  static override args = [{ name: 'BUILD_ID' }];
+
+  static override flags = {
+    ...EASNonInteractiveFlag,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
+  };

  async runAsync(): Promise<void> {
-    const { BUILD_ID: buildIdFromArg } = (await this.parse(BuildCancel)).args;
+    const {
+      args: { BUILD_ID: buildIdFromArg },
+      flags: { 'non-interactive': nonInteractive },
+    } = await this.parse(BuildCancel);
+    const {
+      projectConfig: { projectId },
+    } = await this.getContextAsync(BuildCancel, {
+      nonInteractive,
+    });

-    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
-    const projectFullName = await getProjectFullNameAsync(exp);
+    const displayName = await getDisplayNameForProjectIdAsync(projectId);

    if (buildIdFromArg) {
      await ensureBuildExistsAsync(buildIdFromArg);
    }

-    const buildId = buildIdFromArg || (await selectBuildToCancelAsync(projectId, projectFullName));
+    let buildId: string | null = buildIdFromArg;
    if (!buildId) {
-      return;
+      if (nonInteractive) {
+        throw new Error('BUILD_ID must not be empty in non-interactive mode');
+      }
+
+      buildId = await selectBuildToCancelAsync(projectId, displayName);
+      if (!buildId) {
+        return;
+      }
    }

    const spinner = ora().start('Canceling the build…');
@@ -2,23 +2,22 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';

-import { cleanUpOldEasBuildGradleScriptAsync } from '../../build/android/syncProjectConfiguration.js';
-import { ensureProjectConfiguredAsync } from '../../build/configure.js';
-import EasCommand from '../../commandUtils/EasCommand.js';
-import Log, { learnMore } from '../../log.js';
-import { RequestedPlatform } from '../../platform.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, isExpoUpdatesInstalled } from '../../project/projectUtils.js';
-import { resolveWorkflowAsync } from '../../project/workflow.js';
-import { promptAsync } from '../../prompts.js';
-import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule.js';
-import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule.js';
-import { getVcsClient } from '../../vcs/index.js';
+import { cleanUpOldEasBuildGradleScriptAsync } from '../../build/android/syncProjectConfiguration';
+import { ensureProjectConfiguredAsync } from '../../build/configure';
+import EasCommand from '../../commandUtils/EasCommand';
+import Log, { learnMore } from '../../log';
+import { RequestedPlatform } from '../../platform';
+import { isExpoUpdatesInstalled } from '../../project/projectUtils';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { promptAsync } from '../../prompts';
+import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
+import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
+import { getVcsClient } from '../../vcs';

 export default class BuildConfigure extends EasCommand {
-  static description = 'configure the project to support EAS Build';
+  static override description = 'configure the project to support EAS Build';

-  static flags = {
+  static override flags = {
    platform: Flags.enum({
      description: 'Platform to configure',
      char: 'p',
@@ -26,8 +25,17 @@ export default class BuildConfigure extends EasCommand {
    }),
  };

+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
+  };
+
  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildConfigure);
+    const {
+      projectConfig: { exp, projectId, projectDir },
+    } = await this.getContextAsync(BuildConfigure, {
+      nonInteractive: false,
+    });

    Log.log(
      '💡 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.'
@@ -35,7 +43,6 @@ export default class BuildConfigure extends EasCommand {

    await getVcsClient().ensureRepoExistsAsync();

-    const projectDir = await findProjectRootAsync();
    const expoUpdatesIsInstalled = isExpoUpdatesInstalled(projectDir);

    const platform =
@@ -55,19 +62,17 @@ export default class BuildConfigure extends EasCommand {

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

      if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
        if (workflow === Workflow.GENERIC) {
-          await syncIosUpdatesConfigurationAsync(projectDir, exp);
+          await syncIosUpdatesConfigurationAsync(projectDir, exp, projectId);
        }
      }
    }