address PR feedback

use commit message as default build message
2026-11-13 20:28:08 -10:00 · 2022-07-29 14:22:56 +02:00 · 2022-07-29 11:07:02 +02:00
351 changed files with 8569 additions and 17055 deletions
@@ -1,2 +1 @@
-* text eol=lf
 **/yarn.lock linguist-generated
@@ -0,0 +1,20 @@
+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
@@ -32,6 +32,7 @@ jobs:
          # 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:
@@ -4,6 +4,5 @@
  "singleQuote": true,
  "bracketSameLine": true,
  "trailingComma": "es5",
-  "arrowParens": "avoid",
-  "endOfLine": "auto"
+  "arrowParens": "avoid"
 }
@@ -6,166 +6,13 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🛠 Breaking changes

- Prompt before configuring EAS project. ([#1356](https://github.com/expo/eas-cli/pull/1356) by [@wschurman](https://github.com/wschurman))
-
 ### 🎉 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))
-
-### 🐛 Bug fixes
-
-### 🧹 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))
-
-## [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))
+
+### 🐛 Bug fixes
+
+### 🧹 Chores

 ## [0.56.0](https://github.com/expo/eas-cli/releases/tag/v0.56.0) - 2022-07-28

@@ -174,6 +21,7 @@ This is the log of notable changes to EAS CLI and related packages.
 - 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))
+- 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))

 ### 🐛 Bug fixes

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

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

 packages/eas-cli/src/update @kgc00 @wschurman
 packages/eas-cli/src/commands/update @kgc00 @wschurman
@@ -0,0 +1,130 @@
+#!/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,5 +1,5 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "2.1.0"
+  "version": "0.56.0"
 }
@@ -17,18 +17,18 @@
    "clean": "lerna run clean && rm -rf node_modules coverage"
  },
  "devDependencies": {
-    "@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",
+    "@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",
    "eslint-plugin-node": "11.1.0",
-    "jest": "28.1.3",
-    "jest-watch-typeahead": "2.0.0",
+    "jest": "28.1.0",
+    "jest-watch-typeahead": "1.1.0",
    "lerna": "4.0.0",
-    "oclif": "3.1.2",
-    "prettier": "2.7.1",
-    "ts-jest": "28.0.7",
+    "oclif": "3.0.1",
+    "prettier": "2.6.2",
+    "ts-jest": "28.0.2",
    "typescript": "4.7.4"
  },
  "volta": {
@@ -2,24 +2,6 @@ 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,28 +19,6 @@ 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
@@ -71,8 +49,6 @@ 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)
@@ -91,7 +67,6 @@ 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)
@@ -125,7 +100,7 @@ ALIASES
  $ eas login
 ```

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

 ## `eas account:logout`

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

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

 ## `eas account:view`

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

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

 ## `eas analytics [STATUS]`

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

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

 ## `eas autocomplete [SHELL]`

@@ -222,7 +197,7 @@ DESCRIPTION
  create a branch
 ```

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

 ## `eas branch:delete [NAME]`

@@ -242,7 +217,7 @@ DESCRIPTION
  delete a branch
 ```

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

 ## `eas branch:list`

@@ -250,20 +225,16 @@ list all branches

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

 FLAGS
-  --json             Enable JSON output, non-JSON messages will be printed to stderr.
-  --limit=<value>    The number of query items to list at once. The default value is 50 (the maximum is 100). Using a
-                     lower value may help increase command speed.
-  --non-interactive  Run the command in non-interactive mode.
-  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.
+  --json  return output as JSON

 DESCRIPTION
  list all branches
 ```

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

 ## `eas branch:rename`

@@ -282,7 +253,7 @@ DESCRIPTION
  rename a branch
 ```

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

 ## `eas branch:view [NAME]`

@@ -290,23 +261,19 @@ view a branch

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

 ARGUMENTS
  NAME  Name of the branch to view

 FLAGS
-  --json             Enable JSON output, non-JSON messages will be printed to stderr.
-  --limit=<value>    The number of query items to list at once. The default value is 50 (the maximum is 100). Using a
-                     lower value may help increase command speed.
-  --non-interactive  Run the command in non-interactive mode.
-  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.
+  --json  return a json with the branch's ID name and recent update groups.

 DESCRIPTION
  view a branch
 ```

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

 ## `eas build`

@@ -315,10 +282,9 @@ 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>] [-m <value>]
+    <value>] [--wait] [--clear-cache] [--auto-submit | --auto-submit-with-profile <value>]

 FLAGS
-  -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
@@ -336,7 +302,7 @@ DESCRIPTION
  start a build
 ```

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

 ## `eas build:cancel [BUILD_ID]`

@@ -350,7 +316,7 @@ DESCRIPTION
  cancel a build
 ```

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

 ## `eas build:configure`

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

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

 ## `eas build:inspect`

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

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

 ## `eas build:list`

@@ -435,7 +401,7 @@ DESCRIPTION
  list all builds for your project
 ```

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

 ## `eas build:submit`

@@ -465,44 +431,6 @@ ALIASES
  $ eas build:submit
 ```

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

 view a build for your project
@@ -518,7 +446,7 @@ DESCRIPTION
  view a build for your project
 ```

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

 ## `eas channel:create [NAME]`

@@ -538,7 +466,7 @@ DESCRIPTION
  create a channel
 ```

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

 ## `eas channel:edit [NAME]`

@@ -559,7 +487,7 @@ DESCRIPTION
  point a channel at a new branch
 ```

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

 ## `eas channel:list`

@@ -576,7 +504,7 @@ DESCRIPTION
  list all channels
 ```

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

 ## `eas channel:view [NAME]`

@@ -596,7 +524,7 @@ DESCRIPTION
  view a channel
 ```

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

 ## `eas config`

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

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

 ## `eas credentials`

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

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

 DESCRIPTION
  manage credentials
 ```

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

 ## `eas device:create`

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

 ## `eas device:delete`

@@ -663,7 +588,7 @@ DESCRIPTION
  remove a registered device from your account
 ```

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

 ## `eas device:list`

@@ -680,7 +605,7 @@ DESCRIPTION
  list all registered devices for your account
 ```

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

 ## `eas device:view [UDID]`

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

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

 ## `eas diagnostics`

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

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

 ## `eas help [COMMAND]`

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

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

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

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

 ## `eas init`

@@ -790,7 +715,7 @@ DESCRIPTION
  generate the local store configuration from the app stores
 ```

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

 ## `eas metadata:push`

@@ -807,21 +732,7 @@ DESCRIPTION
  sync the local store configuration to the app stores
 ```

-_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v2.1.0/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.1.0/packages/eas-cli/src/commands/open.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v0.56.0/packages/eas-cli/src/commands/metadata/push.ts)_

 ## `eas project:info`

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

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

 ## `eas project:init`

@@ -852,7 +763,7 @@ ALIASES
  $ eas init
 ```

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

 ## `eas secret:create`

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

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

 ## `eas secret:delete`

@@ -889,7 +800,7 @@ DESCRIPTION
  delete an environment secret by ID
 ```

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

 ## `eas secret:list`

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

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

 ## `eas submit`

@@ -933,7 +844,7 @@ ALIASES
  $ eas build:submit
 ```

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

 ## `eas update`

@@ -963,7 +874,7 @@ DESCRIPTION
  publish an update group
 ```

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

 ## `eas update:configure`

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

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

 ## `eas update:delete GROUPID`

@@ -1000,7 +911,7 @@ DESCRIPTION
  delete all the updates in an update group
 ```

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

 ## `eas update:list`

@@ -1019,7 +930,7 @@ DESCRIPTION
  view the recent updates for a branch
 ```

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

 ## `eas update:view GROUPID`

@@ -1039,7 +950,7 @@ DESCRIPTION
  update group details
 ```

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

 ## `eas webhook:create`

@@ -1059,7 +970,7 @@ DESCRIPTION
  create a webhook
 ```

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

 ## `eas webhook:delete [ID]`

@@ -1076,7 +987,7 @@ DESCRIPTION
  delete a webhook
 ```

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

 ## `eas webhook:list`

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

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

 ## `eas webhook:update`

@@ -1114,7 +1025,7 @@ DESCRIPTION
  update a webhook
 ```

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

 ## `eas webhook:view ID`

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

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

 ## `eas whoami`

@@ -1,15 +1,13 @@
-const fs = require('fs/promises');
+#!/usr/bin/env sh

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

-(async () => {
-  const generatedCode = await fs.readFile(path, 'utf8');
-  const comment = `/**
+content="/**
 * 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`;
+ */
+"

-  await fs.writeFile(path, comment + generatedCode);
-})();
+printf '%s\n%s\n' "$content" "$(cat $OUTFILE)" > $OUTFILE
@@ -14,7 +14,7 @@ generates:
      dedupeOperationSuffix: true
    hooks:
      afterOneFileWrite:
-        - 'node ./scripts/annotate-graphql-codegen.js'
+        - ./annotate-graphql-codegen.sh
  ./graphql.schema.json:
    plugins:
      - 'introspection'
@@ -1,40 +1,38 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "2.1.0",
+  "version": "0.56.0",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
  },
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
-    "@expo/apple-utils": "0.0.0-alpha.34",
+    "@expo/apple-utils": "0.0.0-alpha.33",
    "@expo/code-signing-certificates": "0.0.2",
-    "@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.1.0",
+    "@expo/config": "6.0.23",
+    "@expo/config-plugins": "4.1.4",
+    "@expo/config-types": "45.0.0",
+    "@expo/eas-build-job": "0.2.82",
+    "@expo/eas-json": "0.56.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.3.0",
+    "@expo/plugin-help": "5.2.0",
    "@expo/plugin-warn-if-update-available": "2.3.0",
-    "@expo/prebuild-config": "5.0.3",
+    "@expo/prebuild-config": "3.1.6",
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
-    "@expo/spawn-async": "1.7.0",
+    "@expo/spawn-async": "1.6.0",
    "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "1.13.10",
-    "@urql/core": "2.6.1",
+    "@oclif/core": "1.9.0",
+    "@urql/core": "2.4.4",
    "@urql/exchange-retry": "0.3.3",
    "ajv": "^6.12.6",
-    "better-opn": "3.0.2",
    "chalk": "4.1.2",
-    "cli-progress": "3.11.2",
+    "cli-progress": "3.11.0",
    "cli-table3": "0.6.2",
    "dateformat": "4.6.3",
    "env-paths": "2.2.0",
@@ -56,7 +54,7 @@
    "keychain": "1.3.0",
    "log-symbols": "4.1.0",
    "mime": "3.0.0",
-    "minimatch": "5.1.0",
+    "minimatch": "5.0.1",
    "nanoid": "3.3.4",
    "node-fetch": "2.6.7",
    "node-forge": "1.3.1",
@@ -64,12 +62,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",
@@ -79,34 +77,33 @@
    "wrap-ansi": "7.0.0"
  },
  "devDependencies": {
-    "@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",
+    "@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",
+    "@types/cli-progress": "3.9.2",
    "@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.6.2",
-    "@types/node-forge": "1.0.4",
-    "@types/promise-retry": "1.1.3",
+    "@types/node-fetch": "^2.5.7",
+    "@types/node-forge": "1.0.2",
    "@types/prompts": "2.0.14",
-    "@types/semver": "7.3.10",
-    "@types/tar": "6.1.2",
+    "@types/semver": "7.3.9",
+    "@types/tar": "6.1.1",
    "@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",
-    "memfs": "3.4.7",
+    "form-data": "4.0.0",
+    "memfs": "3.4.3",
    "mockdate": "3.0.5",
-    "nock": "13.2.9",
-    "rimraf": "3.0.2",
-    "ts-deepmerge": "2.0.5",
+    "nock": "13.2.4",
+    "tempy": "0.7.0",
+    "ts-deepmerge": "2.0.1",
    "ts-mockito": "2.6.1",
-    "ts-node": "10.9.1",
    "typescript": "4.7.4"
  },
  "engines": {
@@ -174,7 +171,7 @@
    },
    "update": {
      "node": {
-        "version": "18.6.0"
+        "version": "12.13.0"
      },
      "s3": {
        "templates": {
@@ -194,8 +191,8 @@
  },
  "repository": "expo/eas-cli",
  "scripts": {
-    "postpack": "rimraf oclif.manifest.json",
-    "prepack": "rimraf build && yarn build && node ./scripts/prepack.js",
+    "postpack": "rm -f oclif.manifest.json",
+    "prepack": "./scripts/prepack.sh",
    "pretarball-ci": "./scripts/pretarball-ci.sh",
    "build": "tsc --project tsconfig.build.json",
    "watch": "yarn build --watch --preserveWatchOutput",
@@ -203,7 +200,7 @@
    "test": "jest",
    "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
-    "clean": "rimraf dist build tmp node_modules yarn-error.log"
+    "clean": "rm -rf dist build tmp node_modules yarn-error.log"
  },
  "volta": {
    "node": "18.6.0",
@@ -3,6 +3,21 @@
  "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",
@@ -449,43 +464,62 @@
      },
      "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": {
-          "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": [
+          "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": [
              {
                "type": "string",
                "format": "date-time"
              },
              {
-                "type": "boolean"
-              }
-            ],
-            "defaultSnippets": [
-              {
-                "label": "Manual release",
-                "description": "Manually release the app after store approval",
-                "body": false
+                "type": "string",
+                "format": "date"
              },
              {
-                "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"
+                "type": "number"
              }
            ]
          },
-          "phasedRelease": {
+          "isPhasedReleaseEnabled": {
            "type": "boolean",
-            "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)"
+            "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`."
          }
        }
      },
@@ -572,15 +606,11 @@
      "description": "Configuration that is specific to the Apple App Store.",
      "additionalProperties": false,
      "properties": {
-        "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}"
-            }
-          ]
+        "advisory": {
+          "$ref": "#/definitions/apple/AppleAdvisory"
+        },
+        "categories": {
+          "$ref": "#/definitions/apple/AppleCategory"
        },
        "copyright": {
          "type": "string",
@@ -596,12 +626,6 @@
            "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",
@@ -765,6 +789,177 @@
            }
          }
        },
+        "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,4 +1,4 @@
-const fs = require('fs/promises');
+const { promises: fs } = require('fs');

 (async () => {
  // Patch `oclif readme` path and link generation
@@ -1,7 +0,0 @@
-const spawn = require('@expo/spawn-async');
-
-(async () => {
-  if (!process.env.CLI_SIZE_CHECK) {
-    await spawn('yarn', ['oclif', 'manifest'], { stdio: 'inherit' });
-  }
-})();
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+rm -rf build
+yarn build
+
+if [ -z "$CLI_SIZE_CHECK" ]; then
+  yarn oclif manifest
+fi
@@ -0,0 +1,60 @@
+import { Actor } from '../user/User';
+
+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),
+    },
+  };
+}
@@ -15,9 +15,6 @@ 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 {
@@ -4,7 +4,7 @@ import fetch, { RequestError, RequestInit } from './fetch';
 import { getAccessToken, getSessionSecret } from './user/sessionStorage';

 export class ApiV2Error extends Error {
-  override readonly name = 'ApiV2Error';
+  readonly name = 'ApiV2Error';
  readonly expoApiV2ErrorCode: string;
  readonly expoApiV2ErrorDetails?: JSONValue;
  readonly expoApiV2ErrorServerStack?: string;
@@ -1,124 +0,0 @@
-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());
-  }
-}
@@ -1,14 +0,0 @@
-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.');
-  }
-}
@@ -1,83 +0,0 @@
-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,
-  };
-}
@@ -1,14 +1,40 @@
-import { truncateGitCommitMessage } from '../metadata';
+import { instance, mock, when } from 'ts-mockito';

