v5.0.2

fix(eas-cli): implement variadic --platform flag when creating EAS updates (#1939 )
* fix(eas-cli): implement variadic `--platform` flag when creating EAS updates * fix(eas-cli): finish todo and set minimum `@expo/[email protected]` version for multiple `--platform` flags during export * update CHANGELOG.md * fix(eas-cli): be verbose about `--platform=<flag>` in bundle script
2026-11-14 10:08:06 -10:00 · 2023-08-29 13:15:39 +02:00 · 2023-08-29 13:11:49 +02:00 · 2023-08-28 19:05:12 +00:00 · 2023-08-28 20:54:10 +02:00 · 2023-08-28 20:51:18 +02:00
157 changed files with 10893 additions and 1816 deletions
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Expo Developers Discord
+    url: https://chat.expo.dev/
+    about: Join other developers in discussions regarding Expo and EAS.
@@ -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:
@@ -10,11 +10,227 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🐛 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))
+- Add proper expo cli `--platform` flag handling when exporting updates. ([#1939](https://github.com/expo/eas-cli/pull/1939) by [@byCedric](https://github.com/byCedric))

 ### 🧹 Chores

+## [5.0.1](https://github.com/expo/eas-cli/releases/tag/v5.0.1) - 2023-08-28
+
+### 🐛 Bug fixes
+
+- Pass `platform` argument to expo-cli correctly when using the `eas update` command. ([#2028](https://github.com/expo/eas-cli/pull/2028) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [5.0.0](https://github.com/expo/eas-cli/releases/tag/v5.0.0) - 2023-08-28
+
+### 🛠 Breaking changes
+
+- Only export at most ios and android dist for EAS updates. ([#2002](https://github.com/expo/eas-cli/pull/2002) by [@wschurman](https://github.com/wschurman))
+
+### 🎉 New features
+
+- Add rollback disambiguation command. ([#2004](https://github.com/expo/eas-cli/pull/2004) by [@wschurman](https://github.com/wschurman))
+- Detect devices that fail to be provisioned, list them to the user and show the explanation message with the link to the devices page to check actual status. ([#2011](https://github.com/expo/eas-cli/pull/2011) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+- Add info to EAS Update asset upload process about asset counts and limits. ([#2013](https://github.com/expo/eas-cli/pull/2013) by [@wschurman](https://github.com/wschurman))
+- .nvmrc support for setting node version. ([#1954](https://github.com/expo/eas-cli/pull/1954) by [@khamilowicz](https://github.com/khamilowicz))
+
+### 🐛 Bug fixes
+
+- Support republishing roll back to embedded updates. ([#2006](https://github.com/expo/eas-cli/pull/2006) by [@wschurman](https://github.com/wschurman))
+- Configure updates as well when somebody tries to run a build with channel set. ([#2016](https://github.com/expo/eas-cli/pull/2016) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- More branch map utility functions. ([#2001](https://github.com/expo/eas-cli/pull/2001) by [@quinlanj](https://github.com/quinlanj))
+- More branch mapping utils. ([#2003](https://github.com/expo/eas-cli/pull/2003) by [@quinlanj](https://github.com/quinlanj))
+- Create a linked channel on build if not exists. ([#2017](https://github.com/expo/eas-cli/pull/2017) by [@quinlanj](https://github.com/quinlanj))
+- Add `developmentClient` to metadata. ([#2015](https://github.com/expo/eas-cli/pull/2015) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [4.1.2](https://github.com/expo/eas-cli/releases/tag/v4.1.2) - 2023-08-10
+
+### 🧹 Chores
+
+- Make branch mapping utility files have no dependencies. ([#1993](https://github.com/expo/eas-cli/pull/1993) by [@quinlanj](https://github.com/quinlanj))
+
+## [4.1.1](https://github.com/expo/eas-cli/releases/tag/v4.1.1) - 2023-08-08
+
+### 🧹 Chores
+
+- Logger to say website support is coming soon for rollouts. ([#1997](https://github.com/expo/eas-cli/pull/1997) by [@quinlanj](https://github.com/quinlanj))
+
+## [4.1.0](https://github.com/expo/eas-cli/releases/tag/v4.1.0) - 2023-08-08
+
+### 🎉 New features
+
+- Pass credentials to custom iOS builds. ([#1989](https://github.com/expo/eas-cli/pull/1989) by [@szdziedzic](https://github.com/szdziedzic))
+- Add the `withoutCredentials` option as a common build profile field in `eas.json`. ([#1994](https://github.com/expo/eas-cli/pull/1994) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [4.0.1](https://github.com/expo/eas-cli/releases/tag/v4.0.1) - 2023-08-08
+
+### 🐛 Bug fixes
+
+- Fix `eas channel:*` to work with empty branch mappings. ([#1992](https://github.com/expo/eas-cli/pull/1992) by [@quinlanj](https://github.com/quinlanj))
+
+## [4.0.0](https://github.com/expo/eas-cli/releases/tag/v4.0.0) - 2023-08-07
+
+### 🛠 Breaking changes
+
+- Release redesigned `eas channel:rollout` into developer preview. The set of flag arguments are different, in addition to the workflow. ([#1986](https://github.com/expo/eas-cli/pull/1986) by [@quinlanj](https://github.com/quinlanj))
+
+### 🎉 New features
+
+- Option to add current Apple Silicon device without the need to manually provide the provisioning UDID. ([#1943](https://github.com/expo/eas-cli/pull/1943) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+### 🐛 Bug fixes
+
+- Fix rollout-preview ending with republish with code signing. ([#1978](https://github.com/expo/eas-cli/pull/1978) by [@wschurman](https://github.com/wschurman))
+- Rollouts: fix fp precision. ([#1985](https://github.com/expo/eas-cli/pull/1985) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Fixing more grammar errors. ([#1980](https://github.com/expo/eas-cli/pull/1980) by [@quinlanj](https://github.com/quinlanj))
+- Handle rollout edit edge case. ([#1981](https://github.com/expo/eas-cli/pull/1981) by [@quinlanj](https://github.com/quinlanj))
+- Linked expo.fyi rollout article. ([#1991](https://github.com/expo/eas-cli/pull/1991) by [@quinlanj](https://github.com/quinlanj))
+- Rollout ux improvements. ([#1984](https://github.com/expo/eas-cli/pull/1984) by [@quinlanj](https://github.com/quinlanj))
+
+## [3.18.3](https://github.com/expo/eas-cli/releases/tag/v3.18.3) - 2023-08-03
+
+### 🐛 Bug fixes
+
+- Fix republishing with code signing. ([#1973](https://github.com/expo/eas-cli/pull/1973) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Add relationships flag to rollouts-preview. ([#1972](https://github.com/expo/eas-cli/pull/1972) by [@quinlanj](https://github.com/quinlanj))
+- Get channel:{view,list,edit} to play nice with rollouts. ([#1974](https://github.com/expo/eas-cli/pull/1974) by [@quinlanj](https://github.com/quinlanj))
+- Use 'roll out' instead of rollout for verbs. ([#1979](https://github.com/expo/eas-cli/pull/1979) by [@quinlanj](https://github.com/quinlanj))
+
+## [3.18.2](https://github.com/expo/eas-cli/releases/tag/v3.18.2) - 2023-08-03
+
+### 🐛 Bug fixes
+
+- Revert adding `.nvmrc` support for setting node version. ([#1976](https://github.com/expo/eas-cli/pull/1976) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
+- Use just a comma instead of `, ` when concatenating `keywords` in `eas metadata`. ([#1967](https://github.com/expo/eas-cli/pull/1967) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.18.1](https://github.com/expo/eas-cli/releases/tag/v3.18.1) - 2023-08-03
+
+### 🐛 Bug fixes
+
+- Pass correct group into `update:republish`. ([#1971](https://github.com/expo/eas-cli/pull/1971) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Make new rollouts version available for internal dogfooding. ([#1966](https://github.com/expo/eas-cli/pull/1966) by [@quinlanj](https://github.com/quinlanj))
+- Change default runtime version policy for EAS Update to appVersion. ([#1968](https://github.com/expo/eas-cli/pull/1968) by [@quinlanj](https://github.com/quinlanj))
+
+## [3.18.0](https://github.com/expo/eas-cli/releases/tag/v3.18.0) - 2023-08-02
+
+### 🎉 New features
+
+- .nvmrc support for setting node version. ([#1954](https://github.com/expo/eas-cli/pull/1954) by [@khamilowicz](https://github.com/khamilowicz))
+- Provide credentials for custom Android builds. ([#1969](https://github.com/expo/eas-cli/pull/1969) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
+- More branch mapping utility. ([#1957](https://github.com/expo/eas-cli/pull/1957) by [@quinlanj](https://github.com/quinlanj))
+- Utility classes to select existing rollouts and channels. ([#1958](https://github.com/expo/eas-cli/pull/1958) by [@quinlanj](https://github.com/quinlanj))
+
+## [3.17.1](https://github.com/expo/eas-cli/releases/tag/v3.17.1) - 2023-07-27
+
+### 🧹 Chores
+
+- Unify channel graphql query types. ([#1949](https://github.com/expo/eas-cli/pull/1949) by [@quinlanj](https://github.com/quinlanj))
+- Revert UpdateBranchWithCurrentGroupFragment. ([#1952](https://github.com/expo/eas-cli/pull/1952) by [@quinlanj](https://github.com/quinlanj))
+- Fetch entire relay compliant dataset. ([#1953](https://github.com/expo/eas-cli/pull/1953) by [@quinlanj](https://github.com/quinlanj))
+
+## [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
@@ -1,10 +1,10 @@
-* @szdziedzic @wkozyra95
+* @szdziedzic @khamilowicz

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

-packages/eas-cli/src/submit @szdziedzic
-packages/eas-cli/src/commands/submit.ts @szdziedzic
+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 @szdziedzic @wkozyra95
+packages/eas-json @szdziedzic @khamilowicz
@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Instead of opening a GitHub issue for security vulnerabilities, send an email to our secure inbox: secure@expo.io.
@@ -1,6 +1,6 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "3.13.3",
+  "version": "5.0.2",
  "$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",
@@ -133,7 +133,7 @@ ALIASES
  $ eas login
 ```

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

 ## `eas account:logout`

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

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

 ## `eas account:view`

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

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

 ## `eas analytics [STATUS]`

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

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

 ## `eas autocomplete [SHELL]`

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

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

 ## `eas branch:delete [NAME]`

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

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

 ## `eas branch:list`

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

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

 ## `eas branch:rename`

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

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

 ## `eas branch:view [NAME]`

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

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

 ## `eas build`

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

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

 ## `eas build:cancel [BUILD_ID]`

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

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

 ## `eas build:configure`

@@ -379,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.13.3/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v5.0.2/packages/eas-cli/src/commands/build/configure.ts)_

 ## `eas build:inspect`

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

 ## `eas build:list`

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

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

 ## `eas build:resign`

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

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

 ## `eas build:run`

@@ -502,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.13.3/packages/eas-cli/src/commands/build/run.ts)_
+_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v5.0.2/packages/eas-cli/src/commands/build/run.ts)_

 ## `eas build:submit`

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

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

 ## `eas build:version:set`

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

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

 ## `eas build:version:sync`

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

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

 ## `eas build:view [BUILD_ID]`

@@ -606,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.13.3/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v5.0.2/packages/eas-cli/src/commands/build/view.ts)_

 ## `eas channel:create [NAME]`

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

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

 ## `eas channel:edit [NAME]`

@@ -649,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.13.3/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v5.0.2/packages/eas-cli/src/commands/channel/edit.ts)_

 ## `eas channel:list`

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

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

 ## `eas channel:rollout [CHANNEL]`

@@ -677,23 +677,31 @@ Roll a new branch out on a channel incrementally.

 ```
 USAGE
-  $ eas channel:rollout [CHANNEL] [--branch <value>] [--percent <value>] [--end] [--json --non-interactive]
+  $ eas channel:rollout [CHANNEL] [--action create|edit|end] [--percent <value>] [--outcome
+    republish-and-revert|revert] [--branch <value>] [--runtime-version <value>] [--private-key-path <value>] [--json
+    --non-interactive]

 ARGUMENTS
  CHANNEL  channel on which the rollout should be done

 FLAGS
-  --branch=<value>   branch to rollout
-  --end              end the rollout
-  --json             Enable JSON output, non-JSON messages will be printed to stderr.
-  --non-interactive  Run the command in non-interactive mode.
-  --percent=<value>  percent of users to send to the new branch
+  --action=(create|edit|end)               Rollout action to perform
+  --branch=<value>                         Branch to roll out. Use with --action=create
+  --json                                   Enable JSON output, non-JSON messages will be printed to stderr.
+  --non-interactive                        Run the command in non-interactive mode.
+  --outcome=(republish-and-revert|revert)  End outcome of rollout. Use with --action=end
+  --percent=<value>                        Percent of users to send to the new branch. Use with --action=edit or
+                                           --action=create
+  --private-key-path=<value>               File containing the PEM-encoded private key corresponding to the certificate
+                                           in expo-updates' configuration. Defaults to a file named "private-key.pem" in
+                                           the certificate's directory.
+  --runtime-version=<value>                Runtime version to target. Use with --action=create

 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.13.3/packages/eas-cli/src/commands/channel/rollout.ts)_
+_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v5.0.2/packages/eas-cli/src/commands/channel/rollout.ts)_

 ## `eas channel:view [NAME]`

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

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

 ## `eas config`

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

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

 ## `eas credentials`

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

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

 ## `eas device:create`

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

 ## `eas device:delete`

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

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

 ## `eas device:list`

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

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

 ## `eas device:rename`

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

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

 ## `eas device:view [UDID]`

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

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

 ## `eas diagnostics`

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

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

 ## `eas help [COMMAND]`

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

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

 ## `eas metadata:pull`

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

 ## `eas metadata:push`

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

 ## `eas open`

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

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

 ## `eas project:info`

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

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

 ## `eas project:init`

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

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

 ## `eas secret:create`

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

 ## `eas secret:delete`

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

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

 ## `eas secret:list`

@@ -1085,7 +1093,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.13.3/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v5.0.2/packages/eas-cli/src/commands/secret/list.ts)_

 ## `eas secret:push`

@@ -1105,7 +1113,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.13.3/packages/eas-cli/src/commands/secret/push.ts)_
+_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v5.0.2/packages/eas-cli/src/commands/secret/push.ts)_

 ## `eas submit`

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

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

 ## `eas update`

@@ -1143,11 +1151,12 @@ publish an update group

 ```
 USAGE
-  $ eas update [--branch <value>] [--channel <value>] [--message <value>] [--republish | --input-dir <value>
-    | --skip-bundler] [--group <value> |  | ] [--clear-cache] [-p android|ios|all] [--auto] [--private-key-path <value>]
+  $ 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
@@ -1156,7 +1165,6 @@ FLAGS
  --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
@@ -1168,7 +1176,7 @@ DESCRIPTION
  publish an update group
 ```

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

 ## `eas update:configure`

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

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

 ## `eas update:delete GROUPID`

@@ -1207,7 +1215,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.13.3/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v5.0.2/packages/eas-cli/src/commands/update/delete.ts)_

 ## `eas update:list`

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

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

 ## `eas update:republish`

@@ -1237,23 +1245,26 @@ 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]
+    [--private-key-path <value>] [--json --non-interactive]

 FLAGS
+  -m, --message=<value>             Short message describing the republished update group
  -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
+  --branch=<value>                  Branch name to select an update group to republish from
+  --channel=<value>                 Channel name to select an update group 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.
+  --private-key-path=<value>        File containing the PEM-encoded private key corresponding to the certificate in
+                                    expo-updates' configuration. Defaults to a file named "private-key.pem" in the
+                                    certificate's directory.

 DESCRIPTION
  roll back to an existing update
 ```

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

 ## `eas update:view GROUPID`

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

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

 ## `eas webhook:create`

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

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

 ## `eas webhook:delete [ID]`

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

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

 ## `eas webhook:list`

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

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

 ## `eas webhook:update`

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

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

 ## `eas webhook:view ID`

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

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

 ## `eas whoami`

@@ -1,20 +1,20 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "3.13.3",
+  "version": "5.0.2",
  "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": "6.0.2",
-    "@expo/config-types": "47.0.0",
-    "@expo/eas-build-job": "1.0.13",
-    "@expo/eas-json": "3.13.0",
+    "@expo/config": "8.1.2",
+    "@expo/config-plugins": "7.2.4",
+    "@expo/config-types": "49.0.0",
+    "@expo/eas-build-job": "1.0.39",
+    "@expo/eas-json": "5.0.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.13",
+    "@expo/steps": "1.0.34",
    "@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,12 @@
+import { UpdateBranchBasicInfoFragment } from '../../graphql/generated';
+
+export const testBasicBranchInfo: UpdateBranchBasicInfoFragment = {
+  id: 'c4fec95d-7ab1-4d35-bfe6-fe7ff05beda9',
+  name: 'development',
+  __typename: 'UpdateBranch',
+};
+export const testBasicBranchInfo2: UpdateBranchBasicInfoFragment = {
+  id: '43ccb8a4-8aaa-47f0-9790-dcc80933441b',
+  name: 'preview',
+  __typename: 'UpdateBranch',
+};
@@ -0,0 +1,107 @@
+import { EASUpdateAction, EASUpdateContext, NonInteractiveError } from '../../eas-update/utils';
+import { UpdateBranchBasicInfoFragment } from '../../graphql/generated';
+import { BranchQuery } from '../../graphql/queries/BranchQuery';
+import {
+  Connection,
+  Edge,
+  FilterPagination,
+  QueryParams,
+  selectPaginatedAsync,
+} from '../../utils/relay';
+
+/**
+ * Select a branch for the project.
+ *
+ * @constructor
+ * @param {function} options.filterPredicate - A predicate to filter the branches that are shown to the user. It takes a branchInfo object as a parameter and returns a boolean.
+ * @param {string} options.printedType - The type of branch printed to the user. Defaults to 'branch'.
+ * @param {number} options.pageSize - The number of branches to show per page. Defaults to 100.
+ * @param {function} options.beforeEachFilterQuery Optional. If a filter predicate was specified, this callback function will be called before each query.
+ * @args externalQueryParams The query params for the pagination.
+ * @args totalNodesFetched The total number of nodes fetched so far.
+ * @args dataset The dataset so far.
+ * @param {function} options.afterEachFilterQuery Optional. If a filter predicate was specified, this callback function will be called after each query.
+ * @args externalQueryParams The query params for the pagination.
+ * @args totalNodesFetched The total number of nodes fetched so far.
+ * @args dataset The dataset so far.
+ * @args willFetchAgain If the query will fetch again to get a complete page.
+ */
+export class SelectBranch implements EASUpdateAction<UpdateBranchBasicInfoFragment | null> {
+  constructor(
+    private options: {
+      filterPredicate?: (branchInfo: UpdateBranchBasicInfoFragment) => boolean;
+      printedType?: string;
+      pageSize?: number;
+      beforeEachFilterQuery?: (
+        externalQueryParams: QueryParams,
+        totalNodesFetched: number,
+        dataset: Edge<UpdateBranchBasicInfoFragment>[]
+      ) => void;
+      afterEachFilterQuery?: (
+        externalQueryParams: QueryParams,
+        totalNodesFetched: number,
+        dataset: Edge<UpdateBranchBasicInfoFragment>[],
+        willFetchAgain: boolean
+      ) => void;
+    } = {}
+  ) {}
+
+  async queryAsync(
+    ctx: EASUpdateContext,
+    queryParams: QueryParams
+  ): Promise<Connection<UpdateBranchBasicInfoFragment>> {
+    const { graphqlClient, app } = ctx;
+    const { projectId } = app;
+    return await BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync(graphqlClient, {
+      appId: projectId,
+      ...queryParams,
+    });
+  }
+
+  async filterQueryAsync(
+    ctx: EASUpdateContext,
+    queryParams: QueryParams,
+    filterPredicate: (branchInfo: UpdateBranchBasicInfoFragment) => boolean
+  ): Promise<Connection<UpdateBranchBasicInfoFragment>> {
+    const queryAsync = async (
+      queryParams: QueryParams
+    ): Promise<Connection<UpdateBranchBasicInfoFragment>> =>
+      await this.queryAsync(ctx, queryParams);
+    return await FilterPagination.getPageAsync({
+      queryParams,
+      queryAsync,
+      filterPredicate,
+      beforeEachQuery: this.options.beforeEachFilterQuery,
+      afterEachQuery: this.options.afterEachFilterQuery,
+    });
+  }
+
+  public async runAsync(ctx: EASUpdateContext): Promise<UpdateBranchBasicInfoFragment | null> {
+    const { nonInteractive } = ctx;
+    const { filterPredicate } = this.options;
+    const printedType = this.options.printedType ?? 'branch';
+    const pageSize = this.options.pageSize ?? 100;
+    if (nonInteractive) {
+      throw new NonInteractiveError(
+        `${printedType} selection cannot be run in non-interactive mode.`
+      );
+    }
+
+    const queryAsync = async (
+      queryParams: QueryParams
+    ): Promise<Connection<UpdateBranchBasicInfoFragment>> =>
+      filterPredicate
+        ? this.filterQueryAsync(ctx, queryParams, filterPredicate)
+        : this.queryAsync(ctx, queryParams);
+
+    const getTitleAsync = async (branchInfo: UpdateBranchBasicInfoFragment): Promise<string> =>
+      branchInfo.name;
+
+    return await selectPaginatedAsync({
+      queryAsync,
+      getTitleAsync,
+      printedType,
+      pageSize,
+    });
+  }
+}
@@ -0,0 +1,92 @@
+import { createCtxMock } from '../../../eas-update/__tests__/fixtures';
+import { NonInteractiveError } from '../../../eas-update/utils';
+import { UpdateBranchBasicInfoFragment } from '../../../graphql/generated';
+import { BranchQuery } from '../../../graphql/queries/BranchQuery';
+import { promptAsync } from '../../../prompts';
+import { testBasicBranchInfo, testBasicBranchInfo2 } from '../../__tests__/fixtures';
+import { SelectBranch } from '../SelectBranch';
+
+jest.mock('../../../prompts');
+jest.mock('../../../graphql/queries/BranchQuery');
+describe(SelectBranch, () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  it('returns null if project has no branchs', async () => {
+    const ctx = createCtxMock();
+    jest.mocked(BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync).mockResolvedValue({
+      edges: [],
+      pageInfo: {
+        hasPreviousPage: false,
+        hasNextPage: false,
+      },
+    });
+    const selectBranch = new SelectBranch();
+    const branch = await selectBranch.runAsync(ctx);
+    expect(branch).toBeNull();
+  });
+  it('still prompts if project has only one branch', async () => {
+    const ctx = createCtxMock();
+    jest.mocked(BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync).mockResolvedValue({
+      edges: [{ node: testBasicBranchInfo, cursor: 'cursor' }],
+      pageInfo: {
+        hasPreviousPage: false,
+        hasNextPage: false,
+      },
+    });
+    jest.mocked(promptAsync).mockImplementation(async () => ({
+      item: testBasicBranchInfo,
+    }));
+    const selectBranch = new SelectBranch();
+    const branch = await selectBranch.runAsync(ctx);
+    expect(branch).toBe(testBasicBranchInfo);
+    expect(promptAsync).toHaveBeenCalledTimes(1);
+  });
+  it('returns the selected branch', async () => {
+    jest.mocked(BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync).mockResolvedValue({
+      edges: [
+        { node: testBasicBranchInfo, cursor: 'cursor' },
+        { node: testBasicBranchInfo2, cursor: 'cursor' },
+      ],
+      pageInfo: {
+        hasPreviousPage: false,
+        hasNextPage: false,
+      },
+    });
+    jest.mocked(promptAsync).mockImplementation(async () => ({
+      item: testBasicBranchInfo,
+    }));
+    const ctx = createCtxMock();
+    const selectBranch = new SelectBranch();
+    const branch = await selectBranch.runAsync(ctx);
+    expect(branch).toBe(testBasicBranchInfo);
+  });
+  it('returns the only available branch with a filter', async () => {
+    jest.mocked(BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync).mockResolvedValue({
+      edges: [
+        { node: testBasicBranchInfo, cursor: 'cursor' },
+        { node: testBasicBranchInfo2, cursor: 'cursor' },
+      ],
+      pageInfo: {
+        hasPreviousPage: false,
+        hasNextPage: false,
+      },
+    });
+    const ctx = createCtxMock();
+    const selectBranch = new SelectBranch({
+      filterPredicate: (branchInfo: UpdateBranchBasicInfoFragment) =>
+        branchInfo === testBasicBranchInfo,
+    });
+    const branch = await selectBranch.runAsync(ctx);
+    expect(branch).toBe(testBasicBranchInfo);
+  });
+  it('throws an error in Non-Interactive Mode', async () => {
+    const ctx = createCtxMock({
+      nonInteractive: true,
+    });
+    const selectBranch = new SelectBranch();
+
+    // dont fail if users are running in non-interactive mode
+    await expect(selectBranch.runAsync(ctx)).rejects.toThrowError(NonInteractiveError);
+  });
+});
@@ -13,6 +13,8 @@ import {
  EasBuildFreeTierDisabledAndroidError,
  EasBuildFreeTierDisabledError,
  EasBuildFreeTierDisabledIOSError,
+  EasBuildFreeTierIosLimitExceededError,
+  EasBuildFreeTierLimitExceededError,
  EasBuildResourceClassNotAvailableInFreeTierError,
  EasBuildTooManyPendingBuildsError,
  RequestValidationError,
@@ -25,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"
  }
 ]`;
@@ -280,6 +288,45 @@ describe(Build.name, () => {
          );
        });
      });
+      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', () => {
@@ -424,6 +471,29 @@ describe(Build.name, () => {

          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;
@@ -455,6 +525,29 @@ describe(Build.name, () => {

          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;
@@ -124,8 +124,7 @@ export async function prepareAndroidBuildAsync(
 }

 function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean {
-  const isCustomBuild = ctx.buildProfile.config !== undefined;
-  return !ctx.buildProfile.withoutCredentials && !isCustomBuild;
+  return !ctx.buildProfile.withoutCredentials;
 }

 async function ensureAndroidCredentialsAsync(
@@ -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,10 @@ import {
  EasBuildFreeTierDisabledAndroidError,
  EasBuildFreeTierDisabledError,
  EasBuildFreeTierDisabledIOSError,
+  EasBuildFreeTierIosLimitExceededError,
+  EasBuildFreeTierLimitExceededError,
+  EasBuildLegacyResourceClassNotAvailableError,
+  EasBuildProjectArchiveUploadError,
  EasBuildResourceClassNotAvailableInFreeTierError,
  EasBuildTooManyPendingBuildsError,
  RequestValidationError,
@@ -182,8 +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,
 };

@@ -205,15 +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 graphQLError = error.graphQLErrors[0];
-    const requestIdLine = graphQLError?.extensions?.requestId
-      ? `\nRequest ID: ${graphQLError.extensions.requestId}`
-      : '';
-    const originalErrorMessage = graphQLError?.message
-      ? `\nError message: ${graphQLError.message}`
-      : '';
+    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.${requestIdLine}${originalErrorMessage}`
+      `Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.${errorMessage}`
    );
  }
  throw error;
@@ -245,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(
@@ -269,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);
@@ -3,7 +3,7 @@ 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;
  }

@@ -102,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/'
+    )}`
+  );
 }
@@ -55,4 +55,5 @@ export interface BuildContext<T extends Platform> {
  customBuildConfigMetadata?: CustomBuildConfigMetadata;
  android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
  ios: T extends Platform.IOS ? IosBuildContext : undefined;
+  developmentClient: boolean;
 }
@@ -60,6 +60,12 @@ export async function createBuildContextAsync<T extends Platform>({
  const workflow = await resolveWorkflowAsync(projectDir, platform);
  const accountId = account.id;
  const runFromCI = getenv.boolish('CI', false);
+  const developmentClient =
+    buildProfile.developmentClient ??
+    (platform === Platform.ANDROID
+      ? (buildProfile as BuildProfile<Platform.ANDROID>)?.gradleCommand === ':app:assembleDebug'
+      : (buildProfile as BuildProfile<Platform.IOS>)?.buildConfiguration === 'Debug') ??
+    false;

  const credentialsCtx = new CredentialsContext({
    projectInfo: { exp, projectId },
@@ -120,6 +126,7 @@ export async function createBuildContextAsync<T extends Platform>({
    message,
    runFromCI,
    customBuildConfigMetadata,
+    developmentClient,
  };
  if (platform === Platform.ANDROID) {
    const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -8,10 +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 {}
@@ -55,6 +55,5 @@ export async function ensureIosCredentialsForBuildResignAsync(
 }

 function shouldProvideCredentials(buildCtx: BuildContext<Platform.IOS>): boolean {
-  const isCustomBuild = buildCtx.buildProfile.config !== undefined;
-  return !buildCtx.buildProfile.simulator && !isCustomBuild;
+  return !buildCtx.buildProfile.simulator && !buildCtx.buildProfile.withoutCredentials;
 }
@@ -6,7 +6,7 @@ import semver from 'semver';
 import { ora } from '../ora';

 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '1.0.18';
+const PLUGIN_PACKAGE_VERSION = '1.0.39';

 export enum LocalBuildMode {
  /**
@@ -63,6 +63,7 @@ export async function collectMetadataAsync<T extends Platform>(
    runFromCI: ctx.runFromCI,
    buildMode: ctx.buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
    customWorkflowName: ctx.customBuildConfigMetadata?.workflowName,
+    developmentClient: ctx.developmentClient,
  };
  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
@@ -1,3 +1,4 @@
+import { ExpoConfig } from '@expo/config-types';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import {
  AppVersionSource,
@@ -13,6 +14,7 @@ import chalk from 'chalk';
 import nullthrows from 'nullthrows';

 import { Analytics } from '../analytics/AnalyticsManager';
+import { createAndLinkChannelAsync, doesChannelExistAsync } from '../channel/queries';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import {
@@ -24,7 +26,7 @@ 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,
@@ -37,7 +39,12 @@ import {
 } from '../project/customBuildConfig';
 import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
 import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
-import { validateAppVersionRuntimePolicySupportAsync } from '../project/projectUtils';
+import {
+  isExpoUpdatesInstalledAsDevDependency,
+  isExpoUpdatesInstalledOrAvailable,
+  isUsingEASUpdate,
+  validateAppVersionRuntimePolicySupportAsync,
+} from '../project/projectUtils';
 import {
  validateAppConfigForRemoteVersionSource,
  validateBuildProfileVersionSettings,
@@ -52,6 +59,7 @@ import {
  waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
 } from '../submit/submit';
 import { printSubmissionDetailsUrls } from '../submit/utils/urls';
+import { ensureEASUpdateIsConfiguredAsync } from '../update/configure';
 import { validateBuildProfileConfigMatchesProjectConfigAsync } from '../update/utils';
 import { Actor } from '../user/User';
 import { downloadAndMaybeExtractAppAsync } from '../utils/download';
@@ -112,7 +120,15 @@ export async function runBuildAndSubmitAsync(
    easJsonAccessor,
    platforms,
    profileName: flags.profile ?? undefined,
+    projectDir,
  });
+  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,
@@ -171,6 +187,7 @@ export async function runBuildAndSubmitAsync(
      platforms,
      profileName: flags.submitProfile,
      type: 'submit',
+      projectDir,
    });
    for (const startedBuild of startedBuilds) {
      const submitProfile = nullthrows(
@@ -306,6 +323,29 @@ async function prepareAndStartBuildAsync({
    buildCtx.projectId,
    flags.nonInteractive
  );
+  if (buildProfile.profile.channel) {
+    await validateExpoUpdatesInstalledAsProjectDependencyAsync({
+      graphqlClient,
+      exp: buildCtx.exp,
+      projectId: buildCtx.projectId,
+      projectDir,
+      sdkVersion: buildCtx.exp.sdkVersion,
+      nonInteractive: flags.nonInteractive,
+      buildProfile,
+    });
+    if (isUsingEASUpdate(buildCtx.exp, buildCtx.projectId)) {
+      const doesChannelExist = await doesChannelExistAsync(graphqlClient, {
+        appId: buildCtx.projectId,
+        channelName: buildProfile.profile.channel,
+      });
+      if (!doesChannelExist) {
+        await createAndLinkChannelAsync(graphqlClient, {
+          appId: buildCtx.projectId,
+          channelName: buildProfile.profile.channel,
+        });
+      }
+    }
+  }

  await validateAppVersionRuntimePolicySupportAsync(buildCtx.projectDir, buildCtx.exp);
  if (easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE) {
@@ -425,3 +465,52 @@ async function maybeDownloadAndRunSimulatorBuildsAsync(
    }
  }
 }
+
+async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
+  exp,
+  graphqlClient,
+  projectId,
+  projectDir,
+  buildProfile,
+  nonInteractive,
+  sdkVersion,
+}: {
+  graphqlClient: ExpoGraphqlClient;
+  exp: ExpoConfig;
+  projectId: string;
+  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" followed by "eas update:configure".`
+    );
+  } 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 and run "eas update:configure".`
+    );
+    const installExpoUpdates = await confirmAsync({
+      message: `Would you like to install the "expo-updates" package and configure EAS Update now?`,
+    });
+    if (installExpoUpdates) {
+      await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+        exp,
+        projectId,
+        projectDir,
+        platform: RequestedPlatform.All,
+      });
+      Log.withTick('Installed expo-updates and configured EAS Update.');
+      throw new Error('Command must be re-run to pick up new updates configuration.');
+    }
+  }
+}
@@ -0,0 +1,22 @@
+import { BranchBasicInfo, ChannelBasicInfo, UpdateChannelInfoWithBranches } from '../utils';
+
+export const testChannelBasicInfo: ChannelBasicInfo = {
+  id: '9309afc2-9752-40db-8ef7-4abc10744c61',
+  name: 'production',
+  branchMapping:
+    '{"data":[{"branchId":"754bf17f-efc0-46ab-8a59-a03f20e53e9b","branchMappingLogic":{"operand":0.15,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"6941a8dd-5c0a-48bc-8876-f49c88ed419f","branchMappingLogic":"true"}],"version":0}',
+};
+
+export const testBasicBranchInfo1: BranchBasicInfo = {
+  id: '754bf17f-efc0-46ab-8a59-a03f20e53e9b',
+  name: 'wrong-channel',
+};
+
+export const testBasicBranchInfo2: BranchBasicInfo = {
+  id: '6941a8dd-5c0a-48bc-8876-f49c88ed419f',
+  name: 'production',
+};
+export const channelInfoWithBranches: UpdateChannelInfoWithBranches<BranchBasicInfo> = {
+  ...testChannelBasicInfo,
+  updateBranches: [testBasicBranchInfo1, testBasicBranchInfo2],
+};
@@ -0,0 +1,70 @@
+import {
+  emptyBranchMapping,
+  rolloutBranchMapping,
+  standardBranchMapping,
+} from '../../rollout/__tests__/fixtures';
+import {
+  BranchMappingValidationError,
+  assertVersion,
+  getAlwaysTrueBranchMapping,
+  getBranchMapping,
+  getEmptyBranchMapping,
+  getStandardBranchId,
+  isAlwaysTrueBranchMapping,
+  isEmptyBranchMapping,
+} from '../branch-mapping';
+import { testChannelBasicInfo } from './branch-mapping-fixtures';
+
+describe(assertVersion, () => {
+  it('throws if the branch mapping is not the correct version', () => {
+    expect(() => assertVersion(testChannelBasicInfo, 5)).toThrowError(BranchMappingValidationError);
+  });
+  it('asserts the correct version', () => {
+    assertVersion(testChannelBasicInfo, 0);
+    expect(getBranchMapping(testChannelBasicInfo.branchMapping).version).toBe(0);
+  });
+});
+
+describe(getEmptyBranchMapping, () => {
+  it('gets an empty branch mapping', () => {
+    expect(isEmptyBranchMapping(getEmptyBranchMapping())).toBe(true);
+  });
+});
+
+describe(isEmptyBranchMapping, () => {
+  it('detects empty branch mappings', () => {
+    expect(isEmptyBranchMapping(emptyBranchMapping)).toBe(true);
+    expect(isEmptyBranchMapping(standardBranchMapping)).toBe(false);
+    expect(isEmptyBranchMapping(rolloutBranchMapping)).toBe(false);
+  });
+});
+
+describe(isAlwaysTrueBranchMapping, () => {
+  it('detects always true branch mappings', () => {
+    expect(isAlwaysTrueBranchMapping(standardBranchMapping)).toBe(true);
+    expect(isAlwaysTrueBranchMapping(rolloutBranchMapping)).toBe(false);
+    expect(isAlwaysTrueBranchMapping(emptyBranchMapping)).toBe(false);
+  });
+});
+
+describe(getAlwaysTrueBranchMapping, () => {
+  it('gets an always true branch mapping', () => {
+    const alwaysTrueBranchMapping = getAlwaysTrueBranchMapping('test-id');
+    expect(isAlwaysTrueBranchMapping(alwaysTrueBranchMapping)).toBe(true);
+  });
+});
+
+describe(getStandardBranchId, () => {
+  it('throws if the branch mapping is not a standard mapping', () => {
+    expect(() => getStandardBranchId(testChannelBasicInfo)).toThrowError(
+      BranchMappingValidationError
+    );
+  });
+  it('gets a standard branch id', () => {
+    const channelObjectWithStandardMapping = { ...testChannelBasicInfo };
+    channelObjectWithStandardMapping.branchMapping = JSON.stringify(standardBranchMapping);
+    expect(getStandardBranchId(channelObjectWithStandardMapping)).toBe(
+      standardBranchMapping.data[0].branchId
+    );
+  });
+});
@@ -0,0 +1,147 @@
+import { UpdateChannelBasicInfoFragment } from '../../graphql/generated';
+import { UpdateBranchObject, UpdateChannelObject } from '../../graphql/queries/ChannelQuery';
+
+export const testUpdateBranch1: UpdateBranchObject = {
+  id: '754bf17f-efc0-46ab-8a59-a03f20e53e9b',
+  name: 'wrong-channel',
+  updateGroups: [
+    [
+      {
+        id: 'bbe3e63a-f620-4603-8c4d-258f3e51590d',
+        group: '16ca6dba-e63b-48b0-baa3-15a894ee9434',
+        message: 'fix bug',
+        createdAt: '2023-07-17T22:48:59.278Z',
+        runtimeVersion: 'exposdk:48.0.0',
+        platform: 'ios',
+        manifestFragment:
+          '{"extra":{"expoClient":{"ios":{"supportsTablet":true,"bundleIdentifier":"com.quintest113.updatestest4"},"web":{"favicon":"./assets/favicon.png"},"icon":"./assets/icon.png","name":"updates-test-4","slug":"updates-test-4","extra":{"eas":{"projectId":"789a8784-0186-4f41-8bd2-7f219291a2b8"}},"splash":{"image":"./assets/splash.png","resizeMode":"contain","backgroundColor":"#ffffff"},"android":{"package":"com.quintest113.updatestest4","adaptiveIcon":{"backgroundColor":"#ffffff","foregroundImage":"./assets/adaptive-icon.png"}},"updates":{"url":"https://u.expo.dev/789a8784-0186-4f41-8bd2-7f219291a2b8"},"version":"1.0.0","platforms":["ios","android"],"sdkVersion":"48.0.0","orientation":"portrait","runtimeVersion":{"policy":"sdkVersion"},"currentFullName":"@quintest113/updates-test-4","originalFullName":"@quintest113/updates-test-4","userInterfaceStyle":"light","assetBundlePatterns":["**/*"]}},"assets":[{"bundleKey":"7d40544b395c5949f4646f5e150fe020","fileSHA256":"LN_rjlzN55dvcBL7jM5zryIpAp7iHU8VCf7RFIccbNg","storageKey":"Pi65ns2w9xLI5G_m9aGrJ5wK5FpWcGcInSSFwnA_0aA","contentType":"image/png","fileExtension":".png"},{"bundleKey":"cdd04e13d4ec83ff0cd13ec8dabdc341","fileSHA256":"irHji01LPI9giDYxtJo9bTPHaEHzuUcCMTlb4xn90Ks","storageKey":"oJZ9JX1m8IKNDgnIqcKOo5KUFOoa_NCaxruigZu65E0","contentType":"image/png","fileExtension":".png"},{"bundleKey":"a132ecc4ba5c1517ff83c0fb321bc7fc","fileSHA256":"K3RDqaWOksoRpXW9wRWYYVpX3eMFzYznDWAmBrMCzZg","storageKey":"X3OAkUu5P_LqyKFx1bNkA_qDQFLlSjCYNAlVEaOamHE","contentType":"image/png","fileExtension":".png"},{"bundleKey":"0ea69b5077e7c4696db85dbcba75b0e1","fileSHA256":"Pd0Hc-0n4j0leJ8wFzGzrEVa2L5aonoKG4OPicbSciU","storageKey":"FwJkAbrRNahBGX1KXnTAgiiwyzENu3D7DeEzCwmInyo","contentType":"image/png","fileExtension":".png"},{"bundleKey":"f5b790e2ac193b3d41015edb3551f9b8","fileSHA256":"vCfIss7SLYKt1AAi0hxjsgOMEDceLJB6ZWjQf6gTU4k","storageKey":"GQtYm7r0G9N3WJyrymjZ26p8eNMIb7rzqwSVgGco5EU","contentType":"image/png","fileExtension":".png"},{"bundleKey":"5223c8d9b0d08b82a5670fb5f71faf78","fileSHA256":"LJXowmdeeZM1_QBGuwfb2gbLfs_1HtN5IsYwnWGcxNM","storageKey":"jeqOrdQBNY4hgl04B3wtGs8QNWMDmjvbjIMUXPtOBpw","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02d5848f62ade9617cf96894727d32e7","fileSHA256":"u1-8zHOj9oxS8maH-7JbShJIq1-KEV7FXnrGpEUcR-4","storageKey":"LMUvUZZpdGFb7KqaB_l9N4TXTkFn1Pw92ws9fWDNZPw","contentType":"model/gltf-binary","fileExtension":".glb"},{"bundleKey":"6013c27e421ab23c826713af3ebec891","fileSHA256":"dutQNnvzTCS4NgwvbeMbvhro5QnW0GJUeY_4rrvlcLY","storageKey":"85KB9Jr7eqz1Jwt1mYQGRzTy6ZXyO0j7ZcaLImCbzkU","contentType":"image/jpeg","fileExtension":".jpg"}],"launchAsset":{"bundleKey":"3d0ac172fe41ab941a8c68cd7e3a17ee","fileSHA256":"jjnar-ZPrb_g0Bx5tcFfjJrP3v8HdeAlXMk__xN7I1U","storageKey":"bimf-UXq5IFH5nNHCIHdcQ2MyJwTnwDVBb-P8hr2CZw","contentType":"application/javascript","fileExtension":".bundle"}}',
+        isRollBackToEmbedded: false,
+        manifestPermalink: 'https://u.expo.dev/update/bbe3e63a-f620-4603-8c4d-258f3e51590d',
+        gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
+        actor: {
+          __typename: 'User',
+          id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
+          username: 'quintest113',
+        },
+        branch: {
+          id: '754bf17f-efc0-46ab-8a59-a03f20e53e9b',
+          name: 'wrong-channel',
+          __typename: 'UpdateBranch',
+        },
+        codeSigningInfo: null,
+        __typename: 'Update',
+      },
+      {
+        id: 'db22401b-d321-4629-a068-21d6d1f19c02',
+        group: '16ca6dba-e63b-48b0-baa3-15a894ee9434',
+        message: 'fix bug',
+        createdAt: '2023-07-17T22:48:59.278Z',
+        runtimeVersion: 'exposdk:48.0.0',
+        platform: 'android',
+        manifestFragment:
+          '{"extra":{"expoClient":{"ios":{"supportsTablet":true,"bundleIdentifier":"com.quintest113.updatestest4"},"web":{"favicon":"./assets/favicon.png"},"icon":"./assets/icon.png","name":"updates-test-4","slug":"updates-test-4","extra":{"eas":{"projectId":"789a8784-0186-4f41-8bd2-7f219291a2b8"}},"splash":{"image":"./assets/splash.png","resizeMode":"contain","backgroundColor":"#ffffff"},"android":{"package":"com.quintest113.updatestest4","adaptiveIcon":{"backgroundColor":"#ffffff","foregroundImage":"./assets/adaptive-icon.png"}},"updates":{"url":"https://u.expo.dev/789a8784-0186-4f41-8bd2-7f219291a2b8"},"version":"1.0.0","platforms":["ios","android"],"sdkVersion":"48.0.0","orientation":"portrait","runtimeVersion":{"policy":"sdkVersion"},"currentFullName":"@quintest113/updates-test-4","originalFullName":"@quintest113/updates-test-4","userInterfaceStyle":"light","assetBundlePatterns":["**/*"]}},"assets":[{"bundleKey":"778ffc9fe8773a878e9c30a6304784de","fileSHA256":"i2Gkx-9w3JJ1PwSUl2SC9m_UFQ7CPfx3KrZeEDc6-lU","storageKey":"idnX8z03q4vGLzhYMPaQGBADjhqvWe67_afPqJ1vGzM","contentType":"image/png","fileExtension":".png"},{"bundleKey":"376d6a4c7f622917c39feb23671ef71d","fileSHA256":"QJsG0VpGM-5viirUgoKq0M4zQ_TYyPfLhAhN5mrM54I","storageKey":"46DQ95-UdSKiRkQgt5FyXkE1FrKOT9tBZP3nS7auKlg","contentType":"image/png","fileExtension":".png"},{"bundleKey":"c79c3606a1cf168006ad3979763c7e0c","fileSHA256":"kGZm3WiTRq2iMs42ia3vkHtCV_obWT8DY40rlJf2SIQ","storageKey":"k-3xHp3vP8mR36WdccUZVPTRJKpP-zlyboWdkXCIQpQ","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02bc1fa7c0313217bde2d65ccbff40c9","fileSHA256":"_6fuRbdkBbpzkhSVAI99aMneY5X0tpQdsGNGX244IyA","storageKey":"lfqeUjiWFXwowhxVDBEzxsbTOEzYxMLebljy5Bh1mpU","contentType":"image/png","fileExtension":".png"},{"bundleKey":"35ba0eaec5a4f5ed12ca16fabeae451d","fileSHA256":"hM9es7ICUPaeDkczvrTaX0F_BoKJKlrRteYlcHU8IbE","storageKey":"fMoMrsUeB5xWw_Ugn8FqGJf-M2pld2hkXKR704z0MM8","contentType":"image/png","fileExtension":".png"},{"bundleKey":"5223c8d9b0d08b82a5670fb5f71faf78","fileSHA256":"LJXowmdeeZM1_QBGuwfb2gbLfs_1HtN5IsYwnWGcxNM","storageKey":"jeqOrdQBNY4hgl04B3wtGs8QNWMDmjvbjIMUXPtOBpw","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02d5848f62ade9617cf96894727d32e7","fileSHA256":"u1-8zHOj9oxS8maH-7JbShJIq1-KEV7FXnrGpEUcR-4","storageKey":"LMUvUZZpdGFb7KqaB_l9N4TXTkFn1Pw92ws9fWDNZPw","contentType":"model/gltf-binary","fileExtension":".glb"},{"bundleKey":"6013c27e421ab23c826713af3ebec891","fileSHA256":"dutQNnvzTCS4NgwvbeMbvhro5QnW0GJUeY_4rrvlcLY","storageKey":"85KB9Jr7eqz1Jwt1mYQGRzTy6ZXyO0j7ZcaLImCbzkU","contentType":"image/jpeg","fileExtension":".jpg"}],"launchAsset":{"bundleKey":"4cc2ee49988e438ac066827b809721de","fileSHA256":"ctfK72f8EdS1IQmDvJLya38RMSma16beJcMoQToZIe0","storageKey":"QdEoKuCQPvVPA71gY52wqJ9vmtV4ObnCcPE2FP4SIdo","contentType":"application/javascript","fileExtension":".bundle"}}',
+        isRollBackToEmbedded: false,
+        manifestPermalink: 'https://u.expo.dev/update/db22401b-d321-4629-a068-21d6d1f19c02',
+        gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
+        actor: {
+          __typename: 'User',
+          id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
+          username: 'quintest113',
+        },
+        branch: {
+          id: '754bf17f-efc0-46ab-8a59-a03f20e53e9b',
+          name: 'wrong-channel',
+          __typename: 'UpdateBranch',
+        },
+        codeSigningInfo: null,
+        __typename: 'Update',
+      },
+    ],
+  ],
+  __typename: 'UpdateBranch',
+};
+
+export const testUpdateBranch2: UpdateBranchObject = {
+  id: '6941a8dd-5c0a-48bc-8876-f49c88ed419f',
+  name: 'production',
+  updateGroups: [
+    [
+      {
+        id: 'f04aafc1-0bf5-4548-8c35-726b467e7c40',
+        group: 'e40ad156-e9af-4cc2-8e9d-c7b5c328db48',
+        message: 'fix bug',
+        createdAt: '2023-06-23T23:37:10.004Z',
+        runtimeVersion: 'exposdk:48.0.0',
+        platform: 'ios',
+        manifestFragment:
+          '{"extra":{"expoClient":{"ios":{"supportsTablet":true,"bundleIdentifier":"com.quintest113.updatestest4"},"web":{"favicon":"./assets/favicon.png"},"icon":"./assets/icon.png","name":"updates-test-4","slug":"updates-test-4","extra":{"eas":{"projectId":"789a8784-0186-4f41-8bd2-7f219291a2b8"}},"splash":{"image":"./assets/splash.png","resizeMode":"contain","backgroundColor":"#ffffff"},"android":{"package":"com.quintest113.updatestest4","adaptiveIcon":{"backgroundColor":"#ffffff","foregroundImage":"./assets/adaptive-icon.png"}},"updates":{"url":"https://u.expo.dev/789a8784-0186-4f41-8bd2-7f219291a2b8"},"version":"1.0.0","platforms":["ios","android"],"sdkVersion":"48.0.0","orientation":"portrait","runtimeVersion":{"policy":"sdkVersion"},"currentFullName":"@quintest113/updates-test-4","originalFullName":"@quintest113/updates-test-4","userInterfaceStyle":"light","assetBundlePatterns":["**/*"]}},"assets":[{"bundleKey":"7d40544b395c5949f4646f5e150fe020","fileSHA256":"LN_rjlzN55dvcBL7jM5zryIpAp7iHU8VCf7RFIccbNg","storageKey":"Pi65ns2w9xLI5G_m9aGrJ5wK5FpWcGcInSSFwnA_0aA","contentType":"image/png","fileExtension":".png"},{"bundleKey":"cdd04e13d4ec83ff0cd13ec8dabdc341","fileSHA256":"irHji01LPI9giDYxtJo9bTPHaEHzuUcCMTlb4xn90Ks","storageKey":"oJZ9JX1m8IKNDgnIqcKOo5KUFOoa_NCaxruigZu65E0","contentType":"image/png","fileExtension":".png"},{"bundleKey":"a132ecc4ba5c1517ff83c0fb321bc7fc","fileSHA256":"K3RDqaWOksoRpXW9wRWYYVpX3eMFzYznDWAmBrMCzZg","storageKey":"X3OAkUu5P_LqyKFx1bNkA_qDQFLlSjCYNAlVEaOamHE","contentType":"image/png","fileExtension":".png"},{"bundleKey":"0ea69b5077e7c4696db85dbcba75b0e1","fileSHA256":"Pd0Hc-0n4j0leJ8wFzGzrEVa2L5aonoKG4OPicbSciU","storageKey":"FwJkAbrRNahBGX1KXnTAgiiwyzENu3D7DeEzCwmInyo","contentType":"image/png","fileExtension":".png"},{"bundleKey":"f5b790e2ac193b3d41015edb3551f9b8","fileSHA256":"vCfIss7SLYKt1AAi0hxjsgOMEDceLJB6ZWjQf6gTU4k","storageKey":"GQtYm7r0G9N3WJyrymjZ26p8eNMIb7rzqwSVgGco5EU","contentType":"image/png","fileExtension":".png"},{"bundleKey":"5223c8d9b0d08b82a5670fb5f71faf78","fileSHA256":"LJXowmdeeZM1_QBGuwfb2gbLfs_1HtN5IsYwnWGcxNM","storageKey":"jeqOrdQBNY4hgl04B3wtGs8QNWMDmjvbjIMUXPtOBpw","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02d5848f62ade9617cf96894727d32e7","fileSHA256":"u1-8zHOj9oxS8maH-7JbShJIq1-KEV7FXnrGpEUcR-4","storageKey":"LMUvUZZpdGFb7KqaB_l9N4TXTkFn1Pw92ws9fWDNZPw","contentType":"model/gltf-binary","fileExtension":".glb"},{"bundleKey":"6013c27e421ab23c826713af3ebec891","fileSHA256":"dutQNnvzTCS4NgwvbeMbvhro5QnW0GJUeY_4rrvlcLY","storageKey":"85KB9Jr7eqz1Jwt1mYQGRzTy6ZXyO0j7ZcaLImCbzkU","contentType":"image/jpeg","fileExtension":".jpg"}],"launchAsset":{"bundleKey":"76ec49faddaef30ba78fe50edc5ab3d6","fileSHA256":"OLUdgP-fZI2shwGS5qlIk7nWnybL_13RJl5xR85CDBU","storageKey":"OCvI0-34zApbdo3eSGfIaQUbWdZeLeKH-nJSeedKTFs","contentType":"application/javascript","fileExtension":".bundle"}}',
+        isRollBackToEmbedded: false,
+        manifestPermalink: 'https://u.expo.dev/update/f04aafc1-0bf5-4548-8c35-726b467e7c40',
+        gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
+        actor: {
+          __typename: 'User',
+          id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
+          username: 'quintest113',
+        },
+        branch: {
+          id: '6941a8dd-5c0a-48bc-8876-f49c88ed419f',
+          name: 'production',
+          __typename: 'UpdateBranch',
+        },
+        codeSigningInfo: null,
+        __typename: 'Update',
+      },
+      {
+        id: 'd8d15786-2727-407f-bf3e-f4bda7e397d9',
+        group: 'e40ad156-e9af-4cc2-8e9d-c7b5c328db48',
+        message: 'fix bug',
+        createdAt: '2023-06-23T23:37:10.004Z',
+        runtimeVersion: 'exposdk:48.0.0',
+        platform: 'android',
+        manifestFragment:
+          '{"extra":{"expoClient":{"ios":{"supportsTablet":true,"bundleIdentifier":"com.quintest113.updatestest4"},"web":{"favicon":"./assets/favicon.png"},"icon":"./assets/icon.png","name":"updates-test-4","slug":"updates-test-4","extra":{"eas":{"projectId":"789a8784-0186-4f41-8bd2-7f219291a2b8"}},"splash":{"image":"./assets/splash.png","resizeMode":"contain","backgroundColor":"#ffffff"},"android":{"package":"com.quintest113.updatestest4","adaptiveIcon":{"backgroundColor":"#ffffff","foregroundImage":"./assets/adaptive-icon.png"}},"updates":{"url":"https://u.expo.dev/789a8784-0186-4f41-8bd2-7f219291a2b8"},"version":"1.0.0","platforms":["ios","android"],"sdkVersion":"48.0.0","orientation":"portrait","runtimeVersion":{"policy":"sdkVersion"},"currentFullName":"@quintest113/updates-test-4","originalFullName":"@quintest113/updates-test-4","userInterfaceStyle":"light","assetBundlePatterns":["**/*"]}},"assets":[{"bundleKey":"778ffc9fe8773a878e9c30a6304784de","fileSHA256":"i2Gkx-9w3JJ1PwSUl2SC9m_UFQ7CPfx3KrZeEDc6-lU","storageKey":"idnX8z03q4vGLzhYMPaQGBADjhqvWe67_afPqJ1vGzM","contentType":"image/png","fileExtension":".png"},{"bundleKey":"376d6a4c7f622917c39feb23671ef71d","fileSHA256":"QJsG0VpGM-5viirUgoKq0M4zQ_TYyPfLhAhN5mrM54I","storageKey":"46DQ95-UdSKiRkQgt5FyXkE1FrKOT9tBZP3nS7auKlg","contentType":"image/png","fileExtension":".png"},{"bundleKey":"c79c3606a1cf168006ad3979763c7e0c","fileSHA256":"kGZm3WiTRq2iMs42ia3vkHtCV_obWT8DY40rlJf2SIQ","storageKey":"k-3xHp3vP8mR36WdccUZVPTRJKpP-zlyboWdkXCIQpQ","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02bc1fa7c0313217bde2d65ccbff40c9","fileSHA256":"_6fuRbdkBbpzkhSVAI99aMneY5X0tpQdsGNGX244IyA","storageKey":"lfqeUjiWFXwowhxVDBEzxsbTOEzYxMLebljy5Bh1mpU","contentType":"image/png","fileExtension":".png"},{"bundleKey":"35ba0eaec5a4f5ed12ca16fabeae451d","fileSHA256":"hM9es7ICUPaeDkczvrTaX0F_BoKJKlrRteYlcHU8IbE","storageKey":"fMoMrsUeB5xWw_Ugn8FqGJf-M2pld2hkXKR704z0MM8","contentType":"image/png","fileExtension":".png"},{"bundleKey":"5223c8d9b0d08b82a5670fb5f71faf78","fileSHA256":"LJXowmdeeZM1_QBGuwfb2gbLfs_1HtN5IsYwnWGcxNM","storageKey":"jeqOrdQBNY4hgl04B3wtGs8QNWMDmjvbjIMUXPtOBpw","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02d5848f62ade9617cf96894727d32e7","fileSHA256":"u1-8zHOj9oxS8maH-7JbShJIq1-KEV7FXnrGpEUcR-4","storageKey":"LMUvUZZpdGFb7KqaB_l9N4TXTkFn1Pw92ws9fWDNZPw","contentType":"model/gltf-binary","fileExtension":".glb"},{"bundleKey":"6013c27e421ab23c826713af3ebec891","fileSHA256":"dutQNnvzTCS4NgwvbeMbvhro5QnW0GJUeY_4rrvlcLY","storageKey":"85KB9Jr7eqz1Jwt1mYQGRzTy6ZXyO0j7ZcaLImCbzkU","contentType":"image/jpeg","fileExtension":".jpg"}],"launchAsset":{"bundleKey":"f4c6981626dbabcf51078d07a1611f4e","fileSHA256":"q-k1hSWl49aXpSg4jOSaVVnYFSFL6xf7HVl_TQE-ObM","storageKey":"FwK1PaZqtpL0QZIgaHsxU1AV93JhMdu9K1wZizXROAc","contentType":"application/javascript","fileExtension":".bundle"}}',
+        isRollBackToEmbedded: false,
+        manifestPermalink: 'https://u.expo.dev/update/d8d15786-2727-407f-bf3e-f4bda7e397d9',
+        gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
+        actor: {
+          __typename: 'User',
+          id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
+          username: 'quintest113',
+        },
+        branch: {
+          id: '6941a8dd-5c0a-48bc-8876-f49c88ed419f',
+          name: 'production',
+          __typename: 'UpdateBranch',
+        },
+        codeSigningInfo: null,
+        __typename: 'Update',
+      },
+    ],
+  ],
+  __typename: 'UpdateBranch',
+};
+export const testChannelObject: UpdateChannelObject = {
+  id: '9309afc2-9752-40db-8ef7-4abc10744c61',
+  name: 'production',
+  createdAt: '2023-05-16T21:26:16.946Z',
+  branchMapping:
+    '{"data":[{"branchId":"754bf17f-efc0-46ab-8a59-a03f20e53e9b","branchMappingLogic":{"operand":0.15,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"6941a8dd-5c0a-48bc-8876-f49c88ed419f","branchMappingLogic":"true"}],"version":0}',
+  updateBranches: [testUpdateBranch1, testUpdateBranch2],
+  __typename: 'UpdateChannel',
+};
+
+export const testBasicChannelInfo: UpdateChannelBasicInfoFragment = {
+  id: '9309afc2-9752-40db-8ef7-4abc10744c61',
+  name: 'production',
+  branchMapping:
+    '{"data":[{"branchId":"754bf17f-efc0-46ab-8a59-a03f20e53e9b","branchMappingLogic":{"operand":0.1,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"6941a8dd-5c0a-48bc-8876-f49c88ed419f","branchMappingLogic":"true"}],"version":0}',
+  __typename: 'UpdateChannel',
+};
+
+export const testBasicChannelInfo2: UpdateChannelBasicInfoFragment = {
+  id: '9d5c7bf0-d52d-474c-9140-c1bad7f0de9d',
+  name: 'staging',
+  branchMapping:
+    '{"data":[{"branchId":"d7d68e32-d9c9-4a8d-8d1b-21e53100a5e8","branchMappingLogic":{"operand":0.1,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"f9f708c2-0c91-4360-b2a4-0b61834aef4a","branchMappingLogic":"true"}],"version":0}',
+  __typename: 'UpdateChannel',
+};
@@ -0,0 +1,11 @@
+import { getUpdateBranch } from '../utils';
+import { channelInfoWithBranches, testBasicBranchInfo1 } from './branch-mapping-fixtures';
+
+describe(getUpdateBranch, () => {
+  it('gets the update branch', () => {
+    expect(getUpdateBranch(channelInfoWithBranches, '754bf17f-efc0-46ab-8a59-a03f20e53e9b')).toBe(
+      testBasicBranchInfo1
+    );
+    expect(() => getUpdateBranch(channelInfoWithBranches, 'not-a-branch-ID')).toThrow();
+  });
+});
@@ -0,0 +1,107 @@
+import { EASUpdateAction, EASUpdateContext, NonInteractiveError } from '../../eas-update/utils';
+import { UpdateChannelBasicInfoFragment } from '../../graphql/generated';
+import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
+import {
+  Connection,
+  Edge,
+  FilterPagination,
+  QueryParams,
+  selectPaginatedAsync,
+} from '../../utils/relay';
+
+/**
+ * Select a channel for the project.
+ *
+ * @constructor
+ * @param {function} options.filterPredicate - A predicate to filter the channels that are shown to the user. It takes a channelInfo object as a parameter and returns a boolean.
+ * @param {string} options.printedType - The type of channel printed to the user. Defaults to 'channel'.
+ * @param {number} options.pageSize - The number of channels to show per page. Defaults to 100.
+ * @param {function} options.beforeEachFilterQuery Optional. If a filter predicate was specified, this callback function will be called before each query.
+ * @args externalQueryParams The query params for the pagination.
+ * @args totalNodesFetched The total number of nodes fetched so far.
+ * @args dataset The dataset so far.
+ * @param {function} options.afterEachFilterQuery Optional. If a filter predicate was specified, this callback function will be called after each query.
+ * @args externalQueryParams The query params for the pagination.
+ * @args totalNodesFetched The total number of nodes fetched so far.
+ * @args dataset The dataset so far.
+ * @args willFetchAgain If the query will fetch again to get a complete page.
+ */
+export class SelectChannel implements EASUpdateAction<UpdateChannelBasicInfoFragment | null> {
+  constructor(
+    private options: {
+      filterPredicate?: (channelInfo: UpdateChannelBasicInfoFragment) => boolean;
+      printedType?: string;
+      pageSize?: number;
+      beforeEachFilterQuery?: (
+        externalQueryParams: QueryParams,
+        totalNodesFetched: number,
+        dataset: Edge<UpdateChannelBasicInfoFragment>[]
+      ) => void;
+      afterEachFilterQuery?: (
+        externalQueryParams: QueryParams,
+        totalNodesFetched: number,
+        dataset: Edge<UpdateChannelBasicInfoFragment>[],
+        willFetchAgain: boolean
+      ) => void;
+    } = {}
+  ) {}
+
+  async queryAsync(
+    ctx: EASUpdateContext,
+    queryParams: QueryParams
+  ): Promise<Connection<UpdateChannelBasicInfoFragment>> {
+    const { graphqlClient, app } = ctx;
+    const { projectId } = app;
+    return await ChannelQuery.viewUpdateChannelsBasicInfoPaginatedOnAppAsync(graphqlClient, {
+      appId: projectId,
+      ...queryParams,
+    });
+  }
+
+  async filterQueryAsync(
+    ctx: EASUpdateContext,
+    queryParams: QueryParams,
+    filterPredicate: (channelInfo: UpdateChannelBasicInfoFragment) => boolean
+  ): Promise<Connection<UpdateChannelBasicInfoFragment>> {
+    const queryAsync = async (
+      queryParams: QueryParams
+    ): Promise<Connection<UpdateChannelBasicInfoFragment>> =>
+      await this.queryAsync(ctx, queryParams);
+    return await FilterPagination.getPageAsync({
+      queryParams,
+      queryAsync,
+      filterPredicate,
+      beforeEachQuery: this.options.beforeEachFilterQuery,
+      afterEachQuery: this.options.afterEachFilterQuery,
+    });
+  }
+
+  public async runAsync(ctx: EASUpdateContext): Promise<UpdateChannelBasicInfoFragment | null> {
+    const { nonInteractive } = ctx;
+    const { filterPredicate } = this.options;
+    const printedType = this.options.printedType ?? 'channel';
+    const pageSize = this.options.pageSize ?? 100;
+    if (nonInteractive) {
+      throw new NonInteractiveError(
+        `${printedType} selection cannot be run in non-interactive mode.`
+      );
+    }
+
+    const queryAsync = async (
+      queryParams: QueryParams
+    ): Promise<Connection<UpdateChannelBasicInfoFragment>> =>
+      filterPredicate
+        ? this.filterQueryAsync(ctx, queryParams, filterPredicate)
+        : this.queryAsync(ctx, queryParams);
+
+    const getTitleAsync = async (channelInfo: UpdateChannelBasicInfoFragment): Promise<string> =>
+      channelInfo.name;
+
+    return await selectPaginatedAsync({
+      queryAsync,
+      getTitleAsync,
+      printedType,
+      pageSize,
+    });
+  }
+}
@@ -0,0 +1,92 @@
+import { createCtxMock } from '../../../eas-update/__tests__/fixtures';
+import { NonInteractiveError } from '../../../eas-update/utils';
+import { UpdateChannelBasicInfoFragment } from '../../../graphql/generated';
+import { ChannelQuery } from '../../../graphql/queries/ChannelQuery';
+import { promptAsync } from '../../../prompts';
+import { testBasicChannelInfo, testBasicChannelInfo2 } from '../../__tests__/fixtures';
+import { SelectChannel } from '../SelectChannel';
+
+jest.mock('../../../prompts');
+jest.mock('../../../graphql/queries/ChannelQuery');
+describe(SelectChannel, () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  it('returns null if project has no channels', async () => {
+    const ctx = createCtxMock();
+    jest.mocked(ChannelQuery.viewUpdateChannelsBasicInfoPaginatedOnAppAsync).mockResolvedValue({
+      edges: [],
+      pageInfo: {
+        hasPreviousPage: false,
+        hasNextPage: false,
+      },
+    });
+    const selectChannel = new SelectChannel();
+    const channel = await selectChannel.runAsync(ctx);
+    expect(channel).toBeNull();
+  });
+  it('still prompts if project has only one channel', async () => {
+    const ctx = createCtxMock();
+    jest.mocked(ChannelQuery.viewUpdateChannelsBasicInfoPaginatedOnAppAsync).mockResolvedValue({
+      edges: [{ node: testBasicChannelInfo, cursor: 'cursor' }],
+      pageInfo: {
+        hasPreviousPage: false,
+        hasNextPage: false,
+      },
+    });
+    jest.mocked(promptAsync).mockImplementation(async () => ({
+      item: testBasicChannelInfo,
+    }));
+    const selectChannel = new SelectChannel();
+    const channel = await selectChannel.runAsync(ctx);
+    expect(channel).toBe(testBasicChannelInfo);
+    expect(promptAsync).toHaveBeenCalledTimes(1);
+  });
+  it('returns the selected channel', async () => {
+    jest.mocked(ChannelQuery.viewUpdateChannelsBasicInfoPaginatedOnAppAsync).mockResolvedValue({
+      edges: [
+        { node: testBasicChannelInfo, cursor: 'cursor' },
+        { node: testBasicChannelInfo2, cursor: 'cursor' },
+      ],
+      pageInfo: {
+        hasPreviousPage: false,
+        hasNextPage: false,
+      },
+    });
+    jest.mocked(promptAsync).mockImplementation(async () => ({
+      item: testBasicChannelInfo,
+    }));
+    const ctx = createCtxMock();
+    const selectChannel = new SelectChannel();
+    const channel = await selectChannel.runAsync(ctx);
+    expect(channel).toBe(testBasicChannelInfo);
+  });
+  it('returns the only available channel with a filter', async () => {
+    jest.mocked(ChannelQuery.viewUpdateChannelsBasicInfoPaginatedOnAppAsync).mockResolvedValue({
+      edges: [
+        { node: testBasicChannelInfo, cursor: 'cursor' },
+        { node: testBasicChannelInfo2, cursor: 'cursor' },
+      ],
+      pageInfo: {
+        hasPreviousPage: false,
+        hasNextPage: false,
+      },
+    });
+    const ctx = createCtxMock();
+    const selectChannel = new SelectChannel({
+      filterPredicate: (channelInfo: UpdateChannelBasicInfoFragment) =>
+        channelInfo === testBasicChannelInfo,
+    });
+    const channel = await selectChannel.runAsync(ctx);
+    expect(channel).toBe(testBasicChannelInfo);
+  });
+  it('throws an error in Non-Interactive Mode', async () => {
+    const ctx = createCtxMock({
+      nonInteractive: true,
+    });
+    const selectChannel = new SelectChannel();
+
+    // dont fail if users are running in non-interactive mode
+    await expect(selectChannel.runAsync(ctx)).rejects.toThrowError(NonInteractiveError);
+  });
+});
@@ -0,0 +1,214 @@
+import { ChannelBasicInfo } from './utils';
+
+// 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 type AlwaysTrueBranchMapping = {
+  version: number;
+  data: [
+    {
+      branchId: string;
+      branchMappingLogic: BranchMappingAlwaysTrue;
+    }
+  ];
+};
+
+export type EmptyBranchMapping = {
+  version: number;
+  data: [];
+};
+
+export function getEmptyBranchMapping(): EmptyBranchMapping {
+  return {
+    version: 0,
+    data: [],
+  };
+}
+
+export function getAlwaysTrueBranchMapping(branchId: string): AlwaysTrueBranchMapping {
+  return {
+    version: 0,
+    data: [
+      {
+        branchId,
+        branchMappingLogic: 'true',
+      },
+    ],
+  };
+}
+
+export function hasEmptyBranchMap(channelInfo: ChannelBasicInfo): boolean {
+  const branchMapping = getBranchMapping(channelInfo.branchMapping);
+  return isEmptyBranchMapping(branchMapping);
+}
+
+export function hasStandardBranchMap(channelInfo: ChannelBasicInfo): boolean {
+  const branchMapping = getBranchMapping(channelInfo.branchMapping);
+  return isAlwaysTrueBranchMapping(branchMapping);
+}
+
+export function getStandardBranchId(channelInfo: ChannelBasicInfo): string {
+  const branchMapping = getBranchMapping(channelInfo.branchMapping);
+  assertAlwaysTrueBranchMapping(branchMapping);
+  return getBranchIdFromStandardMapping(branchMapping);
+}
+
+export function isEmptyBranchMapping(
+  branchMapping: BranchMapping
+): branchMapping is EmptyBranchMapping {
+  return branchMapping.data.length === 0;
+}
+
+export function isAlwaysTrueBranchMapping(
+  branchMapping: BranchMapping
+): branchMapping is AlwaysTrueBranchMapping {
+  const numBranches = branchMapping.data.length;
+  if (numBranches !== 1) {
+    return false;
+  }
+  const branchMappingLogic = branchMapping.data[0].branchMappingLogic;
+  return isAlwaysTrue(branchMappingLogic);
+}
+
+function getBranchIdFromStandardMapping(branchMapping: AlwaysTrueBranchMapping): string {
+  return branchMapping.data[0].branchId;
+}
+
+export function getBranchIds(branchMapping: BranchMapping): string[] {
+  return branchMapping.data.map(data => data.branchId);
+}
+
+export function getBranchMapping(branchMappingString: string): BranchMapping {
+  try {
+    return JSON.parse(branchMappingString);
+  } catch {
+    throw new Error(`Could not parse branchMapping string into a JSON: "${branchMappingString}"`);
+  }
+}
+
+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';
+}
+
+function isVersion(branchMapping: BranchMapping, version: number): boolean {
+  return branchMapping.version === version;
+}
+
+export function assertVersion(channelInfo: ChannelBasicInfo, version: number): void {
+  const branchMapping = getBranchMapping(channelInfo.branchMapping);
+  if (!isVersion(branchMapping, version)) {
+    throw new BranchMappingValidationError(
+      `Expected branch mapping version ${version}. Received: ${JSON.stringify(branchMapping)}`
+    );
+  }
+}
+
+export function assertStatement(node: BranchMappingNode): asserts node is BranchMappingStatement {
+  if (!isStatement(node)) {
+    throw new BranchMappingValidationError(
+      'Branch mapping node must be a statement. Received: ' + JSON.stringify(node)
+    );
+  }
+}
+
+export function assertNodeObject(node: BranchMappingNode): asserts node is BranchMappingObject {
+  if (!isNodeObject(node)) {
+    throw new BranchMappingValidationError(
+      'Branch mapping node must be an object. Received: ' + JSON.stringify(node)
+    );
+  }
+}
+
+export function assertNumber(operand: string | number | string[]): asserts operand is number {
+  if (typeof operand !== 'number') {
+    throw new BranchMappingValidationError(
+      'Expected a number. Received: ' + JSON.stringify(operand)
+    );
+  }
+}
+
+export function assertString(operand: string | number | string[]): asserts operand is string {
+  if (typeof operand !== 'string') {
+    throw new BranchMappingValidationError(
+      'Expected a string. Received: ' + JSON.stringify(operand)
+    );
+  }
+}
+
+function assertAlwaysTrueBranchMapping(
+  branchMapping: BranchMapping
+): asserts branchMapping is AlwaysTrueBranchMapping {
+  if (!isAlwaysTrueBranchMapping(branchMapping)) {
+    throw new BranchMappingValidationError(
+      'Expected standard branch mapping. Received: ' + JSON.stringify(branchMapping)
+    );
+  }
+}
+
+export class BranchMappingValidationError extends Error {}
@@ -0,0 +1,52 @@
+import assert from 'assert';
+import chalk from 'chalk';
+
+import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
+import Log from '../log';
+import { getRollout, isRollout } from '../rollout/branch-mapping';
+import {
+  FormattedBranchDescription,
+  formatBranch,
+  getUpdateGroupDescriptionsWithBranch,
+} from '../update/utils';
+import { assertVersion, hasEmptyBranchMap, hasStandardBranchMap } from './branch-mapping';
+
+export function logChannelDetails(channel: UpdateChannelObject): void {
+  assertVersion(channel, 0);
+  assert(
+    hasEmptyBranchMap(channel) || hasStandardBranchMap(channel) || isRollout(channel),
+    'Only standard branch mappings and rollouts are supported.'
+  );
+
+  const branchDescription = channel.updateBranches.flatMap(branch => {
+    const updateGroupWithBranchDescriptions = getUpdateGroupDescriptionsWithBranch(
+      branch.updateGroups
+    );
+    const maybeRollout = isRollout(channel) ? getRollout(channel) : null;
+    let maybePercentOnBranch: number | undefined = undefined;
+    if (maybeRollout) {
+      maybePercentOnBranch =
+        maybeRollout.rolledOutBranchId === branch.id
+          ? maybeRollout.percentRolledOut
+          : 100 - maybeRollout.percentRolledOut;
+    }
+
+    return updateGroupWithBranchDescriptions.map(
+      ({ branch, ...updateGroup }): FormattedBranchDescription => ({
+        branch,
+        branchRolloutPercentage: maybePercentOnBranch,
+        update: updateGroup,
+      })
+    );
+  });
+
+  if (branchDescription.length === 0) {
+    Log.log(chalk.dim('No branches are pointed to this channel.'));
+  } else {
+    Log.log(
+      branchDescription
+        .map(description => formatBranch(description))
+        .join(`\n\n${chalk.dim('———')}\n\n`)
+    );
+  }
+}
@@ -1,6 +1,9 @@
 import chalk from 'chalk';
+import { print } from 'graphql';
 import gql from 'graphql-tag';

+import { createUpdateBranchOnAppAsync } from '../branch/queries';
+import { BranchNotFoundError } from '../branch/utils';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { withErrorHandlingAsync } from '../graphql/client';
@@ -12,14 +15,18 @@ import {
 } from '../graphql/generated';
 import { BranchQuery, UpdateBranchOnChannelObject } from '../graphql/queries/BranchQuery';
 import { ChannelQuery, UpdateChannelObject } from '../graphql/queries/ChannelQuery';
+import { UpdateChannelBasicInfoFragmentNode } from '../graphql/types/UpdateChannelBasicInfo';
 import Log from '../log';
+import { getDisplayNameForProjectIdAsync } from '../project/projectUtils';
 import formatFields from '../utils/formatFields';
 import { printJsonOnlyOutput } from '../utils/json';
 import {
  paginatedQueryWithConfirmPromptAsync,
  paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
-import { logChannelDetails } from './utils';
+import { ChannelNotFoundError } from './errors';
+import { logChannelDetails } from './print-utils';
+import { ChannelBasicInfo } from './utils';

 export const CHANNELS_LIMIT = 25;

@@ -227,11 +234,11 @@ export async function createChannelOnAppAsync(
            updateChannel {
              createUpdateChannelForApp(appId: $appId, name: $name, branchMapping: $branchMapping) {
                id
-                name
-                branchMapping
+                ...UpdateChannelBasicInfoFragment
              }
            }
          }
+          ${print(UpdateChannelBasicInfoFragmentNode)}
        `,
        {
          appId,
@@ -262,3 +269,101 @@ export async function ensureChannelExistsAsync(
    }
  }
 }
+
+export async function doesChannelExistAsync(
+  graphqlClient: ExpoGraphqlClient,
+  { appId, channelName }: { appId: string; channelName: string }
+): Promise<boolean> {
+  try {
+    await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
+      appId,
+      channelName,
+    });
+  } catch (err) {
+    if (err instanceof ChannelNotFoundError) {
+      return false;
+    }
+    throw err;
+  }
+  return true;
+}
+
+/**
+ *
+ * Creates a channel and links it to a branch with the same name.
+ *
+ * @param appId the app ID, also known as the project ID
+ * @param channelName the name of the channel to create
+ * @param shouldPrintJson print only the JSON output
+ */
+export async function createAndLinkChannelAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    appId,
+    channelName,
+    shouldPrintJson,
+  }: { appId: string; channelName: string; shouldPrintJson?: boolean }
+): Promise<ChannelBasicInfo> {
+  let branchId: string;
+  let branchMessage: string;
+
+  try {
+    const branch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
+      appId,
+      name: channelName,
+    });
+    branchId = branch.id;
+    branchMessage = `We found a branch with the same name`;
+  } catch (error) {
+    if (error instanceof BranchNotFoundError) {
+      const newBranch = await createUpdateBranchOnAppAsync(graphqlClient, {
+        appId,
+        name: channelName,
+      });
+      branchId = newBranch.id;
+      branchMessage = `We also went ahead and made a branch with the same name`;
+    } else {
+      throw error;
+    }
+  }
+
+  const {
+    updateChannel: { createUpdateChannelForApp: newChannel },
+  } = await createChannelOnAppAsync(graphqlClient, {
+    appId,
+    channelName,
+    branchId,
+  });
+
+  if (!newChannel) {
+    throw new Error(
+      `Could not create channel with name ${channelName} on project with id ${appId}`
+    );
+  }
+
+  if (shouldPrintJson) {
+    printJsonOnlyOutput(newChannel);
+  } else {
+    Log.addNewLineIfNone();
+    Log.withTick(
+      `Created a new channel on project ${chalk.bold(
+        await getDisplayNameForProjectIdAsync(graphqlClient, appId)
+      )}`
+    );
+    Log.log(
+      formatFields([
+        { label: 'Name', value: newChannel.name },
+        { label: 'ID', value: newChannel.id },
+      ])
+    );
+    Log.addNewLineIfNone();
+    Log.withTick(`${branchMessage} and have pointed the channel at it.`);
+    Log.log(
+      formatFields([
+        { label: 'Name', value: newChannel.name },
+        { label: 'ID', value: branchId },
+      ])
+    );
+  }
+  return newChannel;
+}
@@ -1,117 +1,35 @@
-import assert from 'assert';
-import chalk from 'chalk';
-
-import { 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;
-  }[];
+export type ChannelBasicInfo = {
+  id: string;
+  name: string;
+  branchMapping: string;
+};
+export type BranchBasicInfo = {
+  id: string;
+  name: string;
 };

-/**
- * Get the branch mapping and determine whether it is a rollout.
- * Ensure that the branch mapping is properly formatted.
- */
-export function getBranchMapping(branchMappingString?: string): {
-  branchMapping: BranchMapping;
-  isRollout: boolean;
-  rolloutPercent?: number;
-} {
-  if (!branchMappingString) {
-    throw new Error('Missing branch mapping.');
-  }
-  let branchMapping: BranchMapping;
-  try {
-    branchMapping = JSON.parse(branchMappingString);
-  } catch {
-    throw new Error(`Could not parse branchMapping string into a JSON: "${branchMappingString}"`);
-  }
-  assert(branchMapping, 'Branch Mapping must be defined.');
+export type UpdateChannelInfoWithBranches<Branch extends BranchBasicInfo> = ChannelBasicInfo & {
+  updateBranches: Branch[];
+};

-  if (branchMapping.version !== 0) {
-    throw new Error('Branch mapping must be version 0.');
-  }
-
-  const isRollout = branchMapping.data.length === 2;
-  const rolloutPercent = branchMapping.data[0]?.branchMappingLogic.operand;
-
-  switch (branchMapping.data.length) {
-    case 0:
-      break;
-    case 1:
-      if (branchMapping.data[0].branchMappingLogic !== 'true') {
-        throw new Error('Branch mapping logic for a single branch must be "true"');
-      }
-      break;
-    case 2:
-      if (branchMapping.data[0].branchMappingLogic.clientKey !== 'rolloutToken') {
-        throw new Error('Client key of initial branch mapping must be "rolloutToken"');
-      }
-      if (branchMapping.data[0].branchMappingLogic.branchMappingOperator !== 'hash_lt') {
-        throw new Error('Branch mapping operator of initial branch mapping must be "hash_lt"');
-      }
-      if (rolloutPercent == null) {
-        throw new Error('Branch mapping is missing a "rolloutPercent"');
-      }
-      if (branchMapping.data[1].branchMappingLogic !== 'true') {
-        throw new Error('Branch mapping logic for a the second branch of a rollout must be "true"');
-      }
-      break;
-    default:
-      throw new Error('Branch mapping data must have length less than or equal to 2.');
-  }
-
-  return { branchMapping, isRollout, rolloutPercent };
+function getUpdateBranchNullable<Branch extends BranchBasicInfo>(
+  channel: UpdateChannelInfoWithBranches<Branch>,
+  branchId: string
+): Branch | null {
+  const updateBranches = channel.updateBranches;
+  const updateBranch = updateBranches.find(branch => branch.id === branchId);
+  return updateBranch ?? null;
 }

-export function logChannelDetails(channel: UpdateChannelObject): void {
-  const { branchMapping, isRollout, rolloutPercent } = getBranchMapping(channel.branchMapping);
-  if (branchMapping.data.length > 2) {
-    throw new Error('Branch Mapping data must have length less than or equal to 2.');
-  }
-
-  const rolloutBranchIds = branchMapping.data.map(data => data.branchId);
-  const branchDescription = channel.updateBranches.flatMap(branch => {
-    const updateGroupWithBranchDescriptions = getUpdateGroupDescriptionsWithBranch(
-      branch.updateGroups
-    );
-
-    const isRolloutBranch = isRollout && rolloutBranchIds.includes(branch.id);
-    const isBaseBranch = rolloutBranchIds.length > 0 && rolloutBranchIds[0] === branch.id;
-    let rolloutPercentNumber: number | undefined = undefined;
-    if (isRolloutBranch) {
-      rolloutPercentNumber = isBaseBranch ? rolloutPercent! * 100 : (1 - rolloutPercent!) * 100;
-    }
-
-    return updateGroupWithBranchDescriptions.map(
-      ({ branch, ...updateGroup }): FormattedBranchDescription => ({
-        branch,
-        branchRolloutPercentage: rolloutPercentNumber,
-        update: updateGroup,
-      })
-    );
-  });
-
-  if (branchDescription.length === 0) {
-    Log.log(chalk.dim('No branches are pointed to this channel.'));
-  } else {
-    Log.log(
-      branchDescription
-        .map(description => formatBranch(description))
-        .join(`\n\n${chalk.dim('———')}\n\n`)
+export function getUpdateBranch<Branch extends BranchBasicInfo>(
+  channel: UpdateChannelInfoWithBranches<Branch>,
+  branchId: string
+): Branch {
+  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 {
@@ -193,16 +194,30 @@ export default abstract class EasCommand extends Command {
    if (err instanceof EasCommandError) {
      Log.error(err.message);
    } else if (err instanceof CombinedError && err?.graphQLErrors) {
-      let cleanMessage = err.message.replace('[GraphQL] ', '');
-      cleanMessage += err?.graphQLErrors?.[0]?.extensions?.requestId
-        ? `\nRequest ID: ${err.graphQLErrors[0].extensions.requestId}`
-        : '';
+      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;
  }
 }
@@ -172,6 +172,44 @@ describe(EasCommand.name, () => {
        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');
@@ -186,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(() => {
@@ -200,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,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: {
@@ -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 { getPrivateExpoConfig } from '../../../project/expoConfig';
+import { createOrModifyExpoConfigAsync, getPrivateExpoConfig } from '../../../project/expoConfig';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { toAppPrivacy } from '../../../project/projectUtils';
 import SessionManager from '../../../user/SessionManager';
@@ -25,7 +25,7 @@ export async function saveProjectIdToAppConfigAsync(
  options: { env?: Env } = {}
 ): Promise<void> {
  const exp = getPrivateExpoConfig(projectDir, options);
-  const result = await modifyConfigAsync(
+  const result = await createOrModifyExpoConfigAsync(
    projectDir,
    {
      extra: { ...exp.extra, eas: { ...exp.extra?.eas, projectId } },
@@ -160,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');
  }
 }
@@ -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';

@@ -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) {
@@ -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) {
@@ -68,6 +68,7 @@ export default class BuildVersionGetView extends EasCommand {
      easJsonAccessor,
      platforms,
      profileName: flags.profile ?? undefined,
+      projectDir,
    });
    const results: { [key in Platform]?: string } = {};
    for (const { profile, platform } of buildProfiles) {
@@ -80,6 +80,7 @@ export default class BuildVersionSyncView extends EasCommand {
      easJsonAccessor,
      platforms,
      profileName: flags.profile ?? undefined,
+      projectDir,
    });
    for (const profileInfo of buildProfiles) {
      const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
@@ -1,16 +1,11 @@
 import chalk from 'chalk';

-import { createUpdateBranchOnAppAsync } from '../../branch/queries';
-import { BranchNotFoundError } from '../../branch/utils';
-import { createChannelOnAppAsync } from '../../channel/queries';
+import { createAndLinkChannelAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import Log from '../../log';
-import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import formatFields from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { enableJsonOutput } from '../../utils/json';

 export default class ChannelCreate extends EasCommand {
  static override description = 'create a channel';
@@ -60,69 +55,13 @@ export default class ChannelCreate extends EasCommand {
      }));
    }

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

-    if (!newChannel) {
-      throw new Error(
-        `Could not create channel with name ${channelName} on project with id ${projectId}`
-      );
-    }
-
-    if (jsonFlag) {
-      printJsonOnlyOutput(newChannel);
-    } else {
-      Log.addNewLineIfNone();
-      Log.withTick(
-        `Created a new channel on project ${chalk.bold(
-          await getDisplayNameForProjectIdAsync(graphqlClient, projectId)
-        )}`
-      );
-      Log.log(
-        formatFields([
-          { label: 'Name', value: newChannel.name },
-          { label: 'ID', value: newChannel.id },
-        ])
-      );
-      Log.addNewLineIfNone();
-      Log.withTick(`${branchMessage} and have pointed the channel at it.`);
-      Log.log(
-        formatFields([
-          { label: 'Name', value: newChannel.name },
-          { label: 'ID', value: branchId },
-        ])
-      );
-
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('You can now update your app by publishing!'));
-    }
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('You can now update your app by publishing!'));
  }
 }
@@ -1,26 +1,31 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
+import { print } from 'graphql';
 import gql from 'graphql-tag';

 import { selectBranchOnAppAsync } from '../../branch/queries';
+import { hasEmptyBranchMap, hasStandardBranchMap } from '../../channel/branch-mapping';
 import { selectChannelOnAppAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { withErrorHandlingAsync } from '../../graphql/client';
 import {
+  UpdateChannelBasicInfoFragment,
  UpdateChannelBranchMappingMutation,
  UpdateChannelBranchMappingMutationVariables,
 } from '../../graphql/generated';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
+import { UpdateChannelBasicInfoFragmentNode } from '../../graphql/types/UpdateChannelBasicInfo';
 import Log from '../../log';
+import { isRollout } from '../../rollout/branch-mapping';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export async function updateChannelBranchMappingAsync(
  graphqlClient: ExpoGraphqlClient,
  { channelId, branchMapping }: UpdateChannelBranchMappingMutationVariables
-): Promise<UpdateChannelBranchMappingMutation['updateChannel']['editUpdateChannel']> {
+): Promise<UpdateChannelBasicInfoFragment> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .mutation<UpdateChannelBranchMappingMutation, UpdateChannelBranchMappingMutationVariables>(
@@ -29,11 +34,11 @@ export async function updateChannelBranchMappingAsync(
            updateChannel {
              editUpdateChannel(channelId: $channelId, branchMapping: $branchMapping) {
                id
-                name
-                branchMapping
+                ...UpdateChannelBasicInfoFragment
              }
            }
          }
+          ${print(UpdateChannelBasicInfoFragmentNode)}
        `,
        { channelId, branchMapping }
      )
@@ -95,8 +100,10 @@ export default class ChannelEdit extends EasCommand {
          paginatedQueryOptions: { json, nonInteractive, offset: 0 },
        });

-    if (existingChannel.updateBranches.length > 1) {
+    if (isRollout(existingChannel)) {
      throw new Error('There is a rollout in progress. Manage it with "channel:rollout" instead.');
+    } else if (!hasStandardBranchMap(existingChannel) && !hasEmptyBranchMap(existingChannel)) {
+      throw new Error('Only standard branch mappings can be edited with this command.');
    }

    const branch = branchFlag
@@ -1,297 +1,49 @@
 import { Flags } from '@oclif/core';
-import chalk from 'chalk';

-import { selectBranchOnAppAsync } from '../../branch/queries';
-import { selectChannelOnAppAsync } from '../../channel/queries';
-import { BranchMapping, 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 Log from '../../log';
-import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
-import { promptAsync, selectAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { updateChannelBranchMappingAsync } from './edit';
+import { NonInteractiveOptions as CreateRolloutNonInteractiveOptions } from '../../rollout/actions/CreateRollout';
+import { NonInteractiveOptions as EditRolloutNonInteractiveOptions } from '../../rollout/actions/EditRollout';
+import {
+  EndOutcome,
+  GeneralOptions as EndRolloutGeneralOptions,
+  NonInteractiveOptions as EndRolloutNonInteractiveOptions,
+} from '../../rollout/actions/EndRollout';
+import { ManageRolloutActions } from '../../rollout/actions/ManageRollout';
+import { NonInteractiveRollout } from '../../rollout/actions/NonInteractiveRollout';
+import {
+  MainMenuActions,
+  RolloutActions,
+  RolloutMainMenu,
+} from '../../rollout/actions/RolloutMainMenu';

-async function promptForRolloutPercentAsync({
-  promptMessage,
-}: {
-  promptMessage: string;
-}): Promise<number> {
-  const { name: rolloutPercent } = await promptAsync({
-    type: 'text',
-    name: 'name',
-    format: value => {
-      return parseInt(value, 10);
-    },
-    message: promptMessage,
-    initial: 0,
-    validate: (rolloutPercent: string): true | string => {
-      const floatValue = parseFloat(rolloutPercent);
-      return Number.isInteger(floatValue) && floatValue >= 0 && floatValue <= 100
-        ? true
-        : 'The rollout percentage must be an integer between 0 and 100 inclusive.';
-    },
-  });
-  return rolloutPercent;
+enum ActionRawFlagValue {
+  CREATE = 'create',
+  EDIT = 'edit',
+  END = 'end',
 }
+type ChannelRolloutRawArgsAndFlags = {
+  channel?: string;
+  action?: ActionRawFlagValue;
+  percent?: number;
+  outcome?: EndOutcome;
+  'non-interactive': boolean;
+  branch?: string;
+  'runtime-version'?: string;
+  'private-key-path'?: string;
+  json?: boolean;
+};

-function getRolloutInfo(channel: UpdateChannelByNameObject): {
-  newBranch: Pick<UpdateBranch, 'name' | 'id'>;
-  oldBranch: Pick<UpdateBranch, 'name' | 'id'>;
-  currentPercent: number;
-} {
-  const { branchMapping } = getBranchMapping(channel.branchMapping);
-  const [newBranchId, oldBranchId] = branchMapping.data.map(d => d.branchId);
-  const newBranch = channel.updateBranches.filter(branch => branch.id === newBranchId)[0];
-  const oldBranch = channel.updateBranches.filter(branch => branch.id === oldBranchId)[0];
-
-  if (!newBranch || !oldBranch) {
-    throw new Error(`Branch mapping rollout is missing a branch for channel "${channel.name}".`);
-  }
-
-  const currentPercent = 100 * branchMapping.data[0].branchMappingLogic.operand;
-  return { newBranch, oldBranch, currentPercent };
-}
-
-async function startRolloutAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    channelName,
-    branchName,
-    percent,
-    projectId,
-    displayName,
-    currentBranchMapping,
-    channel,
-    nonInteractive,
-  }: {
-    channelName?: string;
-    branchName: string;
-    percent?: number;
-    projectId: string;
-    displayName: string;
-    currentBranchMapping: BranchMapping;
-    channel: UpdateChannelByNameObject;
-    nonInteractive: boolean;
-  }
-): Promise<{
-  newChannelInfo: {
-    id: string;
-    name: string;
-    branchMapping: string;
-  };
-  logMessage: string;
-}> {
-  const branch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
-    appId: projectId,
-    name: branchName,
-  });
-
-  const oldBranchId = currentBranchMapping.data[0].branchId;
-  if (branch.id === oldBranchId) {
-    throw new Error(
-      `channel "${channelName}" is already pointing at branch "${branchName}". Rollouts must be done with distinct branches.`
-    );
-  }
-
-  if (percent == null) {
-    if (nonInteractive) {
-      throw new Error(
-        'You must specify a percent with the --percent flag when initiating a rollout with the --non-interactive flag.'
-      );
-    }
-    const promptMessage = `What percent of users should be directed to the branch "${branchName}"?`;
-    percent = await promptForRolloutPercentAsync({ promptMessage });
-  }
-
-  const newBranchMapping = {
-    version: 0,
-    data: [
-      {
-        branchId: branch.id,
-        branchMappingLogic: {
-          operand: percent / 100,
-          clientKey: 'rolloutToken',
-          branchMappingOperator: 'hash_lt',
-        },
-      },
-      currentBranchMapping.data[0],
-    ],
-  };
-  const newChannelInfo = await updateChannelBranchMappingAsync(graphqlClient, {
-    channelId: channel.id,
-    branchMapping: JSON.stringify(newBranchMapping),
-  });
-
-  const oldBranch = channel.updateBranches.filter(branch => branch.id === oldBranchId)[0];
-  if (!oldBranch) {
-    throw new Error(
-      `Branch mapping is missing its only branch for channel "${channelName}" on app "${displayName}"`
-    );
-  }
-
-  const logMessage = `Started a rollout of branch ${chalk.bold(branchName)} on channel ${chalk.bold(
-    channelName!
-  )}! ${chalk.bold(percent)}% of users will be directed to branch ${chalk.bold(
-    branchName
-  )}, ${chalk.bold(100 - percent)}% to branch ${chalk.bold(oldBranch.name)}.`;
-
-  return { newChannelInfo, logMessage };
-}
-
-async function editRolloutAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    channelName,
-    percent,
-    nonInteractive,
-    currentBranchMapping,
-    channel,
-  }: {
-    channelName?: string;
-    percent?: number;
-    nonInteractive: boolean;
-    currentBranchMapping: BranchMapping;
-    channel: UpdateChannelByNameObject;
-  }
-): Promise<{
-  newChannelInfo: {
-    id: string;
-    name: string;
-    branchMapping: string;
-  };
-  logMessage: string;
-}> {
-  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(channel);
-
-  if (percent == null) {
-    if (nonInteractive) {
-      throw new Error(
-        'A rollout is already in progress. If you wish to modify it you must use specify the new rollout percentage with the --percent flag.'
-      );
-    }
-    const promptMessage = `Currently ${currentPercent}% of all users are routed to branch ${
-      newBranch.name
-    } and ${100 - currentPercent}% of all users are routed to branch ${
-      oldBranch.name
-    }. What percent of users should be directed to the branch ${newBranch.name}?`;
-    percent = await promptForRolloutPercentAsync({ promptMessage });
-  }
-
-  const newBranchMapping = { ...currentBranchMapping };
-  newBranchMapping.data[0].branchMappingLogic.operand = percent / 100;
-
-  const newChannelInfo = await updateChannelBranchMappingAsync(graphqlClient, {
-    channelId: channel.id,
-    branchMapping: JSON.stringify(newBranchMapping),
-  });
-
-  const logMessage = `Rollout of branch ${chalk.bold(newBranch.name)} on channel ${chalk.bold(
-    channelName!
-  )} updated from ${chalk.bold(currentPercent)}% to ${chalk.bold(percent)}%. ${chalk.bold(
-    percent
-  )}% of users will be directed to branch ${chalk.bold(newBranch.name)}, ${chalk.bold(
-    100 - percent
-  )}% to branch ${chalk.bold(oldBranch.name)}.`;
-
-  return { newChannelInfo, logMessage };
-}
-
-async function endRolloutAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    channelName,
-    branchName,
-    nonInteractive,
-    projectId,
-    channel,
-  }: {
-    channelName?: string;
-    branchName?: string;
-    nonInteractive: boolean;
-    projectId: string;
-    channel: UpdateChannelByNameObject;
-  }
-): Promise<{
-  newChannelInfo: {
-    id: string;
-    name: string;
-    branchMapping: string;
-  };
-  logMessage: string;
-}> {
-  // end rollout
-  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(channel);
-
-  let endOnNewBranch;
-  if (branchName) {
-    const branch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
-      appId: projectId,
-      name: branchName,
-    });
-
-    switch (branch.id) {
-      case newBranch.id:
-        endOnNewBranch = true;
-        break;
-      case oldBranch.id:
-        endOnNewBranch = false;
-        break;
-      default:
-        throw new Error(
-          `The branch "${branchName}" specified by --branch must be one of the branches involved in the rollout: "${newBranch.name}" or "${oldBranch.name}".`
-        );
-    }
-  } else {
-    if (nonInteractive) {
-      throw new Error(
-        'Branch name must be specified with the --branch flag when both the --end and --non-interactive flag are true.'
-      );
-    }
-    endOnNewBranch = await selectAsync<boolean>(
-      'Ending the rollout will send all traffic to a single branch. Which one should that be?',
-      [
-        {
-          title: `${newBranch.name} ${chalk.grey(`- current percent: ${currentPercent}%`)}`,
-          value: true,
-        },
-        {
-          title: `${oldBranch.name} ${chalk.grey(`- current percent: ${100 - currentPercent}%`)}`,
-          value: false,
-        },
-      ]
-    );
-  }
-  if (endOnNewBranch == null) {
-    throw new Error('Branch to end on is undefined.');
-  }
-
-  const newBranchMapping = {
-    version: 0,
-    data: [
-      {
-        branchId: endOnNewBranch ? newBranch.id : oldBranch.id,
-        branchMappingLogic: 'true',
-      },
-    ],
-  };
-
-  const newChannelInfo = await updateChannelBranchMappingAsync(graphqlClient, {
-    channelId: channel.id,
-    branchMapping: JSON.stringify(newBranchMapping),
-  });
-  const logMessage = `Rollout on channel ${chalk.bold(
-    channelName
-  )} ended. All traffic is now sent to branch ${chalk.bold(
-    endOnNewBranch ? newBranch.name : oldBranch.name
-  )}`;
-
-  return { newChannelInfo, logMessage };
-}
+type ChannelRolloutArgsAndFlags = {
+  channelName?: string;
+  action?: RolloutActions;
+  nonInteractive: boolean;
+  json?: boolean;
+} & Partial<EditRolloutNonInteractiveOptions> &
+  Partial<EndRolloutNonInteractiveOptions> &
+  EndRolloutGeneralOptions &
+  Partial<CreateRolloutNonInteractiveOptions>;

 export default class ChannelRollout extends EasCommand {
  static override description = 'Roll a new branch out on a channel incrementally.';
@@ -304,17 +56,68 @@ export default class ChannelRollout extends EasCommand {
  ];

  static override flags = {
-    branch: Flags.string({
-      description: 'branch to rollout',
+    action: Flags.enum({
+      description: 'Rollout action to perform',
+      options: Object.values(ActionRawFlagValue),
      required: false,
+      relationships: [
+        {
+          type: 'all',
+          flags: [
+            {
+              name: 'percent',
+              // eslint-disable-next-line async-protect/async-suffix
+              when: async flags => {
+                return (
+                  !!flags['non-interactive'] &&
+                  (flags['action'] === ActionRawFlagValue.CREATE ||
+                    flags['action'] === ActionRawFlagValue.EDIT)
+                );
+              },
+            },
+            {
+              name: 'outcome',
+              // eslint-disable-next-line async-protect/async-suffix
+              when: async flags =>
+                !!flags['non-interactive'] && flags['action'] === ActionRawFlagValue.END,
+            },
+            {
+              name: 'branch',
+              // eslint-disable-next-line async-protect/async-suffix
+              when: async flags =>
+                !!flags['non-interactive'] && flags['action'] === ActionRawFlagValue.CREATE,
+            },
+            {
+              name: 'runtime-version',
+              // eslint-disable-next-line async-protect/async-suffix
+              when: async flags =>
+                !!flags['non-interactive'] && flags['action'] === ActionRawFlagValue.CREATE,
+            },
+          ],
+        },
+      ],
    }),
    percent: Flags.integer({
-      description: 'percent of users to send to the new branch',
+      description:
+        'Percent of users to send to the new branch. Use with --action=edit or --action=create',
      required: false,
    }),
-    end: Flags.boolean({
-      description: 'end the rollout',
-      default: false,
+    outcome: Flags.enum({
+      description: 'End outcome of rollout. Use with --action=end',
+      options: Object.values(EndOutcome),
+      required: false,
+    }),
+    branch: Flags.string({
+      description: 'Branch to roll out. Use with --action=create',
+      required: false,
+    }),
+    'runtime-version': Flags.string({
+      description: 'Runtime version to target. Use with --action=create',
+      required: false,
+    }),
+    'private-key-path': Flags.string({
+      description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,
+      required: false,
    }),
    ...EasNonInteractiveAndJsonFlags,
  };
@@ -325,164 +128,63 @@ export default class ChannelRollout extends EasCommand {
  };

  async runAsync(): Promise<void> {
+    const { args, flags } = await this.parse(ChannelRollout);
+    const argsAndFlags = this.sanitizeArgsAndFlags({ ...flags, ...args });
    const {
-      args: { channel: channelNameArg },
-      flags: {
-        json: jsonFlag,
-        end: endFlag,
-        branch: branchName,
-        percent,
-        'non-interactive': nonInteractive,
-      },
-    } = await this.parse(ChannelRollout);
-    const {
-      privateProjectConfig: { projectId },
+      privateProjectConfig: { exp, projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelRollout, {
-      nonInteractive,
+      nonInteractive: argsAndFlags.nonInteractive,
    });
-    if (jsonFlag) {
-      enableJsonOutput();
+    if (argsAndFlags.json) {
+      // TODO(quin): implement json output
+      throw new Error('Developer Preview doesnt support JSON output yet');
    }

-    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
-
-    let channelName: string = channelNameArg;
-    if (!channelName) {
-      const { name } = await selectChannelOnAppAsync(graphqlClient, {
-        projectId,
-        selectionPromptTitle: 'Select a channel on which to perform a rollout',
-        paginatedQueryOptions: {
-          json: jsonFlag,
-          nonInteractive,
-          offset: 0,
-        },
-      });
-      channelName = name;
-    }
-
-    const channel = await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
-      appId: projectId,
-      channelName,
-    });
-    if (!channel) {
-      throw new Error(
-        `Could not find a channel named "${channelName}". Check which channels exist on this project with ${chalk.bold(
-          'eas channel:list'
-        )}.`
-      );
-    }
-
-    const { branchMapping: currentBranchMapping, isRollout } = getBranchMapping(
-      channel.branchMapping
-    );
-
-    if (currentBranchMapping.data.length === 0) {
-      throw new Error('The channel is not pointing at any branches.');
-    }
-    if (currentBranchMapping.data.length > 2) {
-      throw new Error('"channel:rollout" cannot handle branch mappings with more than 2 branches.');
-    }
-    // This combination doesn't make sense. Throw an error explaining the options.
-    if (isRollout && branchName && !endFlag) {
-      throw new Error(
-        `There is a rollout in progress. You can only either edit the rollout percent or 'end' it.`
-      );
-    }
-
-    /**
-     * This if/else block has three branches:
-     *  1. The branch mapping is not a rollout, i.e. it is pointing to a single branch.
-     *  2. The branch mapping is a rollout.
-     *    a. increase/decrease the rollout percentage.
-     *    b. end the rollout.
-     */
-    let rolloutMutationResult: {
-      newChannelInfo: {
-        id: string;
-        name: string;
-        branchMapping: string;
-      };
-      logMessage: string;
+    const app = { projectId, exp };
+    const ctx = {
+      projectId,
+      nonInteractive: argsAndFlags.nonInteractive,
+      graphqlClient,
+      app,
    };
-    if (!isRollout) {
-      rolloutMutationResult = await startRolloutAsync(graphqlClient, {
-        channelName,
-        branchName:
-          branchName ??
-          (await promptForBranchNameAsync({
-            graphqlClient,
-            projectId,
-            channelName,
-            nonInteractive,
-            json: jsonFlag,
-          })),
-        percent,
-        nonInteractive,
-        projectId,
-        displayName: projectDisplayName,
-        currentBranchMapping,
-        channel,
-      });
-    } else if (endFlag) {
-      rolloutMutationResult = await endRolloutAsync(graphqlClient, {
-        channelName,
-        branchName,
-        nonInteractive,
-        projectId,
-        channel,
-      });
+    if (argsAndFlags.nonInteractive) {
+      await new NonInteractiveRollout(argsAndFlags).runAsync(ctx);
    } else {
-      rolloutMutationResult = await editRolloutAsync(graphqlClient, {
-        channelName,
-        percent,
-        nonInteractive,
-        currentBranchMapping,
-        channel,
-      });
-    }
-    if (!rolloutMutationResult) {
-      throw new Error('rollout result is empty');
-    }
-    const { newChannelInfo, logMessage } = rolloutMutationResult;
-    if (jsonFlag) {
-      printJsonOnlyOutput(newChannelInfo);
-    } else {
-      Log.withTick(logMessage);
+      Log.addNewLineIfNone();
+      Log.warn(
+        `✨ This command is in Developer Preview and has not been released to production yet. Website support is coming soon.`
+      );
+      Log.addNewLineIfNone();
+      await new RolloutMainMenu(argsAndFlags).runAsync(ctx);
    }
  }
-}

-async function promptForBranchNameAsync({
-  graphqlClient,
-  projectId,
-  channelName,
-  nonInteractive,
-  json,
-}: {
-  graphqlClient: ExpoGraphqlClient;
-  projectId: string;
-  channelName: string;
-  nonInteractive: boolean;
-  json: boolean;
-}): Promise<string> {
-  if (nonInteractive) {
-    throw new Error('Must supply branch flag in non-interactive mode');
+  private getAction(action: ActionRawFlagValue): RolloutActions {
+    switch (action) {
+      case ActionRawFlagValue.CREATE:
+        return MainMenuActions.CREATE_NEW;
+      case ActionRawFlagValue.EDIT:
+        return ManageRolloutActions.EDIT;
+      case ActionRawFlagValue.END:
+        return ManageRolloutActions.END;
+    }
  }

-  const { name: branchName } = await selectBranchOnAppAsync(graphqlClient, {
-    projectId,
-    promptTitle: `Which branch would you like roll out on ${channelName}?`,
-    displayTextForListItem: updateBranch => ({
-      title: updateBranch.name,
-    }),
-    // discard limit and offset because this query is not their intended target
-    paginatedQueryOptions: {
-      json,
-      nonInteractive,
-      offset: 0,
-    },
-  });
-
-  return branchName;
+  private sanitizeArgsAndFlags(
+    rawFlags: ChannelRolloutRawArgsAndFlags
+  ): ChannelRolloutArgsAndFlags {
+    const action = rawFlags.action;
+    return {
+      channelName: rawFlags.channel,
+      percent: rawFlags.percent,
+      outcome: rawFlags.outcome,
+      branchNameToRollout: rawFlags.branch,
+      runtimeVersion: rawFlags['runtime-version'],
+      privateKeyPath: rawFlags['private-key-path'] ?? null,
+      action: action ? this.getAction(action) : undefined,
+      nonInteractive: rawFlags['non-interactive'],
+      json: rawFlags.json,
+    };
+  }
 }
@@ -47,6 +47,7 @@ export default class MetadataLint extends EasCommand {
      easJsonAccessor: EasJsonAccessor.fromProjectPath(projectDir),
      platforms: [Platform.IOS],
      profileName: flags.profile,
+      projectDir,
    });

    if (submitProfiles.length !== 1) {
@@ -49,6 +49,7 @@ export default class MetadataPull extends EasCommand {
      easJsonAccessor: EasJsonAccessor.fromProjectPath(projectDir),
      platforms: [Platform.IOS],
      profileName: flags.profile,
+      projectDir,
    });

    if (submitProfiles.length !== 1) {
@@ -47,6 +47,7 @@ export default class MetadataPush extends EasCommand {
      easJsonAccessor: EasJsonAccessor.fromProjectPath(projectDir),
      platforms: [Platform.IOS],
      profileName: flags.profile,
+      projectDir,
    });

    if (submitProfiles.length !== 1) {
@@ -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',
+        });
      });
    });

@@ -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 { getPrivateExpoConfig } 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;
@@ -118,6 +118,7 @@ export default class Submit extends EasCommand {
      easJsonAccessor: EasJsonAccessor.fromProjectPath(projectDir),
      platforms,
      profileName: flagsWithPlatform.profile,
+      projectDir,
    });

    const submissions: SubmissionFragment[] = [];
@@ -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,5 +1,5 @@
-import { AppJSONConfig, PackageJSONConfig, getConfig } from '@expo/config';
-import { vol } from 'memfs';
+import { AppJSONConfig, ExpoConfig, PackageJSONConfig, getConfig } from '@expo/config';
+import { DirectoryJSON, vol } from 'memfs';
 import { instance, mock } from 'ts-mockito';

 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
@@ -8,12 +8,17 @@ import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/cr
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
 import FeatureGating from '../../../commandUtils/gating/FeatureGating';
 import { jester } from '../../../credentials/__tests__/fixtures-constants';
-import { CodeSigningInfo, UpdateFragment } from '../../../graphql/generated';
+import { UpdateFragment } from '../../../graphql/generated';
 import { PublishMutation } from '../../../graphql/mutations/PublishMutation';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { UpdateQuery } from '../../../graphql/queries/UpdateQuery';
 import { getBranchNameFromChannelNameAsync } from '../../../update/getBranchNameFromChannelNameAsync';
 import { selectUpdateGroupOnBranchAsync } from '../../../update/queries';
+import {
+  getCodeSigningInfoAsync,
+  getManifestBodyAsync,
+  signBody,
+} from '../../../utils/code-signing';
 import UpdateRepublish from '../republish';

 const projectRoot = '/test-project';
@@ -33,12 +38,6 @@ const updateStub: UpdateFragment = {
  createdAt: '2022-01-01T12:00:00Z',
 };

-const codeSigningStub: CodeSigningInfo = {
-  keyid: 'keyid',
-  alg: 'alg',
-  sig: 'sig',
-};
-
 jest.mock('fs');
 jest.mock('@expo/config');
 jest.mock('../../../commandUtils/context/contextUtils/getProjectIdAsync');
@@ -52,16 +51,12 @@ jest.mock('../../../ora', () => ({
    start: () => ({ succeed: () => {}, fail: () => {} }),
  }),
 }));
+jest.mock('../../../utils/code-signing');
+jest.mock('../../../fetch');

 describe(UpdateRepublish.name, () => {
  afterEach(() => vol.reset());

-  it('errors without --channel, --branch, or --group', async () => {
-    await expect(new UpdateRepublish([], commandOptions).run()).rejects.toThrow(
-      '--channel, --branch, or --group must be specified'
-    );
-  });
-
  it('errors when providing both --group and --branch', async () => {
    const flags = ['--group=1234', '--branch=main'];

@@ -156,18 +151,45 @@ describe(UpdateRepublish.name, () => {
  });

  it('re-creates update using codesigning with --group and --message', async () => {
-    const flags = ['--group=1234', '--message=test-republish'];
+    const flags = [
+      '--group=1234',
+      '--message=test-republish',
+      `--private-key-path=./keys/test-private-key.pem`,
+    ];
    const codeSigning = {
-      alg: 'alg',
+      alg: 'rsa-v1_5-sha256',
      keyid: 'keyid',
      sig: 'sig',
    };

-    mockTestProject();
+    mockTestProject({
+      extraManifest: {
+        updates: {
+          codeSigningCertificate: './keys/test-certificate.pem',
+          codeSigningMetadata: {
+            alg: 'rsa-v1_5-sha256',
+            keyid: 'keyid',
+          },
+        },
+      },
+      extraVol: {
+        './keys/test-private-key.pem': 'testpemprivate',
+        './keys/test-certificate.pem': 'testpemcertificate',
+      },
+    });
+
+    jest.mocked(getCodeSigningInfoAsync).mockResolvedValue({
+      privateKey: '' as any,
+      certificate: '' as any,
+      codeSigningMetadata: { alg: 'rsa-v1_5-sha256', keyid: 'keyid' },
+    });
+    jest.mocked(getManifestBodyAsync).mockResolvedValue('test');
+    jest.mocked(signBody).mockReturnValue('sig');
+
    // Mock queries to retrieve the update and code signing info
    jest
      .mocked(UpdateQuery.viewUpdateGroupAsync)
-      .mockResolvedValue([{ ...updateStub, codeSigningInfo: codeSigningStub }]);
+      .mockResolvedValue([{ ...updateStub, codeSigningInfo: codeSigning }]);
    // Mock mutations to store the new update
    jest.mocked(PublishMutation.publishUpdateGroupAsync).mockResolvedValue([
      {
@@ -287,8 +309,12 @@ describe(UpdateRepublish.name, () => {
 /** Create a new in-memory project, based on src/commands/project/__tests__/init.test.ts */
 function mockTestProject({
  configuredProjectId = '1234',
+  extraManifest,
+  extraVol,
 }: {
  configuredProjectId?: string;
+  extraManifest?: Partial<ExpoConfig>;
+  extraVol?: DirectoryJSON;
 } = {}): void {
  const packageJSON: PackageJSONConfig = {
    name: 'testing123',
@@ -309,6 +335,7 @@ function mockTestProject({
          projectId: configuredProjectId,
        },
      },
+      ...extraManifest,
    },
  };

@@ -316,6 +343,7 @@ function mockTestProject({
    {
      'package.json': JSON.stringify(packageJSON),
      'app.json': JSON.stringify(appJSON),
+      ...extraVol,
    },
    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';
@@ -39,9 +41,11 @@ export default class UpdateConfigure extends EasCommand {
    });

    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',
+      })}`
    );
  }
 }
@@ -35,6 +35,7 @@ import {
  getRuntimeVersionObjectAsync,
  getUpdateMessageForCommandAsync,
  isUploadedAssetCountAboveWarningThreshold,
+  platformDisplayNames,
  resolveInputDirectoryAsync,
  uploadAssetsAsync,
 } from '../../project/publish';
@@ -98,6 +99,7 @@ export default class UpdatePublish extends EasCommand {
      required: false,
    }),
    message: Flags.string({
+      char: 'm',
      description: 'A short message describing the update',
      required: false,
    }),
@@ -324,6 +326,21 @@ export default class UpdatePublish extends EasCommand {
      for (const uploadedAssetPath of uploadResults.uniqueUploadedAssetPaths) {
        Log.debug(chalk.dim(`- ${uploadedAssetPath}`));
      }
+
+      const platformString = (Object.keys(assets) as PublishPlatform[])
+        .map(platform => {
+          const collectedAssetForPlatform = nullthrows(assets[platform]);
+          const totalAssetsForPlatform = collectedAssetForPlatform.assets.length + 1; // launch asset
+          const assetString = totalAssetsForPlatform === 1 ? 'asset' : 'assets';
+          return `${totalAssetsForPlatform} ${platformDisplayNames[platform]} ${assetString}`;
+        })
+        .join(', ');
+      Log.withInfo(
+        `${platformString} (maximum: ${assetLimitPerUpdateGroup} total per update). ${learnMore(
+          'https://expo.fyi/eas-update-asset-limits',
+          { learnMoreMessage: 'Learn more about asset limits.' }
+        )}`
+      );
    } catch (e) {
      assetSpinner.fail('Failed to upload');
      throw e;
@@ -1,23 +1,21 @@
 import { Platform } from '@expo/config';
 import { Flags } from '@oclif/core';

-import { getUpdateGroupUrl } from '../../build/utils/url';
+import { selectBranchOnAppAsync } from '../../branch/queries';
+import { selectChannelOnAppAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
-import { Update } from '../../graphql/generated';
-import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
-import Log, { link } from '../../log';
-import { ora } from '../../ora';
-import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
+import Log from '../../log';
 import { promptAsync } from '../../prompts';
 import { getBranchNameFromChannelNameAsync } from '../../update/getBranchNameFromChannelNameAsync';
 import { selectUpdateGroupOnBranchAsync } from '../../update/queries';
+import { UpdateToRepublish, republishAsync } from '../../update/republish';
 import { truncateString as truncateUpdateMessage } from '../../update/utils';
-import formatFields from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { getCodeSigningInfoAsync } from '../../utils/code-signing';
+import { enableJsonOutput } from '../../utils/json';

 const defaultRepublishPlatforms: Platform[] = ['android', 'ios'];

@@ -27,6 +25,7 @@ type UpdateRepublishRawFlags = {
  group?: string;
  message?: string;
  platform: string;
+  'private-key-path'?: string;
  'non-interactive': boolean;
  json?: boolean;
 };
@@ -37,34 +36,21 @@ type UpdateRepublishFlags = {
  groupId?: string;
  updateMessage?: string;
  platform: Platform[];
+  privateKeyPath?: string;
  nonInteractive: boolean;
  json: boolean;
 };

-type UpdateToRepublish = {
-  groupId: string;
-  branchId: string;
-  branchName: string;
-} & Pick<
-  Update,
-  | 'message'
-  | 'runtimeVersion'
-  | 'manifestFragment'
-  | 'platform'
-  | 'gitCommitHash'
-  | 'codeSigningInfo'
->;
-
 export default class UpdateRepublish extends EasCommand {
  static override description = 'roll back to an existing update';

  static override flags = {
    channel: Flags.string({
-      description: 'Channel name to select an update to republish from',
+      description: 'Channel name to select an update group to republish from',
      exclusive: ['branch', 'group'],
    }),
    branch: Flags.string({
-      description: 'Branch name to select an update to republish from',
+      description: 'Branch name to select an update group to republish from',
      exclusive: ['channel', 'group'],
    }),
    group: Flags.string({
@@ -72,7 +58,8 @@ export default class UpdateRepublish extends EasCommand {
      exclusive: ['branch', 'channel'],
    }),
    message: Flags.string({
-      description: 'Short message describing the republished update',
+      char: 'm',
+      description: 'Short message describing the republished update group',
      required: false,
    }),
    platform: Flags.enum({
@@ -81,6 +68,10 @@ export default class UpdateRepublish extends EasCommand {
      default: 'all',
      required: false,
    }),
+    'private-key-path': Flags.string({
+      description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,
+      required: false,
+    }),
    ...EasNonInteractiveAndJsonFlags,
  };

@@ -104,6 +95,8 @@ export default class UpdateRepublish extends EasCommand {
      enableJsonOutput();
    }

+    const codeSigningInfo = await getCodeSigningInfoAsync(exp, flags.privateKeyPath);
+
    const existingUpdates = await getOrAskUpdatesAsync(graphqlClient, projectId, flags);
    const updatesToPublish = existingUpdates.filter(update =>
      flags.platform.includes(update.platform as Platform)
@@ -123,117 +116,43 @@ export default class UpdateRepublish extends EasCommand {
    }

    if (rawFlags.platform === 'all') {
-      Log.withTick(`The republished update will appear only on: ${rawFlags.platform}`);
+      Log.withTick(`The republished update group will appear only on: ${rawFlags.platform}`);
    } else {
      const platformsFromUpdates = updatesToPublish.map(update => update.platform);
      if (platformsFromUpdates.length < defaultRepublishPlatforms.length) {
-        Log.warn(`You are republishing an update that wasn't published for all platforms.`);
+        Log.warn(`You are republishing an update group that wasn't published for all platforms.`);
      }

      Log.withTick(
-        `The republished update will appear on the same platforms it was originally published on: ${platformsFromUpdates.join(
+        `The republished update group will appear on the same platforms it was originally published on: ${platformsFromUpdates.join(
          ', '
        )}`
      );
    }

-    // This command only republishes a single update group
-    // The update group properties are the same for all updates
-    const { branchId, branchName, runtimeVersion } = updatesToPublish[0];
-
    const updateMessage = await getOrAskUpdateMessageAsync(updatesToPublish, flags);
-
-    // If codesigning was created for the original update, we need to add it to the republish
-    const shouldRepublishWithCodesigning = updatesToPublish.some(update => update.codeSigningInfo);
-    if (shouldRepublishWithCodesigning) {
-      Log.withTick(
-        `The republished update will be signed with the same codesigning as the original update.`
-      );
-    }
-
-    const publishIndicator = ora('Republishing...').start();
-    let updatesRepublished: Awaited<ReturnType<typeof PublishMutation.publishUpdateGroupAsync>>;
-
-    try {
-      updatesRepublished = await PublishMutation.publishUpdateGroupAsync(graphqlClient, [
-        {
-          branchId,
-          runtimeVersion,
-          message: updateMessage,
-          updateInfoGroup: Object.fromEntries(
-            updatesToPublish.map(update => [update.platform, JSON.parse(update.manifestFragment)])
-          ),
-          gitCommitHash: updatesToPublish[0].gitCommitHash,
-          awaitingCodeSigningInfo: shouldRepublishWithCodesigning,
-        },
-      ]);
-
-      if (shouldRepublishWithCodesigning) {
-        const codeSigningByPlatform = Object.fromEntries(
-          updatesToPublish.map(update => [update.platform, update.codeSigningInfo])
-        );
-
-        await Promise.all(
-          updatesRepublished.map(async update => {
-            const codeSigning = codeSigningByPlatform[update.platform];
-            if (codeSigning) {
-              await PublishMutation.setCodeSigningInfoAsync(graphqlClient, update.id, codeSigning);
-            }
-          })
-        );
-      }
-
-      publishIndicator.succeed('Republished update');
-    } catch (error: any) {
-      publishIndicator.fail('Failed to republish update');
-      throw error;
-    }
-
-    if (flags.json) {
-      return printJsonOnlyOutput(updatesRepublished);
-    }
-
-    const updatesRepublishedByPlatform = Object.fromEntries(
-      updatesRepublished.map(update => [update.platform, update])
-    );
-
-    const updateGroupUrl = getUpdateGroupUrl(
-      (await getOwnerAccountForProjectIdAsync(graphqlClient, projectId)).name,
-      exp.slug,
-      updatesRepublished[0].group
-    );
-
-    Log.addNewLineIfNone();
-    Log.log(
-      formatFields([
-        { label: 'Branch', value: branchName },
-        { label: 'Runtime version', value: updatesRepublished[0].runtimeVersion },
-        { label: 'Platform', value: updatesRepublished.map(update => update.platform).join(', ') },
-        { label: 'Update Group ID', value: updatesRepublished[0].id },
-        ...(updatesRepublishedByPlatform.android
-          ? [{ label: 'Android update ID', value: updatesRepublishedByPlatform.android.id }]
-          : []),
-        ...(updatesRepublishedByPlatform.ios
-          ? [{ label: 'iOS update ID', value: updatesRepublishedByPlatform.ios.id }]
-          : []),
-        { label: 'Message', value: updateMessage },
-        { label: 'Website link', value: link(updateGroupUrl, { dim: false }) },
-      ])
-    );
+    const arbitraryUpdate = updatesToPublish[0];
+    await republishAsync({
+      graphqlClient,
+      app: { exp, projectId },
+      updatesToPublish,
+      targetBranch: { branchId: arbitraryUpdate.branchId, branchName: arbitraryUpdate.branchName },
+      updateMessage,
+      codeSigningInfo,
+      json: flags.json,
+    });
  }

-  sanitizeFlags(rawFlags: UpdateRepublishRawFlags): UpdateRepublishFlags {
+  private sanitizeFlags(rawFlags: UpdateRepublishRawFlags): UpdateRepublishFlags {
    const branchName = rawFlags.branch;
    const channelName = rawFlags.channel;
    const groupId = rawFlags.group;
    const nonInteractive = rawFlags['non-interactive'];
+    const privateKeyPath = rawFlags['private-key-path'];

    if (nonInteractive && !groupId) {
      throw new Error('Only --group can be used in non-interactive mode');
    }
-    if (!groupId && !(branchName || channelName)) {
-      throw new Error(`--channel, --branch, or --group must be specified`);
-    }

    const platform =
      rawFlags.platform === 'all' ? defaultRepublishPlatforms : ([rawFlags.platform] as Platform[]);
@@ -244,6 +163,7 @@ export default class UpdateRepublish extends EasCommand {
      groupId,
      platform,
      updateMessage: rawFlags.message,
+      privateKeyPath,
      json: rawFlags.json ?? false,
      nonInteractive,
    };
@@ -257,18 +177,22 @@ async function getOrAskUpdatesAsync(
  flags: UpdateRepublishFlags
 ): Promise<UpdateToRepublish[]> {
  if (flags.groupId) {
-    const updateGroups = await UpdateQuery.viewUpdateGroupAsync(graphqlClient, {
+    const updateGroup = await UpdateQuery.viewUpdateGroupAsync(graphqlClient, {
      groupId: flags.groupId,
    });

-    return updateGroups.map(group => ({
-      ...group,
-      groupId: group.group,
-      branchId: group.branch.id,
-      branchName: group.branch.name,
+    return updateGroup.map(update => ({
+      ...update,
+      groupId: update.group,
+      branchId: update.branch.id,
+      branchName: update.branch.name,
    }));
  }

+  if (flags.nonInteractive) {
+    throw new Error('Must supply --group when in non-interactive mode');
+  }
+
  if (flags.branchName) {
    return await askUpdatesFromBranchNameAsync(graphqlClient, {
      ...flags,
@@ -285,7 +209,55 @@ async function getOrAskUpdatesAsync(
    });
  }

-  throw new Error('--channel, --branch, or --group is required');
+  const { choice } = await promptAsync({
+    type: 'select',
+    message: 'Find update by branch or channel?',
+    name: 'choice',
+    choices: [
+      { title: 'Branch', value: 'branch' },
+      { title: 'Channel', value: 'channel' },
+    ],
+  });
+
+  if (choice === 'channel') {
+    const { name } = await selectChannelOnAppAsync(graphqlClient, {
+      projectId,
+      selectionPromptTitle: 'Select a channel to view',
+      paginatedQueryOptions: {
+        json: flags.json,
+        nonInteractive: flags.nonInteractive,
+        offset: 0,
+      },
+    });
+
+    return await askUpdatesFromChannelNameAsync(graphqlClient, {
+      ...flags,
+      channelName: name,
+      projectId,
+    });
+  } else if (choice === 'branch') {
+    const { name } = await selectBranchOnAppAsync(graphqlClient, {
+      projectId,
+      promptTitle: 'Select branch from which to choose update',
+      displayTextForListItem: updateBranch => ({
+        title: updateBranch.name,
+      }),
+      // discard limit and offset because this query is not their intended target
+      paginatedQueryOptions: {
+        json: flags.json,
+        nonInteractive: flags.nonInteractive,
+        offset: 0,
+      },
+    });
+
+    return await askUpdatesFromBranchNameAsync(graphqlClient, {
+      ...flags,
+      branchName: name,
+      projectId,
+    });
+  } else {
+    throw new Error('Must choose update via channel or branch');
+  }
 }

 /** Ask the user which update needs to be republished by branch name, this requires interactive mode */
@@ -298,21 +270,17 @@ async function askUpdatesFromBranchNameAsync(
    nonInteractive,
  }: { projectId: string; branchName: string; json: boolean; nonInteractive: boolean }
 ): Promise<UpdateToRepublish[]> {
-  if (nonInteractive) {
-    throw new Error('Must supply --group when in non-interactive mode');
-  }
-
-  const updateGroups = await selectUpdateGroupOnBranchAsync(graphqlClient, {
+  const updateGroup = await selectUpdateGroupOnBranchAsync(graphqlClient, {
    projectId,
    branchName,
    paginatedQueryOptions: getPaginatedQueryOptions({ json, 'non-interactive': nonInteractive }),
  });

-  return updateGroups.map(group => ({
-    ...group,
-    groupId: group.id,
-    branchId: group.branch.id,
-    branchName: group.branch.name,
+  return updateGroup.map(update => ({
+    ...update,
+    groupId: update.group,
+    branchId: update.branch.id,
+    branchName: update.branch.name,
  }));
 }
 /** Ask the user which update needs to be republished by channel name, this requires interactive mode */
@@ -325,10 +293,6 @@ async function askUpdatesFromChannelNameAsync(
    nonInteractive,
  }: { projectId: string; channelName: string; json: boolean; nonInteractive: boolean }
 ): Promise<UpdateToRepublish[]> {
-  if (nonInteractive) {
-    throw new Error('Must supply --group when in non-interactive mode');
-  }
-
  const branchName = await getBranchNameFromChannelNameAsync(graphqlClient, projectId, channelName);

  return await askUpdatesFromBranchNameAsync(graphqlClient, {
@@ -86,7 +86,11 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
    }),
    platform: Flags.enum({
      char: 'p',
-      options: [...defaultPublishPlatforms, 'all'],
+      options: [
+        // TODO: Add web when it's fully supported
+        ...defaultPublishPlatforms,
+        'all',
+      ],
      default: 'all',
      required: false,
    }),
@@ -0,0 +1,42 @@
+import { Flags } from '@oclif/core';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { promptAsync } from '../../prompts';
+import UpdateRepublish from './republish';
+import UpdateRollBackToEmbedded from './roll-back-to-embedded';
+
+export default class UpdateRollback extends EasCommand {
+  static override description = 'roll back to an embedded update or an existing update';
+
+  static override hidden = true;
+
+  static override flags = {
+    'private-key-path': Flags.string({
+      description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,
+      required: false,
+    }),
+  };
+
+  async runAsync(): Promise<void> {
+    const { flags } = await this.parse(UpdateRollback);
+
+    const { choice } = await promptAsync({
+      type: 'select',
+      message: 'Which type of update would you like to roll back to?',
+      name: 'choice',
+      choices: [
+        { title: 'Published Update', value: 'published' },
+        { title: 'Embedded Update', value: 'embedded' },
+      ],
+    });
+
+    const privateKeyPathArg = flags['private-key-path']
+      ? ['--private-key-path', flags['private-key-path']]
+      : [];
+    if (choice === 'published') {
+      await UpdateRepublish.run(privateKeyPathArg);
+    } else {
+      await UpdateRollBackToEmbedded.run(privateKeyPathArg);
+    }
+  }
+}
@@ -151,6 +151,7 @@ export function getNewAndroidApiMock(): { [key in keyof typeof AndroidGraphqlCli
    updateAndroidAppCredentialsAsync: jest.fn(),
    updateAndroidAppBuildCredentialsAsync: jest.fn(),
    createAndroidAppBuildCredentialsAsync: jest.fn(),
+    setDefaultAndroidAppBuildCredentialsAsync: jest.fn(),
    getDefaultAndroidAppBuildCredentialsAsync: jest.fn(),
    getAndroidAppBuildCredentialsByNameAsync: jest.fn(),
    createOrUpdateAndroidAppBuildCredentialsByNameAsync: jest.fn(),
@@ -146,6 +146,16 @@ export async function updateAndroidAppBuildCredentialsAsync(
  );
 }

+export async function setDefaultAndroidAppBuildCredentialsAsync(
+  graphqlClient: ExpoGraphqlClient,
+  buildCredentials: AndroidAppBuildCredentialsFragment
+): Promise<AndroidAppBuildCredentialsFragment> {
+  return await AndroidAppBuildCredentialsMutation.setDefaultAndroidAppBuildCredentialsAsync(
+    graphqlClient,
+    buildCredentials.id
+  );
+}
+
 export async function createAndroidAppBuildCredentialsAsync(
  graphqlClient: ExpoGraphqlClient,
  appLookupParams: AppLookupParams,
@@ -164,14 +174,6 @@ export async function createAndroidAppBuildCredentialsAsync(
      graphqlClient,
      appLookupParams
    );
-  const buildCredentialsList = androidAppCredentials.androidAppBuildCredentialsList;
-  const existingDefaultBuildCredentials =
-    buildCredentialsList.find(buildCredentials => buildCredentials.isDefault) ?? null;
-  if (existingDefaultBuildCredentials && isDefault) {
-    throw new Error(
-      'Cannot create new default Android Build Credentials. A set of default credentials exists already.'
-    );
-  }

  return await AndroidAppBuildCredentialsMutation.createAndroidAppBuildCredentialsAsync(
    graphqlClient,
@@ -8,6 +8,7 @@ import {
  AndroidAppBuildCredentialsFragment,
  AndroidAppBuildCredentialsInput,
  CreateAndroidAppBuildCredentialsMutation,
+  SetDefaultAndroidAppBuildCredentialsMutation,
  SetKeystoreMutation,
 } from '../../../../../graphql/generated';
 import { AndroidAppBuildCredentialsFragmentNode } from '../../../../../graphql/types/credentials/AndroidAppBuildCredentials';
@@ -55,6 +56,37 @@ export const AndroidAppBuildCredentialsMutation = {
    );
    return data.androidAppBuildCredentials.createAndroidAppBuildCredentials;
  },
+  async setDefaultAndroidAppBuildCredentialsAsync(
+    graphqlClient: ExpoGraphqlClient,
+    androidAppBuildCredentialsId: string
+  ): Promise<AndroidAppBuildCredentialsFragment> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .mutation<SetDefaultAndroidAppBuildCredentialsMutation>(
+          gql`
+            mutation SetDefaultAndroidAppBuildCredentialsMutation(
+              $androidAppBuildCredentialsId: ID!
+              $isDefault: Boolean!
+            ) {
+              androidAppBuildCredentials {
+                setDefault(id: $androidAppBuildCredentialsId, isDefault: $isDefault) {
+                  id
+                  ...AndroidAppBuildCredentialsFragment
+                }
+              }
+            }
+            ${print(AndroidAppBuildCredentialsFragmentNode)}
+          `,
+          {
+            androidAppBuildCredentialsId,
+            isDefault: true,
+          }
+        )
+        .toPromise()
+    );
+    assert(data, `GraphQL: 'setDefault' not defined in server response ${JSON.stringify(data)}}`);
+    return data.androidAppBuildCredentials.setDefault;
+  },
  async setKeystoreAsync(
    graphqlClient: ExpoGraphqlClient,
    androidAppBuildCredentialsId: string,
@@ -177,7 +177,23 @@ export class SetUpAdhocProvisioningProfile {
      );
    }

-    // 6. Create (or update) app build credentials
+    // 6. Compare selected devices with the ones actually provisioned
+    const diffList = differenceBy(
+      chosenDevices,
+      appleProvisioningProfile.appleDevices,
+      'identifier'
+    );
+    if (diffList && diffList.length > 0) {
+      Log.warn(`Failed to provision ${diffList.length} of the selected devices:`);
+      for (const missingDevice of diffList) {
+        Log.warn(`- ${formatDeviceLabel(missingDevice)}`);
+      }
+      Log.log(
+        'Most commonly devices fail to to be provisioned while they are still being processed by Apple, which can take up to 24-72 hours. Check your Apple Developer Portal page at https://developer.apple.com/account/resources/devices/list, the devices in "Processing" status cannot be provisioned yet'
+      );
+    }
+
+    // 7. Create (or update) app build credentials
    assert(appleProvisioningProfile);
    return await assignBuildCredentialsAsync(
      ctx,
@@ -1,4 +1,38 @@
-import { doUDIDsMatch } from '../SetUpAdhocProvisioningProfile';
+import { Env } from '@expo/eas-build-job';
+import { EasJson } from '@expo/eas-json';
+
+import { Analytics } from '../../../../analytics/AnalyticsManager';
+import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils/createGraphqlClient';
+import {
+  Account,
+  AppleAppIdentifierFragment,
+  AppleDevice,
+  AppleDeviceClass,
+  AppleDeviceFragment,
+  AppleDistributionCertificateFragment,
+  IosAppBuildCredentialsFragment,
+} from '../../../../graphql/generated';
+import Log from '../../../../log';
+import { getApplePlatformFromTarget } from '../../../../project/ios/target';
+import { Actor } from '../../../../user/User';
+import { CredentialsContext, CredentialsContextProjectInfo } from '../../../context';
+import { ProvisioningProfile } from '../../appstore/Credentials.types';
+import { ApplePlatform } from '../../appstore/constants';
+import { assignBuildCredentialsAsync, getBuildCredentialsAsync } from '../BuildCredentialsUtils';
+import { chooseDevicesAsync } from '../DeviceUtils';
+import { SetUpAdhocProvisioningProfile, doUDIDsMatch } from '../SetUpAdhocProvisioningProfile';
+
+jest.mock('../BuildCredentialsUtils');
+jest.mock('../../../context');
+jest.mock('../../../ios/api/GraphqlClient');
+jest.mock('../DeviceUtils', () => {
+  return {
+    __esModule: true,
+    chooseDevicesAsync: jest.fn(),
+    formatDeviceLabel: jest.requireActual('../DeviceUtils').formatDeviceLabel,
+  };
+});
+jest.mock('../../../../project/ios/target');

 describe(doUDIDsMatch, () => {
  it('return false if UDIDs do not match', () => {
@@ -12,3 +46,104 @@ describe(doUDIDsMatch, () => {
    expect(doUDIDsMatch(udidsA, udidsB)).toBe(true);
  });
 });
+describe('runWithDistributionCertificateAsync', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+  const setUpAdhocProvisioningProfile = new SetUpAdhocProvisioningProfile({
+    app: { account: {} as Account, projectName: 'projName', bundleIdentifier: 'bundleId' },
+    target: { targetName: 'targetName', bundleIdentifier: 'bundleId', entitlements: {} },
+  });
+  describe('compare chosen and provisioned devices', () => {
+    describe('not all devices provisioned', () => {
+      it('displays warning to the user and lists the missing devices', async () => {
+        const { ctx, distCert } = setUpTest();
+        jest.mocked(getBuildCredentialsAsync).mockResolvedValue({
+          provisioningProfile: {
+            appleTeam: {},
+            appleDevices: [{ identifier: 'id1' }],
+            developerPortalIdentifier: 'provisioningProfileId',
+          },
+        } as IosAppBuildCredentialsFragment);
+        const LogWarnSpy = jest.spyOn(Log, 'warn');
+        const LogLogSpy = jest.spyOn(Log, 'log');
+        const result = await setUpAdhocProvisioningProfile.runWithDistributionCertificateAsync(
+          ctx,
+          distCert
+        );
+        expect(result).toEqual({} as IosAppBuildCredentialsFragment);
+        expect(LogWarnSpy).toHaveBeenCalledTimes(3);
+        expect(LogWarnSpy).toHaveBeenCalledWith('Failed to provision 2 of the selected devices:');
+        expect(LogWarnSpy).toHaveBeenCalledWith('- id2 (iPhone) (Device 2)');
+        expect(LogWarnSpy).toHaveBeenCalledWith('- id3 (Mac) (Device 3)');
+        expect(LogLogSpy).toHaveBeenCalledTimes(1);
+        expect(LogLogSpy).toHaveBeenCalledWith(
+          'Most commonly devices fail to to be provisioned while they are still being processed by Apple, which can take up to 24-72 hours. Check your Apple Developer Portal page at https://developer.apple.com/account/resources/devices/list, the devices in "Processing" status cannot be provisioned yet'
+        );
+      });
+    });
+    describe('all devices provisioned', () => {
+      it('does not display warning', async () => {
+        const { ctx, distCert } = setUpTest();
+        jest.mocked(getBuildCredentialsAsync).mockResolvedValue({
+          provisioningProfile: {
+            appleTeam: {},
+            appleDevices: [{ identifier: 'id1' }, { identifier: 'id2' }, { identifier: 'id3' }],
+            developerPortalIdentifier: 'provisioningProfileId',
+          },
+        } as IosAppBuildCredentialsFragment);
+        const LogWarnSpy = jest.spyOn(Log, 'warn');
+        const LogLogSpy = jest.spyOn(Log, 'log');
+        const result = await setUpAdhocProvisioningProfile.runWithDistributionCertificateAsync(
+          ctx,
+          distCert
+        );
+        expect(result).toEqual({} as IosAppBuildCredentialsFragment);
+        expect(LogWarnSpy).not.toHaveBeenCalled();
+        expect(LogLogSpy).not.toHaveBeenCalled();
+      });
+    });
+  });
+});
+
+function setUpTest(): { ctx: CredentialsContext; distCert: AppleDistributionCertificateFragment } {
+  const ctx = jest.mocked(
+    new CredentialsContext(
+      {} as {
+        projectInfo: CredentialsContextProjectInfo | null;
+        easJsonCliConfig?: EasJson['cli'];
+        nonInteractive: boolean;
+        projectDir: string;
+        user: Actor;
+        graphqlClient: ExpoGraphqlClient;
+        analytics: Analytics;
+        env?: Env;
+      }
+    )
+  );
+  Object.defineProperty(ctx, 'ios', { value: jest.mock('../../../ios/api/GraphqlClient') });
+  ctx.ios.getDevicesForAppleTeamAsync = jest
+    .fn()
+    .mockResolvedValue([
+      { identifier: 'id1' },
+      { identifier: 'id2' },
+      { identifier: 'id3' },
+    ] as AppleDeviceFragment[]);
+  jest.mocked(chooseDevicesAsync).mockResolvedValue([
+    { identifier: 'id1', name: 'Device 1', deviceClass: AppleDeviceClass.Ipad },
+    { identifier: 'id2', name: 'Device 2', deviceClass: AppleDeviceClass.Iphone },
+    { identifier: 'id3', name: 'Device 3', deviceClass: AppleDeviceClass.Mac },
+  ] as AppleDevice[]);
+  // @ts-ignore
+  jest.mocked(getApplePlatformFromTarget).mockResolvedValue(ApplePlatform.IOS);
+  Object.defineProperty(ctx, 'appStore', { value: jest.mock('../../appstore/AppStoreApi') });
+  ctx.appStore.createOrReuseAdhocProvisioningProfileAsync = jest.fn().mockResolvedValue({
+    provisioningProfileId: 'provisioningProfileId',
+  } as ProvisioningProfile);
+  ctx.ios.createOrGetExistingAppleAppIdentifierAsync = jest
+    .fn()
+    .mockResolvedValue({} as AppleAppIdentifierFragment);
+  jest.mocked(assignBuildCredentialsAsync).mockResolvedValue({} as IosAppBuildCredentialsFragment);
+  const distCert = {} as AppleDistributionCertificateFragment;
+  return { ctx, distCert };
+}
@@ -513,6 +513,20 @@ export const CapabilityMapping: CapabilityClassifier[] = [
    validateOptions: createValidateStringArrayOptions(['app-usage', 'system-installation']),
    getOptions: getDefinedOptions,
  },
+  {
+    name: 'Apple Pay Later Merchandising',
+    entitlement: 'com.apple.developer.pay-later-merchandising',
+    capability: CapabilityType.APPLE_PAY_LATER_MERCHANDISING,
+    validateOptions: createValidateStringArrayOptions(['payinfour-merchandising']),
+    getOptions: getDefinedOptions,
+  },
+  {
+    name: 'Sensitive Content Analysis',
+    entitlement: 'com.apple.developer.sensitivecontentanalysis.client',
+    capability: CapabilityType.SENSITIVE_CONTENT_ANALYSIS,
+    validateOptions: createValidateStringArrayOptions(['analysis']),
+    getOptions: getDefinedOptions,
+  },
  {
    // Not in Xcode
    // https://developer-mdn.apple.com/documentation/devicecheck/preparing_to_use_the_app_attest_service
@@ -698,6 +712,36 @@ export const CapabilityMapping: CapabilityClassifier[] = [
    validateOptions: validateBooleanOptions,
    getOptions: getBooleanOptions,
  },
+  {
+    entitlement: 'com.apple.developer.shared-with-you.collaboration',
+    name: 'Messages Collaboration',
+    capability: CapabilityType.MESSAGES_COLLABORATION,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.submerged-shallow-depth-and-pressure',
+    name: 'Shallow Depth and Pressure',
+    capability: CapabilityType.SHALLOW_DEPTH_PRESSURE,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.proximity-reader.identity.display',
+    name: 'Tap to Present ID on iPhone (Display Only)',
+    capability: CapabilityType.TAP_TO_DISPLAY_ID,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+  {
+    entitlement: 'com.apple.developer.matter.allow-setup-payload',
+    name: 'Matter Allow Setup Payload',
+    capability: CapabilityType.MATTER_ALLOW_SETUP_PAYLOAD,
+    validateOptions: validateBooleanOptions,
+    getOptions: getBooleanOptions,
+  },
+
+  // VMNET

  // These don't appear to have entitlements, so it's unclear how we can automatically enable / disable them at this time.
  // TODO: Maybe add a warning about manually enabling features?
@@ -18,6 +18,7 @@ export enum AndroidActionType {
  GoBackToCaller,
  GoBackToHighLevelActions,
  CreateKeystore,
+  SetDefaultKeystore,
  DownloadKeystore,
  RemoveKeystore,
  CreateFcm,
@@ -52,6 +52,11 @@ export const buildCredentialsActions: ActionInfo[] = [
    title: 'Set up a new keystore',
    scope: Scope.Project,
  },
+  {
+    value: AndroidActionType.SetDefaultKeystore,
+    title: 'Change default keystore',
+    scope: Scope.Project,
+  },
  {
    value: AndroidActionType.DownloadKeystore,
    title: 'Download existing keystore',
@@ -0,0 +1,42 @@
+import { AndroidAppBuildCredentialsFragment } from '../../graphql/generated';
+import Log from '../../log';
+import { confirmAsync } from '../../prompts';
+import { promptForNameAsync } from '../android/actions/BuildCredentialsUtils';
+import { CreateKeystore } from '../android/actions/CreateKeystore';
+import { AppLookupParams } from '../android/api/GraphqlClient';
+import { CredentialsContext } from '../context';
+
+export class CreateAndroidBuildCredentials {
+  constructor(private app: AppLookupParams) {}
+
+  async runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment> {
+    const name = await promptForNameAsync();
+
+    const buildCredentialsList = await ctx.android.getAndroidAppBuildCredentialsListAsync(
+      ctx.graphqlClient,
+      this.app
+    );
+
+    let isDefault = true;
+    if (buildCredentialsList.length > 0) {
+      isDefault = await confirmAsync({
+        message: 'Do you want to set this as your default build credentials?',
+        initial: false,
+      });
+    }
+
+    const keystore = await new CreateKeystore(this.app.account).runAsync(ctx);
+    const createAndroidCredentials = await ctx.android.createAndroidAppBuildCredentialsAsync(
+      ctx.graphqlClient,
+      this.app,
+      {
+        name,
+        isDefault,
+        androidKeystoreId: keystore.id,
+      }
+    );
+
+    Log.succeed(`Created Android build credentials ${createAndroidCredentials.name}`);
+    return createAndroidCredentials;
+  }
+}
@@ -14,7 +14,6 @@ import {
 } from '../android/actions/BuildCredentialsUtils';
 import { CreateFcm } from '../android/actions/CreateFcm';
 import { CreateGoogleServiceAccountKey } from '../android/actions/CreateGoogleServiceAccountKey';
-import { CreateKeystore } from '../android/actions/CreateKeystore';
 import { DownloadKeystore } from '../android/actions/DownloadKeystore';
 import { RemoveFcm } from '../android/actions/RemoveFcm';
 import { SelectAndRemoveGoogleServiceAccountKey } from '../android/actions/RemoveGoogleServiceAccountKey';
@@ -36,13 +35,11 @@ import {
  gsaKeyActions,
  highLevelActions,
 } from './AndroidActions';
+import { CreateAndroidBuildCredentials } from './CreateAndroidBuildCredentials';
 import { Action, PressAnyKeyToContinue } from './HelperActions';
-import {
-  SelectAndroidBuildCredentials,
-  SelectAndroidBuildCredentialsResultType,
-  SelectExistingAndroidBuildCredentials,
-} from './SelectAndroidBuildCredentials';
+import { SelectExistingAndroidBuildCredentials } from './SelectAndroidBuildCredentials';
 import { SelectBuildProfileFromEasJson } from './SelectBuildProfileFromEasJson';
+import { SetDefaultAndroidKeystore } from './SetDefaultAndroidKeystore';

 export class ManageAndroid {
  constructor(private callingAction: Action, private projectDir: string) {}
@@ -163,31 +160,9 @@ export class ManageAndroid {
    );
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx, gradleContext);
    if (action === AndroidActionType.CreateKeystore) {
-      const selectBuildCredentialsResult = await new SelectAndroidBuildCredentials(
-        appLookupParams
-      ).runAsync(ctx);
-      const keystore = await new CreateKeystore(appLookupParams.account).runAsync(ctx);
-      if (
-        selectBuildCredentialsResult.resultType ===
-        SelectAndroidBuildCredentialsResultType.CREATE_REQUEST
-      ) {
-        await ctx.android.createAndroidAppBuildCredentialsAsync(
-          ctx.graphqlClient,
-          appLookupParams,
-          {
-            ...selectBuildCredentialsResult.result,
-            androidKeystoreId: keystore.id,
-          }
-        );
-      } else {
-        await ctx.android.updateAndroidAppBuildCredentialsAsync(
-          ctx.graphqlClient,
-          selectBuildCredentialsResult.result,
-          {
-            androidKeystoreId: keystore.id,
-          }
-        );
-      }
+      await new CreateAndroidBuildCredentials(appLookupParams).runAsync(ctx);
+    } else if (action === AndroidActionType.SetDefaultKeystore) {
+      await new SetDefaultAndroidKeystore(appLookupParams).runAsync(ctx);
    } else if (action === AndroidActionType.DownloadKeystore) {
      const buildCredentials = await new SelectExistingAndroidBuildCredentials(
        appLookupParams
@@ -0,0 +1,45 @@
+import { AndroidAppBuildCredentialsFragment } from '../../graphql/generated';
+import Log from '../../log';
+import { promptAsync } from '../../prompts';
+import { sortBuildCredentials } from '../android/actions/BuildCredentialsUtils';
+import { AppLookupParams } from '../android/api/GraphqlClient';
+import { CredentialsContext } from '../context';
+
+export class SetDefaultAndroidKeystore {
+  constructor(private app: AppLookupParams) {}
+
+  async runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment | undefined> {
+    const buildCredentialsList = await ctx.android.getAndroidAppBuildCredentialsListAsync(
+      ctx.graphqlClient,
+      this.app
+    );
+    if (buildCredentialsList.length === 0) {
+      Log.log(`You don't have any Android build credentials`);
+      return;
+    }
+    const sortedBuildCredentialsList = sortBuildCredentials(buildCredentialsList);
+    const sortedBuildCredentialsChoices = sortedBuildCredentialsList.map(buildCredentials => ({
+      title: buildCredentials.isDefault
+        ? `${buildCredentials.name} (Default)`
+        : buildCredentials.name,
+      value: buildCredentials,
+    }));
+
+    const { buildCredentialsResult } = await promptAsync({
+      type: 'select',
+      name: 'buildCredentialsResult',
+      message: 'Select build credentials',
+      choices: [...sortedBuildCredentialsChoices, { title: 'Cancel', value: null }],
+    });
+
+    if (!buildCredentialsResult?.androidKeystore) {
+      return;
+    }
+
+    Log.log('Updating the default build credentials for this project...');
+    return await ctx.android.setDefaultAndroidAppBuildCredentialsAsync(ctx.graphqlClient, {
+      ...buildCredentialsResult,
+      isDefault: true,
+    });
+  }
+}
@@ -0,0 +1 @@
+export const runCurrentMachineMethodAsync = jest.fn();
@@ -5,6 +5,7 @@ import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils
 import AppStoreApi from '../../../../credentials/ios/appstore/AppStoreApi';
 import { AccountFragment, Role } from '../../../../graphql/generated';
 import DeviceCreateAction, { RegistrationMethod } from '../action';
+import { runCurrentMachineMethodAsync } from '../currentMachineMethod';
 import { runDeveloperPortalMethodAsync } from '../developerPortalMethod';
 import { runInputMethodAsync } from '../inputMethod';
 import { runRegistrationUrlMethodAsync } from '../registrationUrlMethod';
@@ -13,6 +14,7 @@ jest.mock('prompts');
 jest.mock('../developerPortalMethod');
 jest.mock('../inputMethod');
 jest.mock('../registrationUrlMethod');
+jest.mock('../currentMachineMethod');

 beforeEach(() => {
  const promptsMock = jest.mocked(prompts);
@@ -22,6 +24,7 @@ beforeEach(() => {
  });
  jest.mocked(runRegistrationUrlMethodAsync).mockClear();
  jest.mocked(runInputMethodAsync).mockClear();
+  jest.mocked(runCurrentMachineMethodAsync).mockClear();
 });

 describe(DeviceCreateAction, () => {
@@ -118,5 +121,36 @@ describe(DeviceCreateAction, () => {

      expect(runDeveloperPortalMethodAsync).toBeCalled();
    });
+
+    it('calls runCurrentMachineMethodAsync if user chooses the current machine method', async () => {
+      jest.mocked(prompts).mockImplementationOnce(async () => ({
+        method: RegistrationMethod.CURRENT_MACHINE,
+      }));
+      const appStoreApiMock = mock<AppStoreApi>();
+      const appStoreApi = instance(appStoreApiMock);
+      const graphqlClient = instance(mock<ExpoGraphqlClient>());
+
+      const account: AccountFragment = {
+        id: 'account_id',
+        name: 'foobar',
+        users: [
+          {
+            role: Role.Owner,
+            actor: {
+              id: 'user_id',
+            },
+          },
+        ],
+      };
+      const appleTeam = {
+        id: 'apple-team-id',
+        appleTeamIdentifier: 'ABC123Y',
+        appleTeamName: 'John Doe (Individual)',
+      };
+      const action = new DeviceCreateAction(graphqlClient, appStoreApi, account, appleTeam);
+      await action.runAsync();
+
+      expect(runCurrentMachineMethodAsync).toBeCalled();
+    });
  });
 });
@@ -0,0 +1,183 @@
+import os from 'os';
+import prompts from 'prompts';
+import { instance, mock } from 'ts-mockito';
+
+import { ExpoGraphqlClient } from '../../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { AppleDeviceMutation } from '../../../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
+import { AppleTeam } from '../../../../graphql/generated';
+import { DeviceCreateError } from '../../../utils/errors';
+import { runCurrentMachineMethodAsync } from '../currentMachineMethod';
+
+jest.mock('../../../../credentials/ios/api/graphql/mutations/AppleDeviceMutation');
+jest.mock('../../../../ora');
+jest.mock('os', () => {
+  return {
+    ...jest.requireActual('os'),
+    cpus: jest.fn(),
+  };
+});
+jest.mock('@expo/spawn-async', () => {
+  return {
+    __esModule: true,
+    ...jest.requireActual('@expo/spawn-async'),
+    default: jest.fn(async () => {
+      return {
+        stdout: JSON.stringify({
+          SPHardwareDataType: [
+            {
+              provisioning_UDID: 'fake_udid',
+              machine_name: 'fake_machine_name',
+            },
+          ],
+        }),
+      };
+    }),
+  };
+});
+
+let actualPlatform: string;
+beforeAll(() => {
+  actualPlatform = process.platform;
+});
+
+beforeEach(() => {
+  jest.mocked(prompts).mockReset();
+  jest.mocked(prompts).mockImplementation(() => {
+    throw new Error(`unhandled prompts call - this shouldn't happen - fix tests!`);
+  });
+  jest.mocked(AppleDeviceMutation.createAppleDeviceAsync).mockClear();
+});
+
+afterAll(() => {
+  Object.defineProperty(process, 'platform', { value: actualPlatform });
+});
+
+describe(runCurrentMachineMethodAsync, () => {
+  it('allows registering the default Mac device class', async () => {
+    jest.mocked(os.cpus).mockImplementation(() => [{ model: 'Apple M1' } as os.CpuInfo]);
+    Object.defineProperty(process, 'platform', { value: 'darwin' });
+    mockDeviceData('my Mac');
+    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: true }));
+
+    const graphqlClient = instance(mock<ExpoGraphqlClient>());
+    const accountId = 'account-id';
+    // @ts-expect-error appleTeam is missing properties of AppleTeam GraphQL type
+    const appleTeam: AppleTeam = {
+      id: 'apple-team-id',
+      appleTeamIdentifier: 'ABC123XY',
+      appleTeamName: 'John Doe (Individual)',
+    };
+
+    await runCurrentMachineMethodAsync(graphqlClient, accountId, appleTeam);
+
+    expect(AppleDeviceMutation.createAppleDeviceAsync).toHaveBeenCalledTimes(1);
+  });
+
+  it('proceeds with registration if user approves, only once', async () => {
+    jest.mocked(os.cpus).mockImplementation(() => [{ model: 'Apple M1' } as os.CpuInfo]);
+    Object.defineProperty(process, 'platform', { value: 'darwin' });
+    mockDeviceData('my Mac');
+    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: true }));
+    mockDeviceData('my other Mac');
+    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: false }));
+
+    const graphqlClient = instance(mock<ExpoGraphqlClient>());
+    const accountId = 'account-id';
+    // @ts-expect-error appleTeam is missing properties of AppleTeam GraphQL type
+    const appleTeam: AppleTeam = {
+      id: 'apple-team-id',
+      appleTeamIdentifier: 'ABC123XY',
+      appleTeamName: 'John Doe (Individual)',
+    };
+
+    await runCurrentMachineMethodAsync(graphqlClient, accountId, appleTeam);
+
+    expect(AppleDeviceMutation.createAppleDeviceAsync).toHaveBeenCalledTimes(1);
+  });
+
+  it('exits registration if user cancels', async () => {
+    jest.mocked(os.cpus).mockImplementation(() => [{ model: 'Apple M1' } as os.CpuInfo]);
+    Object.defineProperty(process, 'platform', { value: 'darwin' });
+    mockDeviceData('my Mac');
+    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: false }));
+    mockDeviceData('my other Mac');
+    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: true }));
+
+    const graphqlClient = instance(mock<ExpoGraphqlClient>());
+    const accountId = 'account-id';
+    // @ts-expect-error appleTeam is missing properties of AppleTeam GraphQL type
+    const appleTeam: AppleTeam = {
+      id: 'apple-team-id',
+      appleTeamIdentifier: 'ABC123XY',
+      appleTeamName: 'John Doe (Individual)',
+    };
+
+    await runCurrentMachineMethodAsync(graphqlClient, accountId, appleTeam);
+
+    expect(AppleDeviceMutation.createAppleDeviceAsync).toHaveBeenCalledTimes(0);
+  });
+
+  it('exits registration if current Mac machine is not of Apple Silicon type', async () => {
+    jest
+      .mocked(os.cpus)
+      .mockImplementation(() => [{ model: 'Intel(R) Core(TM) i5' } as os.CpuInfo]);
+    Object.defineProperty(process, 'platform', { value: 'darwin' });
+    mockDeviceData('my old Mac');
+    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: true }));
+    mockDeviceData('my other Mac');
+    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: false }));
+
+    const graphqlClient = instance(mock<ExpoGraphqlClient>());
+    const accountId = 'account-id';
+    // @ts-expect-error appleTeam is missing properties of AppleTeam GraphQL type
+    const appleTeam: AppleTeam = {
+      id: 'apple-team-id',
+      appleTeamIdentifier: 'ABC123XY',
+      appleTeamName: 'John Doe (Individual)',
+    };
+
+    await expect(
+      runCurrentMachineMethodAsync(graphqlClient, accountId, appleTeam)
+    ).rejects.toThrowError(
+      new DeviceCreateError(
+        "Current machine is not of Apple Silicon type - provisioning UDID can't be added automatically."
+      )
+    );
+
+    expect(AppleDeviceMutation.createAppleDeviceAsync).toHaveBeenCalledTimes(0);
+  });
+
+  it('exits registration if current machine is not Mac', async () => {
+    jest
+      .mocked(os.cpus)
+      .mockImplementation(() => [{ model: 'Intel(R) Core(TM) i5' } as os.CpuInfo]);
+    Object.defineProperty(process, 'platform', { value: 'win32' });
+    mockDeviceData('my Windows PC');
+    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: true }));
+    mockDeviceData('my other Mac');
+    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: false }));
+
+    const graphqlClient = instance(mock<ExpoGraphqlClient>());
+    const accountId = 'account-id';
+    // @ts-expect-error appleTeam is missing properties of AppleTeam GraphQL type
+    const appleTeam: AppleTeam = {
+      id: 'apple-team-id',
+      appleTeamIdentifier: 'ABC123XY',
+      appleTeamName: 'John Doe (Individual)',
+    };
+
+    await expect(
+      runCurrentMachineMethodAsync(graphqlClient, accountId, appleTeam)
+    ).rejects.toThrowError(
+      new DeviceCreateError(
+        "Current machine is not of Apple Silicon type - provisioning UDID can't be added automatically."
+      )
+    );
+
+    expect(AppleDeviceMutation.createAppleDeviceAsync).toHaveBeenCalledTimes(0);
+  });
+});
+
+function mockDeviceData(name: string): void {
+  jest.mocked(prompts).mockImplementationOnce(async () => ({ name }));
+}
@@ -21,6 +21,8 @@ describe(runInputMethodAsync, () => {
  it('should allow for multiple device registration', async () => {
    mockDeviceData('00001111-001122334455662E', 'my iPhone', AppleDeviceClass.Iphone);
    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: true }));
+    mockDeviceData('00001111-001122334455662F', 'my Mac', AppleDeviceClass.Mac);
+    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: true }));
    mockDeviceData('b12cba9856d89c932ab7a4b813c4d932534e1679', 'my iPad', AppleDeviceClass.Ipad);
    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: false }));

@@ -35,7 +37,7 @@ describe(runInputMethodAsync, () => {

    await runInputMethodAsync(graphqlClient, accountId, appleTeam);

-    expect(AppleDeviceMutation.createAppleDeviceAsync).toHaveBeenCalledTimes(2);
+    expect(AppleDeviceMutation.createAppleDeviceAsync).toHaveBeenCalledTimes(3);
  });
 });

@@ -5,6 +5,7 @@ import AppStoreApi from '../../../credentials/ios/appstore/AppStoreApi';
 import { AccountFragment, AppleTeam } from '../../../graphql/generated';
 import Log from '../../../log';
 import { promptAsync } from '../../../prompts';
+import { runCurrentMachineMethodAsync } from './currentMachineMethod';
 import { runDeveloperPortalMethodAsync } from './developerPortalMethod';
 import { runInputMethodAsync } from './inputMethod';
 import { runRegistrationUrlMethodAsync } from './registrationUrlMethod';
@@ -13,6 +14,7 @@ export enum RegistrationMethod {
  WEBSITE,
  INPUT,
  DEVELOPER_PORTAL,
+  CURRENT_MACHINE,
  EXIT,
 }

@@ -37,6 +39,8 @@ export default class DeviceCreateAction {
      );
    } else if (method === RegistrationMethod.INPUT) {
      await runInputMethodAsync(this.graphqlClient, this.account.id, this.appleTeam);
+    } else if (method === RegistrationMethod.CURRENT_MACHINE) {
+      await runCurrentMachineMethodAsync(this.graphqlClient, this.account.id, this.appleTeam);
    } else if (method === RegistrationMethod.EXIT) {
      Log.log('Bye!');
      process.exit(0);
@@ -66,6 +70,12 @@ export default class DeviceCreateAction {
          title: `${chalk.bold('Input')} - allows you to type in UDIDs (advanced option)`,
          value: RegistrationMethod.INPUT,
        },
+        {
+          title: `${chalk.bold(
+            'Current Machine'
+          )} - automatically sets the provisioning UDID of the current Apple Silicon machine`,
+          value: RegistrationMethod.CURRENT_MACHINE,
+        },
        { title: chalk.bold('Exit'), value: RegistrationMethod.EXIT },
      ],
      validate: (val: RegistrationMethod) => Object.values(RegistrationMethod).includes(val),
@@ -0,0 +1,127 @@
+import spawnAsync from '@expo/spawn-async';
+import chalk from 'chalk';
+import os from 'os';
+
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { AppleDeviceMutation } from '../../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
+import { AppleDeviceClass, AppleTeam } from '../../../graphql/generated';
+import Log from '../../../log';
+import { ora } from '../../../ora';
+import { confirmAsync } from '../../../prompts';
+import { DeviceCreateError } from '../../utils/errors';
+import { DeviceData, printDeviceData, promptForNameAsync } from './utils';
+
+export async function runCurrentMachineMethodAsync(
+  graphqlClient: ExpoGraphqlClient,
+  accountId: string,
+  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>
+): Promise<void> {
+  Log.newLine();
+  Log.log(chalk.white('Checking if current machine is an Apple Silicon one.'));
+  if (!isMachineAppleSilicon()) {
+    throw new DeviceCreateError(
+      "Current machine is not of Apple Silicon type - provisioning UDID can't be added automatically."
+    );
+  }
+  Log.log(chalk.green('Check successful.'));
+
+  await collectDataAndRegisterDeviceAsync(graphqlClient, { accountId, appleTeam });
+}
+
+function isMachineAppleSilicon(): boolean {
+  return os.cpus()[0].model.includes('Apple M') && process.platform === 'darwin';
+}
+
+async function collectDataAndRegisterDeviceAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    accountId,
+    appleTeam,
+  }: {
+    accountId: string;
+    appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>;
+  }
+): Promise<void> {
+  const deviceData = await collectDeviceDataAsync(appleTeam);
+  if (!deviceData) {
+    return;
+  }
+
+  const { udid, deviceClass, name } = deviceData;
+  const spinner = ora(`Registering Apple device on Expo`).start();
+  try {
+    await AppleDeviceMutation.createAppleDeviceAsync(
+      graphqlClient,
+      {
+        appleTeamId: appleTeam.id,
+        identifier: udid,
+        name,
+        deviceClass: deviceClass ?? undefined,
+      },
+      accountId
+    );
+  } catch (err) {
+    spinner.fail();
+    throw err;
+  }
+  spinner.succeed();
+}
+
+async function collectDeviceDataAsync(
+  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName'>,
+  initialValues: Partial<DeviceData> = {}
+): Promise<DeviceData | null> {
+  Log.log(chalk.white('Fetching the provisioning UDID.'));
+  const [udid, defaultMachineName] = await fetchCurrentMachineUDIDAsync();
+  Log.log(chalk.green(`Fetched the provisioning UDID - ${udid}`));
+  const name = await promptForNameAsync(defaultMachineName ?? initialValues.name);
+  const deviceClass = AppleDeviceClass.Mac;
+  const deviceData: DeviceData = {
+    udid,
+    name,
+    deviceClass,
+  };
+  printDeviceData(deviceData, appleTeam);
+
+  const registrationConfirmed = await confirmAsync({
+    message: 'Is this what you want to register?',
+  });
+  if (!registrationConfirmed) {
+    Log.log('No worries, just try again.');
+    Log.newLine();
+    return null;
+  } else {
+    return deviceData;
+  }
+}
+
+async function fetchCurrentMachineUDIDAsync(): Promise<[string, string?]> {
+  try {
+    const profilerData = (
+      await spawnAsync('system_profiler', ['-json', 'SPHardwareDataType'])
+    ).stdout.trim();
+    if (!profilerData) {
+      const message = 'Failed to fetch the provisioning UDID from system profiler';
+      Log.error(message);
+      throw new DeviceCreateError(message);
+    }
+
+    const profilerDataJSON = JSON.parse(profilerData);
+    const provisioningUDID = profilerDataJSON?.SPHardwareDataType[0]?.provisioning_UDID;
+    if (!provisioningUDID) {
+      const message = 'System profiler data did not contain the provisioning UDID';
+      Log.error(message);
+      throw new DeviceCreateError(message);
+    }
+
+    const defaultMachineName = profilerDataJSON?.SPHardwareDataType[0]?.machine_name;
+    return [provisioningUDID, defaultMachineName];
+  } catch (err: any) {
+    if (!(err instanceof DeviceCreateError)) {
+      const message = `Failed to fetch the provisioning UDID of the current machine - ${err.message}`;
+      Log.error(message);
+      throw new DeviceCreateError(message);
+    }
+    throw err;
+  }
+}
@@ -19,6 +19,7 @@ const DEVICE_IMPORT_CHUNK_SIZE = 10;
 const DEVICE_CLASS_TO_GRAPHQL_TYPE: Partial<Record<DeviceClass, AppleDeviceClass>> = {
  [DeviceClass.IPAD]: AppleDeviceClass.Ipad,
  [DeviceClass.IPHONE]: AppleDeviceClass.Iphone,
+  [DeviceClass.MAC]: AppleDeviceClass.Mac,
 };

 export async function runDeveloperPortalMethodAsync(
@@ -105,7 +106,7 @@ async function findUnregisteredPortalDevicesAsync(
  return portalDevices.filter(
    portalDevice =>
      !(portalDevice.attributes.udid in expoRegisteredDevicesByUdid) &&
-      [DeviceClass.IPAD, DeviceClass.IPHONE, DeviceClass.APPLE_TV].includes(
+      [DeviceClass.IPAD, DeviceClass.IPHONE, DeviceClass.APPLE_TV, DeviceClass.MAC].includes(
        portalDevice.attributes.deviceClass
      )
  );
@@ -2,18 +2,17 @@ import chalk from 'chalk';

 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { AppleDeviceMutation } from '../../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
-import { AppleDeviceClass, AppleTeam } from '../../../graphql/generated';
+import { AppleTeam } from '../../../graphql/generated';
 import Log from '../../../log';
 import { ora } from '../../../ora';
-import { confirmAsync, promptAsync } from '../../../prompts';
-import { isValidUDID, normalizeUDID } from '../../udids';
-import { formatNewDevice } from '../../utils/formatDevice';
-
-interface DeviceData {
-  udid: string;
-  name?: string;
-  deviceClass: AppleDeviceClass | null;
-}
+import { confirmAsync } from '../../../prompts';
+import {
+  DeviceData,
+  printDeviceData,
+  promptForDeviceClassAsync,
+  promptForNameAsync,
+  promptForUDIDAsync,
+} from './utils';

 export async function runInputMethodAsync(
  graphqlClient: ExpoGraphqlClient,
@@ -78,16 +77,7 @@ async function collectDeviceDataAsync(
    deviceClass,
  };

-  Log.newLine();
-  Log.log(
-    `We are going to register the following device in our database.
-This device will ${chalk.bold(
-      'not'
-    )} be registered on the Apple Developer Portal until it is chosen for an internal distribution build.`
-  );
-  Log.newLine();
-  Log.log(formatNewDevice({ ...deviceData, identifier: deviceData.udid }, appleTeam));
-  Log.newLine();
+  printDeviceData(deviceData, appleTeam);

  const registrationConfirmed = await confirmAsync({
    message: 'Is this what you want to register?',
@@ -100,56 +90,3 @@ This device will ${chalk.bold(
    return deviceData;
  }
 }
-
-export async function promptForUDIDAsync(initial?: string): Promise<string> {
-  const { udid } = await promptAsync({
-    type: 'text',
-    name: 'udid',
-    message: 'UDID:',
-    initial,
-    validate: (rawVal: string) => {
-      const val = normalizeUDID(rawVal);
-      if (!val || val === '') {
-        return 'UDID cannot be empty';
-      } else if (val.length !== 25 && val.length !== 40) {
-        return 'UDID should be a 25 or 40-character string';
-      } else if (!isValidUDID(val)) {
-        return 'UDID is invalid';
-      } else {
-        return true;
-      }
-    },
-    format: (val: string) => normalizeUDID(val),
-  });
-  return udid;
-}
-
-async function promptForNameAsync(initial?: string): Promise<string | undefined> {
-  const { name } = await promptAsync({
-    type: 'text',
-    name: 'name',
-    message: 'Device name (optional):',
-    initial,
-  });
-  return name;
-}
-
-async function promptForDeviceClassAsync(
-  initial?: AppleDeviceClass | null
-): Promise<AppleDeviceClass | null> {
-  const choices = [
-    { title: 'iPhone', value: AppleDeviceClass.Iphone },
-    { title: 'iPad', value: AppleDeviceClass.Ipad },
-    { title: 'Not sure (leave empty)', value: null },
-  ];
-  const values = choices.map(({ value }) => value);
-
-  const { deviceClass } = await promptAsync({
-    type: 'select',
-    name: 'deviceClass',
-    message: 'Device class (optional):',
-    choices,
-    initial: initial !== undefined && values.indexOf(initial),
-  });
-  return deviceClass;
-}
@@ -0,0 +1,83 @@
+import chalk from 'chalk';
+
+import { AppleDeviceClass, AppleTeam } from '../../../graphql/generated';
+import Log from '../../../log';
+import { promptAsync } from '../../../prompts';
+import { isValidUDID, normalizeUDID } from '../../udids';
+import { formatNewDevice } from '../../utils/formatDevice';
+
+export interface DeviceData {
+  udid: string;
+  name?: string;
+  deviceClass: AppleDeviceClass | null;
+}
+
+export async function promptForDeviceClassAsync(
+  initial?: AppleDeviceClass | null
+): Promise<AppleDeviceClass | null> {
+  const choices = [
+    { title: 'iPhone', value: AppleDeviceClass.Iphone },
+    { title: 'iPad', value: AppleDeviceClass.Ipad },
+    { title: 'Mac', value: AppleDeviceClass.Mac },
+    { title: 'Not sure (leave empty)', value: null },
+  ];
+  const values = choices.map(({ value }) => value);
+
+  const { deviceClass } = await promptAsync({
+    type: 'select',
+    name: 'deviceClass',
+    message: 'Device class (optional):',
+    choices,
+    initial: initial !== undefined && values.indexOf(initial),
+  });
+  return deviceClass;
+}
+
+export async function promptForNameAsync(initial?: string): Promise<string | undefined> {
+  const { name } = await promptAsync({
+    type: 'text',
+    name: 'name',
+    message: 'Device name (optional):',
+    initial,
+  });
+  return name;
+}
+
+export async function promptForUDIDAsync(initial?: string): Promise<string> {
+  const { udid } = await promptAsync({
+    type: 'text',
+    name: 'udid',
+    message: 'UDID:',
+    initial,
+    validate: (rawVal: string) => {
+      const val = normalizeUDID(rawVal);
+      if (!val || val === '') {
+        return 'UDID cannot be empty';
+      } else if (val.length !== 25 && val.length !== 40) {
+        return 'UDID should be a 25 or 40-character string';
+      } else if (!isValidUDID(val)) {
+        return 'UDID is invalid';
+      } else {
+        return true;
+      }
+    },
+    format: (val: string) => normalizeUDID(val),
+  });
+  return udid;
+}
+
+export function printDeviceData(
+  deviceData: DeviceData,
+  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName'>
+): void {
+  Log.newLine();
+  Log.log(
+    `We are going to register the following device in our database.
+  This device will ${chalk.bold(
+    'not'
+  )} be registered on the Apple Developer Portal until it is chosen for an internal distribution build.`
+  );
+  Log.newLine();
+  Log.log(formatNewDevice({ ...deviceData, identifier: deviceData.udid }, appleTeam));
+  Log.newLine();
+}
@@ -12,10 +12,10 @@ import { Actor } from '../user/User';
 import DeviceCreateAction from './actions/create/action';
 import { DeviceManagerContext } from './context';

-const CREATE_COMMAND_DESCRIPTION = `This command lets you register your Apple devices (iPhones and iPads) for internal distribution of your app.
+const CREATE_COMMAND_DESCRIPTION = `This command lets you register your Apple devices (iPhones, iPads and Macs) for internal distribution of your app.
 Internal distribution means that you won't need to upload your app archive to App Store / Testflight.
-Your app archive (.ipa) will be installable on your equipment as long as you sign your application with an adhoc provisiong profile.
-The provisioning profile needs to contain the UDIDs (unique identifiers) of your iPhones and iPads.
+Your app archive (.ipa) will be installable on your equipment as long as you sign your application with an adhoc provisioning profile.
+The provisioning profile needs to contain the UDIDs (unique identifiers) of your iPhones, iPads and Macs.

 First of all, choose the Expo account under which you want to register your devices.
 Later, authenticate with Apple and choose your desired Apple Team (if your Apple ID has access to multiple teams).`;
@@ -3,3 +3,9 @@ export class DeviceNotFoundError extends Error {
    super(message ?? 'Device not found.');
  }
 }
+
+export class DeviceCreateError extends Error {
+  constructor(message?: string) {
+    super(message ?? 'Failed to create a device.');
+  }
+}
@@ -9,6 +9,7 @@ export type AppleTeamIdAndName = Pick<AppleTeam, 'appleTeamIdentifier' | 'appleT
 const DEVICE_CLASS_DISPLAY_NAMES: Record<AppleDeviceClass, string> = {
  [AppleDeviceClass.Iphone]: 'iPhone',
  [AppleDeviceClass.Ipad]: 'iPad',
+  [AppleDeviceClass.Mac]: 'Mac',
 };

 function formatDeviceClass(device: Device | NewDevice): string {
@@ -0,0 +1,10 @@
+import { testAppJson } from '../../credentials/__tests__/fixtures-constants';
+import { EASUpdateContext } from '../utils';
+
+export function createCtxMock(options: { nonInteractive?: boolean } = {}): EASUpdateContext {
+  return {
+    graphqlClient: jest.fn() as any,
+    nonInteractive: options.nonInteractive ?? false,
+    app: { exp: testAppJson, projectId: 'test-project-id' },
+  };
+}
@@ -0,0 +1,15 @@
+import { ExpoConfig } from '@expo/config-types';
+
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+
+export type EASUpdateContext = {
+  graphqlClient: ExpoGraphqlClient;
+  nonInteractive: boolean;
+  app: { exp: ExpoConfig; projectId: string };
+};
+
+export interface EASUpdateAction<T = any> {
+  runAsync(ctx: EASUpdateContext): Promise<T>;
+}
+
+export class NonInteractiveError extends Error {}
@@ -6,7 +6,16 @@ export async function withErrorHandlingAsync<T>(promise: Promise<OperationResult
  const { data, error } = await promise;

  if (error) {
-    if (error.graphQLErrors.some(e => e?.extensions?.isTransient)) {
+    if (
+      error.graphQLErrors.some(
+        e =>
+          e?.extensions?.isTransient &&
+          ![
+            'EAS_BUILD_FREE_TIER_LIMIT_EXCEEDED',
+            'EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED',
+          ].includes(e?.extensions?.errorCode as string)
+      )
+    ) {
      Log.error(`We've encountered a transient error. Try again shortly.`);
    }
    throw error;
@@ -112,6 +112,8 @@ export type Account = {
  googleServiceAccountKeys: Array<GoogleServiceAccountKey>;
  id: Scalars['ID'];
  isCurrent: Scalars['Boolean'];
+  /** Whether this account has SSO enabled. Can be queried by all members. */
+  isSSOEnabled: Scalars['Boolean'];
  name: Scalars['String'];
  /** Offers set on this account */
  offers?: Maybe<Array<Offer>>;
@@ -466,20 +468,14 @@ export type AccountQueryByNameArgs = {
 /** Auth configuration data for an SSO account. */
 export type AccountSsoConfiguration = {
  __typename?: 'AccountSSOConfiguration';
-  authEndpoint?: Maybe<Scalars['String']>;
  authProtocol: AuthProtocolType;
  authProviderIdentifier: Scalars['String'];
  clientIdentifier: Scalars['String'];
  clientSecret: Scalars['String'];
  createdAt: Scalars['DateTime'];
-  endSessionEndpoint?: Maybe<Scalars['String']>;
  id: Scalars['ID'];
  issuer: Scalars['String'];
-  jwksEndpoint?: Maybe<Scalars['String']>;
-  revokeEndpoint?: Maybe<Scalars['String']>;
-  tokenEndpoint?: Maybe<Scalars['String']>;
  updatedAt: Scalars['DateTime'];
-  userInfoEndpoint?: Maybe<Scalars['String']>;
 };

 export type AccountSsoConfigurationData = {
@@ -526,17 +522,11 @@ export type AccountSsoConfigurationMutationUpdateAccountSsoConfigurationArgs = {
 /** Public auth configuration data for an SSO account. */
 export type AccountSsoConfigurationPublicData = {
  __typename?: 'AccountSSOConfigurationPublicData';
-  authEndpoint?: Maybe<Scalars['String']>;
  authProtocol: AuthProtocolType;
  authProviderIdentifier: Scalars['String'];
-  clientIdentifier: Scalars['String'];
-  endSessionEndpoint?: Maybe<Scalars['String']>;
+  authorizationUrl: Scalars['String'];
  id: Scalars['ID'];
  issuer: Scalars['String'];
-  jwksEndpoint?: Maybe<Scalars['String']>;
-  revokeEndpoint?: Maybe<Scalars['String']>;
-  tokenEndpoint?: Maybe<Scalars['String']>;
-  userInfoEndpoint?: Maybe<Scalars['String']>;
 };

 export type AccountSsoConfigurationPublicDataQuery = {
@@ -972,6 +962,7 @@ export type AndroidSubmissionConfig = {
  /** @deprecated archiveType is deprecated and will be null */
  archiveType?: Maybe<SubmissionAndroidArchiveType>;
  releaseStatus?: Maybe<SubmissionAndroidReleaseStatus>;
+  rollout?: Maybe<Scalars['Float']>;
  track: SubmissionAndroidTrack;
 };

@@ -982,6 +973,7 @@ export type AndroidSubmissionConfigInput = {
  googleServiceAccountKeyId?: InputMaybe<Scalars['String']>;
  googleServiceAccountKeyJson?: InputMaybe<Scalars['String']>;
  releaseStatus?: InputMaybe<SubmissionAndroidReleaseStatus>;
+  rollout?: InputMaybe<Scalars['Float']>;
  track: SubmissionAndroidTrack;
 };

@@ -1017,6 +1009,7 @@ export type App = Project & {
  /** Environment secrets for an app */
  environmentSecrets: Array<EnvironmentSecret>;
  fullName: Scalars['String'];
+  githubBuildTriggers: Array<GitHubBuildTrigger>;
  githubRepository?: Maybe<GitHubRepository>;
  githubRepositorySettings?: Maybe<GitHubRepositorySettings>;
  /** githubUrl field from most recent classic update manifest */
@@ -1164,6 +1157,7 @@ export type AppBuildsPaginatedArgs = {
 export type AppChannelsPaginatedArgs = {
  after?: InputMaybe<Scalars['String']>;
  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<ChannelFilterInput>;
  first?: InputMaybe<Scalars['Int']>;
  last?: InputMaybe<Scalars['Int']>;
 };
@@ -1363,6 +1357,7 @@ export type AppInput = {

 export type AppInsights = {
  __typename?: 'AppInsights';
+  hasEventsFromExpoInsightsClientModule: Scalars['Boolean'];
  totalUniqueUsers?: Maybe<Scalars['Int']>;
  uniqueUsersByAppVersionOverTime: UniqueUsersOverTimeData;
  uniqueUsersByPlatformOverTime: UniqueUsersOverTimeData;
@@ -1371,16 +1366,19 @@ export type AppInsights = {

 export type AppInsightsTotalUniqueUsersArgs = {
  timespan: InsightsTimespan;
+  useDeprecatedBackend?: InputMaybe<Scalars['Boolean']>;
 };


 export type AppInsightsUniqueUsersByAppVersionOverTimeArgs = {
  timespan: InsightsTimespan;
+  useDeprecatedBackend?: InputMaybe<Scalars['Boolean']>;
 };


 export type AppInsightsUniqueUsersByPlatformOverTimeArgs = {
  timespan: InsightsTimespan;
+  useDeprecatedBackend?: InputMaybe<Scalars['Boolean']>;
 };

 export type AppMutation = {
@@ -1659,7 +1657,8 @@ export type AppleDevice = {

 export enum AppleDeviceClass {
  Ipad = 'IPAD',
-  Iphone = 'IPHONE'
+  Iphone = 'IPHONE',
+  Mac = 'MAC'
 }

 export type AppleDeviceInput = {
@@ -1980,6 +1979,44 @@ export enum AuthProtocolType {
  Oidc = 'OIDC'
 }

+export type BackgroundJobReceipt = {
+  __typename?: 'BackgroundJobReceipt';
+  account: Account;
+  createdAt: Scalars['DateTime'];
+  errorCode?: Maybe<Scalars['String']>;
+  errorMessage?: Maybe<Scalars['String']>;
+  id: Scalars['ID'];
+  resultId?: Maybe<Scalars['ID']>;
+  resultType: BackgroundJobResultType;
+  state: BackgroundJobState;
+  tries: Scalars['Int'];
+  updatedAt: Scalars['DateTime'];
+  willRetry: Scalars['Boolean'];
+};
+
+export type BackgroundJobReceiptQuery = {
+  __typename?: 'BackgroundJobReceiptQuery';
+  /** Look up background job receipt by ID */
+  byId: BackgroundJobReceipt;
+};
+
+
+export type BackgroundJobReceiptQueryByIdArgs = {
+  id: Scalars['ID'];
+};
+
+export enum BackgroundJobResultType {
+  GithubBuild = 'GITHUB_BUILD',
+  Void = 'VOID'
+}
+
+export enum BackgroundJobState {
+  Failure = 'FAILURE',
+  InProgress = 'IN_PROGRESS',
+  Queued = 'QUEUED',
+  Success = 'SUCCESS'
+}
+
 export type Billing = {
  __typename?: 'Billing';
  /** History of invoices */
@@ -2033,6 +2070,7 @@ export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
  initiatingUser?: Maybe<User>;
  iosEnterpriseProvisioning?: Maybe<BuildIosEnterpriseProvisioning>;
  isGitWorkingTreeDirty?: Maybe<Scalars['Boolean']>;
+  isWaived: Scalars['Boolean'];
  logFiles: Array<Scalars['String']>;
  maxBuildTimeSeconds: Scalars['Int'];
  /** Retry time starts after completedAt */
@@ -2203,6 +2241,17 @@ export enum BuildJobStatus {
  Started = 'STARTED'
 }

+export type BuildLimitThresholdExceededMetadata = {
+  __typename?: 'BuildLimitThresholdExceededMetadata';
+  account: Account;
+  thresholdsExceeded: Array<NotificationThresholdExceeded>;
+};
+
+export enum BuildLimitThresholdExceededMetadataType {
+  Ios = 'IOS',
+  Total = 'TOTAL'
+}
+
 export type BuildLogs = {
  __typename?: 'BuildLogs';
  format?: Maybe<BuildJobLogsFormat>;
@@ -2348,6 +2397,14 @@ export type BuildParamsInput = {
  sdkVersion?: InputMaybe<Scalars['String']>;
 };

+export type BuildPlanCreditThresholdExceededMetadata = {
+  __typename?: 'BuildPlanCreditThresholdExceededMetadata';
+  account: Account;
+  buildCreditUsage: Scalars['Int'];
+  planLimit: Scalars['Int'];
+  threshold: Scalars['Int'];
+};
+
 export enum BuildPriority {
  High = 'HIGH',
  Normal = 'NORMAL',
@@ -2480,6 +2537,10 @@ export type Card = {
  last4?: Maybe<Scalars['String']>;
 };

+export type ChannelFilterInput = {
+  searchTerm?: InputMaybe<Scalars['String']>;
+};
+
 export type Charge = {
  __typename?: 'Charge';
  amount: Scalars['Int'];
@@ -2549,6 +2610,19 @@ export type CreateGitHubAppInstallationInput = {
  installationIdentifier: Scalars['Int'];
 };

+export type CreateGitHubBuildTriggerInput = {
+  appId: Scalars['ID'];
+  autoSubmit: Scalars['Boolean'];
+  buildProfile: Scalars['String'];
+  isActive: Scalars['Boolean'];
+  platform: AppPlatform;
+  /** A branch or tag name, or a wildcard pattern where the code change originates from. For example, `main` or `release/*`. */
+  sourcePattern: Scalars['String'];
+  /** A branch name or a wildcard pattern that the pull request targets. For example, `main` or `release/*`. */
+  targetPattern?: InputMaybe<Scalars['String']>;
+  type: GitHubBuildTriggerType;
+};
+
 export type CreateGitHubRepositoryInput = {
  appId: Scalars['ID'];
  githubAppInstallationId: Scalars['ID'];
@@ -2661,6 +2735,11 @@ export type DeleteRobotResult = {
  id: Scalars['ID'];
 };

+export type DeleteSsoUserResult = {
+  __typename?: 'DeleteSSOUserResult';
+  id: Scalars['ID'];
+};
+
 export type DeleteUpdateBranchResult = {
  __typename?: 'DeleteUpdateBranchResult';
  id: Scalars['ID'];
@@ -3011,8 +3090,8 @@ export enum GitHubAppInstallationStatus {

 export type GitHubAppMutation = {
  __typename?: 'GitHubAppMutation';
-  /** Create a GitHub build for an app */
-  createGitHubBuild: Scalars['Boolean'];
+  /** Create a GitHub build for an app. Returns the ID of the background job receipt. Use BackgroundJobReceiptQuery to get the status of the job. */
+  createGitHubBuild: BackgroundJobReceipt;
 };


@@ -3049,6 +3128,54 @@ export type GitHubBuildInput = {
  platform: AppPlatform;
 };

+export type GitHubBuildTrigger = {
+  __typename?: 'GitHubBuildTrigger';
+  app: App;
+  autoSubmit: Scalars['Boolean'];
+  buildProfile: Scalars['String'];
+  createdAt: Scalars['DateTime'];
+  id: Scalars['ID'];
+  isActive: Scalars['Boolean'];
+  lastRunAt?: Maybe<Scalars['DateTime']>;
+  platform: AppPlatform;
+  sourcePattern: Scalars['String'];
+  targetPattern?: Maybe<Scalars['String']>;
+  type: GitHubBuildTriggerType;
+  updatedAt: Scalars['DateTime'];
+};
+
+export type GitHubBuildTriggerMutation = {
+  __typename?: 'GitHubBuildTriggerMutation';
+  /** Create GitHub build trigger for an App */
+  createGitHubBuildTrigger: GitHubBuildTrigger;
+  /** Delete GitHub build trigger by ID */
+  deleteGitHubBuildTrigger: GitHubBuildTrigger;
+  /** Update a GitHub build trigger by ID */
+  updateGitHubBuildTrigger: GitHubBuildTrigger;
+};
+
+
+export type GitHubBuildTriggerMutationCreateGitHubBuildTriggerArgs = {
+  githubBuildTriggerData: CreateGitHubBuildTriggerInput;
+};
+
+
+export type GitHubBuildTriggerMutationDeleteGitHubBuildTriggerArgs = {
+  githubBuildTriggerId: Scalars['ID'];
+};
+
+
+export type GitHubBuildTriggerMutationUpdateGitHubBuildTriggerArgs = {
+  githubBuildTriggerData: UpdateGitHubBuildTriggerInput;
+  githubBuildTriggerId: Scalars['ID'];
+};
+
+export enum GitHubBuildTriggerType {
+  PullRequestUpdated = 'PULL_REQUEST_UPDATED',
+  PushToBranch = 'PUSH_TO_BRANCH',
+  TagUpdated = 'TAG_UPDATED'
+}
+
 export type GitHubRepository = {
  __typename?: 'GitHubRepository';
  app: App;
@@ -3056,7 +3183,7 @@ export type GitHubRepository = {
  githubRepositoryIdentifier: Scalars['Int'];
  githubRepositoryUrl?: Maybe<Scalars['String']>;
  id: Scalars['ID'];
-  metadata?: Maybe<GitHubRepositoryMetadata>;
+  metadata: GitHubRepositoryMetadata;
  nodeIdentifier: Scalars['String'];
 };

@@ -3069,7 +3196,6 @@ export type GitHubRepositoryMetadata = {
  githubRepoUrl: Scalars['String'];
  lastPushed: Scalars['DateTime'];
  lastUpdated: Scalars['DateTime'];
-  openGraphImageUrl?: Maybe<Scalars['String']>;
  private: Scalars['Boolean'];
 };

@@ -3585,6 +3711,8 @@ export type MeMutation = {
  createAccount: Account;
  /** Delete an Account created via createAccount */
  deleteAccount: DeleteAccountResult;
+  /** Delete a SSO user. Actor must be an owner on the SSO user's SSO account. */
+  deleteSSOUser: DeleteSsoUserResult;
  /** Delete a second factor device */
  deleteSecondFactorDevice: SecondFactorBooleanResult;
  /** Delete a Snack that the current user owns */
@@ -3637,6 +3765,11 @@ export type MeMutationDeleteAccountArgs = {
 };


+export type MeMutationDeleteSsoUserArgs = {
+  ssoUserId: Scalars['ID'];
+};
+
+
 export type MeMutationDeleteSecondFactorDeviceArgs = {
  otp: Scalars['String'];
  userSecondFactorDeviceId: Scalars['ID'];
@@ -3710,12 +3843,27 @@ export type MeteredBillingStatus = {
  EAS_UPDATE: Scalars['Boolean'];
 };

+export type Notification = {
+  __typename?: 'Notification';
+  createdAt: Scalars['DateTime'];
+  event: NotificationEvent;
+  id: Scalars['ID'];
+  isRead: Scalars['Boolean'];
+  metadata?: Maybe<NotificationMetadata>;
+  type: NotificationType;
+  updatedAt: Scalars['DateTime'];
+};
+
 export enum NotificationEvent {
  BuildComplete = 'BUILD_COMPLETE',
+  BuildLimitThresholdExceeded = 'BUILD_LIMIT_THRESHOLD_EXCEEDED',
  BuildPlanCreditThresholdExceeded = 'BUILD_PLAN_CREDIT_THRESHOLD_EXCEEDED',
-  SubmissionComplete = 'SUBMISSION_COMPLETE'
+  SubmissionComplete = 'SUBMISSION_COMPLETE',
+  Test = 'TEST'
 }

+export type NotificationMetadata = BuildLimitThresholdExceededMetadata | BuildPlanCreditThresholdExceededMetadata | TestNotificationMetadata;
+
 export type NotificationSubscription = {
  __typename?: 'NotificationSubscription';
  account?: Maybe<Account>;
@@ -3756,8 +3904,17 @@ export type NotificationSubscriptionMutationUnsubscribeArgs = {
  id: Scalars['ID'];
 };

+export type NotificationThresholdExceeded = {
+  __typename?: 'NotificationThresholdExceeded';
+  count: Scalars['Int'];
+  limit: Scalars['Int'];
+  threshold: Scalars['Int'];
+  type: BuildLimitThresholdExceededMetadataType;
+};
+
 export enum NotificationType {
-  Email = 'EMAIL'
+  Email = 'EMAIL',
+  Web = 'WEB'
 }

 export type Offer = {
@@ -4041,6 +4198,8 @@ export type RootMutation = {
  githubApp: GitHubAppMutation;
  /** Mutations for GitHub App installations */
  githubAppInstallation: GitHubAppInstallationMutation;
+  /** Mutations for GitHub build triggers */
+  githubBuildTrigger: GitHubBuildTriggerMutation;
  /** Mutations for GitHub repositories */
  githubRepository: GitHubRepositoryMutation;
  /** Mutations for GitHub repository settings */
@@ -4122,6 +4281,7 @@ export type RootQuery = {
  /** Top-level query object for querying Apple Teams. */
  appleTeam: AppleTeamQuery;
  asset: AssetQuery;
+  backgroundJobReceipt: BackgroundJobReceiptQuery;
  buildJobs: BuildJobQuery;
  buildOrBuildJob: BuildOrBuildJobQuery;
  /** Top-level query object for querying BuildPublicData publicly. */
@@ -4150,17 +4310,20 @@ export type RootQuery = {
  meUserActor?: Maybe<UserActor>;
  project: ProjectQuery;
  snack: SnackQuery;
-  /** Top-level query object for querying SSO Users. */
-  ssoUser: SsoUserQuery;
  /** Top-level query object for querying Expo status page services. */
  statuspageService: StatuspageServiceQuery;
  submissions: SubmissionQuery;
  /** fetch all updates in a group */
  updatesByGroup: Array<Update>;
-  /** Top-level query object for querying Users. */
+  /**
+   * Top-level query object for querying Users.
+   * @deprecated Public user queries are no longer supported
+   */
  user: UserQuery;
  /** Top-level query object for querying UserActors. */
  userActor: UserActorQuery;
+  /** Top-level query object for querying UserActorPublicData publicly. */
+  userActorPublicData: UserActorPublicDataQuery;
  /** @deprecated Use 'byId' field under 'user'. */
  userByUserId?: Maybe<User>;
  /** @deprecated Use 'byUsername' field under 'user'. */
@@ -4212,6 +4375,23 @@ export type Runtime = {
  version: Scalars['String'];
 };

+export type RuntimeEdge = {
+  __typename?: 'RuntimeEdge';
+  cursor: Scalars['String'];
+  node: Runtime;
+};
+
+export type RuntimeFilterInput = {
+  /** Only return runtimes shared with this branch */
+  branchId?: InputMaybe<Scalars['String']>;
+};
+
+export type RuntimesConnection = {
+  __typename?: 'RuntimesConnection';
+  edges: Array<RuntimeEdge>;
+  pageInfo: PageInfo;
+};
+
 /** Represents a human SSO (not robot) actor. */
 export type SsoUser = Actor & UserActor & {
  __typename?: 'SSOUser';
@@ -4221,6 +4401,7 @@ export type SsoUser = Actor & UserActor & {
  /** Coalesced project activity for all apps belonging to all accounts this user belongs to. Only resolves for the viewer. */
  activityTimelineProjectActivities: Array<ActivityTimelineProjectActivity>;
  appCount: Scalars['Int'];
+  /** @deprecated No longer supported */
  appetizeCode?: Maybe<Scalars['String']>;
  /** Apps this user has published. If this user is the viewer, this field returns the apps the user has access to. */
  apps: Array<App>;
@@ -4238,11 +4419,14 @@ export type SsoUser = Actor & UserActor & {
  fullName?: Maybe<Scalars['String']>;
  /** GitHub account linked to a user */
  githubUser?: Maybe<GitHubUser>;
+  /** @deprecated No longer supported */
  githubUsername?: Maybe<Scalars['String']>;
  id: Scalars['ID'];
+  /** @deprecated No longer supported */
  industry?: Maybe<Scalars['String']>;
  isExpoAdmin: Scalars['Boolean'];
  lastName?: Maybe<Scalars['String']>;
+  /** @deprecated No longer supported */
  location?: Maybe<Scalars['String']>;
  notificationSubscriptions: Array<NotificationSubscription>;
  /** Associated accounts */
@@ -4250,8 +4434,11 @@ export type SsoUser = Actor & UserActor & {
  profilePhoto: Scalars['String'];
  /** Snacks associated with this account */
  snacks: Array<Snack>;
+  /** @deprecated No longer supported */
  twitterUsername?: Maybe<Scalars['String']>;
  username: Scalars['String'];
+  /** Web notifications linked to a user */
+  websiteNotifications: Array<Notification>;
 };


@@ -4291,29 +4478,7 @@ export type SsoUserSnacksArgs = {

 export type SsoUserDataInput = {
  firstName?: InputMaybe<Scalars['String']>;
-  githubUsername?: InputMaybe<Scalars['String']>;
-  industry?: InputMaybe<Scalars['String']>;
  lastName?: InputMaybe<Scalars['String']>;
-  location?: InputMaybe<Scalars['String']>;
-  twitterUsername?: InputMaybe<Scalars['String']>;
-};
-
-export type SsoUserQuery = {
-  __typename?: 'SSOUserQuery';
-  /** Query an SSOUser by ID */
-  byId: SsoUser;
-  /** Query an SSOUser by username */
-  byUsername: SsoUser;
-};
-
-
-export type SsoUserQueryByIdArgs = {
-  userId: Scalars['ID'];
-};
-
-
-export type SsoUserQueryByUsernameArgs = {
-  username: Scalars['String'];
 };

 export type SecondFactorBooleanResult = {
@@ -4692,6 +4857,11 @@ export type SubscriptionDetailsPlanEnablementArgs = {
  serviceMetric: EasServiceMetric;
 };

+export type TestNotificationMetadata = {
+  __typename?: 'TestNotificationMetadata';
+  message: Scalars['String'];
+};
+
 export type TimelineActivityConnection = {
  __typename?: 'TimelineActivityConnection';
  edges: Array<TimelineActivityEdge>;
@@ -4748,16 +4918,27 @@ export type Update = ActivityTimelineProjectActivity & {

 export type UpdateBranch = {
  __typename?: 'UpdateBranch';
+  app: App;
  appId: Scalars['ID'];
  createdAt: Scalars['DateTime'];
  id: Scalars['ID'];
  name: Scalars['String'];
+  runtimes: RuntimesConnection;
  updateGroups: Array<Array<Update>>;
  updatedAt: Scalars['DateTime'];
  updates: Array<Update>;
 };


+export type UpdateBranchRuntimesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<RuntimeFilterInput>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+};
+
+
 export type UpdateBranchUpdateGroupsArgs = {
  filter?: InputMaybe<UpdatesFilter>;
  limit: Scalars['Int'];
@@ -4809,6 +4990,7 @@ export type UpdateBranchMutationPublishUpdateGroupsArgs = {

 export type UpdateChannel = {
  __typename?: 'UpdateChannel';
+  app: App;
  appId: Scalars['ID'];
  branchMapping: Scalars['String'];
  createdAt: Scalars['DateTime'];
@@ -4862,6 +5044,16 @@ export type UpdateChannelMutationEditUpdateChannelArgs = {
  channelId: Scalars['ID'];
 };

+export type UpdateGitHubBuildTriggerInput = {
+  autoSubmit: Scalars['Boolean'];
+  buildProfile: Scalars['String'];
+  isActive: Scalars['Boolean'];
+  platform: AppPlatform;
+  sourcePattern: Scalars['String'];
+  targetPattern?: InputMaybe<Scalars['String']>;
+  type: GitHubBuildTriggerType;
+};
+
 export type UpdateGitHubRepositorySettingsInput = {
  baseDirectory: Scalars['String'];
 };
@@ -4960,6 +5152,7 @@ export type User = Actor & UserActor & {
  /** Coalesced project activity for all apps belonging to all accounts this user belongs to. Only resolves for the viewer. */
  activityTimelineProjectActivities: Array<ActivityTimelineProjectActivity>;
  appCount: Scalars['Int'];
+  /** @deprecated No longer supported */
  appetizeCode?: Maybe<Scalars['String']>;
  /** Apps this user has published */
  apps: Array<App>;
@@ -4968,7 +5161,7 @@ export type User = Actor & UserActor & {
  /** Discord account linked to a user */
  discordUser?: Maybe<DiscordUser>;
  displayName: Scalars['String'];
-  email?: Maybe<Scalars['String']>;
+  email: Scalars['String'];
  emailVerified: Scalars['Boolean'];
  /**
   * Server feature gate values for this actor, optionally filtering by desired gates.
@@ -4979,16 +5172,19 @@ export type User = Actor & UserActor & {
  fullName?: Maybe<Scalars['String']>;
  /** GitHub account linked to a user */
  githubUser?: Maybe<GitHubUser>;
+  /** @deprecated No longer supported */
  githubUsername?: Maybe<Scalars['String']>;
  /** Whether this user has any pending user invitations. Only resolves for the viewer. */
  hasPendingUserInvitations: Scalars['Boolean'];
  id: Scalars['ID'];
+  /** @deprecated No longer supported */
  industry?: Maybe<Scalars['String']>;
  isExpoAdmin: Scalars['Boolean'];
-  /** @deprecated This field no longer exists */
+  /** @deprecated No longer supported */
  isLegacy: Scalars['Boolean'];
  isSecondFactorAuthenticationEnabled: Scalars['Boolean'];
  lastName?: Maybe<Scalars['String']>;
+  /** @deprecated No longer supported */
  location?: Maybe<Scalars['String']>;
  notificationSubscriptions: Array<NotificationSubscription>;
  /** Pending UserInvitations for this user. Only resolves for the viewer. */
@@ -5000,8 +5196,10 @@ export type User = Actor & UserActor & {
  secondFactorDevices: Array<UserSecondFactorDevice>;
  /** Snacks associated with this account */
  snacks: Array<Snack>;
+  /** @deprecated No longer supported */
  twitterUsername?: Maybe<Scalars['String']>;
  username: Scalars['String'];
+  websiteNotifications: Array<Notification>;
 };


@@ -5050,6 +5248,7 @@ export type UserActor = {
   */
  activityTimelineProjectActivities: Array<ActivityTimelineProjectActivity>;
  appCount: Scalars['Int'];
+  /** @deprecated No longer supported */
  appetizeCode?: Maybe<Scalars['String']>;
  /** Apps this user has published */
  apps: Array<App>;
@@ -5071,11 +5270,14 @@ export type UserActor = {
  fullName?: Maybe<Scalars['String']>;
  /** GitHub account linked to a user */
  githubUser?: Maybe<GitHubUser>;
+  /** @deprecated No longer supported */
  githubUsername?: Maybe<Scalars['String']>;
  id: Scalars['ID'];
+  /** @deprecated No longer supported */
  industry?: Maybe<Scalars['String']>;
  isExpoAdmin: Scalars['Boolean'];
  lastName?: Maybe<Scalars['String']>;
+  /** @deprecated No longer supported */
  location?: Maybe<Scalars['String']>;
  notificationSubscriptions: Array<NotificationSubscription>;
  /** Associated accounts */
@@ -5083,8 +5285,11 @@ export type UserActor = {
  profilePhoto: Scalars['String'];
  /** Snacks associated with this user's personal account */
  snacks: Array<Snack>;
+  /** @deprecated No longer supported */
  twitterUsername?: Maybe<Scalars['String']>;
  username: Scalars['String'];
+  /** Web notifications linked to a user */
+  websiteNotifications: Array<Notification>;
 };


@@ -5122,6 +5327,46 @@ export type UserActorSnacksArgs = {
  offset: Scalars['Int'];
 };

+/** A human user (type User or SSOUser) that can login to the Expo website, use Expo services, and be a member of accounts. */
+export type UserActorPublicData = {
+  __typename?: 'UserActorPublicData';
+  /** Apps this user has published */
+  apps: Array<App>;
+  firstName?: Maybe<Scalars['String']>;
+  id: Scalars['ID'];
+  lastName?: Maybe<Scalars['String']>;
+  profilePhoto: Scalars['String'];
+  /** Snacks associated with this user's personal account */
+  snacks: Array<Snack>;
+  username: Scalars['String'];
+};
+
+
+/** A human user (type User or SSOUser) that can login to the Expo website, use Expo services, and be a member of accounts. */
+export type UserActorPublicDataAppsArgs = {
+  includeUnpublished?: InputMaybe<Scalars['Boolean']>;
+  limit: Scalars['Int'];
+  offset: Scalars['Int'];
+};
+
+
+/** A human user (type User or SSOUser) that can login to the Expo website, use Expo services, and be a member of accounts. */
+export type UserActorPublicDataSnacksArgs = {
+  limit: Scalars['Int'];
+  offset: Scalars['Int'];
+};
+
+export type UserActorPublicDataQuery = {
+  __typename?: 'UserActorPublicDataQuery';
+  /** Get UserActorPublicData by username */
+  byUsername: UserActorPublicData;
+};
+
+
+export type UserActorPublicDataQueryByUsernameArgs = {
+  username: Scalars['String'];
+};
+
 export type UserActorQuery = {
  __typename?: 'UserActorQuery';
  /** Query a UserActor by ID */
@@ -5141,17 +5386,12 @@ export type UserActorQueryByUsernameArgs = {
 };

 export type UserDataInput = {
-  appetizeCode?: InputMaybe<Scalars['String']>;
  email?: InputMaybe<Scalars['String']>;
  firstName?: InputMaybe<Scalars['String']>;
  fullName?: InputMaybe<Scalars['String']>;
-  githubUsername?: InputMaybe<Scalars['String']>;
  id?: InputMaybe<Scalars['ID']>;
-  industry?: InputMaybe<Scalars['String']>;
  lastName?: InputMaybe<Scalars['String']>;
-  location?: InputMaybe<Scalars['String']>;
  profilePhoto?: InputMaybe<Scalars['String']>;
-  twitterUsername?: InputMaybe<Scalars['String']>;
  username?: InputMaybe<Scalars['String']>;
 };

@@ -5268,9 +5508,15 @@ export type UserPermission = {

 export type UserQuery = {
  __typename?: 'UserQuery';
-  /** Query a User by ID */
+  /**
+   * Query a User by ID
+   * @deprecated Public user queries are no longer supported
+   */
  byId: User;
-  /** Query a User by username */
+  /**
+   * Query a User by username
+   * @deprecated Public user queries are no longer supported
+   */
  byUsername: User;
 };

@@ -5463,6 +5709,14 @@ export type CreateAndroidAppBuildCredentialsMutationVariables = Exact<{

 export type CreateAndroidAppBuildCredentialsMutation = { __typename?: 'RootMutation', androidAppBuildCredentials: { __typename?: 'AndroidAppBuildCredentialsMutation', createAndroidAppBuildCredentials: { __typename?: 'AndroidAppBuildCredentials', id: string, isDefault: boolean, isLegacy: boolean, name: string, androidKeystore?: { __typename?: 'AndroidKeystore', id: string, type: AndroidKeystoreType, keystore: string, keystorePassword: string, keyAlias: string, keyPassword?: string | null, md5CertificateFingerprint?: string | null, sha1CertificateFingerprint?: string | null, sha256CertificateFingerprint?: string | null, createdAt: any, updatedAt: any } | null } } };

+export type SetDefaultAndroidAppBuildCredentialsMutationVariables = Exact<{
+  androidAppBuildCredentialsId: Scalars['ID'];
+  isDefault: Scalars['Boolean'];
+}>;
+
+
+export type SetDefaultAndroidAppBuildCredentialsMutation = { __typename?: 'RootMutation', androidAppBuildCredentials: { __typename?: 'AndroidAppBuildCredentialsMutation', setDefault: { __typename?: 'AndroidAppBuildCredentials', id: string, isDefault: boolean, isLegacy: boolean, name: string, androidKeystore?: { __typename?: 'AndroidKeystore', id: string, type: AndroidKeystoreType, keystore: string, keystorePassword: string, keyAlias: string, keyPassword?: string | null, md5CertificateFingerprint?: string | null, sha1CertificateFingerprint?: string | null, sha256CertificateFingerprint?: string | null, createdAt: any, updatedAt: any } | null } } };
+
 export type SetKeystoreMutationVariables = Exact<{
  androidAppBuildCredentialsId: Scalars['ID'];
  keystoreId: Scalars['ID'];
@@ -5946,7 +6200,7 @@ export type CreateAndroidSubmissionMutationVariables = Exact<{
 }>;


-export type CreateAndroidSubmissionMutation = { __typename?: 'RootMutation', submission: { __typename?: 'SubmissionMutation', createAndroidSubmission: { __typename?: 'CreateSubmissionResult', submission: { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null } } } };
+export type CreateAndroidSubmissionMutation = { __typename?: 'RootMutation', submission: { __typename?: 'SubmissionMutation', createAndroidSubmission: { __typename?: 'CreateSubmissionResult', submission: { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null } } } };

 export type CreateIosSubmissionMutationVariables = Exact<{
  appId: Scalars['ID'];
@@ -5956,7 +6210,7 @@ export type CreateIosSubmissionMutationVariables = Exact<{
 }>;


-export type CreateIosSubmissionMutation = { __typename?: 'RootMutation', submission: { __typename?: 'SubmissionMutation', createIosSubmission: { __typename?: 'CreateSubmissionResult', submission: { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null } } } };
+export type CreateIosSubmissionMutation = { __typename?: 'RootMutation', submission: { __typename?: 'SubmissionMutation', createIosSubmission: { __typename?: 'CreateSubmissionResult', submission: { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null } } } };

 export type CreateUploadSessionMutationVariables = Exact<{
  type: UploadSessionType;
@@ -6028,6 +6282,17 @@ export type BranchesByAppQueryVariables = Exact<{

 export type BranchesByAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updates: Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }> }> } } };

+export type BranchesBasicPaginatedOnAppQueryVariables = Exact<{
+  appId: Scalars['String'];
+  first?: InputMaybe<Scalars['Int']>;
+  after?: InputMaybe<Scalars['String']>;
+  last?: InputMaybe<Scalars['Int']>;
+  before?: InputMaybe<Scalars['String']>;
+}>;
+
+
+export type BranchesBasicPaginatedOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, branchesPaginated: { __typename?: 'AppBranchesConnection', edges: Array<{ __typename?: 'AppBranchEdge', cursor: string, node: { __typename?: 'UpdateBranch', id: string, name: string } }>, pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | null, endCursor?: string | null } } } } };
+
 export type ViewBranchesOnUpdateChannelQueryVariables = Exact<{
  appId: Scalars['String'];
  channelName: Scalars['String'];
@@ -6050,7 +6315,7 @@ export type BuildsWithSubmissionsByIdQueryVariables = Exact<{
 }>;


-export type BuildsWithSubmissionsByIdQuery = { __typename?: 'RootQuery', builds: { __typename?: 'BuildQuery', byId: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, message?: string | null, completedAt?: any | null, resourceClass: BuildResourceClass, expirationDate?: any | null, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }>, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'SSOUser', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } } } };
+export type BuildsWithSubmissionsByIdQuery = { __typename?: 'RootQuery', builds: { __typename?: 'BuildQuery', byId: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, message?: string | null, completedAt?: any | null, resourceClass: BuildResourceClass, expirationDate?: any | null, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }>, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'SSOUser', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } } } };

 export type ViewBuildsOnAppQueryVariables = Exact<{
  appId: Scalars['String'];
@@ -6065,6 +6330,7 @@ export type ViewBuildsOnAppQuery = { __typename?: 'RootQuery', app: { __typename
 export type ViewUpdateChannelOnAppQueryVariables = Exact<{
  appId: Scalars['String'];
  channelName: Scalars['String'];
+  filter?: InputMaybe<UpdatesFilter>;
 }>;


@@ -6077,7 +6343,18 @@ export type ViewUpdateChannelsOnAppQueryVariables = Exact<{
 }>;


-export type ViewUpdateChannelsOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateChannels: Array<{ __typename?: 'UpdateChannel', id: string, name: string, branchMapping: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> }> }> } } };
+export type ViewUpdateChannelsOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateChannels: Array<{ __typename?: 'UpdateChannel', id: string, name: string, createdAt: any, branchMapping: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> }> }> } } };
+
+export type ViewUpdateChannelsPaginatedOnAppQueryVariables = Exact<{
+  appId: Scalars['String'];
+  first?: InputMaybe<Scalars['Int']>;
+  after?: InputMaybe<Scalars['String']>;
+  last?: InputMaybe<Scalars['Int']>;
+  before?: InputMaybe<Scalars['String']>;
+}>;
+
+
+export type ViewUpdateChannelsPaginatedOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, channelsPaginated: { __typename?: 'AppChannelsConnection', edges: Array<{ __typename?: 'AppChannelEdge', cursor: string, node: { __typename?: 'UpdateChannel', id: string, name: string, branchMapping: string } }>, pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | null, endCursor?: string | null } } } } };

 export type EnvironmentSecretsByAppIdQueryVariables = Exact<{
  appId: Scalars['String'];
@@ -6100,6 +6377,19 @@ export type GetAssetLimitPerUpdateGroupForAppQueryVariables = Exact<{

 export type GetAssetLimitPerUpdateGroupForAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, assetLimitPerUpdateGroup: number } } };

+export type ViewRuntimesOnBranchQueryVariables = Exact<{
+  appId: Scalars['String'];
+  name: Scalars['String'];
+  first?: InputMaybe<Scalars['Int']>;
+  after?: InputMaybe<Scalars['String']>;
+  last?: InputMaybe<Scalars['Int']>;
+  before?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<RuntimeFilterInput>;
+}>;
+
+
+export type ViewRuntimesOnBranchQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateBranchByName?: { __typename?: 'UpdateBranch', id: string, runtimes: { __typename?: 'RuntimesConnection', edges: Array<{ __typename?: 'RuntimeEdge', cursor: string, node: { __typename?: 'Runtime', id: string, version: string } }>, pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | null, endCursor?: string | null } } } | null } } };
+
 export type StatuspageServiceByServiceNamesQueryVariables = Exact<{
  serviceNames: Array<StatuspageServiceName> | StatuspageServiceName;
 }>;
@@ -6112,7 +6402,7 @@ export type SubmissionsByIdQueryVariables = Exact<{
 }>;


-export type SubmissionsByIdQuery = { __typename?: 'RootQuery', submissions: { __typename?: 'SubmissionQuery', byId: { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null } } };
+export type SubmissionsByIdQuery = { __typename?: 'RootQuery', submissions: { __typename?: 'SubmissionQuery', byId: { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null } } };

 export type GetAllSubmissionsForAppQueryVariables = Exact<{
  appId: Scalars['String'];
@@ -6123,7 +6413,7 @@ export type GetAllSubmissionsForAppQueryVariables = Exact<{
 }>;


-export type GetAllSubmissionsForAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }> } } };
+export type GetAllSubmissionsForAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }> } } };

 export type ViewUpdatesByGroupQueryVariables = Exact<{
  groupId: Scalars['ID'];
@@ -6156,7 +6446,7 @@ export type ViewUpdateGroupsOnAppQuery = { __typename?: 'RootQuery', app: { __ty
 export type CurrentUserQueryVariables = Exact<{ [key: string]: never; }>;


-export type CurrentUserQuery = { __typename?: 'RootQuery', meActor?: { __typename: 'Robot', firstName?: string | null, id: string, featureGates: any, isExpoAdmin: boolean, accounts: Array<{ __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }> } | { __typename: 'SSOUser', username: string, id: string, featureGates: any, isExpoAdmin: boolean, accounts: Array<{ __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }> } | { __typename: 'User', username: string, id: string, featureGates: any, isExpoAdmin: boolean, primaryAccount: { __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }, accounts: Array<{ __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }> } | null };
+export type CurrentUserQuery = { __typename?: 'RootQuery', meActor?: { __typename: 'Robot', firstName?: string | null, id: string, featureGates: any, isExpoAdmin: boolean, accounts: Array<{ __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }> } | { __typename: 'SSOUser', username: string, id: string, featureGates: any, isExpoAdmin: boolean, primaryAccount: { __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }, accounts: Array<{ __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }> } | { __typename: 'User', username: string, id: string, featureGates: any, isExpoAdmin: boolean, primaryAccount: { __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }, accounts: Array<{ __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }> } | null };

 export type WebhooksByAppIdQueryVariables = Exact<{
  appId: Scalars['String'];
@@ -6179,18 +6469,24 @@ export type AppFragment = { __typename?: 'App', id: string, fullName: string, sl

 export type BuildFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, message?: string | null, completedAt?: any | null, resourceClass: BuildResourceClass, expirationDate?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'SSOUser', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };

-export type BuildWithSubmissionsFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, message?: string | null, completedAt?: any | null, resourceClass: BuildResourceClass, expirationDate?: any | null, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }>, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'SSOUser', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };
+export type BuildWithSubmissionsFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, message?: string | null, completedAt?: any | null, resourceClass: BuildResourceClass, expirationDate?: any | null, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }>, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'SSOUser', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };

 export type EnvironmentSecretFragment = { __typename?: 'EnvironmentSecret', id: string, name: string, type: EnvironmentSecretType, createdAt: any };

+export type RuntimeFragment = { __typename?: 'Runtime', id: string, version: string };
+
 export type StatuspageServiceFragment = { __typename?: 'StatuspageService', id: string, name: StatuspageServiceName, status: StatuspageServiceStatus, incidents: Array<{ __typename?: 'StatuspageIncident', id: string, status: StatuspageIncidentStatus, name: string, impact: StatuspageIncidentImpact, shortlink: string }> };

-export type SubmissionFragment = { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null };
+export type SubmissionFragment = { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null };

 export type UpdateFragment = { __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null };

 export type UpdateBranchFragment = { __typename?: 'UpdateBranch', id: string, name: string, updates: Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }> };

+export type UpdateBranchBasicInfoFragment = { __typename?: 'UpdateBranch', id: string, name: string };
+
+export type UpdateChannelBasicInfoFragment = { __typename?: 'UpdateChannel', id: string, name: string, branchMapping: string };
+
 export type WebhookFragment = { __typename?: 'Webhook', id: string, event: WebhookType, url: string, createdAt: any, updatedAt: any };

 export type AndroidAppBuildCredentialsFragment = { __typename?: 'AndroidAppBuildCredentials', id: string, isDefault: boolean, isLegacy: boolean, name: string, androidKeystore?: { __typename?: 'AndroidKeystore', id: string, type: AndroidKeystoreType, keystore: string, keystorePassword: string, keyAlias: string, keyPassword?: string | null, md5CertificateFingerprint?: string | null, sha1CertificateFingerprint?: string | null, sha256CertificateFingerprint?: string | null, createdAt: any, updatedAt: any } | null };
@@ -5,8 +5,11 @@ import { BranchNotFoundError } from '../../branch/utils';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../client';
 import {
+  BranchesBasicPaginatedOnAppQuery,
+  BranchesBasicPaginatedOnAppQueryVariables,
  BranchesByAppQuery,
  BranchesByAppQueryVariables,
+  UpdateBranchBasicInfoFragment,
  UpdateBranchFragment,
  ViewBranchQuery,
  ViewBranchQueryVariables,
@@ -15,6 +18,7 @@ import {
 } from '../generated';
 import { UpdateFragmentNode } from '../types/Update';
 import { UpdateBranchFragmentNode } from '../types/UpdateBranch';
+import { UpdateBranchBasicInfoFragmentNode } from '../types/UpdateBranchBasicInfo';

 export type UpdateBranchOnChannelObject = NonNullable<
  ViewBranchesOnUpdateChannelQuery['app']['byId']['updateChannelByName']
@@ -24,7 +28,7 @@ export const BranchQuery = {
  async getBranchByNameAsync(
    graphqlClient: ExpoGraphqlClient,
    { appId, name }: ViewBranchQueryVariables
-  ): Promise<NonNullable<ViewBranchQuery['app']['byId']['updateBranchByName']>> {
+  ): Promise<UpdateBranchBasicInfoFragment> {
    const response = await withErrorHandlingAsync<ViewBranchQuery>(
      graphqlClient
        .query<ViewBranchQuery, ViewBranchQueryVariables>(
@@ -35,11 +39,12 @@ export const BranchQuery = {
                  id
                  updateBranchByName(name: $name) {
                    id
-                    name
+                    ...UpdateBranchBasicInfoFragment
                  }
                }
              }
            }
+            ${print(UpdateBranchBasicInfoFragmentNode)}
          `,
          {
            appId,
@@ -88,6 +93,56 @@ export const BranchQuery = {

    return data?.app?.byId.updateBranches ?? [];
  },
+  async listBranchesBasicInfoPaginatedOnAppAsync(
+    graphqlClient: ExpoGraphqlClient,
+    { appId, first, after, last, before }: BranchesBasicPaginatedOnAppQueryVariables
+  ): Promise<BranchesBasicPaginatedOnAppQuery['app']['byId']['branchesPaginated']> {
+    const response = await withErrorHandlingAsync(
+      graphqlClient
+        .query<BranchesBasicPaginatedOnAppQuery, BranchesBasicPaginatedOnAppQueryVariables>(
+          gql`
+            query BranchesBasicPaginatedOnApp(
+              $appId: String!
+              $first: Int
+              $after: String
+              $last: Int
+              $before: String
+            ) {
+              app {
+                byId(appId: $appId) {
+                  id
+                  branchesPaginated(first: $first, after: $after, before: $before, last: $last) {
+                    edges {
+                      node {
+                        id
+                        ...UpdateBranchBasicInfoFragment
+                      }
+                      cursor
+                    }
+                    pageInfo {
+                      hasNextPage
+                      hasPreviousPage
+                      startCursor
+                      endCursor
+                    }
+                  }
+                }
+              }
+            }
+            ${print(UpdateBranchBasicInfoFragmentNode)}
+          `,
+          { appId, first, after, last, before },
+          { additionalTypenames: ['UpdateBranch'] }
+        )
+        .toPromise()
+    );
+    const { branchesPaginated } = response.app.byId;
+
+    if (!branchesPaginated) {
+      throw new Error(`Could not find channels on project with id ${appId}`);
+    }
+    return branchesPaginated;
+  },
  async listBranchesOnChannelAsync(
    graphqlClient: ExpoGraphqlClient,
    { appId, channelName, offset, limit }: ViewBranchesOnUpdateChannelQueryVariables
@@ -5,31 +5,55 @@ import { ChannelNotFoundError } from '../../channel/errors';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../client';
 import {
+  UpdateBranchBasicInfoFragment,
+  UpdateFragment,
  ViewUpdateChannelOnAppQuery,
  ViewUpdateChannelOnAppQueryVariables,
  ViewUpdateChannelsOnAppQuery,
  ViewUpdateChannelsOnAppQueryVariables,
+  ViewUpdateChannelsPaginatedOnAppQuery,
+  ViewUpdateChannelsPaginatedOnAppQueryVariables,
 } from '../generated';
 import { UpdateFragmentNode } from '../types/Update';
+import { UpdateChannelBasicInfoFragmentNode } from '../types/UpdateChannelBasicInfo';

-export type UpdateChannelObject = NonNullable<
+type ViewUpdateChannelsOnAppObject = NonNullable<
  ViewUpdateChannelsOnAppQuery['app']['byId']['updateChannels']
 >[number];

-export type UpdateChannelByNameObject = NonNullable<
+type UpdateChannelByNameObject = NonNullable<
  ViewUpdateChannelOnAppQuery['app']['byId']['updateChannelByName']
 >;

+// these types should have the same fields
+export type UpdateChannelObject = ViewUpdateChannelsOnAppObject & UpdateChannelByNameObject;
+
+export type UpdateBranchObject = UpdateChannelObject['updateBranches'][number];
+
+export function composeUpdateBranchObject(
+  branchInfo: UpdateBranchBasicInfoFragment,
+  updateGroups: UpdateFragment[][]
+): UpdateBranchObject {
+  return {
+    ...branchInfo,
+    updateGroups,
+  };
+}
+
 export const ChannelQuery = {
  async viewUpdateChannelAsync(
    graphqlClient: ExpoGraphqlClient,
-    { appId, channelName }: ViewUpdateChannelOnAppQueryVariables
+    { appId, channelName, filter }: ViewUpdateChannelOnAppQueryVariables
  ): Promise<UpdateChannelByNameObject> {
    const response = await withErrorHandlingAsync(
      graphqlClient
        .query<ViewUpdateChannelOnAppQuery, ViewUpdateChannelOnAppQueryVariables>(
          gql`
-            query ViewUpdateChannelOnApp($appId: String!, $channelName: String!) {
+            query ViewUpdateChannelOnApp(
+              $appId: String!
+              $channelName: String!
+              $filter: UpdatesFilter
+            ) {
              app {
                byId(appId: $appId) {
                  id
@@ -41,7 +65,7 @@ export const ChannelQuery = {
                    updateBranches(offset: 0, limit: 5) {
                      id
                      name
-                      updateGroups(offset: 0, limit: 1) {
+                      updateGroups(offset: 0, limit: 1, filter: $filter) {
                        id
                        ...UpdateFragment
                      }
@@ -52,7 +76,7 @@ export const ChannelQuery = {
            }
            ${print(UpdateFragmentNode)}
          `,
-          { appId, channelName },
+          { appId, channelName, filter },
          { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
        )
        .toPromise()
@@ -80,6 +104,7 @@ export const ChannelQuery = {
                  updateChannels(offset: $offset, limit: $limit) {
                    id
                    name
+                    createdAt
                    branchMapping
                    updateBranches(offset: 0, limit: 5) {
                      id
@@ -108,4 +133,57 @@ export const ChannelQuery = {

    return updateChannels;
  },
+  async viewUpdateChannelsBasicInfoPaginatedOnAppAsync(
+    graphqlClient: ExpoGraphqlClient,
+    { appId, first, after, last, before }: ViewUpdateChannelsPaginatedOnAppQueryVariables
+  ): Promise<ViewUpdateChannelsPaginatedOnAppQuery['app']['byId']['channelsPaginated']> {
+    const response = await withErrorHandlingAsync(
+      graphqlClient
+        .query<
+          ViewUpdateChannelsPaginatedOnAppQuery,
+          ViewUpdateChannelsPaginatedOnAppQueryVariables
+        >(
+          gql`
+            query ViewUpdateChannelsPaginatedOnApp(
+              $appId: String!
+              $first: Int
+              $after: String
+              $last: Int
+              $before: String
+            ) {
+              app {
+                byId(appId: $appId) {
+                  id
+                  channelsPaginated(first: $first, after: $after, before: $before, last: $last) {
+                    edges {
+                      node {
+                        id
+                        ...UpdateChannelBasicInfoFragment
+                      }
+                      cursor
+                    }
+                    pageInfo {
+                      hasNextPage
+                      hasPreviousPage
+                      startCursor
+                      endCursor
+                    }
+                  }
+                }
+              }
+            }
+            ${print(UpdateChannelBasicInfoFragmentNode)}
+          `,
+          { appId, first, after, last, before },
+          { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
+        )
+        .toPromise()
+    );
+    const { channelsPaginated } = response.app.byId;
+
+    if (!channelsPaginated) {
+      throw new Error(`Could not find channels on project with id ${appId}`);
+    }
+    return channelsPaginated;
+  },
 };
@@ -0,0 +1,85 @@
+import { print } from 'graphql';
+import gql from 'graphql-tag';
+
+import { BranchNotFoundError } from '../../branch/utils';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { Connection } from '../../utils/relay';
+import { withErrorHandlingAsync } from '../client';
+import {
+  RuntimeFragment,
+  ViewRuntimesOnBranchQuery,
+  ViewRuntimesOnBranchQueryVariables,
+} from '../generated';
+import { RuntimeFragmentNode } from '../types/Runtime';
+
+export const RuntimeQuery = {
+  async getRuntimesOnBranchAsync(
+    graphqlClient: ExpoGraphqlClient,
+    { appId, name, first, after, last, before, filter }: ViewRuntimesOnBranchQueryVariables
+  ): Promise<Connection<RuntimeFragment>> {
+    const response = await withErrorHandlingAsync<ViewRuntimesOnBranchQuery>(
+      graphqlClient
+        .query<ViewRuntimesOnBranchQuery, ViewRuntimesOnBranchQueryVariables>(
+          gql`
+            query ViewRuntimesOnBranch(
+              $appId: String!
+              $name: String!
+              $first: Int
+              $after: String
+              $last: Int
+              $before: String
+              $filter: RuntimeFilterInput
+            ) {
+              app {
+                byId(appId: $appId) {
+                  id
+                  updateBranchByName(name: $name) {
+                    id
+                    runtimes(
+                      first: $first
+                      after: $after
+                      before: $before
+                      last: $last
+                      filter: $filter
+                    ) {
+                      edges {
+                        node {
+                          id
+                          ...RuntimeFragment
+                        }
+                        cursor
+                      }
+                      pageInfo {
+                        hasNextPage
+                        hasPreviousPage
+                        startCursor
+                        endCursor
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            ${print(RuntimeFragmentNode)}
+          `,
+          {
+            appId,
+            name,
+            first,
+            after,
+            last,
+            before,
+            filter,
+          },
+          { additionalTypenames: ['UpdateBranch', 'Runtime'] }
+        )
+        .toPromise()
+    );
+
+    const { updateBranchByName } = response.app.byId;
+    if (!updateBranchByName) {
+      throw new BranchNotFoundError(`Could not find a branch named "${name}".`);
+    }
+    return updateBranchByName.runtimes;
+  },
+};
@@ -16,7 +16,7 @@ export const UserQuery = {
              meActor {
                __typename
                id
-                ... on User {
+                ... on UserActor {
                  username
                  primaryAccount {
                    id
@@ -26,9 +26,6 @@ export const UserQuery = {
                ... on Robot {
                  firstName
                }
-                ... on SSOUser {
-                  username
-                }
                accounts {
                  id
                  ...AccountFragment
@@ -41,7 +38,7 @@ export const UserQuery = {
          `,
          {},
          {
-            additionalTypenames: ['User'],
+            additionalTypenames: ['User', 'SSOUser'],
          }
        )
        .toPromise()
@@ -0,0 +1,8 @@
+import gql from 'graphql-tag';
+
+export const RuntimeFragmentNode = gql`
+  fragment RuntimeFragment on Runtime {
+    id
+    version
+  }
+`;
@@ -18,6 +18,7 @@ export const SubmissionFragmentNode = gql`
      applicationIdentifier
      track
      releaseStatus
+      rollout
    }
    iosConfig {
      ascAppIdentifier
@@ -2,15 +2,17 @@ import { print } from 'graphql';
 import gql from 'graphql-tag';

 import { UpdateFragmentNode } from './Update';
+import { UpdateBranchBasicInfoFragmentNode } from './UpdateBranchBasicInfo';

 export const UpdateBranchFragmentNode = gql`
  fragment UpdateBranchFragment on UpdateBranch {
    id
-    name
+    ...UpdateBranchBasicInfoFragment
    updates(offset: 0, limit: 10) {
      id
      ...UpdateFragment
    }
  }
  ${print(UpdateFragmentNode)}
+  ${print(UpdateBranchBasicInfoFragmentNode)}
 `;
@@ -0,0 +1,8 @@
+import gql from 'graphql-tag';
+
+export const UpdateBranchBasicInfoFragmentNode = gql`
+  fragment UpdateBranchBasicInfoFragment on UpdateBranch {
+    id
+    name
+  }
+`;
@@ -0,0 +1,9 @@
+import gql from 'graphql-tag';
+
+export const UpdateChannelBasicInfoFragmentNode = gql`
+  fragment UpdateChannelBasicInfoFragment on UpdateChannel {
+    id
+    name
+    branchMapping
+  }
+`;
@@ -5,6 +5,7 @@ import { AppleDeviceClass } from '../../generated';
 export const APPLE_DEVICE_CLASS_LABELS: Record<AppleDeviceClass, string> = {
  [AppleDeviceClass.Ipad]: 'iPad',
  [AppleDeviceClass.Iphone]: 'iPhone',
+  [AppleDeviceClass.Mac]: 'Mac',
 };

 export const AppleDeviceFragmentNode = gql`
@@ -57,6 +57,10 @@ export default class Log {
    Log.consoleLog(chalk.green(figures.tick), ...args);
  }

+  public static withInfo(...args: any[]): void {
+    Log.consoleLog(chalk.green(figures.info), ...args);
+  }
+
  private static consoleLog(...args: any[]): void {
    Log.updateIsLastLineNewLine(args);
    // eslint-disable-next-line no-console
@@ -180,7 +180,7 @@ export class AppleConfigReader {
    return {
      locale,
      description: info.description,
-      keywords: info.keywords?.join(', '),
+      keywords: info.keywords?.join(','),
      // TODO: maybe move this to task logic, it's more an exception than data handling
      whatsNew: context.versionIsFirst ? undefined : info.releaseNotes || DEFAULT_WHATSNEW,
      marketingUrl: info.marketingUrl,
				`@@ -0,0 +1 @@`
				`export const runCurrentMachineMethodAsync = jest.fn();`