[eas-cli] unify channel graphql query types

update CHANGELOG.md
v3.17.0
2026-11-13 20:28:08 -10:00 · 2023-07-24 15:54:43 -07:00 · 2023-07-24 17:24:12 +00:00 · 2023-07-24 19:16:40 +02:00 · 2023-07-24 19:08:10 +02:00 · 2023-07-24 09:10:07 -07:00
193 changed files with 8376 additions and 2026 deletions
@@ -1,8 +1,5 @@
-<!-- Thanks for contributing to _EAS CLI_! Before you submit your pull request, please make sure to check the following boxes by putting an x in the [ ] (don't: [x ], [ x], do: [x]) -->
-
-# Checklist
-
- [ ] I've added an entry to [CHANGELOG.md](https://github.com/expo/eas-cli/blob/main/CHANGELOG.md#main) if necessary. You can comment this pull request with `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]` and CHANGELOG.md will be updated automatically.
+<!-- If this PR requires a changelog entry, add it by commenting the PR with the command `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]`. -->
+<!-- You can skip the changelog check by labeling the PR with "no changelog". -->

 # Why

@@ -0,0 +1,48 @@
+name: Changelog bot
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  pr-commented:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.EXPO_BOT_PAT }}
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18
+      - name: Checkout Pull Request
+        run: hub pr checkout ${{ github.event.issue.number }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install dependencies
+        working-directory: ./scripts
+        run: yarn install --frozen-lockfile --check-files
+      - name: Add changelog entry
+        working-directory: ./scripts
+        run: |
+          PARAMS=${PR_COMMENT_BODY#/changelog-entry }
+          if [[ ! "$PARAMS" =~ " " ]]; then
+            echo "Invalid /changelog-entry command"
+            exit 1
+          fi
+          CATEGORY=$( cut -d ' ' -f 1 <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
+          MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
+          yarn changelog-entry "$CATEGORY" "$MESSAGE"
+        env:
+          GITHUB_PR_AUTHOR: ${{ github.event.issue.user.login }}
+          GITHUB_PR_NUMBER: ${{ github.event.issue.number }}
+          PR_COMMENT_BODY: ${{ github.event.comment.body }}
+      - name: Commit and push
+        run: |
+          # use the last commit author name and email
+          git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)"
+          git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
+
+          git add CHANGELOG.md
+          git commit -m "update CHANGELOG.md"
+          git push
@@ -1,48 +1,37 @@
-on:
-  issue_comment:
-    types: [created]
+name: CHANGELOG.md PR check

-name: Changelog
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - labeled
+      - unlabeled

 jobs:
-  pr-commented:
+  pr-changelog-entry:
+    name: Check CHANGELOG.md updated
    runs-on: ubuntu-latest
-    if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
    steps:
      - uses: actions/checkout@v2
+      - name: Check if CHANGELOG.md was updated
+        id: changelog-updated
+        uses: tj-actions/changed-files@v35
        with:
-          token: ${{ secrets.EXPO_BOT_PAT }}
-      - uses: actions/setup-node@v2
+          files: CHANGELOG.md
+      - name: Fail if CHANGELOG.md was not updated and the "no changelog" label is absent
+        if: steps.changelog-updated.outputs.any_changed == 'false' && !contains(github.event.pull_request.labels.*.name, 'no changelog')
+        uses: actions/github-script@v6
        with:
-          node-version: 18
-      - name: Checkout Pull Request
-        run: hub pr checkout ${{ github.event.issue.number }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Install dependencies
-        working-directory: ./scripts
-        run: yarn install --frozen-lockfile --check-files
-      - name: Add changelog entry
-        working-directory: ./scripts
-        run: |
-          PARAMS=${PR_COMMENT_BODY#/changelog-entry }
-          if [[ ! "$PARAMS" =~ " " ]]; then
-            echo "Invalid /changelog-entry command"
-            exit 1
-          fi
-          CATEGORY=$( cut -d ' ' -f 1 <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
-          MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
-          yarn changelog-entry "$CATEGORY" "$MESSAGE"
-        env:
-          GITHUB_PR_AUTHOR: ${{ github.event.issue.user.login }}
-          GITHUB_PR_NUMBER: ${{ github.event.issue.number }}
-          PR_COMMENT_BODY: ${{ github.event.comment.body }}
-      - name: Commit and push
-        run: |
-          # use the last commit author name and email
-          git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)"
-          git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
-
-          git add CHANGELOG.md
-          git commit -m "update CHANGELOG.md"
-          git push
+          script: |
+            core.setFailed('Please add a changelog entry!')
+      - uses: mshick/[email protected]
+        if: always()
+        with:
+          message-id: changelog-entry-check
+          refresh-message-position: true
+          message: ${{ contains(github.event.pull_request.labels.*.name, 'no changelog') && '⏩ The changelog entry check has been skipped since the "no changelog" label is present.' || '✅ Thank you for adding the changelog entry!' }}
+          message-failure: |
+            ❌ It looks like a changelog entry is missing for this PR. You have two options: you can add it manually, or you can use the changelog bot to do it for you.
+            🤖 To use the bot, simply comment on this PR with the command `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]`.
+            ⏩ If this PR doesn't require a changelog entry, such as if it's an internal change that doesn't affect the user experience, you can add the "no changelog" label to the PR.
@@ -29,7 +29,7 @@ jobs:
        with:
          node-version: 18
      - run: yarn install --frozen-lockfile --check-files
-      - run: yarn build
+      - run: yarn build-ci
      - name: Build tarballs
        working-directory: ${{ github.workspace }}/packages/eas-cli
        run: |
@@ -70,7 +70,7 @@ jobs:
        with:
          node-version: 18
      - run: yarn install --frozen-lockfile --check-files
-      - run: yarn build
+      - run: yarn build-ci
      - name: Build tarballs
        working-directory: ${{ github.workspace }}/packages/eas-cli
        run: |
@@ -99,7 +99,7 @@ jobs:
          node-version: 18
      - run: yarn install --frozen-lockfile --check-files
      - run: sudo apt-get install nsis
-      - run: yarn build
+      - run: yarn build-ci
      - run: |
          yarn pretarball-ci
          yarn oclif pack:win
@@ -142,7 +142,7 @@ jobs:
      - name: Install dependencies
        run: yarn install --frozen-lockfile --check-files
      - name: Build
-        run: yarn build
+        run: yarn build-ci
      - name: Publish packages to npm
        run: yarn lerna publish from-package --yes --no-verify-access
        env:
@@ -1,4 +1,5 @@
 name: Run tests
+
 on:
  push:
    branches: [main]
@@ -25,20 +26,23 @@ jobs:
      - run: yarn typecheck
      - run: yarn test
        if: ${{ !matrix.coverage }}
+        env:
+          NODE_OPTIONS: --max-old-space-size=8192
      - run: yarn test --coverage
        if: ${{ matrix.coverage }}
        env:
          # Oclif seems to cause OOM errors when testing with coverage enabled.
          # Remove this whenever we solved those OOM errors.
-          NODE_OPTIONS: --max-old-space-size=4096
+          NODE_OPTIONS: --max-old-space-size=8192
      - run: yarn lint --max-warnings=0
      - run: yarn install --frozen-lockfile --check-files
        working-directory: ./scripts
-      - run: yarn lint-changelog
      - uses: codecov/codecov-action@v1
        if: ${{ matrix.coverage }}
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
+      - run: yarn lint-changelog
+
  notify-slack:
    runs-on: ubuntu-latest
    needs: test
@@ -10,6 +10,208 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🐛 Bug fixes

+### 🧹 Chores
+
+## [3.17.0](https://github.com/expo/eas-cli/releases/tag/v3.17.0) - 2023-07-24
+
+### 🎉 New features
+
+- Add `rollout` option for configuring Android submissions. ([#1938](https://github.com/expo/eas-cli/pull/1938) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
+- Added branch mapping utility functions. ([#1944](https://github.com/expo/eas-cli/pull/1944) by [@quinlanj](https://github.com/quinlanj))
+- Amend branch mapping utility functions. ([#1945](https://github.com/expo/eas-cli/pull/1945) by [@quinlanj](https://github.com/quinlanj))
+- Handle error thrown when `intel-medium` resource class is not available as server-side defined error. ([#1947](https://github.com/expo/eas-cli/pull/1947) by [@szdziedzic](https://github.com/szdziedzic))
+- Remove `intel-medium` from `eas.schema.json`, so it's not suggested as a valid value by our VSCode plugin. ([#1947](https://github.com/expo/eas-cli/pull/1947) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.16.0](https://github.com/expo/eas-cli/releases/tag/v3.16.0) - 2023-07-18
+
+### 🎉 New features
+
+- Add styling to SSO auth redirect completion page. ([#1929](https://github.com/expo/eas-cli/pull/1929) by [@wschurman](https://github.com/wschurman))
+- Ignore entitlements from native template when `/ios` is gitignored. ([#1906](https://github.com/expo/eas-cli/pull/1906) by [@byCedric](https://github.com/byCedric))
+- Use node server default port selection for SSO login server. ([#1930](https://github.com/expo/eas-cli/pull/1930) by [@wschurman](https://github.com/wschurman))
+
+### 🐛 Bug fixes
+
+- Fix incorrect handling of valid `inProgress` Android submission release status. ([#1934](https://github.com/expo/eas-cli/pull/1934) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
+- Print friendly error msg in case account doesn't have required permission. ([#1867](https://github.com/expo/eas-cli/pull/1867) by [@firasrg](https://github.com/firasrg))
+- Limit project file upload size to 2GB. ([#1928](https://github.com/expo/eas-cli/pull/1928) by [@khamilowicz](https://github.com/khamilowicz))
+- Bump urql graphql client major version. ([#1936](https://github.com/expo/eas-cli/pull/1936) by [@quinlanj](https://github.com/quinlanj))
+
+## [3.15.1](https://github.com/expo/eas-cli/releases/tag/v3.15.1) - 2023-07-11
+
+### 🐛 Bug fixes
+
+- Ensure useClassicUpdates is not set when using EAS Update commands. ([#1915](https://github.com/expo/eas-cli/pull/1915) by [@ide](https://github.com/ide))
+- Handle multiple GraphQLErrors when receiving a CombinedError. ([#1924](https://github.com/expo/eas-cli/pull/1924) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+### 🧹 Chores
+
+- Bump Expo package dependencies. ([#1911](https://github.com/expo/eas-cli/pull/1911) by [@brentvatne](https://github.com/brentvatne))
+- Better bare workflow runtimeVersion error. ([#1910](https://github.com/expo/eas-cli/pull/1910) by [@quinlanj](https://github.com/quinlanj))
+- Fix runtime version print logs. ([#1925](https://github.com/expo/eas-cli/pull/1925) by [@quinlanj](https://github.com/quinlanj))
+- Add info about new `macos-ventura-13.4-xcode-14.3.1` image to `eas.schema.json`. ([#1920](https://github.com/expo/eas-cli/pull/1920) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.15.0](https://github.com/expo/eas-cli/releases/tag/v3.15.0) - 2023-06-30
+
+### 🎉 New features
+
+- Show build profile when selecting a build for eas build:run. ([#1901](https://github.com/expo/eas-cli/pull/1901) by [@keith-kurak](https://github.com/keith-kurak))
+- Adds -m alias to --message in update/republish and removed README comment. ([#1905](https://github.com/expo/eas-cli/pull/1905) by [@pusongqi](https://github.com/pusongqi))
+
+### 🧹 Chores
+
+- Better runtimeVersion output. ([#1894](https://github.com/expo/eas-cli/pull/1894) by [@quinlanj](https://github.com/quinlanj))
+- Print better error message when uploading project archive tarball fails. ([#1897](https://github.com/expo/eas-cli/pull/1897) by [@szdziedzic](https://github.com/szdziedzic))
+- Adds support for 2 new server-side errors related to build limits. ([#1921](https://github.com/expo/eas-cli/pull/1921) by [@sundeeppeswani](https://github.com/sundeeppeswani))
+
+## [3.14.0](https://github.com/expo/eas-cli/releases/tag/v3.14.0) - 2023-06-20
+
+### 🎉 New features
+
+- Added support for SSO users. ([#1875](https://github.com/expo/eas-cli/pull/1875) by [@lzkb](https://github.com/lzkb))
+- Added new bundle identifier capabilities and entitlements from WWDC23. ([#1870](https://github.com/expo/eas-cli/pull/1870) by [@EvanBacon](https://github.com/EvanBacon))
+- Selecting default keystore via CLI. ([#1889](https://github.com/expo/eas-cli/pull/1889) by [@khamilowicz](https://github.com/khamilowicz))
+
+### 🧹 Chores
+
+- Change sso flag display. ([#1890](https://github.com/expo/eas-cli/pull/1890) by [@lzkb](https://github.com/lzkb))
+- Build:configure -- add channels to eas.json if using eas updates. ([#1887](https://github.com/expo/eas-cli/pull/1887) by [@quinlanj](https://github.com/quinlanj))
+- Eas update: Error gracefully if no git repo. ([#1884](https://github.com/expo/eas-cli/pull/1884) by [@quinlanj](https://github.com/quinlanj))
+- Error gracefully if expo pkg not installed. ([#1883](https://github.com/expo/eas-cli/pull/1883) by [@quinlanj](https://github.com/quinlanj))
+- Update `eas build:configure` command to show the link of `eas.json` when generated. ([#1878](https://github.com/expo/eas-cli/pull/1878) by [@amandeepmittal](https://github.com/amandeepmittal))
+- Create app.json or add the "expo" key if either are missing, before modifying or reading the file. ([#1881](https://github.com/expo/eas-cli/pull/1881) by [@brentvatne](https://github.com/brentvatne))
+- Include the original stack in re-thrown errors thrown from EAS CLI commands. ([#1882](https://github.com/expo/eas-cli/pull/1882) by [@brentvatne](https://github.com/brentvatne))
+- Make `update:configure` less verbose. ([#1888](https://github.com/expo/eas-cli/pull/1888) by [@quinlanj](https://github.com/quinlanj))
+- Improve validation for values from app config. ([#1893](https://github.com/expo/eas-cli/pull/1893) by [@wkozyra95](https://github.com/wkozyra95))
+- Improve `expo-updates` validation for builds with `channel` property set. ([#1885](https://github.com/expo/eas-cli/pull/1885) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.13.3](https://github.com/expo/eas-cli/releases/tag/v3.13.3) - 2023-06-05
+
+### 🐛 Bug fixes
+
+- Show original GraphQL error message in case of an unexpected error. ([#1862](https://github.com/expo/eas-cli/pull/1862) by [@dsokal](https://github.com/dsokal))
+- Fix updates synchronization of native files to include strings.xml for bare projects. ([#1865](https://github.com/expo/eas-cli/pull/1865) by [@wschurman](https://github.com/wschurman))
+
+## [3.13.2](https://github.com/expo/eas-cli/releases/tag/v3.13.2) - 2023-05-26
+
+### 🧹 Chores
+
+- Refactor getExpoConfig to remove dangerous default. ([#1857](https://github.com/expo/eas-cli/pull/1857) by [@wschurman](https://github.com/wschurman))
+- Add support for pending-cancel build status. ([#1855](https://github.com/expo/eas-cli/pull/1855) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+## [3.13.1](https://github.com/expo/eas-cli/releases/tag/v3.13.1) - 2023-05-24
+
+### 🧹 Chores
+
+- Short format for selecting devices prompt. ([#1840](https://github.com/expo/eas-cli/pull/1840) by [@khamilowicz](https://github.com/khamilowicz))
+- Improve typescript types for user display. ([#1851](https://github.com/expo/eas-cli/pull/1851) by [@wschurman](https://github.com/wschurman))
+- Add error for `large` resource class not available on the free plan to server-side defined errors. ([#1848](https://github.com/expo/eas-cli/pull/1848) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.13.0](https://github.com/expo/eas-cli/releases/tag/v3.13.0) - 2023-05-17
+
+### 🎉 New features
+
+- Add clear cache flag to eas update. ([#1839](https://github.com/expo/eas-cli/pull/1839) by [@quinlanj](https://github.com/quinlanj))
+- Print EAS Update assets that timed out during upload or processing. ([#1849](https://github.com/expo/eas-cli/pull/1849) by [@wschurman](https://github.com/wschurman))
+
+### 🐛 Bug fixes
+
+- Fix building iOS projects with framework targets. ([#1835](https://github.com/expo/eas-cli/pull/1835) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Ignore dirty workingdir when building from GitHub. ([#1842](https://github.com/expo/eas-cli/pull/1842) by [@wkozyra95](https://github.com/wkozyra95))
+- Remove App Specific Password prompt. ([#1843](https://github.com/expo/eas-cli/pull/1843) by [@quinlanj](https://github.com/quinlanj))
+- Validate `CFBundleShortVersionString`. ([#1846](https://github.com/expo/eas-cli/pull/1846) by [@khamilowicz](https://github.com/khamilowicz))
+
+## [3.12.1](https://github.com/expo/eas-cli/releases/tag/v3.12.1) - 2023-05-15
+
+### 🐛 Bug fixes
+
+- Don't submit expired builds. ([#1837](https://github.com/expo/eas-cli/pull/1837) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Change red apple icon to green apple icon on successful build. ([#1828](https://github.com/expo/eas-cli/pull/1828) by [@dchhetri](https://github.com/dchhetri))
+
+## [3.12.0](https://github.com/expo/eas-cli/releases/tag/v3.12.0) - 2023-05-08
+
+### 🎉 New features
+
+- Add `build:version:get` command. ([#1815](https://github.com/expo/eas-cli/pull/1815) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Upgrade dependencies. ([#1824](https://github.com/expo/eas-cli/pull/1824) by [@dsokal](https://github.com/dsokal))
+
+## [3.11.0](https://github.com/expo/eas-cli/releases/tag/v3.11.0) - 2023-05-05
+
+### 🎉 New features
+
+- Add account list to `eas whoami`/`eas account:view`. ([#1814](https://github.com/expo/eas-cli/pull/1814) by [@wschurman](https://github.com/wschurman))
+- Add `large` resource class for iOS as allowed value in `eas.json`. ([#1817](https://github.com/expo/eas-cli/pull/1817) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
+- Print request ID on unforeseen GraphQL error for easier tracking and follow up. ([#1813](https://github.com/expo/eas-cli/pull/1813) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+## [3.10.2](https://github.com/expo/eas-cli/releases/tag/v3.10.2) - 2023-04-25
+
+### 🧹 Chores
+
+- Add info about Xcode 14.3 image to `eas.schema.json`. ([#1808](https://github.com/expo/eas-cli/pull/1808) by [@szdziedzic](https://github.com/szdziedzic))
+- Allow users to select an app to run using the `build:run` command if multiple apps are found in the tarball. ([#1807](https://github.com/expo/eas-cli/pull/1807) by [@szdziedzic](https://github.com/szdziedzic))
+- Don't resolve `default` resource class for iOS in CLI. ([#1734](https://github.com/expo/eas-cli/pull/1734) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.10.1](https://github.com/expo/eas-cli/releases/tag/v3.10.1) - 2023-04-25
+
+### 🧹 Chores
+
+- Add `cache.paths` field and deprecate `cache.customPaths`. ([#1794](https://github.com/expo/eas-cli/pull/1794) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+## [3.10.0](https://github.com/expo/eas-cli/releases/tag/v3.10.0) - 2023-04-21
+
+### 🎉 New features
+
+- Added eas device:rename command. ([#1787](https://github.com/expo/eas-cli/pull/1787) by [@keith-kurak](https://github.com/keith-kurak))
+
+### 🐛 Bug fixes
+
+- Fix `device:delete` not disabling on Apple. ([#1803](https://github.com/expo/eas-cli/pull/1803) by [@keith-kurak](https://github.com/keith-kurak))
+- Fix message truncation for updates. ([#1801](https://github.com/expo/eas-cli/pull/1801) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Throw an error if somebody tries to start iOS build with the `large` resource class selected using the deprecated `--resource-class` flag. ([#1795](https://github.com/expo/eas-cli/pull/1795) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.9.3](https://github.com/expo/eas-cli/releases/tag/v3.9.3) - 2023-04-18
+
+### 🐛 Bug fixes
+
+- Fix prompts in `eas update`. ([#1797](https://github.com/expo/eas-cli/pull/1797) by [@wschurman](https://github.com/wschurman))
+
+## [3.9.2](https://github.com/expo/eas-cli/releases/tag/v3.9.2) - 2023-04-13
+
+### 🐛 Bug fixes
+
+- Fixes the rollout percentages when ending a rollout. ([#1781](https://github.com/expo/eas-cli/pull/1781) by [@jonsamp](https://github.com/jonsamp))
+- Print meaningful error message if `extra.eas.projectId` is not a string. ([#1788](https://github.com/expo/eas-cli/pull/1788) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Show output of `expo install expo-updates`. ([#1782](https://github.com/expo/eas-cli/pull/1782) by [@wkozyra95](https://github.com/wkozyra95))
+- Print deprecation warnings for deprecated `eas.json` fields. ([#1768](https://github.com/expo/eas-cli/pull/1768) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.9.1](https://github.com/expo/eas-cli/releases/tag/v3.9.1) - 2023-04-10
+
+### 🐛 Bug fixes
+
 - Update apple utilities to work around the maintenance error. ([#1780](https://github.com/expo/eas-cli/pull/1780) by [@byCedric](https://github.com/byCedric))

 ### 🧹 Chores
@@ -65,7 +267,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

- Support variant detection for package*UniversalApk Gradle Commands. ([#1708](https://github.com/expo/eas-cli/pull/1708) by [@frw](https://github.com/frw))
+- Support variant detection for package\*UniversalApk Gradle Commands. ([#1708](https://github.com/expo/eas-cli/pull/1708) by [@frw](https://github.com/frw))

 ## [3.6.1](https://github.com/expo/eas-cli/releases/tag/v3.6.1) - 2023-02-20

@@ -1,10 +1,10 @@
-* @dsokal @wkozyra95
+* @szdziedzic @khamilowicz

-packages/eas-cli/src/build @dsokal @wkozyra95
-packages/eas-cli/src/commands/build @dsokal @wkozyra95
+packages/eas-cli/src/build @szdziedzic @khamilowicz
+packages/eas-cli/src/commands/build @szdziedzic @khamilowicz

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

 packages/eas-cli/src/update @EvanBacon @byCedric @wschurman
 packages/eas-cli/src/commands/update @EvanBacon @byCedric @wschurman
@@ -13,4 +13,4 @@ packages/eas-cli/schema @bycedric
 packages/eas-cli/src/metadata @bycedric
 packages/eas-cli/src/commands/metadata @bycedric

-packages/eas-json @dsokal @wkozyra95
+packages/eas-json @szdziedzic @khamilowicz
@@ -1,6 +1,6 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "3.9.1",
+  "version": "3.17.0",
  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
@@ -6,6 +6,7 @@
  ],
  "scripts": {
    "build": "lerna run build",
+    "build-ci": "lerna run build-ci",
    "build:tarballs:linux": "yarn build-for-size-check",
    "build-for-size-check": "yarn build && yarn workspace eas-cli pretarball-ci && CLI_SIZE_CHECK=1 yarn workspace eas-cli oclif pack:tarballs --no-xz --targets linux-x64",
    "typecheck": "lerna run typecheck",
@@ -73,6 +73,7 @@ eas --help COMMAND
 * [`eas build:resign`](#eas-buildresign)
 * [`eas build:run`](#eas-buildrun)
 * [`eas build:submit`](#eas-buildsubmit)
+* [`eas build:version:get`](#eas-buildversionget)
 * [`eas build:version:set`](#eas-buildversionset)
 * [`eas build:version:sync`](#eas-buildversionsync)
 * [`eas build:view [BUILD_ID]`](#eas-buildview-build_id)
@@ -86,6 +87,7 @@ eas --help COMMAND
 * [`eas device:create`](#eas-devicecreate)
 * [`eas device:delete`](#eas-devicedelete)
 * [`eas device:list`](#eas-devicelist)
+* [`eas device:rename`](#eas-devicerename)
 * [`eas device:view [UDID]`](#eas-deviceview-udid)
 * [`eas diagnostics`](#eas-diagnostics)
 * [`eas help [COMMAND]`](#eas-help-command)
@@ -131,7 +133,7 @@ ALIASES
  $ eas login
 ```

-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/account/login.ts)_

 ## `eas account:logout`

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

-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/account/logout.ts)_

 ## `eas account:view`

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

-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/account/view.ts)_

 ## `eas analytics [STATUS]`

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

-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/analytics.ts)_

 ## `eas autocomplete [SHELL]`

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

-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/branch/create.ts)_

 ## `eas branch:delete [NAME]`

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

-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/branch/delete.ts)_

 ## `eas branch:list`

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

-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/branch/list.ts)_

 ## `eas branch:rename`

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

-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/branch/rename.ts)_

 ## `eas branch:view [NAME]`

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

-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/branch/view.ts)_

 ## `eas build`

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

-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/build/index.ts)_

 ## `eas build:cancel [BUILD_ID]`

@@ -360,7 +362,7 @@ DESCRIPTION
  cancel a build
 ```

-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/build/cancel.ts)_

 ## `eas build:configure`

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

-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/build/configure.ts)_

 ## `eas build:inspect`

@@ -412,7 +414,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/v3.9.1/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/build/inspect.ts)_

 ## `eas build:list`

@@ -420,10 +422,11 @@ list all builds for your project

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

 FLAGS
  --appBuildVersion=<value>
@@ -433,23 +436,23 @@ FLAGS
  --channel=<value>
  --distribution=(store|internal|simulator)
  --gitCommitHash=<value>
-  --json                                                         Enable JSON output, non-JSON messages will be printed
-                                                                 to stderr.
-  --limit=<value>                                                The number of items to fetch each query. Defaults to 10
-                                                                 and is capped at 50.
-  --non-interactive                                              Run the command in non-interactive mode.
-  --offset=<value>                                               Start queries from specified index. Use for paginating
-                                                                 results. Defaults to 0.
+  --json                                                                        Enable JSON output, non-JSON messages
+                                                                                will be printed to stderr.
+  --limit=<value>                                                               The number of items to fetch each query.
+                                                                                Defaults to 10 and is capped at 50.
+  --non-interactive                                                             Run the command in non-interactive mode.
+  --offset=<value>                                                              Start queries from specified index. Use
+                                                                                for paginating results. Defaults to 0.
  --platform=(all|android|ios)
  --runtimeVersion=<value>
  --sdkVersion=<value>
-  --status=(new|in-queue|in-progress|errored|finished|canceled)
+  --status=(new|in-queue|in-progress|pending-cancel|errored|finished|canceled)

 DESCRIPTION
  list all builds for your project
 ```

-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/build/list.ts)_

 ## `eas build:resign`

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

-_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/build/resign.ts)_
+_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/build/resign.ts)_

 ## `eas build:run`

@@ -499,7 +502,7 @@ DESCRIPTION
  run simulator/emulator builds from eas-cli
 ```

-_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/build/run.ts)_
+_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/build/run.ts)_

 ## `eas build:submit`

@@ -529,9 +532,30 @@ ALIASES
  $ eas build:submit
 ```

+## `eas build:version:get`
+
+get the latest version from EAS servers
+
+```
+USAGE
+  $ eas build:version:get [-p android|ios|all] [-e <value>] [--json --non-interactive]
+
+FLAGS
+  -e, --profile=PROFILE_NAME        Name of the build profile from eas.json. Defaults to "production" if defined in
+                                    eas.json.
+  -p, --platform=(android|ios|all)
+  --json                            Enable JSON output, non-JSON messages will be printed to stderr.
+  --non-interactive                 Run the command in non-interactive mode.
+
+DESCRIPTION
+  get the latest version from EAS servers
+```
+
+_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/build/version/get.ts)_
+
 ## `eas build:version:set`

-Update version of an app.
+update version of an app

 ```
 USAGE
@@ -543,14 +567,14 @@ FLAGS
  -p, --platform=(android|ios)

 DESCRIPTION
-  Update version of an app.
+  update version of an app
 ```

-_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/build/version/set.ts)_
+_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v3.17.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
+update a version in native code with a value stored on EAS servers

 ```
 USAGE
@@ -562,10 +586,10 @@ FLAGS
  -p, --platform=(android|ios|all)

 DESCRIPTION
-  Update a version in native code with a value stored on EAS servers
+  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/v3.9.1/packages/eas-cli/src/commands/build/version/sync.ts)_
+_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/build/version/sync.ts)_

 ## `eas build:view [BUILD_ID]`

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

-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/build/view.ts)_

 ## `eas channel:create [NAME]`

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

-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/channel/create.ts)_

 ## `eas channel:edit [NAME]`

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

-_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/channel/edit.ts)_

 ## `eas channel:list`

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

-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/channel/list.ts)_

 ## `eas channel:rollout [CHANNEL]`

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

-_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/channel/rollout.ts)_
+_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/channel/rollout.ts)_

 ## `eas channel:view [NAME]`

@@ -692,7 +716,7 @@ DESCRIPTION
  view a channel
 ```

-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/channel/view.ts)_

 ## `eas config`

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

-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/config.ts)_

 ## `eas credentials`

@@ -730,7 +754,7 @@ DESCRIPTION
  manage credentials
 ```

-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/credentials.ts)_

 ## `eas device:create`

@@ -744,7 +768,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/v3.9.1/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/device/create.ts)_

 ## `eas device:delete`

@@ -764,7 +788,7 @@ DESCRIPTION
  remove a registered device from your account
 ```

-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/device/delete.ts)_

 ## `eas device:list`

@@ -785,7 +809,28 @@ DESCRIPTION
  list all registered devices for your account
 ```

-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/device/list.ts)_
+
+## `eas device:rename`
+
+rename a registered device
+
+```
+USAGE
+  $ eas device:rename [--apple-team-id <value>] [--udid <value>] [--name <value>] [--json --non-interactive]
+
+FLAGS
+  --apple-team-id=<value>  The Apple team ID on which to find the device
+  --json                   Enable JSON output, non-JSON messages will be printed to stderr.
+  --name=<value>           The new name for the device
+  --non-interactive        Run the command in non-interactive mode.
+  --udid=<value>           The Apple device ID to rename
+
+DESCRIPTION
+  rename a registered device
+```
+
+_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/device/rename.ts)_

 ## `eas device:view [UDID]`

@@ -799,7 +844,7 @@ DESCRIPTION
  view a device for your project
 ```

-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/device/view.ts)_

 ## `eas diagnostics`

@@ -813,7 +858,7 @@ DESCRIPTION
  display environment info
 ```

-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/diagnostics.ts)_

 ## `eas help [COMMAND]`

@@ -901,7 +946,7 @@ DESCRIPTION
  validate the local store configuration
 ```

-_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/metadata/lint.ts)_
+_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/metadata/lint.ts)_

 ## `eas metadata:pull`

@@ -918,7 +963,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/v3.9.1/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/metadata/pull.ts)_

 ## `eas metadata:push`

@@ -935,7 +980,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/v3.9.1/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/metadata/push.ts)_

 ## `eas open`

@@ -949,7 +994,7 @@ DESCRIPTION
  open the project page in a web browser
 ```

-_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/open.ts)_
+_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/open.ts)_

 ## `eas project:info`

@@ -963,7 +1008,7 @@ DESCRIPTION
  information about the current project
 ```

-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/project/info.ts)_

 ## `eas project:init`

@@ -985,7 +1030,7 @@ ALIASES
  $ eas init
 ```

-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/project/init.ts)_

 ## `eas secret:create`

@@ -1008,7 +1053,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/v3.9.1/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/secret/create.ts)_

 ## `eas secret:delete`

@@ -1026,7 +1071,7 @@ DESCRIPTION
  delete an environment secret by ID
 ```

-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/secret/delete.ts)_

 ## `eas secret:list`

@@ -1040,7 +1085,7 @@ DESCRIPTION
  list environment secrets available for your current app
 ```

-_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/secret/list.ts)_

 ## `eas secret:push`

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

-_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/secret/push.ts)_
+_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/secret/push.ts)_

 ## `eas submit`

@@ -1090,7 +1135,7 @@ ALIASES
  $ eas build:submit
 ```

-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/submit.ts)_

 ## `eas update`

@@ -1098,19 +1143,20 @@ publish an update group

 ```
 USAGE
-  $ eas update [--branch <value>] [--channel <value>] [--message <value>] [--republish | --input-dir <value>
-    | --skip-bundler] [--group <value> |  | ] [-p android|ios|all] [--auto] [--private-key-path <value>] [--json
-    --non-interactive]
+  $ eas update [--branch <value>] [--channel <value>] [-m <value>] [--republish | --input-dir <value> |
+    --skip-bundler] [--group <value> |  | ] [--clear-cache] [-p android|ios|all] [--auto] [--private-key-path <value>]
+    [--json --non-interactive]

 FLAGS
+  -m, --message=<value>             A short message describing the update
  -p, --platform=(android|ios|all)  [default: all]
  --auto                            Use the current git branch and commit message for the EAS branch and update message
  --branch=<value>                  Branch to publish the update group on
  --channel=<value>                 Channel that the published update should affect
+  --clear-cache                     Clear the bundler cache before publishing
  --group=<value>                   Update group to republish (deprecated, see republish command)
  --input-dir=<value>               [default: dist] Location of the bundle
  --json                            Enable JSON output, non-JSON messages will be printed to stderr.
-  --message=<value>                 A short message describing the update
  --non-interactive                 Run the command in non-interactive mode.
  --private-key-path=<value>        File containing the PEM-encoded private key corresponding to the certificate in
                                    expo-updates' configuration. Defaults to a file named "private-key.pem" in the
@@ -1122,7 +1168,7 @@ DESCRIPTION
  publish an update group
 ```

-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/update/index.ts)_

 ## `eas update:configure`

@@ -1140,7 +1186,7 @@ DESCRIPTION
  configure the project to support EAS Update
 ```

-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/update/configure.ts)_

 ## `eas update:delete GROUPID`

@@ -1161,7 +1207,7 @@ DESCRIPTION
  delete all the updates in an update group
 ```

-_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/update/delete.ts)_

 ## `eas update:list`

@@ -1183,7 +1229,7 @@ DESCRIPTION
  view the recent updates
 ```

-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/update/list.ts)_

 ## `eas update:republish`

@@ -1191,23 +1237,23 @@ roll back to an existing update

 ```
 USAGE
-  $ eas update:republish [--channel <value> | --branch <value> | --group <value>] [--message <value>] [-p
-    android|ios|all] [--json --non-interactive]
+  $ eas update:republish [--channel <value> | --branch <value> | --group <value>] [-m <value>] [-p android|ios|all]
+    [--json --non-interactive]

 FLAGS
+  -m, --message=<value>             Short message describing the republished update
  -p, --platform=(android|ios|all)  [default: all]
  --branch=<value>                  Branch name to select an update to republish from
  --channel=<value>                 Channel name to select an update to republish from
  --group=<value>                   Update group ID to republish
  --json                            Enable JSON output, non-JSON messages will be printed to stderr.
-  --message=<value>                 Short message describing the republished update
  --non-interactive                 Run the command in non-interactive mode.

 DESCRIPTION
  roll back to an existing update
 ```

-_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/update/republish.ts)_
+_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/update/republish.ts)_

 ## `eas update:view GROUPID`

@@ -1227,7 +1273,7 @@ DESCRIPTION
  update group details
 ```

-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/update/view.ts)_

 ## `eas webhook:create`

@@ -1248,7 +1294,7 @@ DESCRIPTION
  create a webhook
 ```

-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/webhook/create.ts)_

 ## `eas webhook:delete [ID]`

@@ -1268,7 +1314,7 @@ DESCRIPTION
  delete a webhook
 ```

-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/webhook/delete.ts)_

 ## `eas webhook:list`

@@ -1286,7 +1332,7 @@ DESCRIPTION
  list webhooks
 ```

-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/webhook/list.ts)_

 ## `eas webhook:update`

@@ -1308,7 +1354,7 @@ DESCRIPTION
  update a webhook
 ```

-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/webhook/update.ts)_

 ## `eas webhook:view ID`

@@ -1325,7 +1371,7 @@ DESCRIPTION
  view a webhook
 ```

-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v3.9.1/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v3.17.0/packages/eas-cli/src/commands/webhook/view.ts)_

 ## `eas whoami`

@@ -2,4 +2,5 @@ module.exports = async () => {
  process.env.TZ = 'UTC';
  process.env.EAS_NO_VCS = '1';
  process.env.EAS_PROJECT_ROOT = '/app';
+  process.env.FORCE_COLOR = '1';
 };
@@ -1,20 +1,20 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "3.9.1",
+  "version": "3.17.0",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
  },
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
-    "@expo/apple-utils": "1.2.0",
+    "@expo/apple-utils": "1.3.1",
    "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "7.0.3",
-    "@expo/config-plugins": "5.0.4",
-    "@expo/config-types": "47.0.0",
-    "@expo/eas-build-job": "1.0.7",
-    "@expo/eas-json": "3.9.1",
+    "@expo/config": "8.1.2",
+    "@expo/config-plugins": "7.2.4",
+    "@expo/config-types": "49.0.0",
+    "@expo/eas-build-job": "1.0.13",
+    "@expo/eas-json": "3.17.0",
    "@expo/json-file": "8.2.37",
    "@expo/multipart-body-parser": "1.1.0",
    "@expo/osascript": "2.0.33",
@@ -23,17 +23,17 @@
    "@expo/plist": "0.0.20",
    "@expo/plugin-help": "5.1.22",
    "@expo/plugin-warn-if-update-available": "2.5.0",
-    "@expo/prebuild-config": "5.0.7",
+    "@expo/prebuild-config": "6.2.5",
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
    "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.8",
+    "@expo/steps": "1.0.25",
    "@expo/timeago.js": "1.0.0",
    "@oclif/core": "1.23.2",
    "@oclif/plugin-autocomplete": "1.3.10",
    "@segment/ajv-human-errors": "^2.1.2",
-    "@urql/core": "3.1.1",
-    "@urql/exchange-retry": "1.0.0",
+    "@urql/core": "4.0.11",
+    "@urql/exchange-retry": "1.2.0",
    "ajv": "8.11.0",
    "ajv-formats": "2.1.1",
    "better-opn": "3.0.2",
@@ -204,11 +204,12 @@
  "scripts": {
    "postpack": "rimraf oclif.manifest.json",
    "prepack": "yarn rebuild && node ./scripts/prepack.js",
-    "rebuild": "rimraf build && yarn build",
+    "rebuild": "rimraf build && yarn build-ci",
    "pretarball-ci": "./scripts/pretarball-ci.sh",
    "build": "tsc --project tsconfig.build.json",
+    "build-ci": "tsc --project tsconfig.build-ci.json",
    "watch": "yarn build --watch --preserveWatchOutput",
-    "typecheck": "tsc",
+    "typecheck": "tsc --project tsconfig.build-ci.json",
    "test": "jest",
    "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`BuildVersionGetView reading version when appVersionSource is set to local  1`] = `"This project is not configured for using remote version source. Add [1m{"cli": { "appVersionSource": "remote" }}[22m in eas.json or re-run this command without "--non-interactive" flag."`;
@@ -0,0 +1,161 @@
+import { AppVersionSource, EasJson } from '@expo/eas-json';
+import chalk from 'chalk';
+
+import BuildVersionGetView from '../../commands/build/version/get';
+import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
+import Log from '../../log';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { getMockEasJson, mockCommandContext, mockProjectId, mockTestCommand } from './utils';
+
+jest.mock('../../project/applicationIdentifier');
+jest.mock('fs');
+jest.mock('../../log');
+jest.mock('../../utils/json');
+jest.mock('../../graphql/queries/AppVersionQuery');
+
+function withRemoteVersionSource(easJson: EasJson): EasJson {
+  return {
+    ...easJson,
+    cli: {
+      ...easJson.cli,
+      appVersionSource: AppVersionSource.REMOTE,
+    },
+  };
+}
+
+describe(BuildVersionGetView, () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  test('reading version for platform android', async () => {
+    const ctx = mockCommandContext(BuildVersionGetView, {
+      easJson: withRemoteVersionSource(getMockEasJson()),
+    });
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
+      buildVersion: '100',
+      storeVersion: '1.0.0',
+    }));
+
+    const cmd = mockTestCommand(BuildVersionGetView, ['--platform=android'], ctx);
+    await cmd.run();
+    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      'ANDROID',
+      'eas.test.com'
+    );
+    expect(Log.log).toHaveBeenCalledWith(`Android versionCode - ${chalk.bold('100')}`);
+    expect(enableJsonOutput).not.toHaveBeenCalled();
+    expect(printJsonOnlyOutput).not.toHaveBeenCalled();
+  });
+
+  test('reading version for platform android when no remote version is set', async () => {
+    const ctx = mockCommandContext(BuildVersionGetView, {
+      easJson: withRemoteVersionSource(getMockEasJson()),
+    });
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
+
+    const cmd = mockTestCommand(BuildVersionGetView, ['--platform=android'], ctx);
+    await cmd.run();
+    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      'ANDROID',
+      'eas.test.com'
+    );
+    expect(Log.log).toHaveBeenCalledWith(`No remote versions are configured for this project.`);
+    expect(enableJsonOutput).not.toHaveBeenCalled();
+    expect(printJsonOnlyOutput).not.toHaveBeenCalled();
+  });
+
+  test('reading version with --json flag for platform android', async () => {
+    const ctx = mockCommandContext(BuildVersionGetView, {
+      easJson: withRemoteVersionSource(getMockEasJson()),
+    });
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
+      buildVersion: '100',
+      storeVersion: '1.0.0',
+    }));
+
+    const cmd = mockTestCommand(
+      BuildVersionGetView,
+      ['--non-interactive', '--json', '--platform=android'],
+      ctx
+    );
+    await cmd.run();
+    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      'ANDROID',
+      'eas.test.com'
+    );
+    expect(enableJsonOutput).toHaveBeenCalled();
+    expect(printJsonOnlyOutput).toHaveBeenCalledWith({
+      versionCode: '100',
+    });
+  });
+
+  test('reading version with --json flag for platform ios', async () => {
+    const ctx = mockCommandContext(BuildVersionGetView, {
+      easJson: withRemoteVersionSource(getMockEasJson()),
+    });
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
+      buildVersion: '100',
+      storeVersion: '1.0.0',
+    }));
+
+    const cmd = mockTestCommand(
+      BuildVersionGetView,
+      ['--non-interactive', '--json', '--platform=ios'],
+      ctx
+    );
+    await cmd.run();
+    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      'IOS',
+      'eas.test.com'
+    );
+    expect(enableJsonOutput).toHaveBeenCalled();
+    expect(printJsonOnlyOutput).toHaveBeenCalledWith({
+      buildNumber: '100',
+    });
+  });
+
+  test('reading version with --json flag when no remote version is set', async () => {
+    const ctx = mockCommandContext(BuildVersionGetView, {
+      easJson: withRemoteVersionSource(getMockEasJson()),
+    });
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
+
+    const cmd = mockTestCommand(
+      BuildVersionGetView,
+      ['--non-interactive', '--json', '--platform=android'],
+      ctx
+    );
+    await cmd.run();
+    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      'ANDROID',
+      'eas.test.com'
+    );
+    expect(enableJsonOutput).toHaveBeenCalled();
+    expect(printJsonOnlyOutput).toHaveBeenCalledWith({});
+  });
+
+  test('reading version when appVersionSource is set to local ', async () => {
+    const ctx = mockCommandContext(BuildVersionGetView, {});
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
+      buildVersion: '100',
+      storeVersion: '1.0.0',
+    }));
+
+    const cmd = mockTestCommand(
+      BuildVersionGetView,
+      ['--non-interactive', '--json', '--platform=android'],
+      ctx
+    );
+    await expect(cmd.run()).rejects.toThrowErrorMatchingSnapshot();
+  });
+});
@@ -0,0 +1,140 @@
+import { AppVersionSource, EasJson } from '@expo/eas-json';
+import fs from 'fs-extra';
+import path from 'path';
+
+import BuildVersionSetView from '../../commands/build/version/set';
+import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
+import { AppQuery } from '../../graphql/queries/AppQuery';
+import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
+import Log from '../../log';
+import * as prompts from '../../prompts';
+import {
+  getMockAppFragment,
+  getMockEasJson,
+  mockCommandContext,
+  mockProjectId,
+  mockTestCommand,
+} from './utils';
+
+jest.mock('../../project/applicationIdentifier');
+jest.mock('../../graphql/queries/AppVersionQuery');
+jest.mock('../../graphql/queries/AppQuery');
+jest.mock('../../graphql/mutations/AppVersionMutation');
+jest.mock('fs');
+jest.mock('../../log');
+jest.mock('../../prompts');
+jest.mock('../../utils/json');
+
+function withRemoteVersionSource(easJson: EasJson): EasJson {
+  return {
+    ...easJson,
+    cli: {
+      ...easJson.cli,
+      appVersionSource: AppVersionSource.REMOTE,
+    },
+  };
+}
+
+describe(BuildVersionSetView, () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('setting version for platform android', async () => {
+    const ctx = mockCommandContext(BuildVersionSetView, {
+      easJson: withRemoteVersionSource(getMockEasJson()),
+    });
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
+    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
+      version: '1000',
+    }));
+
+    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
+    await cmd.run();
+    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      'ANDROID',
+      'eas.test.com'
+    );
+    expect(AppVersionMutation.createAppVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      expect.objectContaining({
+        buildVersion: '1000',
+        storeVersion: '1.0.0',
+      })
+    );
+  });
+
+  test('printing current remote version before prompting for a new one', async () => {
+    const ctx = mockCommandContext(BuildVersionSetView, {
+      easJson: withRemoteVersionSource(getMockEasJson()),
+    });
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
+      buildVersion: '100',
+      storeVersion: '1.0.0',
+    }));
+    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
+      version: '1000',
+    }));
+
+    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
+    await cmd.run();
+    expect(Log.log).toHaveBeenCalledWith(expect.stringMatching('configured with versionCode 100'));
+    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      'ANDROID',
+      'eas.test.com'
+    );
+  });
+
+  test('printing info that there is no remote version configured', async () => {
+    const ctx = mockCommandContext(BuildVersionSetView, {
+      easJson: withRemoteVersionSource(getMockEasJson()),
+    });
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
+    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
+      version: '1000',
+    }));
+
+    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
+    await cmd.run();
+    expect(Log.log).toHaveBeenCalledWith(
+      expect.stringMatching('does not have any versionCode configured')
+    );
+    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      'ANDROID',
+      'eas.test.com'
+    );
+  });
+
+  test('setting version aborts when appVersionSource is set to local and users refuse auto configuration', async () => {
+    const ctx = mockCommandContext(BuildVersionSetView, {});
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    jest.mocked(prompts.confirmAsync).mockImplementation(async () => false);
+
+    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
+    await expect(cmd.run()).rejects.toThrowError('Aborting...');
+    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
+  });
+
+  test('setting version when appVersionSource is set to local and user allows auto configuration', async () => {
+    const ctx = mockCommandContext(BuildVersionSetView, {});
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    jest.mocked(prompts.confirmAsync).mockImplementation(async () => true);
+
+    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
+    await cmd.run();
+
+    const easJsonAfterCmd = await fs.readJson(path.join(ctx.projectDir, 'eas.json'));
+    expect(easJsonAfterCmd.cli.appVersionSource).toBe('remote');
+  });
+});
@@ -0,0 +1,204 @@
+import { Workflow } from '@expo/eas-build-job';
+import { AppVersionSource, EasJson } from '@expo/eas-json';
+import fs from 'fs-extra';
+import path from 'path';
+
+import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../build/android/version';
+import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../build/ios/version';
+import BuildVersionSyncView from '../../commands/build/version/sync';
+import { Target } from '../../credentials/ios/types';
+import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
+import { AppQuery } from '../../graphql/queries/AppQuery';
+import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
+import { getAppBuildGradleAsync } from '../../project/android/gradleUtils';
+import { resolveTargetsAsync } from '../../project/ios/target';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import * as prompts from '../../prompts';
+import {
+  getMockAppFragment,
+  getMockEasJson,
+  mockCommandContext,
+  mockProjectId,
+  mockTestCommand,
+} from './utils';
+
+jest.mock('../../build/android/version');
+jest.mock('../../build/ios/version');
+jest.mock('../../project/applicationIdentifier');
+jest.mock('../../graphql/queries/AppVersionQuery');
+jest.mock('../../graphql/queries/AppQuery');
+jest.mock('../../graphql/mutations/AppVersionMutation');
+jest.mock('../../project/workflow');
+jest.mock('../../project/android/gradleUtils');
+jest.mock('../../project/ios/target');
+jest.mock('../../project/ios/scheme');
+jest.mock('fs');
+jest.mock('../../log');
+jest.mock('../../prompts');
+jest.mock('../../utils/json');
+
+function withRemoteVersionSource(easJson: EasJson): EasJson {
+  return {
+    ...easJson,
+    cli: {
+      ...easJson.cli,
+      appVersionSource: AppVersionSource.REMOTE,
+    },
+  };
+}
+
+describe(BuildVersionSyncView, () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('syncing version for managed project on platform android', async () => {
+    const ctx = mockCommandContext(BuildVersionSyncView, {
+      easJson: withRemoteVersionSource(getMockEasJson()),
+    });
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
+      buildVersion: '1000',
+      storeVersion: '0.0.1',
+    }));
+    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
+      version: '1000',
+    }));
+    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.MANAGED);
+
+    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
+    const syncAndroidAsync = jest.spyOn(cmd, 'syncAndroidAsync' as any);
+
+    await cmd.run();
+    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      'ANDROID',
+      'eas.test.com'
+    );
+    expect(syncAndroidAsync).not.toHaveBeenCalled();
+  });
+
+  test('syncing version for bare project on platform android', async () => {
+    const ctx = mockCommandContext(BuildVersionSyncView, {
+      easJson: withRemoteVersionSource(getMockEasJson()),
+    });
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
+      buildVersion: '1000',
+      storeVersion: '0.0.1',
+    }));
+    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
+      version: '1000',
+    }));
+    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.GENERIC);
+    jest.mocked(getAppBuildGradleAsync).mockImplementation(async () => ({
+      android: {},
+    }));
+
+    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
+    const syncAndroidAsync = jest.spyOn(cmd, 'syncAndroidAsync' as any);
+
+    await cmd.run();
+    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      'ANDROID',
+      'eas.test.com'
+    );
+    expect(syncAndroidAsync).toHaveBeenCalled();
+    expect(updateAndroidNativeVersionsAsync).toHaveBeenCalledWith({
+      projectDir: ctx.projectDir,
+      versionCode: 1000,
+    });
+  });
+
+  test('syncing version for managed project on platform ios', async () => {
+    const ctx = mockCommandContext(BuildVersionSyncView, {
+      easJson: withRemoteVersionSource(getMockEasJson()),
+    });
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
+      buildVersion: '1000',
+      storeVersion: '0.0.1',
+    }));
+    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
+      version: '1000',
+    }));
+    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.MANAGED);
+
+    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=ios'], ctx);
+    const syncIosAsync = jest.spyOn(cmd, 'syncIosAsync' as any);
+
+    await cmd.run();
+    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      'IOS',
+      'eas.test.com'
+    );
+    expect(syncIosAsync).not.toHaveBeenCalled();
+  });
+
+  test('syncing version for bare project on platform ios', async () => {
+    const ctx = mockCommandContext(BuildVersionSyncView, {
+      easJson: withRemoteVersionSource(getMockEasJson()),
+    });
+    const fakeTarget: Target = {
+      targetName: 'testapp',
+      bundleIdentifier: 'eas.test.com',
+      entitlements: {},
+    };
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
+      buildVersion: '1000',
+      storeVersion: '0.0.1',
+    }));
+    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
+      version: '1000',
+    }));
+    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.GENERIC);
+    jest.mocked(resolveTargetsAsync).mockImplementation(async () => [fakeTarget]);
+
+    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=ios'], ctx);
+    const syncIosAsync = jest.spyOn(cmd, 'syncIosAsync' as any);
+
+    await cmd.run();
+    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      'IOS',
+      'eas.test.com'
+    );
+    expect(syncIosAsync).toHaveBeenCalled();
+    expect(updateIosNativeVersionsAsync).toHaveBeenCalledWith({
+      buildNumber: '1000',
+      projectDir: ctx.projectDir,
+      targets: [fakeTarget],
+    });
+  });
+
+  test('syncing version aborts when appVersionSource is set to local and users refuse auto configuration', async () => {
+    const ctx = mockCommandContext(BuildVersionSyncView, {});
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    jest.mocked(prompts.confirmAsync).mockImplementation(async () => false);
+
+    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
+    await expect(cmd.run()).rejects.toThrowError('Aborting...');
+    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
+  });
+
+  test('syncing version when appVersionSource is set to local and user allows auto configuration', async () => {
+    const ctx = mockCommandContext(BuildVersionSyncView, {});
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    jest.mocked(prompts.confirmAsync).mockImplementation(async () => true);
+
+    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
+    await cmd.run();
+
+    const easJsonAfterCmd = await fs.readJson(path.join(ctx.projectDir, 'eas.json'));
+    expect(easJsonAfterCmd.cli.appVersionSource).toBe('remote');
+  });
+});
@@ -0,0 +1,149 @@
+import { ExpoConfig } from '@expo/config-types';
+import { EasJson } from '@expo/eas-json';
+import { Command, Config } from '@oclif/core';
+import { vol } from 'memfs';
+import path from 'path';
+import { v4 as uuidv4 } from 'uuid';
+
+import { ContextInput, ContextOutput } from '../../commandUtils/EasCommand';
+import { DynamicConfigContextFn } from '../../commandUtils/context/DynamicProjectConfigContextField';
+import { AppFragment, Role } from '../../graphql/generated';
+
+export function getMockEasJson(): EasJson {
+  return {
+    cli: {},
+    build: {
+      production: {},
+    },
+  };
+}
+
+export const mockProjectId = 'fake-project-id';
+
+export function getMockAppFragment(): AppFragment {
+  return {
+    id: mockProjectId,
+    slug: 'testapp',
+    fullName: '@testuser/testpp',
+    ownerAccount: {
+      id: 'test-account-id',
+      name: 'testuser',
+      users: [
+        {
+          role: Role.Owner,
+          actor: {
+            id: 'test-user-id',
+          },
+        },
+      ],
+    },
+  };
+}
+
+export function getMockExpoConfig(): ExpoConfig {
+  return {
+    name: 'testapp',
+    slug: 'tetsapp',
+    extra: {
+      projectId: mockProjectId,
+    },
+  };
+}
+
+export interface LocalProjectContext {
+  projectDir: string;
+  exp?: ExpoConfig;
+  appId?: string;
+}
+
+export function mockCommandContext<
+  C extends {
+    [name: string]: any;
+  } = object
+>(
+  commandClass: { contextDefinition: ContextInput<C> },
+  overrides: {
+    easJson?: EasJson;
+    exp?: ExpoConfig;
+    projectId?: string;
+    getDynamicPrivateProjectConfigAsync?: DynamicConfigContextFn;
+    getDynamicPublicProjectConfigAsync?: DynamicConfigContextFn;
+  }
+): ContextOutput<C> {
+  const projectDir = path.join('/test', uuidv4());
+  vol.reset();
+  vol.fromJSON({ 'eas.json': JSON.stringify(overrides.easJson ?? getMockEasJson()) }, projectDir);
+  const contextDefinition = commandClass.contextDefinition;
+
+  const result: any = {};
+  for (const [contextKey] of Object.entries(contextDefinition)) {
+    if (contextKey === 'loggedIn') {
+      result.loggedIn = {};
+    }
+
+    if (contextKey === 'projectDir') {
+      result.projectDir = projectDir;
+    }
+    if (contextKey === 'maybeLoggedIn') {
+      result.maybeLoggedIn = {};
+    }
+    if (contextKey === 'sessionManager') {
+      result.sessionManager = {};
+    }
+    if (contextKey === 'projectConfig') {
+      result.projectConfig = {
+        exp: overrides.exp ?? getMockExpoConfig(),
+        projectId: overrides.projectId ?? mockProjectId,
+        projectDir,
+      };
+    }
+    if (contextKey === 'getDynamicPrivateProjectConfigAsync') {
+      result.getDynamicPrivateProjectConfigAsync = () => ({
+        exp: overrides.exp ?? getMockExpoConfig(),
+        projectId: overrides.projectId ?? mockProjectId,
+        projectDir,
+      });
+    }
+
+    if (contextKey === 'getDynamicPublicProjectConfigAsync') {
+      result.getDynamicPublicProjectConfigAsync = () => ({
+        exp: overrides.exp ?? getMockExpoConfig(),
+        projectId: overrides.projectId ?? mockProjectId,
+        projectDir,
+      });
+    }
+  }
+  return result;
+}
+
+export function mockTestCommand<T extends Command>(
+  commandConstructor: new (argv: string[], config: Config) => T,
+  argv: string[],
+  ctx: any
+): T {
+  const cmd = new commandConstructor(argv, new Config({ root: __dirname }));
+  (cmd as any).getContextAsync = jest.fn(() => ctx);
+  return cmd;
+}
+
+export class NoErrorThrownError extends Error {}
+
+export const getErrorAsync = async <TError = any>(
+  call: () => unknown
+): Promise<TError | NoErrorThrownError> => {
+  try {
+    await call();
+    throw new NoErrorThrownError();
+  } catch (error: unknown) {
+    return error as TError;
+  }
+};
+
+export const getError = <TError = any>(call: () => unknown): TError | NoErrorThrownError => {
+  try {
+    call();
+    throw new NoErrorThrownError();
+  } catch (error: unknown) {
+    return error as TError;
+  }
+};
@@ -1,7 +1,9 @@
 import { Platform } from '@expo/eas-build-job';
 import { CombinedError } from '@urql/core';
 import { GraphQLError } from 'graphql/error';
+import { v4 as uuidv4 } from 'uuid';

+import { getError } from '../../__tests__/commands/utils';
 import { EasCommandError } from '../../commandUtils/errors';
 import Build from '../../commands/build';
 import Log, { link } from '../../log';
@@ -11,6 +13,9 @@ import {
  EasBuildFreeTierDisabledAndroidError,
  EasBuildFreeTierDisabledError,
  EasBuildFreeTierDisabledIOSError,
+  EasBuildFreeTierIosLimitExceededError,
+  EasBuildFreeTierLimitExceededError,
+  EasBuildResourceClassNotAvailableInFreeTierError,
  EasBuildTooManyPendingBuildsError,
  RequestValidationError,
  TurtleDeprecatedJobFormatError,
@@ -22,12 +27,18 @@ beforeEach(() => {

 const EXPECTED_STRINGIFIED_GRAPHQL_ERROR_JSON = `[
  {
+    "name": "GraphQLError",
+    "extensions": {},
    "message": "Error 1"
  },
  {
+    "name": "GraphQLError",
+    "extensions": {},
    "message": "Error 2"
  },
  {
+    "name": "GraphQLError",
+    "extensions": {},
    "message": "Error 3"
  }
 ]`;
@@ -42,9 +53,11 @@ const EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS = `You have already reached the maxim
 const EXPECTED_GENERIC_MESSAGE =
  'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.';

+const mockRequestId = uuidv4();
 const getGraphQLError = (message: string, errorCode: string): GraphQLError => {
  return new GraphQLError(message, null, null, null, null, null, {
    errorCode,
+    requestId: mockRequestId,
  });
 };

@@ -114,64 +127,135 @@ describe(Build.name, () => {
    });

    describe('error is server-side defined error', () => {
-      describe('throws correct EasCommandError subclass', () => {
-        describe('for TURTLE_DEPRECATED_JOB_FORMAT', () => {
-          it('does it with Android', async () => {
+      describe('for TURTLE_DEPRECATED_JOB_FORMAT', () => {
+        describe('with Android', () => {
+          it('throws correct EasCommandError subclass', async () => {
            const platform = Platform.ANDROID;
            const graphQLError = getGraphQLError('Error 1', 'TURTLE_DEPRECATED_JOB_FORMAT');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            try {
-              handleBuildRequestError(error, platform);
-            } catch (caughtError) {
-              assertReThrownError(caughtError as Error, TurtleDeprecatedJobFormatError);
-            }
+            const handleBuildRequestErrorThrownError = getError<TurtleDeprecatedJobFormatError>(
+              () => {
+                handleBuildRequestError(error, platform);
+              }
+            );
+
+            assertReThrownError(
+              handleBuildRequestErrorThrownError,
+              TurtleDeprecatedJobFormatError,
+              'Error 1'
+            );
          });

-          it('does it with iOS', async () => {
+          it('throws correct EasBuildResourceClassNotAvailableInFreeTierError', async () => {
+            const platform = Platform.ANDROID;
+            const graphQLError = getGraphQLError(
+              'Error 1',
+              'EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER'
+            );
+            const graphQLErrors = [graphQLError];
+            const error = new CombinedError({ graphQLErrors });
+
+            const handleBuildRequestErrorThrownError =
+              getError<EasBuildResourceClassNotAvailableInFreeTierError>(() => {
+                handleBuildRequestError(error, platform);
+              });
+
+            assertReThrownError(
+              handleBuildRequestErrorThrownError,
+              EasBuildResourceClassNotAvailableInFreeTierError,
+              'Error 1'
+            );
+          });
+        });
+        describe('with iOS', () => {
+          it('throws correct EasCommandError subclass', async () => {
            const platform = Platform.IOS;
            const graphQLError = getGraphQLError('Error 1', 'TURTLE_DEPRECATED_JOB_FORMAT');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            try {
-              handleBuildRequestError(error, platform);
-            } catch (caughtError) {
-              assertReThrownError(caughtError as Error, TurtleDeprecatedJobFormatError);
-            }
+            const handleBuildRequestErrorThrownError = getError<TurtleDeprecatedJobFormatError>(
+              () => {
+                handleBuildRequestError(error, platform);
+              }
+            );
+
+            assertReThrownError(
+              handleBuildRequestErrorThrownError,
+              TurtleDeprecatedJobFormatError,
+              'Error 1'
+            );
+          });
+
+          it('throws correct EasBuildResourceClassNotAvailableInFreeTierError', async () => {
+            const platform = Platform.IOS;
+            const graphQLError = getGraphQLError(
+              'Error 1',
+              'EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER'
+            );
+            const graphQLErrors = [graphQLError];
+            const error = new CombinedError({ graphQLErrors });
+
+            const handleBuildRequestErrorThrownError =
+              getError<EasBuildResourceClassNotAvailableInFreeTierError>(() => {
+                handleBuildRequestError(error, platform);
+              });
+
+            assertReThrownError(
+              handleBuildRequestErrorThrownError,
+              EasBuildResourceClassNotAvailableInFreeTierError,
+              'Error 1'
+            );
          });
        });
+      });

-        describe('for EAS_BUILD_FREE_TIER_DISABLED', () => {
-          it('does it with Android', async () => {
+      describe('for EAS_BUILD_FREE_TIER_DISABLED', () => {
+        describe('with Android', () => {
+          it('throws correct EasCommandError subclass', async () => {
            const platform = Platform.ANDROID;
            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            try {
-              handleBuildRequestError(error, platform);
-            } catch (caughtError) {
-              assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledError);
-            }
-          });
+            const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierDisabledError>(
+              () => {
+                handleBuildRequestError(error, platform);
+              }
+            );

-          it('does it with iOS', async () => {
+            assertReThrownError(
+              handleBuildRequestErrorThrownError,
+              EasBuildFreeTierDisabledError,
+              'Error 1'
+            );
+          });
+        });
+        describe('with iOS', () => {
+          it('throws correct EasCommandError subclass', async () => {
            const platform = Platform.IOS;
            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            try {
-              handleBuildRequestError(error, platform);
-            } catch (caughtError) {
-              assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledError);
-            }
+            const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierDisabledError>(
+              () => {
+                handleBuildRequestError(error, platform);
+              }
+            );
+
+            assertReThrownError(
+              handleBuildRequestErrorThrownError,
+              EasBuildFreeTierDisabledError,
+              'Error 1'
+            );
          });
        });
-
-        it('does it for EAS_BUILD_FREE_TIER_DISABLED_IOS', async () => {
+      });
+      describe('for EAS_BUILD_FREE_TIER_DISABLED_IOS', () => {
+        it('throws correct EasCommandError subclass', async () => {
          const platform = Platform.IOS;
          const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED_IOS');
          const graphQLErrors = [graphQLError];
@@ -180,181 +264,332 @@ describe(Build.name, () => {
          try {
            handleBuildRequestError(error, platform);
          } catch (caughtError) {
-            assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledIOSError);
+            assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledIOSError, 'Error 1');
          }
        });
-
-        it('does it for EAS_BUILD_FREE_TIER_DISABLED_ANDROID', async () => {
+      });
+      describe('for EAS_BUILD_FREE_TIER_DISABLED_ANDROID', () => {
+        it('throws correct EasCommandError subclass', async () => {
          const platform = Platform.ANDROID;
          const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED_ANDROID');
          const graphQLErrors = [graphQLError];
          const error = new CombinedError({ graphQLErrors });

-          try {
-            handleBuildRequestError(error, platform);
-          } catch (caughtError) {
-            assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledAndroidError);
-          }
-        });
+          const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierDisabledAndroidError>(
+            () => {
+              handleBuildRequestError(error, platform);
+            }
+          );

-        describe('for VALIDATION_ERROR', () => {
-          it('does it with Android', async () => {
+          assertReThrownError(
+            handleBuildRequestErrorThrownError,
+            EasBuildFreeTierDisabledAndroidError,
+            'Error 1'
+          );
+        });
+      });
+      describe('for EAS_BUILD_FREE_TIER_LIMIT_EXCEEDED', () => {
+        it('throws correct EasCommandError subclass', async () => {
+          const platform = Platform.ANDROID;
+          const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_LIMIT_EXCEEDED');
+          const graphQLErrors = [graphQLError];
+          const error = new CombinedError({ graphQLErrors });
+
+          const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierLimitExceededError>(
+            () => {
+              handleBuildRequestError(error, platform);
+            }
+          );
+
+          assertReThrownError(
+            handleBuildRequestErrorThrownError,
+            EasBuildFreeTierLimitExceededError,
+            'Error 1'
+          );
+        });
+      });
+      describe('for EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED', () => {
+        it('throws correct EasCommandError subclass', async () => {
+          const platform = Platform.ANDROID;
+          const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED');
+          const graphQLErrors = [graphQLError];
+          const error = new CombinedError({ graphQLErrors });
+
+          const handleBuildRequestErrorThrownError =
+            getError<EasBuildFreeTierIosLimitExceededError>(() => {
+              handleBuildRequestError(error, platform);
+            });
+
+          assertReThrownError(
+            handleBuildRequestErrorThrownError,
+            EasBuildFreeTierIosLimitExceededError,
+            'Error 1'
+          );
+        });
+      });
+
+      describe('for VALIDATION_ERROR', () => {
+        describe('with Android', () => {
+          it('throws correct EasCommandError subclass', async () => {
            const platform = Platform.ANDROID;
            const graphQLError = getGraphQLError('Error 1', 'VALIDATION_ERROR');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            try {
+            const handleBuildRequestErrorThrownError = getError<RequestValidationError>(() => {
              handleBuildRequestError(error, platform);
-            } catch (caughtError) {
-              assertReThrownError(caughtError as Error, RequestValidationError);
-            }
-          });
+            });

-          it('does it with iOS', async () => {
+            assertReThrownError(
+              handleBuildRequestErrorThrownError,
+              RequestValidationError,
+              'Error 1'
+            );
+          });
+        });
+        describe('with iOS', () => {
+          it('throws correct EasCommandError subclass', async () => {
            const platform = Platform.IOS;
            const graphQLError = getGraphQLError('Error 1', 'VALIDATION_ERROR');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            try {
+            const handleBuildRequestErrorThrownError = getError<RequestValidationError>(() => {
              handleBuildRequestError(error, platform);
-            } catch (caughtError) {
-              assertReThrownError(caughtError as Error, RequestValidationError);
-            }
+            });
+
+            assertReThrownError(
+              handleBuildRequestErrorThrownError,
+              RequestValidationError,
+              'Error 1'
+            );
          });
        });
      });
    });

    describe('error is other expected graphQL-related error', () => {
-      describe('throws correct EasCommandError subclass', () => {
-        describe('for EAS_BUILD_DOWN_FOR_MAINTENANCE', () => {
-          it('does it with Android', async () => {
+      describe('for EAS_BUILD_DOWN_FOR_MAINTENANCE', () => {
+        describe('with Android', () => {
+          it('throws correct EasCommandError subclass', async () => {
            const platform = Platform.ANDROID;
            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_DOWN_FOR_MAINTENANCE');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            try {
-              handleBuildRequestError(error, platform);
-            } catch (caughtError) {
-              assertReThrownError(
-                caughtError as Error,
-                EasBuildDownForMaintenanceError,
-                EXPECTED_EAS_BUILD_DOWN_MESSAGE
-              );
-            }
-          });
+            const handleBuildRequestErrorThrownError = getError<EasBuildDownForMaintenanceError>(
+              () => {
+                handleBuildRequestError(error, platform);
+              }
+            );

-          it('does it with iOS', async () => {
-            const platform = Platform.IOS;
-            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_DOWN_FOR_MAINTENANCE');
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            try {
-              handleBuildRequestError(error, platform);
-            } catch (caughtError) {
-              assertReThrownError(
-                caughtError as Error,
-                EasBuildDownForMaintenanceError,
-                EXPECTED_EAS_BUILD_DOWN_MESSAGE
-              );
-            }
+            assertReThrownError(
+              handleBuildRequestErrorThrownError,
+              EasBuildDownForMaintenanceError,
+              EXPECTED_EAS_BUILD_DOWN_MESSAGE
+            );
          });
        });
+        describe('with iOS', () => {
+          it('throws correct EasCommandError subclass', async () => {
+            const platform = Platform.IOS;
+            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_DOWN_FOR_MAINTENANCE');
+            const graphQLErrors = [graphQLError];
+            const error = new CombinedError({ graphQLErrors });

-        describe('for EAS_BUILD_TOO_MANY_PENDING_BUILDS', () => {
-          it('does it with Android', async () => {
+            const handleBuildRequestErrorThrownError = getError<EasBuildDownForMaintenanceError>(
+              () => {
+                handleBuildRequestError(error, platform);
+              }
+            );
+
+            assertReThrownError(
+              handleBuildRequestErrorThrownError,
+              EasBuildDownForMaintenanceError,
+              EXPECTED_EAS_BUILD_DOWN_MESSAGE
+            );
+          });
+        });
+      });
+
+      describe('for EAS_BUILD_TOO_MANY_PENDING_BUILDS', () => {
+        describe('with Android', () => {
+          it('throws correct EasCommandError subclass', async () => {
            const platform = Platform.ANDROID;
            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_TOO_MANY_PENDING_BUILDS');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            try {
-              handleBuildRequestError(error, platform);
-            } catch (caughtError) {
-              assertReThrownError(
-                caughtError as Error,
-                EasBuildTooManyPendingBuildsError,
-                EXPECTED_MAX_BUILD_COUNT_MESSAGE_ANDROID
-              );
-            }
-          });
+            const handleBuildRequestErrorThrownError = getError<EasBuildTooManyPendingBuildsError>(
+              () => {
+                handleBuildRequestError(error, platform);
+              }
+            );

-          it('does it with iOS', async () => {
+            assertReThrownError(
+              handleBuildRequestErrorThrownError,
+              EasBuildTooManyPendingBuildsError,
+              EXPECTED_MAX_BUILD_COUNT_MESSAGE_ANDROID
+            );
+          });
+        });
+        describe('with iOS', () => {
+          it('throws correct EasCommandError subclass', async () => {
            const platform = Platform.IOS;
            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_TOO_MANY_PENDING_BUILDS');
            const graphQLErrors = [graphQLError];
            const error = new CombinedError({ graphQLErrors });

-            try {
-              handleBuildRequestError(error, platform);
-            } catch (caughtError) {
-              assertReThrownError(
-                caughtError as Error,
-                EasBuildTooManyPendingBuildsError,
-                EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS
-              );
-            }
+            const handleBuildRequestErrorThrownError = getError<EasBuildTooManyPendingBuildsError>(
+              () => {
+                handleBuildRequestError(error, platform);
+              }
+            );
+
+            assertReThrownError(
+              handleBuildRequestErrorThrownError,
+              EasBuildTooManyPendingBuildsError,
+              EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS
+            );
          });
        });
      });
    });

    describe('error is unexpected graphQL-related error', () => {
-      describe('throws base Error class with custom message', () => {
-        it('does it with Android', async () => {
+      describe('with Android', () => {
+        it('throws base Error class with custom message', async () => {
          const platform = Platform.ANDROID;
          const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
          const graphQLErrors = [graphQLError];
          const error = new CombinedError({ graphQLErrors });
+          const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nRequest ID: ${mockRequestId}\nError message: Error 1`;

-          try {
+          const handleBuildRequestErrorThrownError = getError<Error>(() => {
            handleBuildRequestError(error, platform);
-          } catch (caughtError) {
-            assertReThrownError(caughtError as Error, Error, EXPECTED_GENERIC_MESSAGE);
-          }
-        });
+          });

-        it('does it with iOS', async () => {
+          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+        });
+        it('throws base Error class with message including all error messages if combined error has multiple GraphQL errors', async () => {
+          const platform = Platform.ANDROID;
+          const graphQLErrors = [
+            getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR'),
+            getGraphQLError('Error 2', 'OTHER_GRAPHQL_ERROR'),
+            getGraphQLError('Error 3', 'YET_ANOTHER_GRAPHQL_ERROR'),
+          ];
+          const error = new CombinedError({ graphQLErrors });
+          const expectedMessage =
+            `${EXPECTED_GENERIC_MESSAGE}\n` +
+            `Request ID: ${mockRequestId}\n` +
+            'Error message: Error 1\n' +
+            `Request ID: ${mockRequestId}\n` +
+            'Error message: Error 2\n' +
+            `Request ID: ${mockRequestId}\n` +
+            'Error message: Error 3';
+
+          const handleBuildRequestErrorThrownError = getError<Error>(() => {
+            handleBuildRequestError(error, platform);
+          });
+
+          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+        });
+        describe('without request ID', () => {
+          it('throws base Error class with custom message without request ID line', async () => {
+            const platform = Platform.ANDROID;
+            const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
+            delete graphQLError.extensions.requestId;
+            const graphQLErrors = [graphQLError];
+            const error = new CombinedError({ graphQLErrors });
+            const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nError message: Error 1`;
+
+            const handleBuildRequestErrorThrownError = getError<Error>(() => {
+              handleBuildRequestError(error, platform);
+            });
+
+            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+          });
+        });
+      });
+      describe('with iOS', () => {
+        it('throws base Error class with custom message', async () => {
          const platform = Platform.IOS;
          const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
          const graphQLErrors = [graphQLError];
          const error = new CombinedError({ graphQLErrors });
+          const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nRequest ID: ${mockRequestId}\nError message: Error 1`;

-          try {
+          const handleBuildRequestErrorThrownError = getError<Error>(() => {
            handleBuildRequestError(error, platform);
-          } catch (caughtError) {
-            assertReThrownError(caughtError as Error, Error, EXPECTED_GENERIC_MESSAGE);
-          }
+          });
+
+          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+        });
+        it('throws base Error class with message including all error messages if combined error has multiple GraphQL errors', async () => {
+          const platform = Platform.IOS;
+          const graphQLErrors = [
+            getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR'),
+            getGraphQLError('Error 2', 'OTHER_GRAPHQL_ERROR'),
+            getGraphQLError('Error 3', 'YET_ANOTHER_GRAPHQL_ERROR'),
+          ];
+          const error = new CombinedError({ graphQLErrors });
+          const expectedMessage =
+            `${EXPECTED_GENERIC_MESSAGE}\n` +
+            `Request ID: ${mockRequestId}\n` +
+            'Error message: Error 1\n' +
+            `Request ID: ${mockRequestId}\n` +
+            'Error message: Error 2\n' +
+            `Request ID: ${mockRequestId}\n` +
+            'Error message: Error 3';
+
+          const handleBuildRequestErrorThrownError = getError<Error>(() => {
+            handleBuildRequestError(error, platform);
+          });
+
+          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+        });
+        describe('without request ID', () => {
+          it('throws base Error class with custom message without request ID line', async () => {
+            const platform = Platform.IOS;
+            const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
+            delete graphQLError.extensions.requestId;
+            const graphQLErrors = [graphQLError];
+            const error = new CombinedError({ graphQLErrors });
+            const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nError message: Error 1`;
+
+            const handleBuildRequestErrorThrownError = getError<Error>(() => {
+              handleBuildRequestError(error, platform);
+            });
+
+            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+          });
        });
      });
    });

    describe('error is unexpected non-graphQL-related error', () => {
-      describe('throws base Error class with propagated message', () => {
-        it('does it with Android', async () => {
+      describe('with Android', () => {
+        it('throws base Error class with propagated message', async () => {
          const platform = Platform.ANDROID;
          const error = new Error('Non-graphQL-related error');

-          try {
+          const handleBuildRequestErrorThrownError = getError<Error>(() => {
            handleBuildRequestError(error, platform);
-          } catch (caughtError) {
-            expect(caughtError).toStrictEqual(error);
-          }
-        });
+          });

-        it('does it with iOS', async () => {
+          expect(handleBuildRequestErrorThrownError).toStrictEqual(error);
+        });
+      });
+      describe('with iOS', () => {
+        it('throws base Error class with propagated message', async () => {
          const platform = Platform.IOS;
          const error = new Error('Non-graphQL-related error');

-          try {
+          const handleBuildRequestErrorThrownError = getError<Error>(() => {
            handleBuildRequestError(error, platform);
-          } catch (caughtError) {
-            expect(caughtError).toStrictEqual(error);
-          }
+          });
+
+          expect(handleBuildRequestErrorThrownError).toStrictEqual(error);
        });
      });
    });
@@ -24,7 +24,7 @@ interface JobData {

 const cacheDefaults = {
  disabled: false,
-  customPaths: [],
+  paths: [],
 };

 export async function prepareJobAsync(
@@ -4,6 +4,7 @@ import assert from 'assert';
 import chalk from 'chalk';
 import cliProgress from 'cli-progress';
 import fs from 'fs-extra';
+import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';

 import { BuildEvent } from '../analytics/AnalyticsManager';
@@ -42,6 +43,11 @@ import {
  EasBuildFreeTierDisabledAndroidError,
  EasBuildFreeTierDisabledError,
  EasBuildFreeTierDisabledIOSError,
+  EasBuildFreeTierIosLimitExceededError,
+  EasBuildFreeTierLimitExceededError,
+  EasBuildLegacyResourceClassNotAvailableError,
+  EasBuildProjectArchiveUploadError,
+  EasBuildResourceClassNotAvailableInFreeTierError,
  EasBuildTooManyPendingBuildsError,
  RequestValidationError,
  TurtleDeprecatedJobFormatError,
@@ -80,9 +86,14 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {

 export type BuildRequestSender = () => Promise<BuildFragment | undefined>;

-function resolveBuildParamsInput<T extends Platform>(ctx: BuildContext<T>): BuildParamsInput {
+function resolveBuildParamsInput<T extends Platform>(
+  ctx: BuildContext<T>,
+  metadata: Metadata
+): BuildParamsInput {
  return {
    resourceClass: ctx.resourceClass,
+    sdkVersion: metadata.sdkVersion,
+    reactNativeVersion: metadata.reactNativeVersion,
  };
 }

@@ -142,7 +153,7 @@ export async function prepareBuildRequestForPlatformAsync<
  assert(projectArchive);

  const metadata = await collectMetadataAsync(ctx);
-  const buildParams = resolveBuildParamsInput(ctx);
+  const buildParams = resolveBuildParamsInput(ctx, metadata);
  const job = await builder.prepareJobAsync(ctx, {
    projectArchive,
    credentials: credentialsResult?.credentials,
@@ -176,6 +187,11 @@ const SERVER_SIDE_DEFINED_ERRORS: Record<string, typeof EasCommandError> = {
  EAS_BUILD_FREE_TIER_DISABLED: EasBuildFreeTierDisabledError,
  EAS_BUILD_FREE_TIER_DISABLED_IOS: EasBuildFreeTierDisabledIOSError,
  EAS_BUILD_FREE_TIER_DISABLED_ANDROID: EasBuildFreeTierDisabledAndroidError,
+  EAS_BUILD_FREE_TIER_LIMIT_EXCEEDED: EasBuildFreeTierLimitExceededError,
+  EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED: EasBuildFreeTierIosLimitExceededError,
+  EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER:
+    EasBuildResourceClassNotAvailableInFreeTierError,
+  EAS_BUILD_LEGACY_RESOURCE_CLASS_NOT_AVAILABLE: EasBuildLegacyResourceClassNotAvailableError,
  VALIDATION_ERROR: RequestValidationError,
 };

@@ -197,8 +213,19 @@ export function handleBuildRequestError(error: any, platform: Platform): never {
      `You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
    );
  } else if (error?.graphQLErrors) {
+    const errorMessage = error.graphQLErrors
+      .map((graphQLError: GraphQLError) => {
+        const requestIdLine = graphQLError?.extensions?.requestId
+          ? `\nRequest ID: ${graphQLError.extensions.requestId}`
+          : '';
+        const errorMessageLine = graphQLError?.message
+          ? `\nError message: ${graphQLError.message}`
+          : '';
+        return `${requestIdLine}${errorMessageLine}`;
+      })
+      .join('');
    throw new 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, report the issue.${errorMessage}`
    );
  }
  throw error;
@@ -230,6 +257,10 @@ async function uploadProjectAsync<TPlatform extends Platform>(
          );
        }

+        if (projectTarball.size > 2 * 1024 * 1024 * 1024) {
+          throw new Error('Project archive is too big. Maximum allowed size is 2GB.');
+        }
+
        projectTarballPath = projectTarball.path;

        const bucketKey = await uploadFileAtPathToGCSAsync(
@@ -254,6 +285,12 @@ async function uploadProjectAsync<TPlatform extends Platform>(
        properties: ctx.analyticsEventProperties,
      }
    );
+  } catch (err: any) {
+    let errMessage = 'Failed to upload the project tarball to EAS Build';
+    if (err.message) {
+      errMessage += `\n\nReason: ${err.message}`;
+    }
+    throw new EasBuildProjectArchiveUploadError(errMessage);
  } finally {
    if (projectTarballPath) {
      await fs.remove(projectTarballPath);
@@ -483,6 +520,7 @@ async function handleSingleBuildProgressAsync(
      }
      break;
    }
+    case BuildStatus.PendingCancel:
    case BuildStatus.Canceled:
      spinner.fail('Build canceled');
      return { refetch: false };
@@ -513,6 +551,7 @@ const statusToDisplayName: Record<BuildStatus, string> = {
  [BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
  [BuildStatus.InQueue]: 'in queue',
  [BuildStatus.InProgress]: 'in progress',
+  [BuildStatus.PendingCancel]: 'canceled',
  [BuildStatus.Canceled]: 'canceled',
  [BuildStatus.Finished]: 'finished',
  [BuildStatus.Errored]: 'failed',
@@ -531,7 +570,12 @@ async function handleMultipleBuildsProgressAsync(
    builds.filter(build => build.status === BuildStatus.Finished).length === buildCount;
  const allSettled =
    builds.filter(build =>
-      [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(build.status)
+      [
+        BuildStatus.Finished,
+        BuildStatus.Errored,
+        BuildStatus.Canceled,
+        BuildStatus.PendingCancel,
+      ].includes(build.status)
    ).length === buildCount;

  if (allSettled) {
@@ -1,9 +1,9 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { EasJson, EasJsonAccessor, ResourceClass } from '@expo/eas-json';
+import { EasJson, EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';

-import Log from '../log';
+import Log, { learnMore } from '../log';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';
 import { getVcsClient } from '../vcs';
@@ -14,6 +14,10 @@ interface ConfigureParams {
  nonInteractive: boolean;
 }

+export async function easJsonExistsAsync(projectDir: string): Promise<boolean> {
+  return await fs.pathExists(EasJsonAccessor.formatEasJsonPath(projectDir));
+}
+
 /**
 * Creates eas.json if it does not exist.
 *
@@ -24,7 +28,7 @@ interface ConfigureParams {
 export async function ensureProjectConfiguredAsync(
  configureParams: ConfigureParams
 ): Promise<boolean> {
-  if (await fs.pathExists(EasJsonAccessor.formatEasJsonPath(configureParams.projectDir))) {
+  if (await easJsonExistsAsync(configureParams.projectDir)) {
    return false;
  }

@@ -53,21 +57,11 @@ const EAS_JSON_MANAGED_DEFAULT: EasJson = {
    development: {
      developmentClient: true,
      distribution: 'internal',
-      ios: {
-        resourceClass: ResourceClass.M_MEDIUM,
-      },
    },
    preview: {
      distribution: 'internal',
-      ios: {
-        resourceClass: ResourceClass.M_MEDIUM,
-      },
-    },
-    production: {
-      ios: {
-        resourceClass: ResourceClass.M_MEDIUM,
-      },
    },
+    production: {},
  },
  submit: {
    production: {},
@@ -86,20 +80,12 @@ const EAS_JSON_BARE_DEFAULT: EasJson = {
      },
      ios: {
        buildConfiguration: 'Debug',
-        resourceClass: ResourceClass.M_MEDIUM,
      },
    },
    preview: {
      distribution: 'internal',
-      ios: {
-        resourceClass: ResourceClass.M_MEDIUM,
-      },
-    },
-    production: {
-      ios: {
-        resourceClass: ResourceClass.M_MEDIUM,
-      },
    },
+    production: {},
  },
  submit: {
    production: {},
@@ -120,5 +106,9 @@ async function createEasJsonAsync(projectDir: string): Promise<void> {

  await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
  await getVcsClient().trackFileAsync(easJsonPath);
-  Log.withTick(`Generated ${chalk.bold('eas.json')}`);
+  Log.withTick(
+    `Generated ${chalk.bold('eas.json')}. ${learnMore(
+      'https://docs.expo.dev/build-reference/eas-json/'
+    )}`
+  );
 }
@@ -8,6 +8,7 @@ import { CredentialsContext } from '../credentials/context';
 import { Target } from '../credentials/ios/types';
 import { BuildResourceClass } from '../graphql/generated';
 import { GradleBuildContext } from '../project/android/gradle';
+import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
 import { LocalBuildOptions } from './local';
@@ -51,6 +52,7 @@ export interface BuildContext<T extends Platform> {
  graphqlClient: ExpoGraphqlClient;
  analytics: Analytics;
  workflow: Workflow;
+  customBuildConfigMetadata?: CustomBuildConfigMetadata;
  android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
  ios: T extends Platform.IOS ? IosBuildContext : undefined;
 }
@@ -9,6 +9,7 @@ import { Analytics, AnalyticsEventProperties, BuildEvent } from '../analytics/An
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
+import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { Actor } from '../user/User';
@@ -33,7 +34,8 @@ export async function createBuildContextAsync<T extends Platform>({
  actor,
  graphqlClient,
  analytics,
-  getDynamicProjectConfigAsync,
+  getDynamicPrivateProjectConfigAsync,
+  customBuildConfigMetadata,
 }: {
  buildProfileName: string;
  buildProfile: BuildProfile<T>;
@@ -49,9 +51,10 @@ export async function createBuildContextAsync<T extends Platform>({
  actor: Actor;
  graphqlClient: ExpoGraphqlClient;
  analytics: Analytics;
-  getDynamicProjectConfigAsync: DynamicConfigContextFn;
+  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
+  customBuildConfigMetadata?: CustomBuildConfigMetadata;
 }): Promise<BuildContext<T>> {
-  const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });
+  const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
  const projectName = exp.slug;
  const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
  const workflow = await resolveWorkflowAsync(projectDir, platform);
@@ -90,8 +93,6 @@ export async function createBuildContextAsync<T extends Platform>({
  const resourceClass = await resolveBuildResourceClassAsync(
    buildProfile,
    platform,
-    projectDir,
-    exp,
    resourceClassFlag
  );

@@ -118,6 +119,7 @@ export async function createBuildContextAsync<T extends Platform>({
    workflow,
    message,
    runFromCI,
+    customBuildConfigMetadata,
  };
  if (platform === Platform.ANDROID) {
    const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -8,8 +8,18 @@ export class EasBuildFreeTierDisabledIOSError extends EasCommandError {}

 export class EasBuildFreeTierDisabledAndroidError extends EasCommandError {}

+export class EasBuildFreeTierLimitExceededError extends EasCommandError {}
+
+export class EasBuildFreeTierIosLimitExceededError extends EasCommandError {}
+
+export class EasBuildResourceClassNotAvailableInFreeTierError extends EasCommandError {}
+
+export class EasBuildLegacyResourceClassNotAvailableError extends EasCommandError {}
+
 export class RequestValidationError extends EasCommandError {}

 export class EasBuildDownForMaintenanceError extends EasCommandError {}

 export class EasBuildTooManyPendingBuildsError extends EasCommandError {}
+
+export class EasBuildProjectArchiveUploadError extends EasCommandError {}
@@ -77,7 +77,7 @@ describe(bumpVersionAsync, () => {
    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
-      projectDir: '/repo',
+      projectDir: '/app',
      exp: fakeExp,
      targets: [
        {
@@ -88,9 +88,9 @@ describe(bumpVersionAsync, () => {
      ],
    });

-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
    const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info.plist'
+      '/app/ios/myproject/Info.plist'
    )) as IOSConfig.InfoPlist;
    expect(fakeExp.version).toBe('1.0.0');
    expect(fakeExp.ios?.buildNumber).toBe('2');
@@ -113,7 +113,7 @@ describe(bumpVersionAsync, () => {
    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
-      projectDir: '/repo',
+      projectDir: '/app',
      exp: fakeExp,
      targets: [
        {
@@ -124,9 +124,9 @@ describe(bumpVersionAsync, () => {
      ],
    });

-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
    const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info2.plist'
+      '/app/ios/myproject/Info2.plist'
    )) as IOSConfig.InfoPlist;
    expect(fakeExp.version).toBe('1.0.0');
    expect(fakeExp.ios?.buildNumber).toBe('2');
@@ -148,7 +148,7 @@ describe(bumpVersionAsync, () => {
    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.APP_VERSION,
-      projectDir: '/repo',
+      projectDir: '/app',
      exp: fakeExp,
      targets: [
        {
@@ -159,9 +159,9 @@ describe(bumpVersionAsync, () => {
      ],
    });

-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
    const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info.plist'
+      '/app/ios/myproject/Info.plist'
    )) as IOSConfig.InfoPlist;
    expect(fakeExp.version).toBe('1.0.1');
    expect(fakeExp.ios?.buildNumber).toBe('1');
@@ -183,7 +183,7 @@ describe(bumpVersionAsync, () => {
    );
    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.NOOP,
-      projectDir: '/repo',
+      projectDir: '/app',
      exp: fakeExp,
      targets: [
        {
@@ -194,9 +194,9 @@ describe(bumpVersionAsync, () => {
      ],
    });

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

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

-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
    expect(fakeExp.version).toBe('1.0.0');
    expect(fakeExp.ios?.buildNumber).toBe('2');
    expect(appJSON.expo.version).toBe('1.0.0');
@@ -230,11 +230,11 @@ describe(bumpVersionInAppJsonAsync, () => {

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

-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
    expect(fakeExp.version).toBe('1.0.1');
    expect(fakeExp.ios?.buildNumber).toBe('1');
    expect(appJSON.expo.version).toBe('1.0.1');
@@ -246,11 +246,11 @@ describe(bumpVersionInAppJsonAsync, () => {

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

-    const appJSON = await fs.readJSON('/repo/app.json');
+    const appJSON = await fs.readJSON('/app/app.json');
    expect(fakeExp.version).toBe('1.0.0');
    expect(fakeExp.ios?.buildNumber).toBe('1');
    expect(appJSON.expo.version).toBe('1.0.0');
@@ -262,7 +262,7 @@ describe(readBuildNumberAsync, () => {
  describe('bare project', () => {
    it('reads the build number from native code', async () => {
      const exp = initBareWorkflowProject();
-      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
+      const buildNumber = await readBuildNumberAsync('/app', exp, {});
      expect(buildNumber).toBe('1');
    });
  });
@@ -270,7 +270,7 @@ describe(readBuildNumberAsync, () => {
  describe('managed project', () => {
    it('reads the build number from expo config', async () => {
      const exp = initManagedProject();
-      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
+      const buildNumber = await readBuildNumberAsync('/app', exp, {});
      expect(buildNumber).toBe('1');
    });
  });
@@ -280,24 +280,38 @@ describe(readShortVersionAsync, () => {
  describe('bare project', () => {
    it('reads the short version from native code', async () => {
      const exp = initBareWorkflowProject();
-      const appVersion = await readShortVersionAsync('/repo', exp, {});
+      const appVersion = await readShortVersionAsync('/app', exp, {});
      expect(appVersion).toBe('1.0.0');
    });
    it('evaluates interpolated build number', async () => {
      const exp = initBareWorkflowProject({
        appVersion: '$(CURRENT_PROJECT_VERSION)',
      });
-      const buildNumber = await readShortVersionAsync('/repo', exp, {
+      const buildNumber = await readShortVersionAsync('/app', exp, {
        CURRENT_PROJECT_VERSION: '1.0.0',
      });
      expect(buildNumber).toBe('1.0.0');
    });
+
+    it('fails when build number is invalid', async () => {
+      const exp = initBareWorkflowProject({
+        appVersion: '$(CURRENT_PROJECT_VERSION)',
+      });
+
+      await expect(
+        readShortVersionAsync('/app', exp, {
+          CURRENT_PROJECT_VERSION: '0.0.7.1.028',
+        })
+      ).rejects.toThrowError(
+        'CFBundleShortVersionString (version field in app.json/app.config.js) must be a period-separated list of three non-negative integers. Current value: 0.0.7.1.028'
+      );
+    });
  });

  describe('managed project', () => {
    it('reads the version from app config', async () => {
      const exp = initBareWorkflowProject();
-      const appVersion = await readShortVersionAsync('/repo', exp, {});
+      const appVersion = await readShortVersionAsync('/app', exp, {});
      expect(appVersion).toBe('1.0.0');
    });
  });
@@ -309,66 +323,75 @@ describe(getInfoPlistPath, () => {
      {
        './ios/testapp/Info.plist': '',
      },
-      '/repo'
+      '/app'
    );
-    const plistPath = getInfoPlistPath('/repo', {});
-    expect(plistPath).toBe('/repo/ios/testapp/Info.plist');
+    const plistPath = getInfoPlistPath('/app', {});
+    expect(plistPath).toBe('/app/ios/testapp/Info.plist');
  });
  it('returns INFOPLIST_FILE if specified', () => {
    vol.fromJSON(
      {
        './ios/testapp/Info.plist': '',
      },
-      '/repo'
+      '/app'
    );
-    const plistPath = getInfoPlistPath('/repo', { INFOPLIST_FILE: './qwert/NotInfo.plist' });
-    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+    const plistPath = getInfoPlistPath('/app', { INFOPLIST_FILE: './qwert/NotInfo.plist' });
+    expect(plistPath).toBe('/app/ios/qwert/NotInfo.plist');
  });
  it('evaluates SRCROOT in Info.plist', () => {
    vol.fromJSON(
      {
        './ios/testapp/Info.plist': '',
      },
-      '/repo'
+      '/app'
    );
-    const plistPath = getInfoPlistPath('/repo', {
+    const plistPath = getInfoPlistPath('/app', {
      INFOPLIST_FILE: '$(SRCROOT)/qwert/NotInfo.plist',
    });
-    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+    expect(plistPath).toBe('/app/ios/qwert/NotInfo.plist');
  });
  it('evaluates BuildSettings in Info.plist', () => {
    vol.fromJSON(
      {
        './ios/testapp/Info.plist': '',
      },
-      '/repo'
+      '/app'
    );
-    const plistPath = getInfoPlistPath('/repo', {
+    const plistPath = getInfoPlistPath('/app', {
      INFOPLIST_FILE: '$(SRCROOT)/qwert/$(TARGET_NAME).plist',
      TARGET_NAME: 'NotInfo',
    });
-    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+    expect(plistPath).toBe('/app/ios/qwert/NotInfo.plist');
  });
 });

 function initBareWorkflowProject({
  appVersion = '1.0.0',
  buildNumber = '1',
+  expoConfig = {},
  infoPlistName = 'Info.plist',
-}: { appVersion?: string; buildNumber?: string; infoPlistName?: string } = {}): ExpoConfig {
+}: {
+  appVersion?: string;
+  buildNumber?: string;
+  infoPlistName?: string;
+  expoConfig?: { version?: string; ios?: object };
+} = {}): ExpoConfig {
  const fakeExp: ExpoConfig = {
    name: 'myproject',
    slug: 'myproject',
    version: '1.0.0',
    ios: {
      buildNumber: '1',
+      ...expoConfig.ios,
    },
+    ...expoConfig,
  };
  vol.fromJSON(
    {
      './app.json': JSON.stringify({
        expo: fakeExp,
      }),
+      './ios/myproject.xcodeproj/project.pbxproj': '',
      [`./ios/myproject/${infoPlistName}`]: `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -380,7 +403,7 @@ function initBareWorkflowProject({
 </dict>
 </plist>`,
    },
-    '/repo'
+    '/app'
  );

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

  return fakeExp;
@@ -27,7 +27,7 @@ interface JobData {

 const cacheDefaults = {
  disabled: false,
-  customPaths: [],
+  paths: [],
 };

 export async function prepareJobAsync(
@@ -22,6 +22,8 @@ import { readPlistAsync, writePlistAsync } from '../../utils/plist';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';

+const SHORT_VERSION_REGEX = /^\d+.\d+.\d+$/;
+
 export enum BumpStrategy {
  APP_VERSION,
  BUILD_NUMBER,
@@ -97,6 +99,14 @@ export async function bumpVersionInAppJsonAsync({
  }
 }

+function validateShortVersion(shortVersion: string | undefined): void {
+  if (shortVersion && !SHORT_VERSION_REGEX.test(shortVersion)) {
+    throw new Error(
+      `CFBundleShortVersionString (version field in app.json/app.config.js) must be a period-separated list of three non-negative integers. Current value: ${shortVersion}`
+    );
+  }
+}
+
 export async function readShortVersionAsync(
  projectDir: string,
  exp: ExpoConfig,
@@ -105,11 +115,15 @@ export async function readShortVersionAsync(
  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
  if (workflow === Workflow.GENERIC) {
    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
-    return (
+
+    const shortVersion =
      infoPlist.CFBundleShortVersionString &&
-      evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings)
-    );
+      evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings);
+
+    validateShortVersion(shortVersion);
+    return shortVersion;
  } else {
+    validateShortVersion(exp.version);
    return exp.version;
  }
 }
@@ -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.128';
+const PLUGIN_PACKAGE_VERSION = '1.0.27';

 export enum LocalBuildMode {
  /**
@@ -19,6 +19,7 @@ import { getVcsClient } from '../vcs';
 import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
 import { BuildContext } from './context';
 import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
+import { LocalBuildMode } from './local';

 export async function collectMetadataAsync<T extends Platform>(
  ctx: BuildContext<T>
@@ -47,7 +48,10 @@ export async function collectMetadataAsync<T extends Platform>(
    gitCommitMessage: truncateGitCommitMessage(
      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
    ),
-    isGitWorkingTreeDirty: await vcsClient.hasUncommittedChangesAsync(),
+    isGitWorkingTreeDirty:
+      ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL
+        ? false
+        : await vcsClient.hasUncommittedChangesAsync(),
    username: getUsername(ctx.exp, ctx.user),
    message: ctx.message,
    ...(ctx.platform === Platform.IOS && {
@@ -58,6 +62,7 @@ export async function collectMetadataAsync<T extends Platform>(
    runWithNoWaitFlag: ctx.noWait,
    runFromCI: ctx.runFromCI,
    buildMode: ctx.buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
+    customWorkflowName: ctx.customBuildConfigMetadata?.workflowName,
  };
  return sanitizeMetadata(metadata);
 }
@@ -132,6 +132,7 @@ function createBuildToPartialChoiceMaker(
        name: build.platform === AppPlatform.Ios ? 'Build number' : 'Version code',
        value: build.appBuildVersion ? chalk.bold(build.appBuildVersion) : null,
      },
+      { name: 'Profile', value: build.buildProfile ? chalk.bold(build.buildProfile) : null },
    ];

    const filteredDescriptionArray: string[] = descriptionItems
@@ -24,17 +24,25 @@ import {
 } from '../graphql/generated';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
 import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform';
-import Log from '../log';
+import Log, { learnMore } from '../log';
 import {
  RequestedPlatform,
  appPlatformDisplayNames,
  appPlatformEmojis,
  toPlatforms,
 } from '../platform';
-import { validateCustomBuildConfigAsync } from '../project/customBuildConfig';
+import {
+  CustomBuildConfigMetadata,
+  validateCustomBuildConfigAsync,
+} from '../project/customBuildConfig';
 import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
 import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
-import { validateAppVersionRuntimePolicySupportAsync } from '../project/projectUtils';
+import {
+  installExpoUpdatesAsync,
+  isExpoUpdatesInstalledAsDevDependency,
+  isExpoUpdatesInstalledOrAvailable,
+  validateAppVersionRuntimePolicySupportAsync,
+} from '../project/projectUtils';
 import {
  validateAppConfigForRemoteVersionSource,
  validateBuildProfileVersionSettings,
@@ -90,7 +98,7 @@ export async function runBuildAndSubmitAsync(
  projectDir: string,
  flags: BuildFlags,
  actor: Actor,
-  getDynamicProjectConfigAsync: DynamicConfigContextFn
+  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn
 ): Promise<void> {
  await getVcsClient().ensureRepoExistsAsync();
  await ensureRepoIsCleanAsync(flags.nonInteractive);
@@ -110,6 +118,13 @@ export async function runBuildAndSubmitAsync(
    platforms,
    profileName: flags.profile ?? undefined,
  });
+  Log.log(
+    `Loaded "env" configuration for the "${buildProfiles[0].profileName}" profile: ${
+      buildProfiles[0].profile.env
+        ? Object.keys(buildProfiles[0].profile.env).join(', ')
+        : 'no environment variables specified'
+    }. ${learnMore('https://docs.expo.dev/build-reference/variables/')}`
+  );

  await ensureExpoDevClientInstalledForDevClientBuildsAsync({
    projectDir,
@@ -117,9 +132,14 @@ export async function runBuildAndSubmitAsync(
    buildProfiles,
  });

+  const customBuildConfigMetadataByPlatform: { [p in AppPlatform]?: CustomBuildConfigMetadata } =
+    {};
  for (const buildProfile of buildProfiles) {
    validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
-    await validateCustomBuildConfigAsync(projectDir, buildProfile.profile);
+    const maybeMetadata = await validateCustomBuildConfigAsync(projectDir, buildProfile.profile);
+    if (maybeMetadata) {
+      customBuildConfigMetadataByPlatform[toAppPlatform(buildProfile.platform)] = maybeMetadata;
+    }
  }

  const startedBuilds: {
@@ -129,6 +149,7 @@ export async function runBuildAndSubmitAsync(
  const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};

  for (const buildProfile of buildProfiles) {
+    const platform = toAppPlatform(buildProfile.platform);
    const { build: maybeBuild, buildCtx } = await prepareAndStartBuildAsync({
      projectDir,
      flags,
@@ -138,12 +159,13 @@ export async function runBuildAndSubmitAsync(
      actor,
      graphqlClient,
      analytics,
-      getDynamicProjectConfigAsync,
+      getDynamicPrivateProjectConfigAsync,
+      customBuildConfigMetadata: customBuildConfigMetadataByPlatform[platform],
    });
    if (maybeBuild) {
      startedBuilds.push({ build: maybeBuild, buildProfile });
    }
-    buildCtxByPlatform[toAppPlatform(buildProfile.platform)] = buildCtx;
+    buildCtxByPlatform[platform] = buildCtx;
  }

  if (flags.localBuildOptions.localBuildMode) {
@@ -208,7 +230,9 @@ export async function runBuildAndSubmitAsync(
  }

  const haveAllBuildsFailedOrCanceled = builds.every(
-    build => build?.status && [BuildStatus.Errored, BuildStatus.Canceled].includes(build?.status)
+    build =>
+      build?.status &&
+      [BuildStatus.Errored, BuildStatus.Canceled, BuildStatus.PendingCancel].includes(build?.status)
  );

  await maybeDownloadAndRunSimulatorBuildsAsync(builds, flags);
@@ -245,7 +269,8 @@ async function prepareAndStartBuildAsync({
  actor,
  graphqlClient,
  analytics,
-  getDynamicProjectConfigAsync,
+  getDynamicPrivateProjectConfigAsync,
+  customBuildConfigMetadata,
 }: {
  projectDir: string;
  flags: BuildFlags;
@@ -255,7 +280,8 @@ async function prepareAndStartBuildAsync({
  actor: Actor;
  graphqlClient: ExpoGraphqlClient;
  analytics: Analytics;
-  getDynamicProjectConfigAsync: DynamicConfigContextFn;
+  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
+  customBuildConfigMetadata?: CustomBuildConfigMetadata;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
  const buildCtx = await createBuildContextAsync({
    buildProfileName: buildProfile.profileName,
@@ -272,7 +298,8 @@ async function prepareAndStartBuildAsync({
    actor,
    graphqlClient,
    analytics,
-    getDynamicProjectConfigAsync,
+    getDynamicPrivateProjectConfigAsync,
+    customBuildConfigMetadata,
  });

  if (moreBuilds) {
@@ -291,6 +318,14 @@ async function prepareAndStartBuildAsync({
    buildCtx.projectId,
    flags.nonInteractive
  );
+  if (buildProfile.profile.channel) {
+    await validateExpoUpdatesInstalledAsProjectDependencyAsync({
+      projectDir,
+      sdkVersion: buildCtx.exp.sdkVersion,
+      nonInteractive: flags.nonInteractive,
+      buildProfile,
+    });
+  }

  await validateAppVersionRuntimePolicySupportAsync(buildCtx.projectDir, buildCtx.exp);
  if (easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE) {
@@ -410,3 +445,40 @@ async function maybeDownloadAndRunSimulatorBuildsAsync(
    }
  }
 }
+
+async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
+  projectDir,
+  buildProfile,
+  nonInteractive,
+  sdkVersion,
+}: {
+  projectDir: string;
+  buildProfile: ProfileData<'build'>;
+  nonInteractive: boolean;
+  sdkVersion?: string;
+}): Promise<void> {
+  if (isExpoUpdatesInstalledOrAvailable(projectDir, sdkVersion)) {
+    return;
+  }
+
+  if (isExpoUpdatesInstalledAsDevDependency(projectDir)) {
+    Log.warn(
+      `The build profile "${buildProfile.profileName}" uses the channel "${buildProfile.profile.channel}", but you've added "expo-updates" as a dev dependency. To make channels work for your builds, move "expo-updates" from dev dependencies to the main dependencies in your project.`
+    );
+  } else if (nonInteractive) {
+    Log.warn(
+      `The build profile "${buildProfile.profileName}" has specified the channel "${buildProfile.profile.channel}", but the "expo-updates" package hasn't been installed. To use channels for your builds, install the "expo-updates" package by running "npx expo install expo-updates".`
+    );
+  } else {
+    Log.warn(
+      `The build profile "${buildProfile.profileName}" specifies the channel "${buildProfile.profile.channel}", but the "expo-updates" package is missing. To use channels in your builds, install the "expo-updates" package.`
+    );
+    const installExpoUpdates = await confirmAsync({
+      message: `Would you like to install the "expo-updates" package?`,
+    });
+    if (installExpoUpdates) {
+      await installExpoUpdatesAsync(projectDir, { silent: false });
+      Log.withTick('Installed expo-updates');
+    }
+  }
+}
@@ -2,6 +2,7 @@ export enum BuildStatus {
  NEW = 'new',
  IN_QUEUE = 'in-queue',
  IN_PROGRESS = 'in-progress',
+  PENDING_CANCEL = 'pending-cancel',
  ERRORED = 'errored',
  FINISHED = 'finished',
  CANCELED = 'canceled',
@@ -27,6 +27,7 @@ export function formatGraphQLBuild(build: BuildFragment): string {
            return chalk.blue('in queue');
          case GraphQLBuildStatus.InProgress:
            return chalk.blue('in progress');
+          case GraphQLBuildStatus.PendingCancel:
          case GraphQLBuildStatus.Canceled:
            return chalk.gray('canceled');
          case GraphQLBuildStatus.Finished:
@@ -90,6 +91,7 @@ export function formatGraphQLBuild(build: BuildFragment): string {
          case GraphQLBuildStatus.InQueue:
          case GraphQLBuildStatus.InProgress:
            return '<in progress>';
+          case GraphQLBuildStatus.PendingCancel:
          case GraphQLBuildStatus.Canceled:
          case GraphQLBuildStatus.Errored:
            return null;
@@ -80,7 +80,7 @@ function printBuildResult(build: BuildFragment): void {
    }
    return;
  }
-  if (build.status === BuildStatus.Canceled) {
+  if ([BuildStatus.Canceled, BuildStatus.PendingCancel].includes(build.status)) {
    Log.addNewLineIfNone();
    Log.error(
      `${appPlatformEmojis[build.platform]} ${
@@ -1,12 +1,9 @@
-import { ExpoConfig } from '@expo/config-types';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile, ResourceClass } from '@expo/eas-json';
 import chalk from 'chalk';
-import semver from 'semver';

 import { BuildResourceClass } from '../../graphql/generated';
-import Log from '../../log';
-import { getReactNativeVersionAsync } from '../metadata';
+import Log, { link } from '../../log';

 type AndroidResourceClass = Exclude<
  ResourceClass,
@@ -42,22 +39,20 @@ const androidResourceClassToBuildResourceClassMapping: Record<
 export async function resolveBuildResourceClassAsync<T extends Platform>(
  profile: BuildProfile<T>,
  platform: Platform,
-  projectDir: string,
-  exp: ExpoConfig,
  resourceClassFlag?: ResourceClass
 ): Promise<BuildResourceClass> {
  const profileResourceClass = profile.resourceClass;

  if (profileResourceClass && resourceClassFlag && resourceClassFlag !== profileResourceClass) {
    Log.warn(
-      `Build profile specifies the "${profileResourceClass}" resource class but you passed "${resourceClassFlag}" to --resource-class.\nUsing the  "${resourceClassFlag}" as the override.`
+      `Build profile specifies the "${profileResourceClass}" resource class but you passed "${resourceClassFlag}" to --resource-class.\nUsing "${resourceClassFlag}" as the override.`
    );
  }

  const selectedResourceClass = resourceClassFlag ?? profileResourceClass;

  return platform === Platform.IOS
-    ? await resolveIosResourceClassAsync(exp, projectDir, resourceClassFlag ?? profileResourceClass)
+    ? resolveIosResourceClass(resourceClassFlag, profileResourceClass)
    : resolveAndroidResourceClass(selectedResourceClass);
 }

@@ -79,13 +74,19 @@ function resolveAndroidResourceClass(selectedResourceClass?: ResourceClass): Bui
  return androidResourceClassToBuildResourceClassMapping[resourceClass as AndroidResourceClass];
 }

-async function resolveIosResourceClassAsync(
-  exp: ExpoConfig,
-  projectDir: string,
-  selectedResourceClass?: ResourceClass
-): Promise<BuildResourceClass> {
-  const resourceClass =
-    selectedResourceClass ?? (await resolveIosDefaultRequestedResourceClassAsync(exp, projectDir));
+function resolveIosResourceClass(
+  resourceClassFlag?: ResourceClass,
+  profileResourceClass?: ResourceClass
+): BuildResourceClass {
+  const resourceClass = resourceClassFlag ?? profileResourceClass ?? ResourceClass.DEFAULT;
+
+  if (resourceClassFlag === ResourceClass.LARGE) {
+    throw new Error(
+      `Experimental "large" resource class for Intel iOS workers is no longer available. Remove the specified resource class to use the default, or learn more about all available resource classes: ${link(
+        'https://docs.expo.dev/build-reference/eas-json/'
+      )}`
+    );
+  }

  if ([ResourceClass.M1_EXPERIMENTAL, ResourceClass.M1_MEDIUM].includes(resourceClass)) {
    Log.warn(
@@ -95,29 +96,13 @@ async function resolveIosResourceClassAsync(
    );
  }

-  if (resourceClass === ResourceClass.M1_LARGE) {
+  if ([ResourceClass.M_LARGE, ResourceClass.M1_LARGE].includes(resourceClass)) {
    Log.warn(
-      `Resource class ${chalk.bold('m1-large')} is deprecated. Use ${chalk.bold(
-        'm-large'
+      `Resource class ${chalk.bold(resourceClass)} is deprecated. Use ${chalk.bold(
+        'large'
      )} instead.`
    );
  }

  return iosResourceClassToBuildResourceClassMapping[resourceClass];
 }
-
-async function resolveIosDefaultRequestedResourceClassAsync(
-  exp: ExpoConfig,
-  projectDir: string
-): Promise<ResourceClass> {
-  const { sdkVersion } = exp;
-  const reactNativeVersion = await getReactNativeVersionAsync(projectDir);
-  if (
-    (sdkVersion && semver.satisfies(sdkVersion, '>=48')) ||
-    (reactNativeVersion && semver.satisfies(reactNativeVersion, '>=0.71.0'))
-  ) {
-    return ResourceClass.M_MEDIUM;
-  } else {
-    return ResourceClass.DEFAULT;
-  }
-}
@@ -0,0 +1,85 @@
+import assert from 'assert';
+
+// TODO(quin): move this into a common package with www
+export type BranchMappingOperator =
+  | '=='
+  | '!='
+  | '<'
+  | '>'
+  | '<='
+  | '>='
+  | 'in'
+  | 'regex'
+  | 'hash_lt'
+  | 'hash_lte'
+  | 'hash_gt'
+  | 'hash_gte';
+export type BranchMappingObject = {
+  clientKey: string;
+  branchMappingOperator: BranchMappingOperator;
+  operand: number | string | string[];
+};
+export type BranchMappingAlwaysTrue = 'true';
+export type BranchMappingStatement =
+  | ['and' | 'or', ...BranchMappingNode[]]
+  | ['not', BranchMappingNode];
+export type BranchMappingNode =
+  | BranchMappingAlwaysTrue
+  | BranchMappingObject
+  | BranchMappingStatement;
+export type BranchMapping = {
+  version: number;
+  data: {
+    branchId: string;
+    branchMappingLogic: BranchMappingNode;
+  }[];
+};
+
+export function getNodesFromStatement(statement: BranchMappingStatement): BranchMappingNode[] {
+  return statement.slice(1) as BranchMappingNode[];
+}
+
+export function isAndStatement(
+  statement: BranchMappingStatement
+): statement is BranchMappingStatement {
+  return statement[0] === 'and';
+}
+
+export function isStatement(node: BranchMappingNode): node is BranchMappingStatement {
+  return Array.isArray(node);
+}
+
+export function isNodeObject(node: BranchMappingNode): node is BranchMappingObject {
+  return typeof node === 'object' && !isStatement(node);
+}
+
+export function andStatement(nodes: BranchMappingNode[]): ['and', ...BranchMappingNode[]] {
+  return ['and', ...nodes];
+}
+
+export function isAlwaysTrue(node: BranchMappingNode): boolean {
+  return node === 'true';
+}
+
+export function alwaysTrue(): BranchMappingAlwaysTrue {
+  return 'true';
+}
+
+export function equalsOperator(): BranchMappingOperator {
+  return '==';
+}
+
+export function hashLtOperator(): BranchMappingOperator {
+  return 'hash_lt';
+}
+
+export function assertNodeObject(node: BranchMappingNode): asserts node is BranchMappingObject {
+  assert(
+    isNodeObject(node),
+    'Branch mapping node must be an object. Received: ' + JSON.stringify(node)
+  );
+}
+
+export function assertNumber(operand: string | number | string[]): asserts operand is number {
+  assert(typeof operand === 'number', 'Expected a number. Received: ' + JSON.stringify(operand));
+}
@@ -1,25 +1,14 @@
 import assert from 'assert';
 import chalk from 'chalk';

-import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
+import { UpdateBranchObject, UpdateChannelObject } from '../graphql/queries/ChannelQuery';
 import Log from '../log';
 import {
  FormattedBranchDescription,
  formatBranch,
  getUpdateGroupDescriptionsWithBranch,
 } from '../update/utils';
-
-export type BranchMapping = {
-  version: number;
-  data: {
-    branchId: string;
-    branchMappingLogic: {
-      operand: number;
-      clientKey: string;
-      branchMappingOperator: string;
-    } & string;
-  }[];
-};
+import { BranchMapping, assertNodeObject, assertNumber, isNodeObject } from './branch-mapping';

 /**
 * Get the branch mapping and determine whether it is a rollout.
@@ -46,8 +35,12 @@ export function getBranchMapping(branchMappingString?: string): {
  }

  const isRollout = branchMapping.data.length === 2;
-  const rolloutPercent = branchMapping.data[0]?.branchMappingLogic.operand;
-
+  const branchMappingNode = branchMapping.data[0]?.branchMappingLogic;
+  let rolloutPercent: number | undefined;
+  if (isNodeObject(branchMappingNode)) {
+    assertNumber(branchMappingNode.operand);
+    rolloutPercent = branchMappingNode.operand;
+  }
  switch (branchMapping.data.length) {
    case 0:
      break;
@@ -57,10 +50,11 @@ export function getBranchMapping(branchMappingString?: string): {
      }
      break;
    case 2:
-      if (branchMapping.data[0].branchMappingLogic.clientKey !== 'rolloutToken') {
+      assertNodeObject(branchMappingNode);
+      if (branchMappingNode.clientKey !== 'rolloutToken') {
        throw new Error('Client key of initial branch mapping must be "rolloutToken"');
      }
-      if (branchMapping.data[0].branchMappingLogic.branchMappingOperator !== 'hash_lt') {
+      if (branchMappingNode.branchMappingOperator !== 'hash_lt') {
        throw new Error('Branch mapping operator of initial branch mapping must be "hash_lt"');
      }
      if (rolloutPercent == null) {
@@ -115,3 +109,25 @@ export function logChannelDetails(channel: UpdateChannelObject): void {
    );
  }
 }
+
+function getUpdateBranchNullable(
+  channel: UpdateChannelObject,
+  branchId: string
+): UpdateBranchObject | null {
+  const updateBranches = channel.updateBranches;
+  const updateBranch = updateBranches.find(branch => branch.id === branchId);
+  return updateBranch ?? null;
+}
+
+export function getUpdateBranch(
+  channel: UpdateChannelObject,
+  branchId: string
+): UpdateBranchObject {
+  const updateBranch = getUpdateBranchNullable(channel, branchId);
+  if (!updateBranch) {
+    throw new Error(
+      `Could not find branch with id "${branchId}" in branch-mapping of channel "${channel.name}"`
+    );
+  }
+  return updateBranch;
+}
@@ -1,5 +1,6 @@
 import { Command } from '@oclif/core';
 import { CombinedError } from '@urql/core';
+import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';

 import {
@@ -11,16 +12,19 @@ import Log from '../log';
 import SessionManager from '../user/SessionManager';
 import AnalyticsContextField from './context/AnalyticsContextField';
 import ContextField from './context/ContextField';
-import { DynamicProjectConfigContextField } from './context/DynamicProjectConfigContextField';
+import {
+  DynamicPrivateProjectConfigContextField,
+  DynamicPublicProjectConfigContextField,
+} from './context/DynamicProjectConfigContextField';
 import LoggedInContextField from './context/LoggedInContextField';
 import MaybeLoggedInContextField from './context/MaybeLoggedInContextField';
-import { OptionalProjectConfigContextField } from './context/OptionalProjectConfigContextField';
-import ProjectConfigContextField from './context/ProjectConfigContextField';
+import { OptionalPrivateProjectConfigContextField } from './context/OptionalPrivateProjectConfigContextField';
+import { PrivateProjectConfigContextField } from './context/PrivateProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
 import { EasCommandError } from './errors';

-type ContextInput<
+export type ContextInput<
  T extends {
    [name: string]: any;
  } = object
@@ -28,7 +32,7 @@ type ContextInput<
  [P in keyof T]: ContextField<T[P]>;
 };

-type ContextOutput<
+export type ContextOutput<
  T extends {
    [name: string]: any;
  } = object
@@ -65,7 +69,7 @@ export default abstract class EasCommand extends Command {
     * run within a project directory, null otherwise.
     */
    OptionalProjectConfig: {
-      projectConfig: new OptionalProjectConfigContextField(),
+      privateProjectConfig: new OptionalPrivateProjectConfigContextField(),
    },
    /**
     * Require this command to be run in a project directory. Return the project directory in the context.
@@ -78,7 +82,9 @@ export default abstract class EasCommand extends Command {
     */
    DynamicProjectConfig: {
      // eslint-disable-next-line async-protect/async-suffix
-      getDynamicProjectConfigAsync: new DynamicProjectConfigContextField(),
+      getDynamicPublicProjectConfigAsync: new DynamicPublicProjectConfigContextField(),
+      // eslint-disable-next-line async-protect/async-suffix
+      getDynamicPrivateProjectConfigAsync: new DynamicPrivateProjectConfigContextField(),
    },
    /**
     * Require the project to be identified and registered on server. Returns the project config in the context.
@@ -87,7 +93,7 @@ export default abstract class EasCommand extends Command {
     */
    ProjectConfig: {
      loggedIn: new LoggedInContextField(),
-      projectConfig: new ProjectConfigContextField(),
+      privateProjectConfig: new PrivateProjectConfigContextField(),
    },
    /**
     * Analytics manager. Returns the analytics manager in the context for use by the command.
@@ -188,13 +194,30 @@ export default abstract class EasCommand extends Command {
    if (err instanceof EasCommandError) {
      Log.error(err.message);
    } else if (err instanceof CombinedError && err?.graphQLErrors) {
-      const cleanMessage = err.message.replace('[GraphQL] ', '');
+      const cleanMessage = err?.graphQLErrors
+        .map((graphQLError: GraphQLError) => {
+          const messageLine = graphQLError.message.replace('[GraphQL] ', '');
+          const requestIdLine = graphQLError.extensions?.requestId
+            ? `\nRequest ID: ${err.graphQLErrors[0].extensions.requestId}`
+            : '';
+
+          const defaultMsg = `${messageLine}${requestIdLine}`;
+
+          if (graphQLError.extensions?.errorCode === 'UNAUTHORIZED_ERROR') {
+            return `You don't have the required permissions to perform this operation.\n\n${defaultMsg}`;
+          }
+
+          return defaultMsg;
+        })
+        .join('\n');
      Log.error(cleanMessage);
      baseMessage = BASE_GRAPHQL_ERROR_MESSAGE;
    } else {
      Log.error(err.message);
    }
    Log.debug(err);
-    throw new Error(baseMessage);
+    const sanitizedError = new Error(baseMessage);
+    sanitizedError.stack = err.stack;
+    throw sanitizedError;
  }
 }
@@ -1,4 +1,6 @@
 import { CombinedError } from '@urql/core';
+import { GraphQLError } from 'graphql/error';
+import { v4 as uuidv4 } from 'uuid';

 import { AnalyticsWithOrchestration, createAnalyticsAsync } from '../../analytics/AnalyticsManager';
 import Log from '../../log';
@@ -17,6 +19,7 @@ jest.mock('../../analytics/AnalyticsManager', () => {
 jest.mock('../../log');

 let originalProcessArgv: string[];
+const mockRequestId = uuidv4();

 beforeAll(() => {
  originalProcessArgv = process.argv;
@@ -137,6 +140,76 @@ describe(EasCommand.name, () => {
        expect(logDebugSpy).toBeCalledWith(error);
      });

+      it('logs the cleaned message with request ID if present', async () => {
+        const TestEasCommand = createTestEasCommand();
+        const logErrorSpy = jest.spyOn(Log, 'error');
+        const logDebugSpy = jest.spyOn(Log, 'debug');
+        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
+        const graphQLError = new GraphQLError(
+          'Unexpected GraphQL error message',
+          null,
+          null,
+          null,
+          null,
+          null,
+          {
+            errorCode: 'UNKNOWN_GRAPHQL_ERROR',
+            requestId: mockRequestId,
+          }
+        );
+        const graphQLErrors = [graphQLError];
+        const error = new CombinedError({ graphQLErrors });
+        runAsyncMock.mockImplementation(() => {
+          throw error;
+        });
+        try {
+          await TestEasCommand.run();
+        } catch {}
+
+        expect(logErrorSpy).toBeCalledWith(
+          `Unexpected GraphQL error message\nRequest ID: ${mockRequestId}`
+        );
+        expect(logDebugSpy).toBeCalledWith(error);
+      });
+
+      it('logs the cleaned messages with request IDs if multiple GraphQL errors present', async () => {
+        const TestEasCommand = createTestEasCommand();
+        const logErrorSpy = jest.spyOn(Log, 'error');
+        const logDebugSpy = jest.spyOn(Log, 'debug');
+        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
+        const graphQLErrors = [
+          new GraphQLError('Unexpected GraphQL error message', null, null, null, null, null, {
+            errorCode: 'UNKNOWN_GRAPHQL_ERROR',
+            requestId: mockRequestId,
+          }),
+          new GraphQLError('Other GraphQL error message', null, null, null, null, null, {
+            errorCode: 'OTHER_GRAPHQL_ERROR',
+            requestId: mockRequestId,
+          }),
+          new GraphQLError('Yet another GraphQL error message', null, null, null, null, null, {
+            errorCode: 'YET_ANOTHER_GRAPHQL_ERROR',
+            requestId: mockRequestId,
+          }),
+        ];
+        const error = new CombinedError({ graphQLErrors });
+        runAsyncMock.mockImplementation(() => {
+          throw error;
+        });
+        try {
+          await TestEasCommand.run();
+        } catch {}
+
+        expect(logErrorSpy).toBeCalledWith(
+          'Unexpected GraphQL error message\n' +
+            `Request ID: ${mockRequestId}\n` +
+            'Other GraphQL error message\n' +
+            `Request ID: ${mockRequestId}\n` +
+            'Yet another GraphQL error message\n' +
+            `Request ID: ${mockRequestId}`
+        );
+        expect(logDebugSpy).toBeCalledWith(error);
+      });
+
      it('re-throws the error with default base message', async () => {
        const TestEasCommand = createTestEasCommand();
        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
@@ -151,7 +224,7 @@ describe(EasCommand.name, () => {
        }
      });

-      it('re-throws the error with a different default base message in case of graphQLError', async () => {
+      it('re-throws the error with a different default base message in case of CombinedError', async () => {
        const TestEasCommand = createTestEasCommand();
        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
        runAsyncMock.mockImplementation(() => {
@@ -165,6 +238,34 @@ describe(EasCommand.name, () => {
          expect((caughtError as Error).message).toEqual('GraphQL request failed.');
        }
      });
+
+      it('re-throws the error with a different default base message in case of CombinedError with multiple GraphQLErrors', async () => {
+        const TestEasCommand = createTestEasCommand();
+        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
+        runAsyncMock.mockImplementation(() => {
+          const graphQLErrors = [
+            new GraphQLError('Unexpected GraphQL error message', null, null, null, null, null, {
+              errorCode: 'UNEXPECTED_GRAPHQL_ERROR',
+              requestId: mockRequestId,
+            }),
+            new GraphQLError('Other GraphQL error message', null, null, null, null, null, {
+              errorCode: 'OTHER_GRAPHQL_ERROR',
+              requestId: mockRequestId,
+            }),
+            new GraphQLError('Yet another GraphQL error message', null, null, null, null, null, {
+              errorCode: 'YET_ANOTHER_GRAPHQL_ERROR',
+              requestId: mockRequestId,
+            }),
+          ];
+          throw new CombinedError({ graphQLErrors });
+        });
+        try {
+          await TestEasCommand.run();
+        } catch (caughtError) {
+          expect(caughtError).toBeInstanceOf(Error);
+          expect((caughtError as Error).message).toEqual('GraphQL request failed.');
+        }
+      });
    });
  });
 });
@@ -1,29 +1,55 @@
 import { ExpoConfig } from '@expo/config-types';

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

-export type DynamicConfigContextFn = (options: ExpoConfigOptions) => Promise<{
+export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
  projectId: string;
  exp: ExpoConfig;
  projectDir: string;
 }>;

-export class DynamicProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
+export class DynamicPublicProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
  async getValueAsync({
    nonInteractive,
    sessionManager,
  }: ContextOptions): Promise<DynamicConfigContextFn> {
    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
    return async (options?: ExpoConfigOptions) => {
-      const expBefore = getExpoConfig(projectDir, options);
+      const expBefore = getPublicExpoConfig(projectDir, options);
      const projectId = await getProjectIdAsync(sessionManager, expBefore, {
        nonInteractive,
        env: options?.env,
      });
-      const exp = getExpoConfig(projectDir, options);
+      const exp = getPublicExpoConfig(projectDir, options);
+      return {
+        exp,
+        projectDir,
+        projectId,
+      };
+    };
+  }
+}
+
+export class DynamicPrivateProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
+  async getValueAsync({
+    nonInteractive,
+    sessionManager,
+  }: ContextOptions): Promise<DynamicConfigContextFn> {
+    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
+    return async (options?: ExpoConfigOptions) => {
+      const expBefore = getPrivateExpoConfig(projectDir, options);
+      const projectId = await getProjectIdAsync(sessionManager, expBefore, {
+        nonInteractive,
+        env: options?.env,
+      });
+      const exp = getPrivateExpoConfig(projectDir, options);
      return {
        exp,
        projectDir,
@@ -1,12 +1,12 @@
 import { ExpoConfig } from '@expo/config-types';
 import { InvalidEasJsonError } from '@expo/eas-json/build/errors';

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

-export class OptionalProjectConfigContextField extends ContextField<
+export class OptionalPrivateProjectConfigContextField extends ContextField<
  | {
      projectId: string;
      exp: ExpoConfig;
@@ -35,11 +35,11 @@ export class OptionalProjectConfigContextField extends ContextField<
      return undefined;
    }

-    const expBefore = getExpoConfig(projectDir);
+    const expBefore = getPrivateExpoConfig(projectDir);
    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
      nonInteractive,
    });
-    const exp = getExpoConfig(projectDir);
+    const exp = getPrivateExpoConfig(projectDir);
    return {
      exp,
      projectDir,
@@ -1,11 +1,11 @@
 import { ExpoConfig } from '@expo/config-types';

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

-export default class ProjectConfigContextField extends ContextField<{
+export class PrivateProjectConfigContextField extends ContextField<{
  projectId: string;
  exp: ExpoConfig;
  projectDir: string;
@@ -16,11 +16,11 @@ export default class ProjectConfigContextField extends ContextField<{
    projectDir: string;
  }> {
    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    const expBefore = getExpoConfig(projectDir);
+    const expBefore = getPrivateExpoConfig(projectDir);
    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
      nonInteractive,
    });
-    const exp = getExpoConfig(projectDir);
+    const exp = getPrivateExpoConfig(projectDir);

    return {
      projectId,
@@ -1,4 +1,4 @@
-import { getConfig, modifyConfigAsync } from '@expo/config';
+import { getConfig, getConfigFilePaths, modifyConfigAsync } from '@expo/config';
 import { vol } from 'memfs';
 import { anything, instance, mock, when } from 'ts-mockito';

@@ -26,6 +26,10 @@ describe(getProjectIdAsync, () => {
  let sessionManager: SessionManager;

  beforeEach(() => {
+    jest
+      .mocked(getConfigFilePaths)
+      .mockReturnValue({ staticConfigPath: null, dynamicConfigPath: null });
+
    const sessionManagerMock = mock<SessionManager>();
    when(sessionManagerMock.ensureLoggedInAsync(anything())).thenResolve({
      actor: {
@@ -252,4 +256,26 @@ describe(getProjectIdAsync, () => {
      getProjectIdAsync(sessionManager, { name: 'test', slug: 'test' }, { nonInteractive: false })
    ).rejects.toThrow();
  });
+
+  it('throws if extra.eas.projectId is not a string', async () => {
+    jest.mocked(getConfig).mockReturnValue({
+      exp: { name: 'test', slug: 'test', extra: { eas: { projectId: 1234 } } },
+    } as any);
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+      id: '1234',
+      fullName: '@notnotbrent/test',
+      slug: 'test',
+      ownerAccount: { name: 'notnotbrent' } as any,
+    });
+
+    await expect(
+      getProjectIdAsync(
+        sessionManager,
+        { name: 'test', slug: 'wat', extra: { eas: { projectId: 1234 } } },
+        { nonInteractive: false }
+      )
+    ).rejects.toThrow(
+      `Project config: "extra.eas.projectId" must be a string, found number. If you're not sure how to set it up on your own, remove the property entirely and it will be automatically configured on the next EAS CLI run.`
+    );
+  });
 });
@@ -3,11 +3,10 @@ import {
  Client,
  OperationContext,
  OperationResult,
-  PromisifiedSource,
+  OperationResultSource,
  TypedDocumentNode,
  cacheExchange,
  createClient as createUrqlClient,
-  dedupExchange,
  fetchExchange,
 } from '@urql/core';
 import { retryExchange } from '@urql/exchange-retry';
@@ -22,7 +21,7 @@ export interface ExpoGraphqlClient extends Client {
    query: DocumentNode | TypedDocumentNode<Data, Variables> | string,
    variables: Variables,
    context: Partial<OperationContext> & { additionalTypenames: string[] }
-  ): PromisifiedSource<OperationResult<Data, Variables>>;
+  ): OperationResultSource<OperationResult<Data, Variables>>;
 }

 export function createGraphqlClient(authInfo: {
@@ -32,7 +31,6 @@ export function createGraphqlClient(authInfo: {
  return createUrqlClient({
    url: getExpoApiBaseUrl() + '/graphql',
    exchanges: [
-      dedupExchange,
      cacheExchange,
      retryExchange({
        maxDelayMs: 4000,
@@ -1,4 +1,4 @@
-import { getProjectConfigDescription, modifyConfigAsync } from '@expo/config';
+import { getProjectConfigDescription } from '@expo/config';
 import { ExpoConfig } from '@expo/config-types';
 import { Env } from '@expo/eas-build-job';
 import chalk from 'chalk';
@@ -6,7 +6,7 @@ import chalk from 'chalk';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import Log, { learnMore } from '../../../log';
 import { ora } from '../../../ora';
-import { getExpoConfig } from '../../../project/expoConfig';
+import { createOrModifyExpoConfigAsync, getPrivateExpoConfig } from '../../../project/expoConfig';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { toAppPrivacy } from '../../../project/projectUtils';
 import SessionManager from '../../../user/SessionManager';
@@ -24,8 +24,8 @@ export async function saveProjectIdToAppConfigAsync(
  projectId: string,
  options: { env?: Env } = {}
 ): Promise<void> {
-  const exp = getExpoConfig(projectDir, options);
-  const result = await modifyConfigAsync(
+  const exp = getPrivateExpoConfig(projectDir, options);
+  const result = await createOrModifyExpoConfigAsync(
    projectDir,
    {
      extra: { ...exp.extra, eas: { ...exp.extra?.eas, projectId } },
@@ -89,6 +89,12 @@ export async function getProjectIdAsync(

  const localProjectId = exp.extra?.eas?.projectId;
  if (localProjectId) {
+    if (typeof localProjectId !== 'string') {
+      throw new Error(
+        `Project config: "extra.eas.projectId" must be a string, found ${typeof localProjectId}. If you're not sure how to set it up on your own, remove the property entirely and it will be automatically configured on the next EAS CLI run.`
+      );
+    }
+
    // check that the local project ID matches account and slug
    const appForProjectId = await AppQuery.byIdAsync(graphqlClient, localProjectId);
    if (exp.owner && exp.owner !== appForProjectId.ownerAccount.name) {
@@ -154,12 +160,12 @@ export async function getProjectIdAsync(
    switch (user.__typename) {
      case 'User':
        return user.username;
+      case 'SSOUser':
+        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'
        );
-      case 'SSOUser':
-        throw new Error('SSO users are not supported yet.');
    }
  };

@@ -1,3 +1,5 @@
+import { Flags } from '@oclif/core';
+
 import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';

@@ -5,13 +7,27 @@ export default class AccountLogin extends EasCommand {
  static override description = 'log in with your Expo account';
  static override aliases = ['login'];

+  static override flags = {
+    // can pass either --sso or -s
+    sso: Flags.boolean({
+      description: 'Login with SSO',
+      char: 's',
+      default: false,
+      hidden: true,
+    }),
+  };
+
  static override contextDefinition = {
    ...this.ContextOptions.SessionManagment,
  };

  async runAsync(): Promise<void> {
+    const {
+      flags: { sso },
+    } = await this.parse(AccountLogin);
+
    const { sessionManager } = await this.getContextAsync(AccountLogin, { nonInteractive: false });
-    await sessionManager.showLoginPromptAsync();
+    await sessionManager.showLoginPromptAsync({ sso });
    Log.log('Logged in');
  }
 }
@@ -1,8 +1,10 @@
 import chalk from 'chalk';
+import nullthrows from 'nullthrows';

 import EasCommand from '../../commandUtils/EasCommand';
+import { Role } from '../../graphql/generated';
 import Log from '../../log';
-import { getActorDisplayName } from '../../user/User';
+import { Actor, getActorDisplayName } from '../../user/User';

 export default class AccountView extends EasCommand {
  static override description = 'show the username you are logged in as';
@@ -18,9 +20,48 @@ export default class AccountView extends EasCommand {
    } = await this.getContextAsync(AccountView, { nonInteractive: true });
    if (actor) {
      Log.log(chalk.green(getActorDisplayName(actor)));
+
+      // personal account is included, only show if more accounts that personal account
+      // but do show personal account in list if there are more
+      const accountExcludingPersonalAccount = actor.accounts.filter(
+        account => !('username' in actor) || account.name !== actor.username
+      );
+      if (accountExcludingPersonalAccount.length > 0) {
+        Log.newLine();
+        Log.log('Accounts:');
+        actor.accounts.forEach(account => {
+          const roleOnAccount = AccountView.getRoleOnAccount(actor, account);
+          Log.log(`• ${account.name} (Role: ${AccountView.getLabelForRole(roleOnAccount)})`);
+        });
+      }
    } else {
      Log.warn('Not logged in');
      process.exit(1);
    }
  }
+
+  private static getRoleOnAccount(actor: Actor, account: Actor['accounts'][0]): Role {
+    if ('username' in actor && account.name === actor.username) {
+      return Role.Owner;
+    }
+
+    return nullthrows(account.users.find(user => user.actor.id === actor.id)?.role);
+  }
+
+  private static getLabelForRole(role: Role): string {
+    switch (role) {
+      case Role.Owner:
+        return 'Owner';
+      case Role.Admin:
+        return 'Admin';
+      case Role.Developer:
+        return 'Developer';
+      case Role.ViewOnly:
+        return 'Viewer';
+      case Role.Custom:
+      case Role.HasAdmin:
+      case Role.NotAdmin:
+        return 'Custom';
+    }
+  }
 }
@@ -35,7 +35,7 @@ export default class BranchCreate extends EasCommand {
      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(BranchCreate);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchCreate, {
      nonInteractive,
@@ -108,7 +108,7 @@ export default class BranchDelete extends EasCommand {
    }

    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchDelete, { nonInteractive });
    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
@@ -20,7 +20,7 @@ export default class BranchList extends EasCommand {
  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BranchList);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchList, {
      nonInteractive: flags['non-interactive'],
@@ -72,7 +72,7 @@ export default class BranchRename extends EasCommand {
      flags: { json: jsonFlag, from: currentName, to: newName, 'non-interactive': nonInteractive },
    } = await this.parse(BranchRename);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchRename, {
      nonInteractive,
@@ -38,7 +38,7 @@ export default class BranchView extends EasCommand {
    } = await this.parse(BranchView);
    const { 'non-interactive': nonInteractive } = flags;
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchView, {
      nonInteractive,
@@ -147,7 +147,7 @@ export default class BuildCancel extends EasCommand {
      flags: { 'non-interactive': nonInteractive },
    } = await this.parse(BuildCancel);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildCancel, {
      nonInteractive,
@@ -174,7 +174,7 @@ export default class BuildCancel extends EasCommand {
    const spinner = ora().start('Canceling the build…');
    try {
      const { status } = await cancelBuildAsync(graphqlClient, buildId);
-      if (status === BuildStatus.Canceled) {
+      if ([BuildStatus.Canceled, BuildStatus.PendingCancel].includes(status)) {
        spinner.succeed('Build canceled');
      } else {
        spinner.text = 'Build is already completed';
@@ -7,10 +7,14 @@ import { ensureProjectConfiguredAsync } from '../../build/configure';
 import EasCommand from '../../commandUtils/EasCommand';
 import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
-import { isExpoUpdatesInstalled } from '../../project/projectUtils';
+import { isExpoUpdatesInstalled, isUsingEASUpdate } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
+import {
+  ensureEASUpdateIsConfiguredInEasJsonAsync,
+  ensureUseClassicUpdatesIsRemovedAsync,
+} from '../../update/configure';
 import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
 import { getVcsClient } from '../../vcs';

@@ -33,7 +37,7 @@ export default class BuildConfigure extends EasCommand {
  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildConfigure);
    const {
-      projectConfig: { exp, projectId, projectDir },
+      privateProjectConfig: { exp, projectId, projectDir },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildConfigure, {
      nonInteractive: false,
@@ -57,10 +61,19 @@ export default class BuildConfigure extends EasCommand {

    // ensure eas.json exists
    Log.newLine();
-    await ensureProjectConfiguredAsync({
+    const didCreateEasJson = await ensureProjectConfiguredAsync({
      projectDir,
      nonInteractive: false,
    });
+    if (didCreateEasJson && isUsingEASUpdate(exp, projectId)) {
+      if (exp.updates?.useClassicUpdates) {
+        // NOTE: this method modifies the Expo config; be sure to use this function's return value
+        // if the config object is used later in the future
+        await ensureUseClassicUpdatesIsRemovedAsync({ exp, projectDir });
+      }
+
+      await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);
+    }

    // configure expo-updates
    if (expoUpdatesIsInstalled) {
@@ -118,7 +118,7 @@ export default class Build extends EasCommand {

    const {
      loggedIn: { actor, graphqlClient },
-      getDynamicProjectConfigAsync,
+      getDynamicPrivateProjectConfigAsync,
      projectDir,
      analytics,
    } = await this.getContextAsync(Build, {
@@ -144,7 +144,7 @@ export default class Build extends EasCommand {
      projectDir,
      flagsWithPlatform,
      actor,
-      getDynamicProjectConfigAsync
+      getDynamicPrivateProjectConfigAsync
    );
  }

@@ -73,7 +73,7 @@ export default class BuildInspect extends EasCommand {
    const { flags } = await this.parse(BuildInspect);
    const {
      loggedIn: { actor, graphqlClient },
-      getDynamicProjectConfigAsync,
+      getDynamicPrivateProjectConfigAsync,
      projectDir,
      analytics,
    } = await this.getContextAsync(BuildInspect, {
@@ -120,7 +120,7 @@ export default class BuildInspect extends EasCommand {
            },
          },
          actor,
-          getDynamicProjectConfigAsync
+          getDynamicPrivateProjectConfigAsync
        );
        if (!flags.verbose) {
          Log.log(chalk.green('Build successful'));
@@ -46,7 +46,7 @@ export default class BuildInternal extends EasCommand {

    const {
      loggedIn: { actor, graphqlClient },
-      getDynamicProjectConfigAsync,
+      getDynamicPrivateProjectConfigAsync,
      projectDir,
      analytics,
    } = await this.getContextAsync(BuildInternal, {
@@ -74,7 +74,7 @@ export default class BuildInternal extends EasCommand {
        },
      },
      actor,
-      getDynamicProjectConfigAsync
+      getDynamicPrivateProjectConfigAsync
    );
  }
 }
@@ -27,6 +27,7 @@ export default class BuildList extends EasCommand {
        BuildStatus.NEW,
        BuildStatus.IN_QUEUE,
        BuildStatus.IN_PROGRESS,
+        BuildStatus.PENDING_CANCEL,
        BuildStatus.ERRORED,
        BuildStatus.FINISHED,
        BuildStatus.CANCELED,
@@ -68,7 +69,7 @@ export default class BuildList extends EasCommand {
      'non-interactive': nonInteractive,
    } = flags;
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildList, {
      nonInteractive,
@@ -123,6 +124,8 @@ const toGraphQLBuildStatus = (buildStatus?: BuildStatus): GraphQLBuildStatus | u
    return GraphQLBuildStatus.InQueue;
  } else if (buildStatus === BuildStatus.IN_PROGRESS) {
    return GraphQLBuildStatus.InProgress;
+  } else if (buildStatus === BuildStatus.PENDING_CANCEL) {
+    return GraphQLBuildStatus.PendingCancel;
  } else if (buildStatus === BuildStatus.ERRORED) {
    return GraphQLBuildStatus.Errored;
  } else if (buildStatus === BuildStatus.FINISHED) {
@@ -101,7 +101,7 @@ export default class BuildResign extends EasCommand {

    const {
      loggedIn: { actor, graphqlClient },
-      getDynamicProjectConfigAsync,
+      getDynamicPrivateProjectConfigAsync,
      projectDir,
      analytics,
    } = await this.getContextAsync(BuildResign, {
@@ -130,7 +130,7 @@ export default class BuildResign extends EasCommand {
      platform,
      flags.profile ?? 'production'
    );
-    const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });
+    const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
    const build = await this.ensureBuildSelectedAsync(
      { graphqlClient, projectId, platform, nonInteractive, limit, offset },
@@ -81,7 +81,7 @@ export default class Run extends EasCommand {
    const queryOptions = getPaginatedQueryOptions(flags);
    const {
      loggedIn: { graphqlClient },
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
    } = await this.getContextAsync(Run, {
      nonInteractive: false,
    });
@@ -210,8 +210,9 @@ async function maybeGetBuildAsync(
      },
      paginatedQueryOptions,
      selectPromptDisabledFunction: build => !isRunnableOnSimulatorOrEmulator(build),
-      selectPromptWarningMessage:
-        'Artifacts for this build have expired and are no longer available, or this is not a simulator/emulator build.',
+      selectPromptWarningMessage: `Artifacts for this build have expired and are no longer available, or this is not ${
+        flags.selectedPlatform === AppPlatform.Ios ? 'a simulator' : 'an emulator'
+      } build.`,
    });
    return validateChosenBuild(build, flags.selectedPlatform);
  } else if (flags.runArchiveFlags.latest) {
@@ -0,0 +1,120 @@
+import { Platform } from '@expo/eas-build-job';
+import { EasJsonAccessor } from '@expo/eas-json';
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+
+import EasCommand from '../../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../../commandUtils/flags';
+import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
+import { toAppPlatform } from '../../../graphql/types/AppPlatform';
+import Log from '../../../log';
+import { selectRequestedPlatformAsync, toPlatforms } from '../../../platform';
+import { getApplicationIdentifierAsync } from '../../../project/applicationIdentifier';
+import {
+  ensureVersionSourceIsRemoteAsync,
+  validateAppConfigForRemoteVersionSource,
+} from '../../../project/remoteVersionSource';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../../utils/json';
+import { getProfilesAsync } from '../../../utils/profiles';
+
+export default class BuildVersionGetView extends EasCommand {
+  public static override description = 'get the latest version from EAS servers';
+
+  public static override 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',
+    }),
+    ...EasNonInteractiveAndJsonFlags,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.DynamicProjectConfig,
+    ...this.ContextOptions.ProjectDir,
+  };
+
+  public async runAsync(): Promise<void> {
+    const { flags } = await this.parse(BuildVersionGetView);
+    if (flags.json) {
+      enableJsonOutput();
+    }
+    const {
+      loggedIn: { graphqlClient },
+      getDynamicPrivateProjectConfigAsync,
+      projectDir,
+    } = await this.getContextAsync(BuildVersionGetView, {
+      nonInteractive: true,
+    });
+
+    if (!flags.platform && flags['non-interactive']) {
+      throw new Error('"--platform" flag is required in non-interactive mode.');
+    }
+    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
+    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
+    await ensureVersionSourceIsRemoteAsync(easJsonAccessor, {
+      nonInteractive: flags['non-interactive'],
+    });
+
+    const platforms = toPlatforms(requestedPlatform);
+    const buildProfiles = await getProfilesAsync({
+      type: 'build',
+      easJsonAccessor,
+      platforms,
+      profileName: flags.profile ?? undefined,
+    });
+    const results: { [key in Platform]?: string } = {};
+    for (const { profile, platform } of buildProfiles) {
+      const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
+        env: profile.env,
+      });
+
+      validateAppConfigForRemoteVersionSource(exp, platform);
+
+      const applicationIdentifier = await getApplicationIdentifierAsync({
+        graphqlClient,
+        projectDir,
+        projectId,
+        exp,
+        buildProfile: profile,
+        platform,
+      });
+      const remoteVersions = await AppVersionQuery.latestVersionAsync(
+        graphqlClient,
+        projectId,
+        toAppPlatform(platform),
+        applicationIdentifier
+      );
+      if (remoteVersions?.buildVersion) {
+        results[platform] = remoteVersions?.buildVersion;
+      }
+    }
+    if (flags.json) {
+      const jsonResults: { versionCode?: string; buildNumber?: string } = {};
+      if (results.android) {
+        jsonResults.versionCode = results.android;
+      }
+      if (results.ios) {
+        jsonResults.buildNumber = results.ios;
+      }
+      printJsonOnlyOutput(jsonResults);
+    } else {
+      if (Object.keys(results).length === 0) {
+        Log.log('No remote versions are configured for this project.');
+        return;
+      }
+      if (results.android) {
+        Log.log(`Android versionCode - ${chalk.bold(results.android)}`);
+      }
+      if (results.ios) {
+        Log.log(`iOS buildNumber - ${chalk.bold(results.ios)}`);
+      }
+    }
+  }
+}
@@ -22,7 +22,7 @@ import {
 import { promptAsync } from '../../../prompts';

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

  static override flags = {
    platform: Flags.enum({
@@ -47,7 +47,7 @@ export default class BuildVersionSetView extends EasCommand {
    const { flags } = await this.parse(BuildVersionSetView);
    const {
      loggedIn: { graphqlClient },
-      getDynamicProjectConfigAsync,
+      getDynamicPrivateProjectConfigAsync,
      projectDir,
    } = await this.getContextAsync(BuildVersionSetView, {
      nonInteractive: false,
@@ -55,14 +55,14 @@ export default class BuildVersionSetView extends EasCommand {

    const platform = await selectPlatformAsync(flags.platform);
    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-    await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
+    await ensureVersionSourceIsRemoteAsync(easJsonAccessor, { nonInteractive: false });
    const profile = await EasJsonUtils.getBuildProfileAsync(
      easJsonAccessor,
      platform,
      flags.profile ?? undefined
    );

-    const { exp, projectId } = await getDynamicProjectConfigAsync({ env: profile.env });
+    const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: profile.env });
    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

    validateAppConfigForRemoteVersionSource(exp, platform);
@@ -39,7 +39,7 @@ 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';
+    'update a version in native code with a value stored on EAS servers';

  public static override flags = {
    platform: Flags.enum({
@@ -64,7 +64,7 @@ export default class BuildVersionSyncView extends EasCommand {
    const { flags } = await this.parse(BuildVersionSyncView);
    const {
      loggedIn: { graphqlClient },
-      getDynamicProjectConfigAsync,
+      getDynamicPrivateProjectConfigAsync,
      projectDir,
    } = await this.getContextAsync(BuildVersionSyncView, {
      nonInteractive: true,
@@ -72,7 +72,7 @@ export default class BuildVersionSyncView extends EasCommand {

    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-    await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
+    await ensureVersionSourceIsRemoteAsync(easJsonAccessor, { nonInteractive: false });

    const platforms = toPlatforms(requestedPlatform);
    const buildProfiles = await getProfilesAsync({
@@ -82,7 +82,7 @@ export default class BuildVersionSyncView extends EasCommand {
      profileName: flags.profile ?? undefined,
    });
    for (const profileInfo of buildProfiles) {
-      const { exp, projectId } = await getDynamicProjectConfigAsync({
+      const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
        env: profileInfo.profile.env,
      });

@@ -28,7 +28,7 @@ export default class BuildView extends EasCommand {
      flags,
    } = await this.parse(BuildView);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildView, {
      nonInteractive: true,
@@ -38,7 +38,7 @@ export default class ChannelCreate extends EasCommand {
      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(ChannelCreate);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelCreate, {
      nonInteractive,
@@ -41,7 +41,7 @@ export default class ChannelDelete extends EasCommand {
      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(ChannelDelete);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelDelete, {
      nonInteractive,
@@ -13,14 +13,14 @@ import {
  UpdateChannelBranchMappingMutationVariables,
 } from '../../graphql/generated';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
+import { ChannelQuery, UpdateChannelBasicInfo } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export async function updateChannelBranchMappingAsync(
  graphqlClient: ExpoGraphqlClient,
  { channelId, branchMapping }: UpdateChannelBranchMappingMutationVariables
-): Promise<UpdateChannelBranchMappingMutation['updateChannel']['editUpdateChannel']> {
+): Promise<UpdateChannelBasicInfo> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .mutation<UpdateChannelBranchMappingMutation, UpdateChannelBranchMappingMutationVariables>(
@@ -75,7 +75,7 @@ export default class ChannelEdit extends EasCommand {
      flags: { branch: branchFlag, json, 'non-interactive': nonInteractive },
    } = await this.parse(ChannelEdit);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelEdit, {
      nonInteractive,
@@ -27,7 +27,7 @@ export default class ChannelList extends EasCommand {
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelList, {
      nonInteractive,
@@ -2,14 +2,20 @@ import { Flags } from '@oclif/core';
 import chalk from 'chalk';

 import { selectBranchOnAppAsync } from '../../branch/queries';
+import {
+  BranchMapping,
+  BranchMappingObject,
+  assertNodeObject,
+  assertNumber,
+} from '../../channel/branch-mapping';
 import { selectChannelOnAppAsync } from '../../channel/queries';
-import { BranchMapping, getBranchMapping } from '../../channel/utils';
+import { getBranchMapping } from '../../channel/utils';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { UpdateBranch } from '../../graphql/generated';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
-import { ChannelQuery, UpdateChannelByNameObject } from '../../graphql/queries/ChannelQuery';
+import { ChannelQuery, UpdateChannelObject } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync, selectAsync } from '../../prompts';
@@ -39,7 +45,7 @@ async function promptForRolloutPercentAsync({
  return rolloutPercent;
 }

-function getRolloutInfo(channel: UpdateChannelByNameObject): {
+function getRolloutInfo(channel: UpdateChannelObject): {
  newBranch: Pick<UpdateBranch, 'name' | 'id'>;
  oldBranch: Pick<UpdateBranch, 'name' | 'id'>;
  currentPercent: number;
@@ -53,7 +59,10 @@ function getRolloutInfo(channel: UpdateChannelByNameObject): {
    throw new Error(`Branch mapping rollout is missing a branch for channel "${channel.name}".`);
  }

-  const currentPercent = 100 * branchMapping.data[0].branchMappingLogic.operand;
+  const branchMappingNode = branchMapping.data[0]?.branchMappingLogic;
+  assertNodeObject(branchMappingNode);
+  assertNumber(branchMappingNode.operand);
+  const currentPercent = 100 * branchMappingNode.operand;
  return { newBranch, oldBranch, currentPercent };
 }

@@ -75,7 +84,7 @@ async function startRolloutAsync(
    projectId: string;
    displayName: string;
    currentBranchMapping: BranchMapping;
-    channel: UpdateChannelByNameObject;
+    channel: UpdateChannelObject;
    nonInteractive: boolean;
  }
 ): Promise<{
@@ -156,7 +165,7 @@ async function editRolloutAsync(
    percent?: number;
    nonInteractive: boolean;
    currentBranchMapping: BranchMapping;
-    channel: UpdateChannelByNameObject;
+    channel: UpdateChannelObject;
  }
 ): Promise<{
  newChannelInfo: {
@@ -183,7 +192,7 @@ async function editRolloutAsync(
  }

  const newBranchMapping = { ...currentBranchMapping };
-  newBranchMapping.data[0].branchMappingLogic.operand = percent / 100;
+  (newBranchMapping.data[0].branchMappingLogic as BranchMappingObject).operand = percent / 100;

  const newChannelInfo = await updateChannelBranchMappingAsync(graphqlClient, {
    channelId: channel.id,
@@ -214,7 +223,7 @@ async function endRolloutAsync(
    branchName?: string;
    nonInteractive: boolean;
    projectId: string;
-    channel: UpdateChannelByNameObject;
+    channel: UpdateChannelObject;
  }
 ): Promise<{
  newChannelInfo: {
@@ -256,11 +265,11 @@ async function endRolloutAsync(
      'Ending the rollout will send all traffic to a single branch. Which one should that be?',
      [
        {
-          title: `${newBranch.name} ${chalk.grey(`- current percent: ${100 - currentPercent}%`)}`,
+          title: `${newBranch.name} ${chalk.grey(`- current percent: ${currentPercent}%`)}`,
          value: true,
        },
        {
-          title: `${oldBranch.name} ${chalk.grey(`- current percent: ${currentPercent}%`)}`,
+          title: `${oldBranch.name} ${chalk.grey(`- current percent: ${100 - currentPercent}%`)}`,
          value: false,
        },
      ]
@@ -336,7 +345,7 @@ export default class ChannelRollout extends EasCommand {
      },
    } = await this.parse(ChannelRollout);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelRollout, {
      nonInteractive,
@@ -38,7 +38,7 @@ export default class ChannelView extends EasCommand {
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelView, {
      nonInteractive,
@@ -41,7 +41,7 @@ export default class Config extends EasCommand {
      enableJsonOutput();
    }
    const { platform: maybePlatform, profile: maybeProfile } = flags;
-    const { getDynamicProjectConfigAsync, projectDir } = await this.getContextAsync(Config, {
+    const { getDynamicPublicProjectConfigAsync, projectDir } = await this.getContextAsync(Config, {
      nonInteractive: false,
    });

@@ -82,9 +82,8 @@ export default class Config extends EasCommand {
        Log.log(JSON.stringify(profile, null, 2));
      }
    } else {
-      const { exp: appConfig } = await getDynamicProjectConfigAsync({
+      const { exp: appConfig } = await getDynamicPublicProjectConfigAsync({
        env: profile.env,
-        isPublicConfig: true,
      });

      if (flags.json) {
@@ -21,8 +21,8 @@ export default class Credentials extends EasCommand {
    const { flags } = await this.parse(Credentials);
    const {
      loggedIn: { actor, graphqlClient },
-      projectConfig,
-      getDynamicProjectConfigAsync,
+      privateProjectConfig,
+      getDynamicPrivateProjectConfigAsync,
      analytics,
    } = await this.getContextAsync(Credentials, {
      nonInteractive: false,
@@ -32,8 +32,8 @@ export default class Credentials extends EasCommand {
      actor,
      graphqlClient,
      analytics,
-      projectConfig ?? null,
-      getDynamicProjectConfigAsync,
+      privateProjectConfig ?? null,
+      getDynamicPrivateProjectConfigAsync,
      flags.platform
    ).runAsync();
  }
@@ -15,7 +15,7 @@ export default class DeviceCreate extends EasCommand {
    // this command is interactive by design
    const {
      loggedIn: { actor, graphqlClient },
-      projectConfig,
+      privateProjectConfig,
    } = await this.getContextAsync(DeviceCreate, {
      nonInteractive: false,
    });
@@ -24,7 +24,7 @@ export default class DeviceCreate extends EasCommand {
      appStore: new AppStoreApi(),
      user: actor,
      graphqlClient,
-      projectId: projectConfig?.projectId,
+      projectId: privateProjectConfig?.projectId,
    });
    const manager = new DeviceManager(ctx);
    await manager.createAsync();
@@ -43,7 +43,7 @@ export default class DeviceDelete extends EasCommand {
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    let { 'apple-team-id': appleTeamIdentifier, udid } = flags;
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(DeviceDelete, {
      nonInteractive: paginatedQueryOptions.nonInteractive,
@@ -112,11 +112,17 @@ export default class DeviceDelete extends EasCommand {
    const removeAppleSpinner = ora('Disabling device on Apple').start();
    try {
      const appleValidatedDevices = await Device.getAsync(context);
-      const appleValidatedDevice = appleValidatedDevices.find(d => d.id === device.id);
+      const appleValidatedDevice = appleValidatedDevices.find(
+        d => d.attributes.udid === device.identifier
+      );
      if (appleValidatedDevice) {
        await appleValidatedDevice.updateAsync({ status: DeviceStatus.DISABLED });
+        removeAppleSpinner.succeed('Disabled device on Apple');
+      } else {
+        removeAppleSpinner.warn(
+          'Device not found on Apple Developer Portal. Expo-registered devices will not appear there until they are chosen for an internal distribution build.'
+        );
      }
-      removeAppleSpinner.succeed('Disabled device on Apple');
    } catch (err) {
      removeAppleSpinner.fail();
      throw err;
@@ -29,7 +29,7 @@ export default class BuildList extends EasCommand {
    const { flags } = await this.parse(BuildList);
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildList, {
      nonInteractive: paginatedQueryOptions.nonInteractive,
@@ -0,0 +1,168 @@
+import { Device } from '@expo/apple-utils';
+import { Flags } from '@oclif/core';
+import assert from 'assert';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { PaginatedQueryOptions, getPaginatedQueryOptions } from '../../commandUtils/pagination';
+import { AppleDeviceMutation } from '../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
+import {
+  AppleDeviceQuery,
+  AppleDeviceQueryResult,
+} from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
+import { authenticateAsync, getRequestContext } from '../../credentials/ios/appstore/authenticate';
+import {
+  selectAppleDeviceOnAppleTeamAsync,
+  selectAppleTeamOnAccountAsync,
+} from '../../devices/queries';
+import formatDevice from '../../devices/utils/formatDevice';
+import { AppleDevice, AppleTeamFragment, Maybe } from '../../graphql/generated';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+
+export default class DeviceRename extends EasCommand {
+  static override description = 'rename a registered device';
+
+  static override flags = {
+    'apple-team-id': Flags.string({ description: 'The Apple team ID on which to find the device' }),
+    udid: Flags.string({ description: 'The Apple device ID to rename' }),
+    name: Flags.string({ description: 'The new name for the device' }),
+    ...EasNonInteractiveAndJsonFlags,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  async runAsync(): Promise<void> {
+    const { flags } = await this.parse(DeviceRename);
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
+    let { 'apple-team-id': appleTeamIdentifier, udid, name } = flags;
+    const {
+      privateProjectConfig: { projectId },
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(DeviceRename, {
+      nonInteractive: paginatedQueryOptions.nonInteractive,
+    });
+    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
+    let appleTeamName;
+
+    if (paginatedQueryOptions.json) {
+      enableJsonOutput();
+    }
+
+    let appleTeam: AppleTeamFragment;
+
+    if (!appleTeamIdentifier) {
+      appleTeam = await selectAppleTeamOnAccountAsync(graphqlClient, {
+        accountName: account.name,
+        selectionPromptTitle: `What Apple team would you like to list devices for?`,
+        paginatedQueryOptions,
+      });
+      appleTeamIdentifier = appleTeam.appleTeamIdentifier;
+      appleTeamName = appleTeam.appleTeamName;
+    }
+
+    assert(appleTeamIdentifier, 'No team identifier is specified');
+
+    const chosenDevice = udid
+      ? await AppleDeviceQuery.getByDeviceIdentifierAsync(graphqlClient, account.name, udid)
+      : await selectAppleDeviceOnAppleTeamAsync(graphqlClient, {
+          accountName: account.name,
+          appleTeamIdentifier,
+          selectionPromptTitle: `Which device would you like to rename?`,
+          paginatedQueryOptions,
+        });
+
+    const newDeviceName = name ? name : await this.promptForNewDeviceNameAsync(chosenDevice.name);
+
+    this.logChosenDevice(chosenDevice, appleTeamName, appleTeamIdentifier, paginatedQueryOptions);
+
+    await this.renameDeviceOnExpoAsync(graphqlClient, chosenDevice, newDeviceName!);
+
+    await this.renameDeviceOnAppleAsync(chosenDevice, appleTeamIdentifier, newDeviceName!);
+  }
+
+  async promptForNewDeviceNameAsync(
+    initial: Maybe<string> | undefined
+  ): Promise<string | undefined> {
+    const { name } = await promptAsync({
+      type: 'text',
+      name: 'name',
+      message: 'New device name:',
+      initial: initial ?? undefined,
+    });
+    return name;
+  }
+
+  async renameDeviceOnExpoAsync(
+    graphqlClient: ExpoGraphqlClient,
+    chosenDevice: AppleDevice | AppleDeviceQueryResult,
+    newDeviceName: string
+  ): Promise<void> {
+    const removalSpinner = ora(`Renaming Apple device on Expo`).start();
+    try {
+      await AppleDeviceMutation.updateAppleDeviceAsync(graphqlClient, chosenDevice.id, {
+        name: newDeviceName,
+      });
+      removalSpinner.succeed('Renamed Apple device on Expo');
+    } catch (err) {
+      removalSpinner.fail();
+      throw err;
+    }
+  }
+
+  async renameDeviceOnAppleAsync(
+    device: AppleDevice | AppleDeviceQueryResult,
+    appleTeamIdentifier: string,
+    newDeviceName: string
+  ): Promise<void> {
+    const ctx = await authenticateAsync({ teamId: appleTeamIdentifier });
+    const context = getRequestContext(ctx);
+
+    Log.addNewLineIfNone();
+    const removeAppleSpinner = ora('Renaming device on Apple').start();
+    try {
+      const appleValidatedDevices = await Device.getAsync(context);
+      const appleValidatedDevice = appleValidatedDevices.find(
+        d => d.attributes.udid === device.identifier
+      );
+      if (appleValidatedDevice) {
+        await appleValidatedDevice.updateAsync({ name: newDeviceName });
+        removeAppleSpinner.succeed('Renamed device on Apple');
+      } else {
+        removeAppleSpinner.warn(
+          'Device not found on Apple Developer Portal. Expo-registered devices will not appear there until they are chosen for an internal distribution build.'
+        );
+      }
+    } catch (err) {
+      removeAppleSpinner.fail();
+      throw err;
+    }
+  }
+
+  logChosenDevice(
+    device: AppleDevice | AppleDeviceQueryResult,
+    appleTeamName: Maybe<string> | undefined,
+    appleTeamIdentifier: string,
+    { json }: PaginatedQueryOptions
+  ): void {
+    if (json) {
+      printJsonOnlyOutput(device);
+    } else {
+      Log.addNewLineIfNone();
+      Log.log(
+        formatDevice(device, {
+          appleTeamName,
+          appleTeamIdentifier: appleTeamIdentifier!,
+        })
+      );
+      Log.newLine();
+    }
+  }
+}
@@ -32,7 +32,7 @@ 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 {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(DeviceView, {
      nonInteractive: true,
@@ -35,7 +35,7 @@ export default class MetadataPull extends EasCommand {
    const { flags } = await this.parse(MetadataPull);
    const {
      loggedIn: { actor, graphqlClient },
-      projectConfig: { exp, projectId, projectDir },
+      privateProjectConfig: { exp, projectId, projectDir },
      analytics,
    } = await this.getContextAsync(MetadataPull, {
      nonInteractive: false,
@@ -33,7 +33,7 @@ export default class MetadataPush extends EasCommand {
    const { flags } = await this.parse(MetadataPush);
    const {
      loggedIn: { actor, graphqlClient },
-      projectConfig: { exp, projectId, projectDir },
+      privateProjectConfig: { exp, projectId, projectDir },
      analytics,
    } = await this.getContextAsync(MetadataPush, {
      nonInteractive: false,
@@ -16,7 +16,7 @@ export default class Open extends EasCommand {
  async runAsync(): Promise<void> {
    // this command is interactive by nature (only really run by humans in a terminal)
    const {
-      projectConfig: { projectId, exp },
+      privateProjectConfig: { projectId, exp },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(Open, {
      nonInteractive: false,
@@ -1,4 +1,4 @@
-import { AppJSONConfig, PackageJSONConfig, getConfig, modifyConfigAsync } from '@expo/config';
+import { AppJSONConfig, PackageJSONConfig, getConfig } from '@expo/config';
 import chalk from 'chalk';
 import { vol } from 'memfs';
 import { instance, mock } from 'ts-mockito';
@@ -12,12 +12,17 @@ import FeatureGating from '../../../commandUtils/gating/FeatureGating';
 import { jester, jester2 } from '../../../credentials/__tests__/fixtures-constants';
 import { AppMutation } from '../../../graphql/mutations/AppMutation';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
+import { createOrModifyExpoConfigAsync } from '../../../project/expoConfig';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { confirmAsync, promptAsync } from '../../../prompts';
 import ProjectInit from '../init';

 jest.mock('fs');
 jest.mock('@expo/config');
+jest.mock('../../../project/expoConfig', () => ({
+  ...jest.requireActual('../../../project/expoConfig'),
+  createOrModifyExpoConfigAsync: jest.fn(),
+}));
 jest.mock('../../../prompts');
 jest.mock('../../../user/actions');
 jest.mock('../../../graphql/mutations/AppMutation');
@@ -143,13 +148,16 @@ describe(ProjectInit.name, () => {
      });

      describe('force', () => {
-        it('does not prompt to overwrite when different', async () => {
+        beforeEach(() => {
          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
            id: '1234',
            slug: 'testing-123',
            fullName: '@jester/testing-123',
            ownerAccount: jester.accounts[0],
          });
+        });
+
+        it('does not prompt to overwrite when different', async () => {
          await new ProjectInit(['--id', '12345', '--force'], {
            root: '/test-project',
          } as any).run();
@@ -183,7 +191,7 @@ describe(ProjectInit.name, () => {
          });

          await new ProjectInit(['--id', '1234'], commandOptions).run();
-          expect(modifyConfigAsync).not.toHaveBeenCalled();
+          expect(createOrModifyExpoConfigAsync).not.toHaveBeenCalled();
        });

        it('prompts to configure if not consistent', async () => {
@@ -195,14 +203,20 @@ describe(ProjectInit.name, () => {
          });

          jest.mocked(confirmAsync).mockResolvedValue(true);
-          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
+          jest
+            .mocked(createOrModifyExpoConfigAsync)
+            .mockResolvedValue({ type: 'success', config: {} as any });

          await new ProjectInit(['--id', '1234'], commandOptions).run();

          expect(confirmAsync).toHaveBeenCalled();
-          expect(modifyConfigAsync).toHaveBeenCalledTimes(2);
-          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { owner: 'jester2' });
-          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { slug: 'testing-124' });
+          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledTimes(2);
+          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
+            owner: 'jester2',
+          });
+          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
+            slug: 'testing-124',
+          });
        });

        it('overrides if force flag is present and it is not consistent', async () => {
@@ -213,14 +227,20 @@ describe(ProjectInit.name, () => {
            ownerAccount: jester2.accounts[0],
          });

-          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
+          jest
+            .mocked(createOrModifyExpoConfigAsync)
+            .mockResolvedValue({ type: 'success', config: {} as any });

          await new ProjectInit(['--id', '1234', '--force'], commandOptions).run();

          expect(confirmAsync).not.toHaveBeenCalled();
-          expect(modifyConfigAsync).toHaveBeenCalledTimes(2);
-          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { owner: 'jester2' });
-          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { slug: 'testing-124' });
+          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledTimes(2);
+          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
+            owner: 'jester2',
+          });
+          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
+            slug: 'testing-124',
+          });
        });

        it('throws if non-interactive is present and it is not consistent', async () => {
@@ -231,7 +251,9 @@ describe(ProjectInit.name, () => {
            ownerAccount: jester2.accounts[0],
          });

-          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
+          jest
+            .mocked(createOrModifyExpoConfigAsync)
+            .mockResolvedValue({ type: 'success', config: {} as any });

          await expect(
            new ProjectInit(['--id', '1234', '--non-interactive'], commandOptions).run()
@@ -240,7 +262,7 @@ describe(ProjectInit.name, () => {
          );

          expect(confirmAsync).not.toHaveBeenCalled();
-          expect(modifyConfigAsync).not.toHaveBeenCalled();
+          expect(createOrModifyExpoConfigAsync).not.toHaveBeenCalled();
        });
      });
    });
@@ -271,7 +293,7 @@ describe(ProjectInit.name, () => {
          });

          await new ProjectInit(['--id', '1234'], commandOptions).run();
-          expect(modifyConfigAsync).not.toHaveBeenCalled();
+          expect(createOrModifyExpoConfigAsync).not.toHaveBeenCalled();
        });

        it('prompts to configure if not consistent', async () => {
@@ -285,14 +307,20 @@ describe(ProjectInit.name, () => {
          });

          jest.mocked(confirmAsync).mockResolvedValue(true);
-          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
+          jest
+            .mocked(createOrModifyExpoConfigAsync)
+            .mockResolvedValue({ type: 'success', config: {} as any });

          await new ProjectInit(['--id', '1234'], commandOptions).run();

          expect(confirmAsync).toHaveBeenCalled();
-          expect(modifyConfigAsync).toHaveBeenCalledTimes(2);
-          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { owner: 'jester2' });
-          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { slug: 'testing-124' });
+          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledTimes(2);
+          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
+            owner: 'jester2',
+          });
+          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
+            slug: 'testing-124',
+          });
        });

        it('overrides if force flag is present and it is not consistent', async () => {
@@ -305,14 +333,20 @@ describe(ProjectInit.name, () => {
            ownerAccount: jester2.accounts[0],
          });

-          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
+          jest
+            .mocked(createOrModifyExpoConfigAsync)
+            .mockResolvedValue({ type: 'success', config: {} as any });

          await new ProjectInit(['--id', '1234', '--force'], commandOptions).run();

          expect(confirmAsync).not.toHaveBeenCalled();
-          expect(modifyConfigAsync).toHaveBeenCalledTimes(2);
-          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { owner: 'jester2' });
-          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { slug: 'testing-124' });
+          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledTimes(2);
+          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
+            owner: 'jester2',
+          });
+          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
+            slug: 'testing-124',
+          });
        });

        it('throws if non-interactive is present and it is not consistent', async () => {
@@ -325,7 +359,9 @@ describe(ProjectInit.name, () => {
            ownerAccount: jester2.accounts[0],
          });

-          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
+          jest
+            .mocked(createOrModifyExpoConfigAsync)
+            .mockResolvedValue({ type: 'success', config: {} as any });

          await expect(
            new ProjectInit(['--id', '1234', '--non-interactive'], commandOptions).run()
@@ -334,7 +370,7 @@ describe(ProjectInit.name, () => {
          );

          expect(confirmAsync).not.toHaveBeenCalled();
-          expect(modifyConfigAsync).not.toHaveBeenCalled();
+          expect(createOrModifyExpoConfigAsync).not.toHaveBeenCalled();
        });
      });
    });
@@ -367,14 +403,20 @@ describe(ProjectInit.name, () => {
        });

        jest.mocked(confirmAsync).mockResolvedValue(true);
-        jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
+        jest
+          .mocked(createOrModifyExpoConfigAsync)
+          .mockResolvedValue({ type: 'success', config: {} as any });

        await new ProjectInit([], commandOptions).run();

        expect(confirmAsync).toHaveBeenCalled();
-        expect(modifyConfigAsync).toHaveBeenCalledTimes(2);
-        expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { owner: 'jester2' });
-        expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { slug: 'testing-124' });
+        expect(createOrModifyExpoConfigAsync).toHaveBeenCalledTimes(2);
+        expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
+          owner: 'jester2',
+        });
+        expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
+          slug: 'testing-124',
+        });
      });
    });

@@ -43,7 +43,7 @@ export default class ProjectInfo extends EasCommand {

  async runAsync(): Promise<void> {
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ProjectInfo, {
      nonInteractive: true,
@@ -1,4 +1,4 @@
-import { getProjectConfigDescription, modifyConfigAsync } from '@expo/config';
+import { getProjectConfigDescription } from '@expo/config';
 import { ExpoConfig } from '@expo/config-types';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
@@ -13,7 +13,7 @@ import { AppMutation } from '../../graphql/mutations/AppMutation';
 import { AppQuery } from '../../graphql/queries/AppQuery';
 import Log, { link } from '../../log';
 import { ora } from '../../ora';
-import { getExpoConfig } from '../../project/expoConfig';
+import { createOrModifyExpoConfigAsync, getPrivateExpoConfig } from '../../project/expoConfig';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { toAppPrivacy } from '../../project/projectUtils';
 import { confirmAsync, promptAsync } from '../../prompts';
@@ -60,7 +60,7 @@ export default class ProjectInit extends EasCommand {
    projectDir: string,
    modifications: Partial<ExpoConfig>
  ): Promise<void> {
-    const result = await modifyConfigAsync(projectDir, modifications);
+    const result = await createOrModifyExpoConfigAsync(projectDir, modifications);
    switch (result.type) {
      case 'success':
        break;
@@ -98,7 +98,7 @@ export default class ProjectInit extends EasCommand {
    projectDir: string,
    { force, nonInteractive }: InitializeMethodOptions
  ): Promise<void> {
-    const exp = getExpoConfig(projectDir);
+    const exp = getPrivateExpoConfig(projectDir);
    const appForProjectId = await AppQuery.byIdAsync(graphqlClient, projectId);
    const correctOwner = appForProjectId.ownerAccount.name;
    const correctSlug = appForProjectId.slug;
@@ -153,7 +153,7 @@ export default class ProjectInit extends EasCommand {
    projectDir: string,
    { force, nonInteractive }: InitializeMethodOptions
  ): Promise<void> {
-    const exp = getExpoConfig(projectDir);
+    const exp = getPrivateExpoConfig(projectDir);
    const existingProjectId = exp.extra?.eas?.projectId;

    if (projectId === existingProjectId) {
@@ -209,7 +209,7 @@ export default class ProjectInit extends EasCommand {
    actor: Actor,
    projectDir: string
  ): Promise<string> {
-    const exp = getExpoConfig(projectDir);
+    const exp = getPrivateExpoConfig(projectDir);
    const existingProjectId = exp.extra?.eas?.projectId;

    if (existingProjectId) {
@@ -66,7 +66,7 @@ export default class EnvironmentSecretCreate extends EasCommand {
      },
    } = await this.parse(EnvironmentSecretCreate);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentSecretCreate, {
      nonInteractive,
@@ -31,7 +31,7 @@ export default class EnvironmentSecretDelete extends EasCommand {
      flags: { id, 'non-interactive': nonInteractive },
    } = await this.parse(EnvironmentSecretDelete);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentSecretDelete, {
      nonInteractive,
@@ -19,7 +19,7 @@ export default class EnvironmentSecretList extends EasCommand {

  async runAsync(): Promise<void> {
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentSecretList, {
      nonInteractive: true,
@@ -51,7 +51,7 @@ export default class EnvironmentSecretPush extends EasCommand {
      flags: { scope, force, 'env-file': maybeEnvFilePath, 'non-interactive': nonInteractive },
    } = await this.parse(EnvironmentSecretPush);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentSecretPush, {
      nonInteractive,
@@ -100,7 +100,7 @@ export default class Submit extends EasCommand {
    const { flags: rawFlags } = await this.parse(Submit);
    const {
      loggedIn: { actor, graphqlClient },
-      projectConfig: { exp, projectId, projectDir },
+      privateProjectConfig: { exp, projectId, projectDir },
      analytics,
    } = await this.getContextAsync(Submit, {
      nonInteractive: false,
@@ -0,0 +1,27 @@
+import { ExpoConfig } from '@expo/config';
+import { instance, mock } from 'ts-mockito';
+
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { ensureEASUpdateIsConfiguredAsync } from '../../../update/configure';
+
+describe(ensureEASUpdateIsConfiguredAsync, () => {
+  it('errors with "useClassicUpdates" set and no app.json', async () => {
+    const graphqlClient = instance(mock<ExpoGraphqlClient>({}));
+    const exp: ExpoConfig = {
+      name: 'test',
+      slug: 'test',
+      updates: { useClassicUpdates: true },
+    };
+
+    await expect(async () => {
+      await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+        exp,
+        projectId: 'test',
+        projectDir: '/tmp/test',
+        platform: null,
+      });
+    }).rejects.toThrow(
+      `Your app config sets "updates.useClassicUpdates" but EAS Update does not support classic updates. Remove "useClassicUpdates" from your app config and run this command again.`
+    );
+  });
+});
@@ -1,11 +1,4 @@
-import {
-  AppJSONConfig,
-  ExpoConfig,
-  GetConfigOptions,
-  PackageJSONConfig,
-  Platform,
-  getConfig,
-} from '@expo/config';
+import { AppJSONConfig, ExpoConfig, PackageJSONConfig, Platform, getConfig } from '@expo/config';
 import { Updates } from '@expo/config-plugins';
 import { vol } from 'memfs';
 import nullthrows from 'nullthrows';
@@ -14,7 +7,10 @@ import { instance, mock } from 'ts-mockito';

 import UpdatePublish from '..';
 import { ensureBranchExistsAsync } from '../../../branch/queries';
-import { DynamicProjectConfigContextField } from '../../../commandUtils/context/DynamicProjectConfigContextField';
+import {
+  DynamicPrivateProjectConfigContextField,
+  DynamicPublicProjectConfigContextField,
+} from '../../../commandUtils/context/DynamicProjectConfigContextField';
 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
@@ -237,22 +233,26 @@ function mockTestProject({

  jest.mocked(getConfig).mockReturnValue(mockManifest as any);
  jest
-    .spyOn(DynamicProjectConfigContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(async (options?: GetConfigOptions) => {
-      let exp = { ...mockManifest.exp };
-
-      // Fake a limited public config
-      if (options?.isPublicConfig) {
-        exp = {
-          name: mockManifest.exp.name,
-          version: mockManifest.exp.version,
-          slug: mockManifest.exp.slug,
-          sdkVersion: mockManifest.exp.sdkVersion,
-          owner: mockManifest.exp.owner,
-          extra: mockManifest.exp.extra,
-        };
-      }
-
+    .spyOn(DynamicPrivateProjectConfigContextField.prototype, 'getValueAsync')
+    .mockResolvedValue(async () => {
+      const exp = { ...mockManifest.exp };
+      return {
+        exp,
+        projectDir: projectRoot,
+        projectId: configuredProjectId,
+      };
+    });
+  jest
+    .spyOn(DynamicPublicProjectConfigContextField.prototype, 'getValueAsync')
+    .mockResolvedValue(async () => {
+      const exp = {
+        name: mockManifest.exp.name,
+        version: mockManifest.exp.version,
+        slug: mockManifest.exp.slug,
+        sdkVersion: mockManifest.exp.sdkVersion,
+        owner: mockManifest.exp.owner,
+        extra: mockManifest.exp.extra,
+      };
      return {
        exp,
        projectDir: projectRoot,
@@ -3,7 +3,7 @@ import { vol } from 'memfs';
 import { instance, mock } from 'ts-mockito';

 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
-import ProjectConfigContextField from '../../../commandUtils/context/ProjectConfigContextField';
+import { PrivateProjectConfigContextField } from '../../../commandUtils/context/PrivateProjectConfigContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
 import FeatureGating from '../../../commandUtils/gating/FeatureGating';
@@ -324,7 +324,7 @@ function mockTestProject({
  const graphqlClient = instance(mock<ExpoGraphqlClient>({}));

  jest.mocked(getConfig).mockReturnValue(mockManifest as any);
-  jest.spyOn(ProjectConfigContextField.prototype, 'getValueAsync').mockResolvedValue({
+  jest.spyOn(PrivateProjectConfigContextField.prototype, 'getValueAsync').mockResolvedValue({
    exp: mockManifest.exp,
    projectDir: projectRoot,
    projectId: configuredProjectId,
@@ -1,10 +1,4 @@
-import {
-  AppJSONConfig,
-  ExpoConfig,
-  GetConfigOptions,
-  PackageJSONConfig,
-  getConfig,
-} from '@expo/config';
+import { AppJSONConfig, ExpoConfig, PackageJSONConfig, getConfig } from '@expo/config';
 import { Updates } from '@expo/config-plugins';
 import { vol } from 'memfs';
 import nullthrows from 'nullthrows';
@@ -12,7 +6,10 @@ import path from 'path';
 import { instance, mock } from 'ts-mockito';

 import { ensureBranchExistsAsync } from '../../../branch/queries';
-import { DynamicProjectConfigContextField } from '../../../commandUtils/context/DynamicProjectConfigContextField';
+import {
+  DynamicPrivateProjectConfigContextField,
+  DynamicPublicProjectConfigContextField,
+} from '../../../commandUtils/context/DynamicProjectConfigContextField';
 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
@@ -217,22 +214,26 @@ function mockTestProject({

  jest.mocked(getConfig).mockReturnValue(mockManifest as any);
  jest
-    .spyOn(DynamicProjectConfigContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(async (options?: GetConfigOptions) => {
-      let exp = { ...mockManifest.exp };
-
-      // Fake a limited public config
-      if (options?.isPublicConfig) {
-        exp = {
-          name: mockManifest.exp.name,
-          version: mockManifest.exp.version,
-          slug: mockManifest.exp.slug,
-          sdkVersion: mockManifest.exp.sdkVersion,
-          owner: mockManifest.exp.owner,
-          extra: mockManifest.exp.extra,
-        };
-      }
-
+    .spyOn(DynamicPrivateProjectConfigContextField.prototype, 'getValueAsync')
+    .mockResolvedValue(async () => {
+      const exp = { ...mockManifest.exp };
+      return {
+        exp,
+        projectDir: projectRoot,
+        projectId: configuredProjectId,
+      };
+    });
+  jest
+    .spyOn(DynamicPublicProjectConfigContextField.prototype, 'getValueAsync')
+    .mockResolvedValue(async () => {
+      const exp = {
+        name: mockManifest.exp.name,
+        version: mockManifest.exp.version,
+        slug: mockManifest.exp.slug,
+        sdkVersion: mockManifest.exp.sdkVersion,
+        owner: mockManifest.exp.owner,
+        extra: mockManifest.exp.extra,
+      };
      return {
        exp,
        projectDir: projectRoot,
@@ -1,14 +1,16 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';

+import { easJsonExistsAsync } from '../../build/configure';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
-import Log from '../../log';
+import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
 import {
  ensureEASUpdateIsConfiguredAsync,
  ensureEASUpdateIsConfiguredInEasJsonAsync,
 } from '../../update/configure';
+import { getVcsClient } from '../../vcs';

 export default class UpdateConfigure extends EasCommand {
  static override description = 'configure the project to support EAS Update';
@@ -32,16 +34,18 @@ export default class UpdateConfigure extends EasCommand {
    const { flags } = await this.parse(UpdateConfigure);
    const platform = flags.platform as RequestedPlatform;
    const {
-      projectConfig: { projectId, exp, projectDir },
+      privateProjectConfig: { projectId, exp, projectDir },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(UpdateConfigure, {
      nonInteractive: flags['non-interactive'],
    });

    Log.log(
-      '💡 The following process will configure your project to run EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
+      '💡 The following process will configure your project to use EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
    );

+    await getVcsClient().ensureRepoExistsAsync();
+
    await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
      exp,
      projectId,
@@ -52,23 +56,16 @@ export default class UpdateConfigure extends EasCommand {
    await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);

    Log.addNewLineIfNone();
-    Log.log(`🎉 Your app is configured with EAS Update!`);
+    Log.log(`🎉 Your app is configured to use EAS Update!`);
    Log.newLine();
-    Log.log(`${chalk.bold('Next steps')}:`);
-    Log.newLine();
-    Log.log('Update a production build:');
-    Log.log(`1. Create a new build. Example: ${chalk.bold('eas build --profile production')}.`);
-    Log.log('2. Make changes in your project.');
-    Log.log(`3. Publish an update. Example: ${chalk.bold('eas update --channel production')}.`);
-    Log.log('4. Force close and reopen the app at least twice to view the update.');
-
-    Log.newLine();
-    Log.log('Preview an update:');
+    const easJsonExists = await easJsonExistsAsync(projectDir);
+    if (!easJsonExists) {
+      Log.log(`- Run ${chalk.bold('eas build:configure')} to complete your installation`);
+    }
    Log.log(
-      `1. Publish an update to a branch. Example: ${chalk.bold('eas update --branch new-feature')}.`
-    );
-    Log.log(
-      '2. In Expo Go or a development build, navigate to Projects > [project name] > Branch > Open.'
+      `- ${learnMore('https://docs.expo.dev/eas-update/introduction/', {
+        learnMoreMessage: 'Learn more about other capabilities of EAS Update',
+      })}`
    );
  }
 }
@@ -23,6 +23,7 @@ import { RequestedPlatform } from '../../platform';
 import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
 import {
  ExpoCLIExportPlatformFlag,
+  RawAsset,
  buildBundlesAsync,
  buildUnsortedUpdateInfoGroupAsync,
  collectAssetsAsync,
@@ -45,6 +46,7 @@ import {
  getManifestBodyAsync,
  signBody,
 } from '../../utils/code-signing';
+import areSetsEqual from '../../utils/expodash/areSetsEqual';
 import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -59,6 +61,7 @@ type RawUpdateFlags = {
  platform: string;
  'input-dir': string;
  'skip-bundler': boolean;
+  'clear-cache': boolean;
  'private-key-path'?: string;
  'non-interactive': boolean;
  json: boolean;
@@ -76,6 +79,7 @@ type UpdateFlags = {
  updateMessage?: string;
  inputDir: string;
  skipBundler: boolean;
+  clearCache: boolean;
  privateKeyPath?: string;
  json: boolean;
  nonInteractive: boolean;
@@ -94,6 +98,7 @@ export default class UpdatePublish extends EasCommand {
      required: false,
    }),
    message: Flags.string({
+      char: 'm',
      description: 'A short message describing the update',
      required: false,
    }),
@@ -114,6 +119,10 @@ export default class UpdatePublish extends EasCommand {
      description: `Skip running Expo CLI to bundle the app before publishing`,
      default: false,
    }),
+    'clear-cache': Flags.boolean({
+      description: `Clear the bundler cache before publishing`,
+      default: false,
+    }),
    platform: Flags.enum({
      char: 'p',
      options: [
@@ -151,6 +160,7 @@ export default class UpdatePublish extends EasCommand {
      updateMessage: updateMessageArg,
      inputDir,
      skipBundler,
+      clearCache,
      privateKeyPath,
      json: jsonFlag,
      nonInteractive,
@@ -158,7 +168,8 @@ export default class UpdatePublish extends EasCommand {
    } = this.sanitizeFlags(rawFlags);

    const {
-      getDynamicProjectConfigAsync,
+      getDynamicPublicProjectConfigAsync,
+      getDynamicPrivateProjectConfigAsync,
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(UpdatePublish, {
      nonInteractive,
@@ -172,9 +183,7 @@ export default class UpdatePublish extends EasCommand {
      exp: expPossiblyWithoutEasUpdateConfigured,
      projectId,
      projectDir,
-    } = await getDynamicProjectConfigAsync({
-      isPublicConfig: true,
-    });
+    } = await getDynamicPublicProjectConfigAsync();

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

@@ -185,10 +194,8 @@ export default class UpdatePublish extends EasCommand {
      projectId,
    });

-    const { exp } = await getDynamicProjectConfigAsync({ isPublicConfig: true });
-    const { exp: expPrivate } = await getDynamicProjectConfigAsync({
-      isPublicConfig: false,
-    });
+    const { exp } = await getDynamicPublicProjectConfigAsync();
+    const { exp: expPrivate } = await getDynamicPrivateProjectConfigAsync();
    const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);

    const branchName = await getBranchNameForCommandAsync({
@@ -212,7 +219,7 @@ export default class UpdatePublish extends EasCommand {
    if (!skipBundler) {
      const bundleSpinner = ora().start('Exporting...');
      try {
-        await buildBundlesAsync({ projectDir, inputDir, exp, platformFlag });
+        await buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clearCache });
        bundleSpinner.succeed('Exported bundle(s)');
      } catch (e) {
        bundleSpinner.fail('Export failed');
@@ -234,14 +241,58 @@ export default class UpdatePublish extends EasCommand {
      const assets = filterExportedPlatformsByFlag(collectedAssets, platformFlag);
      realizedPlatforms = Object.keys(assets) as PublishPlatform[];

-      const uploadResults = await uploadAssetsAsync(
-        graphqlClient,
-        assets,
-        projectId,
-        (totalAssets, missingAssets) => {
-          assetSpinner.text = `Uploading (${totalAssets - missingAssets}/${totalAssets})`;
-        }
-      );
+      // Timeout mechanism:
+      // - Start with 60 second timeout. 60 seconds is chosen because the cloud function that processes
+      //   uploaded assets has a timeout of 60 seconds.
+      // - Each time one or more assets reports as ready, reset the timeout to 60 seconds.
+      // - Start upload. Internally, uploadAssetsAsync uploads them all and then checks for successful
+      //   processing every (5 + n) seconds with a linear backoff of n + 1 second.
+      // - At the same time as upload is started, start timeout checker which checks every 1 second to see
+      //   if timeout has been reached. When timeout expires, send a cancellation signal to currently running
+      //   upload function call to instruct it to stop uploading or checking for successful processing.
+      let lastUploadedStorageKeys = new Set<string>();
+      let lastAssetUploadResults: {
+        asset: RawAsset & { storageKey: string };
+        finished: boolean;
+      }[] = [];
+      let timeAtWhichToTimeout = Date.now() + 60 * 1000; // sixty seconds from now
+      const cancelationToken = { isCanceledOrFinished: false };
+
+      const uploadResults = await Promise.race([
+        uploadAssetsAsync(
+          graphqlClient,
+          assets,
+          projectId,
+          cancelationToken,
+          assetUploadResults => {
+            const currentUploadedStorageKeys = new Set(
+              assetUploadResults.filter(r => r.finished).map(r => r.asset.storageKey)
+            );
+            if (!areSetsEqual(currentUploadedStorageKeys, lastUploadedStorageKeys)) {
+              timeAtWhichToTimeout = Date.now() + 60 * 1000; // reset timeout to sixty seconds from now
+              lastUploadedStorageKeys = currentUploadedStorageKeys;
+              lastAssetUploadResults = assetUploadResults;
+            }
+
+            const totalAssets = assetUploadResults.length;
+            const missingAssetCount = assetUploadResults.filter(a => !a.finished).length;
+            assetSpinner.text = `Uploading (${totalAssets - missingAssetCount}/${totalAssets})`;
+          }
+        ),
+        (async () => {
+          while (Date.now() < timeAtWhichToTimeout) {
+            if (cancelationToken.isCanceledOrFinished) {
+              break;
+            }
+            await new Promise(res => setTimeout(res, 1000)); // wait 1 second
+          }
+          cancelationToken.isCanceledOrFinished = true;
+          const timedOutAssets = lastAssetUploadResults
+            .filter(r => !r.finished)
+            .map(r => `\n- ${r.asset.originalPath ?? r.asset.path}`);
+          throw new Error(`Asset processing timed out for assets: ${timedOutAssets}`);
+        })(),
+      ]);

      uploadedAssetCount = uploadResults.uniqueUploadedAssetCount;
      assetLimitPerUpdateGroup = uploadResults.assetLimitPerUpdateGroup;
@@ -488,6 +539,7 @@ export default class UpdatePublish extends EasCommand {
      updateMessage,
      inputDir: flags['input-dir'],
      skipBundler: flags['skip-bundler'],
+      clearCache: flags['clear-cache'],
      platform: flags.platform as RequestedPlatform,
      privateKeyPath: flags['private-key-path'],
      nonInteractive,
@@ -41,7 +41,7 @@ export default class UpdateList extends EasCommand {
    const { flags } = await this.parse(UpdateList);
    const { branch: branchFlag, all, json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(UpdateList, {
      nonInteractive,
@@ -72,6 +72,7 @@ export default class UpdateRepublish extends EasCommand {
      exclusive: ['branch', 'channel'],
    }),
    message: Flags.string({
+      char: 'm',
      description: 'Short message describing the republished update',
      required: false,
    }),
@@ -94,7 +95,7 @@ export default class UpdateRepublish extends EasCommand {
    const flags = this.sanitizeFlags(rawFlags);

    const {
-      projectConfig: { exp, projectId },
+      privateProjectConfig: { exp, projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(UpdateRepublish, {
      nonInteractive: flags.nonInteractive,
@@ -122,7 +122,8 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
    } = this.sanitizeFlags(rawFlags);

    const {
-      getDynamicProjectConfigAsync,
+      getDynamicPublicProjectConfigAsync,
+      getDynamicPrivateProjectConfigAsync,
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(UpdateRollBackToEmbedded, {
      nonInteractive,
@@ -136,9 +137,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      exp: expPossiblyWithoutEasUpdateConfigured,
      projectId,
      projectDir,
-    } = await getDynamicProjectConfigAsync({
-      isPublicConfig: true,
-    });
+    } = await getDynamicPublicProjectConfigAsync();

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

@@ -149,10 +148,8 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      projectId,
    });

-    const { exp } = await getDynamicProjectConfigAsync({ isPublicConfig: true });
-    const { exp: expPrivate } = await getDynamicProjectConfigAsync({
-      isPublicConfig: false,
-    });
+    const { exp } = await getDynamicPublicProjectConfigAsync();
+    const { exp: expPrivate } = await getDynamicPrivateProjectConfigAsync();
    const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);

    const branchName = await getBranchNameForCommandAsync({
@@ -33,7 +33,7 @@ export default class WebhookCreate extends EasCommand {
  async runAsync(): Promise<void> {
    const { flags } = await this.parse(WebhookCreate);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(WebhookCreate, {
      nonInteractive: flags['non-interactive'],
@@ -39,7 +39,7 @@ export default class WebhookDelete extends EasCommand {
      flags: { 'non-interactive': nonInteractive },
    } = await this.parse(WebhookDelete);
    const {
-      projectConfig: { projectId },
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(WebhookDelete, {
      nonInteractive,