-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));
+import { Client } from '../../vcs/vcs';
+import { getFormattedCommitMessageAsync } from '../metadata';
+
+describe(getFormattedCommitMessageAsync, () => {
+  it(`returns undefined if it's not a git project`, async () => {
+    const clientMock = mock<Client>();
+    when(clientMock.getLastCommitMessageAsync()).thenResolve(null);
+    const client = instance(clientMock);
+
+    await expect(getFormattedCommitMessageAsync(client)).resolves.toBe(undefined);
  });

-  it('truncates long commit messages', () => {
-    expect(truncateGitCommitMessage('a'.repeat(5000))).toBe(`${'a'.repeat(4093)}...`);
+  it('returns commit message', async () => {
+    const clientMock = mock<Client>();
+    when(clientMock.getLastCommitMessageAsync()).thenResolve('lorem ipsum');
+    const client = instance(clientMock);
+
+    await expect(getFormattedCommitMessageAsync(client)).resolves.toBe('lorem ipsum');
+  });
+
+  it('trims long commit messages', async () => {
+    const clientMock = mock<Client>();
+    when(clientMock.getLastCommitMessageAsync()).thenResolve('a'.repeat(1500));
+    const client = instance(clientMock);
+
+    await expect(getFormattedCommitMessageAsync(client)).resolves.toBe(`${'a'.repeat(1021)}...`);
+  });
+
+  it('replaces new lines with spaces', async () => {
+    const clientMock = mock<Client>();
+    when(clientMock.getLastCommitMessageAsync()).thenResolve(`Lorem\nipsum\ndolor\nsit\namet`);
+    const client = instance(clientMock);
+
+    await expect(getFormattedCommitMessageAsync(client)).resolves.toBe(
+      `Lorem ipsum dolor sit amet`
+    );
  });
 });
@@ -73,17 +73,17 @@ describe(bumpVersionAsync, () => {

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

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/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('/app');
+    const buildGradle = await getAppBuildGradleAsync('/repo');
    assert(buildGradle);
    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('124');
    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
@@ -95,17 +95,17 @@ describe(bumpVersionAsync, () => {

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

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/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('/app');
+    const buildGradle = await getAppBuildGradleAsync('/repo');
    assert(buildGradle);
    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('123');
    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.1');
@@ -116,17 +116,17 @@ describe(bumpVersionAsync, () => {

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

-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/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('/app');
+    const buildGradle = await getAppBuildGradleAsync('/repo');
    assert(buildGradle);
    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('123');
    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
@@ -140,11 +140,11 @@ describe(bumpVersionInAppJsonAsync, () => {

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

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

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

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

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

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

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

  return fakeExp;
@@ -1,5 +1,4 @@
 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';

@@ -15,6 +14,7 @@ import {
 } from '../../project/android/applicationId';
 import { resolveGradleBuildContextAsync } from '../../project/android/gradle';
 import { toggleConfirmAsync } from '../../prompts';
+import { findAccountByName } from '../../user/Account';
 import {
  BuildRequestSender,
  CredentialsResult,
@@ -28,7 +28,6 @@ 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>
@@ -46,7 +45,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('Update eas.json and come back again.');
+      Log.error('Please update eas.json and come back again.');
      process.exit(1);
    }
  }
@@ -57,22 +56,12 @@ 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, ctx.user);
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
  }

  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, versionCodeOverride };
+  return { applicationId, gradleContext };
 }

 export async function prepareAndroidBuildAsync(
@@ -87,11 +76,7 @@ export async function prepareAndroidBuildAsync(
      await syncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
-        localAutoIncrement:
-          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-            ? false
-            : ctx.buildProfile.autoIncrement,
-        projectId: ctx.projectId,
+        buildProfile: ctx.buildProfile,
      });
    },
    prepareJobAsync: async (
@@ -136,7 +121,7 @@ async function ensureAndroidCredentialsAsync(
  const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {
    app: {
      account: nullthrows(
-        ctx.user.accounts.find(a => a.name === ctx.accountName),
+        findAccountByName(ctx.user.accounts, ctx.accountName),
        `You do not have access to account: ${ctx.accountName}`
      ),
      projectName: ctx.projectName,
@@ -13,10 +13,8 @@ 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,
-    applicationArchivePath: job.applicationArchivePath,
-    buildArtifactPaths: job.buildArtifactPaths,
+    artifactPath: job.artifactPath,
    username: job.username,
    buildType: job.buildType && transformBuildType(job.buildType),
    developmentClient: job.developmentClient,
@@ -5,6 +5,7 @@ import slash from 'slash';

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

@@ -23,7 +24,7 @@ export async function prepareJobAsync(
  ctx: BuildContext<Platform.ANDROID>,
  jobData: JobData
 ): Promise<Job> {
-  const username = getUsername(ctx.exp, ctx.user);
+  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
  const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
  const projectRootDirectory =
    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
@@ -71,15 +72,9 @@ export async function prepareJobAsync(
    updates: { channel: ctx.buildProfile.channel },
    developmentClient: buildProfile.developmentClient,
    gradleCommand: buildProfile.gradleCommand,
-    applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
-    buildArtifactPaths: buildProfile.buildArtifactPaths,
+    artifactPath: buildProfile.artifactPath,
    buildType,
    username,
-    ...(ctx.android.versionCodeOverride && {
-      version: {
-        versionCode: ctx.android.versionCodeOverride,
-      },
-    }),
    experimental: {
      prebuildCommand: ctx.buildProfile.prebuildCommand,
    },
@@ -1,7 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { AndroidVersionAutoIncrement } from '@expo/eas-json';
+import { AndroidVersionAutoIncrement, BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
@@ -15,21 +15,20 @@ import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './ver
 export async function syncProjectConfigurationAsync({
  projectDir,
  exp,
-  localAutoIncrement,
-  projectId,
+  buildProfile,
 }: {
  projectDir: string;
  exp: ExpoConfig;
-  localAutoIncrement?: AndroidVersionAutoIncrement;
-  projectId: string;
+  buildProfile: BuildProfile<Platform.ANDROID>;
 }): Promise<void> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
-  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
+  const { autoIncrement } = buildProfile;
+  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
    await cleanUpOldEasBuildGradleScriptAsync(projectDir);
    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(projectDir, exp, projectId);
+      await syncUpdatesConfigurationAsync(projectDir, exp);
    }
    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
  } else {
@@ -1,15 +1,11 @@
 import { ExpoConfig } from '@expo/config';
-import { AndroidConfig, Updates } from '@expo/config-plugins';
+import { AndroidConfig } 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 { 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,
@@ -169,97 +165,3 @@ 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);
-  }
-}
@@ -120,7 +120,7 @@ export async function prepareBuildRequestForPlatformAsync<

  return async () => {
    if (ctx.localBuildOptions.enable) {
-      await runLocalBuildAsync(job, metadata, ctx.localBuildOptions);
+      await runLocalBuildAsync(job, ctx.localBuildOptions);
      return undefined;
    } else {
      try {
@@ -134,18 +134,18 @@ 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. Upgrade to the latest eas-cli version.');
+    Log.error('EAS Build API has changed, please 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. Try again later. Check https://status.expo.dev/ for updates.'
+      'EAS Build is down for maintenance, please try again later. Check 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. Try again later. Check https://status.expo.dev/ for updates.'
+      'EAS Build free tier is temporarily disabled, please try again later. Check https://status.expo.dev/ for updates.'
    );
    throw new Error('Build request failed.');
  } else if (
@@ -157,7 +157,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, report the issue.'
+      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, please report the issue.'
    );
  }
  throw error;
@@ -177,17 +177,6 @@ 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 uploadFileAtPathToS3Async(
@@ -254,7 +243,11 @@ type MaybeBuildFragment = BuildFragment | null;

 export async function waitForBuildEndAsync(
  { buildIds, accountName }: { buildIds: string[]; accountName: string },
-  { intervalSec = 10 } = {}
+  {
+    // 2 hours (max build time limit) + 10 minutes (possible queue time)
+    timeoutSec = 2 * 60 * 60 + 10 * 60,
+    intervalSec = 10,
+  } = {}
 ): Promise<MaybeBuildFragment[]> {
  let spinner;
  let originalSpinnerText;
@@ -266,7 +259,8 @@ 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();
  }
-  while (true) {
+  const endTime = new Date().getTime() + timeoutSec * 1000;
+  while (new Date().getTime() <= endTime) {
    const builds = await getBuildsSafelyAsync(buildIds);
    const { refetch } =
      builds.length === 1
@@ -277,6 +271,10 @@ 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[]> {
@@ -1,5 +1,5 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { EasJson, EasJsonAccessor } from '@expo/eas-json';
+import { EasJson, EasJsonReader } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';

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

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

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

  const hasAndroidNativeProject =
    (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
@@ -16,7 +16,6 @@ export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android'
 export interface AndroidBuildContext {
  applicationId: string;
  gradleContext?: GradleBuildContext;
-  versionCodeOverride?: string;
 }

 export interface IosBuildContext {
@@ -24,7 +23,6 @@ export interface IosBuildContext {
  applicationTarget: Target;
  targets: Target[];
  xcodeBuildContext: XcodeBuildContext;
-  buildNumberOverride?: string;
 }

 export interface BuildContext<T extends Platform> {
@@ -38,8 +36,6 @@ export interface BuildContext<T extends Platform> {
  exp: ExpoConfig;
  localBuildOptions: LocalBuildOptions;
  nonInteractive: boolean;
-  noWait: boolean;
-  runFromCI: boolean;
  platform: T;
  projectDir: string;
  projectId: string;
@@ -1,7 +1,6 @@
 import { Platform } from '@expo/eas-build-job';
 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';

@@ -10,9 +9,10 @@ import { Analytics, BuildEvent } from '../analytics/events';
 import { CredentialsContext } from '../credentials/context';
 import { BuildResourceClass } from '../graphql/generated';
 import { getExpoConfig } from '../project/expoConfig';
-import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
+import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
-import { Actor } from '../user/User';
+import { findAccountByName } from '../user/Account';
+import { ensureLoggedInAsync } from '../user/actions';
 import { createAndroidContextAsync } from './android/build';
 import { BuildContext, CommonContext } from './context';
 import { createIosContextAsync } from './ios/build';
@@ -24,14 +24,11 @@ export async function createBuildContextAsync<T extends Platform>({
  easJsonCliConfig,
  clearCache = false,
  localBuildOptions,
-  nonInteractive,
-  noWait,
+  nonInteractive = false,
  platform,
  projectDir,
  resourceClass,
  message,
-  actor,
-  projectId,
 }: {
  buildProfileName: string;
  buildProfile: BuildProfile<T>;
@@ -39,29 +36,26 @@ export async function createBuildContextAsync<T extends Platform>({
  clearCache: boolean;
  localBuildOptions: LocalBuildOptions;
  nonInteractive: boolean;
-  noWait: boolean;
  platform: T;
  projectDir: string;
  resourceClass: BuildResourceClass;
  message?: string;
-  actor: Actor;
-  projectId: string;
 }): Promise<BuildContext<T>> {
  const exp = getExpoConfig(projectDir, { env: buildProfile.env });

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

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

  const devClientProperties = getDevClientEventProperties({
@@ -76,13 +70,11 @@ 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: account.name,
+    accountName,
    buildProfile,
    buildProfileName,
    resourceClass,
@@ -92,16 +84,14 @@ export async function createBuildContextAsync<T extends Platform>({
    exp,
    localBuildOptions,
    nonInteractive,
-    noWait,
    platform,
    projectDir,
    projectId,
    projectName,
    trackingCtx,
-    user: actor,
+    user,
    workflow,
    message,
-    runFromCI,
  };
  if (platform === Platform.ANDROID) {
    const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -1,5 +1,4 @@
 import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
-import { AppVersionSource } from '@expo/eas-json';

 import { IosCredentials } from '../../credentials/ios/types';
 import { BuildParamsInput } from '../../graphql/generated';
@@ -15,7 +14,6 @@ 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>
@@ -23,7 +21,7 @@ export async function createIosContextAsync(
  const { buildProfile } = ctx;

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

  checkNodeEnvVariable(ctx);
@@ -44,22 +42,12 @@ export async function createIosContextAsync(
    env: buildProfile.env,
  });
  const applicationTarget = findApplicationTarget(targets);
-  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,
    targets,
    xcodeBuildContext,
-    buildNumberOverride,
  };
 }

@@ -75,12 +63,8 @@ export async function prepareIosBuildAsync(
      await syncProjectConfigurationAsync({
        projectDir: ctx.projectDir,
        exp: ctx.exp,
+        buildProfile: ctx.buildProfile,
        targets: ctx.ios.targets,
-        localAutoIncrement:
-          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-            ? false
-            : ctx.buildProfile.autoIncrement,
-        projectId: ctx.projectId,
      });
    },
    prepareJobAsync: async (
@@ -1,7 +1,7 @@
 import { Platform } from '@expo/eas-build-job';

 import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
-import { getAppFromContextAsync } from '../../credentials/ios/actions/BuildCredentialsUtils';
+import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils';
 import { IosCredentials, Target } from '../../credentials/ios/types';
 import { CredentialsResult } from '../build';
 import { BuildContext } from '../context';
@@ -16,7 +16,7 @@ export async function ensureIosCredentialsAsync(
  }

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

 import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
@@ -14,11 +14,9 @@ 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,
-    applicationArchivePath: job.applicationArchivePath,
-    buildArtifactPaths: job.buildArtifactPaths,
+    artifactPath: job.artifactPath,
    username: job.username,
    developmentClient: job.developmentClient,
    simulator: job.simulator,
@@ -28,6 +26,7 @@ export function transformJob(job: Ios.Job): IosJobInput {

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

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

  return {
    buildCredentials,
+    environmentSecrets: secrets.env,
  };
 }
@@ -4,6 +4,7 @@ import slash from 'slash';

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

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

 import { Target } from '../../credentials/ios/types';
 import { isExpoUpdatesInstalled } from '../../project/projectUtils';
@@ -11,22 +11,21 @@ import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './ver
 export async function syncProjectConfigurationAsync({
  projectDir,
  exp,
+  buildProfile,
  targets,
-  localAutoIncrement,
-  projectId,
 }: {
  projectDir: string;
  exp: ExpoConfig;
+  buildProfile: BuildProfile<Platform.IOS>;
  targets: Target[];
-  localAutoIncrement?: IosVersionAutoIncrement;
-  projectId: string;
 }): Promise<void> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
-  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
+  const { autoIncrement } = buildProfile;
+  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(projectDir, exp, projectId);
+      await syncUpdatesConfigurationAsync(projectDir, exp);
    }
    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
  } else {
@@ -1,17 +1,12 @@
 import { ExpoConfig } from '@expo/config';
-import { IOSConfig, Updates } from '@expo/config-plugins';
+import { IOSConfig } 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 { 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';
@@ -250,106 +245,3 @@ 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,4 +1,4 @@
-import { Job, Metadata } from '@expo/eas-build-job';
+import { Job } from '@expo/eas-build-job';
 import spawnAsync from '@expo/spawn-async';
 import { ChildProcess } from 'child_process';
 import semver from 'semver';
@@ -6,7 +6,7 @@ import semver from 'semver';
 import { ora } from '../ora';

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

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

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

-async function getCommandAndArgsAsync(
-  job: Job,
-  metadata: Metadata
-): Promise<{ command: string; args: string[] }> {
-  const jobAndMetadataBase64 = Buffer.from(JSON.stringify({ job, metadata })).toString('base64');
+async function getCommandAndArgsAsync(job: Job): Promise<{ command: string; args: string[] }> {
+  const jobBase64 = Buffer.from(JSON.stringify({ job })).toString('base64');
  if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
    return {
      command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
-      args: [jobAndMetadataBase64],
+      args: [jobBase64],
    };
  } else {
-    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobAndMetadataBase64];
+    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64];
    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
@@ -14,8 +14,10 @@ import {
  readChannelSafelyAsync as readIosChannelSafelyAsync,
  readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
 } from '../update/ios/UpdatesModule';
+import { ensureLoggedInAsync } from '../user/actions';
 import { easCliVersion } from '../utils/easCli';
 import { getVcsClient } from '../vcs';
+import { Client } from '../vcs/vcs';
 import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
 import { BuildContext } from './context';
 import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
@@ -23,12 +25,13 @@ import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios
 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 vcsClient = getVcsClient();
  const metadata: Metadata = {
    trackingContext: ctx.trackingCtx,
    ...(await maybeResolveVersionsAsync(ctx)),
@@ -44,19 +47,14 @@ export async function collectMetadataAsync<T extends Platform>(
    appIdentifier: resolveAppIdentifier(ctx),
    buildProfile: ctx.buildProfileName,
    gitCommitHash: await vcsClient.getCommitHashAsync(),
-    gitCommitMessage: truncateGitCommitMessage(
-      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
-    ),
    isGitWorkingTreeDirty: await vcsClient.hasUncommittedChangesAsync(),
-    username: getUsername(ctx.exp, ctx.user),
-    message: ctx.message,
+    username: getUsername(ctx.exp, await ensureLoggedInAsync()),
+    message: ctx.message ?? (await getFormattedCommitMessageAsync(vcsClient)),
    ...(ctx.platform === Platform.IOS && {
      iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
        ctx as BuildContext<Platform.IOS>
      ),
    }),
-    runWithNoWaitFlag: ctx.noWait,
-    runFromCI: ctx.runFromCI,
  };
  return sanitizeMetadata(metadata);
 }
@@ -66,32 +64,10 @@ async function maybeResolveVersionsAsync<T extends Platform>(
 ): Promise<{ appBuildVersion?: string; appVersion?: string }> {
  if (ctx.platform === Platform.IOS) {
    const iosContext = ctx as BuildContext<Platform.IOS>;
-    const resolvedVersion = await maybeResolveIosVersionsAsync(
-      ctx.projectDir,
-      ctx.exp,
-      iosContext.ios.targets
-    );
-    if (iosContext.ios.buildNumberOverride) {
-      return {
-        ...resolvedVersion,
-        appBuildVersion: iosContext.ios.buildNumberOverride,
-      };
-    }
-    return resolvedVersion;
+    return await maybeResolveIosVersionsAsync(ctx.projectDir, ctx.exp, iosContext.ios.targets);
  } else if (ctx.platform === Platform.ANDROID) {
    const androidCtx = ctx as BuildContext<Platform.ANDROID>;
-    const resolvedVersion = await maybeResolveAndroidVersionsAsync(
-      ctx.projectDir,
-      ctx.exp,
-      androidCtx.buildProfile
-    );
-    if (androidCtx.android.versionCodeOverride) {
-      return {
-        ...resolvedVersion,
-        appBuildVersion: androidCtx.android.versionCodeOverride,
-      };
-    }
-    return resolvedVersion;
+    return await maybeResolveAndroidVersionsAsync(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
  } else {
    throw new Error(`Unsupported platform ${ctx.platform}`);
  }
@@ -174,12 +150,15 @@ function resolveIosEnterpriseProvisioning(
  return ctx.buildProfile.enterpriseProvisioning;
 }

-export function truncateGitCommitMessage(
-  msg: string | undefined,
-  maxLength: number = 4096
-): string | undefined {
-  if (msg === undefined) {
+export async function getFormattedCommitMessageAsync(
+  vcsClient: Client
+): Promise<string | undefined> {
+  const maybeCommitMessage = (await vcsClient.getLastCommitMessageAsync())?.trim();
+  if (!maybeCommitMessage) {
    return undefined;
  }
-  return msg.length > maxLength ? `${msg.substring(0, maxLength - 3)}...` : msg;
+  const lines = maybeCommitMessage.split('\n');
+  const withoutEmptyLines = lines.filter(i => i);
+  const message = withoutEmptyLines.join(' ');
+  return message.length > 1024 ? message.substring(0, 1021) + '...' : message;
 }
@@ -1,70 +0,0 @@
-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,12 +1,5 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import {
-  AppVersionSource,
-  BuildProfile,
-  EasJson,
-  EasJsonAccessor,
-  EasJsonUtils,
-  SubmitProfile,
-} from '@expo/eas-json';
+import { BuildProfile, EasJson, EasJsonReader, SubmitProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';

@@ -15,10 +8,8 @@ import {
  BuildFragment,
  BuildResourceClass,
  BuildStatus,
-  BuildWithSubmissionsFragment,
  SubmissionFragment,
 } from '../graphql/generated';
-import { BuildQuery } from '../graphql/queries/BuildQuery';
 import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform';
 import Log from '../log';
 import {
@@ -29,19 +20,12 @@ import {
 } 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';
 import { printSubmissionDetailsUrls } from '../submit/utils/urls';
-import { Actor } from '../user/User';
 import { printJsonOnlyOutput } from '../utils/json';
 import { ProfileData, getProfilesAsync } from '../utils/profiles';
 import { getVcsClient } from '../vcs';
@@ -88,12 +72,7 @@ const platformToGraphQLResourceClassMapping: Record<
  },
 };

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

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

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

-  for (const buildProfile of buildProfiles) {
-    validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
-  }
-
  const startedBuilds: {
-    build: BuildWithSubmissionsFragment | BuildFragment;
+    build: BuildFragment;
    buildProfile: ProfileData<'build'>;
  }[] = [];
  const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
@@ -140,8 +114,6 @@ export async function runBuildAndSubmitAsync(
          flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
        ],
      easJsonCliConfig,
-      actor,
-      projectId,
    });
    if (maybeBuild) {
      startedBuilds.push({ build: maybeBuild, buildProfile });
@@ -160,7 +132,7 @@ export async function runBuildAndSubmitAsync(
  const submissions: SubmissionFragment[] = [];
  if (flags.autoSubmit) {
    const submitProfiles = await getProfilesAsync({
-      easJsonAccessor,
+      easJsonReader,
      platforms,
      profileName: flags.submitProfile,
      type: 'submit',
@@ -180,7 +152,6 @@ export async function runBuildAndSubmitAsync(
        submitProfile,
        nonInteractive: flags.nonInteractive,
      });
-      startedBuild.build = await BuildQuery.withSubmissionsByIdAsync(startedBuild.build.id);
      submissions.push(submission);
    }

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

  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 {
-    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);
+    // the following function also exits with non zero code if any of the submissions failed
+    await waitForSubmissionsToCompleteAsync(submissions);
  }
 }

@@ -235,8 +192,6 @@ async function prepareAndStartBuildAsync({
  buildProfile,
  resourceClass,
  easJsonCliConfig,
-  actor,
-  projectId,
 }: {
  projectDir: string;
  flags: BuildFlags;
@@ -244,8 +199,6 @@ async function prepareAndStartBuildAsync({
  buildProfile: ProfileData<'build'>;
  resourceClass: BuildResourceClass;
  easJsonCliConfig: EasJson['cli'];
-  actor: Actor;
-  projectId: string;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
  const buildCtx = await createBuildContextAsync({
    buildProfileName: buildProfile.profileName,
@@ -253,14 +206,11 @@ 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,
-    projectId,
  });

  if (moreBuilds) {
@@ -272,10 +222,7 @@ async function prepareAndStartBuildAsync({
      )}`
    );
  }
-  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);
@@ -332,7 +279,6 @@ async function prepareAndStartSubmissionAsync({
    env: buildProfile.env,
    credentialsCtx: buildCtx.credentialsCtx,
    applicationIdentifier: buildCtx.android?.applicationId ?? buildCtx.ios?.bundleIdentifier,
-    actor: buildCtx.user,
  });

  if (moreBuilds) {
@@ -14,6 +14,7 @@ import {
 } from '../../graphql/generated';
 import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
+import { printJsonOnlyOutput } from '../../utils/json';
 import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';

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

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

@@ -94,14 +99,14 @@ export function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationIn
    return;
  }
  if (deprecationInfo.type === EasBuildDeprecationInfoType.Internal) {
-    Log.warn('This command is using API that soon will be deprecated. Upgrade EAS CLI.');
+    Log.warn('This command is using API that soon will be deprecated, please update 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. Report it as a bug:');
+    Log.warn('An unexpected warning was encountered. Please report it as a bug:');
    Log.warn(deprecationInfo);
  }
 }
@@ -28,7 +28,7 @@ export async function maybeBailOnRepoStatusAsync(): Promise<void> {
  });

  if (!answer) {
-    throw new Error('Commit all changes. Aborting...');
+    throw new Error('Please 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. ${chalk.bold(
-      'Commit all your changes before proceeding'
+    `This operation needs to be run on a clean working tree, please ${chalk.bold(
+      'commit all your changes before proceeding'
    )}.`
  );
  if (nonInteractive) {
-    throw new Error('Commit all changes. Aborting...');
+    throw new Error('Please 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('Commit all changes. Aborting...');
+    throw new Error('Please commit all changes. Aborting...');
  }
 }

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

 export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
@@ -1,194 +0,0 @@
-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:}`);
-}
@@ -1,112 +0,0 @@
-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,4 +1,6 @@
+import { EasJsonReader } from '@expo/eas-json';
 import { Command } from '@oclif/core';
+import semver from 'semver';

 import {
  AnalyticsEvent,
@@ -6,82 +8,62 @@ import {
  initAsync as initAnalyticsAsync,
  logEvent,
 } from '../analytics/rudderstackClient';
+import { findProjectRootAsync } from '../project/projectUtils';
 import { getUserAsync } from '../user/User';
-import ActorContextField from './context/ActorContextField';
-import ContextField from './context/ContextField';
-import ProjectDirContextField from './context/ProjectDirContextField';
-import ProjectIdContextField from './context/ProjectIdContextField';
-
-export const EASCommandProjectDirContext = {
-  projectDir: new ProjectDirContextField(),
-};
-
-export const EASCommandProjectIdContext = {
-  projectId: new ProjectIdContextField(),
-};
-
-export const EASCommandLoggedInContext = {
-  actor: new ActorContextField(),
-};
-
-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];
-};
+import { ensureLoggedInAsync } from '../user/actions';
+import { easCliVersion } from '../utils/easCli';
+import { setVcsClient } from '../vcs';
+import GitClient from '../vcs/clients/git';

 export default abstract class EasCommand extends Command {
-  static contextDefinition: ContextInput = {};
-
-  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);
-  }
+  /**
+   * When user data is unavailable locally, determines if the command will
+   * force the user to log in
+   */
+  protected requiresAuthentication = true;
+  protected mustBeRunInsideProject = true;

  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();
+    }

-    // this is needed for logEvent call below as it identifies the user in the analytics system
-    await getUserAsync();
+    if (this.requiresAuthentication) {
+      const { flags } = await this.parse();
+      const nonInteractive = (flags as any)['non-interactive'] ?? false;
+      await ensureLoggedInAsync({ nonInteractive });
+    } else {
+      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
-  override async finally(err: Error): Promise<any> {
+  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,9 +1,11 @@
 import { flushAsync, initAsync, logEvent } from '../../analytics/rudderstackClient';
 import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants';
 import { getUserAsync } from '../../user/User';
+import { ensureLoggedInAsync } from '../../user/actions';
 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 {
@@ -30,13 +32,19 @@ 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 = (): typeof EasCommand => {
+const createTestEasCommand = (authValue: boolean): typeof EasCommand => {
  class TestEasCommand extends EasCommand {
+    requiresAuthentication = authValue;
+
    async runAsync(): Promise<void> {}
  }

@@ -53,29 +61,37 @@ describe(EasCommand.name, () => {
    //
    // See https://github.com/oclif/command/blob/master/src/command.ts#L80
    // and look for "Config.load"
-    it('ensures the user data is read', async () => {
-      const TestEasCommand = createTestEasCommand();
+    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);
      await TestEasCommand.run();

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

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

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

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

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

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

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

  describe('after exceptions', () => {
    it('flushes analytics', async () => {
-      const TestEasCommand = createTestEasCommand();
+      const TestEasCommand = createTestEasCommand(true);
      try {
        await TestEasCommand.run().then(() => {
          throw new Error('foo');
@@ -1,85 +0,0 @@
-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';
-import ContextField, { ContextOptions } from './ContextField';
-
-export default class ActorContextField extends ContextField<Actor> {
-  async getValueAsync({ nonInteractive }: ContextOptions): Promise<Actor> {
-    return await ActorContextField.ensureLoggedInAsync({ nonInteractive });
-  }
-
-  private static async 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 this.showLoginPromptAsync({ nonInteractive, printNewLine: true });
-      user = await getUserAsync();
-    }
-
-    return nullthrows(user);
-  }
-
-  private static async 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;
-      }
-    }
-  }
-}
@@ -1,7 +0,0 @@
-export interface ContextOptions {
-  nonInteractive: boolean;
-}
-
-export default abstract class ContextField<T> {
-  abstract getValueAsync(options: ContextOptions): Promise<T>;
-}
@@ -1,106 +0,0 @@
-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';
-import ContextField from './ContextField';
-
-export default class ProjectDirContextField extends ContextField<string> {
-  async getValueAsync(): Promise<string> {
-    return await ProjectDirContextField.findProjectDirAndVerifyProjectSetupAsync();
-  }
-
-  private static async 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());
-    }
-  }
-
-  private static async 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 this.isEasCliInDependenciesAsync(projectDir)) {
-      printCliVersionWarning = true;
-      consoleWarn(`Found ${chalk.bold('eas-cli')} in your project dependencies.`);
-    }
-
-    const maybeRepoRoot = PackageManagerUtils.findWorkspaceRoot(projectDir) ?? projectDir;
-    if (maybeRepoRoot !== projectDir && (await this.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();
-    }
-  }
-
-  private static async 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
-    );
-  }
-
-  /**
-   * Get the project root directory.
-   */
-  private static async findProjectRootAsync(): Promise<string> {
-    const projectRootDir = await pkgDir();
-    if (!projectRootDir) {
-      throw new Error('Run this command inside a project directory.');
-    } 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;
-    }
-  }
-
-  private static async findProjectDirAndVerifyProjectSetupAsync(): Promise<string> {
-    const projectDir = await this.findProjectRootAsync();
-    await this.applyCliConfigAsync(projectDir);
-    await this.ensureEasCliIsNotInDependenciesAsync(projectDir);
-    return projectDir;
-  }
-}
@@ -1,127 +0,0 @@
-import { getProjectConfigDescription, modifyConfigAsync } from '@expo/config';
-import { ExpoConfig } from '@expo/config-types';
-import chalk from 'chalk';
-
-import Log 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 ActorContextField from './ActorContextField';
-import ContextField, { ContextOptions } from './ContextField';
-import ProjectDirContextField from './ProjectDirContextField';
-
-export default class ProjectIdContextField extends ContextField<string> {
-  async getValueAsync({ nonInteractive }: ContextOptions): Promise<string> {
-    const projectDir = await ProjectDirContextField['findProjectDirAndVerifyProjectSetupAsync']();
-    const exp = getExpoConfig(projectDir);
-    return await ProjectIdContextField.getProjectIdAsync(exp, { nonInteractive });
-  }
-
-  /**
-   * Save an EAS project ID to the appropriate field in the app config.
-   */
-  private static async saveProjectIdToAppConfigAsync(
-    projectDir: string,
-    projectId: string
-  ): Promise<void> {
-    const exp = getExpoConfig(projectDir);
-    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 the ${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.
-   */
-  private static async getProjectIdAsync(
-    exp: ExpoConfig,
-    options: { nonInteractive: boolean }
-  ): Promise<string> {
-    const localProjectId = exp.extra?.eas?.projectId;
-    if (localProjectId) {
-      return localProjectId;
-    }
-
-    const projectDir = await ProjectDirContextField['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 ActorContextField['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 this.saveProjectIdToAppConfigAsync(projectDir, projectId);
-      spinner.succeed(`Linked local project to EAS project ${projectId}`);
-    } catch (e: any) {
-      spinner.fail();
-      throw e;
-    }
-
-    return projectId;
-  }
-}
@@ -1,46 +0,0 @@
-import { vol } from 'memfs';
-import pkgDir from 'pkg-dir';
-
-import ProjectDirContextField from '../ProjectDirContextField';
-
-jest.mock('@expo/config');
-jest.mock('fs');
-jest.mock('pkg-dir');
-
-jest.mock('../../../prompts');
-
-beforeEach(() => {
-  jest.resetAllMocks();
-});
-
-describe(ProjectDirContextField['findProjectRootAsync'], () => {
-  beforeEach(() => {
-    vol.reset();
-  });
-
-  it('throws if not inside the project directory', async () => {
-    vol.fromJSON(
-      {
-        './README.md': '1',
-      },
-      '/app'
-    );
-    await expect(ProjectDirContextField['findProjectRootAsync']()).rejects.toThrow(
-      'Run this command inside a project directory.'
-    );
-  });
-
-  it('returns the root directory of the project', async () => {
-    jest.mocked(pkgDir).mockResolvedValue('/app');
-    vol.fromJSON(
-      {
-        './README.md': '1',
-        './package.json': '2',
-        './src/index.ts': '3',
-      },
-      '/app'
-    );
-    const projectRoot = await ProjectDirContextField['findProjectRootAsync']();
-    expect(projectRoot).toBe('/app');
-  });
-});
@@ -1,104 +0,0 @@
-import { getConfig, modifyConfigAsync } from '@expo/config';
-import { vol } from 'memfs';
-
-import { Role } from '../../../graphql/generated';
-import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
-import ActorContextField from '../ActorContextField';
-import ProjectDirContextField from '../ProjectDirContextField';
-import ProjectIdContextField from '../ProjectIdContextField';
-
-jest.mock('@expo/config');
-jest.mock('fs');
-
-jest.mock('../ActorContextField');
-jest.mock('../ProjectDirContextField');
-jest.mock('../../../user/User');
-jest.mock('../../../ora', () => ({
-  ora: () => ({
-    start: () => ({ succeed: () => {}, fail: () => {} }),
-  }),
-}));
-jest.mock('../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync');
-
-describe(ProjectIdContextField.name, () => {
-  beforeEach(() => {
-    jest.mocked(ActorContextField['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'
-    );
-  });
-
-  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(ProjectDirContextField['findProjectRootAsync']).mockResolvedValue('/app');
-    await expect(
-      new ProjectIdContextField().getValueAsync({ nonInteractive: false })
-    ).resolves.toEqual('1234');
-  });
-
-  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(ProjectDirContextField['findProjectRootAsync']).mockResolvedValue('/app');
-    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 new ProjectIdContextField().getValueAsync({ nonInteractive: false });
-    expect(projectId).toBe('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(ProjectDirContextField['findProjectRootAsync']).mockResolvedValue('/app');
-    jest.mocked(modifyConfigAsync).mockResolvedValue({
-      type: 'fail',
-      config: null,
-    });
-    jest
-      .mocked(fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)
-      .mockImplementation(async () => '4567');
-
-    await expect(
-      new ProjectIdContextField().getValueAsync({ nonInteractive: false })
-    ).rejects.toThrow();
-  });
-});
@@ -1,23 +0,0 @@
-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.',
-  }),
-};
@@ -1,64 +0,0 @@
-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,16 @@
 import EasCommand from '../../commandUtils/EasCommand';
-import ActorContextField from '../../commandUtils/context/ActorContextField';
 import Log from '../../log';
+import { showLoginPromptAsync } from '../../user/actions';

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

  async runAsync(): Promise<void> {
-    await ActorContextField['showLoginPromptAsync']();
+    await showLoginPromptAsync();
    Log.log('Logged in');
  }
 }
@@ -3,8 +3,11 @@ import Log from '../../log';
 import { logoutAsync } from '../../user/User';

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

  async runAsync(): Promise<void> {
    await logoutAsync();
@@ -5,8 +5,11 @@ import Log from '../../log';
 import { getActorDisplayName, getUserAsync } from '../../user/User';

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    if (!nonInteractive) {
+    if (!jsonFlag) {
      Log.addNewLineIfNone();
      Log.warn(
-        `You are about to permanently delete branch: "${branchName}" and all of the updates published on it.` +
+        `You are about to permamently delete branch: "${name}" 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: "${branchName}".`);
+        Log.error(`Cancelled deletion of branch: "${name}".`);
        process.exit(1);
      }
    }
@@ -148,9 +148,7 @@ export default class BranchDelete extends EasCommand {
      printJsonOnlyOutput(deletionResult);
    } else {
      Log.withTick(
-        `️Deleted branch "${branchName}" and all of its updates on project ${chalk.bold(
-          projectDisplayName
-        )}.`
+        `️Deleted branch "${name}" and all of its updates on project ${chalk.bold(fullName)}.`
      );
    }
  }
@@ -1,32 +1,106 @@
-import { listAndRenderBranchesOnAppAsync } from '../../branch/queries';
-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
-import { enableJsonOutput } from '../../utils/json';
+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';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  BranchesByAppQuery,
+  BranchesByAppQueryVariables,
+  UpdateBranchFragment,
+} from '../../graphql/generated';
+import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+
+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 ?? [];
+}

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

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

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

-    await listAndRenderBranchesOnAppAsync({ projectId, paginatedQueryOptions });
+    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.`);
+      }
+    }
  }
 }
@@ -1,8 +1,8 @@
 import EasCommand from '../../commandUtils/EasCommand';

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    if (!branchName) {
-      if (nonInteractive) {
-        throw new Error('Branch name may not be empty.');
-      }
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(exp);

-      ({ 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,
-        },
+    if (!name) {
+      const validationMessage = 'Branch name may not be empty.';
+      if (jsonFlag) {
+        throw new Error(validationMessage);
+      }
+      ({ name } = await promptAsync({
+        type: 'text',
+        name: 'name',
+        message: 'Please enter the name of the branch to view:',
+        validate: value => (value ? true : validationMessage),
      }));
    }

-    await listAndRenderUpdateGroupsOnBranchAsync({
-      projectId,
-      branchName,
-      paginatedQueryOptions,
+    const { app } = await UpdateQuery.viewBranchAsync({
+      appId: projectId,
+      name,
    });
+    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,8 +1,7 @@
 import chalk from 'chalk';
 import gql from 'graphql-tag';

-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
-import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  Build,
@@ -14,7 +13,12 @@ import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { appPlatformEmojis } from '../../platform';
-import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { getExpoConfig } from '../../project/expoConfig';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
 import { confirmAsync, selectAsync } from '../../prompts';

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

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

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

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

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

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

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

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

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

    const spinner = ora().start('Canceling the build…');
@@ -4,14 +4,11 @@ import chalk from 'chalk';

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

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

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

-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
-    ...EASCommandProjectDirContext,
-  };
-
  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildConfigure);
-    const { 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.'
@@ -46,6 +35,7 @@ export default class BuildConfigure extends EasCommand {

    await getVcsClient().ensureRepoExistsAsync();

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

    const platform =
@@ -70,14 +60,14 @@ export default class BuildConfigure extends EasCommand {
      if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
        if (workflow === Workflow.GENERIC) {
-          await syncAndroidUpdatesConfigurationAsync(projectDir, exp, projectId);
+          await syncAndroidUpdatesConfigurationAsync(projectDir, exp);
        }
      }

      if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
        if (workflow === Workflow.GENERIC) {
-          await syncIosUpdatesConfigurationAsync(projectDir, exp, projectId);
+          await syncIosUpdatesConfigurationAsync(projectDir, exp);
        }
      }
    }
@@ -1,25 +1,13 @@
-import { Platform } from '@expo/eas-build-job';
-import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
 import { Errors, Flags } from '@oclif/core';
-import chalk from 'chalk';
-import figures from 'figures';
 import path from 'path';

 import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
 import { UserInputResourceClass } from '../../build/types';
-import EasCommand, {
-  EASCommandLoggedInContext,
-  EASCommandProjectDirContext,
-  EASCommandProjectIdContext,
-} from '../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { StatuspageServiceName } from '../../graphql/generated';
-import Log, { link } from '../../log';
+import EasCommand from '../../commandUtils/EasCommand';
+import Log from '../../log';
 import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform';
-import { selectAsync } from '../../prompts';
-import uniq from '../../utils/expodash/uniq';
+import { findProjectRootAsync } from '../../project/projectUtils';
 import { enableJsonOutput } from '../../utils/json';
-import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';

 interface RawBuildFlags {
  platform?: string;
@@ -39,9 +27,9 @@ interface RawBuildFlags {
 }

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

-  static override flags = {
+  static flags = {
    platform: Flags.enum({
      char: 'p',
      options: ['android', 'ios', 'all'],
@@ -50,16 +38,23 @@ export default class Build extends EasCommand {
      default: false,
      hidden: true,
    }),
+    json: Flags.boolean({
+      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
+      default: false,
+    }),
    'skip-project-configuration': Flags.boolean({
      default: false,
      hidden: true,
    }),
    profile: Flags.string({
-      char: 'e',
      description:
        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
      helpValue: 'PROFILE_NAME',
    }),
+    'non-interactive': Flags.boolean({
+      default: false,
+      description: 'Run command in non-interactive mode',
+    }),
    local: Flags.boolean({
      default: false,
      description: 'Run build locally [experimental]',
@@ -96,45 +91,21 @@ export default class Build extends EasCommand {
      char: 'm',
      description: 'A short message describing the build',
    }),
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...EASCommandLoggedInContext,
-    ...EASCommandProjectIdContext,
-    ...EASCommandProjectDirContext,
  };

  async runAsync(): Promise<void> {
    const { flags: rawFlags } = await this.parse(Build);
-
    if (rawFlags.json) {
      enableJsonOutput();
    }
-    const flags = this.sanitizeFlags(rawFlags);
+    const flags = await this.sanitizeFlagsAsync(rawFlags);

-    const { actor, projectId, projectDir } = await this.getContextAsync(Build, {
-      nonInteractive: flags.nonInteractive,
-    });
+    const projectDir = await findProjectRootAsync();

-    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
-
-    if (!flags.localBuildOptions.enable) {
-      await maybeWarnAboutEasOutagesAsync(
-        flags.autoSubmit
-          ? [StatuspageServiceName.EasBuild, StatuspageServiceName.EasSubmit]
-          : [StatuspageServiceName.EasBuild]
-      );
-    }
-
-    const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
-
-    await runBuildAndSubmitAsync(projectDir, flagsWithPlatform, actor, projectId);
+    await runBuildAndSubmitAsync(projectDir, flags);
  }

-  private sanitizeFlags(
-    flags: RawBuildFlags
-  ): Omit<BuildFlags, 'requestedPlatform'> & { requestedPlatform?: RequestedPlatform } {
+  private async sanitizeFlagsAsync(flags: RawBuildFlags): Promise<BuildFlags> {
    const nonInteractive = flags['non-interactive'];
    if (!flags.local && flags.output) {
      Errors.error('--output is allowed only for local builds', { exit: 1 });
@@ -146,11 +117,21 @@ export default class Build extends EasCommand {
      Errors.error('--json is allowed only when building in non-interactive mode', { exit: 1 });
    }

-    const requestedPlatform =
-      flags.platform &&
-      Object.values(RequestedPlatform).includes(flags.platform.toLowerCase() as RequestedPlatform)
-        ? (flags.platform.toLowerCase() as RequestedPlatform)
-        : undefined;
+    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
+    if (flags.local) {
+      if (flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined) {
+        // TODO: implement this
+        Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
+      }
+
+      if (requestedPlatform === RequestedPlatform.All) {
+        Errors.error('Builds for multiple platforms are not supported with flag --local', {
+          exit: 1,
+        });
+      } else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
+        Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
+      }
+    }

    if (flags['skip-credentials-check']) {
      Log.warnDeprecatedFlag(
@@ -195,105 +176,4 @@ export default class Build extends EasCommand {
      message,
    };
  }
-
-  private async ensurePlatformSelectedAsync(
-    flags: Omit<BuildFlags, 'requestedPlatform'> & { requestedPlatform?: RequestedPlatform }
-  ): Promise<BuildFlags> {
-    const requestedPlatform = await selectRequestedPlatformAsync(flags.requestedPlatform);
-
-    if (flags.localBuildOptions.enable) {
-      if (flags.autoSubmit) {
-        // TODO: implement this
-        Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
-      }
-
-      if (requestedPlatform === RequestedPlatform.All) {
-        Errors.error('Builds for multiple platforms are not supported with flag --local', {
-          exit: 1,
-        });
-      } else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
-        Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
-      }
-    }
-
-    return {
-      ...flags,
-      requestedPlatform,
-    };
-  }
-}
-
-async function handleDeprecatedEasJsonAsync(
-  projectDir: string,
-  nonInteractive: boolean
-): Promise<void> {
-  const easJsonAccessor = new EasJsonAccessor(projectDir);
-  const profileNames = await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
-  const platformAndProfileNames: [Platform, string][] = profileNames.flatMap(profileName => [
-    [Platform.ANDROID, profileName],
-    [Platform.IOS, profileName],
-  ]);
-
-  const deprecatedProfiles: [Platform, string][] = [];
-
-  for (const [platform, profileName] of platformAndProfileNames) {
-    const buildProfile = await EasJsonUtils.getBuildProfileAsync(
-      easJsonAccessor,
-      platform,
-      profileName
-    );
-    if (buildProfile.artifactPath) {
-      deprecatedProfiles.push([platform, profileName]);
-    }
-  }
-
-  if (deprecatedProfiles.length === 0) {
-    return;
-  }
-
-  const deprecatedProfileNames = uniq(deprecatedProfiles.map(([, profileName]) => profileName));
-  Log.warn(`Some of your build profiles use deprecated field ${chalk.bold('artifactPath')}:`);
-  for (const profileName of deprecatedProfileNames) {
-    Log.warn(`- ${profileName}`);
-  }
-  Log.newLine();
-
-  if (nonInteractive) {
-    Log.warn(
-      `${figures.warning} Action required: rename ${chalk.bold('artifactPath')} to ${chalk.bold(
-        'applicationArchivePath'
-      )} in all of the build profiles listed above.`
-    );
-    Log.warn(
-      `See ${link('https://docs.expo.dev/build-reference/eas-json/')} for more information.`
-    );
-    Log.warn(
-      `This warning will become an error in a future EAS CLI release. This build will continue to use the ${chalk.bold(
-        'artifactPath'
-      )} setting.`
-    );
-    return;
-  }
-
-  const rename = await selectAsync('Do you want us to handle renaming the field for you?', [
-    { title: 'Yes', value: true },
-    { title: 'No, I will edit eas.json manually (EAS CLI exits)', value: false },
-  ]);
-
-  if (!rename) {
-    Errors.exit(1);
-  }
-
-  await easJsonAccessor.readRawJsonAsync();
-  for (const [platform, profileName] of deprecatedProfiles) {
-    easJsonAccessor.patch(easJsonRawObject => {
-      easJsonRawObject.build[profileName][platform].applicationArchivePath =
-        easJsonRawObject.build[profileName][platform].artifactPath;
-      delete easJsonRawObject.build[profileName][platform].artifactPath;
-      return easJsonRawObject;
-    });
-  }
-  await easJsonAccessor.writeAsync();
-
-  Log.withTick('Updated eas.json');
 }
@@ -5,14 +5,11 @@ import path from 'path';
 import { v4 as uuidv4 } from 'uuid';

 import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
-import EasCommand, {
-  EASCommandLoggedInContext,
-  EASCommandProjectDirContext,
-  EASCommandProjectIdContext,
-} from '../../commandUtils/EasCommand';
+import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
+import { findProjectRootAsync } from '../../project/projectUtils';
 import { getTmpDirectory } from '../../utils/paths';
 import { getVcsClient } from '../../vcs';

@@ -28,17 +25,16 @@ const STAGE_DESCRIPTION = `Stage of the build you want to inspect.
    post-build - builds the native project and leaves the output directory for inspection`;

 export default class BuildInspect extends EasCommand {
-  static override description =
+  static description =
    'inspect the state of the project at specific build stages, useful for troubleshooting';

-  static override flags = {
+  static flags = {
    platform: Flags.enum({
      char: 'p',
      options: [RequestedPlatform.Android, RequestedPlatform.Ios],
      required: true,
    }),
    profile: Flags.string({
-      char: 'e',
      description:
        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
      helpValue: 'PROFILE_NAME',
@@ -65,18 +61,8 @@ export default class BuildInspect extends EasCommand {
    }),
  };

-  static override contextDefinition = {
-    ...EASCommandLoggedInContext,
-    ...EASCommandProjectIdContext,
-    ...EASCommandProjectDirContext,
-  };
-
  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildInspect);
-    const { actor, projectId, projectDir } = await this.getContextAsync(BuildInspect, {
-      nonInteractive: false,
-    });
-
    const outputDirectory = path.resolve(process.cwd(), flags.output);
    const tmpWorkingdir = path.join(getTmpDirectory(), uuidv4());

@@ -94,29 +80,25 @@ export default class BuildInspect extends EasCommand {
      await vcs.makeShallowCopyAsync(tmpWorkingdir);
      await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
    } else {
+      const projectDir = await findProjectRootAsync();
      try {
-        await runBuildAndSubmitAsync(
-          projectDir,
-          {
-            nonInteractive: false,
-            wait: true,
-            clearCache: false,
-            json: false,
-            autoSubmit: false,
-            requestedPlatform: flags.platform,
-            profile: flags.profile,
-            localBuildOptions: {
-              enable: true,
-              ...(flags.stage === InspectStage.PRE_BUILD ? { skipNativeBuild: true } : {}),
-              ...(flags.stage === InspectStage.POST_BUILD ? { skipCleanup: true } : {}),
-              verbose: flags.verbose,
-              workingdir: tmpWorkingdir,
-              artifactsDir: path.join(tmpWorkingdir, 'artifacts'),
-            },
+        await runBuildAndSubmitAsync(projectDir, {
+          nonInteractive: false,
+          wait: true,
+          clearCache: false,
+          json: false,
+          autoSubmit: false,
+          requestedPlatform: flags.platform,
+          profile: flags.profile,
+          localBuildOptions: {
+            enable: true,
+            ...(flags.stage === InspectStage.PRE_BUILD ? { skipNativeBuild: true } : {}),
+            ...(flags.stage === InspectStage.POST_BUILD ? { skipCleanup: true } : {}),
+            verbose: flags.verbose,
+            workingdir: tmpWorkingdir,
+            artifactsDir: path.join(tmpWorkingdir, 'artifacts'),
          },
-          actor,
-          projectId
-        );
+        });
        if (!flags.verbose) {
          Log.log(chalk.green('Build successful'));
        }
@@ -1,30 +1,36 @@
 import { Flags } from '@oclif/core';
+import chalk from 'chalk';

-import { BUILDS_LIMIT, listAndRenderBuildsOnAppAsync } from '../../build/queries';
 import { BuildDistributionType, BuildStatus } from '../../build/types';
-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import {
-  EasPaginatedQueryFlags,
-  getLimitFlagWithCustomValues,
-  getPaginatedQueryOptions,
-} from '../../commandUtils/pagination';
+import { formatGraphQLBuild } from '../../build/utils/formatBuild';
+import EasCommand from '../../commandUtils/EasCommand';
 import {
  AppPlatform,
  DistributionType,
  BuildStatus as GraphQLBuildStatus,
 } from '../../graphql/generated';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
+import Log from '../../log';
+import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
-import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
-import { enableJsonOutput } from '../../utils/json';
+import { getExpoConfig } from '../../project/expoConfig';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export default class BuildList extends EasCommand {
-  static override description = 'list all builds for your project';
+  static description = 'list all builds for your project';

-  static override flags = {
+  static flags = {
    platform: Flags.enum({
      options: [RequestedPlatform.All, RequestedPlatform.Android, RequestedPlatform.Ios],
    }),
+    json: Flags.boolean({
+      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
+    }),
    status: Flags.enum({
      options: [
        BuildStatus.NEW,
@@ -50,55 +56,76 @@ export default class BuildList extends EasCommand {
    appIdentifier: Flags.string(),
    buildProfile: Flags.string(),
    gitCommitHash: Flags.string(),
-    ...EasPaginatedQueryFlags,
-    limit: getLimitFlagWithCustomValues({ defaultTo: 10, limit: BUILDS_LIMIT }),
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
+    limit: Flags.integer(),
  };

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildList);
-    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    const {
-      json: jsonFlag,
+      json,
      platform: requestedPlatform,
      status: buildStatus,
      distribution: buildDistribution,
-      'non-interactive': nonInteractive,
+      limit = 10,
    } = flags;
-    const { projectId } = await this.getContextAsync(BuildList, {
-      nonInteractive,
-    });
-    if (jsonFlag) {
+    if (json) {
      enableJsonOutput();
    }

    const platform = toAppPlatform(requestedPlatform);
    const graphqlBuildStatus = toGraphQLBuildStatus(buildStatus);
    const graphqlBuildDistribution = toGraphQLBuildDistribution(buildDistribution);
-    const displayName = await getDisplayNameForProjectIdAsync(projectId);

-    await listAndRenderBuildsOnAppAsync({
-      projectId,
-      projectDisplayName: displayName,
-      filter: {
-        platform,
-        status: graphqlBuildStatus,
-        distribution: graphqlBuildDistribution,
-        channel: flags.channel,
-        appVersion: flags.appVersion,
-        appBuildVersion: flags.appBuildVersion,
-        sdkVersion: flags.sdkVersion,
-        runtimeVersion: flags.runtimeVersion,
-        appIdentifier: flags.appIdentifier,
-        buildProfile: flags.buildProfile,
-        gitCommitHash: flags.gitCommitHash,
-      },
-      paginatedQueryOptions,
-    });
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(exp);
+    const projectName = await getProjectFullNameAsync(exp);
+
+    const spinner = ora().start('Fetching the build list for the project…');
+
+    try {
+      const builds = await BuildQuery.allForAppAsync(projectId, {
+        limit,
+        filter: {
+          platform,
+          status: graphqlBuildStatus,
+          distribution: graphqlBuildDistribution,
+          channel: flags.channel,
+          appVersion: flags.appVersion,
+          appBuildVersion: flags.appBuildVersion,
+          sdkVersion: flags.sdkVersion,
+          runtimeVersion: flags.runtimeVersion,
+          appIdentifier: flags.appIdentifier,
+          buildProfile: flags.buildProfile,
+          gitCommitHash: flags.gitCommitHash,
+        },
+      });
+
+      if (builds.length) {
+        if (platform || graphqlBuildStatus) {
+          spinner.succeed(
+            `Showing ${builds.length} matching builds for the project ${projectName}`
+          );
+        } else {
+          spinner.succeed(`Showing last ${builds.length} builds for the project ${projectName}`);
+        }
+
+        if (json) {
+          printJsonOnlyOutput(builds);
+        } else {
+          const list = builds
+            .map(build => formatGraphQLBuild(build))
+            .join(`\n\n${chalk.dim('———')}\n\n`);
+
+          Log.log(`\n${list}`);
+        }
+      } else {
+        spinner.fail(`Couldn't find any builds for the project ${projectName}`);
+      }
+    } catch (e) {
+      spinner.fail(`Something went wrong and we couldn't fetch the build list ${projectName}`);
+      throw e;
+    }
  }
 }

@@ -1,14 +1,10 @@
 import { getRuntimeVersionNullable } from '@expo/config-plugins/build/utils/Updates';
 import { Platform } from '@expo/eas-build-job';
-import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
+import { EasJsonReader } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';

-import EasCommand, {
-  EASCommandLoggedInContext,
-  EASCommandProjectDirContext,
-  EASCommandProjectIdContext,
-} from '../../../commandUtils/EasCommand';
+import EasCommand from '../../../commandUtils/EasCommand';
 import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
 import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { toAppPlatform } from '../../../graphql/types/AppPlatform';
@@ -18,62 +14,54 @@ import { VERSION_CODE_REQUIREMENTS, isValidVersionCode } from '../../../project/
 import { getApplicationIdentifierAsync } from '../../../project/applicationIdentifier';
 import { getExpoConfig } from '../../../project/expoConfig';
 import { BUILD_NUMBER_REQUIREMENTS, isValidBuildNumber } from '../../../project/ios/versions';
-import { getDisplayNameForProjectIdAsync } from '../../../project/projectUtils';
 import {
-  ensureVersionSourceIsRemoteAsync,
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../../project/projectUtils';
+import {
+  ensureRemoteVersionPolicyAsync,
  getBuildVersionName,
-  validateAppConfigForRemoteVersionSource,
+  validateAppConfigForRemoteVersionPolicyAsync,
 } from '../../../project/remoteVersionSource';
 import { promptAsync } from '../../../prompts';

 export default class BuildVersionSetView extends EasCommand {
-  static override description = 'Update version of an app.';
+  static description = 'Update version of an app.';
+  static hidden = true;

-  static override flags = {
+  static flags = {
    platform: Flags.enum({
      char: 'p',
      options: ['android', 'ios'],
    }),
    profile: Flags.string({
-      char: 'e',
      description:
        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
      helpValue: 'PROFILE_NAME',
    }),
  };

-  static override contextDefinition = {
-    ...EASCommandLoggedInContext,
-    ...EASCommandProjectIdContext,
-    ...EASCommandProjectDirContext,
-  };
-
  public async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildVersionSetView);
-    const { actor, projectId, projectDir } = await this.getContextAsync(BuildVersionSetView, {
-      nonInteractive: false,
-    });
+
+    const projectDir = await findProjectRootAsync();

    const platform = await selectPlatformAsync(flags.platform);
-    const easJsonAccessor = new EasJsonAccessor(projectDir);
-    await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
-    const profile = await EasJsonUtils.getBuildProfileAsync(
-      easJsonAccessor,
-      platform,
-      flags.profile ?? undefined
-    );
+    const easJsonReader = new EasJsonReader(projectDir);
+    await ensureRemoteVersionPolicyAsync(projectDir, easJsonReader);
+    const profile = await easJsonReader.getBuildProfileAsync(platform, flags.profile ?? undefined);

    const exp = getExpoConfig(projectDir, { env: profile.env });
-    const displayName = await getDisplayNameForProjectIdAsync(projectId);
-
-    validateAppConfigForRemoteVersionSource(exp, platform);
+    const projectId = await getProjectIdAsync(exp);
+    const projectFullName = await getProjectFullNameAsync(exp);
+    await validateAppConfigForRemoteVersionPolicyAsync(exp);

    const applicationIdentifier = await getApplicationIdentifierAsync(
      projectDir,
      exp,
      profile,
-      platform,
-      actor
+      platform
    );
    const remoteVersions = await AppVersionQuery.latestVersionAsync(
      projectId,
@@ -81,12 +69,12 @@ export default class BuildVersionSetView extends EasCommand {
      applicationIdentifier
    );
    const currentStateMessage = remoteVersions?.buildVersion
-      ? `Project ${chalk.bold(displayName)} with ${getApplicationIdentifierName(
+      ? `Project ${chalk.bold(projectFullName)} with ${getApplicationIdentifierName(
          platform
        )} "${applicationIdentifier}" is configured with ${getBuildVersionName(platform)} ${
          remoteVersions.buildVersion
        }.`
-      : `Project ${chalk.bold(displayName)} with ${getApplicationIdentifierName(
+      : `Project ${chalk.bold(projectFullName)} with ${getApplicationIdentifierName(
          platform
        )} "${applicationIdentifier}" does not have any ${getBuildVersionName(
          platform
@@ -1,16 +1,12 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, EasJsonAccessor } from '@expo/eas-json';
+import { BuildProfile, EasJsonReader } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';

 import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../../build/android/version';
 import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../../build/ios/version';
-import EasCommand, {
-  EASCommandLoggedInContext,
-  EASCommandProjectDirContext,
-  EASCommandProjectIdContext,
-} from '../../../commandUtils/EasCommand';
+import EasCommand from '../../../commandUtils/EasCommand';
 import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { toAppPlatform } from '../../../graphql/types/AppPlatform';
 import Log from '../../../log';
@@ -26,10 +22,11 @@ import { getExpoConfig } from '../../../project/expoConfig';
 import { resolveXcodeBuildContextAsync } from '../../../project/ios/scheme';
 import { resolveTargetsAsync } from '../../../project/ios/target';
 import { BUILD_NUMBER_REQUIREMENTS, isValidBuildNumber } from '../../../project/ios/versions';
+import { findProjectRootAsync, getProjectIdAsync } from '../../../project/projectUtils';
 import {
-  ensureVersionSourceIsRemoteAsync,
+  ensureRemoteVersionPolicyAsync,
  getBuildVersionName,
-  validateAppConfigForRemoteVersionSource,
+  validateAppConfigForRemoteVersionPolicyAsync,
 } from '../../../project/remoteVersionSource';
 import { resolveWorkflowAsync } from '../../../project/workflow';
 import { getProfilesAsync } from '../../../utils/profiles';
@@ -43,57 +40,47 @@ interface SyncContext<T extends Platform> {
 }

 export default class BuildVersionSyncView extends EasCommand {
-  public static override description =
-    'Update a version in native code with a value stored on EAS servers';
+  public static description = 'Update a version in native code with a value stored on EAS servers';
+  static hidden = true;

-  public static override flags = {
+  public static flags = {
    platform: Flags.enum({
      char: 'p',
      options: ['android', 'ios', 'all'],
    }),
    profile: Flags.string({
-      char: 'e',
      description:
        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
      helpValue: 'PROFILE_NAME',
    }),
  };

-  static override contextDefinition = {
-    ...EASCommandLoggedInContext,
-    ...EASCommandProjectIdContext,
-    ...EASCommandProjectDirContext,
-  };
-
  public async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildVersionSyncView);
-    const { actor, projectId, projectDir } = await this.getContextAsync(BuildVersionSyncView, {
-      nonInteractive: true,
-    });
+    const projectDir = await findProjectRootAsync();

    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
-    const easJsonAccessor = new EasJsonAccessor(projectDir);
-    await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
+    const easJsonReader = new EasJsonReader(projectDir);
+    await ensureRemoteVersionPolicyAsync(projectDir, easJsonReader);

    const platforms = toPlatforms(requestedPlatform);
    const buildProfiles = await getProfilesAsync({
      type: 'build',
-      easJsonAccessor,
+      easJsonReader,
      platforms,
      profileName: flags.profile ?? undefined,
    });
    for (const profileInfo of buildProfiles) {
      const exp = getExpoConfig(projectDir, { env: profileInfo.profile.env });
-
-      validateAppConfigForRemoteVersionSource(exp, profileInfo.platform);
+      const projectId = await getProjectIdAsync(exp);
+      await validateAppConfigForRemoteVersionPolicyAsync(exp);
      const platformDisplayName = appPlatformDisplayNames[toAppPlatform(profileInfo.platform)];

      const applicationIdentifier = await getApplicationIdentifierAsync(
        projectDir,
        exp,
        profileInfo.profile,
-        profileInfo.platform,
-        actor
+        profileInfo.platform
      );
      const remoteVersions = await AppVersionQuery.latestVersionAsync(
        projectId,
@@ -1,24 +1,28 @@
+import { Flags } from '@oclif/core';
+
 import { formatGraphQLBuild } from '../../build/utils/formatBuild';
-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
-import { EasJsonOnlyFlag } from '../../commandUtils/flags';
+import EasCommand from '../../commandUtils/EasCommand';
 import { BuildFragment } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { getExpoConfig } from '../../project/expoConfig';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export default class BuildView extends EasCommand {
-  static override description = 'view a build for your project';
+  static description = 'view a build for your project';

-  static override args = [{ name: 'BUILD_ID' }];
+  static args = [{ name: 'BUILD_ID' }];

-  static override flags = {
-    ...EasJsonOnlyFlag,
-  };
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
+  static flags = {
+    json: Flags.boolean({
+      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
+    }),
  };

  async runAsync(): Promise<void> {
@@ -26,14 +30,14 @@ export default class BuildView extends EasCommand {
      args: { BUILD_ID: buildId },
      flags,
    } = await this.parse(BuildView);
-    const { projectId } = await this.getContextAsync(BuildView, {
-      nonInteractive: true,
-    });
    if (flags.json) {
      enableJsonOutput();
    }

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

    const spinner = ora().start('Fetching the build…');

@@ -43,22 +47,18 @@ export default class BuildView extends EasCommand {
      if (buildId) {
        build = await BuildQuery.byIdAsync(buildId);
      } else {
-        const builds = await BuildQuery.viewBuildsOnAppAsync({
-          appId: projectId,
-          offset: 0,
-          limit: 1,
-        });
+        const builds = await BuildQuery.allForAppAsync(projectId, { limit: 1 });
        if (builds.length === 0) {
-          spinner.fail(`Couldn't find any builds for the project ${displayName}`);
+          spinner.fail(`Couldn't find any builds for the project ${projectName}`);
          return;
        }
        build = builds[0];
      }

      if (buildId) {
-        spinner.succeed(`Found a matching build for the project ${displayName}`);
+        spinner.succeed(`Found a matching build for the project ${projectName}`);
      } else {
-        spinner.succeed(`Showing the last build for the project ${displayName}`);
+        spinner.succeed(`Showing the last build for the project ${projectName}`);
      }

      if (flags.json) {
@@ -71,7 +71,7 @@ export default class BuildView extends EasCommand {
        spinner.fail(`Something went wrong and we couldn't fetch the build with id ${buildId}`);
      } else {
        spinner.fail(
-          `Something went wrong and we couldn't fetch the last build for the project ${displayName}`
+          `Something went wrong and we couldn't fetch the last build for the project ${projectName}`
        );
      }

@@ -1,9 +1,8 @@
+import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

-import { BranchNotFoundError } from '../../branch/utils';
-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  CreateUpdateChannelOnAppMutation,
@@ -11,7 +10,12 @@ import {
 } from '../../graphql/generated';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import Log from '../../log';
-import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { getExpoConfig } from '../../project/expoConfig';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -56,9 +60,9 @@ export async function createUpdateChannelOnAppAsync({
 }

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

-  static override args = [
+  static args = [
    {
      name: 'name',
      required: false,
@@ -66,60 +70,57 @@ export default class ChannelCreate extends EasCommand {
    },
  ];

-  static override flags = {
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
+  static flags = {
+    json: Flags.boolean({
+      description:
+        'print output as a JSON object with the new channel ID, name and branch mapping.',
+      default: false,
+    }),
  };

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

+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(exp);
+
    if (!channelName) {
      const validationMessage = 'Channel name may not be empty.';
-      if (nonInteractive) {
+      if (jsonFlag) {
        throw new Error(validationMessage);
      }
      ({ name: channelName } = await promptAsync({
        type: 'text',
        name: 'name',
-        message: 'Provide a channel name:',
+        message: 'Please name the channel:',
        validate: value => (value ? true : validationMessage),
      }));
    }

    let branchId: string;
    let branchMessage: string;
+    const existingBranch = await BranchQuery.getBranchByNameAsync({
+      appId: projectId,
+      name: channelName,
+    });

-    try {
-      const branch = await BranchQuery.getBranchByNameAsync({
+    if (existingBranch) {
+      branchId = existingBranch.id;
+      branchMessage = `We found a branch with the same name`;
+    } else {
+      const newBranch = await createUpdateBranchOnAppAsync({
        appId: projectId,
        name: channelName,
      });
-      branchId = branch.id;
-      branchMessage = `We found a branch with the same name`;
-    } catch (error) {
-      if (error instanceof BranchNotFoundError) {
-        const newBranch = await createUpdateBranchOnAppAsync({
-          appId: projectId,
-          name: channelName,
-        });
-        branchId = newBranch.id;
-        branchMessage = `We also went ahead and made a branch with the same name`;
-      } else {
-        throw error;
-      }
+      branchId = newBranch.id;
+      branchMessage = `We also went ahead and made a branch with the same name`;
    }

    const {
@@ -132,7 +133,7 @@ export default class ChannelCreate extends EasCommand {

    if (!newChannel) {
      throw new Error(
-        `Could not create channel with name ${channelName} on project with id ${projectId}`
+        `Could not create channel with name ${channelName} on app with id ${projectId}`
      );
    }

@@ -141,9 +142,7 @@ export default class ChannelCreate extends EasCommand {
    } else {
      Log.addNewLineIfNone();
      Log.withTick(
-        `Created a new channel on project ${chalk.bold(
-          await getDisplayNameForProjectIdAsync(projectId)
-        )}`
+        `Created a new channel on project ${chalk.bold(await getProjectFullNameAsync(exp))}`
      );
      Log.log(
        formatFields([
@@ -1,84 +1,96 @@
+import { Flags } from '@oclif/core';
 import gql from 'graphql-tag';

-import { selectChannelOnAppAsync } from '../../channel/queries';
-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  DeleteUpdateChannelMutation,
  DeleteUpdateChannelMutationVariables,
  DeleteUpdateChannelResult,
+  GetChannelInfoQuery,
+  GetChannelInfoQueryVariables,
 } from '../../graphql/generated';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
-import { toggleConfirmAsync } from '../../prompts';
+import { getExpoConfig } from '../../project/expoConfig';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
+import { promptAsync, toggleConfirmAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export default class ChannelDelete extends EasCommand {
-  static override hidden = true;
-  static override description = 'Delete a channel';
+  static hidden = true;
+  static description = 'Delete a channel';

-  static override args = [
+  static args = [
    {
      name: 'name',
      required: false,
      description: 'Name of the channel to delete',
    },
  ];
-  static override flags = {
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
+  static flags = {
+    json: Flags.boolean({
+      description: 'print output as a JSON object',
+      default: false,
+    }),
+    'non-interactive': Flags.boolean({
+      default: false,
+      description: 'Run command in non-interactive mode',
+    }),
  };

  async runAsync(): Promise<void> {
    const {
      args: { name: nameArg },
-      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
+      flags: { json: jsonFlag, 'non-interactive': nonInteractiveFlag },
    } = await this.parse(ChannelDelete);
-    const { projectId } = await this.getContextAsync(ChannelDelete, {
-      nonInteractive,
-    });
+    if (jsonFlag && !nonInteractiveFlag) {
+      throw new Error('--json is allowed only in non-interactive mode');
+    }
    if (jsonFlag) {
      enableJsonOutput();
    }

-    let channelId, channelName;
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const fullName = await getProjectFullNameAsync(exp);
+    const projectId = await getProjectIdAsync(exp);
+
+    let name;
    if (nameArg) {
-      const { id, name } = await ChannelQuery.viewUpdateChannelAsync({
-        appId: projectId,
-        channelName: nameArg,
-      });
-      channelId = id;
-      channelName = name;
+      name = nameArg;
    } else {
-      if (nonInteractive) {
+      if (nonInteractiveFlag) {
        throw new Error('Channel name must be set when running in non-interactive mode');
      }
-      const { id, name } = await selectChannelOnAppAsync({
-        projectId,
-        selectionPromptTitle: 'Select a channel to delete',
-        paginatedQueryOptions: {
-          json: jsonFlag,
-          nonInteractive,
-          offset: 0,
-        },
-      });
-      channelId = id;
-      channelName = name;
+      name = (
+        await promptAsync({
+          type: 'text',
+          name: 'name',
+          message: 'Please enter the name of the channel to delete:',
+          validate: (value: any) => (value ? true : 'Channel name may not be empty.'),
+        })
+      ).name;
    }

-    if (!nonInteractive) {
+    const data = await getChannelInfoAsync({ appId: projectId, name });
+    const channelId = data.app?.byId.updateChannelByName?.id;
+    if (!channelId) {
+      throw new Error(`Could not find channel ${name} on ${fullName}`);
+    }
+
+    if (!nonInteractiveFlag) {
      Log.addNewLineIfNone();
      Log.warn(
-        `You are about to permanently delete channel: "${channelName}".\nThis action is irreversible.`
+        `You are about to permamently delete channel: "${name}".\nThis action is irreversible.`
      );
      Log.newLine();
      const confirmed = await toggleConfirmAsync({ message: 'Are you sure you wish to proceed?' });
      if (!confirmed) {
-        Log.error(`Canceled deletion of channel: "${channelName}".`);
+        Log.error(`Canceled deletion of channel: "${name}".`);
        process.exit(1);
      }
    }
@@ -90,11 +102,42 @@ export default class ChannelDelete extends EasCommand {
    if (jsonFlag) {
      printJsonOnlyOutput(deletionResult);
    } else {
-      Log.withTick(`️Deleted channel "${channelName}".`);
+      Log.withTick(`️Deleted channel "${name}".`);
    }
  }
 }

+async function getChannelInfoAsync({
+  appId,
+  name,
+}: GetChannelInfoQueryVariables): Promise<GetChannelInfoQuery> {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .query<GetChannelInfoQuery, GetChannelInfoQueryVariables>(
+        gql`
+          query GetChannelInfo($appId: String!, $name: String!) {
+            app {
+              byId(appId: $appId) {
+                id
+                updateChannelByName(name: $name) {
+                  id
+                  name
+                }
+              }
+            }
+          }
+        `,
+        {
+          appId,
+          name,
+        },
+        { additionalTypenames: ['UpdateChannel'] }
+      )
+      .toPromise()
+  );
+  return data;
+}
+
 async function deleteChannelOnAppAsync({
  channelId,
 }: DeleteUpdateChannelMutationVariables): Promise<DeleteUpdateChannelResult> {
@@ -2,26 +2,71 @@ import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

-import { selectBranchOnAppAsync } from '../../branch/queries';
-import { selectChannelOnAppAsync } from '../../channel/queries';
-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
+  GetChannelByNameToEditQuery,
+  GetChannelByNameToEditQueryVariables,
+  UpdateBranch,
+  UpdateChannel,
  UpdateChannelBranchMappingMutation,
  UpdateChannelBranchMappingMutationVariables,
 } from '../../graphql/generated';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

+async function getChannelByNameForAppAsync({
+  appId,
+  channelName,
+}: GetChannelByNameToEditQueryVariables): Promise<
+  Pick<UpdateChannel, 'id' | 'name'> & {
+    updateBranches: Pick<UpdateBranch, 'id' | 'name'>[];
+  }
+> {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .query<GetChannelByNameToEditQuery, GetChannelByNameToEditQueryVariables>(
+        gql`
+          query GetChannelByNameToEdit($appId: String!, $channelName: String!) {
+            app {
+              byId(appId: $appId) {
+                id
+                updateChannelByName(name: $channelName) {
+                  id
+                  name
+                  updateBranches(offset: 0, limit: 1) {
+                    id
+                    name
+                  }
+                }
+              }
+            }
+          }
+        `,
+        { appId, channelName },
+        { additionalTypenames: ['UpdateChannel', 'UpdateBranch'] }
+      )
+      .toPromise()
+  );
+  const updateChannelByNameResult = data.app?.byId.updateChannelByName;
+  if (!updateChannelByNameResult) {
+    throw new Error(`Could not find a channel named ${channelName} on app with id ${appId}`);
+  }
+  return updateChannelByNameResult;
+}
+
 export async function updateChannelBranchMappingAsync({
  channelId,
  branchMapping,
-}: UpdateChannelBranchMappingMutationVariables): Promise<
-  UpdateChannelBranchMappingMutation['updateChannel']['editUpdateChannel']
-> {
+}: UpdateChannelBranchMappingMutationVariables): Promise<{
+  id: string;
+  name: string;
+  branchMapping: string;
+}> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .mutation<UpdateChannelBranchMappingMutation, UpdateChannelBranchMappingMutationVariables>(
@@ -44,13 +89,13 @@ export async function updateChannelBranchMappingAsync({
  if (!channel) {
    throw new Error(`Could not find a channel with id: ${channelId}`);
  }
-  return channel;
+  return data.updateChannel.editUpdateChannel!;
 }

 export default class ChannelEdit extends EasCommand {
-  static override description = 'point a channel at a new branch';
+  static description = 'point a channel at a new branch';

-  static override args = [
+  static args = [
    {
      name: 'name',
      required: false,
@@ -58,57 +103,48 @@ export default class ChannelEdit extends EasCommand {
    },
  ];

-  static override flags = {
+  static flags = {
    branch: Flags.string({
      description: 'Name of the branch to point to',
    }),
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
+    json: Flags.boolean({
+      description: 'Print output as a JSON object with the channel ID, name and branch mapping',
+      default: false,
+    }),
  };

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

-    const existingChannel = args.name
-      ? await ChannelQuery.viewUpdateChannelAsync({ appId: projectId, channelName: args.name })
-      : await selectChannelOnAppAsync({
-          projectId,
-          selectionPromptTitle: 'Select a channel to edit',
-          paginatedQueryOptions: { json, nonInteractive, offset: 0 },
-        });
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(exp);

+    const channelName = args.name ?? (await promptForChannelAsync());
+
+    const existingChannel = await getChannelByNameForAppAsync({ appId: projectId, channelName });
    if (existingChannel.updateBranches.length > 1) {
-      throw new Error('There is a rollout in progress. Manage it with "channel:rollout" instead.');
+      throw new Error(
+        'There is a rollout in progress. Please manage it with "channel:rollout" instead.'
+      );
    }

-    const branch = branchFlag
-      ? await BranchQuery.getBranchByNameAsync({
-          appId: projectId,
-          name: branchFlag,
-        })
-      : await selectBranchOnAppAsync({
-          projectId,
-          promptTitle: `Which branch would you like ${existingChannel.name} to point at?`,
-          displayTextForListItem: updateBranch => updateBranch.name,
-          paginatedQueryOptions: {
-            json,
-            nonInteractive,
-            offset: 0,
-          },
-        });
+    const branchName = flags.branch ?? (await promptForBranchAsync());

+    const branch = await BranchQuery.getBranchByNameAsync({
+      appId: projectId,
+      name: branchName,
+    });
+    if (!branch) {
+      throw new Error(
+        `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
+          'eas branch:list'
+        )}.`
+      );
+    }
    const channel = await updateChannelBranchMappingAsync({
      channelId: existingChannel.id,
      // todo: move branch mapping logic to utility
@@ -118,7 +154,7 @@ export default class ChannelEdit extends EasCommand {
      }),
    });

-    if (json) {
+    if (flags.json) {
      printJsonOnlyOutput(channel);
    } else {
      Log.withTick(
@@ -131,3 +167,25 @@ export default class ChannelEdit extends EasCommand {
    }
  }
 }
+
+async function promptForChannelAsync(): Promise<string> {
+  Log.addNewLineIfNone();
+  const { name } = await promptAsync({
+    type: 'text',
+    name: 'name',
+    message: 'Please enter the name of the channel to edit:',
+    validate: value => (value ? true : 'The channel name may not be empty.'),
+  });
+  return name;
+}
+
+async function promptForBranchAsync(): Promise<string> {
+  Log.addNewLineIfNone();
+  const { name } = await promptAsync({
+    type: 'text',
+    name: 'name',
+    message: `To which branch should the channel link?`,
+    validate: value => (value ? true : 'The branch name may not be empty.'),
+  });
+  return name;
+}
@@ -1,40 +1,114 @@
-import { CHANNELS_LIMIT, listAndRenderChannelsOnAppAsync } from '../../channel/queries';
-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { Flags } from '@oclif/core';
+import gql from 'graphql-tag';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
-  EasPaginatedQueryFlags,
-  getLimitFlagWithCustomValues,
-  getPaginatedQueryOptions,
-} from '../../commandUtils/pagination';
-import { enableJsonOutput } from '../../utils/json';
+  GetAllChannelsForAppQuery,
+  GetAllChannelsForAppQueryVariables,
+} from '../../graphql/generated';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import formatFields from '../../utils/formatFields';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { logChannelDetails } from './view';
+
+const CHANNEL_LIMIT = 10_000;
+
+async function getAllUpdateChannelForAppAsync({
+  appId,
+}: {
+  appId: string;
+}): Promise<GetAllChannelsForAppQuery> {
+  return await withErrorHandlingAsync(
+    graphqlClient
+      .query<GetAllChannelsForAppQuery, GetAllChannelsForAppQueryVariables>(
+        gql`
+          query GetAllChannelsForApp($appId: String!, $offset: Int!, $limit: Int!) {
+            app {
+              byId(appId: $appId) {
+                id
+                updateChannels(offset: $offset, limit: $limit) {
+                  id
+                  name
+                  branchMapping
+                  updateBranches(offset: 0, limit: $limit) {
+                    id
+                    name
+                    updates(offset: 0, limit: 10) {
+                      id
+                      group
+                      message
+                      runtimeVersion
+                      createdAt
+                      platform
+                      actor {
+                        id
+                        ... on User {
+                          username
+                        }
+                        ... on Robot {
+                          firstName
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        `,
+        { appId, offset: 0, limit: CHANNEL_LIMIT },
+        { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
+      )
+      .toPromise()
+  );
+}

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

-  static override flags = {
-    ...EasPaginatedQueryFlags,
-    limit: getLimitFlagWithCustomValues({ defaultTo: 10, limit: CHANNELS_LIMIT }),
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
+  static flags = {
+    json: Flags.boolean({
+      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
+      default: false,
+    }),
  };

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

-    await listAndRenderChannelsOnAppAsync({
-      projectId,
-      paginatedQueryOptions,
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(exp);
+
+    const getAllUpdateChannelForAppResult = await getAllUpdateChannelForAppAsync({
+      appId: projectId,
    });
+    const channels = getAllUpdateChannelForAppResult.app?.byId.updateChannels;
+    if (!channels) {
+      throw new Error(`Could not find channels on project with id ${projectId}`);
+    }
+
+    if (jsonFlag) {
+      printJsonOnlyOutput(channels);
+    } else {
+      for (const channel of channels) {
+        Log.addNewLineIfNone();
+        Log.log(
+          formatFields([
+            { label: 'Name', value: channel.name },
+            { label: 'ID', value: channel.id },
+          ])
+        );
+        logChannelDetails(channel);
+      }
+    }
  }
 }
@@ -1,17 +1,21 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';

-import { BranchMapping, getBranchMapping } from '../../channel/utils';
-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { UpdateBranch } from '../../graphql/generated';
+import EasCommand from '../../commandUtils/EasCommand';
+import { GetChannelByNameForAppQuery, UpdateBranch } from '../../graphql/generated';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
-import { ChannelQuery, UpdateChannelByNameObject } from '../../graphql/queries/ChannelQuery';
+import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
-import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { getExpoConfig } from '../../project/expoConfig';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
 import { promptAsync, selectAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { updateChannelBranchMappingAsync } from './edit';
+import { BranchMapping, getBranchMapping } from './view';

 async function promptForRolloutPercentAsync({
  promptMessage,
@@ -36,7 +40,9 @@ async function promptForRolloutPercentAsync({
  return rolloutPercent;
 }

-function getRolloutInfo(channel: UpdateChannelByNameObject): {
+function getRolloutInfo(
+  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>
+): {
  newBranch: Pick<UpdateBranch, 'name' | 'id'>;
  oldBranch: Pick<UpdateBranch, 'name' | 'id'>;
  currentPercent: number;
@@ -58,20 +64,20 @@ async function startRolloutAsync({
  channelName,
  branchName,
  percent,
+  jsonFlag,
  projectId,
-  displayName,
+  fullName,
  currentBranchMapping,
  channel,
-  nonInteractive,
 }: {
  channelName?: string;
  branchName: string;
  percent?: number;
+  jsonFlag: boolean;
  projectId: string;
-  displayName: string;
+  fullName: string;
  currentBranchMapping: BranchMapping;
-  channel: UpdateChannelByNameObject;
-  nonInteractive: boolean;
+  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
 }): Promise<{
  newChannelInfo: {
    id: string;
@@ -84,6 +90,13 @@ async function startRolloutAsync({
    appId: projectId,
    name: branchName,
  });
+  if (!branch) {
+    throw new Error(
+      `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
+        'eas branch:list'
+      )}.`
+    );
+  }

  const oldBranchId = currentBranchMapping.data[0].branchId;
  if (branch.id === oldBranchId) {
@@ -93,9 +106,9 @@ async function startRolloutAsync({
  }

  if (percent == null) {
-    if (nonInteractive) {
+    if (jsonFlag) {
      throw new Error(
-        'You must specify a percent with the --percent flag when initiating a rollout with the --non-interactive flag.'
+        'You must specify a percent with the --percent flag when initiating a rollout with the --json flag.'
      );
    }
    const promptMessage = `What percent of users should be directed to the branch "${branchName}"?`;
@@ -124,7 +137,7 @@ async function startRolloutAsync({
  const oldBranch = channel.updateBranches.filter(branch => branch.id === oldBranchId)[0];
  if (!oldBranch) {
    throw new Error(
-      `Branch mapping is missing its only branch for channel "${channelName}" on app "${displayName}"`
+      `Branch mapping is missing its only branch for channel "${channelName}" on app "${fullName}"`
    );
  }

@@ -142,15 +155,15 @@ async function startRolloutAsync({
 async function editRolloutAsync({
  channelName,
  percent,
-  nonInteractive,
+  jsonFlag,
  currentBranchMapping,
  channel,
 }: {
  channelName?: string;
  percent?: number;
-  nonInteractive: boolean;
+  jsonFlag: boolean;
  currentBranchMapping: BranchMapping;
-  channel: UpdateChannelByNameObject;
+  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
 }): Promise<{
  newChannelInfo: {
    id: string;
@@ -162,7 +175,7 @@ async function editRolloutAsync({
  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(channel);

  if (percent == null) {
-    if (nonInteractive) {
+    if (jsonFlag) {
      throw new Error(
        'A rollout is already in progress. If you wish to modify it you must use specify the new rollout percentage with the --percent flag.'
      );
@@ -197,15 +210,15 @@ async function editRolloutAsync({
 async function endRolloutAsync({
  channelName,
  branchName,
-  nonInteractive,
+  jsonFlag,
  projectId,
  channel,
 }: {
  channelName?: string;
  branchName?: string;
-  nonInteractive: boolean;
+  jsonFlag: boolean;
  projectId: string;
-  channel: UpdateChannelByNameObject;
+  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
 }): Promise<{
  newChannelInfo: {
    id: string;
@@ -223,6 +236,13 @@ async function endRolloutAsync({
      appId: projectId,
      name: branchName,
    });
+    if (!branch) {
+      throw new Error(
+        `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
+          'eas branch:list'
+        )}.`
+      );
+    }

    switch (branch.id) {
      case newBranch.id:
@@ -237,9 +257,9 @@ async function endRolloutAsync({
        );
    }
  } else {
-    if (nonInteractive) {
+    if (jsonFlag) {
      throw new Error(
-        'Branch name must be specified with the --branch flag when both the --end and --non-interactive flag are true.'
+        'Branch name must be specified with the --branch flag when both the --end and --json flag are true.'
      );
    }
    endOnNewBranch = await selectAsync<boolean>(
@@ -284,10 +304,10 @@ async function endRolloutAsync({
 }

 export default class ChannelRollout extends EasCommand {
-  static override hidden = true;
-  static override description = 'Rollout a new branch out to a channel incrementally.';
+  static hidden = true;
+  static description = 'Rollout a new branch out to a channel incrementally.';

-  static override args = [
+  static args = [
    {
      name: 'channel',
      required: true,
@@ -295,7 +315,7 @@ export default class ChannelRollout extends EasCommand {
    },
  ];

-  static override flags = {
+  static flags = {
    branch: Flags.string({
      description: 'branch to rollout',
      required: false,
@@ -308,40 +328,33 @@ export default class ChannelRollout extends EasCommand {
      description: 'end the rollout',
      default: false,
    }),
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
+    json: Flags.boolean({
+      description: 'print output as a JSON object with the new channel ID, name and branch mapping',
+      default: false,
+    }),
  };

  async runAsync(): Promise<void> {
    const {
      args: { channel: channelName },
-      flags: {
-        json: jsonFlag,
-        end: endFlag,
-        branch: branchName,
-        percent,
-        'non-interactive': nonInteractive,
-      },
+      flags: { json: jsonFlag, end: endFlag, branch: branchName, percent },
    } = await this.parse(ChannelRollout);
-    const { projectId } = await this.getContextAsync(ChannelRollout, {
-      nonInteractive,
-    });
    if (jsonFlag) {
      enableJsonOutput();
    }

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

-    const channel = await ChannelQuery.viewUpdateChannelAsync({
+    const channel = await ChannelQuery.getUpdateChannelByNameForAppAsync({
      appId: projectId,
      channelName: channelName!,
    });
    if (!channel) {
      throw new Error(
-        `Could not find a channel named "${channelName}". Check which channels exist on this project with ${chalk.bold(
+        `Could not find a channel named "${channelName}". Please check what channels exist on this project with ${chalk.bold(
          'eas channel:list'
        )}.`
      );
@@ -382,11 +395,11 @@ export default class ChannelRollout extends EasCommand {
    if (!isRollout) {
      rolloutMutationResult = await startRolloutAsync({
        channelName,
-        branchName: branchName ?? (await promptForBranchNameAsync(channelName, nonInteractive)),
+        branchName: branchName ?? (await promptForBranchNameAsync(channelName)),
        percent,
-        nonInteractive,
+        jsonFlag,
        projectId,
-        displayName: projectDisplayName,
+        fullName,
        currentBranchMapping,
        channel,
      });
@@ -394,7 +407,7 @@ export default class ChannelRollout extends EasCommand {
      rolloutMutationResult = await endRolloutAsync({
        channelName,
        branchName,
-        nonInteractive,
+        jsonFlag,
        projectId,
        channel,
      });
@@ -402,7 +415,7 @@ export default class ChannelRollout extends EasCommand {
      rolloutMutationResult = await editRolloutAsync({
        channelName,
        percent,
-        nonInteractive,
+        jsonFlag,
        currentBranchMapping,
        channel,
      });
@@ -419,13 +432,7 @@ export default class ChannelRollout extends EasCommand {
  }
 }

-async function promptForBranchNameAsync(
-  channelName: string,
-  nonInteractive: boolean
-): Promise<string> {
-  if (nonInteractive) {
-    throw new Error('Must supply branch flag in non-interactive mode');
-  }
+async function promptForBranchNameAsync(channelName: string): Promise<string> {
  const { name } = await promptAsync({
    type: 'text',
    name: 'name',
@@ -1,18 +1,146 @@
+import { Flags } from '@oclif/core';
 import assert from 'assert';
+import chalk from 'chalk';
+import Table from 'cli-table3';

+import EasCommand from '../../commandUtils/EasCommand';
+import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
 import {
-  listAndRenderBranchesAndUpdatesOnChannelAsync,
-  selectChannelOnAppAsync,
-} from '../../channel/queries';
-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
-import { enableJsonOutput } from '../../utils/json';
+  FormatUpdateParameter,
+  UPDATE_COLUMNS,
+  formatUpdate,
+  getPlatformsForGroup,
+} from '../../update/utils';
+import formatFields from '../../utils/formatFields';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+
+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: {
+  branchMapping: string;
+  updateBranches: {
+    updates: (FormatUpdateParameter & {
+      runtimeVersion: string;
+      group: string;
+      platform: string;
+    })[];
+    name: string;
+    id: string;
+  }[];
+}): void {
+  const { branchMapping, isRollout, rolloutPercent } = getBranchMapping(channel.branchMapping);
+
+  const table = new Table({
+    head: ['branch', ...(isRollout ? ['rollout percent'] : []), ...UPDATE_COLUMNS],
+    wordWrap: true,
+  });
+
+  for (const index in branchMapping.data) {
+    if (parseInt(index, 10) > 1) {
+      throw new Error('Branch Mapping data must have length less than or equal to 2.');
+    }
+
+    const { branchId } = branchMapping.data[index];
+    const branch = channel.updateBranches.filter(branch => branch.id === branchId)[0];
+    if (!branch) {
+      throw new Error('Branch mapping is pointing at a missing branch.');
+    }
+    const update = branch.updates[0];
+    table.push([
+      branch.name,
+      ...(isRollout
+        ? [
+            parseInt(index, 10) === 0
+              ? `${rolloutPercent! * 100}%`
+              : `${(1 - rolloutPercent!) * 100}%`,
+          ]
+        : []),
+      formatUpdate(update),
+      update?.runtimeVersion ?? 'N/A',
+      update?.group ?? 'N/A',
+      getPlatformsForGroup({
+        updates: branch.updates,
+        group: branch.updates[0]?.group,
+      }),
+    ]);
+  }
+  Log.log(table.toString());
+}

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

-  static override args = [
+  static args = [
    {
      name: 'name',
      required: false,
@@ -20,51 +148,61 @@ export default class ChannelView extends EasCommand {
    },
  ];

-  static override flags = {
-    ...EasNonInteractiveAndJsonFlags,
-    ...EasPaginatedQueryFlags,
-  };
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
+  static flags = {
+    json: Flags.boolean({
+      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
+      default: false,
+    }),
  };

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

+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(exp);
+
    if (!channelName) {
      const validationMessage = 'A channel name is required to view a specific channel.';
-      if (nonInteractive) {
+      if (jsonFlag) {
        throw new Error(validationMessage);
      }
-      const selectedUpdateChannel = await selectChannelOnAppAsync({
-        projectId,
-        selectionPromptTitle: 'Select a channel to view',
-        paginatedQueryOptions: {
-          json: jsonFlag,
-          nonInteractive,
-          offset: 0,
-        },
-      });
-      channelName = selectedUpdateChannel.name;
-      assert(channelName, `A channel must be selected.`);
+      ({ name: channelName } = await promptAsync({
+        type: 'text',
+        name: 'name',
+        message: 'Please name the channel:',
+        validate: value => (value ? true : validationMessage),
+      }));
    }

-    await listAndRenderBranchesAndUpdatesOnChannelAsync({
-      projectId,
+    const channel = await ChannelQuery.getUpdateChannelByNameForAppAsync({
+      appId: projectId,
      channelName,
-      paginatedQueryOptions,
    });
+    if (!channel) {
+      throw new Error(`Could not find a channel with name: ${channelName}`);
+    }
+
+    if (jsonFlag) {
+      printJsonOnlyOutput(channel);
+    } else {
+      Log.addNewLineIfNone();
+      Log.log(chalk.bold('Channel:'));
+      Log.log(
+        formatFields([
+          { label: 'Name', value: channel.name },
+          { label: 'ID', value: channel.id },
+        ])
+      );
+      Log.addNewLineIfNone();
+      Log.log(chalk`{bold Branches pointed at this channel and their most recent update group:}`);
+      logChannelDetails(channel);
+    }
  }
 }
@@ -1,50 +1,43 @@
 import { getProjectConfigDescription } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
-import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
+import { EasJsonReader } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';

-import EasCommand, { EASCommandProjectDirContext } from '../commandUtils/EasCommand';
+import EasCommand from '../commandUtils/EasCommand';
 import { toAppPlatform } from '../graphql/types/AppPlatform';
 import Log from '../log';
 import { appPlatformEmojis } from '../platform';
 import { getExpoConfig } from '../project/expoConfig';
+import { findProjectRootAsync } from '../project/projectUtils';
 import { selectAsync } from '../prompts';

 export default class Config extends EasCommand {
-  static override description = 'display project configuration (app.json + eas.json)';
+  static description = 'display project configuration (app.json + eas.json)';

-  static override flags = {
+  static flags = {
    platform: Flags.enum({ char: 'p', options: ['android', 'ios'] }),
-    profile: Flags.string({
-      char: 'e',
-      description:
-        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
-      helpValue: 'PROFILE_NAME',
-    }),
+    profile: Flags.string(),
  };

-  static override contextDefinition = {
-    ...EASCommandProjectDirContext,
-  };
+  protected requiresAuthentication = false;

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(Config);
-    const { projectDir } = await this.getContextAsync(Config, {
-      nonInteractive: false,
-    });
    const { platform: maybePlatform, profile: maybeProfile } = flags as {
      platform?: Platform;
      profile?: string;
    };

-    const accessor = new EasJsonAccessor(projectDir);
+    const projectDir = await findProjectRootAsync();
+
+    const reader = new EasJsonReader(projectDir);
    const profileName =
      maybeProfile ??
      (await selectAsync(
        'Select build profile',
        (
-          await EasJsonUtils.getBuildProfileNamesAsync(accessor)
+          await reader.getBuildProfileNamesAsync()
        ).map(profileName => ({
          title: profileName,
          value: profileName,
@@ -63,7 +56,7 @@ export default class Config extends EasCommand {
        },
      ]));

-    const profile = await EasJsonUtils.getBuildProfileAsync(accessor, platform, profileName);
+    const profile = await reader.getBuildProfileAsync(platform, profileName);
    const config = getExpoConfig(projectDir, { env: profile.env, isPublicConfig: true });

    Log.addNewLineIfNone();
@@ -1,34 +1,10 @@
-import { Flags } from '@oclif/core';
-
-import EasCommand, {
-  EASCommandLoggedInContext,
-  EASCommandProjectDirContext,
-  EASCommandProjectIdContext,
-} from '../commandUtils/EasCommand';
+import EasCommand from '../commandUtils/EasCommand';
 import { SelectPlatform } from '../credentials/manager/SelectPlatform';
-import { getExpoConfig } from '../project/expoConfig';

 export default class Credentials extends EasCommand {
-  static override description = 'manage credentials';
-
-  static override flags = {
-    platform: Flags.enum({ char: 'p', options: ['android', 'ios'] }),
-  };
-
-  static override contextDefinition = {
-    ...EASCommandLoggedInContext,
-    ...EASCommandProjectIdContext,
-    ...EASCommandProjectDirContext,
-  };
+  static description = 'manage credentials';

  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(Credentials);
-    const { actor, projectId, projectDir } = await this.getContextAsync(Credentials, {
-      nonInteractive: false,
-    });
-
-    const exp = getExpoConfig(projectDir);
-
-    await new SelectPlatform(actor, { projectId, exp }, flags.platform).runAsync();
+    await new SelectPlatform().runAsync();
  }
 }
@@ -1,26 +1,16 @@
-import EasCommand, {
-  EASCommandLoggedInContext,
-  EASCommandProjectIdContext,
-} from '../../commandUtils/EasCommand';
+import EasCommand from '../../commandUtils/EasCommand';
 import AppStoreApi from '../../credentials/ios/appstore/AppStoreApi';
 import { createContextAsync } from '../../devices/context';
 import DeviceManager from '../../devices/manager';
+import { ensureLoggedInAsync } from '../../user/actions';

 export default class DeviceCreate extends EasCommand {
-  static override description = 'register new Apple Devices to use for internal distribution';
-
-  static override contextDefinition = {
-    ...EASCommandLoggedInContext,
-    ...EASCommandProjectIdContext,
-  };
+  static description = 'register new Apple Devices to use for internal distribution';

  async runAsync(): Promise<void> {
-    // this command is interactive by design
-    const { actor, projectId } = await this.getContextAsync(DeviceCreate, {
-      nonInteractive: false,
-    });
+    const user = await ensureLoggedInAsync();

-    const ctx = await createContextAsync({ appStore: new AppStoreApi(), user: actor, projectId });
+    const ctx = await createContextAsync({ appStore: new AppStoreApi(), user });
    const manager = new DeviceManager(ctx);
    await manager.createAsync();
  }
@@ -2,7 +2,7 @@ import { Device, DeviceStatus } from '@expo/apple-utils';
 import { Flags } from '@oclif/core';
 import assert from 'assert';

-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
+import EasCommand from '../../commandUtils/EasCommand';
 import { chooseDevicesToDeleteAsync } from '../../credentials/ios/actions/DeviceUtils';
 import { AppleDeviceMutation } from '../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
 import {
@@ -16,38 +16,34 @@ import formatDevice from '../../devices/utils/formatDevice';
 import { AppleDevice, Maybe } from '../../graphql/generated';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';

 export default class DeviceDelete extends EasCommand {
-  static override description = 'remove a registered device from your account';
+  static description = 'remove a registered device from your account';

-  static override flags = {
+  static flags = {
    'apple-team-id': Flags.string(),
    udid: Flags.string({ multiple: true }),
  };

-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
-  };
-
  async runAsync(): Promise<void> {
    let {
      flags: { 'apple-team-id': appleTeamIdentifier, udid: udids },
    } = await this.parse(DeviceDelete);
-    const { projectId } = await this.getContextAsync(DeviceDelete, {
-      nonInteractive: false,
-    });

-    const account = await getOwnerAccountForProjectIdAsync(projectId);
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const accountName = await getProjectAccountNameAsync(exp);

    if (!appleTeamIdentifier) {
-      appleTeamIdentifier = await this.askForAppleTeamAsync(account.name);
+      appleTeamIdentifier = await this.askForAppleTeamAsync(accountName);
    }

    assert(appleTeamIdentifier, 'No team identifier is specified');

-    const appleDevicesResult = await this.getDevicesForTeamAsync(account.name, appleTeamIdentifier);
+    const appleDevicesResult = await this.getDevicesForTeamAsync(accountName, appleTeamIdentifier);

    if (!appleDevicesResult) {
      return;
@@ -93,10 +89,9 @@ export default class DeviceDelete extends EasCommand {
    Log.addNewLineIfNone();
    const removeAppleSpinner = ora('Disabling devices on Apple').start();
    try {
-      const chosenDeviceIdentifiers = chosenDevices.map(cd => cd.identifier);
-      const allDevices = await Device.getAsync(context);
-      const realDevices = allDevices.filter(d =>
-        chosenDeviceIdentifiers.includes(d.attributes.udid)
+      let realDevices = await Device.getAllIOSProfileDevicesAsync(context);
+      realDevices = realDevices.filter(d =>
+        chosenDevices.map(cd => cd.identifier).includes(d.attributes.udid)
      );

      for (const device of realDevices) {
@@ -2,33 +2,29 @@ import { Flags } from '@oclif/core';
 import assert from 'assert';
 import chalk from 'chalk';

-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
+import EasCommand from '../../commandUtils/EasCommand';
 import { AppleDeviceQuery } from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
 import { AppleTeamQuery } from '../../credentials/ios/api/graphql/queries/AppleTeamQuery';
 import formatDevice from '../../devices/utils/formatDevice';
 import Log from '../../log';
 import { Ora, ora } from '../../ora';
-import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';

 export default class BuildList extends EasCommand {
-  static override description = 'list all registered devices for your account';
+  static description = 'list all registered devices for your account';

-  static override flags = {
+  static flags = {
    'apple-team-id': Flags.string(),
  };

-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
-  };
-
  async runAsync(): Promise<void> {
    let appleTeamIdentifier = (await this.parse(BuildList)).flags['apple-team-id'];
-    const { projectId } = await this.getContextAsync(BuildList, {
-      nonInteractive: false,
-    });

-    const account = await getOwnerAccountForProjectIdAsync(projectId);
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const accountName = await getProjectAccountNameAsync(exp);

    let spinner: Ora;

@@ -36,7 +32,7 @@ export default class BuildList extends EasCommand {
      spinner = ora().start('Fetching the list of teams for the project…');

      try {
-        const teams = await AppleTeamQuery.getAllForAccountAsync(account.name);
+        const teams = await AppleTeamQuery.getAllForAccountAsync(accountName);

        if (teams.length > 0) {
          spinner.succeed();
@@ -59,7 +55,7 @@ export default class BuildList extends EasCommand {
            appleTeamIdentifier = result.appleTeamIdentifier;
          }
        } else {
-          spinner.fail(`Couldn't find any teams for the account ${account.name}`);
+          spinner.fail(`Couldn't find any teams for the account ${accountName}`);
        }
      } catch (e) {
        spinner.fail(`Something went wrong and we couldn't fetch the list of teams`);
@@ -73,7 +69,7 @@ export default class BuildList extends EasCommand {

    try {
      const result = await AppleDeviceQuery.getAllForAppleTeamAsync(
-        account.name,
+        accountName,
        appleTeamIdentifier
      );

@@ -1,18 +1,15 @@
-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
+import EasCommand from '../../commandUtils/EasCommand';
 import { AppleDeviceQuery } from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
 import formatDevice from '../../devices/utils/formatDevice';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';

 export default class DeviceView extends EasCommand {
-  static override description = 'view a device for your project';
+  static description = 'view a device for your project';

-  static override args = [{ name: 'UDID' }];
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
-  };
+  static args = [{ name: 'UDID' }];

  async runAsync(): Promise<void> {
    const { UDID } = (await this.parse(DeviceView)).args;
@@ -30,15 +27,15 @@ If you are not sure what is the UDID of the device you are looking for, run:
      );
      throw new Error('Device UDID is missing');
    }
-    const { projectId } = await this.getContextAsync(DeviceView, {
-      nonInteractive: true,
-    });
-    const account = await getOwnerAccountForProjectIdAsync(projectId);
+
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const accountName = await getProjectAccountNameAsync(exp);

    const spinner = ora().start(`Fetching device details for ${UDID}…`);

    try {
-      const device = await AppleDeviceQuery.getByDeviceIdentifierAsync(account.name, UDID);
+      const device = await AppleDeviceQuery.getByDeviceIdentifierAsync(accountName, UDID);

      if (device) {
        spinner.succeed('Fetched device details');
@@ -1,23 +1,18 @@
 import { Platform } from '@expo/eas-build-job';
 import envinfo from 'envinfo';

-import EasCommand, { EASCommandProjectDirContext } from '../commandUtils/EasCommand';
+import EasCommand from '../commandUtils/EasCommand';
 import Log from '../log';
+import { findProjectRootAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';

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

-  static override contextDefinition = {
-    ...EASCommandProjectDirContext,
-  };
+  protected requiresAuthentication = false;

  async runAsync(): Promise<void> {
-    const { projectDir } = await this.getContextAsync(Diagnostics, {
-      nonInteractive: true,
-    });
-
    const info = await envinfo.run(
      {
        System: ['OS', 'Shell'],
@@ -43,11 +38,12 @@ export default class Diagnostics extends EasCommand {
    );

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

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

@@ -4,51 +4,38 @@ import chalk from 'chalk';
 import path from 'path';

 import { ensureProjectConfiguredAsync } from '../../build/configure';
-import EasCommand, {
-  EASCommandLoggedInContext,
-  EASCommandProjectDirContext,
-  EASCommandProjectIdContext,
-} from '../../commandUtils/EasCommand';
+import EasCommand from '../../commandUtils/EasCommand';
 import { CredentialsContext } from '../../credentials/context';
 import Log, { learnMore } from '../../log';
 import { createMetadataContextAsync } from '../../metadata/context';
 import { downloadMetadataAsync } from '../../metadata/download';
 import { handleMetadataError } from '../../metadata/errors';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';

 export default class MetadataPull extends EasCommand {
-  static override description = 'generate the local store configuration from the app stores';
+  static description = 'generate the local store configuration from the app stores';

-  static override flags = {
+  static flags = {
    profile: Flags.string({
-      char: 'e',
      description:
        'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
    }),
  };

-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
-    ...EASCommandLoggedInContext,
-    ...EASCommandProjectDirContext,
-  };
-
  async runAsync(): Promise<void> {
    Log.warn('EAS Metadata is in beta and subject to breaking changes.');

    const { flags } = await this.parse(MetadataPull);
-    const { actor, projectId, projectDir } = await this.getContextAsync(MetadataPull, {
-      nonInteractive: false,
-    });
-
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-
-    // this command is interactive (all nonInteractive flags passed to utility functions are false)
+    await getProjectIdAsync(exp);
    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false });

    const credentialsCtx = new CredentialsContext({
-      projectInfo: { exp, projectId },
+      exp,
      projectDir,
-      user: actor,
+      user: await ensureLoggedInAsync(),
      nonInteractive: false,
    });

@@ -64,11 +51,11 @@ export default class MetadataPull extends EasCommand {
      const relativePath = path.relative(process.cwd(), filePath);

      Log.addNewLineIfNone();
-      Log.log(`🎉 Your store config is ready.
+      Log.log(`🎉 Your store configuration is ready.

 - Update the ${chalk.bold(relativePath)} file to prepare the app information.
 - Run ${chalk.bold('eas submit')} or manually upload a new app version to the app stores.
- Once the app is uploaded, run ${chalk.bold('eas metadata:push')} to sync the store config.
+- Once the app is uploaded, run ${chalk.bold('eas metadata:push')} to sync the store configuration.
 - ${learnMore('https://docs.expo.dev/eas-metadata/introduction/')}`);
    } catch (error: any) {
      handleMetadataError(error);
@@ -2,51 +2,38 @@ import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';

 import { ensureProjectConfiguredAsync } from '../../build/configure';
-import EasCommand, {
-  EASCommandLoggedInContext,
-  EASCommandProjectDirContext,
-  EASCommandProjectIdContext,
-} from '../../commandUtils/EasCommand';
+import EasCommand from '../../commandUtils/EasCommand';
 import { CredentialsContext } from '../../credentials/context';
 import Log, { learnMore } from '../../log';
 import { createMetadataContextAsync } from '../../metadata/context';
 import { handleMetadataError } from '../../metadata/errors';
 import { uploadMetadataAsync } from '../../metadata/upload';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';

 export default class MetadataPush extends EasCommand {
-  static override description = 'sync the local store configuration to the app stores';
+  static description = 'sync the local store configuration to the app stores';

-  static override flags = {
+  static flags = {
    profile: Flags.string({
-      char: 'e',
      description:
        'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
    }),
  };

-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
-    ...EASCommandLoggedInContext,
-    ...EASCommandProjectDirContext,
-  };
-
  async runAsync(): Promise<void> {
    Log.warn('EAS Metadata is in beta and subject to breaking changes.');

    const { flags } = await this.parse(MetadataPush);
-    const { actor, projectId, projectDir } = await this.getContextAsync(MetadataPush, {
-      nonInteractive: false,
-    });
-
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-
-    // this command is interactive (all nonInteractive flags passed to utility functions are false)
+    await getProjectIdAsync(exp);
    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false });

    const credentialsCtx = new CredentialsContext({
-      projectInfo: { exp, projectId },
+      exp,
      projectDir,
-      user: actor,
+      user: await ensureLoggedInAsync(),
      nonInteractive: false,
    });

@@ -1,48 +0,0 @@
-import openBrowserAsync from 'better-opn';
-
-import { getProjectDashboardUrl } from '../build/utils/url';
-import EasCommand, {
-  EASCommandProjectDirContext,
-  EASCommandProjectIdContext,
-} from '../commandUtils/EasCommand';
-import { ora } from '../ora';
-import { getExpoConfig } from '../project/expoConfig';
-import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
-
-export default class Open extends EasCommand {
-  static override description = 'open the project page in a web browser';
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
-    ...EASCommandProjectDirContext,
-  };
-
-  async runAsync(): Promise<void> {
-    // this command is interactive by nature (only really run by humans in a terminal)
-    const { projectId, projectDir } = await this.getContextAsync(Open, {
-      nonInteractive: false,
-    });
-    const exp = getExpoConfig(projectDir);
-
-    const account = await getOwnerAccountForProjectIdAsync(projectId);
-
-    const projectName = exp.slug;
-
-    const projectDashboardUrl = getProjectDashboardUrl(account.name, projectName);
-    const failedMessage = `Unable to open a web browser. Project page is available at: ${projectDashboardUrl}`;
-    const spinner = ora(`Opening ${projectDashboardUrl}`).start();
-    try {
-      const opened = await openBrowserAsync(projectDashboardUrl);
-
-      if (opened) {
-        spinner.succeed(`Opened ${projectDashboardUrl}`);
-      } else {
-        spinner.fail(failedMessage);
-      }
-      return;
-    } catch (error) {
-      spinner.fail(failedMessage);
-      throw error;
-    }
-  }
-}
@@ -1,251 +0,0 @@
-import { AppJSONConfig, PackageJSONConfig, getConfig } from '@expo/config';
-import chalk from 'chalk';
-import { vol } from 'memfs';
-
-import ActorContextField from '../../../commandUtils/context/ActorContextField';
-import ProjectDirContextField from '../../../commandUtils/context/ProjectDirContextField';
-import ProjectIdContextField from '../../../commandUtils/context/ProjectIdContextField';
-import { jester } from '../../../credentials/__tests__/fixtures-constants';
-import { AppMutation } from '../../../graphql/mutations/AppMutation';
-import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
-import { confirmAsync, promptAsync } from '../../../prompts';
-import ProjectInit from '../init';
-
-jest.mock('fs');
-jest.mock('@expo/config');
-jest.mock('../../../prompts');
-jest.mock('../../../user/actions');
-jest.mock('../../../graphql/mutations/AppMutation');
-jest.mock('../../../ora', () => ({
-  ora: () => ({
-    start: () => ({ succeed: () => {}, fail: () => {} }),
-  }),
-}));
-jest.mock('../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync');
-jest.mock('../../../commandUtils/context/ProjectIdContextField');
-
-let originalProcessArgv: string[];
-
-beforeAll(() => {
-  originalProcessArgv = process.argv;
-  process.argv = [];
-});
-
-afterAll(() => {
-  process.argv = originalProcessArgv;
-});
-
-function mockTestProject(options: {
-  configuredProjectId?: string;
-  configuredOwner?: string;
-}): void {
-  const projectRoot = '/test-project';
-  const packageJSON: PackageJSONConfig = {
-    name: 'testing123',
-    version: '0.1.0',
-    description: 'fake description',
-    main: 'index.js',
-  };
-
-  const appJSON: AppJSONConfig = {
-    expo: {
-      name: 'testing 123',
-      version: '0.1.0',
-      slug: 'testing-123',
-      sdkVersion: '33.0.0',
-      owner: options.configuredOwner,
-      extra: {
-        eas: {
-          projectId: options.configuredProjectId,
-        },
-      },
-    },
-  };
-
-  vol.fromJSON(
-    {
-      [projectRoot + '/package.json']: JSON.stringify(packageJSON, null, 2),
-      [projectRoot + '/app.json']: JSON.stringify(appJSON, null, 2),
-    },
-    '/'
-  );
-
-  const mockManifest = { exp: appJSON.expo };
-
-  jest.mocked(getConfig).mockReturnValue(mockManifest as any);
-  jest.spyOn(ProjectDirContextField.prototype, 'getValueAsync').mockResolvedValue('/test-project');
-  jest.spyOn(ActorContextField.prototype, 'getValueAsync').mockResolvedValue(jester);
-}
-
-const commandOptions = { root: '/test-project' } as any;
-
-beforeEach(() => {
-  jest.resetAllMocks();
-});
-
-describe(ProjectInit.name, () => {
-  describe('when id flag is provided', () => {
-    describe('when it is already configured', () => {
-      beforeEach(() => {
-        mockTestProject({ configuredProjectId: '1234', configuredOwner: jester.accounts[0].name });
-      });
-
-      describe('interactive', () => {
-        it('is no-op if already configured for id', async () => {
-          await new ProjectInit(['--id', '1234'], commandOptions).run();
-          expect(ProjectIdContextField['saveProjectIdToAppConfigAsync']).not.toHaveBeenCalled();
-        });
-
-        it('prompts to overwrite when different', async () => {
-          jest.mocked(confirmAsync).mockResolvedValue(true);
-          await new ProjectInit(['--id', '12345'], commandOptions).run();
-          expect(ProjectIdContextField['saveProjectIdToAppConfigAsync']).toHaveBeenCalledWith(
-            '/test-project',
-            '12345'
-          );
-          expect(confirmAsync).toHaveBeenCalled();
-        });
-
-        it('aborts when prompt to overwrite is declined', async () => {
-          jest.mocked(confirmAsync).mockResolvedValue(false);
-          await new ProjectInit(['--id', '12345'], commandOptions).run();
-          expect(ProjectIdContextField['saveProjectIdToAppConfigAsync']).not.toHaveBeenCalled();
-          expect(confirmAsync).toHaveBeenCalled();
-        });
-      });
-
-      describe('force', () => {
-        it('does not prompt to overwrite when different', async () => {
-          await new ProjectInit(['--id', '12345', '--force'], {
-            root: '/test-project',
-          } as any).run();
-          expect(ProjectIdContextField['saveProjectIdToAppConfigAsync']).toHaveBeenCalledWith(
-            '/test-project',
-            '12345'
-          );
-          expect(confirmAsync).not.toHaveBeenCalled();
-        });
-      });
-
-      describe('non-interactive', () => {
-        it('aborts when different', async () => {
-          await expect(
-            new ProjectInit(['--id', '12345', '--non-interactive'], {
-              root: '/test-project',
-            } as any).run()
-          ).rejects.toThrowError(
-            `Project is already linked to a different ID: ${chalk.bold(
-              '1234'
-            )}. Use --force flag to overwrite.`
-          );
-          expect(ProjectIdContextField['saveProjectIdToAppConfigAsync']).not.toHaveBeenCalled();
-        });
-      });
-    });
-
-    describe('when it is not yet configured', () => {
-      beforeEach(() => {
-        mockTestProject({});
-      });
-
-      it('configures', async () => {
-        await new ProjectInit(['--id', '1234'], commandOptions).run();
-        expect(ProjectIdContextField['saveProjectIdToAppConfigAsync']).toHaveBeenCalledWith(
-          '/test-project',
-          '1234'
-        );
-      });
-    });
-  });
-
-  describe('when no arguments are provided', () => {
-    describe('when it is already configured', () => {
-      beforeEach(() => {
-        mockTestProject({ configuredProjectId: '1234', configuredOwner: jester.accounts[0].name });
-      });
-
-      it('does not configure', async () => {
-        await new ProjectInit([], commandOptions).run();
-        expect(ProjectIdContextField['saveProjectIdToAppConfigAsync']).not.toHaveBeenCalled();
-      });
-    });
-
-    describe('when it is not yet configured', () => {
-      describe('when owner is specified', () => {
-        beforeEach(() => {
-          mockTestProject({ configuredOwner: jester.accounts[0].name });
-        });
-
-        describe('when project exists on server', () => {
-          beforeEach(() => {
-            jest.mocked(findProjectIdByAccountNameAndSlugNullableAsync).mockResolvedValue('123456');
-          });
-
-          it('prompts for confirmation to link', async () => {
-            jest.mocked(confirmAsync).mockResolvedValue(true);
-            await new ProjectInit([], commandOptions).run();
-            expect(ProjectIdContextField['saveProjectIdToAppConfigAsync']).toHaveBeenCalledWith(
-              '/test-project',
-              '123456'
-            );
-            expect(confirmAsync).toHaveBeenCalledTimes(1);
-          });
-
-          it('does not save when confirmation to link is denied', async () => {
-            jest.mocked(confirmAsync).mockResolvedValue(false);
-            await expect(new ProjectInit([], commandOptions).run()).rejects.toThrow(
-              'Project ID configuration canceled. Re-run the command to select a different account/project.'
-            );
-            expect(ProjectIdContextField['saveProjectIdToAppConfigAsync']).not.toHaveBeenCalled();
-            expect(confirmAsync).toHaveBeenCalledTimes(1);
-          });
-        });
-
-        describe('when project does not exist on server', () => {
-          it('asks to create it', async () => {
-            jest.mocked(confirmAsync).mockResolvedValue(true);
-            jest.mocked(AppMutation.createAppAsync).mockResolvedValue('0129');
-            await new ProjectInit([], commandOptions).run();
-            expect(ProjectIdContextField['saveProjectIdToAppConfigAsync']).toHaveBeenCalledWith(
-              '/test-project',
-              '0129'
-            );
-            expect(confirmAsync).toHaveBeenCalledTimes(1);
-          });
-
-          it('does not create it if declined', async () => {
-            jest.mocked(confirmAsync).mockResolvedValue(false);
-            await expect(new ProjectInit([], commandOptions).run()).rejects.toThrowError(
-              'Project ID configuration canceled for @jester/testing-123.'
-            );
-            expect(ProjectIdContextField['saveProjectIdToAppConfigAsync']).not.toHaveBeenCalled();
-            expect(confirmAsync).toHaveBeenCalledTimes(1);
-          });
-        });
-      });
-
-      describe('when owner is not specified', () => {
-        beforeEach(() => {
-          mockTestProject({});
-        });
-
-        it('prompts for an account', async () => {
-          jest.mocked(promptAsync).mockResolvedValue({ account: { name: 'other' } });
-          await expect(new ProjectInit([], commandOptions).run()).rejects.toThrowError(
-            `You don't have permission to create a new project on the other account and no matching project already exists on the account.`
-          );
-          expect(promptAsync).toHaveBeenCalledTimes(1);
-        });
-      });
-
-      it('throws when the user does not have permission to create projects on account', async () => {
-        mockTestProject({ configuredOwner: jester.accounts[1].name });
-        jest.mocked(AppMutation.createAppAsync).mockResolvedValue('0129');
-        await expect(new ProjectInit([], commandOptions).run()).rejects.toThrowError(
-          `You don't have permission to create a new project on the other account and no matching project already exists on the account.`
-        );
-        expect(ProjectIdContextField['saveProjectIdToAppConfigAsync']).not.toHaveBeenCalled();
-      });
-    });
-  });
-});
@@ -1,9 +1,11 @@
 import gql from 'graphql-tag';

-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import { AppInfoQuery, AppInfoQueryVariables } from '../../graphql/generated';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import formatFields from '../../utils/formatFields';

 async function projectInfoByIdAsync(appId: string): Promise<AppInfoQuery> {
@@ -30,20 +32,15 @@ async function projectInfoByIdAsync(appId: string): Promise<AppInfoQuery> {
 }

 export default class ProjectInfo extends EasCommand {
-  static override description = 'information about the current project';
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
-  };
+  static description = 'information about the current project';

  async runAsync(): Promise<void> {
-    const { projectId } = await this.getContextAsync(ProjectInfo, {
-      nonInteractive: true,
-    });
-
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(exp);
    const { app } = await projectInfoByIdAsync(projectId);
    if (!app) {
-      throw new Error(`Could not find project with id: ${projectId}`);
+      throw new Error(`Could not find project with ID: ${projectId}`);
    }

    Log.addNewLineIfNone();
@@ -1,232 +1,25 @@
-import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import nullthrows from 'nullthrows';
-import terminalLink from 'terminal-link';

-import { getProjectDashboardUrl } from '../../build/utils/url';
-import EasCommand, {
-  EASCommandLoggedInContext,
-  EASCommandProjectDirContext,
-} from '../../commandUtils/EasCommand';
-import ProjectIdContextField from '../../commandUtils/context/ProjectIdContextField';
-import { AppPrivacy, Role } from '../../graphql/generated';
-import { AppMutation } from '../../graphql/mutations/AppMutation';
+import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
-import { ora } from '../../ora';
 import { getExpoConfig } from '../../project/expoConfig';
-import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
-import { toAppPrivacy } from '../../project/projectUtils';
-import { confirmAsync, promptAsync } from '../../prompts';
-import { Actor } from '../../user/User';
-
-type InitializeMethodOptions = {
-  force: boolean;
-  nonInteractive: boolean;
-};
+import { findProjectRootAsync, setProjectIdAsync } from '../../project/projectUtils';

 export default class ProjectInit extends EasCommand {
-  static override description = 'create or link an EAS project';
-  static override aliases = ['init'];
-
-  static override flags = {
-    id: Flags.string({
-      description: 'ID of the EAS project to link',
-    }),
-    force: Flags.boolean({
-      description: 'Whether to overwrite any existing project ID',
-      dependsOn: ['id'],
-    }),
-    // this is the same as EASNonInteractiveFlag but with the dependsOn
-    'non-interactive': Flags.boolean({
-      description: 'Run the command in non-interactive mode.',
-      dependsOn: ['id'],
-    }),
-  };
-
-  static override contextDefinition = {
-    ...EASCommandLoggedInContext,
-    ...EASCommandProjectDirContext,
-  };
-
-  private static async saveProjectIdAndLogSuccessAsync(
-    projectDir: string,
-    projectId: string
-  ): Promise<void> {
-    await ProjectIdContextField['saveProjectIdToAppConfigAsync'](projectDir, projectId);
-    Log.withTick(`Project successfully linked (ID: ${chalk.bold(projectId)}) (modified app.json)`);
-  }
-
-  private static async initializeWithExplicitIDAsync(
-    projectId: string,
-    projectDir: string,
-    { force, nonInteractive }: InitializeMethodOptions
-  ): Promise<void> {
-    const exp = getExpoConfig(projectDir);
-    const existingProjectId = exp.extra?.eas?.projectId;
-
-    if (projectId === existingProjectId) {
-      Log.succeed(`Project already linked (ID: ${chalk.bold(existingProjectId)})`);
-      return;
-    }
-
-    if (!existingProjectId) {
-      await ProjectInit.saveProjectIdAndLogSuccessAsync(projectDir, projectId);
-      return;
-    }
-
-    if (projectId !== existingProjectId) {
-      if (force) {
-        await ProjectInit.saveProjectIdAndLogSuccessAsync(projectDir, projectId);
-        return;
-      }
-
-      if (nonInteractive) {
-        throw new Error(
-          `Project is already linked to a different ID: ${chalk.bold(
-            existingProjectId
-          )}. Use --force flag to overwrite.`
-        );
-      }
-
-      const confirm = await confirmAsync({
-        message: `Project is already linked to a different ID: ${chalk.bold(
-          existingProjectId
-        )}. Do you wish to overwrite it?`,
-      });
-      if (!confirm) {
-        Log.log('Aborting');
-        return;
-      }
-
-      await ProjectInit.saveProjectIdAndLogSuccessAsync(projectDir, projectId);
-    }
-  }
-
-  private static async initializeWithInteractiveSelectionAsync(
-    actor: Actor,
-    projectDir: string
-  ): Promise<void> {
-    const exp = getExpoConfig(projectDir);
-    const existingProjectId = exp.extra?.eas?.projectId;
-
-    if (existingProjectId) {
-      Log.succeed(
-        `Project already linked (ID: ${chalk.bold(
-          existingProjectId
-        )}). To re-configure, remove the extra.eas.projectId field from your app config.`
-      );
-      return;
-    }
-
-    const allAccounts = actor.accounts;
-    const accountNamesWhereUserHasSufficientPermissionsToCreateApp = new Set(
-      allAccounts
-        .filter(a => a.users.find(it => it.actor.id === actor.id)?.role !== Role.ViewOnly)
-        .map(it => it.name)
-    );
-
-    // if no owner field, ask the user which account they want to use to create/link the project
-    let accountName = exp.owner;
-    if (!accountName) {
-      if (allAccounts.length === 1) {
-        accountName = allAccounts[0].name;
-      } else {
-        // if regular user, put primary account first
-        const sortedAccounts =
-          actor.__typename === 'Robot'
-            ? allAccounts
-            : [...allAccounts].sort((a, _b) => (a.name === actor.username ? -1 : 1));
-
-        const choices = sortedAccounts.map(account => ({
-          title: account.name,
-          value: account,
-          description: !accountNamesWhereUserHasSufficientPermissionsToCreateApp.has(account.name)
-            ? '(Viewer Role)'
-            : undefined,
-        }));
-        accountName = (
-          await promptAsync({
-            type: 'select',
-            name: 'account',
-            message: 'Which account should own this project?',
-            choices,
-          })
-        ).account.name;
-      }
-    }
-
-    if (!accountName) {
-      throw new Error('No account selected for project. Canceling.');
-    }
-
-    const projectName = exp.slug;
-    const projectFullName = `@${accountName}/${projectName}`;
-    const existingProjectIdOnServer = await findProjectIdByAccountNameAndSlugNullableAsync(
-      accountName,
-      projectName
-    );
-    if (existingProjectIdOnServer) {
-      const affirmedLink = await confirmAsync({
-        message: `Existing project found: ${projectFullName} (ID: ${existingProjectIdOnServer}). Link this project?`,
-      });
-      if (!affirmedLink) {
-        throw new Error(
-          `Project ID configuration canceled. Re-run the command to select a different account/project.`
-        );
-      }
-
-      await ProjectInit.saveProjectIdAndLogSuccessAsync(projectDir, existingProjectIdOnServer);
-      return;
-    }
-
-    if (!accountNamesWhereUserHasSufficientPermissionsToCreateApp.has(accountName)) {
-      throw new Error(
-        `You don't have permission to create a new project on the ${accountName} account and no matching project already exists on the account.`
-      );
-    }
-
-    const affirmedCreate = await confirmAsync({
-      message: `Would you like to create a project for ${projectFullName}?`,
-    });
-    if (!affirmedCreate) {
-      throw new Error(`Project ID configuration canceled for ${projectFullName}.`);
-    }
-
-    const projectDashboardUrl = getProjectDashboardUrl(accountName, projectName);
-    const projectLink = terminalLink(projectFullName, projectDashboardUrl, {
-      // https://github.com/sindresorhus/terminal-link/issues/18#issuecomment-1068020361
-      fallback: () => `${projectFullName} (${projectDashboardUrl})`,
-    });
-
-    const account = nullthrows(allAccounts.find(a => a.name === accountName));
-
-    const spinner = ora(`Creating ${chalk.bold(projectFullName)}`).start();
-    let createdProjectId: string;
-    try {
-      createdProjectId = await AppMutation.createAppAsync({
-        accountId: account.id,
-        projectName,
-        privacy: toAppPrivacy(exp.privacy) ?? AppPrivacy.Public,
-      });
-      spinner.succeed(`Created ${chalk.bold(projectLink)}`);
-    } catch (err) {
-      spinner.fail();
-      throw err;
-    }
-
-    await ProjectInit.saveProjectIdAndLogSuccessAsync(projectDir, createdProjectId);
-  }
+  static description = 'create or link an EAS project';
+  static aliases = ['init'];

  async runAsync(): Promise<void> {
-    const {
-      flags: { id, force, 'non-interactive': nonInteractive },
-    } = await this.parse(ProjectInit);
-    const { actor, projectDir } = await this.getContextAsync(ProjectInit, { nonInteractive });
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);

-    if (id) {
-      await ProjectInit.initializeWithExplicitIDAsync(id, projectDir, { force, nonInteractive });
-    } else {
-      await ProjectInit.initializeWithInteractiveSelectionAsync(actor, projectDir);
+    if (exp.extra?.eas?.projectId) {
+      Log.error(
+        `app.json is already linked to project with ID: ${chalk.bold(exp.extra?.eas?.projectId)}`
+      );
+      return;
    }
+
+    await setProjectIdAsync(projectDir);
  }
 }
@@ -1,32 +1,28 @@
 import { Flags } from '@oclif/core';
-import assert from 'assert';
 import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';

-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
-import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
 import {
  EnvironmentSecretScope,
  EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
-import {
-  SecretType,
-  SecretTypeToEnvironmentSecretType,
-} from '../../graphql/types/EnvironmentSecret';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
-  getDisplayNameForProjectIdAsync,
-  getOwnerAccountForProjectIdAsync,
+  findProjectRootAsync,
+  getProjectAccountNameAsync,
+  getProjectIdAsync,
 } from '../../project/projectUtils';
-import { promptAsync, selectAsync } from '../../prompts';
+import { promptAsync } from '../../prompts';
+import { findAccountByName } from '../../user/Account';
+import { getActorDisplayName } from '../../user/User';
+import { ensureLoggedInAsync } from '../../user/actions';

 export default class EnvironmentSecretCreate extends EasCommand {
-  static override description =
-    'create an environment secret on the current project or owner account';
+  static description = 'create an environment secret on the current project or owner account';

-  static override flags = {
+  static flags = {
    scope: Flags.enum({
      description: 'Scope for the secret',
      options: [EnvironmentSecretScope.ACCOUNT, EnvironmentSecretScope.PROJECT],
@@ -36,46 +32,29 @@ export default class EnvironmentSecretCreate extends EasCommand {
      description: 'Name of the secret',
    }),
    value: Flags.string({
-      description: 'Text value or path to a file to store in the secret',
-    }),
-    type: Flags.enum({
-      description: 'The type of secret',
-      options: [SecretType.STRING, SecretType.FILE],
+      description: 'Value of the secret',
    }),
    force: Flags.boolean({
      description: 'Delete and recreate existing secrets',
      default: false,
    }),
-    ...EASNonInteractiveFlag,
-  };
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
  };

  async runAsync(): Promise<void> {
+    const actor = await ensureLoggedInAsync();
    let {
-      flags: {
-        name,
-        value: secretValue,
-        scope,
-        force,
-        type: secretType,
-        'non-interactive': nonInteractive,
-      },
+      flags: { name, value: secretValue, scope, force },
    } = await this.parse(EnvironmentSecretCreate);
-    const { projectId } = await this.getContextAsync(EnvironmentSecretCreate, {
-      nonInteractive,
-    });

-    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);
-    const ownerAccount = await getOwnerAccountForProjectIdAsync(projectId);
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const accountName = await getProjectAccountNameAsync(exp);
+
+    const { slug } = exp;
+    const projectId = await getProjectIdAsync(exp);

    if (!scope) {
      const validationMessage = 'Secret scope may not be empty.';
-      if (nonInteractive) {
-        throw new Error(validationMessage);
-      }

      ({ scope } = await promptAsync({
        type: 'select',
@@ -90,18 +69,13 @@ export default class EnvironmentSecretCreate extends EasCommand {
    }

    if (!name) {
-      const validationMessage = 'Secret name may not be empty.';
-      if (nonInteractive) {
-        throw new Error(validationMessage);
-      }
-
      ({ name } = await promptAsync({
        type: 'text',
        name: 'name',
        message: `Secret name:`,
        validate: value => {
          if (!value) {
-            return validationMessage;
+            return 'Secret name may not be empty.';
          }

          // this validation regex here is just to shorten the feedback loop
@@ -115,82 +89,42 @@ export default class EnvironmentSecretCreate extends EasCommand {
      }));

      if (!name) {
-        throw new Error(validationMessage);
+        throw new Error('Secret name may not be empty.');
      }
    }

-    if (!secretType) {
-      if (nonInteractive) {
-        throw new Error('Secret type may not be empty in non-interactive mode');
-      }
-
-      secretType = await selectAsync('Select secret type', [
-        {
-          title: 'string',
-          value: SecretType.STRING,
-        },
-        {
-          title: 'file',
-          value: SecretType.FILE,
-        },
-      ]);
-    }
-
    if (!secretValue) {
      const validationMessage = 'Secret value may not be empty.';
-      if (nonInteractive) {
-        throw new Error(validationMessage);
-      }

      ({ secretValue } = await promptAsync({
        type: 'text',
        name: 'secretValue',
-        message: secretType === SecretType.STRING ? 'Secret value:' : 'Local file path:',
-        // eslint-disable-next-line async-protect/async-suffix
-        validate: async secretValue => {
-          if (!secretValue) {
-            return 'Secret value may not be empty.';
-          }
-          if (secretType === SecretType.FILE) {
-            const secretFilePath = path.resolve(secretValue);
-            if (!(await fs.pathExists(secretFilePath))) {
-              return `File "${secretValue}" does not exist.`;
-            }
-          }
-          return true;
-        },
+        message: 'Secret value:',
+        validate: value => (value ? true : validationMessage),
      }));
-    }

-    assert(secretValue);
-
-    let secretFilePath: string | undefined;
-    if (secretType === SecretType.FILE) {
-      secretFilePath = path.resolve(secretValue);
-      if (!(await fs.pathExists(secretFilePath))) {
-        throw new Error(`File "${secretValue}" does not exist`);
+      if (!secretValue) {
+        throw new Error(validationMessage);
      }
    }

    if (scope === EnvironmentSecretScope.PROJECT) {
      if (force) {
-        const { appSecrets: existingSecrets } = await EnvironmentSecretsQuery.byAppIdAsync(
-          projectId
-        );
+        const existingSecrets = await EnvironmentSecretsQuery.byAppIdAsync(projectId);
        const existingSecret = existingSecrets.find(secret => secret.name === name);

        if (existingSecret) {
          await EnvironmentSecretMutation.deleteAsync(existingSecret.id);
          Log.withTick(
            `Deleting existing secret ${chalk.bold(name)} on project ${chalk.bold(
-              projectDisplayName
+              `@${accountName}/${slug}`
            )}.`
          );
        }
      }

      const secret = await EnvironmentSecretMutation.createForAppAsync(
-        { name, value: secretValue, type: SecretTypeToEnvironmentSecretType[secretType] },
+        { name, value: secretValue },
        projectId
      );
      if (!secret) {
@@ -199,24 +133,25 @@ export default class EnvironmentSecretCreate extends EasCommand {
        );
      }

-      if (secretType === SecretType.STRING) {
-        Log.withTick(
-          `️Created a new secret ${chalk.bold(name)} with value ${chalk.bold(
-            secretValue
-          )} on project ${chalk.bold(projectDisplayName)}.`
-        );
-      } else {
-        Log.withTick(
-          `️Created a new secret ${chalk.bold(name)} from file ${chalk.bold(
-            secretFilePath
-          )} on project ${chalk.bold(projectDisplayName)}.`
-        );
-      }
+      Log.withTick(
+        `️Created a new secret ${chalk.bold(name)} on project ${chalk.bold(
+          `@${accountName}/${slug}`
+        )}.`
+      );
    } else if (scope === EnvironmentSecretScope.ACCOUNT) {
-      if (force) {
-        const { accountSecrets: existingSecrets } = await EnvironmentSecretsQuery.byAppIdAsync(
-          projectId
+      const ownerAccount = findAccountByName(actor.accounts, accountName);
+
+      if (!ownerAccount) {
+        Log.warn(
+          `Your account (${getActorDisplayName(actor)}) doesn't have access to the ${chalk.bold(
+            accountName
+          )} account`
        );
+        return;
+      }
+
+      if (force) {
+        const existingSecrets = await EnvironmentSecretsQuery.byAccountNameAsync(ownerAccount.name);
        const existingSecret = existingSecrets.find(secret => secret.name === name);

        if (existingSecret) {
@@ -231,7 +166,7 @@ export default class EnvironmentSecretCreate extends EasCommand {
      }

      const secret = await EnvironmentSecretMutation.createForAccountAsync(
-        { name, value: secretValue, type: SecretTypeToEnvironmentSecretType[secretType] },
+        { name, value: secretValue },
        ownerAccount.id
      );

@@ -241,19 +176,9 @@ export default class EnvironmentSecretCreate extends EasCommand {
        );
      }

-      if (secretType === SecretType.STRING) {
-        Log.withTick(
-          `️Created a new secret ${chalk.bold(name)} with value ${chalk.bold(
-            secretValue
-          )} on account ${chalk.bold(ownerAccount.name)}.`
-        );
-      } else {
-        Log.withTick(
-          `️Created a new secret ${chalk.bold(name)} from file ${chalk.bold(
-            secretFilePath
-          )} on account ${chalk.bold(ownerAccount.name)}.`
-        );
-      }
+      Log.withTick(
+        `️Created a new secret ${chalk.bold(name)} on account ${chalk.bold(ownerAccount.name)}.`
+      );
    }
  }
 }
@@ -1,7 +1,6 @@
 import { Flags } from '@oclif/core';

-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
-import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
 import {
  EnvironmentSecretScope,
@@ -9,38 +8,39 @@ import {
  EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
+import {
+  findProjectRootAsync,
+  getProjectAccountNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';

 export default class EnvironmentSecretDelete extends EasCommand {
-  static override description = 'delete an environment secret by ID';
+  static description = 'delete an environment secret by ID';

-  static override flags = {
+  static flags = {
    id: Flags.string({
      description: 'ID of the secret to delete',
    }),
-    ...EASNonInteractiveFlag,
-  };
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
  };

  async runAsync(): Promise<void> {
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(exp);
+    const projectAccountName = await getProjectAccountNameAsync(exp);
+
    let {
-      flags: { id, 'non-interactive': nonInteractive },
+      flags: { id },
    } = await this.parse(EnvironmentSecretDelete);
-    const { projectId } = await this.getContextAsync(EnvironmentSecretDelete, {
-      nonInteractive,
-    });
    let secret: EnvironmentSecretWithScope | undefined;

    if (!id) {
      const validationMessage = 'You must select which secret to delete.';
-      if (nonInteractive) {
-        throw new Error(validationMessage);
-      }

-      const secrets = await EnvironmentSecretsQuery.allAsync(projectId);
+      const secrets = await EnvironmentSecretsQuery.allAsync(projectAccountName, projectId);
+
      ({ secret } = await promptAsync({
        type: 'autocomplete',
        name: 'secret',
@@ -58,27 +58,25 @@ export default class EnvironmentSecretDelete extends EasCommand {
      }
    }

-    if (!nonInteractive) {
-      Log.addNewLineIfNone();
-      Log.warn(
-        `You are about to permanently delete secret${
-          secret?.name ? ` "${secret?.name}"` : ''
-        } with id: "${id}".\nThis action is irreversible.`
+    Log.addNewLineIfNone();
+    Log.warn(
+      `You are about to permamently delete secret${
+        secret?.name ? ` "${secret?.name}"` : ''
+      } with id: "${id}".\nThis action is irreversible.`
+    );
+    Log.newLine();
+    const confirmed = await toggleConfirmAsync({
+      message: `Are you sure you wish to proceed?${
+        secret?.scope === EnvironmentSecretScope.ACCOUNT
+          ? ' This secret is applied across your whole account and may affect multiple apps.'
+          : ''
+      }`,
+    });
+    if (!confirmed) {
+      Log.error(
+        `Canceled deletion of secret${secret?.name ? ` "${secret?.name}"` : ''} with id: "${id}".`
      );
-      Log.newLine();
-      const confirmed = await toggleConfirmAsync({
-        message: `Are you sure you wish to proceed?${
-          secret?.scope === EnvironmentSecretScope.ACCOUNT
-            ? ' This secret is applied across your whole account and may affect multiple apps.'
-            : ''
-        }`,
-      });
-      if (!confirmed) {
-        Log.error(
-          `Canceled deletion of secret${secret?.name ? ` "${secret?.name}"` : ''} with id: "${id}".`
-        );
-        process.exit(1);
-      }
+      process.exit(1);
    }

    await EnvironmentSecretMutation.deleteAsync(id);
@@ -2,39 +2,39 @@ import chalk from 'chalk';
 import Table from 'cli-table3';
 import dateFormat from 'dateformat';

-import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
+import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretsQuery } from '../../graphql/queries/EnvironmentSecretsQuery';
-import { EnvironmentSecretTypeToSecretType } from '../../graphql/types/EnvironmentSecret';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
+import {
+  findProjectRootAsync,
+  getProjectAccountNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';

 export default class EnvironmentSecretList extends EasCommand {
-  static override description = 'list environment secrets available for your current app';
-
-  static override contextDefinition = {
-    ...EASCommandProjectIdContext,
-  };
+  static description = 'list environment secrets available for your current app';

  async runAsync(): Promise<void> {
-    const { projectId } = await this.getContextAsync(EnvironmentSecretList, {
-      nonInteractive: true,
-    });
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(exp);
+    const projectAccountName = await getProjectAccountNameAsync(exp);

-    const secrets = await EnvironmentSecretsQuery.allAsync(projectId);
+    if (!projectDir) {
+      throw new Error("Please run this command inside your project's directory");
+    }
+
+    const secrets = await EnvironmentSecretsQuery.allAsync(projectAccountName, projectId);

    const table = new Table({
-      head: ['Name', 'Type', 'Scope', 'ID', 'Updated at'],
+      head: ['Name', 'Scope', 'ID', 'Updated at'],
      wordWrap: true,
    });

    for (const secret of secrets) {
-      const { name, createdAt: updatedAt, scope, id, type } = secret;
-      table.push([
-        name,
-        EnvironmentSecretTypeToSecretType[type],
-        scope,
-        id,
-        dateFormat(updatedAt, 'mmm dd HH:MM:ss'),
-      ]);
+      const { name, createdAt: updatedAt, scope, id } = secret;
+      table.push([name, scope, id, dateFormat(updatedAt, 'mmm dd HH:MM:ss')]);
    }

    Log.log(chalk`{bold Secrets for this account and project:}`);
Author	SHA1	Message	Date
Dominik Sokal	dd7a3912c6	address PR feedback	2022-07-29 14:22:56 +02:00
Dominik Sokal	77ac0550a9	use commit message as default build message	2022-07-29 11:07:02 +02:00