v2.5.1

Revert "feat: use versioned cli for export (#1460 )"
This reverts commit 2aade4c0c8.
2026-11-14 10:08:06 -10:00 · 2022-10-24 12:18:07 +02:00 · 2022-10-24 12:17:47 +02:00 · 2022-10-24 12:08:06 +02:00 · 2022-10-24 09:52:15 +02:00 · 2022-10-24 07:49:28 +00:00
262 changed files with 4641 additions and 2569 deletions
@@ -32,6 +32,9 @@ jobs:
          # Remove this whenever we solved those OOM errors.
          NODE_OPTIONS: --max-old-space-size=4096
      - run: yarn lint --max-warnings=0
+      - run: yarn install --frozen-lockfile --check-files
+        working-directory: ./scripts
+      - run: yarn lint-changelog
      - uses: codecov/codecov-action@v1
        if: ${{ matrix.coverage }}
        with:
@@ -10,11 +10,60 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🐛 Bug fixes

- Make Apple Platform detection more robust. ([#1417](https://github.com/expo/eas-cli/pull/1417) by [@quinlanj](https://github.com/quinlanj))
- Fix creating EAS secret from file. ([#1423](https://github.com/expo/eas-cli/pull/1423) by [@dsokal](https://github.com/dsokal))
+- Revert using local CLI for `expo export` ([#1460](https://github.com/expo/eas-cli/pull/1460)). ([#1472](https://github.com/expo/eas-cli/pull/1472) by [@dsokal](https://github.com/dsokal))

 ### 🧹 Chores

+## [2.5.0](https://github.com/expo/eas-cli/releases/tag/v2.5.0) - 2022-10-24
+
+### 🎉 New features
+
+- Update init command to handle slug and owner. ([#1452](https://github.com/expo/eas-cli/pull/1452) by [@wschurman](https://github.com/wschurman))
+- Add `eas secret:push`. ([#1457](https://github.com/expo/eas-cli/pull/1457) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Initialize analytics consistently and move analytics into context. ([#1444](https://github.com/expo/eas-cli/pull/1444) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Handle case where git is installed but not working properly. ([#1454](https://github.com/expo/eas-cli/pull/1454) by [@brentvatne](https://github.com/brentvatne))
+- Remove table logging in `update:view`. ([#1463](https://github.com/expo/eas-cli/pull/1463) by [@EvanBacon](https://github.com/EvanBacon))
+- Fix install prompt language. ([#1462](https://github.com/expo/eas-cli/pull/1462) by [@EvanBacon](https://github.com/EvanBacon))
+
+## [2.4.1](https://github.com/expo/eas-cli/releases/tag/v2.4.1) - 2022-10-17
+
+### 🐛 Bug fixes
+
+- Bump `eas-cli-local-build-plugin` to 0.0.144 to not require `yarn` for local builds. ([c05ef](https://github.com/expo/eas-cli/commit/c05ef9cccaa819d8e5fb84858cb09cadaae90134) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Remove EAS Submit errors from codebase. The errors have been moved to the server side. ([#1443](https://github.com/expo/eas-cli/pull/1443) by [@dsokal](https://github.com/dsokal))
+
+## [2.4.0](https://github.com/expo/eas-cli/releases/tag/v2.4.0) - 2022-10-14
+
+### 🎉 New features
+
+- Handle more common errors for EAS Submit. ([#1440](https://github.com/expo/eas-cli/pull/1440) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Move graphql and session into command context. ([#1435](https://github.com/expo/eas-cli/pull/1435), [#1436](https://github.com/expo/eas-cli/pull/1436) by [@wschurman](https://github.com/wschurman))
+
+## [2.3.0](https://github.com/expo/eas-cli/releases/tag/v2.3.0) - 2022-10-10
+
+### 🎉 New features
+
+- Add new experimental resource class for M1 Macs. ([#1425](https://github.com/expo/eas-cli/pull/1425) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [2.2.1](https://github.com/expo/eas-cli/releases/tag/v2.2.1) - 2022-10-05
+
+### 🐛 Bug fixes
+
+- Make Apple Platform detection more robust. ([#1417](https://github.com/expo/eas-cli/pull/1417) by [@quinlanj](https://github.com/quinlanj))
+- Fix creating EAS secret from file. ([#1423](https://github.com/expo/eas-cli/pull/1423) by [@dsokal](https://github.com/dsokal))
+
 ## [2.2.0](https://github.com/expo/eas-cli/releases/tag/v2.2.0) - 2022-10-04

 ### 🛠 Breaking changes
@@ -42,10 +91,10 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🧹 Chores

 - Standardize the GQL 'Update' schema using UpdateFragmentNode. ([#1348](https://github.com/expo/eas-cli/pull/1348) by [@kgc00](https://github.com/kgc00))
- Remove 'owner' app config field dependency. ([#1368](https://github.com/expo/eas-cli/pull/1368), [#1369](https://github.com/expo/eas-cli/pull/1369), [#1371](https://github.com/expo/eas-cli/pull/1371), [#1372](https://github.com/expo/eas-cli/pull/1372), [#1373](https://github.com/expo/eas-cli/pull/1373), by [@wschurman](https://github.com/wschurman))
+- Remove 'owner' app config field dependency. ([#1368](https://github.com/expo/eas-cli/pull/1368), [#1369](https://github.com/expo/eas-cli/pull/1369), [#1371](https://github.com/expo/eas-cli/pull/1371), [#1372](https://github.com/expo/eas-cli/pull/1372), [#1373](https://github.com/expo/eas-cli/pull/1373) by [@wschurman](https://github.com/wschurman))
 - Add Xcode 14 image. ([#1365](https://github.com/expo/eas-cli/pull/1365) by [@szdziedzic](https://github.com/szdziedzic))
 - Update max `versionCode` for Android. ([#1400](https://github.com/expo/eas-cli/pull/1400) by [@wkozyra95](https://github.com/wkozyra95))
- Add and use command context to declare command dependencies. ([#1383](https://github.com/expo/eas-cli/pull/1383), [#1384](https://github.com/expo/eas-cli/pull/1384), [#1387](https://github.com/expo/eas-cli/pull/1387), [#1388](https://github.com/expo/eas-cli/pull/1388), [#1390](https://github.com/expo/eas-cli/pull/1390), [#1391](https://github.com/expo/eas-cli/pull/1391), [#1394](https://github.com/expo/eas-cli/pull/1394), [#1402](https://github.com/expo/eas-cli/pull/1402), [#1403](https://github.com/expo/eas-cli/pull/1403), by [@wschurman](https://github.com/wschurman))
+- Add and use command context to declare command dependencies. ([#1383](https://github.com/expo/eas-cli/pull/1383), [#1384](https://github.com/expo/eas-cli/pull/1384), [#1387](https://github.com/expo/eas-cli/pull/1387), [#1388](https://github.com/expo/eas-cli/pull/1388), [#1390](https://github.com/expo/eas-cli/pull/1390), [#1391](https://github.com/expo/eas-cli/pull/1391), [#1394](https://github.com/expo/eas-cli/pull/1394), [#1402](https://github.com/expo/eas-cli/pull/1402), [#1403](https://github.com/expo/eas-cli/pull/1403) by [@wschurman](https://github.com/wschurman))
 - Fix typo in the ad hoc build message. ([#1407](https://github.com/expo/eas-cli/pull/1407) by [@Simek](https://github.com/Simek))
 - Improve errors and error messages formatting related to **eas.json**. ([#1414](https://github.com/expo/eas-cli/pull/1414) by [@Simek](https://github.com/Simek))
 - Handle errors from platform-specific kill switches to disable free tier builds. ([#1401](https://github.com/expo/eas-cli/pull/1401) by [@szdziedzic](https://github.com/szdziedzic))
@@ -221,7 +270,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

- Show bundler output by default for eas update command. ([#1171](https://github.com/expo/eas-cli/pull/1171) by [@kgc00](https://github.com/kgc00/))
+- Show bundler output by default for eas update command. ([#1171](https://github.com/expo/eas-cli/pull/1171) by [@kgc00](https://github.com/kgc00))
 - Allow users to skip metadata validation. ([#1175](https://github.com/expo/eas-cli/pull/1175) by [@byCedric](https://github.com/byCedric))
 - Add experimental `--resource-class` flag for Build commands. ([#1138](https://github.com/expo/eas-cli/pull/1138) by [@christopherwalter](https://github.com/christopherwalter))
 - Truncate long messages for `eas update` command, rather than failing. ([#1178](https://github.com/expo/eas-cli/pull/1178) by [@kgc00](https://github.com/kgc00))
@@ -258,13 +307,13 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

- `eas update` now provides more information about the publish process including real-time feedback on asset uploads, update ids, and website links. ([#1152](https://github.com/expo/eas-cli/pull/1152) by [@kgc00](https://github.com/kgc00/))
+- `eas update` now provides more information about the publish process including real-time feedback on asset uploads, update ids, and website links. ([#1152](https://github.com/expo/eas-cli/pull/1152) by [@kgc00](https://github.com/kgc00))
 - Added first beta of `eas metadata` to sync store information using store configuration files ([#1136](https://github.com/expo/eas-cli/pull/1136) by [@bycedric](https://github.com/bycedric))

 ### 🐛 Bug fixes

- Improved support for working on branches with many updates. ([#1144](https://github.com/expo/eas-cli/pull/1144), [#1148](https://github.com/expo/eas-cli/pull/1148) by [@kgc00](https://github.com/kgc00/))
- `eas update` project links no longer contain a `)` on unsupported terminals. ([#1152](https://github.com/expo/eas-cli/pull/1152) by [@kgc00](https://github.com/kgc00/))
+- Improved support for working on branches with many updates. ([#1144](https://github.com/expo/eas-cli/pull/1144), [#1148](https://github.com/expo/eas-cli/pull/1148) by [@kgc00](https://github.com/kgc00))
+- `eas update` project links no longer contain a `)` on unsupported terminals. ([#1152](https://github.com/expo/eas-cli/pull/1152) by [@kgc00](https://github.com/kgc00))

 ### 🧹 Chores

@@ -274,7 +323,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🐛 Bug fixes

- No longer timeout on publishing updates for branches with many updates. ([#1119](https://github.com/expo/eas-cli/pull/1119) by [@kgc00](https://github.com/kgc00/))
+- No longer timeout on publishing updates for branches with many updates. ([#1119](https://github.com/expo/eas-cli/pull/1119) by [@kgc00](https://github.com/kgc00))

 ### 🧹 Chores

@@ -445,7 +494,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🧹 Chores

- Upgrade `node-forge` to 1.0.0. ([#902](https://github.com/expo/eas-cli/pull/902) by [@dependabot](https://github.com/apps/dependabot) + [@dsokal](https://github.com/dsokal))
+- Upgrade `node-forge` to 1.0.0. ([#902](https://github.com/expo/eas-cli/pull/902) by [@dependabot](https://github.com/apps/dependabot), [@dsokal](https://github.com/dsokal))
 - Replace `@expo/plugin-autocomplete` with `@oclif/plugin-autocomplete`. Upgrade oclif deps. ([#903](https://github.com/expo/eas-cli/pull/903) by [@dsokal](https://github.com/dsokal))

 ## [0.44.0](https://github.com/expo/eas-cli/releases/tag/v0.44.0) - 2022-01-11
@@ -497,7 +546,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

- Adds commands for EAS Update, which is now in preview for subscribers. EAS Update makes fixing small bugs and pushing quick fixes a snap in between app store submissions. It accomplishes this by allowing an end-user's app to swap out the non-native parts of their app (for example, JS, styling, and image changes) with a new update that contains bug fixes and other updates.
+- Adds commands for EAS Update, which is now in preview for subscribers. EAS Update makes fixing small bugs and pushing quick fixes a snap in between app store submissions. It accomplishes this by allowing an end-user's app to swap out the non-native parts of their app (for example, JS, styling, and image changes) with a new update that contains bug fixes and other updates. ([#854](https://github.com/expo/eas-cli/pull/854) by [@jonsamp](https://github.com/jonsamp))
  - Adds `eas update`, which can bundle and publish updates on a branch.
  - Adds `eas branch`, which manages branches. Branches contain a list of updates and are linked to channels.
  - Adds `eas channel`, which manages channels. Channels are specified inside builds and are linked to branches, allowing us to link specific updates with specific builds.
@@ -543,7 +592,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🐛 Bug fixes

 - Fix submit for multi-target projects where ascAppId is not specified. ([#809](https://github.com/expo/eas-cli/pull/809) by [@wkozyra95](https://github.com/wkozyra95))
- Fix building iOS projects with Apple Watch companion app. ([#812](https://github.com/expo/eas-cli/pull/812), [#817](https://github.com/expo/eas-cli/pull/817), [#821](https://github.com/expo/eas-cli/pull/821) by [@jkhales](https://github.com/jkhales) + [@dsokal](https://github.com/dsokal))
+- Fix building iOS projects with Apple Watch companion app. ([#812](https://github.com/expo/eas-cli/pull/812), [#817](https://github.com/expo/eas-cli/pull/817), [#821](https://github.com/expo/eas-cli/pull/821) by [@jkhales](https://github.com/jkhales), [@dsokal](https://github.com/dsokal))

 ### 🧹 Chores

@@ -579,7 +628,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

- Improve unknown capability syncing error message. ([#775](https://github.com/expo/eas-cli/pulls/775) by [@EvanBacon](https://github.com/EvanBacon))
+- Improve unknown capability syncing error message. ([#775](https://github.com/expo/eas-cli/pull/775) by [@EvanBacon](https://github.com/EvanBacon))
 - Add submit webhooks. ([#777](https://github.com/expo/eas-cli/pull/777) by [@dsokal](https://github.com/dsokal))

 ### 🐛 Bug fixes
@@ -677,7 +726,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🛠 Breaking changes

- Use new build job format. ([#701](https://github.com/expo/eas-cli/pull/701) and [#711](https://github.com/expo/eas-cli/pull/711) by [@dsokal](https://github.com/dsokal))
+- Use new build job format. ([#701](https://github.com/expo/eas-cli/pull/701), [#711](https://github.com/expo/eas-cli/pull/711) by [@dsokal](https://github.com/dsokal))
 - Don't print logs to `stderr`. ([#708](https://github.com/expo/eas-cli/pull/708) by [@dsokal](https://github.com/dsokal))
 - Remove automatic migration for legacy `eas.json` format introduced in [v0.22.2](https://github.com/expo/eas-cli/releases/tag/v0.22.2). ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
 - Implement no-commit build workflow. Add required `cli` field in root of `eas.json`. ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
@@ -709,7 +758,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

- Make "production" the default profile for building and submitting. ([#677](https://github.com/expo/eas-cli/pull/677)) by [@jonsamp](https://github.com/jonsamp)
+- Make "production" the default profile for building and submitting. ([#677](https://github.com/expo/eas-cli/pull/677) by [@jonsamp](https://github.com/jonsamp))
  - Previously, the default profile when running `eas build` or `eas submit` was "release". We're changing it to a more recognizable name that is consistent with our docs, which is now "production". You can always specify a profile manually with the `--profile` flag. For this major version, if you do not have a profile named "production", and still have a profile named "release", we will fall back to the "release" profile as the default, however you'll see a warning as we're going to remove that behavior in the next major release of EAS CLI.
  - To upgrade, update **eas.json** to have a "production" profile in both the `build` and `submit` objects. If you already have a project set up, this will replace the existing "release" profile. After the change, eas.json should have the following profiles:
    ```json
@@ -755,7 +804,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🛠 Breaking changes

- Don't resolve the iOS builder image on the client side. EAS Build will use the appropriate iOS image for a given Expo SDK version unless the `image` is defined. This only applies to managed projects. ([#675](https://github.com/expo/eas-cli/pull/675) by [@wkozyra95](https://github.com/wkozyra95) + [@dsokal](https://github.com/dsokal))
+- Don't resolve the iOS builder image on the client side. EAS Build will use the appropriate iOS image for a given Expo SDK version unless the `image` is defined. This only applies to managed projects. ([#675](https://github.com/expo/eas-cli/pull/675) by [@wkozyra95](https://github.com/wkozyra95), [@dsokal](https://github.com/dsokal))

 ### 🎉 New features

@@ -767,7 +816,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🐛 Bug fixes

 - Fix `--json` flag when running EAS CLI on GitHub actions. ([#669](https://github.com/expo/eas-cli/pull/669) by [@dsokal](https://github.com/dsokal))
- Fix `"ios: mods.ios.infoPlist: Failed to find Info.plist linked to Xcode project."` warning when running `eas build` in a managed project.([#670](https://github.com/expo/eas-cli/pull/670) by [@brentvatne](https://github.com/brentvatne))
+- Fix `"ios: mods.ios.infoPlist: Failed to find Info.plist linked to Xcode project."` warning when running `eas build` in a managed project. ([#670](https://github.com/expo/eas-cli/pull/670) by [@brentvatne](https://github.com/brentvatne))
 - Fix building monorepo projects on Windows. ([#671](https://github.com/expo/eas-cli/pull/671) by [@dsokal](https://github.com/dsokal))

 ## [0.30.0](https://github.com/expo/eas-cli/releases/tag/v0.30.0) - 2021-10-05
@@ -901,7 +950,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🐛 Bug fixes

- Fix wrong warning for `metro.config.js` check on Windows. ([#587](https://github.com/expo/eas-cli/pull/588) by [@louisgv](https://github.com/louisgv))
+- Fix wrong warning for `metro.config.js` check on Windows. ([#588](https://github.com/expo/eas-cli/pull/588) by [@louisgv](https://github.com/louisgv))
 - Fix detecting `googleServicesFile` with `EAS_NO_VCS=1`. ([#583](https://github.com/expo/eas-cli/pull/583) by [@wkozyra95](https://github.com/wkozyra95))

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

 ### 🎉 New features

- Include the file extension for update's assets in the manifest fragment. ([#532](https://github.com/expo/eas-cli/pull/535) by [@jkhales](https://github.com/jkhales))
+- Include the file extension for update's assets in the manifest fragment. ([#535](https://github.com/expo/eas-cli/pull/535) by [@jkhales](https://github.com/jkhales))
 - Use env variables from `eas.json` when evaluating `app.config.js`. ([#532](https://github.com/expo/eas-cli/pull/532) by [@dsokal](https://github.com/dsokal))

 ### 🐛 Bug fixes
@@ -1001,7 +1050,7 @@ This is the log of notable changes to EAS CLI and related packages.
 - Add `secret:create --force` command to overwrite existing secrets. ([#513](https://github.com/expo/eas-cli/pull/513) by [@bycedric](https://github.com/bycedric))
 - Fall back to APK when building for internal distribution. ([#527](https://github.com/expo/eas-cli/pull/527) by [@dsokal](https://github.com/dsokal))
 - Add `iosEnterpriseProvisioning` to build metadata. ([#522](https://github.com/expo/eas-cli/pull/522) by [@dsokal](https://github.com/dsokal))
- Autodetect Google Services JSON key path in `eas submit -p android`. ([#520](https://github.com/expo/eas-cli/pull/297) by [@barthap](https://github.com/barthap))
+- Autodetect Google Services JSON key path in `eas submit -p android`. ([#520](https://github.com/expo/eas-cli/pull/520) by [@barthap](https://github.com/barthap))

 ### 🐛 Bug fixes

@@ -1015,7 +1064,7 @@ This is the log of notable changes to EAS CLI and related packages.

 - Add `project:*` commands. ([#500](https://github.com/expo/eas-cli/pull/500) by [@jkhales](https://github.com/jkhales))
 - Added support for iOS 15 capabilities: Communication Notifications, Time Sensitive Notifications, Group Activities, and Family Controls. ([#499](https://github.com/expo/eas-cli/pull/499) by [@EvanBacon](https://github.com/EvanBacon))
- Show more build metadata in `build:view` and `build:list`. ([#504](https://github.com/expo/eas-cli/pull/504) and [#508](https://github.com/expo/eas-cli/pull/508) by [@dsokal](https://github.com/dsokal))
+- Show more build metadata in `build:view` and `build:list`. ([#504](https://github.com/expo/eas-cli/pull/504), [#508](https://github.com/expo/eas-cli/pull/508) by [@dsokal](https://github.com/dsokal))
 - Add runtime version to build metadata. ([#493](https://github.com/expo/eas-cli/pull/493) by [@dsokal](https://github.com/dsokal))

 ## [0.20.0](https://github.com/expo/eas-cli/releases/tag/v0.20.0) - 2021-07-09
@@ -1095,15 +1144,15 @@ This is the log of notable changes to EAS CLI and related packages.
 - New version of Android credentials manager. ([#460](https://github.com/expo/eas-cli/pull/460) by [@quinlanj](https://github.com/quinlanj))
 - Add an internal distribution with dev client to `build:configure` defaults. ([#465](https://github.com/expo/eas-cli/pull/465) by [@fson](https://github.com/fson))
 - Add `updates.channel` to build metadata. ([#461](https://github.com/expo/eas-cli/pull/461) by [@jkhales](https://github.com/jkhales))
- iOS push key setup and management now available in `eas-cli credentials`. ([#469](https://github.com/expo/eas-cli/pull/469) [#470](https://github.com/expo/eas-cli/pull/470) by [@quinlanj](https://github.com/quinlanj))
+- iOS push key setup and management now available in `eas-cli credentials`. ([#469](https://github.com/expo/eas-cli/pull/469), [#470](https://github.com/expo/eas-cli/pull/470) by [@quinlanj](https://github.com/quinlanj))
 - Support new build status: `new`. ([#475](https://github.com/expo/eas-cli/pull/475) by [@dsokal](https://github.com/dsokal))

 ### 🧹 Chores

 - Deprecate `--skip-credentials-check` flag because it doesn't do anything and is no longer needed. ([#442](https://github.com/expo/eas-cli/pull/442) by [@brentvatne](https://github.com/brentvatne))
- Move android credentials code to new Graphql API. ([#439](https://github.com/expo/eas-cli/pull/439) [#440](https://github.com/expo/eas-cli/pull/440) [#438](https://github.com/expo/eas-cli/pull/438) [#443](https://github.com/expo/eas-cli/pull/443) [#447](https://github.com/expo/eas-cli/pull/447) [#451](https://github.com/expo/eas-cli/pull/451) [#455](https://github.com/expo/eas-cli/pull/455) by [@quinlanj](https://github.com/quinlanj))
+- Move android credentials code to new Graphql API. ([#439](https://github.com/expo/eas-cli/pull/439), [#440](https://github.com/expo/eas-cli/pull/440), [#438](https://github.com/expo/eas-cli/pull/438), [#443](https://github.com/expo/eas-cli/pull/443), [#447](https://github.com/expo/eas-cli/pull/447), [#451](https://github.com/expo/eas-cli/pull/451), [#455](https://github.com/expo/eas-cli/pull/455) by [@quinlanj](https://github.com/quinlanj))
 - Prepare Graphql infra to support iOS push keys. ([#456](https://github.com/expo/eas-cli/pull/456) by [@quinlanj](https://github.com/quinlanj))
- Improve credentials DX ([#448](https://github.com/expo/eas-cli/pull/448) [#449](https://github.com/expo/eas-cli/pull/449) by [@quinlanj](https://github.com/quinlanj))
+- Improve credentials DX ([#448](https://github.com/expo/eas-cli/pull/448), [#449](https://github.com/expo/eas-cli/pull/449) by [@quinlanj](https://github.com/quinlanj))
 - Add analytics on dev client builds. ([#454](https://github.com/expo/eas-cli/pull/454) by [@fson](https://github.com/fson))
 - Support non-git projects. ([#462](https://github.com/expo/eas-cli/pull/462) by [@wkozyra95](https://github.com/wkozyra95))

@@ -1117,7 +1166,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🧹 Chores

- Android credentials setup now on Graphql API. ([#434](https://github.com/expo/eas-cli/pull/427) by [@quinlanj](https://github.com/quinlanj))
+- Android credentials setup now on Graphql API. ([#427](https://github.com/expo/eas-cli/pull/427) by [@quinlanj](https://github.com/quinlanj))

 ## [0.16.0](https://github.com/expo/eas-cli/releases/tag/v0.16.0) - 2021-05-26

@@ -1149,7 +1198,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🎉 New features

 - Auto sync associated domains capability before building. ([#384](https://github.com/expo/eas-cli/pull/384) by [@EvanBacon](https://github.com/EvanBacon))
- Add eas init command. [#402](https://github.com/expo/eas-cli/pull/402) by [@jkhales](https://github.com/jkhales))
+- Add eas init command. ([#402](https://github.com/expo/eas-cli/pull/402) by [@jkhales](https://github.com/jkhales))
 - Allow for arbitrary string values in `schemeBuildConfiguration`. ([#394](https://github.com/expo/eas-cli/pull/394) by [@randomhajile](https://github.com/randomhajile))
 - Allow for installing custom `expo-cli` version on EAS Build. ([#409](https://github.com/expo/eas-cli/pull/409) by [@randomhajile](https://github.com/randomhajile))
 - Support PKCS kesytores for Android. ([#398](https://github.com/expo/eas-cli/pull/398) by [@wkozyra95](https://github.com/wkozyra95))
@@ -1160,7 +1209,7 @@ This is the log of notable changes to EAS CLI and related packages.

 - Fix failure when publishing without the platform flag. ([#415](https://github.com/expo/eas-cli/pull/415) by [@jkhales](https://github.com/jkhales))
 - Pin versions in package.json. ([#399](https://github.com/expo/eas-cli/pull/399) by [@dsokal](https://github.com/dsokal))
- Revert [0ac2f](https://github.com/expo/eas-cli/commit/0ac2fb77a118df609381c4e350aa68609340c3cd) as the root cause of the issue has been fixed in [#399](https://github.com/expo/eas-cli/pull/399).
+  - Revert [0ac2f](https://github.com/expo/eas-cli/commit/0ac2fb77a118df609381c4e350aa68609340c3cd) as the root cause of the issue has been fixed in [#399](https://github.com/expo/eas-cli/pull/399).
 - Include development-client in valid buildType for internal distribution. ([#410](https://github.com/expo/eas-cli/pull/410) by [@brentvatne](https://github.com/brentvatne))

 ## [0.14.1](https://github.com/expo/eas-cli/releases/tag/v0.14.1) - 2021-05-11
@@ -1187,7 +1236,7 @@ This is the log of notable changes to EAS CLI and related packages.

 - Cleanup unused code. ([#364](https://github.com/expo/eas-cli/pull/364), [#365](https://github.com/expo/eas-cli/pull/365) by [@quinlanj](https://github.com/quinlanj))
 - Redesign UX in beta credentials manager. ([#360](https://github.com/expo/eas-cli/pull/360) by [@quinlanj](https://github.com/quinlanj))
- Port more options to the beta credentials manager. ([#352](https://github.com/expo/eas-cli/pull/352), [357](https://github.com/expo/eas-cli/pull/357), [361](https://github.com/expo/eas-cli/pull/361) by [@quinlanj](https://github.com/quinlanj))
+- Port more options to the beta credentials manager. ([#352](https://github.com/expo/eas-cli/pull/352), [#357](https://github.com/expo/eas-cli/pull/357), [#361](https://github.com/expo/eas-cli/pull/361) by [@quinlanj](https://github.com/quinlanj))
 - Add getBuildProfileNamesAsync helper to EasJsonReader. ([#351](https://github.com/expo/eas-cli/pull/351) by [@quinlanj](https://github.com/quinlanj))
 - Increase build timeout to 1 hour. ([#370](https://github.com/expo/eas-cli/pull/370) by [@wkozyra95](https://github.com/wkozyra95))
 - Remove check for pending builds. ([#373](https://github.com/expo/eas-cli/pull/373) by [@wkozyra95](https://github.com/wkozyra95))
@@ -1248,7 +1297,7 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

- Use special Expo SDK runtime version for managed projects ([#336](https://github.com/expo/eas-cli/pull/336)) by [@wschurman](https://github.com/wschurman))
+- Use special Expo SDK runtime version for managed projects ([#336](https://github.com/expo/eas-cli/pull/336) by [@wschurman](https://github.com/wschurman))

 ### 🐛 Bug fixes

@@ -1273,7 +1322,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🎉 New features

 - Retry graphQL call on network or transient server errors. ([#320](https://github.com/expo/eas-cli/pull/320) by [@jkhales](https://github.com/jkhales))
- Display more friendly error messages when `eas submit` fails. ([#311](https://github.com/expo/eas-cli/pull/297) by [@barthap](https://github.com/barthap))
+- Display more friendly error messages when `eas submit` fails. ([#311](https://github.com/expo/eas-cli/pull/311) by [@barthap](https://github.com/barthap))
 - Add support for managing webhooks (new commands: `webhook:create`, `webhook:view`, `webhook:list`, `webhook:update`, and `webhook:delete`). ([#314](https://github.com/expo/eas-cli/pull/314) by [@dsokal](https://github.com/dsokal))
 - Support for local builds [experimental]. ([#305](https://github.com/expo/eas-cli/pull/305) by [@wkozyra95](https://github.com/wkozyra95))

@@ -1357,7 +1406,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🐛 Bug fixes

 - Make sure all files are committed before build. ([#251](https://github.com/expo/eas-cli/pull/251) by [@wkozyra95](https://github.com/wkozyra95))
- Fix `eas submit` support for tar.gz files. ([#257](https://github.com/expo/eas-cli/pull/257)) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix `eas submit` support for tar.gz files. ([#257](https://github.com/expo/eas-cli/pull/257) by [@wkozyra95](https://github.com/wkozyra95))
 - Show untracked files when checking `git status`. ([#259](https://github.com/expo/eas-cli/pull/259) by [@wkozyra95](https://github.com/wkozyra95))

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

 ### 🐛 Bug fixes

- Fix `"buildType" is not allowed` error. ([#595bf](https://github.com/expo/eas-cli/commit/595bfecf1cbff0f76e7fd2049fe16f6f38bbe150) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix `"buildType" is not allowed` error. ([595bf](https://github.com/expo/eas-cli/commit/595bfecf1cbff0f76e7fd2049fe16f6f38bbe150) by [@wkozyra95](https://github.com/wkozyra95))

 ## [0.4.0](https://github.com/expo/eas-cli/releases/tag/v0.4.0) - 2021-02-16

@@ -1,4 +1,4 @@
 ## Releasing a new version

-1. Run `yarn release` in the repository root folder.
+1. Run `yarn release` in the repository root folder. The next version is chosen automatically based on the changelog entries. If you want to use different version, pass the version string as a positional argument to the command, e.g. `yarn release 1.2.3`.
 2. That's it! GitHub Actions is going to take care of the rest. Watch the #eas-cli Slack channel for a successful release notification.
@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "2.2.1"
+  "version": "2.5.1"
 }
@@ -12,7 +12,8 @@
    "watch": "yarn start",
    "eas": "packages/eas-cli/bin/run",
    "lint": "eslint .",
-    "release": "./scripts/bin/run update-local-plugin && lerna version --exact",
+    "lint-changelog": "./scripts/bin/run lint-changelog",
+    "release": "./scripts/bin/run release",
    "test": "jest",
    "clean": "lerna run clean && rm -rf node_modules coverage"
  },
@@ -125,7 +125,7 @@ ALIASES
  $ eas login
 ```

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

 ## `eas account:logout`

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

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

 ## `eas account:view`

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

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

 ## `eas analytics [STATUS]`

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

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

 ## `eas autocomplete [SHELL]`

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

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

 ## `eas branch:delete [NAME]`

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

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

 ## `eas branch:list`

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

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

 ## `eas branch:rename`

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

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

 ## `eas branch:view [NAME]`

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

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

 ## `eas build`

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

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

 ## `eas build:cancel [BUILD_ID]`

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

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

 ## `eas build:configure`

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

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

 ## `eas build:inspect`

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

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

 ## `eas build:list`

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

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

 ## `eas build:submit`

@@ -490,7 +490,7 @@ DESCRIPTION
  Update version of an app.
 ```

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

 ## `eas build:version:sync`

@@ -509,7 +509,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/v2.2.1/packages/eas-cli/src/commands/build/version/sync.ts)_
+_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v2.5.1/packages/eas-cli/src/commands/build/version/sync.ts)_

 ## `eas build:view [BUILD_ID]`

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

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

 ## `eas channel:create [NAME]`

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

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

 ## `eas channel:edit [NAME]`

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

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

 ## `eas channel:list`

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

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

 ## `eas channel:view [NAME]`

@@ -612,7 +612,7 @@ DESCRIPTION
  view a channel
 ```

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

 ## `eas config`

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

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

 ## `eas credentials`

@@ -648,7 +648,7 @@ DESCRIPTION
  manage credentials
 ```

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

 ## `eas device:create`

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

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

 ## `eas device:delete`

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

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

 ## `eas device:list`

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

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

 ## `eas device:view [UDID]`

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

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

 ## `eas diagnostics`

@@ -731,7 +731,7 @@ DESCRIPTION
  display environment info
 ```

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

 ## `eas help [COMMAND]`

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

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

 ## `eas metadata:push`

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

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

 ## `eas open`

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

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

 ## `eas project:info`

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

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

 ## `eas project:init`

@@ -885,7 +885,7 @@ ALIASES
  $ eas init
 ```

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

 ## `eas secret:create`

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

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

 ## `eas secret:delete`

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

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

 ## `eas secret:list`

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

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

 ## `eas submit`

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

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

 ## `eas update`

@@ -1000,7 +1000,7 @@ DESCRIPTION
  publish an update group
 ```

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

 ## `eas update:configure`

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

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

 ## `eas update:delete GROUPID`

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

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

 ## `eas update:list`

@@ -1060,7 +1060,7 @@ DESCRIPTION
  view the recent updates
 ```

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

 ## `eas update:view GROUPID`

@@ -1080,7 +1080,7 @@ DESCRIPTION
  update group details
 ```

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

 ## `eas webhook:create`

@@ -1101,7 +1101,7 @@ DESCRIPTION
  create a webhook
 ```

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

 ## `eas webhook:delete [ID]`

@@ -1121,7 +1121,7 @@ DESCRIPTION
  delete a webhook
 ```

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

 ## `eas webhook:list`

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

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

 ## `eas webhook:update`

@@ -1160,7 +1160,7 @@ DESCRIPTION
  update a webhook
 ```

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

 ## `eas webhook:view ID`

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

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

 ## `eas whoami`

@@ -2037,71 +2037,6 @@
            },
            "isDeprecated": false,
            "deprecationReason": null
-          },
-          {
-            "name": "subscribeToProduct",
-            "description": "Add a subscription",
-            "args": [
-              {
-                "name": "accountName",
-                "description": "",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "paymentSource",
-                "description": "",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "productId",
-                "description": "",
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              }
-            ],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "Account",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
          }
        ],
        "inputFields": null,
@@ -14758,6 +14693,12 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
+          {
+            "name": "IOS_M1_LARGE",
+            "description": "@experimental This resource class is not yet ready to be used in production. For testing purposes only.",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
          {
            "name": "LEGACY",
            "description": "",
@@ -1,7 +1,7 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "2.2.1",
+  "version": "2.5.1",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
@@ -37,6 +37,7 @@
    "cli-progress": "3.11.2",
    "cli-table3": "0.6.2",
    "dateformat": "4.6.3",
+    "dotenv": "16.0.3",
    "env-paths": "2.2.0",
    "envinfo": "7.8.1",
    "fast-deep-equal": "3.1.3",
@@ -0,0 +1,23 @@
+import { JSONValue } from '@expo/json-file';
+
+export class ApiV2Error extends Error {
+  override readonly name = 'ApiV2Error';
+  readonly expoApiV2ErrorCode: string;
+  readonly expoApiV2ErrorDetails?: JSONValue;
+  readonly expoApiV2ErrorServerStack?: string;
+  readonly expoApiV2ErrorMetadata?: object;
+
+  constructor(response: {
+    message: string;
+    code: string;
+    stack?: string;
+    details?: JSONValue;
+    metadata?: object;
+  }) {
+    super(response.message);
+    this.expoApiV2ErrorCode = response.code;
+    this.expoApiV2ErrorDetails = response.details;
+    this.expoApiV2ErrorServerStack = response.stack;
+    this.expoApiV2ErrorMetadata = response.metadata;
+  }
+}
@@ -1,9 +1,10 @@
 import assert from 'assert';
 import nock from 'nock';

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

-describe('apiClient', () => {
+describe(ApiV2Client, () => {
  it('converts Expo APIv2 error to ApiV2Error', async () => {
    nock(getExpoApiBaseUrl())
      .post('/v2/test')
@@ -21,7 +22,9 @@ describe('apiClient', () => {

    let error: Error | null = null;
    try {
-      await api.postAsync('test', { body: {} });
+      await new ApiV2Client({ accessToken: null, sessionSecret: null }).postAsync('test', {
+        body: {},
+      });
    } catch (e: any) {
      error = e;
    }
@@ -41,7 +44,9 @@ describe('apiClient', () => {

    let error: Error | null = null;
    try {
-      await api.postAsync('test', { body: {} });
+      await new ApiV2Client({ accessToken: null, sessionSecret: null }).postAsync('test', {
+        body: {},
+      });
    } catch (e: any) {
      error = e;
    }
@@ -0,0 +1,232 @@
+import RudderAnalytics from '@expo/rudder-sdk-node';
+import os from 'os';
+import { URL } from 'url';
+import { v4 as uuidv4 } from 'uuid';
+
+import { Actor, getActorDisplayName } from '../user/User';
+import UserSettings from '../user/UserSettings';
+import { easCliVersion } from '../utils/easCli';
+
+const PLATFORM_TO_ANALYTICS_PLATFORM: Partial<Record<NodeJS.Platform, string>> = {
+  darwin: 'Mac',
+  win32: 'Windows',
+  linux: 'Linux',
+};
+
+export type AnalyticsEvent = CommandEvent | BuildEvent | SubmissionEvent | MetadataEvent;
+
+export enum CommandEvent {
+  ACTION = 'action', // generic event type which is used to determine the 'daily active user' stat, include an `action: eas ${subcommand}` property inside of the event properties object
+}
+
+export enum SubmissionEvent {
+  SUBMIT_COMMAND = 'submit cli submit command',
+  SUBMIT_COMMAND_ATTEMPT = 'submit cli attempt',
+  SUBMIT_COMMAND_SUCCESS = 'submit cli success',
+  SUBMIT_COMMAND_FAIL = 'submit cli fail',
+  GATHER_CREDENTIALS_ATTEMPT = 'submit cli gather credentials attempt',
+  GATHER_CREDENTIALS_SUCCESS = 'submit cli gather credentials success',
+  GATHER_CREDENTIALS_FAIL = 'submit cli gather credentials fail',
+  GATHER_ARCHIVE_ATTEMPT = 'submit cli gather archive attempt',
+  GATHER_ARCHIVE_SUCCESS = 'submit cli gather archive success',
+  GATHER_ARCHIVE_FAIL = 'submit cli gather archive fail',
+  SUBMIT_REQUEST_ATTEMPT = 'submit cli request attempt',
+  SUBMIT_REQUEST_SUCCESS = 'submit cli request success',
+  SUBMIT_REQUEST_FAIL = 'submit cli request fail',
+  API_KEY_DOWNLOAD_FAIL = 'submit cli credentials api key download fail',
+  API_KEY_DOWNLOAD_RETRY = 'submit cli credentials api key download fail temporary',
+  API_KEY_DOWNLOAD_SUCCESS = 'submit cli credentials api key download succeed',
+}
+
+export enum BuildEvent {
+  BUILD_COMMAND = 'build cli build command',
+  PROJECT_UPLOAD_ATTEMPT = 'build cli project upload attempt',
+  PROJECT_UPLOAD_SUCCESS = 'build cli project upload success',
+  PROJECT_UPLOAD_FAIL = 'build cli project upload fail',
+  GATHER_CREDENTIALS_ATTEMPT = 'build cli gather credentials attempt',
+  GATHER_CREDENTIALS_SUCCESS = 'build cli gather credentials success',
+  GATHER_CREDENTIALS_FAIL = 'build cli gather credentials fail',
+  CONFIGURE_PROJECT_ATTEMPT = 'build cli configure project attempt',
+  CONFIGURE_PROJECT_SUCCESS = 'build cli configure project success',
+  CONFIGURE_PROJECT_FAIL = 'build cli configure project fail',
+  BUILD_REQUEST_ATTEMPT = 'build cli build request attempt',
+  BUILD_REQUEST_SUCCESS = 'build cli build request success',
+  BUILD_REQUEST_FAIL = 'build cli build request fail',
+
+  BUILD_STATUS_COMMAND = 'build cli build status',
+
+  CREDENTIALS_SYNC_COMMAND = 'build cli credentials sync command',
+  CREDENTIALS_SYNC_UPDATE_LOCAL_ATTEMPT = 'build cli credentials sync update local attempt',
+  CREDENTIALS_SYNC_UPDATE_LOCAL_SUCCESS = 'build cli credentials sync update local success',
+  CREDENTIALS_SYNC_UPDATE_LOCAL_FAIL = 'build cli credentials sync update local fail',
+  CREDENTIALS_SYNC_UPDATE_REMOTE_ATTEMPT = 'build cli credentials sync update remote attempt',
+  CREDENTIALS_SYNC_UPDATE_REMOTE_SUCCESS = 'build cli credentials sync update remote success',
+  CREDENTIALS_SYNC_UPDATE_REMOTE_FAIL = 'build cli credentials sync update remote fail',
+
+  ANDROID_KEYSTORE_CREATE = 'build cli credentials keystore create',
+}
+
+export enum MetadataEvent {
+  APPLE_METADATA_DOWNLOAD = 'metadata cli download apple response',
+  APPLE_METADATA_UPLOAD = 'metadata cli upload apple response',
+}
+
+export type AnalyticsEventProperties = Record<string, string | number | boolean>;
+
+/**
+ * The interface for commands to use to log events to analytics.
+ */
+export interface Analytics {
+  logEvent(name: AnalyticsEvent, properties: AnalyticsEventProperties): void;
+}
+
+/**
+ * The interface for commands to use to orchestrate the analytics system. Should only be necessary to use
+ * this within EASCommand.
+ */
+export interface AnalyticsWithOrchestration extends Analytics {
+  setActor(actor: Actor): void;
+  flushAsync(): Promise<void>;
+}
+
+const USER_SETTINGS_KEY_AMPLITUDE_ENABLED = 'amplitudeEnabled';
+const USER_SETTINGS_KEY_AMPLITUDE_DEVICE_ID = 'amplitudeDeviceId';
+const USER_SETTINGS_KEY_ANALYTICS_ENABLED = 'analyticsEnabled';
+const USER_SETTINGS_KEY_ANALYTICS_DEVICE_ID = 'analyticsDeviceId';
+
+/**
+ * Sets the user's analytics enabled preference. Note that this will only take effect
+ * upon the next run of the CLI.
+ */
+export async function setAnalyticsEnabledAsync(enabled: boolean): Promise<void> {
+  await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, enabled);
+}
+
+/**
+ * Returns the user's analytics enabled preference.
+ */
+export async function getAnalyticsEnabledAsync(): Promise<boolean> {
+  const analyticsEnabled = await UserSettings.getAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, null);
+  return !!analyticsEnabled;
+}
+
+/**
+ * Create an instance of Analytics based on the user's analytics enabled preferences.
+ */
+export async function createAnalyticsAsync(): Promise<AnalyticsWithOrchestration> {
+  // TODO: remove after some time
+  const amplitudeEnabled = await UserSettings.getAsync(USER_SETTINGS_KEY_AMPLITUDE_ENABLED, null);
+  if (amplitudeEnabled !== null) {
+    await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, amplitudeEnabled);
+    await UserSettings.deleteKeyAsync(USER_SETTINGS_KEY_AMPLITUDE_ENABLED);
+  }
+  const amplitudeDeviceId = await UserSettings.getAsync(
+    USER_SETTINGS_KEY_AMPLITUDE_DEVICE_ID,
+    null
+  );
+  if (amplitudeDeviceId !== null) {
+    await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_DEVICE_ID, amplitudeDeviceId);
+    await UserSettings.deleteKeyAsync(USER_SETTINGS_KEY_AMPLITUDE_DEVICE_ID);
+  }
+
+  if (process.env.DISABLE_EAS_ANALYTICS) {
+    await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, false);
+  }
+
+  const analyticsEnabled = await UserSettings.getAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, true);
+  if (!analyticsEnabled) {
+    return new NoOpAnalytics();
+  }
+
+  const persistedDeviceId = await UserSettings.getAsync(
+    USER_SETTINGS_KEY_ANALYTICS_DEVICE_ID,
+    null
+  );
+  const deviceId = persistedDeviceId ?? uuidv4();
+  if (!persistedDeviceId) {
+    await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_DEVICE_ID, deviceId);
+  }
+  return new RudderstackAnalytics(deviceId);
+}
+
+class NoOpAnalytics implements AnalyticsWithOrchestration {
+  logEvent(): void {}
+  setActor(): void {}
+  async flushAsync(): Promise<void> {}
+}
+
+const RudderstackAnalyticsConfig =
+  process.env.EXPO_STAGING || process.env.EXPO_LOCAL
+    ? {
+        // staging environment
+        rudderstackWriteKey: '1wpX20Da4ltFGSXbPFYUL00Chb7',
+        rudderstackDataPlaneURL: 'https://cdp.expo.dev',
+      }
+    : {
+        // prod environment
+        rudderstackWriteKey: '1wpXLFxmujq86etH6G6cc90hPcC',
+        rudderstackDataPlaneURL: 'https://cdp.expo.dev',
+      };
+
+class RudderstackAnalytics implements AnalyticsWithOrchestration {
+  private readonly rudderstackClient = new RudderAnalytics(
+    RudderstackAnalyticsConfig.rudderstackWriteKey,
+    new URL('/v1/batch', RudderstackAnalyticsConfig.rudderstackDataPlaneURL).toString(),
+    {
+      flushInterval: 300,
+    }
+  );
+
+  private identifiedActor: Actor | null = null;
+
+  constructor(private readonly persistentDeviceId: string) {
+    // identify once with just anonymous ID. Once the actor is fetched, re-indentify with
+    // both so that they can be associated
+    this.rudderstackClient.identify({
+      anonymousId: persistentDeviceId,
+    });
+  }
+
+  public setActor(actor: Actor): void {
+    if (this.identifiedActor) {
+      return;
+    }
+
+    this.rudderstackClient.identify({
+      userId: actor.id,
+      anonymousId: this.persistentDeviceId,
+      traits: {
+        username: getActorDisplayName(actor),
+        user_id: actor.id,
+        user_type: actor.__typename,
+      },
+    });
+    this.identifiedActor = actor;
+  }
+
+  public logEvent(name: AnalyticsEvent, properties: AnalyticsEventProperties): void {
+    const userId = this.identifiedActor?.id;
+    const deviceId = this.persistentDeviceId;
+    const commonEventProperties = { source_version: easCliVersion, source: 'eas cli' };
+    const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
+    this.rudderstackClient.track({
+      event: name,
+      properties: { ...properties, ...commonEventProperties },
+      ...identity,
+      context: this.getRudderStackContext(),
+    });
+  }
+
+  public async flushAsync(): Promise<void> {
+    await this.rudderstackClient.flush();
+  }
+
+  private getRudderStackContext(): Record<string, any> {
+    const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
+    return {
+      os: { name: platform, version: os.release() },
+      device: { type: platform, model: platform },
+      app: { name: 'eas cli', version: easCliVersion ?? undefined },
+    };
+  }
+}
@@ -1,23 +1,28 @@
-import { Analytics, Event } from './events';
-
-export type TrackingContext = Record<string, string | number | boolean>;
+import { Analytics, AnalyticsEvent, AnalyticsEventProperties } from './AnalyticsManager';

 export async function withAnalyticsAsync<Result>(
+  analytics: Analytics,
  fn: () => Promise<Result>,
-  analytics: {
-    attemptEvent: Event;
-    successEvent: Event;
-    failureEvent: Event;
-    trackingCtx: TrackingContext;
+  {
+    attemptEvent,
+    successEvent,
+    failureEvent,
+    properties,
+  }: {
+    attemptEvent: AnalyticsEvent;
+    successEvent: AnalyticsEvent;
+    failureEvent: AnalyticsEvent;
+    properties: AnalyticsEventProperties;
  }
 ): Promise<Result> {
  try {
+    analytics.logEvent(attemptEvent, properties);
    const result = await fn();
-    Analytics.logEvent(analytics.successEvent, analytics.trackingCtx);
+    analytics.logEvent(successEvent, properties);
    return result;
  } catch (error: any) {
-    Analytics.logEvent(analytics.failureEvent, {
-      ...analytics.trackingCtx,
+    analytics.logEvent(failureEvent, {
+      ...properties,
      reason: error.message,
    });
    throw error;
@@ -1,60 +0,0 @@
-import { logEvent } from './rudderstackClient';
-export type Event = BuildEvent | SubmissionEvent | MetadataEvent;
-
-export enum SubmissionEvent {
-  SUBMIT_COMMAND = 'submit cli submit command',
-  SUBMIT_COMMAND_ATTEMPT = 'submit cli attempt',
-  SUBMIT_COMMAND_SUCCESS = 'submit cli success',
-  SUBMIT_COMMAND_FAIL = 'submit cli fail',
-  GATHER_CREDENTIALS_ATTEMPT = 'submit cli gather credentials attempt',
-  GATHER_CREDENTIALS_SUCCESS = 'submit cli gather credentials success',
-  GATHER_CREDENTIALS_FAIL = 'submit cli gather credentials fail',
-  GATHER_ARCHIVE_ATTEMPT = 'submit cli gather archive attempt',
-  GATHER_ARCHIVE_SUCCESS = 'submit cli gather archive success',
-  GATHER_ARCHIVE_FAIL = 'submit cli gather archive fail',
-  SUBMIT_REQUEST_ATTEMPT = 'submit cli request attempt',
-  SUBMIT_REQUEST_SUCCESS = 'submit cli request success',
-  SUBMIT_REQUEST_FAIL = 'submit cli request fail',
-  API_KEY_DOWNLOAD_FAIL = 'submit cli credentials api key download fail',
-  API_KEY_DOWNLOAD_RETRY = 'submit cli credentials api key download fail temporary',
-  API_KEY_DOWNLOAD_SUCCESS = 'submit cli credentials api key download succeed',
-}
-
-export enum BuildEvent {
-  BUILD_COMMAND = 'build cli build command',
-  PROJECT_UPLOAD_ATTEMPT = 'build cli project upload attempt',
-  PROJECT_UPLOAD_SUCCESS = 'build cli project upload success',
-  PROJECT_UPLOAD_FAIL = 'build cli project upload fail',
-  GATHER_CREDENTIALS_ATTEMPT = 'build cli gather credentials attempt',
-  GATHER_CREDENTIALS_SUCCESS = 'build cli gather credentials success',
-  GATHER_CREDENTIALS_FAIL = 'build cli gather credentials fail',
-  CONFIGURE_PROJECT_ATTEMPT = 'build cli configure project attempt',
-  CONFIGURE_PROJECT_SUCCESS = 'build cli configure project success',
-  CONFIGURE_PROJECT_FAIL = 'build cli configure project fail',
-  BUILD_REQUEST_ATTEMPT = 'build cli build request attempt',
-  BUILD_REQUEST_SUCCESS = 'build cli build request success',
-  BUILD_REQUEST_FAIL = 'build cli build request fail',
-
-  BUILD_STATUS_COMMAND = 'build cli build status',
-
-  CREDENTIALS_SYNC_COMMAND = 'build cli credentials sync command',
-  CREDENTIALS_SYNC_UPDATE_LOCAL_ATTEMPT = 'build cli credentials sync update local attempt',
-  CREDENTIALS_SYNC_UPDATE_LOCAL_SUCCESS = 'build cli credentials sync update local success',
-  CREDENTIALS_SYNC_UPDATE_LOCAL_FAIL = 'build cli credentials sync update local fail',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_ATTEMPT = 'build cli credentials sync update remote attempt',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_SUCCESS = 'build cli credentials sync update remote success',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_FAIL = 'build cli credentials sync update remote fail',
-
-  ANDROID_KEYSTORE_CREATE = 'build cli credentials keystore create',
-}
-
-export enum MetadataEvent {
-  APPLE_METADATA_DOWNLOAD = 'metadata cli download apple response',
-  APPLE_METADATA_UPLOAD = 'metadata cli upload apple response',
-}
-
-export class Analytics {
-  static logEvent(name: Event, properties: Record<string, any>): void {
-    logEvent(name, properties);
-  }
-}
@@ -1,129 +0,0 @@
-import RudderAnalytics from '@expo/rudder-sdk-node';
-import os from 'os';
-import { URL } from 'url';
-import { v4 as uuidv4 } from 'uuid';
-
-import UserSettings from '../user/UserSettings';
-import { easCliVersion } from '../utils/easCli';
-
-const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
-  darwin: 'Mac',
-  win32: 'Windows',
-  linux: 'Linux',
-};
-
-let rudderstackClient: RudderAnalytics | null = null;
-let userIdentified = false;
-let identifyData: {
-  userId: string;
-  deviceId: string;
-  traits: Record<string, any>;
-} | null = null;
-
-export async function initAsync(): Promise<void> {
-  // TODO: remove after some time
-  const amplitudeEnabled = await UserSettings.getAsync('amplitudeEnabled', null);
-  if (amplitudeEnabled !== null) {
-    await UserSettings.setAsync('analyticsEnabled', amplitudeEnabled);
-    await UserSettings.deleteKeyAsync('amplitudeEnabled');
-  }
-  const amplitudeDeviceId = await UserSettings.getAsync('amplitudeDeviceId', null);
-  if (amplitudeDeviceId !== null) {
-    await UserSettings.setAsync('analyticsDeviceId', amplitudeDeviceId);
-    await UserSettings.deleteKeyAsync('amplitudeDeviceId');
-  }
-  // TODO: cut here
-  if (process.env.DISABLE_EAS_ANALYTICS) {
-    await UserSettings.setAsync('analyticsEnabled', false);
-  }
-
-  const analyticsEnabled = await UserSettings.getAsync('analyticsEnabled', true);
-  if (analyticsEnabled) {
-    const config =
-      process.env.EXPO_STAGING || process.env.EXPO_LOCAL
-        ? {
-            // staging environment
-            rudderstackWriteKey: '1wpX20Da4ltFGSXbPFYUL00Chb7',
-            rudderstackDataPlaneURL: 'https://cdp.expo.dev',
-          }
-        : {
-            // prod environment
-            rudderstackWriteKey: '1wpXLFxmujq86etH6G6cc90hPcC',
-            rudderstackDataPlaneURL: 'https://cdp.expo.dev',
-          };
-
-    rudderstackClient = new RudderAnalytics(
-      config.rudderstackWriteKey,
-      new URL('/v1/batch', config.rudderstackDataPlaneURL).toString(),
-      {
-        flushInterval: 300,
-      }
-    );
-  }
-}
-
-export async function setUserDataAsync(userId: string, traits: Record<string, any>): Promise<void> {
-  const savedDeviceId = await UserSettings.getAsync('analyticsDeviceId', null);
-  const deviceId = savedDeviceId ?? uuidv4();
-  if (!savedDeviceId) {
-    await UserSettings.setAsync('analyticsDeviceId', deviceId);
-  }
-
-  identifyData = {
-    userId,
-    deviceId,
-    traits,
-  };
-
-  ensureUserIdentified();
-}
-
-export async function flushAsync(): Promise<void> {
-  if (rudderstackClient) {
-    await rudderstackClient.flush();
-  }
-}
-
-export function logEvent(name: string, properties: Record<string, any> = {}): void {
-  if (!rudderstackClient) {
-    return;
-  }
-  ensureUserIdentified();
-
-  const { userId, deviceId } = identifyData ?? {};
-  const commonEventProperties = { source_version: easCliVersion, source: 'eas cli' };
-
-  const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
-  rudderstackClient.track({
-    event: name,
-    properties: { ...properties, ...commonEventProperties },
-    ...identity,
-    context: getRudderStackContext(),
-  });
-}
-
-function ensureUserIdentified(): void {
-  if (!rudderstackClient || userIdentified || !identifyData) {
-    return;
-  }
-
-  rudderstackClient.identify({
-    userId: identifyData.userId,
-    anonymousId: identifyData.deviceId,
-    traits: identifyData.traits,
-  });
-  userIdentified = true;
-}
-
-function getRudderStackContext(): Record<string, any> {
-  const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
-  return {
-    os: { name: platform, version: os.release() },
-    device: { type: platform, model: platform },
-    app: { name: 'eas cli', version: easCliVersion ?? undefined },
-  };
-}
-
-export enum AnalyticsEvent {
-  ACTION = 'action', // generic event type which is used to determine the 'daily active user' stat, include an `action: eas ${subcommand}` property inside of the event properties object
-}
@@ -1,93 +1,78 @@
 import { JSONValue } from '@expo/json-file';

+import { ApiV2Error } from './ApiV2Error';
 import fetch, { RequestError, RequestInit } from './fetch';
-import { getAccessToken, getSessionSecret } from './user/sessionStorage';
-
-export class ApiV2Error extends Error {
-  override readonly name = 'ApiV2Error';
-  readonly expoApiV2ErrorCode: string;
-  readonly expoApiV2ErrorDetails?: JSONValue;
-  readonly expoApiV2ErrorServerStack?: string;
-  readonly expoApiV2ErrorMetadata?: object;
-
-  constructor(response: {
-    message: string;
-    code: string;
-    stack?: string;
-    details?: JSONValue;
-    metadata?: object;
-  }) {
-    super(response.message);
-    this.expoApiV2ErrorCode = response.code;
-    this.expoApiV2ErrorDetails = response.details;
-    this.expoApiV2ErrorServerStack = response.stack;
-    this.expoApiV2ErrorMetadata = response.metadata;
-  }
-}

 interface RequestOptions {
  body: JSONValue;
 }

-export const api = {
-  async putAsync(path: string, options: RequestOptions): Promise<any> {
-    return await requestAsync(path, { method: 'PUT', body: JSON.stringify(options.body) });
-  },
+export class ApiV2Client {
+  constructor(
+    private readonly authInfo: {
+      accessToken: string | null;
+      sessionSecret: string | null;
+    }
+  ) {}

-  async postAsync(path: string, options: RequestOptions): Promise<any> {
-    return await requestAsync(path, { method: 'POST', body: JSON.stringify(options.body) });
-  },
-
-  async deleteAsync(path: string): Promise<any> {
-    return await requestAsync(path, { method: 'DELETE' });
-  },
-
-  async getAsync(path: string): Promise<any> {
-    return await requestAsync(path, { method: 'GET' });
-  },
-};
-
-async function requestAsync(path: string, options: RequestInit): Promise<any> {
-  try {
-    const response = await fetch(`${getExpoApiBaseUrl()}/v2/${path}`, {
-      ...options,
-      headers: {
-        'Content-Type': 'application/json',
-        ...getAuthHeaders(),
-      },
-    });
-    return await response.json();
-  } catch (err) {
-    await handleApiErrorAsync(err);
+  public async putAsync(path: string, options: RequestOptions): Promise<any> {
+    return await this.requestAsync(path, { method: 'PUT', body: JSON.stringify(options.body) });
  }
-}

-async function handleApiErrorAsync(err: any): Promise<void> {
-  if (err instanceof RequestError) {
-    let result: { [key: string]: any };
+  public async postAsync(path: string, options: RequestOptions): Promise<any> {
+    return await this.requestAsync(path, { method: 'POST', body: JSON.stringify(options.body) });
+  }
+
+  public async deleteAsync(path: string): Promise<any> {
+    return await this.requestAsync(path, { method: 'DELETE' });
+  }
+
+  public async getAsync(path: string): Promise<any> {
+    return await this.requestAsync(path, { method: 'GET' });
+  }
+
+  private getAuthHeaders(): Record<string, string> {
+    const token = this.authInfo.accessToken;
+    if (token) {
+      return { authorization: `Bearer ${token}` };
+    }
+    const sessionSecret = this.authInfo.sessionSecret;
+    if (sessionSecret) {
+      return { 'expo-session': sessionSecret };
+    }
+    return {};
+  }
+
+  private async requestAsync(path: string, options: RequestInit): Promise<any> {
    try {
-      result = (await err.response.json()) as { [key: string]: any };
-    } catch {
-      throw new Error(`Malformed api response: ${await err.response.text()}`);
+      const response = await fetch(`${getExpoApiBaseUrl()}/v2/${path}`, {
+        ...options,
+        headers: {
+          'Content-Type': 'application/json',
+          ...this.getAuthHeaders(),
+        },
+      });
+      return await response.json();
+    } catch (err) {
+      await ApiV2Client.handleApiErrorAsync(err);
    }
-    if (result.errors?.length) {
-      throw new ApiV2Error(result.errors[0]);
-    }
-  } else {
-    throw err;
  }
-}

-function getAuthHeaders(): Record<string, string> {
-  const token = getAccessToken();
-  if (token) {
-    return { authorization: `Bearer ${token}` };
+  private static async handleApiErrorAsync(err: any): Promise<void> {
+    if (err instanceof RequestError) {
+      let result: { [key: string]: any };
+      try {
+        result = (await err.response.json()) as { [key: string]: any };
+      } catch {
+        throw new Error(`Malformed api response: ${await err.response.text()}`);
+      }
+      if (result.errors?.length) {
+        throw new ApiV2Error(result.errors[0]);
+      }
+    } else {
+      throw err;
+    }
  }
-  const sessionSecret = getSessionSecret();
-  if (sessionSecret) {
-    return { 'expo-session': sessionSecret };
-  }
-  return {};
 }

 export function getExpoApiBaseUrl(): string {
@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import CliTable from 'cli-table3';

+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { UpdateBranchFragment } from '../graphql/generated';
 import { BranchQuery } from '../graphql/queries/BranchQuery';
@@ -14,17 +15,20 @@ import {

 export const BRANCHES_LIMIT = 50;

-export async function selectBranchOnAppAsync({
-  projectId,
-  promptTitle,
-  displayTextForListItem,
-  paginatedQueryOptions,
-}: {
-  projectId: string;
-  displayTextForListItem: (queryItem: UpdateBranchFragment) => string;
-  promptTitle: string;
-  paginatedQueryOptions: PaginatedQueryOptions;
-}): Promise<UpdateBranchFragment> {
+export async function selectBranchOnAppAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    projectId,
+    promptTitle,
+    displayTextForListItem,
+    paginatedQueryOptions,
+  }: {
+    projectId: string;
+    displayTextForListItem: (queryItem: UpdateBranchFragment) => string;
+    promptTitle: string;
+    paginatedQueryOptions: PaginatedQueryOptions;
+  }
+): Promise<UpdateBranchFragment> {
  if (paginatedQueryOptions.nonInteractive) {
    throw new Error('Unable to select a branch in non-interactive mode.');
  }
@@ -32,7 +36,8 @@ export async function selectBranchOnAppAsync({
  const selectedBranch = await paginatedQueryWithSelectPromptAsync({
    limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
    offset: paginatedQueryOptions.offset,
-    queryToPerform: (limit, offset) => queryBranchesOnProjectAsync(limit, offset, projectId),
+    queryToPerform: (limit, offset) =>
+      queryBranchesOnProjectAsync(graphqlClient, limit, offset, projectId),
    promptOptions: {
      title: promptTitle,
      getIdentifierForQueryItem: updateBranchFragment => updateBranchFragment.id,
@@ -45,15 +50,19 @@ export async function selectBranchOnAppAsync({
  return selectedBranch;
 }

-export async function listAndRenderBranchesOnAppAsync({
-  projectId,
-  paginatedQueryOptions,
-}: {
-  projectId: string;
-  paginatedQueryOptions: PaginatedQueryOptions;
-}): Promise<void> {
+export async function listAndRenderBranchesOnAppAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    projectId,
+    paginatedQueryOptions,
+  }: {
+    projectId: string;
+    paginatedQueryOptions: PaginatedQueryOptions;
+  }
+): Promise<void> {
  if (paginatedQueryOptions.nonInteractive) {
    const branches = await queryBranchesOnProjectAsync(
+      graphqlClient,
      paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
      paginatedQueryOptions.offset,
      projectId
@@ -63,7 +72,8 @@ export async function listAndRenderBranchesOnAppAsync({
    await paginatedQueryWithConfirmPromptAsync({
      limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
      offset: paginatedQueryOptions.offset,
-      queryToPerform: (limit, offset) => queryBranchesOnProjectAsync(limit, offset, projectId),
+      queryToPerform: (limit, offset) =>
+        queryBranchesOnProjectAsync(graphqlClient, limit, offset, projectId),
      promptOptions: {
        title: 'Load more branches?',
        renderListItems: branches => renderPageOfBranches(branches, paginatedQueryOptions),
@@ -73,11 +83,12 @@ export async function listAndRenderBranchesOnAppAsync({
 }

 async function queryBranchesOnProjectAsync(
+  graphqlClient: ExpoGraphqlClient,
  limit: number,
  offset: number,
  projectId: string
 ): Promise<UpdateBranchFragment[]> {
-  return await BranchQuery.listBranchesOnAppAsync({
+  return await BranchQuery.listBranchesOnAppAsync(graphqlClient, {
    appId: projectId,
    limit,
    offset,
@@ -1,5 +1,7 @@
+import { instance, mock } from 'ts-mockito';
 import { v4 as uuid } from 'uuid';

+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { selectBuildToCancelAsync } from '../../commands/build/cancel';
 import { AppPlatform, BuildFragment, BuildPriority, BuildStatus } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
@@ -43,14 +45,18 @@ describe(selectBuildToCancelAsync.name, () => {
  });

  it('does not return build id when confirmation is rejected', async () => {
+    const graphqlClient = instance(mock<ExpoGraphqlClient>());
    jest.mocked(confirmAsync).mockResolvedValueOnce(false);
-    expect(selectBuildToCancelAsync(projectId, 'blah')).resolves.toEqual(null);
+    expect(selectBuildToCancelAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(null);
  });

  it('returns build id when confirmation is confirmed', async () => {
+    const graphqlClient = instance(mock<ExpoGraphqlClient>());
    jest.mocked(selectAsync).mockResolvedValueOnce(selectedBuildId);
    jest.mocked(confirmAsync).mockResolvedValueOnce(true);
-    expect(selectBuildToCancelAsync(projectId, 'blah')).resolves.toEqual(selectedBuildId);
+    expect(selectBuildToCancelAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(
+      selectedBuildId
+    );
  });
 });

@@ -63,7 +63,7 @@ This means that it will most likely produce an AAB and you will not be able to i
  const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
  const versionCodeOverride =
    ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-      ? await resolveRemoteVersionCodeAsync({
+      ? await resolveRemoteVersionCodeAsync(ctx.graphqlClient, {
          projectDir: ctx.projectDir,
          projectId: ctx.projectId,
          exp: ctx.exp,
@@ -84,7 +84,7 @@ export async function prepareAndroidBuildAsync(
      return await ensureAndroidCredentialsAsync(ctx);
    },
    syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync({
+      await syncProjectConfigurationAsync(ctx.graphqlClient, {
        projectDir: ctx.projectDir,
        exp: ctx.exp,
        localAutoIncrement:
@@ -108,7 +108,7 @@ export async function prepareAndroidBuildAsync(
    ): Promise<BuildResult> => {
      const graphqlMetadata = transformMetadata(metadata);
      const graphqlJob = transformJob(job);
-      return await BuildMutation.createAndroidBuildAsync({
+      return await BuildMutation.createAndroidBuildAsync(ctx.graphqlClient, {
        appId,
        job: graphqlJob,
        metadata: graphqlMetadata,
@@ -6,30 +6,34 @@ import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';

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

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

  if (workflow === Workflow.GENERIC) {
    await cleanUpOldEasBuildGradleScriptAsync(projectDir);
    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(projectDir, exp, projectId);
+      await syncUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
    }
    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
  } else {
@@ -5,6 +5,7 @@ import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';

+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { AppPlatform } from '../../graphql/generated';
 import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
 import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
@@ -174,20 +175,24 @@ async function writeBuildGradleAsync({
 * Returns buildNumber that will be used for the next build. If current build profile
 * has an 'autoIncrement' option set, it increments the version on server.
 */
-export async function resolveRemoteVersionCodeAsync({
-  projectDir,
-  projectId,
-  exp,
-  applicationId,
-  buildProfile,
-}: {
-  projectDir: string;
-  projectId: string;
-  exp: ExpoConfig;
-  applicationId: string;
-  buildProfile: BuildProfile<Platform.ANDROID>;
-}): Promise<string> {
+export async function resolveRemoteVersionCodeAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    projectDir,
+    projectId,
+    exp,
+    applicationId,
+    buildProfile,
+  }: {
+    projectDir: string;
+    projectId: string;
+    exp: ExpoConfig;
+    applicationId: string;
+    buildProfile: BuildProfile<Platform.ANDROID>;
+  }
+): Promise<string> {
  const remoteVersions = await AppVersionQuery.latestVersionAsync(
+    graphqlClient,
    projectId,
    AppPlatform.Android,
    applicationId
@@ -217,7 +222,7 @@ export async function resolveRemoteVersionCodeAsync({
      `Initializing versionCode with ${chalk.bold(currentBuildVersion)}.`
    ).start();
    try {
-      await AppVersionMutation.createAppVersionAsync({
+      await AppVersionMutation.createAppVersionAsync(graphqlClient, {
        appId: projectId,
        platform: AppPlatform.Android,
        applicationIdentifier: applicationId,
@@ -239,7 +244,7 @@ export async function resolveRemoteVersionCodeAsync({
      )}.`
    ).start();
    try {
-      await AppVersionMutation.createAppVersionAsync({
+      await AppVersionMutation.createAppVersionAsync(graphqlClient, {
        appId: projectId,
        platform: AppPlatform.Android,
        applicationIdentifier: applicationId,
@@ -5,9 +5,10 @@ import cliProgress from 'cli-progress';
 import fs from 'fs-extra';
 import nullthrows from 'nullthrows';

+import { BuildEvent } from '../analytics/AnalyticsManager';
 import { withAnalyticsAsync } from '../analytics/common';
-import { BuildEvent } from '../analytics/events';
 import { getExpoWebsiteBaseUrl } from '../api';
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import {
  AppPlatform,
  BuildFragment,
@@ -77,21 +78,26 @@ export async function prepareBuildRequestForPlatformAsync<
 >(builder: Builder<TPlatform, Credentials, TJob>): Promise<BuildRequestSender> {
  const { ctx } = builder;
  const credentialsResult = await withAnalyticsAsync(
+    ctx.analytics,
    async () => await builder.ensureCredentialsAsync(ctx),
    {
      attemptEvent: BuildEvent.GATHER_CREDENTIALS_ATTEMPT,
      successEvent: BuildEvent.GATHER_CREDENTIALS_SUCCESS,
      failureEvent: BuildEvent.GATHER_CREDENTIALS_FAIL,
-      trackingCtx: ctx.trackingCtx,
+      properties: ctx.analyticsEventProperties,
    }
  );

-  await withAnalyticsAsync(async () => await builder.syncProjectConfigurationAsync(ctx), {
-    attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
-    successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
-    failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
-    trackingCtx: ctx.trackingCtx,
-  });
+  await withAnalyticsAsync(
+    ctx.analytics,
+    async () => await builder.syncProjectConfigurationAsync(ctx),
+    {
+      attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
+      successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
+      failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
+      properties: ctx.analyticsEventProperties,
+    }
+  );

  if (await getVcsClient().isCommitRequiredAsync()) {
    Log.addNewLineIfNone();
@@ -191,6 +197,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
  let projectTarballPath;
  try {
    return await withAnalyticsAsync(
+      ctx.analytics,
      async () => {
        Log.newLine();
        Log.log(
@@ -213,6 +220,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
        projectTarballPath = projectTarball.path;

        const { bucketKey } = await uploadFileAtPathToS3Async(
+          ctx.graphqlClient,
          UploadSessionType.EasBuildProjectSources,
          projectTarball.path,
          createProgressTracker({
@@ -230,7 +238,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
        attemptEvent: BuildEvent.PROJECT_UPLOAD_ATTEMPT,
        successEvent: BuildEvent.PROJECT_UPLOAD_SUCCESS,
        failureEvent: BuildEvent.PROJECT_UPLOAD_FAIL,
-        trackingCtx: ctx.trackingCtx,
+        properties: ctx.analyticsEventProperties,
      }
    );
  } finally {
@@ -248,6 +256,7 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
 ): Promise<BuildFragment> {
  const { ctx } = builder;
  return await withAnalyticsAsync(
+    ctx.analytics,
    async () => {
      if (Log.isDebug) {
        Log.log(`Starting ${requestedPlatformDisplayNames[job.platform]} build`);
@@ -267,7 +276,7 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
      attemptEvent: BuildEvent.BUILD_REQUEST_ATTEMPT,
      successEvent: BuildEvent.BUILD_REQUEST_SUCCESS,
      failureEvent: BuildEvent.BUILD_REQUEST_FAIL,
-      trackingCtx: ctx.trackingCtx,
+      properties: ctx.analyticsEventProperties,
    }
  );
 }
@@ -275,6 +284,7 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
 type MaybeBuildFragment = BuildFragment | null;

 export async function waitForBuildEndAsync(
+  graphqlClient: ExpoGraphqlClient,
  { buildIds, accountName }: { buildIds: string[]; accountName: string },
  { intervalSec = 10 } = {}
 ): Promise<MaybeBuildFragment[]> {
@@ -289,7 +299,7 @@ export async function waitForBuildEndAsync(
    spinner = ora('Waiting for builds to complete. You can press Ctrl+C to exit.').start();
  }
  while (true) {
-    const builds = await getBuildsSafelyAsync(buildIds);
+    const builds = await getBuildsSafelyAsync(graphqlClient, buildIds);
    const { refetch } =
      builds.length === 1
        ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
@@ -301,10 +311,13 @@ export async function waitForBuildEndAsync(
  }
 }

-async function getBuildsSafelyAsync(buildIds: string[]): Promise<MaybeBuildFragment[]> {
+async function getBuildsSafelyAsync(
+  graphqlClient: ExpoGraphqlClient,
+  buildIds: string[]
+): Promise<MaybeBuildFragment[]> {
  const promises = buildIds.map(async buildId => {
    try {
-      return await BuildQuery.byIdAsync(buildId, { useCache: false });
+      return await BuildQuery.byIdAsync(graphqlClient, buildId, { useCache: false });
    } catch (err) {
      Log.debug('Failed to fetch the build status', err);
      return null;
@@ -2,7 +2,8 @@ import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, EasJson } from '@expo/eas-json';

-import { TrackingContext } from '../analytics/common';
+import { Analytics, AnalyticsEventProperties } from '../analytics/AnalyticsManager';
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
 import { Target } from '../credentials/ios/types';
 import { BuildResourceClass } from '../graphql/generated';
@@ -45,8 +46,10 @@ export interface BuildContext<T extends Platform> {
  projectId: string;
  projectName: string;
  message?: string;
-  trackingCtx: TrackingContext;
+  analyticsEventProperties: AnalyticsEventProperties;
  user: Actor;
+  graphqlClient: ExpoGraphqlClient;
+  analytics: Analytics;
  workflow: Workflow;
  android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
  ios: T extends Platform.IOS ? IosBuildContext : undefined;
@@ -5,9 +5,9 @@ import getenv from 'getenv';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';

-import { TrackingContext } from '../analytics/common';
-import { Analytics, BuildEvent } from '../analytics/events';
+import { Analytics, AnalyticsEventProperties, BuildEvent } from '../analytics/AnalyticsManager';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
 import { BuildResourceClass } from '../graphql/generated';
 import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
@@ -31,6 +31,8 @@ export async function createBuildContextAsync<T extends Platform>({
  resourceClass,
  message,
  actor,
+  graphqlClient,
+  analytics,
  getDynamicProjectConfigAsync,
 }: {
  buildProfileName: string;
@@ -45,12 +47,14 @@ export async function createBuildContextAsync<T extends Platform>({
  resourceClass: BuildResourceClass;
  message?: string;
  actor: Actor;
+  graphqlClient: ExpoGraphqlClient;
+  analytics: Analytics;
  getDynamicProjectConfigAsync: DynamicConfigContextFn;
 }): Promise<BuildContext<T>> {
  const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });

  const projectName = exp.slug;
-  const account = await getOwnerAccountForProjectIdAsync(projectId);
+  const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
  const workflow = await resolveWorkflowAsync(projectDir, platform);
  const accountId = account.id;
  const runFromCI = getenv.boolish('CI', false);
@@ -60,6 +64,8 @@ export async function createBuildContextAsync<T extends Platform>({
    nonInteractive,
    projectDir,
    user: actor,
+    graphqlClient,
+    analytics,
    env: buildProfile.env,
    easJsonCliConfig,
  });
@@ -69,7 +75,7 @@ export async function createBuildContextAsync<T extends Platform>({
    projectDir,
    buildProfile,
  });
-  const trackingCtx = {
+  const analyticsEventProperties = {
    tracking_id: uuidv4(),
    platform,
    ...(accountId && { account_id: accountId }),
@@ -79,7 +85,7 @@ export async function createBuildContextAsync<T extends Platform>({
    no_wait: noWait,
    run_from_ci: runFromCI,
  };
-  Analytics.logEvent(BuildEvent.BUILD_COMMAND, trackingCtx);
+  analytics.logEvent(BuildEvent.BUILD_COMMAND, analyticsEventProperties);

  const commonContext: CommonContext<T> = {
    accountName: account.name,
@@ -97,8 +103,10 @@ export async function createBuildContextAsync<T extends Platform>({
    projectDir,
    projectId,
    projectName,
-    trackingCtx,
+    analyticsEventProperties,
    user: actor,
+    graphqlClient,
+    analytics,
    workflow,
    message,
    runFromCI,
@@ -126,7 +134,7 @@ function getDevClientEventProperties({
  platform: Platform;
  projectDir: string;
  buildProfile: BuildProfile;
-}): Partial<TrackingContext> {
+}): Partial<AnalyticsEventProperties> {
  let includesDevClient;
  const version = tryGetDevClientVersion(projectDir);
  if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {
@@ -46,7 +46,7 @@ export async function createIosContextAsync(
  const applicationTarget = findApplicationTarget(targets);
  const buildNumberOverride =
    ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-      ? await resolveRemoteBuildNumberAsync({
+      ? await resolveRemoteBuildNumberAsync(ctx.graphqlClient, {
          projectDir: ctx.projectDir,
          projectId: ctx.projectId,
          exp: ctx.exp,
@@ -72,7 +72,7 @@ export async function prepareIosBuildAsync(
      return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
    },
    syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync({
+      await syncProjectConfigurationAsync(ctx.graphqlClient, {
        projectDir: ctx.projectDir,
        exp: ctx.exp,
        targets: ctx.ios.targets,
@@ -100,7 +100,7 @@ export async function prepareIosBuildAsync(
    ): Promise<BuildResult> => {
      const graphqlMetadata = transformMetadata(metadata);
      const graphqlJob = transformJob(job);
-      return await BuildMutation.createIosBuildAsync({
+      return await BuildMutation.createIosBuildAsync(ctx.graphqlClient, {
        appId,
        job: graphqlJob,
        metadata: graphqlMetadata,
@@ -2,31 +2,35 @@ import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { IosVersionAutoIncrement } from '@expo/eas-json';

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

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

  if (workflow === Workflow.GENERIC) {
    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(projectDir, exp, projectId);
+      await syncUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
    }
    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
  } else {
@@ -6,6 +6,7 @@ import chalk from 'chalk';
 import path from 'path';
 import type { XCBuildConfiguration } from 'xcode';

+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { Target } from '../../credentials/ios/types';
 import { AppPlatform } from '../../graphql/generated';
 import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
@@ -255,20 +256,24 @@ export function evaluateTemplateString(
 * Returns buildNumber that will be used for the next build. If current build profile
 * has an 'autoIncrement' option set, it increments the version on server.
 */
-export async function resolveRemoteBuildNumberAsync({
-  projectDir,
-  projectId,
-  exp,
-  applicationTarget,
-  buildProfile,
-}: {
-  projectDir: string;
-  projectId: string;
-  exp: ExpoConfig;
-  applicationTarget: Target;
-  buildProfile: BuildProfile<Platform.IOS>;
-}): Promise<string> {
+export async function resolveRemoteBuildNumberAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    projectDir,
+    projectId,
+    exp,
+    applicationTarget,
+    buildProfile,
+  }: {
+    projectDir: string;
+    projectId: string;
+    exp: ExpoConfig;
+    applicationTarget: Target;
+    buildProfile: BuildProfile<Platform.IOS>;
+  }
+): Promise<string> {
  const remoteVersions = await AppVersionQuery.latestVersionAsync(
+    graphqlClient,
    projectId,
    AppPlatform.Ios,
    applicationTarget.bundleIdentifier
@@ -307,7 +312,7 @@ export async function resolveRemoteBuildNumberAsync({
      `Initializing buildNumber with ${chalk.bold(currentBuildVersion)}.`
    ).start();
    try {
-      await AppVersionMutation.createAppVersionAsync({
+      await AppVersionMutation.createAppVersionAsync(graphqlClient, {
        appId: projectId,
        platform: AppPlatform.Ios,
        applicationIdentifier: applicationTarget.bundleIdentifier,
@@ -329,7 +334,7 @@ export async function resolveRemoteBuildNumberAsync({
      )}.`
    ).start();
    try {
-      await AppVersionMutation.createAppVersionAsync({
+      await AppVersionMutation.createAppVersionAsync(graphqlClient, {
        appId: projectId,
        platform: AppPlatform.Ios,
        applicationIdentifier: applicationTarget.bundleIdentifier,
@@ -6,7 +6,7 @@ import semver from 'semver';
 import { ora } from '../ora';

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

 export interface LocalBuildOptions {
  enable: boolean;
@@ -30,7 +30,7 @@ export async function collectMetadataAsync<T extends Platform>(
      ? 'simulator'
      : ctx.buildProfile.distribution) ?? 'store';
  const metadata: Metadata = {
-    trackingContext: ctx.trackingCtx,
+    trackingContext: ctx.analyticsEventProperties,
    ...(await maybeResolveVersionsAsync(ctx)),
    cliVersion: easCliVersion,
    workflow: ctx.workflow,
@@ -1,5 +1,6 @@
 import chalk from 'chalk';

+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { BuildFilter, BuildFragment } from '../graphql/generated';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
@@ -10,19 +11,22 @@ import { formatGraphQLBuild } from './utils/formatBuild';

 export const BUILDS_LIMIT = 50;

-export async function listAndRenderBuildsOnAppAsync({
-  projectId,
-  projectDisplayName,
-  filter,
-  paginatedQueryOptions,
-}: {
-  projectId: string;
-  projectDisplayName: string;
-  filter?: BuildFilter;
-  paginatedQueryOptions: PaginatedQueryOptions;
-}): Promise<void> {
+export async function listAndRenderBuildsOnAppAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    projectId,
+    projectDisplayName,
+    filter,
+    paginatedQueryOptions,
+  }: {
+    projectId: string;
+    projectDisplayName: string;
+    filter?: BuildFilter;
+    paginatedQueryOptions: PaginatedQueryOptions;
+  }
+): Promise<void> {
  if (paginatedQueryOptions.nonInteractive) {
-    const builds = await BuildQuery.viewBuildsOnAppAsync({
+    const builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
      appId: projectId,
      limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
      offset: paginatedQueryOptions.offset,
@@ -34,7 +38,7 @@ export async function listAndRenderBuildsOnAppAsync({
      limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
      offset: paginatedQueryOptions.offset,
      queryToPerform: (limit, offset) =>
-        BuildQuery.viewBuildsOnAppAsync({
+        BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
          appId: projectId,
          limit,
          offset,
@@ -10,7 +10,9 @@ import {
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';

+import { Analytics } from '../analytics/AnalyticsManager';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import {
  AppPlatform,
  BuildFragment,
@@ -76,21 +78,46 @@ export interface BuildFlags {
  message?: string;
 }

-const platformToGraphQLResourceClassMapping: Record<
-  Platform,
-  Record<UserInputResourceClass, BuildResourceClass>
+const iosUserInputResourceClassToBuildResourceClassMapping: Record<
+  UserInputResourceClass,
+  BuildResourceClass
 > = {
-  [Platform.ANDROID]: {
-    [UserInputResourceClass.DEFAULT]: BuildResourceClass.AndroidDefault,
-    [UserInputResourceClass.LARGE]: BuildResourceClass.AndroidLarge,
-  },
-  [Platform.IOS]: {
-    [UserInputResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
-    [UserInputResourceClass.LARGE]: BuildResourceClass.IosLarge,
-  },
+  [UserInputResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
+  [UserInputResourceClass.LARGE]: BuildResourceClass.IosLarge,
+  [UserInputResourceClass.M1_EXPERIMENTAL]: BuildResourceClass.IosM1Large,
 };

+const androidUserInputResourceClassToBuildResourceClassMapping: Record<
+  Exclude<UserInputResourceClass, UserInputResourceClass.M1_EXPERIMENTAL>,
+  BuildResourceClass
+> = {
+  [UserInputResourceClass.DEFAULT]: BuildResourceClass.AndroidDefault,
+  [UserInputResourceClass.LARGE]: BuildResourceClass.AndroidLarge,
+};
+
+function resolveResourceClass(
+  platform: Platform,
+  resourceClassInput: UserInputResourceClass
+): BuildResourceClass {
+  if (platform !== Platform.IOS && resourceClassInput === UserInputResourceClass.M1_EXPERIMENTAL) {
+    throw new Error(
+      `Resource class ${UserInputResourceClass.M1_EXPERIMENTAL} is only available for iOS builds`
+    );
+  }
+
+  return platform === Platform.ANDROID
+    ? androidUserInputResourceClassToBuildResourceClassMapping[
+        resourceClassInput as Exclude<
+          UserInputResourceClass,
+          UserInputResourceClass.M1_EXPERIMENTAL
+        >
+      ]
+    : iosUserInputResourceClassToBuildResourceClassMapping[resourceClassInput];
+}
+
 export async function runBuildAndSubmitAsync(
+  graphqlClient: ExpoGraphqlClient,
+  analytics: Analytics,
  projectDir: string,
  flags: BuildFlags,
  actor: Actor,
@@ -137,12 +164,14 @@ export async function runBuildAndSubmitAsync(
      flags,
      moreBuilds: platforms.length > 1,
      buildProfile,
-      resourceClass:
-        platformToGraphQLResourceClassMapping[buildProfile.platform][
-          flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
-        ],
+      resourceClass: resolveResourceClass(
+        buildProfile.platform,
+        flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
+      ),
      easJsonCliConfig,
      actor,
+      graphqlClient,
+      analytics,
      getDynamicProjectConfigAsync,
    });
    if (maybeBuild) {
@@ -182,7 +211,10 @@ export async function runBuildAndSubmitAsync(
        submitProfile,
        nonInteractive: flags.nonInteractive,
      });
-      startedBuild.build = await BuildQuery.withSubmissionsByIdAsync(startedBuild.build.id);
+      startedBuild.build = await BuildQuery.withSubmissionsByIdAsync(
+        graphqlClient,
+        startedBuild.build.id
+      );
      submissions.push(submission);
    }

@@ -199,7 +231,7 @@ export async function runBuildAndSubmitAsync(
  }

  const { accountName } = Object.values(buildCtxByPlatform)[0];
-  const builds = await waitForBuildEndAsync({
+  const builds = await waitForBuildEndAsync(graphqlClient, {
    buildIds: startedBuilds.map(({ build }) => build.id),
    accountName,
  });
@@ -216,13 +248,16 @@ export async function runBuildAndSubmitAsync(
    }
    exitWithNonZeroCodeIfSomeBuildsFailed(builds);
  } else {
-    const completedSubmissions = await waitForSubmissionsToCompleteAsync(submissions);
+    const completedSubmissions = await waitForSubmissionsToCompleteAsync(
+      graphqlClient,
+      submissions
+    );
    if (flags.json) {
      printJsonOnlyOutput(
        await Promise.all(
          builds
            .filter((i): i is BuildWithSubmissionsFragment => !!i)
-            .map(build => BuildQuery.withSubmissionsByIdAsync(build.id))
+            .map(build => BuildQuery.withSubmissionsByIdAsync(graphqlClient, build.id))
        )
      );
    }
@@ -238,6 +273,8 @@ async function prepareAndStartBuildAsync({
  resourceClass,
  easJsonCliConfig,
  actor,
+  graphqlClient,
+  analytics,
  getDynamicProjectConfigAsync,
 }: {
  projectDir: string;
@@ -247,6 +284,8 @@ async function prepareAndStartBuildAsync({
  resourceClass: BuildResourceClass;
  easJsonCliConfig: EasJson['cli'];
  actor: Actor;
+  graphqlClient: ExpoGraphqlClient;
+  analytics: Analytics;
  getDynamicProjectConfigAsync: DynamicConfigContextFn;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
  const buildCtx = await createBuildContextAsync({
@@ -262,6 +301,8 @@ async function prepareAndStartBuildAsync({
    easJsonCliConfig,
    message: flags.message,
    actor,
+    graphqlClient,
+    analytics,
    getDynamicProjectConfigAsync,
  });

@@ -342,6 +383,8 @@ async function prepareAndStartSubmissionAsync({
    credentialsCtx: buildCtx.credentialsCtx,
    applicationIdentifier: buildCtx.android?.applicationId ?? buildCtx.ios?.bundleIdentifier,
    actor: buildCtx.user,
+    graphqlClient: buildCtx.graphqlClient,
+    analytics: buildCtx.analytics,
    projectId: buildCtx.projectId,
    exp: buildCtx.exp,
  });
@@ -16,4 +16,9 @@ export enum BuildDistributionType {
 export enum UserInputResourceClass {
  DEFAULT = 'default',
  LARGE = 'large',
+  /**
+   * @experimental
+   * This resource class is not yet ready to be used in production. For testing purposes only. Might be deprecated / deleted at any time.
+   */
+  M1_EXPERIMENTAL = 'm1-experimental',
 }
@@ -1,5 +1,6 @@
 import chalk from 'chalk';

+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import {
  ViewBranchesOnUpdateChannelQueryVariables,
@@ -18,15 +19,18 @@ import { logChannelDetails } from './utils';

 export const CHANNELS_LIMIT = 25;

-export async function selectChannelOnAppAsync({
-  projectId,
-  selectionPromptTitle,
-  paginatedQueryOptions,
-}: {
-  projectId: string;
-  selectionPromptTitle: string;
-  paginatedQueryOptions: PaginatedQueryOptions;
-}): Promise<UpdateChannelObject> {
+export async function selectChannelOnAppAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    projectId,
+    selectionPromptTitle,
+    paginatedQueryOptions,
+  }: {
+    projectId: string;
+    selectionPromptTitle: string;
+    paginatedQueryOptions: PaginatedQueryOptions;
+  }
+): Promise<UpdateChannelObject> {
  if (paginatedQueryOptions.nonInteractive) {
    throw new Error('Unable to select a channel in non-interactive mode.');
  }
@@ -34,7 +38,8 @@ export async function selectChannelOnAppAsync({
  const updateChannel = await paginatedQueryWithSelectPromptAsync({
    limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
    offset: paginatedQueryOptions.offset,
-    queryToPerform: (limit, offset) => queryChannelsOnAppAsync({ appId: projectId, limit, offset }),
+    queryToPerform: (limit, offset) =>
+      queryChannelsOnAppAsync(graphqlClient, { appId: projectId, limit, offset }),
    promptOptions: {
      title: selectionPromptTitle,
      createDisplayTextForSelectionPromptListItem: updateChannel => updateChannel.name,
@@ -48,15 +53,18 @@ export async function selectChannelOnAppAsync({
  return updateChannel;
 }

-export async function listAndRenderChannelsOnAppAsync({
-  projectId,
-  paginatedQueryOptions,
-}: {
-  projectId: string;
-  paginatedQueryOptions: PaginatedQueryOptions;
-}): Promise<void> {
+export async function listAndRenderChannelsOnAppAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    projectId,
+    paginatedQueryOptions,
+  }: {
+    projectId: string;
+    paginatedQueryOptions: PaginatedQueryOptions;
+  }
+): Promise<void> {
  if (paginatedQueryOptions.nonInteractive) {
-    const channels = await queryChannelsOnAppAsync({
+    const channels = await queryChannelsOnAppAsync(graphqlClient, {
      appId: projectId,
      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
      offset: paginatedQueryOptions.offset,
@@ -67,7 +75,7 @@ export async function listAndRenderChannelsOnAppAsync({
      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
      offset: paginatedQueryOptions.offset,
      queryToPerform: (limit, offset) =>
-        queryChannelsOnAppAsync({ limit, offset, appId: projectId }),
+        queryChannelsOnAppAsync(graphqlClient, { limit, offset, appId: projectId }),
      promptOptions: {
        title: 'Load more channels?',
        renderListItems: channels => renderPageOfChannels(channels, paginatedQueryOptions),
@@ -76,20 +84,23 @@ export async function listAndRenderChannelsOnAppAsync({
  }
 }

-export async function listAndRenderBranchesAndUpdatesOnChannelAsync({
-  projectId: appId,
-  channelName,
-  paginatedQueryOptions,
-}: {
-  projectId: string;
-  channelName: string;
-  paginatedQueryOptions: PaginatedQueryOptions;
-}): Promise<void> {
-  const channel = await ChannelQuery.viewUpdateChannelAsync({ appId, channelName });
+export async function listAndRenderBranchesAndUpdatesOnChannelAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    projectId: appId,
+    channelName,
+    paginatedQueryOptions,
+  }: {
+    projectId: string;
+    channelName: string;
+    paginatedQueryOptions: PaginatedQueryOptions;
+  }
+): Promise<void> {
+  const channel = await ChannelQuery.viewUpdateChannelAsync(graphqlClient, { appId, channelName });
  renderChannelHeaderContent({ channelName: channel.name, channelId: channel.id });

  if (paginatedQueryOptions.nonInteractive) {
-    const branches = await queryBranchesAndUpdateGroupsOnChannelAsync({
+    const branches = await queryBranchesAndUpdateGroupsOnChannelAsync(graphqlClient, {
      appId,
      channelName,
      offset: paginatedQueryOptions.offset,
@@ -101,7 +112,7 @@ export async function listAndRenderBranchesAndUpdatesOnChannelAsync({
      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
      offset: paginatedQueryOptions.offset,
      queryToPerform: (limit, offset) =>
-        queryBranchesAndUpdateGroupsOnChannelAsync({
+        queryBranchesAndUpdateGroupsOnChannelAsync(graphqlClient, {
          channelName,
          appId,
          offset,
@@ -116,12 +127,11 @@ export async function listAndRenderBranchesAndUpdatesOnChannelAsync({
  }
 }

-async function queryChannelsOnAppAsync({
-  appId,
-  offset,
-  limit,
-}: ViewUpdateChannelsOnAppQueryVariables): Promise<UpdateChannelObject[]> {
-  return await ChannelQuery.viewUpdateChannelsOnAppAsync({
+async function queryChannelsOnAppAsync(
+  graphqlClient: ExpoGraphqlClient,
+  { appId, offset, limit }: ViewUpdateChannelsOnAppQueryVariables
+): Promise<UpdateChannelObject[]> {
+  return await ChannelQuery.viewUpdateChannelsOnAppAsync(graphqlClient, {
    appId,
    offset,
    limit,
@@ -129,9 +139,10 @@ async function queryChannelsOnAppAsync({
 }

 async function queryBranchesAndUpdateGroupsOnChannelAsync(
+  graphqlClient: ExpoGraphqlClient,
  args: ViewBranchesOnUpdateChannelQueryVariables
 ): Promise<UpdateBranchOnChannelObject[]> {
-  return await BranchQuery.listBranchesOnChannelAsync(args);
+  return await BranchQuery.listBranchesOnChannelAsync(graphqlClient, args);
 }

 function renderPageOfChannels(
@@ -1,18 +1,21 @@
 import { Command } from '@oclif/core';
+import nullthrows from 'nullthrows';

 import {
-  AnalyticsEvent,
-  flushAsync as flushAnalyticsAsync,
-  initAsync as initAnalyticsAsync,
-  logEvent,
-} from '../analytics/rudderstackClient';
-import { getUserAsync } from '../user/User';
-import ActorContextField from './context/ActorContextField';
+  AnalyticsWithOrchestration,
+  CommandEvent,
+  createAnalyticsAsync,
+} from '../analytics/AnalyticsManager';
+import SessionManager from '../user/SessionManager';
+import AnalyticsContextField from './context/AnalyticsContextField';
 import ContextField from './context/ContextField';
 import { DynamicProjectConfigContextField } from './context/DynamicProjectConfigContextField';
+import LoggedInContextField from './context/LoggedInContextField';
+import MaybeLoggedInContextField from './context/MaybeLoggedInContextField';
 import { OptionalProjectConfigContextField } from './context/OptionalProjectConfigContextField';
 import ProjectConfigContextField from './context/ProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
+import SessionManagementContextField from './context/SessionManagementContextField';

 type ContextInput<
  T extends {
@@ -33,10 +36,24 @@ type ContextOutput<
 export default abstract class EasCommand extends Command {
  protected static readonly ContextOptions = {
    /**
-     * Require this command to be run when logged-in. Returns the logged-in actor in the context.
+     * Require this command to be run when logged-in. Returns the logged-in actor and a logged-in
+     * graphql client in the context.
     */
    LoggedIn: {
-      actor: new ActorContextField(),
+      loggedIn: new LoggedInContextField(),
+    },
+    /**
+     * Do not require this command to be run when logged-in, but if it is get the logged-in actor and a
+     * maybe-logged-in graphql client.
+     */
+    MaybeLoggedIn: {
+      maybeLoggedIn: new MaybeLoggedInContextField(),
+    },
+    /**
+     * Specify this context requirement if the command needs to mutate the user session.
+     */
+    SessionManagment: {
+      sessionManager: new SessionManagementContextField(),
    },
    /**
     * Require the project to be identified and registered on server if this command is being
@@ -60,10 +77,19 @@ export default abstract class EasCommand extends Command {
    },
    /**
     * Require the project to be identified and registered on server. Returns the project config in the context.
+     * This also requires the user to be logged in (getProjectIdAsync requires logged in), so also expose that context.
+     * Exposing the loggedIn context here helps us guarantee user identification for logging purposes.
     */
    ProjectConfig: {
+      loggedIn: new LoggedInContextField(),
      projectConfig: new ProjectConfigContextField(),
    },
+    /**
+     * Analytics manager. Returns the analytics manager in the context for use by the command.
+     */
+    Analytics: {
+      analytics: new AnalyticsContextField(),
+    },
  };

  /**
@@ -90,24 +116,52 @@ export default abstract class EasCommand extends Command {
  ): Promise<ContextOutput<C>> {
    const contextDefinition = commandClass.contextDefinition;

-    const contextValuePairs = await Promise.all(
-      Object.keys(contextDefinition).map(async contextKey => {
-        return [contextKey, await contextDefinition[contextKey].getValueAsync({ nonInteractive })];
-      })
-    );
+    // do these serially so that they don't do things like ask for login twice in parallel
+    const contextValuePairs = [];
+    for (const [contextKey, contextField] of Object.entries(contextDefinition)) {
+      contextValuePairs.push([
+        contextKey,
+        await contextField.getValueAsync({
+          nonInteractive,
+          sessionManager: this.sessionManager,
+          analytics: this.analytics,
+        }),
+      ]);
+    }

    return Object.fromEntries(contextValuePairs);
  }

+  /**
+   * The user session manager. Responsible for coordinating all user session related state.
+   * If needed in a subclass, use the SessionManager ContextOption.
+   */
+  private sessionManagerInternal?: SessionManager;
+  private get sessionManager(): SessionManager {
+    return nullthrows(this.sessionManagerInternal);
+  }
+
+  /**
+   * The analytics manager. Used for logging analytics.
+   * It is set up here to ensure a consistent set up.
+   */
+  private analyticsInternal?: AnalyticsWithOrchestration;
+  private get analytics(): AnalyticsWithOrchestration {
+    return nullthrows(this.analyticsInternal);
+  }
+
  protected abstract runAsync(): Promise<any>;

  // eslint-disable-next-line async-protect/async-suffix
  async run(): Promise<any> {
-    await initAnalyticsAsync();
+    this.analyticsInternal = await createAnalyticsAsync();
+    this.sessionManagerInternal = new SessionManager(this.analytics);

    // this is needed for logEvent call below as it identifies the user in the analytics system
-    await getUserAsync();
-    logEvent(AnalyticsEvent.ACTION, {
+    // if possible
+    await this.sessionManager.getUserAsync();
+
+    this.analytics.logEvent(CommandEvent.ACTION, {
      // id is assigned by oclif in constructor based on the filepath:
      // commands/submit === submit, commands/build/list === build:list
      action: `eas ${this.id}`,
@@ -118,7 +172,7 @@ export default abstract class EasCommand extends Command {

  // eslint-disable-next-line async-protect/async-suffix
  override async finally(err: Error): Promise<any> {
-    await flushAnalyticsAsync();
+    await this.analytics.flushAsync();
    return super.finally(err);
  }
 }
@@ -1,16 +1,14 @@
-import { flushAsync, initAsync, logEvent } from '../../analytics/rudderstackClient';
-import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants';
-import { getUserAsync } from '../../user/User';
+import { AnalyticsWithOrchestration, createAnalyticsAsync } from '../../analytics/AnalyticsManager';
+import SessionManager from '../../user/SessionManager';
 import EasCommand from '../EasCommand';

 jest.mock('../../user/User');
-jest.mock('../../analytics/rudderstackClient', () => {
-  const { AnalyticsEvent } = jest.requireActual('../../analytics/rudderstackClient');
+jest.mock('../../user/SessionManager');
+jest.mock('../../analytics/AnalyticsManager', () => {
+  const { CommandEvent } = jest.requireActual('../../analytics/AnalyticsManager');
  return {
-    AnalyticsEvent,
-    logEvent: jest.fn(),
-    initAsync: jest.fn(),
-    flushAsync: jest.fn(),
+    CommandEvent,
+    createAnalyticsAsync: jest.fn(),
  };
 });

@@ -25,14 +23,16 @@ afterAll(() => {
  process.argv = originalProcessArgv;
 });

+const analytics: AnalyticsWithOrchestration = {
+  logEvent: jest.fn((): void => {}),
+  setActor: jest.fn((): void => {}),
+  flushAsync: jest.fn(async (): Promise<void> => {}),
+};
+
 beforeEach(() => {
-  jest
-    .mocked(getUserAsync)
-    .mockReset()
-    .mockImplementation(async () => mockJester);
-  jest.mocked(initAsync).mockReset();
-  jest.mocked(flushAsync).mockReset();
-  jest.mocked(logEvent).mockReset();
+  jest.resetAllMocks();
+
+  jest.mocked(createAnalyticsAsync).mockResolvedValue(analytics);
 });

 const createTestEasCommand = (): typeof EasCommand => {
@@ -57,28 +57,29 @@ describe(EasCommand.name, () => {
      const TestEasCommand = createTestEasCommand();
      await TestEasCommand.run();

-      expect(jest.mocked(getUserAsync)).toBeCalledTimes(1);
+      const sessionManagerSpy = jest.spyOn(SessionManager.prototype, 'getUserAsync');
+      expect(sessionManagerSpy).toBeCalledTimes(1);
    }, 15_000);

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

-      expect(initAsync).toHaveBeenCalled();
+      expect(createAnalyticsAsync).toHaveBeenCalled();
    });

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

-      expect(flushAsync).toHaveBeenCalled();
+      expect(analytics.flushAsync).toHaveBeenCalled();
    });

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

-      expect(logEvent).toHaveBeenCalledWith('action', {
+      expect(analytics.logEvent).toHaveBeenCalledWith('action', {
        action: `eas ${TestEasCommand.id}`,
      });
    });
@@ -93,7 +94,7 @@ describe(EasCommand.name, () => {
        });
      } catch {}

-      expect(flushAsync).toHaveBeenCalled();
+      expect(analytics.flushAsync).toHaveBeenCalled();
    });
  });
 });
@@ -1,9 +0,0 @@
-import { Actor } from '../../user/User';
-import ContextField, { ContextOptions } from './ContextField';
-import { ensureLoggedInAsync } from './contextUtils/ensureLoggedInAsync';
-
-export default class ActorContextField extends ContextField<Actor> {
-  async getValueAsync({ nonInteractive }: ContextOptions): Promise<Actor> {
-    return await ensureLoggedInAsync({ nonInteractive });
-  }
-}
@@ -0,0 +1,8 @@
+import { Analytics } from '../../analytics/AnalyticsManager';
+import ContextField, { ContextOptions } from './ContextField';
+
+export default class AnalyticsContextField extends ContextField<Analytics> {
+  async getValueAsync({ analytics }: ContextOptions): Promise<Analytics> {
+    return analytics;
+  }
+}
@@ -1,4 +1,9 @@
+import { Analytics } from '../../analytics/AnalyticsManager';
+import SessionManager from '../../user/SessionManager';
+
 export interface ContextOptions {
+  sessionManager: SessionManager;
+  analytics: Analytics;
  nonInteractive: boolean;
 }

@@ -12,11 +12,14 @@ export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
 }>;

 export class DynamicProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
-  async getValueAsync({ nonInteractive }: ContextOptions): Promise<DynamicConfigContextFn> {
+  async getValueAsync({
+    nonInteractive,
+    sessionManager,
+  }: ContextOptions): Promise<DynamicConfigContextFn> {
    return async (options?: ExpoConfigOptions) => {
      const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
      const expBefore = getExpoConfig(projectDir, options);
-      const projectId = await getProjectIdAsync(expBefore, {
+      const projectId = await getProjectIdAsync(sessionManager, expBefore, {
        nonInteractive,
        env: options?.env,
      });
@@ -0,0 +1,20 @@
+import { Actor } from '../../user/User';
+import ContextField, { ContextOptions } from './ContextField';
+import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
+
+export default class LoggedInContextField extends ContextField<{
+  actor: Actor;
+  graphqlClient: ExpoGraphqlClient;
+}> {
+  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<{
+    actor: Actor;
+    graphqlClient: ExpoGraphqlClient;
+  }> {
+    const { actor, authenticationInfo } = await sessionManager.ensureLoggedInAsync({
+      nonInteractive,
+    });
+
+    const graphqlClient = createGraphqlClient(authenticationInfo);
+    return { actor, graphqlClient };
+  }
+}
@@ -0,0 +1,23 @@
+import { Actor } from '../../user/User';
+import ContextField, { ContextOptions } from './ContextField';
+import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
+
+export default class MaybeLoggedInContextField extends ContextField<{
+  actor: Actor | null;
+  graphqlClient: ExpoGraphqlClient;
+}> {
+  async getValueAsync({ sessionManager }: ContextOptions): Promise<{
+    actor: Actor | null;
+    graphqlClient: ExpoGraphqlClient;
+  }> {
+    const authenticationInfo = {
+      accessToken: sessionManager.getAccessToken(),
+      sessionSecret: sessionManager.getSessionSecret(),
+    };
+
+    const graphqlClient = createGraphqlClient(authenticationInfo);
+    const actor = await sessionManager.getUserAsync();
+
+    return { actor: actor ?? null, graphqlClient };
+  }
+}
@@ -14,7 +14,7 @@ export class OptionalProjectConfigContextField extends ContextField<
    }
  | undefined
 > {
-  async getValueAsync({ nonInteractive }: ContextOptions): Promise<
+  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<
    | {
        projectId: string;
        exp: ExpoConfig;
@@ -36,7 +36,7 @@ export class OptionalProjectConfigContextField extends ContextField<
    }

    const expBefore = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(expBefore, {
+    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
      nonInteractive,
    });
    const exp = getExpoConfig(projectDir);
@@ -10,14 +10,14 @@ export default class ProjectConfigContextField extends ContextField<{
  exp: ExpoConfig;
  projectDir: string;
 }> {
-  async getValueAsync({ nonInteractive }: ContextOptions): Promise<{
+  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<{
    projectId: string;
    exp: ExpoConfig;
    projectDir: string;
  }> {
    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
    const expBefore = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(expBefore, {
+    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
      nonInteractive,
    });
    const exp = getExpoConfig(projectDir);
@@ -0,0 +1,8 @@
+import SessionManager from '../../user/SessionManager';
+import ContextField, { ContextOptions } from './ContextField';
+
+export default class SessionManagementContextField extends ContextField<SessionManager> {
+  async getValueAsync({ sessionManager }: ContextOptions): Promise<SessionManager> {
+    return sessionManager;
+  }
+}
@@ -1,74 +0,0 @@
-import { ApiV2Error } from '../../../../api';
-import { promptAsync } from '../../../../prompts';
-import { loginAsync } from '../../../../user/User';
-import {
-  UserSecondFactorDeviceMethod,
-  retryUsernamePasswordAuthWithOTPAsync,
-} from '../../../../user/otp';
-import { showLoginPromptAsync } from '../../contextUtils/ensureLoggedInAsync';
-
-jest.mock('../../../../prompts');
-jest.mock('../../../../api', () => ({
-  ApiV2Error: jest.requireActual('../../../../api').ApiV2Error,
-  getExpoApiBaseUrl: jest.fn(),
-}));
-
-jest.mock('../../../../user/otp');
-jest.mock('../../../../user/User', () => ({
-  loginAsync: jest.fn(),
-}));
-
-beforeEach(() => {
-  jest.mocked(promptAsync).mockReset();
-  jest.mocked(promptAsync).mockImplementation(async () => {
-    throw new Error('Should not be called');
-  });
-
-  jest.mocked(loginAsync).mockReset();
-});
-
-describe(showLoginPromptAsync, () => {
-  it('prompts for OTP when 2FA is enabled', async () => {
-    jest
-      .mocked(promptAsync)
-      .mockImplementationOnce(async () => ({ username: 'hello', password: 'world' }))
-      .mockImplementationOnce(async () => ({ otp: '123456' }))
-      .mockImplementation(async () => {
-        throw new Error("shouldn't happen");
-      });
-    jest
-      .mocked(loginAsync)
-      .mockImplementationOnce(async () => {
-        throw new ApiV2Error({
-          message: 'An OTP is required',
-          code: 'ONE_TIME_PASSWORD_REQUIRED',
-          metadata: {
-            secondFactorDevices: [
-              {
-                id: 'p0',
-                is_primary: true,
-                method: UserSecondFactorDeviceMethod.SMS,
-                sms_phone_number: 'testphone',
-              },
-            ],
-            smsAutomaticallySent: true,
-          },
-        });
-      })
-      .mockImplementation(async () => {});
-
-    await showLoginPromptAsync();
-
-    expect(retryUsernamePasswordAuthWithOTPAsync).toHaveBeenCalledWith('hello', 'world', {
-      secondFactorDevices: [
-        {
-          id: 'p0',
-          is_primary: true,
-          method: UserSecondFactorDeviceMethod.SMS,
-          sms_phone_number: 'testphone',
-        },
-      ],
-      smsAutomaticallySent: true,
-    });
-  });
-});
@@ -1,11 +1,12 @@
 import { getConfig, modifyConfigAsync } from '@expo/config';
 import { vol } from 'memfs';
+import { anything, instance, mock, when } from 'ts-mockito';

 import { Role } from '../../../../graphql/generated';
 import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { learnMore } from '../../../../log';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
-import { ensureLoggedInAsync } from '../../contextUtils/ensureLoggedInAsync';
+import SessionManager from '../../../../user/SessionManager';
 import { findProjectRootAsync } from '../findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from '../getProjectIdAsync';

@@ -13,7 +14,6 @@ jest.mock('@expo/config');
 jest.mock('fs');

 jest.mock('../../../../graphql/queries/AppQuery');
-jest.mock('../../contextUtils/ensureLoggedInAsync');
 jest.mock('../../contextUtils/findProjectDirAndVerifyProjectSetupAsync');
 jest.mock('../../../../user/User');
 jest.mock('../../../../ora', () => ({
@@ -24,30 +24,37 @@ jest.mock('../../../../ora', () => ({
 jest.mock('../../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync');

 describe(getProjectIdAsync, () => {
+  let sessionManager: SessionManager;
+
  beforeEach(() => {
-    jest.mocked(ensureLoggedInAsync).mockResolvedValue({
-      __typename: 'User',
-      id: 'user_id',
-      username: 'notnotbrent',
-      primaryAccount: {
-        id: 'account_id_1',
-        name: 'notnotbrent',
-        users: [{ role: Role.Owner, actor: { id: 'user_id' } }],
-      },
-      accounts: [
-        {
+    const sessionManagerMock = mock<SessionManager>();
+    when(sessionManagerMock.ensureLoggedInAsync(anything())).thenResolve({
+      actor: {
+        __typename: 'User',
+        id: 'user_id',
+        username: 'notnotbrent',
+        primaryAccount: {
          id: 'account_id_1',
          name: 'notnotbrent',
          users: [{ role: Role.Owner, actor: { id: 'user_id' } }],
        },
-        {
-          id: 'account_id_2',
-          name: 'dominik',
-          users: [{ role: Role.ViewOnly, actor: { id: 'user_id' } }],
-        },
-      ],
-      isExpoAdmin: false,
+        accounts: [
+          {
+            id: 'account_id_1',
+            name: 'notnotbrent',
+            users: [{ role: Role.Owner, actor: { id: 'user_id' } }],
+          },
+          {
+            id: 'account_id_2',
+            name: 'dominik',
+            users: [{ role: Role.ViewOnly, actor: { id: 'user_id' } }],
+          },
+        ],
+        isExpoAdmin: false,
+      },
+      authenticationInfo: { accessToken: 'fake', sessionSecret: null },
    });
+    sessionManager = instance(sessionManagerMock);

    vol.fromJSON(
      {
@@ -74,6 +81,7 @@ describe(getProjectIdAsync, () => {

    await expect(
      getProjectIdAsync(
+        sessionManager,
        { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
        { nonInteractive: false }
      )
@@ -93,6 +101,7 @@ describe(getProjectIdAsync, () => {

    await expect(
      getProjectIdAsync(
+        sessionManager,
        { name: 'test', slug: 'test', owner: 'wat', extra: { eas: { projectId: '1234' } } },
        { nonInteractive: false }
      )
@@ -116,6 +125,7 @@ describe(getProjectIdAsync, () => {

    await expect(
      getProjectIdAsync(
+        sessionManager,
        { name: 'test', slug: 'wat', extra: { eas: { projectId: '1234' } } },
        { nonInteractive: false }
      )
@@ -137,6 +147,7 @@ describe(getProjectIdAsync, () => {
      .mockImplementation(async () => '2345');

    const projectId = await getProjectIdAsync(
+      sessionManager,
      { name: 'test', slug: 'test' },
      {
        nonInteractive: false,
@@ -162,7 +173,7 @@ describe(getProjectIdAsync, () => {
      .mockImplementation(async () => '4567');

    await expect(
-      getProjectIdAsync({ name: 'test', slug: 'test' }, { nonInteractive: false })
+      getProjectIdAsync(sessionManager, { name: 'test', slug: 'test' }, { nonInteractive: false })
    ).rejects.toThrow();
  });
 });
@@ -0,0 +1,63 @@
+import {
+  Client,
+  OperationContext,
+  OperationResult,
+  PromisifiedSource,
+  TypedDocumentNode,
+  cacheExchange,
+  createClient as createUrqlClient,
+  dedupExchange,
+  fetchExchange,
+} from '@urql/core';
+import { retryExchange } from '@urql/exchange-retry';
+import { DocumentNode } from 'graphql';
+import fetch from 'node-fetch';
+
+import { getExpoApiBaseUrl } from '../../../api';
+import { httpsProxyAgent } from '../../../fetch';
+
+export interface ExpoGraphqlClient extends Client {
+  query<Data = any, Variables extends object = object>(
+    query: DocumentNode | TypedDocumentNode<Data, Variables> | string,
+    variables: Variables | undefined,
+    context: Partial<OperationContext> & { additionalTypenames: string[] }
+  ): PromisifiedSource<OperationResult<Data, Variables>>;
+}
+
+export function createGraphqlClient(authInfo: {
+  accessToken: string | null;
+  sessionSecret: string | null;
+}): ExpoGraphqlClient {
+  return createUrqlClient({
+    url: getExpoApiBaseUrl() + '/graphql',
+    exchanges: [
+      dedupExchange,
+      cacheExchange,
+      retryExchange({
+        maxDelayMs: 4000,
+        retryIf: (err, operation) => {
+          return !!(
+            err &&
+            !operation.context.noRetry &&
+            (err.networkError || err.graphQLErrors.some(e => e?.extensions?.isTransient))
+          );
+        },
+      }),
+      fetchExchange,
+    ],
+    // @ts-expect-error Type 'typeof fetch' is not assignable to type '(input: RequestInfo, init?: RequestInit | undefined) => Promise<Response>'.
+    fetch,
+    fetchOptions: (): RequestInit => {
+      const headers: Record<string, string> = {};
+      if (authInfo.accessToken) {
+        headers.authorization = `Bearer ${authInfo.accessToken}`;
+      } else if (authInfo.sessionSecret) {
+        headers['expo-session'] = authInfo.sessionSecret;
+      }
+      return {
+        ...(httpsProxyAgent ? { agent: httpsProxyAgent } : {}),
+        headers,
+      };
+    },
+  }) as ExpoGraphqlClient;
+}
@@ -1,91 +0,0 @@
-import { Errors } from '@oclif/core';
-import chalk from 'chalk';
-import nullthrows from 'nullthrows';
-
-import { ApiV2Error } from '../../../api';
-import Log, { learnMore } from '../../../log';
-import { promptAsync } from '../../../prompts';
-import { Actor, getUserAsync, loginAsync } from '../../../user/User';
-import { retryUsernamePasswordAuthWithOTPAsync } from '../../../user/otp';
-
-/**
- * Ensure that there is a logged-in actor. Show a login prompt if not.
- *
- * @param nonInteractive whether the log-in prompt if logged-out should be interactive
- * @returns logged-in Actor
- *
- * @deprecated Should not be used outside of context functions.
- */
-export async function ensureLoggedInAsync({
-  nonInteractive,
-}: {
-  nonInteractive: boolean;
-}): Promise<Actor> {
-  let user: Actor | undefined;
-  try {
-    user = await getUserAsync();
-  } catch {}
-
-  if (!user) {
-    Log.warn('An Expo user account is required to proceed.');
-    await showLoginPromptAsync({ nonInteractive, printNewLine: true });
-    user = await getUserAsync();
-  }
-
-  return nullthrows(user);
-}
-
-/**
- * Prompt the user to log in.
- *
- * @deprecated Should not be used outside of context functions, except in the AccountLogin command.
- */
-export async function showLoginPromptAsync({
-  nonInteractive = false,
-  printNewLine = false,
-} = {}): Promise<void> {
-  if (nonInteractive) {
-    Errors.error(
-      `Either log in with ${chalk.bold('eas login')} or set the ${chalk.bold(
-        'EXPO_TOKEN'
-      )} environment variable if you're using EAS CLI on CI (${learnMore(
-        'https://docs.expo.dev/accounts/programmatic-access/',
-        { dim: false }
-      )})`
-    );
-  }
-  if (printNewLine) {
-    Log.newLine();
-  }
-
-  Log.log('Log in to EAS');
-
-  const { username, password } = await promptAsync([
-    {
-      type: 'text',
-      name: 'username',
-      message: 'Email or username',
-    },
-    {
-      type: 'password',
-      name: 'password',
-      message: 'Password',
-    },
-  ]);
-  try {
-    await loginAsync({
-      username,
-      password,
-    });
-  } catch (e) {
-    if (e instanceof ApiV2Error && e.expoApiV2ErrorCode === 'ONE_TIME_PASSWORD_REQUIRED') {
-      await retryUsernamePasswordAuthWithOTPAsync(
-        username,
-        password,
-        e.expoApiV2ErrorMetadata as any
-      );
-    } else {
-      throw e;
-    }
-  }
-}
@@ -9,8 +9,9 @@ import { ora } from '../../../ora';
 import { getExpoConfig } from '../../../project/expoConfig';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { toAppPrivacy } from '../../../project/projectUtils';
+import SessionManager from '../../../user/SessionManager';
 import { Actor } from '../../../user/User';
-import { ensureLoggedInAsync } from './ensureLoggedInAsync';
+import { createGraphqlClient } from './createGraphqlClient';
 import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';

 /**
@@ -70,13 +71,22 @@ export async function saveProjectIdToAppConfigAsync(
 * @deprecated Should not be used outside of context functions.
 */
 export async function getProjectIdAsync(
+  sessionManager: SessionManager,
  exp: ExpoConfig,
  options: { env?: Env; nonInteractive: boolean }
 ): Promise<string> {
+  // all codepaths in this function require a logged-in user with access to the owning account
+  // since they either query the app via graphql or create it, which includes getting info about
+  // the owner
+  const { actor, authenticationInfo } = await sessionManager.ensureLoggedInAsync({
+    nonInteractive: options.nonInteractive,
+  });
+  const graphqlClient = createGraphqlClient(authenticationInfo);
+
  const localProjectId = exp.extra?.eas?.projectId;
  if (localProjectId) {
    // check that the local project ID matches account and slug
-    const appForProjectId = await AppQuery.byIdAsync(localProjectId);
+    const appForProjectId = await AppQuery.byIdAsync(graphqlClient, localProjectId);
    if (exp.owner && exp.owner !== appForProjectId.ownerAccount.name) {
      throw new Error(
        `Project config: Project identified by "extra.eas.projectId" (${
@@ -121,10 +131,8 @@ export async function getProjectIdAsync(
    }
  };

-  const actor = await ensureLoggedInAsync({
-    nonInteractive: options.nonInteractive,
-  });
  const projectId = await fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync(
+    graphqlClient,
    {
      accountName: getAccountNameForEASProjectSync(exp, actor),
      projectName: exp.slug,
@@ -1,13 +1,17 @@
 import EasCommand from '../../commandUtils/EasCommand';
-import { showLoginPromptAsync } from '../../commandUtils/context/contextUtils/ensureLoggedInAsync';
 import Log from '../../log';

 export default class AccountLogin extends EasCommand {
  static override description = 'log in with your Expo account';
  static override aliases = ['login'];

+  static override contextDefinition = {
+    ...this.ContextOptions.SessionManagment,
+  };
+
  async runAsync(): Promise<void> {
-    await showLoginPromptAsync();
+    const { sessionManager } = await this.getContextAsync(AccountLogin, { nonInteractive: false });
+    await sessionManager.showLoginPromptAsync();
    Log.log('Logged in');
  }
 }
@@ -1,13 +1,17 @@
 import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
-import { logoutAsync } from '../../user/User';

 export default class AccountLogout extends EasCommand {
  static override description = 'log out';
  static override aliases = ['logout'];

+  static override contextDefinition = {
+    ...this.ContextOptions.SessionManagment,
+  };
+
  async runAsync(): Promise<void> {
-    await logoutAsync();
+    const { sessionManager } = await this.getContextAsync(AccountLogout, { nonInteractive: false });
+    await sessionManager.logoutAsync();
    Log.log('Logged out');
  }
 }
@@ -2,16 +2,22 @@ import chalk from 'chalk';

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

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

+  static override contextDefinition = {
+    ...this.ContextOptions.MaybeLoggedIn,
+  };
+
  async runAsync(): Promise<void> {
-    const user = await getUserAsync();
-    if (user) {
-      Log.log(chalk.green(getActorDisplayName(user)));
+    const {
+      maybeLoggedIn: { actor },
+    } = await this.getContextAsync(AccountView, { nonInteractive: true });
+    if (actor) {
+      Log.log(chalk.green(getActorDisplayName(actor)));
    } else {
      Log.warn('Not logged in');
      process.exit(1);
@@ -1,6 +1,6 @@
+import { getAnalyticsEnabledAsync, setAnalyticsEnabledAsync } from '../analytics/AnalyticsManager';
 import EasCommand from '../commandUtils/EasCommand';
 import Log from '../log';
-import UserSettings from '../user/UserSettings';

 export default class AnalyticsView extends EasCommand {
  static override description = 'display or change analytics settings';
@@ -10,10 +10,10 @@ export default class AnalyticsView extends EasCommand {
  async runAsync(): Promise<void> {
    const { STATUS: status } = (await this.parse(AnalyticsView)).args;
    if (status) {
-      await UserSettings.setAsync('analyticsEnabled', status === 'on');
+      setAnalyticsEnabledAsync(status === 'on');
      Log.withTick(`${status === 'on' ? 'Enabling' : 'Disabling'} analytics.`);
    } else {
-      const analyticsEnabled = await UserSettings.getAsync('analyticsEnabled', null);
+      const analyticsEnabled = await getAnalyticsEnabledAsync();
      Log.log(
        `Analytics are ${
          analyticsEnabled === false ? 'disabled' : 'enabled'
@@ -3,8 +3,9 @@ import gql from 'graphql-tag';

 import { getDefaultBranchNameAsync } from '../../branch/utils';
 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { withErrorHandlingAsync } from '../../graphql/client';
 import {
  CreateUpdateBranchForAppMutation,
  CreateUpdateBranchForAppMutationVariables,
@@ -15,10 +16,10 @@ import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

-export async function createUpdateBranchOnAppAsync({
-  appId,
-  name,
-}: CreateUpdateBranchForAppMutationVariables): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
+export async function createUpdateBranchOnAppAsync(
+  graphqlClient: ExpoGraphqlClient,
+  { appId, name }: CreateUpdateBranchForAppMutationVariables
+): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
  const result = await withErrorHandlingAsync(
    graphqlClient
      .mutation<CreateUpdateBranchForAppMutation, CreateUpdateBranchForAppMutationVariables>(
@@ -63,6 +64,7 @@ export default class BranchCreate extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -72,6 +74,7 @@ export default class BranchCreate extends EasCommand {
    } = await this.parse(BranchCreate);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchCreate, {
      nonInteractive,
    });
@@ -80,7 +83,7 @@ export default class BranchCreate extends EasCommand {
      enableJsonOutput();
    }

-    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

    if (!name) {
      const validationMessage = 'Branch name may not be empty.';
@@ -96,7 +99,7 @@ export default class BranchCreate extends EasCommand {
      }));
    }

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

    if (jsonFlag) {
      printJsonOnlyOutput(newBranch);
@@ -3,9 +3,10 @@ import gql from 'graphql-tag';

 import { selectBranchOnAppAsync } from '../../branch/queries';
 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { withErrorHandlingAsync } from '../../graphql/client';
 import {
  DeleteUpdateBranchMutation,
  DeleteUpdateBranchMutationVariables,
@@ -18,10 +19,10 @@ import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { toggleConfirmAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

-async function getBranchInfoAsync({
-  appId,
-  name,
-}: GetBranchInfoQueryVariables): Promise<GetBranchInfoQuery> {
+async function getBranchInfoAsync(
+  graphqlClient: ExpoGraphqlClient,
+  { appId, name }: GetBranchInfoQueryVariables
+): Promise<GetBranchInfoQuery> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .query<GetBranchInfoQuery, GetBranchInfoQueryVariables>(
@@ -49,9 +50,10 @@ async function getBranchInfoAsync({
  return data;
 }

-async function deleteBranchOnAppAsync({
-  branchId,
-}: DeleteUpdateBranchMutationVariables): Promise<DeleteUpdateBranchResult> {
+async function deleteBranchOnAppAsync(
+  graphqlClient: ExpoGraphqlClient,
+  { branchId }: DeleteUpdateBranchMutationVariables
+): Promise<DeleteUpdateBranchResult> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .mutation<DeleteUpdateBranchMutation, DeleteUpdateBranchMutationVariables>(
@@ -78,6 +80,7 @@ export default class BranchDelete extends EasCommand {

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

  static override args = [
@@ -106,15 +109,16 @@ export default class BranchDelete extends EasCommand {

    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchDelete, { nonInteractive });
-    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

    if (!branchName) {
      const validationMessage = 'branch name may not be empty.';
      if (nonInteractive) {
        throw new Error(validationMessage);
      }
-      ({ name: branchName } = await selectBranchOnAppAsync({
+      ({ name: branchName } = await selectBranchOnAppAsync(graphqlClient, {
        projectId,
        displayTextForListItem: updateBranch => updateBranch.name,
        promptTitle: 'Which branch would you like to delete?',
@@ -122,7 +126,7 @@ export default class BranchDelete extends EasCommand {
      }));
    }

-    const data = await getBranchInfoAsync({ appId: projectId, name: branchName });
+    const data = await getBranchInfoAsync(graphqlClient, { appId: projectId, name: branchName });
    const branchId = data.app?.byId.updateBranchByName?.id;
    if (!branchId) {
      throw new Error(`Could not find branch ${branchName} on ${projectDisplayName}`);
@@ -142,7 +146,7 @@ export default class BranchDelete extends EasCommand {
      }
    }

-    const deletionResult = await deleteBranchOnAppAsync({
+    const deletionResult = await deleteBranchOnAppAsync(graphqlClient, {
      branchId,
    });

@@ -14,12 +14,14 @@ export default class BranchList extends EasCommand {

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

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BranchList);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchList, {
      nonInteractive: flags['non-interactive'],
    });
@@ -29,6 +31,6 @@ export default class BranchList extends EasCommand {
      enableJsonOutput();
    }

-    await listAndRenderBranchesOnAppAsync({ projectId, paginatedQueryOptions });
+    await listAndRenderBranchesOnAppAsync(graphqlClient, { projectId, paginatedQueryOptions });
  }
 }
@@ -3,8 +3,9 @@ import chalk from 'chalk';
 import gql from 'graphql-tag';

 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { withErrorHandlingAsync } from '../../graphql/client';
 import {
  EditUpdateBranchInput,
  EditUpdateBranchMutation,
@@ -16,11 +17,10 @@ import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

-async function renameUpdateBranchOnAppAsync({
-  appId,
-  name,
-  newName,
-}: EditUpdateBranchInput): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
+async function renameUpdateBranchOnAppAsync(
+  graphqlClient: ExpoGraphqlClient,
+  { appId, name, newName }: EditUpdateBranchInput
+): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .mutation<EditUpdateBranchMutation, EditUpdateBranchMutationVariables>(
@@ -64,6 +64,7 @@ export default class BranchRename extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -72,6 +73,7 @@ export default class BranchRename extends EasCommand {
    } = await this.parse(BranchRename);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchRename, {
      nonInteractive,
    });
@@ -79,7 +81,7 @@ export default class BranchRename extends EasCommand {
      enableJsonOutput();
    }

-    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

    if (!currentName) {
      const validationMessage = 'current name may not be empty.';
@@ -107,7 +109,7 @@ export default class BranchRename extends EasCommand {
      }));
    }

-    const editedBranch = await renameUpdateBranchOnAppAsync({
+    const editedBranch = await renameUpdateBranchOnAppAsync(graphqlClient, {
      appId: projectId,
      name: currentName!,
      newName: newName!,
@@ -28,6 +28,7 @@ export default class BranchView extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -38,6 +39,7 @@ export default class BranchView extends EasCommand {
    const { 'non-interactive': nonInteractive } = flags;
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchView, {
      nonInteractive,
    });
@@ -52,7 +54,7 @@ export default class BranchView extends EasCommand {
        throw new Error('Branch name may not be empty.');
      }

-      ({ name: branchName } = await selectBranchOnAppAsync({
+      ({ name: branchName } = await selectBranchOnAppAsync(graphqlClient, {
        projectId,
        promptTitle: 'Which branch would you like to view?',
        displayTextForListItem: updateBranch => updateBranch.name,
@@ -65,7 +67,7 @@ export default class BranchView extends EasCommand {
      }));
    }

-    await listAndRenderUpdateGroupsOnBranchAsync({
+    await listAndRenderUpdateGroupsOnBranchAsync(graphqlClient, {
      projectId,
      branchName,
      paginatedQueryOptions,
@@ -2,8 +2,9 @@ import chalk from 'chalk';
 import gql from 'graphql-tag';

 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { withErrorHandlingAsync } from '../../graphql/client';
 import {
  Build,
  BuildStatus,
@@ -17,7 +18,10 @@ import { appPlatformEmojis } from '../../platform';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { confirmAsync, selectAsync } from '../../prompts';

-async function cancelBuildAsync(buildId: string): Promise<Pick<Build, 'id' | 'status'>> {
+async function cancelBuildAsync(
+  graphqlClient: ExpoGraphqlClient,
+  buildId: string
+): Promise<Pick<Build, 'id' | 'status'>> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .mutation<CancelBuildMutation, CancelBuildMutationVariables>(
@@ -56,6 +60,7 @@ function formatUnfinishedBuild(
 }

 export async function selectBuildToCancelAsync(
+  graphqlClient: ExpoGraphqlClient,
  projectId: string,
  projectDisplayName: string
 ): Promise<string | null> {
@@ -64,19 +69,19 @@ export async function selectBuildToCancelAsync(
  let builds;
  try {
    const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
-      BuildQuery.viewBuildsOnAppAsync({
+      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
        appId: projectId,
        offset: 0,
        limit: 10,
        filter: { status: BuildStatus.New },
      }),
-      BuildQuery.viewBuildsOnAppAsync({
+      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
        appId: projectId,
        offset: 0,
        limit: 10,
        filter: { status: BuildStatus.InQueue },
      }),
-      BuildQuery.viewBuildsOnAppAsync({
+      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
        appId: projectId,
        offset: 0,
        limit: 10,
@@ -111,9 +116,12 @@ export async function selectBuildToCancelAsync(
  }
 }

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

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

  async runAsync(): Promise<void> {
@@ -139,14 +148,15 @@ export default class BuildCancel extends EasCommand {
    } = await this.parse(BuildCancel);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildCancel, {
      nonInteractive,
    });

-    const displayName = await getDisplayNameForProjectIdAsync(projectId);
+    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

    if (buildIdFromArg) {
-      await ensureBuildExistsAsync(buildIdFromArg);
+      await ensureBuildExistsAsync(graphqlClient, buildIdFromArg);
    }

    let buildId: string | null = buildIdFromArg;
@@ -155,7 +165,7 @@ export default class BuildCancel extends EasCommand {
        throw new Error('BUILD_ID must not be empty in non-interactive mode');
      }

-      buildId = await selectBuildToCancelAsync(projectId, displayName);
+      buildId = await selectBuildToCancelAsync(graphqlClient, projectId, displayName);
      if (!buildId) {
        return;
      }
@@ -163,7 +173,7 @@ export default class BuildCancel extends EasCommand {

    const spinner = ora().start('Canceling the build…');
    try {
-      const { status } = await cancelBuildAsync(buildId);
+      const { status } = await cancelBuildAsync(graphqlClient, buildId);
      if (status === BuildStatus.Canceled) {
        spinner.succeed('Build canceled');
      } else {
@@ -27,12 +27,14 @@ export default class BuildConfigure extends EasCommand {

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

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildConfigure);
    const {
      projectConfig: { exp, projectId, projectDir },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildConfigure, {
      nonInteractive: false,
    });
@@ -65,14 +67,14 @@ export default class BuildConfigure extends EasCommand {
      if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
        if (workflow === Workflow.GENERIC) {
-          await syncAndroidUpdatesConfigurationAsync(projectDir, exp, projectId);
+          await syncAndroidUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
        }
      }

      if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
        if (workflow === Workflow.GENERIC) {
-          await syncIosUpdatesConfigurationAsync(projectDir, exp, projectId);
+          await syncIosUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
        }
      }
    }
@@ -100,6 +100,7 @@ export default class Build extends EasCommand {
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.Analytics,
  };

  async runAsync(): Promise<void> {
@@ -110,7 +111,12 @@ export default class Build extends EasCommand {
    }
    const flags = this.sanitizeFlags(rawFlags);

-    const { actor, getDynamicProjectConfigAsync, projectDir } = await this.getContextAsync(Build, {
+    const {
+      loggedIn: { actor, graphqlClient },
+      getDynamicProjectConfigAsync,
+      projectDir,
+      analytics,
+    } = await this.getContextAsync(Build, {
      nonInteractive: flags.nonInteractive,
    });

@@ -118,6 +124,7 @@ export default class Build extends EasCommand {

    if (!flags.localBuildOptions.enable) {
      await maybeWarnAboutEasOutagesAsync(
+        graphqlClient,
        flags.autoSubmit
          ? [StatuspageServiceName.EasBuild, StatuspageServiceName.EasSubmit]
          : [StatuspageServiceName.EasBuild]
@@ -127,6 +134,8 @@ export default class Build extends EasCommand {
    const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);

    await runBuildAndSubmitAsync(
+      graphqlClient,
+      analytics,
      projectDir,
      flagsWithPlatform,
      actor,
@@ -147,6 +156,17 @@ export default class Build extends EasCommand {
    if (flags.json && !nonInteractive) {
      Errors.error('--json is allowed only when building in non-interactive mode', { exit: 1 });
    }
+    if (
+      flags['resource-class'] === UserInputResourceClass.M1_EXPERIMENTAL &&
+      flags.platform !== Platform.IOS
+    ) {
+      Errors.error(
+        `Resource class ${UserInputResourceClass.M1_EXPERIMENTAL} is only available for iOS builds`,
+        {
+          exit: 1,
+        }
+      );
+    }

    const requestedPlatform =
      flags.platform &&
@@ -65,16 +65,19 @@ export default class BuildInspect extends EasCommand {
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.Analytics,
  };

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildInspect);
-    const { actor, getDynamicProjectConfigAsync, projectDir } = await this.getContextAsync(
-      BuildInspect,
-      {
-        nonInteractive: false,
-      }
-    );
+    const {
+      loggedIn: { actor, graphqlClient },
+      getDynamicProjectConfigAsync,
+      projectDir,
+      analytics,
+    } = await this.getContextAsync(BuildInspect, {
+      nonInteractive: false,
+    });

    const outputDirectory = path.resolve(process.cwd(), flags.output);
    const tmpWorkingdir = path.join(getTmpDirectory(), uuidv4());
@@ -95,6 +98,8 @@ export default class BuildInspect extends EasCommand {
    } else {
      try {
        await runBuildAndSubmitAsync(
+          graphqlClient,
+          analytics,
          projectDir,
          {
            nonInteractive: false,
@@ -57,6 +57,7 @@ export default class BuildList extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -71,6 +72,7 @@ export default class BuildList extends EasCommand {
    } = flags;
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildList, {
      nonInteractive,
    });
@@ -81,9 +83,9 @@ export default class BuildList extends EasCommand {
    const platform = toAppPlatform(requestedPlatform);
    const graphqlBuildStatus = toGraphQLBuildStatus(buildStatus);
    const graphqlBuildDistribution = toGraphQLBuildDistribution(buildDistribution);
-    const displayName = await getDisplayNameForProjectIdAsync(projectId);
+    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

-    await listAndRenderBuildsOnAppAsync({
+    await listAndRenderBuildsOnAppAsync(graphqlClient, {
      projectId,
      projectDisplayName: displayName,
      filter: {
@@ -45,12 +45,13 @@ export default class BuildVersionSetView extends EasCommand {

  public async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildVersionSetView);
-    const { actor, getDynamicProjectConfigAsync, projectDir } = await this.getContextAsync(
-      BuildVersionSetView,
-      {
-        nonInteractive: false,
-      }
-    );
+    const {
+      loggedIn: { actor, graphqlClient },
+      getDynamicProjectConfigAsync,
+      projectDir,
+    } = await this.getContextAsync(BuildVersionSetView, {
+      nonInteractive: false,
+    });

    const platform = await selectPlatformAsync(flags.platform);
    const easJsonAccessor = new EasJsonAccessor(projectDir);
@@ -62,7 +63,7 @@ export default class BuildVersionSetView extends EasCommand {
    );

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

    validateAppConfigForRemoteVersionSource(exp, platform);

@@ -74,6 +75,7 @@ export default class BuildVersionSetView extends EasCommand {
      actor
    );
    const remoteVersions = await AppVersionQuery.latestVersionAsync(
+      graphqlClient,
      projectId,
      toAppPlatform(platform),
      applicationIdentifier
@@ -104,7 +106,7 @@ export default class BuildVersionSetView extends EasCommand {
          ? value => isValidVersionCode(value) || `Invalid value: ${VERSION_CODE_REQUIREMENTS}.`
          : value => isValidBuildNumber(value) || `Invalid value: ${BUILD_NUMBER_REQUIREMENTS}.`,
    });
-    await AppVersionMutation.createAppVersionAsync({
+    await AppVersionMutation.createAppVersionAsync(graphqlClient, {
      appId: projectId,
      platform: toAppPlatform(platform),
      applicationIdentifier,
@@ -62,12 +62,13 @@ export default class BuildVersionSyncView extends EasCommand {

  public async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildVersionSyncView);
-    const { actor, getDynamicProjectConfigAsync, projectDir } = await this.getContextAsync(
-      BuildVersionSyncView,
-      {
-        nonInteractive: true,
-      }
-    );
+    const {
+      loggedIn: { actor, graphqlClient },
+      getDynamicProjectConfigAsync,
+      projectDir,
+    } = await this.getContextAsync(BuildVersionSyncView, {
+      nonInteractive: true,
+    });

    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
    const easJsonAccessor = new EasJsonAccessor(projectDir);
@@ -96,6 +97,7 @@ export default class BuildVersionSyncView extends EasCommand {
        actor
      );
      const remoteVersions = await AppVersionQuery.latestVersionAsync(
+        graphqlClient,
        projectId,
        toAppPlatform(profileInfo.platform),
        applicationIdentifier
@@ -19,6 +19,7 @@ export default class BuildView extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -28,6 +29,7 @@ export default class BuildView extends EasCommand {
    } = await this.parse(BuildView);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildView, {
      nonInteractive: true,
    });
@@ -35,7 +37,7 @@ export default class BuildView extends EasCommand {
      enableJsonOutput();
    }

-    const displayName = await getDisplayNameForProjectIdAsync(projectId);
+    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

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

@@ -43,9 +45,9 @@ export default class BuildView extends EasCommand {
      let build: BuildFragment;

      if (buildId) {
-        build = await BuildQuery.byIdAsync(buildId);
+        build = await BuildQuery.byIdAsync(graphqlClient, buildId);
      } else {
-        const builds = await BuildQuery.viewBuildsOnAppAsync({
+        const builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
          appId: projectId,
          offset: 0,
          limit: 1,
@@ -3,8 +3,9 @@ import gql from 'graphql-tag';

 import { BranchNotFoundError } from '../../branch/utils';
 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { withErrorHandlingAsync } from '../../graphql/client';
 import {
  CreateUpdateChannelOnAppMutation,
  CreateUpdateChannelOnAppMutationVariables,
@@ -17,15 +18,18 @@ import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { createUpdateBranchOnAppAsync } from '../branch/create';

-export async function createUpdateChannelOnAppAsync({
-  appId,
-  channelName,
-  branchId,
-}: {
-  appId: string;
-  channelName: string;
-  branchId: string;
-}): Promise<CreateUpdateChannelOnAppMutation> {
+export async function createUpdateChannelOnAppAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    appId,
+    channelName,
+    branchId,
+  }: {
+    appId: string;
+    channelName: string;
+    branchId: string;
+  }
+): Promise<CreateUpdateChannelOnAppMutation> {
  // Point the new channel at a branch with its same name.
  const branchMapping = JSON.stringify({
    data: [{ branchId, branchMappingLogic: 'true' }],
@@ -72,6 +76,7 @@ export default class ChannelCreate extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -81,6 +86,7 @@ export default class ChannelCreate extends EasCommand {
    } = await this.parse(ChannelCreate);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelCreate, {
      nonInteractive,
    });
@@ -105,7 +111,7 @@ export default class ChannelCreate extends EasCommand {
    let branchMessage: string;

    try {
-      const branch = await BranchQuery.getBranchByNameAsync({
+      const branch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
        appId: projectId,
        name: channelName,
      });
@@ -113,7 +119,7 @@ export default class ChannelCreate extends EasCommand {
      branchMessage = `We found a branch with the same name`;
    } catch (error) {
      if (error instanceof BranchNotFoundError) {
-        const newBranch = await createUpdateBranchOnAppAsync({
+        const newBranch = await createUpdateBranchOnAppAsync(graphqlClient, {
          appId: projectId,
          name: channelName,
        });
@@ -126,7 +132,7 @@ export default class ChannelCreate extends EasCommand {

    const {
      updateChannel: { createUpdateChannelForApp: newChannel },
-    } = await createUpdateChannelOnAppAsync({
+    } = await createUpdateChannelOnAppAsync(graphqlClient, {
      appId: projectId,
      channelName,
      branchId,
@@ -144,7 +150,7 @@ export default class ChannelCreate extends EasCommand {
      Log.addNewLineIfNone();
      Log.withTick(
        `Created a new channel on project ${chalk.bold(
-          await getDisplayNameForProjectIdAsync(projectId)
+          await getDisplayNameForProjectIdAsync(graphqlClient, projectId)
        )}`
      );
      Log.log(
@@ -2,8 +2,9 @@ import gql from 'graphql-tag';

 import { selectChannelOnAppAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { withErrorHandlingAsync } from '../../graphql/client';
 import {
  DeleteUpdateChannelMutation,
  DeleteUpdateChannelMutationVariables,
@@ -31,6 +32,7 @@ export default class ChannelDelete extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -40,6 +42,7 @@ export default class ChannelDelete extends EasCommand {
    } = await this.parse(ChannelDelete);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelDelete, {
      nonInteractive,
    });
@@ -49,7 +52,7 @@ export default class ChannelDelete extends EasCommand {

    let channelId, channelName;
    if (nameArg) {
-      const { id, name } = await ChannelQuery.viewUpdateChannelAsync({
+      const { id, name } = await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
        appId: projectId,
        channelName: nameArg,
      });
@@ -59,7 +62,7 @@ export default class ChannelDelete extends EasCommand {
      if (nonInteractive) {
        throw new Error('Channel name must be set when running in non-interactive mode');
      }
-      const { id, name } = await selectChannelOnAppAsync({
+      const { id, name } = await selectChannelOnAppAsync(graphqlClient, {
        projectId,
        selectionPromptTitle: 'Select a channel to delete',
        paginatedQueryOptions: {
@@ -85,7 +88,7 @@ export default class ChannelDelete extends EasCommand {
      }
    }

-    const deletionResult = await deleteChannelOnAppAsync({
+    const deletionResult = await deleteChannelOnAppAsync(graphqlClient, {
      channelId,
    });

@@ -97,9 +100,10 @@ export default class ChannelDelete extends EasCommand {
  }
 }

-async function deleteChannelOnAppAsync({
-  channelId,
-}: DeleteUpdateChannelMutationVariables): Promise<DeleteUpdateChannelResult> {
+async function deleteChannelOnAppAsync(
+  graphqlClient: ExpoGraphqlClient,
+  { channelId }: DeleteUpdateChannelMutationVariables
+): Promise<DeleteUpdateChannelResult> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .mutation<DeleteUpdateChannelMutation, DeleteUpdateChannelMutationVariables>(
@@ -5,8 +5,9 @@ import gql from 'graphql-tag';
 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 { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { withErrorHandlingAsync } from '../../graphql/client';
 import {
  UpdateChannelBranchMappingMutation,
  UpdateChannelBranchMappingMutationVariables,
@@ -16,12 +17,10 @@ import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

-export async function updateChannelBranchMappingAsync({
-  channelId,
-  branchMapping,
-}: UpdateChannelBranchMappingMutationVariables): Promise<
-  UpdateChannelBranchMappingMutation['updateChannel']['editUpdateChannel']
-> {
+export async function updateChannelBranchMappingAsync(
+  graphqlClient: ExpoGraphqlClient,
+  { channelId, branchMapping }: UpdateChannelBranchMappingMutationVariables
+): Promise<UpdateChannelBranchMappingMutation['updateChannel']['editUpdateChannel']> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .mutation<UpdateChannelBranchMappingMutation, UpdateChannelBranchMappingMutationVariables>(
@@ -67,6 +66,7 @@ export default class ChannelEdit extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -76,6 +76,7 @@ export default class ChannelEdit extends EasCommand {
    } = await this.parse(ChannelEdit);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelEdit, {
      nonInteractive,
    });
@@ -84,8 +85,11 @@ export default class ChannelEdit extends EasCommand {
    }

    const existingChannel = args.name
-      ? await ChannelQuery.viewUpdateChannelAsync({ appId: projectId, channelName: args.name })
-      : await selectChannelOnAppAsync({
+      ? await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
+          appId: projectId,
+          channelName: args.name,
+        })
+      : await selectChannelOnAppAsync(graphqlClient, {
          projectId,
          selectionPromptTitle: 'Select a channel to edit',
          paginatedQueryOptions: { json, nonInteractive, offset: 0 },
@@ -96,11 +100,11 @@ export default class ChannelEdit extends EasCommand {
    }

    const branch = branchFlag
-      ? await BranchQuery.getBranchByNameAsync({
+      ? await BranchQuery.getBranchByNameAsync(graphqlClient, {
          appId: projectId,
          name: branchFlag,
        })
-      : await selectBranchOnAppAsync({
+      : await selectBranchOnAppAsync(graphqlClient, {
          projectId,
          promptTitle: `Which branch would you like ${existingChannel.name} to point at?`,
          displayTextForListItem: updateBranch => updateBranch.name,
@@ -111,7 +115,7 @@ export default class ChannelEdit extends EasCommand {
          },
        });

-    const channel = await updateChannelBranchMappingAsync({
+    const channel = await updateChannelBranchMappingAsync(graphqlClient, {
      channelId: existingChannel.id,
      // todo: move branch mapping logic to utility
      branchMapping: JSON.stringify({
@@ -19,6 +19,7 @@ export default class ChannelList extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -27,6 +28,7 @@ export default class ChannelList extends EasCommand {
    const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelList, {
      nonInteractive,
    });
@@ -34,7 +36,7 @@ export default class ChannelList extends EasCommand {
      enableJsonOutput();
    }

-    await listAndRenderChannelsOnAppAsync({
+    await listAndRenderChannelsOnAppAsync(graphqlClient, {
      projectId,
      paginatedQueryOptions,
    });
@@ -3,6 +3,7 @@ import chalk from 'chalk';

 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';
@@ -54,25 +55,28 @@ function getRolloutInfo(channel: UpdateChannelByNameObject): {
  return { newBranch, oldBranch, currentPercent };
 }

-async function startRolloutAsync({
-  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<{
+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;
@@ -80,7 +84,7 @@ async function startRolloutAsync({
  };
  logMessage: string;
 }> {
-  const branch = await BranchQuery.getBranchByNameAsync({
+  const branch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
    appId: projectId,
    name: branchName,
  });
@@ -116,7 +120,7 @@ async function startRolloutAsync({
      currentBranchMapping.data[0],
    ],
  };
-  const newChannelInfo = await updateChannelBranchMappingAsync({
+  const newChannelInfo = await updateChannelBranchMappingAsync(graphqlClient, {
    channelId: channel.id,
    branchMapping: JSON.stringify(newBranchMapping),
  });
@@ -139,19 +143,22 @@ async function startRolloutAsync({
  return { newChannelInfo, logMessage };
 }

-async function editRolloutAsync({
-  channelName,
-  percent,
-  nonInteractive,
-  currentBranchMapping,
-  channel,
-}: {
-  channelName?: string;
-  percent?: number;
-  nonInteractive: boolean;
-  currentBranchMapping: BranchMapping;
-  channel: UpdateChannelByNameObject;
-}): Promise<{
+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;
@@ -178,7 +185,7 @@ async function editRolloutAsync({
  const newBranchMapping = { ...currentBranchMapping };
  newBranchMapping.data[0].branchMappingLogic.operand = percent / 100;

-  const newChannelInfo = await updateChannelBranchMappingAsync({
+  const newChannelInfo = await updateChannelBranchMappingAsync(graphqlClient, {
    channelId: channel.id,
    branchMapping: JSON.stringify(newBranchMapping),
  });
@@ -194,19 +201,22 @@ async function editRolloutAsync({
  return { newChannelInfo, logMessage };
 }

-async function endRolloutAsync({
-  channelName,
-  branchName,
-  nonInteractive,
-  projectId,
-  channel,
-}: {
-  channelName?: string;
-  branchName?: string;
-  nonInteractive: boolean;
-  projectId: string;
-  channel: UpdateChannelByNameObject;
-}): Promise<{
+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;
@@ -219,7 +229,7 @@ async function endRolloutAsync({

  let endOnNewBranch;
  if (branchName) {
-    const branch = await BranchQuery.getBranchByNameAsync({
+    const branch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
      appId: projectId,
      name: branchName,
    });
@@ -270,7 +280,7 @@ async function endRolloutAsync({
    ],
  };

-  const newChannelInfo = await updateChannelBranchMappingAsync({
+  const newChannelInfo = await updateChannelBranchMappingAsync(graphqlClient, {
    channelId: channel.id,
    branchMapping: JSON.stringify(newBranchMapping),
  });
@@ -313,6 +323,7 @@ export default class ChannelRollout extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -328,6 +339,7 @@ export default class ChannelRollout extends EasCommand {
    } = await this.parse(ChannelRollout);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelRollout, {
      nonInteractive,
    });
@@ -335,9 +347,9 @@ export default class ChannelRollout extends EasCommand {
      enableJsonOutput();
    }

-    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

-    const channel = await ChannelQuery.viewUpdateChannelAsync({
+    const channel = await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
      appId: projectId,
      channelName: channelName!,
    });
@@ -382,7 +394,7 @@ export default class ChannelRollout extends EasCommand {
      logMessage: string;
    };
    if (!isRollout) {
-      rolloutMutationResult = await startRolloutAsync({
+      rolloutMutationResult = await startRolloutAsync(graphqlClient, {
        channelName,
        branchName: branchName ?? (await promptForBranchNameAsync(channelName, nonInteractive)),
        percent,
@@ -393,7 +405,7 @@ export default class ChannelRollout extends EasCommand {
        channel,
      });
    } else if (endFlag) {
-      rolloutMutationResult = await endRolloutAsync({
+      rolloutMutationResult = await endRolloutAsync(graphqlClient, {
        channelName,
        branchName,
        nonInteractive,
@@ -401,7 +413,7 @@ export default class ChannelRollout extends EasCommand {
        channel,
      });
    } else {
-      rolloutMutationResult = await editRolloutAsync({
+      rolloutMutationResult = await editRolloutAsync(graphqlClient, {
        channelName,
        percent,
        nonInteractive,
@@ -27,6 +27,7 @@ export default class ChannelView extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -38,6 +39,7 @@ export default class ChannelView extends EasCommand {
    const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelView, {
      nonInteractive,
    });
@@ -50,7 +52,7 @@ export default class ChannelView extends EasCommand {
      if (nonInteractive) {
        throw new Error(validationMessage);
      }
-      const selectedUpdateChannel = await selectChannelOnAppAsync({
+      const selectedUpdateChannel = await selectChannelOnAppAsync(graphqlClient, {
        projectId,
        selectionPromptTitle: 'Select a channel to view',
        paginatedQueryOptions: {
@@ -63,7 +65,7 @@ export default class ChannelView extends EasCommand {
      assert(channelName, `A channel must be selected.`);
    }

-    await listAndRenderBranchesAndUpdatesOnChannelAsync({
+    await listAndRenderBranchesAndUpdatesOnChannelAsync(graphqlClient, {
      projectId,
      channelName,
      paginatedQueryOptions,
@@ -13,14 +13,25 @@ export default class Credentials extends EasCommand {
  static override contextDefinition = {
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.OptionalProjectConfig,
+    ...this.ContextOptions.Analytics,
  };

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(Credentials);
-    const { actor, projectConfig } = await this.getContextAsync(Credentials, {
+    const {
+      loggedIn: { actor, graphqlClient },
+      projectConfig,
+      analytics,
+    } = await this.getContextAsync(Credentials, {
      nonInteractive: false,
    });

-    await new SelectPlatform(actor, projectConfig ?? null, flags.platform).runAsync();
+    await new SelectPlatform(
+      actor,
+      graphqlClient,
+      analytics,
+      projectConfig ?? null,
+      flags.platform
+    ).runAsync();
  }
 }
@@ -13,13 +13,17 @@ export default class DeviceCreate extends EasCommand {

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

    const ctx = await createContextAsync({
      appStore: new AppStoreApi(),
      user: actor,
+      graphqlClient,
      projectId: projectConfig?.projectId,
    });
    const manager = new DeviceManager(ctx);
@@ -3,6 +3,7 @@ import { Flags } from '@oclif/core';
 import assert from 'assert';

 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { PaginatedQueryOptions, getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import { AppleDeviceMutation } from '../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
@@ -34,6 +35,7 @@ export default class DeviceDelete extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -42,10 +44,11 @@ export default class DeviceDelete extends EasCommand {
    let { 'apple-team-id': appleTeamIdentifier, udid } = flags;
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(DeviceDelete, {
      nonInteractive: paginatedQueryOptions.nonInteractive,
    });
-    const account = await getOwnerAccountForProjectIdAsync(projectId);
+    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
    let appleTeamName;

    if (paginatedQueryOptions.json) {
@@ -53,7 +56,7 @@ export default class DeviceDelete extends EasCommand {
    }

    if (!appleTeamIdentifier) {
-      const appleTeam = await selectAppleTeamOnAccountAsync({
+      const appleTeam = await selectAppleTeamOnAccountAsync(graphqlClient, {
        accountName: account.name,
        selectionPromptTitle: `What Apple team would you like to list devices for?`,
        paginatedQueryOptions,
@@ -65,8 +68,8 @@ export default class DeviceDelete extends EasCommand {
    assert(appleTeamIdentifier, 'No team identifier is specified');

    const chosenDevice = udid
-      ? await AppleDeviceQuery.getByDeviceIdentifierAsync(account.name, udid)
-      : await selectAppleDeviceOnAppleTeamAsync({
+      ? await AppleDeviceQuery.getByDeviceIdentifierAsync(graphqlClient, account.name, udid)
+      : await selectAppleDeviceOnAppleTeamAsync(graphqlClient, {
          accountName: account.name,
          appleTeamIdentifier,
          selectionPromptTitle: `Which device would you like to disable?`,
@@ -79,7 +82,7 @@ export default class DeviceDelete extends EasCommand {
      return;
    }

-    await this.removeDeviceFromExpoAsync(chosenDevice);
+    await this.removeDeviceFromExpoAsync(graphqlClient, chosenDevice);

    if (await this.shouldDisableDeviceOnAppleAsync(paginatedQueryOptions)) {
      await this.disableDeviceOnAppleAsync(chosenDevice, appleTeamIdentifier);
@@ -135,11 +138,12 @@ export default class DeviceDelete extends EasCommand {
  }

  async removeDeviceFromExpoAsync(
+    graphqlClient: ExpoGraphqlClient,
    chosenDevice: AppleDevice | AppleDeviceQueryResult
  ): Promise<void> {
    const removalSpinner = ora(`Removing Apple device on Expo`).start();
    try {
-      await AppleDeviceMutation.deleteAppleDeviceAsync(chosenDevice.id);
+      await AppleDeviceMutation.deleteAppleDeviceAsync(graphqlClient, chosenDevice.id);
      removalSpinner.succeed('Removed Apple device from Expo');
    } catch (err) {
      removalSpinner.fail();
@@ -22,6 +22,7 @@ export default class BuildList extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -29,6 +30,7 @@ export default class BuildList extends EasCommand {
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildList, {
      nonInteractive: paginatedQueryOptions.nonInteractive,
    });
@@ -38,11 +40,11 @@ export default class BuildList extends EasCommand {
      enableJsonOutput();
    }

-    const account = await getOwnerAccountForProjectIdAsync(projectId);
+    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);

    // if they don't provide a team id, fetch devices on their account
    if (!appleTeamIdentifier) {
-      const selectedAppleTeam = await selectAppleTeamOnAccountAsync({
+      const selectedAppleTeam = await selectAppleTeamOnAccountAsync(graphqlClient, {
        accountName: account.name,
        paginatedQueryOptions: {
          ...paginatedQueryOptions,
@@ -56,7 +58,7 @@ export default class BuildList extends EasCommand {
    }

    assert(appleTeamIdentifier, 'No team identifier is specified');
-    await listAndRenderAppleDevicesOnAppleTeamAsync({
+    await listAndRenderAppleDevicesOnAppleTeamAsync(graphqlClient, {
      accountName: account.name,
      appleTeam: {
        appleTeamIdentifier,
@@ -12,6 +12,7 @@ export default class DeviceView extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -32,15 +33,20 @@ If you are not sure what is the UDID of the device you are looking for, run:
    }
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(DeviceView, {
      nonInteractive: true,
    });
-    const account = await getOwnerAccountForProjectIdAsync(projectId);
+    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);

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

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

      if (device) {
        spinner.succeed('Fetched device details');
@@ -24,6 +24,7 @@ export default class MetadataPull extends EasCommand {
  static override contextDefinition = {
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Analytics,
  };

  async runAsync(): Promise<void> {
@@ -31,8 +32,9 @@ export default class MetadataPull extends EasCommand {

    const { flags } = await this.parse(MetadataPull);
    const {
-      actor,
+      loggedIn: { actor, graphqlClient },
      projectConfig: { exp, projectId, projectDir },
+      analytics,
    } = await this.getContextAsync(MetadataPull, {
      nonInteractive: false,
    });
@@ -44,11 +46,14 @@ export default class MetadataPull extends EasCommand {
      projectInfo: { exp, projectId },
      projectDir,
      user: actor,
+      graphqlClient,
+      analytics,
      nonInteractive: false,
    });

    const metadataCtx = await createMetadataContextAsync({
      credentialsCtx,
+      analytics,
      projectDir,
      exp,
      profileName: flags.profile,
@@ -22,6 +22,7 @@ export default class MetadataPush extends EasCommand {
  static override contextDefinition = {
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Analytics,
  };

  async runAsync(): Promise<void> {
@@ -29,8 +30,9 @@ export default class MetadataPush extends EasCommand {

    const { flags } = await this.parse(MetadataPush);
    const {
-      actor,
+      loggedIn: { actor, graphqlClient },
      projectConfig: { exp, projectId, projectDir },
+      analytics,
    } = await this.getContextAsync(MetadataPush, {
      nonInteractive: false,
    });
@@ -42,11 +44,14 @@ export default class MetadataPush extends EasCommand {
      projectInfo: { exp, projectId },
      projectDir,
      user: actor,
+      graphqlClient,
+      analytics,
      nonInteractive: false,
    });

    const metadataCtx = await createMetadataContextAsync({
      credentialsCtx,
+      analytics,
      projectDir,
      exp,
      profileName: flags.profile,
@@ -10,17 +10,19 @@ export default class Open extends EasCommand {

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

  async runAsync(): Promise<void> {
    // this command is interactive by nature (only really run by humans in a terminal)
    const {
      projectConfig: { projectId, exp },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(Open, {
      nonInteractive: false,
    });

-    const account = await getOwnerAccountForProjectIdAsync(projectId);
+    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);

    const projectName = exp.slug;

@@ -1,12 +1,15 @@
-import { AppJSONConfig, PackageJSONConfig, getConfig } from '@expo/config';
+import { AppJSONConfig, PackageJSONConfig, getConfig, modifyConfigAsync } from '@expo/config';
 import chalk from 'chalk';
 import { vol } from 'memfs';
+import { instance, mock } from 'ts-mockito';

-import ActorContextField from '../../../commandUtils/context/ActorContextField';
+import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
 import ProjectDirContextField from '../../../commandUtils/context/ProjectDirContextField';
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { saveProjectIdToAppConfigAsync } from '../../../commandUtils/context/contextUtils/getProjectIdAsync';
-import { jester } from '../../../credentials/__tests__/fixtures-constants';
+import { jester, jester2 } from '../../../credentials/__tests__/fixtures-constants';
 import { AppMutation } from '../../../graphql/mutations/AppMutation';
+import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { confirmAsync, promptAsync } from '../../../prompts';
 import ProjectInit from '../init';
@@ -16,6 +19,7 @@ jest.mock('@expo/config');
 jest.mock('../../../prompts');
 jest.mock('../../../user/actions');
 jest.mock('../../../graphql/mutations/AppMutation');
+jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../ora', () => ({
  ora: () => ({
    start: () => ({ succeed: () => {}, fail: () => {} }),
@@ -71,10 +75,13 @@ function mockTestProject(options: {
  );

  const mockManifest = { exp: appJSON.expo };
+  const graphqlClient = instance(mock<ExpoGraphqlClient>());

  jest.mocked(getConfig).mockReturnValue(mockManifest as any);
  jest.spyOn(ProjectDirContextField.prototype, 'getValueAsync').mockResolvedValue('/test-project');
-  jest.spyOn(ActorContextField.prototype, 'getValueAsync').mockResolvedValue(jester);
+  jest
+    .spyOn(LoggedInContextField.prototype, 'getValueAsync')
+    .mockResolvedValue({ actor: jester, graphqlClient });
 }

 const commandOptions = { root: '/test-project' } as any;
@@ -92,11 +99,23 @@ describe(ProjectInit.name, () => {

      describe('interactive', () => {
        it('is no-op if already configured for id', async () => {
+          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+            id: '1234',
+            slug: 'testing-123',
+            fullName: '@jester/testing-123',
+            ownerAccount: jester.accounts[0],
+          });
          await new ProjectInit(['--id', '1234'], commandOptions).run();
          expect(saveProjectIdToAppConfigAsync).not.toHaveBeenCalled();
        });

        it('prompts to overwrite when different', async () => {
+          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+            id: '1234',
+            slug: 'testing-123',
+            fullName: '@jester/testing-123',
+            ownerAccount: jester.accounts[0],
+          });
          jest.mocked(confirmAsync).mockResolvedValue(true);
          await new ProjectInit(['--id', '12345'], commandOptions).run();
          expect(saveProjectIdToAppConfigAsync).toHaveBeenCalledWith('/test-project', '12345');
@@ -104,8 +123,16 @@ describe(ProjectInit.name, () => {
        });

        it('aborts when prompt to overwrite is declined', async () => {
+          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+            id: '1234',
+            slug: 'testing-123',
+            fullName: '@jester/testing-123',
+            ownerAccount: jester.accounts[0],
+          });
          jest.mocked(confirmAsync).mockResolvedValue(false);
-          await new ProjectInit(['--id', '12345'], commandOptions).run();
+          await expect(
+            new ProjectInit(['--id', '12345'], commandOptions).run()
+          ).rejects.toThrowError('Aborting');
          expect(saveProjectIdToAppConfigAsync).not.toHaveBeenCalled();
          expect(confirmAsync).toHaveBeenCalled();
        });
@@ -113,6 +140,12 @@ describe(ProjectInit.name, () => {

      describe('force', () => {
        it('does not prompt to overwrite when different', async () => {
+          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+            id: '1234',
+            slug: 'testing-123',
+            fullName: '@jester/testing-123',
+            ownerAccount: jester.accounts[0],
+          });
          await new ProjectInit(['--id', '12345', '--force'], {
            root: '/test-project',
          } as any).run();
@@ -135,17 +168,171 @@ describe(ProjectInit.name, () => {
          expect(saveProjectIdToAppConfigAsync).not.toHaveBeenCalled();
        });
      });
+
+      describe('checks owner and slug consistency', () => {
+        it('is a no-op if already consistent', async () => {
+          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+            id: '1234',
+            slug: 'testing-123',
+            fullName: '@jester/testing-123',
+            ownerAccount: jester.accounts[0],
+          });
+
+          await new ProjectInit(['--id', '1234'], commandOptions).run();
+          expect(modifyConfigAsync).not.toHaveBeenCalled();
+        });
+
+        it('prompts to configure if not consistent', async () => {
+          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+            id: '1234',
+            slug: 'testing-124',
+            fullName: '@jester2/testing-124',
+            ownerAccount: jester2.accounts[0],
+          });
+
+          jest.mocked(confirmAsync).mockResolvedValue(true);
+          jest.mocked(modifyConfigAsync).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' });
+        });
+
+        it('overrides if force flag is present and it is not consistent', async () => {
+          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+            id: '1234',
+            slug: 'testing-124',
+            fullName: '@jester2/testing-124',
+            ownerAccount: jester2.accounts[0],
+          });
+
+          jest.mocked(modifyConfigAsync).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' });
+        });
+
+        it('throws if non-interactive is present and it is not consistent', async () => {
+          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+            id: '1234',
+            slug: 'testing-124',
+            fullName: '@jester2/testing-124',
+            ownerAccount: jester2.accounts[0],
+          });
+
+          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
+
+          await expect(
+            new ProjectInit(['--id', '1234', '--non-interactive'], commandOptions).run()
+          ).rejects.toThrow(
+            'Project config error: Project owner (jester2) does not match the value configured in the "owner" field (jester). Use --force flag to overwrite.'
+          );
+
+          expect(confirmAsync).not.toHaveBeenCalled();
+          expect(modifyConfigAsync).not.toHaveBeenCalled();
+        });
+      });
    });

    describe('when it is not yet configured', () => {
-      beforeEach(() => {
-        mockTestProject({});
-      });
-
      it('configures', async () => {
+        mockTestProject({ configuredOwner: jester.accounts[0].name });
+        jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+          id: '1234',
+          slug: 'testing-123',
+          fullName: '@jester/testing-123',
+          ownerAccount: jester.accounts[0],
+        });
+
        await new ProjectInit(['--id', '1234'], commandOptions).run();
        expect(saveProjectIdToAppConfigAsync).toHaveBeenCalledWith('/test-project', '1234');
      });
+
+      describe('checks owner and slug consistency', () => {
+        it('is a no-op if already consistent', async () => {
+          mockTestProject({ configuredOwner: jester.accounts[0].name });
+
+          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+            id: '1234',
+            slug: 'testing-123',
+            fullName: '@jester/testing-123',
+            ownerAccount: jester.accounts[0],
+          });
+
+          await new ProjectInit(['--id', '1234'], commandOptions).run();
+          expect(modifyConfigAsync).not.toHaveBeenCalled();
+        });
+
+        it('prompts to configure if not consistent', async () => {
+          mockTestProject({ configuredOwner: jester.accounts[0].name });
+
+          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+            id: '1234',
+            slug: 'testing-124',
+            fullName: '@jester2/testing-124',
+            ownerAccount: jester2.accounts[0],
+          });
+
+          jest.mocked(confirmAsync).mockResolvedValue(true);
+          jest.mocked(modifyConfigAsync).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' });
+        });
+
+        it('overrides if force flag is present and it is not consistent', async () => {
+          mockTestProject({ configuredOwner: jester.accounts[0].name });
+
+          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+            id: '1234',
+            slug: 'testing-124',
+            fullName: '@jester2/testing-124',
+            ownerAccount: jester2.accounts[0],
+          });
+
+          jest.mocked(modifyConfigAsync).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' });
+        });
+
+        it('throws if non-interactive is present and it is not consistent', async () => {
+          mockTestProject({ configuredOwner: jester.accounts[0].name });
+
+          jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+            id: '1234',
+            slug: 'testing-124',
+            fullName: '@jester2/testing-124',
+            ownerAccount: jester2.accounts[0],
+          });
+
+          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
+
+          await expect(
+            new ProjectInit(['--id', '1234', '--non-interactive'], commandOptions).run()
+          ).rejects.toThrow(
+            'Project config error: Project owner (jester2) does not match the value configured in the "owner" field (jester). Use --force flag to overwrite.'
+          );
+
+          expect(confirmAsync).not.toHaveBeenCalled();
+          expect(modifyConfigAsync).not.toHaveBeenCalled();
+        });
+      });
    });
  });

@@ -1,12 +1,16 @@
 import gql from 'graphql-tag';

 import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { withErrorHandlingAsync } from '../../graphql/client';
 import { AppInfoQuery, AppInfoQueryVariables } from '../../graphql/generated';
 import Log from '../../log';
 import formatFields from '../../utils/formatFields';

-async function projectInfoByIdAsync(appId: string): Promise<AppInfoQuery> {
+async function projectInfoByIdAsync(
+  graphqlClient: ExpoGraphqlClient,
+  appId: string
+): Promise<AppInfoQuery> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .query<AppInfoQuery, AppInfoQueryVariables>(
@@ -34,16 +38,18 @@ export default class ProjectInfo extends EasCommand {

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

  async runAsync(): Promise<void> {
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ProjectInfo, {
      nonInteractive: true,
    });

-    const { app } = await projectInfoByIdAsync(projectId);
+    const { app } = await projectInfoByIdAsync(graphqlClient, projectId);
    if (!app) {
      throw new Error(`Could not find project with id: ${projectId}`);
    }
@@ -1,3 +1,5 @@
+import { getProjectConfigDescription, modifyConfigAsync } from '@expo/config';
+import { ExpoConfig } from '@expo/config-types';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
@@ -5,9 +7,11 @@ import terminalLink from 'terminal-link';

 import { getProjectDashboardUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { saveProjectIdToAppConfigAsync } from '../../commandUtils/context/contextUtils/getProjectIdAsync';
 import { AppPrivacy, Role } from '../../graphql/generated';
 import { AppMutation } from '../../graphql/mutations/AppMutation';
+import { AppQuery } from '../../graphql/queries/AppQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { getExpoConfig } from '../../project/expoConfig';
@@ -53,7 +57,99 @@ export default class ProjectInit extends EasCommand {
    Log.withTick(`Project successfully linked (ID: ${chalk.bold(projectId)}) (modified app.json)`);
  }

-  private static async initializeWithExplicitIDAsync(
+  private static async modifyExpoConfigAsync(
+    projectDir: string,
+    modifications: Partial<ExpoConfig>
+  ): Promise<void> {
+    const result = await modifyConfigAsync(projectDir, modifications);
+    switch (result.type) {
+      case 'success':
+        break;
+      case 'warn': {
+        Log.warn();
+        Log.warn(
+          `Warning: Your project uses dynamic app configuration, and cannot be automatically modified.`
+        );
+        Log.warn(
+          chalk.dim(
+            'https://docs.expo.dev/workflow/configuration/#dynamic-configuration-with-appconfigjs'
+          )
+        );
+        Log.warn();
+        Log.warn(
+          `To complete the setup process, add the following in your ${chalk.bold(
+            getProjectConfigDescription(projectDir)
+          )}:`
+        );
+        Log.warn();
+        Log.warn(chalk.bold(JSON.stringify(modifications, null, 2)));
+        Log.warn();
+        throw new Error(result.message);
+      }
+      case 'fail':
+        throw new Error(result.message);
+      default:
+        throw new Error('Unexpected result type from modifyConfigAsync');
+    }
+  }
+
+  private static async ensureOwnerSlugConsistencyAsync(
+    graphqlClient: ExpoGraphqlClient,
+    projectId: string,
+    projectDir: string,
+    { force, nonInteractive }: InitializeMethodOptions
+  ): Promise<void> {
+    const exp = getExpoConfig(projectDir);
+    const appForProjectId = await AppQuery.byIdAsync(graphqlClient, projectId);
+    const correctOwner = appForProjectId.ownerAccount.name;
+    const correctSlug = appForProjectId.slug;
+
+    if (exp.owner && exp.owner !== correctOwner) {
+      if (force) {
+        await this.modifyExpoConfigAsync(projectDir, { owner: correctOwner });
+      } else {
+        const message = `Project owner (${correctOwner}) does not match the value configured in the "owner" field (${exp.owner}).`;
+        if (nonInteractive) {
+          throw new Error(`Project config error: ${message} Use --force flag to overwrite.`);
+        }
+
+        const confirm = await confirmAsync({
+          message: `${message}. Do you wish to overwrite it?`,
+        });
+        if (!confirm) {
+          throw new Error('Aborting');
+        }
+
+        await this.modifyExpoConfigAsync(projectDir, { owner: correctOwner });
+      }
+    } else if (!exp.owner) {
+      await this.modifyExpoConfigAsync(projectDir, { owner: correctOwner });
+    }
+
+    if (exp.slug && exp.slug !== correctSlug) {
+      if (force) {
+        await this.modifyExpoConfigAsync(projectDir, { slug: correctSlug });
+      } else {
+        const message = `Project slug (${correctSlug}) does not match the value configured in the "slug" field (${exp.slug}).`;
+        if (nonInteractive) {
+          throw new Error(`Project config error: ${message} Use --force flag to overwrite.`);
+        }
+
+        const confirm = await confirmAsync({
+          message: `${message}. Do you wish to overwrite it?`,
+        });
+        if (!confirm) {
+          throw new Error('Aborting');
+        }
+
+        await this.modifyExpoConfigAsync(projectDir, { slug: correctSlug });
+      }
+    } else if (!exp.slug) {
+      await this.modifyExpoConfigAsync(projectDir, { slug: correctSlug });
+    }
+  }
+
+  private static async setExplicitIDAsync(
    projectId: string,
    projectDir: string,
    { force, nonInteractive }: InitializeMethodOptions
@@ -91,15 +187,31 @@ export default class ProjectInit extends EasCommand {
        )}. Do you wish to overwrite it?`,
      });
      if (!confirm) {
-        Log.log('Aborting');
-        return;
+        throw new Error('Aborting');
      }

      await ProjectInit.saveProjectIdAndLogSuccessAsync(projectDir, projectId);
    }
  }

+  private static async initializeWithExplicitIDAsync(
+    graphqlClient: ExpoGraphqlClient,
+    projectId: string,
+    projectDir: string,
+    { force, nonInteractive }: InitializeMethodOptions
+  ): Promise<void> {
+    await this.setExplicitIDAsync(projectId, projectDir, {
+      force,
+      nonInteractive,
+    });
+    await this.ensureOwnerSlugConsistencyAsync(graphqlClient, projectId, projectDir, {
+      force,
+      nonInteractive,
+    });
+  }
+
  private static async initializeWithInteractiveSelectionAsync(
+    graphqlClient: ExpoGraphqlClient,
    actor: Actor,
    projectDir: string
  ): Promise<void> {
@@ -159,6 +271,7 @@ export default class ProjectInit extends EasCommand {
    const projectName = exp.slug;
    const projectFullName = `@${accountName}/${projectName}`;
    const existingProjectIdOnServer = await findProjectIdByAccountNameAndSlugNullableAsync(
+      graphqlClient,
      accountName,
      projectName
    );
@@ -200,7 +313,7 @@ export default class ProjectInit extends EasCommand {
    const spinner = ora(`Creating ${chalk.bold(projectFullName)}`).start();
    let createdProjectId: string;
    try {
-      createdProjectId = await AppMutation.createAppAsync({
+      createdProjectId = await AppMutation.createAppAsync(graphqlClient, {
        accountId: account.id,
        projectName,
        privacy: toAppPrivacy(exp.privacy) ?? AppPrivacy.Public,
@@ -218,12 +331,18 @@ export default class ProjectInit extends EasCommand {
    const {
      flags: { id, force, 'non-interactive': nonInteractive },
    } = await this.parse(ProjectInit);
-    const { actor, projectDir } = await this.getContextAsync(ProjectInit, { nonInteractive });
+    const {
+      loggedIn: { actor, graphqlClient },
+      projectDir,
+    } = await this.getContextAsync(ProjectInit, { nonInteractive });

    if (id) {
-      await ProjectInit.initializeWithExplicitIDAsync(id, projectDir, { force, nonInteractive });
+      await ProjectInit.initializeWithExplicitIDAsync(graphqlClient, id, projectDir, {
+        force,
+        nonInteractive,
+      });
    } else {
-      await ProjectInit.initializeWithInteractiveSelectionAsync(actor, projectDir);
+      await ProjectInit.initializeWithInteractiveSelectionAsync(graphqlClient, actor, projectDir);
    }
  }
 }
@@ -51,6 +51,7 @@ export default class EnvironmentSecretCreate extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -66,12 +67,13 @@ export default class EnvironmentSecretCreate extends EasCommand {
    } = await this.parse(EnvironmentSecretCreate);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentSecretCreate, {
      nonInteractive,
    });

-    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);
-    const ownerAccount = await getOwnerAccountForProjectIdAsync(projectId);
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+    const ownerAccount = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);

    if (!scope) {
      const validationMessage = 'Secret scope may not be empty.';
@@ -151,7 +153,7 @@ export default class EnvironmentSecretCreate extends EasCommand {
        // eslint-disable-next-line async-protect/async-suffix
        validate: async secretValue => {
          if (!secretValue) {
-            return 'Secret value may not be empty.';
+            return validationMessage;
          }
          if (secretType === SecretType.FILE) {
            const secretFilePath = path.resolve(secretValue);
@@ -178,12 +180,13 @@ export default class EnvironmentSecretCreate extends EasCommand {
    if (scope === EnvironmentSecretScope.PROJECT) {
      if (force) {
        const { appSecrets: existingSecrets } = await EnvironmentSecretsQuery.byAppIdAsync(
+          graphqlClient,
          projectId
        );
        const existingSecret = existingSecrets.find(secret => secret.name === name);

        if (existingSecret) {
-          await EnvironmentSecretMutation.deleteAsync(existingSecret.id);
+          await EnvironmentSecretMutation.deleteAsync(graphqlClient, existingSecret.id);
          Log.withTick(
            `Deleting existing secret ${chalk.bold(name)} on project ${chalk.bold(
              projectDisplayName
@@ -193,6 +196,7 @@ export default class EnvironmentSecretCreate extends EasCommand {
      }

      const secret = await EnvironmentSecretMutation.createForAppAsync(
+        graphqlClient,
        { name, value: secretValue, type: SecretTypeToEnvironmentSecretType[secretType] },
        projectId
      );
@@ -204,13 +208,13 @@ export default class EnvironmentSecretCreate extends EasCommand {

      if (secretType === SecretType.STRING) {
        Log.withTick(
-          `️Created a new secret ${chalk.bold(name)} with value ${chalk.bold(
+          `Created a new secret ${chalk.bold(name)} with value ${chalk.bold(
            secretValue
          )} on project ${chalk.bold(projectDisplayName)}.`
        );
      } else {
        Log.withTick(
-          `️Created a new secret ${chalk.bold(name)} from file ${chalk.bold(
+          `Created a new secret ${chalk.bold(name)} from file ${chalk.bold(
            secretFilePath
          )} on project ${chalk.bold(projectDisplayName)}.`
        );
@@ -218,12 +222,13 @@ export default class EnvironmentSecretCreate extends EasCommand {
    } else if (scope === EnvironmentSecretScope.ACCOUNT) {
      if (force) {
        const { accountSecrets: existingSecrets } = await EnvironmentSecretsQuery.byAppIdAsync(
+          graphqlClient,
          projectId
        );
        const existingSecret = existingSecrets.find(secret => secret.name === name);

        if (existingSecret) {
-          await EnvironmentSecretMutation.deleteAsync(existingSecret.id);
+          await EnvironmentSecretMutation.deleteAsync(graphqlClient, existingSecret.id);

          Log.withTick(
            `Deleting existing secret ${chalk.bold(name)} on account ${chalk.bold(
@@ -234,6 +239,7 @@ export default class EnvironmentSecretCreate extends EasCommand {
      }

      const secret = await EnvironmentSecretMutation.createForAccountAsync(
+        graphqlClient,
        { name, value: secretValue, type: SecretTypeToEnvironmentSecretType[secretType] },
        ownerAccount.id
      );
@@ -246,13 +252,13 @@ export default class EnvironmentSecretCreate extends EasCommand {

      if (secretType === SecretType.STRING) {
        Log.withTick(
-          `️Created a new secret ${chalk.bold(name)} with value ${chalk.bold(
+          `Created a new secret ${chalk.bold(name)} with value ${chalk.bold(
            secretValue
          )} on account ${chalk.bold(ownerAccount.name)}.`
        );
      } else {
        Log.withTick(
-          `️Created a new secret ${chalk.bold(name)} from file ${chalk.bold(
+          `Created a new secret ${chalk.bold(name)} from file ${chalk.bold(
            secretFilePath
          )} on account ${chalk.bold(ownerAccount.name)}.`
        );
@@ -23,6 +23,7 @@ export default class EnvironmentSecretDelete extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -31,6 +32,7 @@ export default class EnvironmentSecretDelete extends EasCommand {
    } = await this.parse(EnvironmentSecretDelete);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentSecretDelete, {
      nonInteractive,
    });
@@ -42,7 +44,7 @@ export default class EnvironmentSecretDelete extends EasCommand {
        throw new Error(validationMessage);
      }

-      const secrets = await EnvironmentSecretsQuery.allAsync(projectId);
+      const secrets = await EnvironmentSecretsQuery.allAsync(graphqlClient, projectId);
      ({ secret } = await promptAsync({
        type: 'autocomplete',
        name: 'secret',
@@ -83,7 +85,7 @@ export default class EnvironmentSecretDelete extends EasCommand {
      }
    }

-    await EnvironmentSecretMutation.deleteAsync(id);
+    await EnvironmentSecretMutation.deleteAsync(graphqlClient, id);

    Log.withTick(`️Deleted secret${secret?.name ? ` "${secret?.name}"` : ''} with id "${id}".`);
  }
@@ -12,16 +12,18 @@ export default class EnvironmentSecretList extends EasCommand {

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

  async runAsync(): Promise<void> {
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentSecretList, {
      nonInteractive: true,
    });

-    const secrets = await EnvironmentSecretsQuery.allAsync(projectId);
+    const secrets = await EnvironmentSecretsQuery.allAsync(graphqlClient, projectId);

    const table = new Table({
      head: ['Name', 'Type', 'Scope', 'ID', 'Updated at'],
@@ -0,0 +1,241 @@
+import { Errors, Flags } from '@oclif/core';
+import chalk from 'chalk';
+import dotenv from 'dotenv';
+import fs from 'fs-extra';
+import path from 'path';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import { EnvironmentSecretFragment, EnvironmentSecretType } from '../../graphql/generated';
+import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
+import {
+  EnvironmentSecretScope,
+  EnvironmentSecretsQuery,
+} from '../../graphql/queries/EnvironmentSecretsQuery';
+import Log from '../../log';
+import { ora } from '../../ora';
+import {
+  getDisplayNameForProjectIdAsync,
+  getOwnerAccountForProjectIdAsync,
+} from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import intersection from '../../utils/expodash/intersection';
+
+export default class EnvironmentSecretPush extends EasCommand {
+  static override description = 'read environment secrets from env file and store on the server';
+
+  static override flags = {
+    scope: Flags.enum({
+      description: 'Scope for the secrets',
+      options: [EnvironmentSecretScope.ACCOUNT, EnvironmentSecretScope.PROJECT],
+      default: EnvironmentSecretScope.PROJECT,
+    }),
+    'env-file': Flags.string({
+      description: 'Env file with secrets',
+    }),
+    force: Flags.boolean({
+      description: 'Delete and recreate existing secrets',
+      default: false,
+    }),
+    ...EASNonInteractiveFlag,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  async runAsync(): Promise<void> {
+    const {
+      flags: { scope, force, 'env-file': maybeEnvFilePath, 'non-interactive': nonInteractive },
+    } = await this.parse(EnvironmentSecretPush);
+    const {
+      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(EnvironmentSecretPush, {
+      nonInteractive,
+    });
+
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+    const ownerAccount = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
+
+    const envFilePath = await resolveEnvFilePathAsync(maybeEnvFilePath, nonInteractive);
+    if (!(await fs.pathExists(envFilePath))) {
+      throw new Error(`File "${envFilePath}" does not exist`);
+    }
+
+    const newSecrets: Record<string, string> = dotenv.parse(await fs.readFile(envFilePath));
+
+    await ensureSecretsDontExistOnServerAsync(
+      graphqlClient,
+      { projectId, scope, force },
+      newSecrets
+    );
+
+    await createSecretsAsync(
+      graphqlClient,
+      {
+        scope,
+        accountId: ownerAccount.id,
+        accountName: ownerAccount.name,
+        projectId,
+        projectDisplayName,
+      },
+      newSecrets
+    );
+
+    Log.withTick(
+      `Created the following secrets on ${scope} ${chalk.bold(
+        scope === EnvironmentSecretScope.ACCOUNT ? ownerAccount.name : projectDisplayName
+      )}:`
+    );
+    for (const secretName of Object.keys(newSecrets)) {
+      Log.log(`- ${secretName}`);
+    }
+  }
+}
+
+async function resolveEnvFilePathAsync(
+  maybeEnvFilePath: string | undefined,
+  nonInteractive: boolean
+): Promise<string> {
+  if (maybeEnvFilePath) {
+    return maybeEnvFilePath;
+  }
+
+  const validationMessage = 'Env file must be passed.';
+  if (nonInteractive) {
+    throw new Error(validationMessage);
+  }
+
+  const { envFilePath } = await promptAsync({
+    type: 'text',
+    name: 'envFilePath',
+    message: 'Path to the env file with secrets:',
+    // eslint-disable-next-line async-protect/async-suffix
+    validate: async secretValueRaw => {
+      if (!secretValueRaw) {
+        return validationMessage;
+      }
+      const envFilePath = path.resolve(secretValueRaw);
+      if (!(await fs.pathExists(envFilePath))) {
+        return `File "${envFilePath}" does not exist.`;
+      }
+      return true;
+    },
+  });
+  return envFilePath;
+}
+
+async function ensureSecretsDontExistOnServerAsync(
+  graphqlClient: ExpoGraphqlClient,
+  { projectId, scope, force }: { projectId: string; scope: EnvironmentSecretScope; force: boolean },
+  secrets: Record<string, string>
+): Promise<void> {
+  const serverSecrets = await readAllSecretsFromServerAsync(graphqlClient, projectId, scope);
+  const commonSecretNames = findCommonSecretNames(serverSecrets, secrets);
+
+  if (commonSecretNames.length > 0) {
+    if (!force) {
+      Log.log(`This ${scope} already has environment secrets with the following names:`);
+      for (const name of commonSecretNames) {
+        Log.log(`- ${name}`);
+      }
+      Log.error('Run with --force flag to proceed');
+      Errors.exit(1);
+    } else {
+      const spinner = ora('Deleting secrets already present on server...').start();
+      const commonSecretNameSet = new Set(commonSecretNames);
+      const commonServerSecrets = serverSecrets.filter(({ name }) => commonSecretNameSet.has(name));
+      await deleteSecretsAsync(graphqlClient, commonServerSecrets);
+      spinner.succeed();
+    }
+  }
+}
+
+async function readAllSecretsFromServerAsync(
+  graphqlClient: ExpoGraphqlClient,
+  projectId: string,
+  scope: EnvironmentSecretScope
+): Promise<EnvironmentSecretFragment[]> {
+  const { appSecrets, accountSecrets } = await EnvironmentSecretsQuery.byAppIdAsync(
+    graphqlClient,
+    projectId
+  );
+
+  return scope === EnvironmentSecretScope.ACCOUNT ? accountSecrets : appSecrets;
+}
+
+function findCommonSecretNames(
+  serverSecrets: EnvironmentSecretFragment[],
+  newSecrets: Record<string, string>
+): string[] {
+  const serverSecretKeys = serverSecrets.map(({ name }) => name);
+  const newSecretKeys = Object.keys(newSecrets);
+  const commonKeys = intersection(serverSecretKeys, newSecretKeys);
+  return commonKeys;
+}
+
+async function deleteSecretsAsync(
+  graphqlClient: ExpoGraphqlClient,
+  secrets: EnvironmentSecretFragment[]
+): Promise<void> {
+  const promises = secrets.map(secret =>
+    EnvironmentSecretMutation.deleteAsync(graphqlClient, secret.id)
+  );
+  await Promise.all(promises);
+}
+
+async function createSecretsAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    scope,
+    accountId,
+    accountName,
+    projectId,
+    projectDisplayName,
+  }: {
+    scope: EnvironmentSecretScope;
+    accountId: string;
+    accountName: string;
+    projectId: string;
+    projectDisplayName: string;
+  },
+  secrets: Record<string, string>
+): Promise<void> {
+  const promises = [];
+
+  const spinner = ora(
+    `Creating secrets on ${scope} ${chalk.bold(
+      scope === EnvironmentSecretScope.ACCOUNT ? accountName : projectDisplayName
+    )}...`
+  ).start();
+  for (const [secretName, secretValue] of Object.entries(secrets)) {
+    if (scope === EnvironmentSecretScope.ACCOUNT) {
+      promises.push(
+        EnvironmentSecretMutation.createForAccountAsync(
+          graphqlClient,
+          { name: secretName, value: secretValue, type: EnvironmentSecretType.String },
+          accountId
+        )
+      );
+    } else {
+      promises.push(
+        EnvironmentSecretMutation.createForAppAsync(
+          graphqlClient,
+          { name: secretName, value: secretValue, type: EnvironmentSecretType.String },
+          projectId
+        )
+      );
+    }
+  }
+
+  try {
+    await Promise.all(promises);
+    spinner.succeed();
+  } catch (err) {
+    spinner.fail();
+    throw err;
+  }
+}
@@ -93,20 +93,22 @@ export default class Submit extends EasCommand {
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.Analytics,
  };

  async runAsync(): Promise<void> {
    const { flags: rawFlags } = await this.parse(Submit);
    const {
-      actor,
+      loggedIn: { actor, graphqlClient },
      projectConfig: { exp, projectId, projectDir },
+      analytics,
    } = await this.getContextAsync(Submit, {
      nonInteractive: false,
    });

    const flags = this.sanitizeFlags(rawFlags);

-    await maybeWarnAboutEasOutagesAsync([StatuspageServiceName.EasSubmit]);
+    await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasSubmit]);

    const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);

@@ -128,6 +130,8 @@ export default class Submit extends EasCommand {
        archiveFlags: flagsWithPlatform.archiveFlags,
        nonInteractive: flagsWithPlatform.nonInteractive,
        actor,
+        graphqlClient,
+        analytics,
        exp,
        projectId,
      });
@@ -150,7 +154,7 @@ export default class Submit extends EasCommand {
    printSubmissionDetailsUrls(submissions);

    if (flagsWithPlatform.wait) {
-      const completedSubmissions = await waitToCompleteAsync(submissions, {
+      const completedSubmissions = await waitToCompleteAsync(graphqlClient, submissions, {
        verbose: flagsWithPlatform.verbose,
      });
      exitWithNonZeroCodeIfSomeSubmissionsDidntFinish(completedSubmissions);
@@ -34,6 +34,7 @@ export default class UpdateConfigure extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -43,6 +44,7 @@ export default class UpdateConfigure extends EasCommand {
    const { flags } = await this.parse(UpdateConfigure);
    const {
      projectConfig: { projectId, exp, projectDir },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(UpdateConfigure, {
      nonInteractive: true,
    });
@@ -74,14 +76,14 @@ export default class UpdateConfigure extends EasCommand {
      [RequestedPlatform.Android, RequestedPlatform.All].includes(platform) &&
      androidWorkflow === Workflow.GENERIC
    ) {
-      await syncAndroidUpdatesConfigurationAsync(projectDir, updatedExp, projectId);
+      await syncAndroidUpdatesConfigurationAsync(graphqlClient, projectDir, updatedExp, projectId);
      Log.withTick(`Configured ${chalk.bold('AndroidManifest.xml')} for EAS Update`);
    }
    if (
      [RequestedPlatform.Ios, RequestedPlatform.All].includes(platform) &&
      iosWorkflow === Workflow.GENERIC
    ) {
-      await syncIosUpdatesConfigurationAsync(projectDir, updatedExp, projectId);
+      await syncIosUpdatesConfigurationAsync(graphqlClient, projectDir, updatedExp, projectId);
      Log.withTick(`Configured ${chalk.bold('Expo.plist')} for EAS Update`);
    }

@@ -2,8 +2,9 @@ import chalk from 'chalk';
 import gql from 'graphql-tag';

 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { withErrorHandlingAsync } from '../../graphql/client';
 import {
  DeleteUpdateGroupMutation,
  UpdateMutationDeleteUpdateGroupArgs,
@@ -12,11 +13,14 @@ import Log from '../../log';
 import { confirmAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

-async function deleteUpdateGroupAsync({
-  group,
-}: {
-  group: string;
-}): Promise<DeleteUpdateGroupMutation> {
+async function deleteUpdateGroupAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    group,
+  }: {
+    group: string;
+  }
+): Promise<DeleteUpdateGroupMutation> {
  return await withErrorHandlingAsync(
    graphqlClient
      .mutation<DeleteUpdateGroupMutation, UpdateMutationDeleteUpdateGroupArgs>(
@@ -50,12 +54,20 @@ export default class UpdateDelete extends EasCommand {
    ...EasNonInteractiveAndJsonFlags,
  };

+  static override contextDefinition = {
+    ...this.ContextOptions.LoggedIn,
+  };
+
  async runAsync(): Promise<void> {
    const {
      args: { groupId: group },
      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(UpdateDelete);

+    const {
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(UpdateDelete, { nonInteractive });
+
    if (jsonFlag) {
      enableJsonOutput();
    }
@@ -78,7 +90,7 @@ export default class UpdateDelete extends EasCommand {
      }
    }

-    await deleteUpdateGroupAsync({ group });
+    await deleteUpdateGroupAsync(graphqlClient, { group });

    if (jsonFlag) {
      printJsonOnlyOutput({ group });
@@ -11,6 +11,7 @@ import { selectBranchOnAppAsync } from '../../branch/queries';
 import { BranchNotFoundError, getDefaultBranchNameAsync } from '../../branch/utils';
 import { getUpdateGroupUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import fetch from '../../fetch';
@@ -60,17 +61,20 @@ import { createUpdateChannelOnAppAsync } from '../channel/create';
 export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
 export type PublishPlatformFlag = PublishPlatform | 'all';

-async function ensureChannelExistsAsync({
-  appId,
-  branchId,
-  channelName,
-}: {
-  appId: string;
-  branchId: string;
-  channelName: string;
-}): Promise<void> {
+async function ensureChannelExistsAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    appId,
+    branchId,
+    channelName,
+  }: {
+    appId: string;
+    branchId: string;
+    channelName: string;
+  }
+): Promise<void> {
  try {
-    await createUpdateChannelOnAppAsync({
+    await createUpdateChannelOnAppAsync(graphqlClient, {
      appId,
      channelName,
      branchId,
@@ -88,26 +92,29 @@ async function ensureChannelExistsAsync({
  }
 }

-export async function ensureBranchExistsAsync({
-  appId,
-  name: branchName,
-}: ViewBranchQueryVariables): Promise<{
+export async function ensureBranchExistsAsync(
+  graphqlClient: ExpoGraphqlClient,
+  { appId, name: branchName }: ViewBranchQueryVariables
+): Promise<{
  branchId: string;
 }> {
  try {
-    const updateBranch = await BranchQuery.getBranchByNameAsync({
+    const updateBranch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
      appId,
      name: branchName,
    });

    const { id } = updateBranch;
-    await ensureChannelExistsAsync({ appId, branchId: id, channelName: branchName });
+    await ensureChannelExistsAsync(graphqlClient, { appId, branchId: id, channelName: branchName });
    return { branchId: id };
  } catch (error) {
    if (error instanceof BranchNotFoundError) {
-      const newUpdateBranch = await createUpdateBranchOnAppAsync({ appId, name: branchName });
+      const newUpdateBranch = await createUpdateBranchOnAppAsync(graphqlClient, {
+        appId,
+        name: branchName,
+      });
      Log.withTick(`Created branch: ${chalk.bold(branchName)}`);
-      await ensureChannelExistsAsync({
+      await ensureChannelExistsAsync(graphqlClient, {
        appId,
        branchId: newUpdateBranch.id,
        channelName: branchName,
@@ -168,6 +175,7 @@ export default class UpdatePublish extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -186,7 +194,10 @@ export default class UpdatePublish extends EasCommand {
      'non-interactive': nonInteractive,
      json: jsonFlag,
    } = flags;
-    const { getDynamicProjectConfigAsync } = await this.getContextAsync(UpdatePublish, {
+    const {
+      getDynamicProjectConfigAsync,
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(UpdatePublish, {
      nonInteractive,
    });

@@ -206,7 +217,7 @@ export default class UpdatePublish extends EasCommand {
      isPublicConfig: false,
    });

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

    const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);

@@ -222,15 +233,13 @@ export default class UpdatePublish extends EasCommand {

    if (!hasExpoUpdates) {
      const install = await confirmAsync({
-        message: `You are creating an update which requires ${chalk.bold(
-          'expo-updates'
-        )} to be installed in your app.\n  Do you want EAS CLI to install it for you?`,
+        message: chalk`The module {cyan expo-updates} must be installed to load EAS updates in-app. Install?`,
        instructions: 'The command will abort unless you agree.',
      });
      if (install) {
        await installExpoUpdatesAsync(projectDir);
      } else {
-        Errors.error(`Install ${chalk.bold('expo-updates')} manually and come back later.`, {
+        Errors.error(`Install ${chalk.bold('expo-updates')} and try again.`, {
          exit: 1,
        });
      }
@@ -246,7 +255,7 @@ export default class UpdatePublish extends EasCommand {
        throw new Error('Must supply --branch or use --auto when in non-interactive mode');
      } else {
        try {
-          const branch = await selectBranchOnAppAsync({
+          const branch = await selectBranchOnAppAsync(graphqlClient, {
            projectId,
            promptTitle: `Which branch would you like to ${
              republish ? 'republish' : 'publish'
@@ -286,14 +295,16 @@ export default class UpdatePublish extends EasCommand {
        'group' | 'message' | 'runtimeVersion' | 'manifestFragment' | 'platform'
      >[];
      if (group) {
-        const updatesByGroup = await UpdateQuery.viewUpdateGroupAsync({ groupId: group });
+        const updatesByGroup = await UpdateQuery.viewUpdateGroupAsync(graphqlClient, {
+          groupId: group,
+        });
        updatesToRepublish = updatesByGroup;
      } else {
        if (nonInteractive) {
          throw new Error('Must supply --group when in non-interactive mode');
        }

-        updatesToRepublish = await selectUpdateGroupOnBranchAsync({
+        updatesToRepublish = await selectUpdateGroupOnBranchAsync(graphqlClient, {
          projectId,
          branchName,
          paginatedQueryOptions,
@@ -393,6 +404,7 @@ export default class UpdatePublish extends EasCommand {
        const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
        const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
        const uploadResults = await uploadAssetsAsync(
+          graphqlClient,
          assets,
          projectId,
          (totalAssets, missingAssets) => {
@@ -423,7 +435,7 @@ export default class UpdatePublish extends EasCommand {
        .map(pair => pair[0]);
    }

-    const { branchId } = await ensureBranchExistsAsync({
+    const { branchId } = await ensureBranchExistsAsync(graphqlClient, {
      appId: projectId,
      name: branchName,
    });
@@ -455,7 +467,7 @@ export default class UpdatePublish extends EasCommand {
    let newUpdates: UpdatePublishMutation['updateBranch']['publishUpdateGroups'];
    const publishSpinner = ora('Publishing...').start();
    try {
-      newUpdates = await PublishMutation.publishUpdateGroupAsync(updateGroups);
+      newUpdates = await PublishMutation.publishUpdateGroupAsync(graphqlClient, updateGroups);

      if (codeSigningInfo) {
        Log.log('🔒 Signing updates');
@@ -488,7 +500,7 @@ export default class UpdatePublish extends EasCommand {

                const manifestSignature = signManifestBody(manifestBody, codeSigningInfo);

-                await PublishMutation.setCodeSigningInfoAsync(newUpdate.id, {
+                await PublishMutation.setCodeSigningInfoAsync(graphqlClient, newUpdate.id, {
                  alg: codeSigningInfo.codeSigningMetadata.alg,
                  keyid: codeSigningInfo.codeSigningMetadata.keyid,
                  sig: manifestSignature,
@@ -531,7 +543,7 @@ export default class UpdatePublish extends EasCommand {
        const updateGroupId = newUpdatesForRuntimeVersion[0].group;

        const projectName = exp.slug;
-        const accountName = (await getOwnerAccountForProjectIdAsync(projectId)).name;
+        const accountName = (await getOwnerAccountForProjectIdAsync(graphqlClient, projectId)).name;
        const updateGroupUrl = getUpdateGroupUrl(accountName, projectName, updateGroupId);
        const updateGroupLink = link(updateGroupUrl, { dim: false });

@@ -34,6 +34,7 @@ export default class UpdateList extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -41,6 +42,7 @@ export default class UpdateList extends EasCommand {
    const { branch: branchFlag, all, json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(UpdateList, {
      nonInteractive,
    });
@@ -51,10 +53,10 @@ export default class UpdateList extends EasCommand {
    }

    if (all) {
-      listAndRenderUpdateGroupsOnAppAsync({ projectId, paginatedQueryOptions });
+      listAndRenderUpdateGroupsOnAppAsync(graphqlClient, { projectId, paginatedQueryOptions });
    } else {
      if (branchFlag) {
-        listAndRenderUpdateGroupsOnBranchAsync({
+        listAndRenderUpdateGroupsOnBranchAsync(graphqlClient, {
          projectId,
          branchName: branchFlag,
          paginatedQueryOptions,
@@ -65,7 +67,7 @@ export default class UpdateList extends EasCommand {
          throw new Error(validationMessage);
        }

-        const selectedBranch = await selectBranchOnAppAsync({
+        const selectedBranch = await selectBranchOnAppAsync(graphqlClient, {
          projectId,
          promptTitle: 'Which branch would you like to view?',
          displayTextForListItem: updateBranch => updateBranch.name,
@@ -77,7 +79,7 @@ export default class UpdateList extends EasCommand {
              offset: 0,
            },
        });
-        listAndRenderUpdateGroupsOnBranchAsync({
+        listAndRenderUpdateGroupsOnBranchAsync(graphqlClient, {
          projectId,
          branchName: selectedBranch.name,
          paginatedQueryOptions,
@@ -1,12 +1,10 @@
 import chalk from 'chalk';
-import Table from 'cli-table3';

 import EasCommand from '../../commandUtils/EasCommand';
 import { EasJsonOnlyFlag } from '../../commandUtils/flags';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
-import { UPDATE_COLUMNS, getUpdateGroupDescriptions } from '../../update/utils';
-import formatFields from '../../utils/formatFields';
+import { formatUpdateGroup, getUpdateGroupDescriptions } from '../../update/utils';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export default class UpdateView extends EasCommand {
@@ -24,35 +22,33 @@ export default class UpdateView extends EasCommand {
    ...EasJsonOnlyFlag,
  };

+  static override contextDefinition = {
+    ...this.ContextOptions.LoggedIn,
+  };
+
  async runAsync(): Promise<void> {
    const {
      args: { groupId },
      flags: { json: jsonFlag },
    } = await this.parse(UpdateView);
+
+    const {
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(UpdateView, { nonInteractive: true });
+
    if (jsonFlag) {
      enableJsonOutput();
    }

-    const updatesByGroup = await UpdateQuery.viewUpdateGroupAsync({ groupId });
+    const updatesByGroup = await UpdateQuery.viewUpdateGroupAsync(graphqlClient, { groupId });
    const [updateGroupDescription] = getUpdateGroupDescriptions([updatesByGroup]);

    if (jsonFlag) {
      printJsonOnlyOutput(updateGroupDescription);
    } else {
-      const groupTable = new Table({
-        head: [...UPDATE_COLUMNS],
-        wordWrap: true,
-      });
-
      Log.log(chalk.bold('Update group:'));
-      Log.log(formatFields([{ label: 'ID', value: updateGroupDescription.group }]));
-      groupTable.push([
-        updateGroupDescription.message,
-        updateGroupDescription.runtimeVersion,
-        updateGroupDescription.group,
-        updateGroupDescription.platforms,
-      ]);
-      Log.log(groupTable.toString());
+
+      Log.log(formatUpdateGroup(updateGroupDescription));
    }
  }
 }
@@ -27,12 +27,14 @@ export default class WebhookCreate extends EasCommand {

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

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

    const spinner = ora('Creating a webhook').start();
    try {
-      await WebhookMutation.createWebhookAsync(projectId, webhookInputParams);
+      await WebhookMutation.createWebhookAsync(graphqlClient, projectId, webhookInputParams);
      spinner.succeed('Successfully created a webhook');
    } catch (err) {
      spinner.fail('Failed to create a webhook');
@@ -3,6 +3,7 @@ import chalk from 'chalk';
 import nullthrows from 'nullthrows';

 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
 import { WebhookFragment } from '../../graphql/generated';
 import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
@@ -29,6 +30,7 @@ export default class WebhookDelete extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -38,14 +40,15 @@ export default class WebhookDelete extends EasCommand {
    } = await this.parse(WebhookDelete);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(WebhookDelete, {
      nonInteractive,
    });

    let webhook: WebhookFragment | undefined =
-      webhookId && (await WebhookQuery.byIdAsync(webhookId));
+      webhookId && (await WebhookQuery.byIdAsync(graphqlClient, webhookId));
    if (!webhookId) {
-      const webhooks = await fetchWebhooksByAppIdAsync(projectId);
+      const webhooks = await fetchWebhooksByAppIdAsync(graphqlClient, projectId);
      if (webhooks.length === 0) {
        process.exit(1);
      }
@@ -86,7 +89,7 @@ export default class WebhookDelete extends EasCommand {

    const spinner = ora('Deleting the webhook').start();
    try {
-      await WebhookMutation.deleteWebhookAsync(webhookId);
+      await WebhookMutation.deleteWebhookAsync(graphqlClient, webhookId);
      spinner.succeed('Successfully deleted the webhook');
    } catch (err) {
      spinner.fail('Failed to delete the webhook');
@@ -95,10 +98,13 @@ export default class WebhookDelete extends EasCommand {
  }
 }

-async function fetchWebhooksByAppIdAsync(appId: string): Promise<WebhookFragment[]> {
+async function fetchWebhooksByAppIdAsync(
+  graphqlClient: ExpoGraphqlClient,
+  appId: string
+): Promise<WebhookFragment[]> {
  const spinner = ora('Fetching webhooks').start();
  try {
-    const webhooks = await WebhookQuery.byAppIdAsync(appId);
+    const webhooks = await WebhookQuery.byAppIdAsync(graphqlClient, appId);
    if (webhooks.length === 0) {
      spinner.fail('There are no webhooks on the project');
      return [];
@@ -21,6 +21,7 @@ export default class WebhookList extends EasCommand {

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

  async runAsync(): Promise<void> {
@@ -29,15 +30,20 @@ export default class WebhookList extends EasCommand {
    } = await this.parse(WebhookList);
    const {
      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
    } = await this.getContextAsync(WebhookList, {
      nonInteractive: true,
    });

-    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

    const spinner = ora(`Fetching the list of webhook on project ${projectDisplayName}`).start();
    try {
-      const webhooks = await WebhookQuery.byAppIdAsync(projectId, event && { event });
+      const webhooks = await WebhookQuery.byAppIdAsync(
+        graphqlClient,
+        projectId,
+        event && { event }
+      );
      if (webhooks.length === 0) {
        spinner.fail(`There are no webhooks on project ${projectDisplayName}`);
      } else {
@@ -31,12 +31,19 @@ export default class WebhookUpdate extends EasCommand {
    ...EASNonInteractiveFlag,
  };

+  static override contextDefinition = {
+    ...this.ContextOptions.LoggedIn,
+  };
+
  async runAsync(): Promise<void> {
    const { flags } = await this.parse(WebhookUpdate);
+    const {
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(WebhookUpdate, { nonInteractive: flags['non-interactive'] });

    const webhookId = flags.id;

-    const webhook = await WebhookQuery.byIdAsync(webhookId);
+    const webhook = await WebhookQuery.byIdAsync(graphqlClient, webhookId);
    const webhookInputParams = await prepareInputParamsAsync(
      pick(flags, ['event', 'url', 'secret', 'non-interactive']),
      webhook
@@ -44,7 +51,7 @@ export default class WebhookUpdate extends EasCommand {

    const spinner = ora('Updating a webhook').start();
    try {
-      await WebhookMutation.updateWebhookAsync(webhookId, webhookInputParams);
+      await WebhookMutation.updateWebhookAsync(graphqlClient, webhookId, webhookInputParams);
      spinner.succeed('Successfully updated a webhook');
    } catch (err) {
      spinner.fail('Failed to update a webhook');
@@ -15,14 +15,21 @@ export default class WebhookView extends EasCommand {
    },
  ];

+  static override contextDefinition = {
+    ...this.ContextOptions.LoggedIn,
+  };
+
  async runAsync(): Promise<void> {
    const {
      args: { ID: webhookId },
    } = await this.parse(WebhookView);
+    const {
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(WebhookView, { nonInteractive: true });

    const spinner = ora(`Fetching the webhook details for ID ${webhookId}`).start();
    try {
-      const webhook = await WebhookQuery.byIdAsync(webhookId);
+      const webhook = await WebhookQuery.byIdAsync(graphqlClient, webhookId);
      spinner.succeed(`Found the webhook details`);
      Log.log(`\n${formatWebhook(webhook)}`);
    } catch (err) {
@@ -14,8 +14,12 @@ export class AssignFcm {
    fcm: AndroidFcmFragment
  ): Promise<CommonAndroidAppCredentialsFragment> {
    const appCredentials =
-      await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(this.app);
+      await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(
+        ctx.graphqlClient,
+        this.app
+      );
    const updatedAppCredentials = await ctx.android.updateAndroidAppCredentialsAsync(
+      ctx.graphqlClient,
      appCredentials,
      {
        androidFcmId: fcm.id,
@@ -14,8 +14,12 @@ export class AssignGoogleServiceAccountKey {
    googleServiceAccountKey: GoogleServiceAccountKeyFragment
  ): Promise<CommonAndroidAppCredentialsFragment> {
    const appCredentials =
-      await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(this.app);
+      await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(
+        ctx.graphqlClient,
+        this.app
+      );
    const updatedAppCredentials = await ctx.android.updateAndroidAppCredentialsAsync(
+      ctx.graphqlClient,
      appCredentials,
      {
        googleServiceAccountKeyForSubmissionsId: googleServiceAccountKey.id,
@@ -21,13 +21,16 @@ export async function canCopyLegacyCredentialsAsync(
  ctx: CredentialsContext,
  app: AppLookupParams
 ): Promise<boolean> {
-  const appCredentials = await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(app);
+  const appCredentials = await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(
+    ctx.graphqlClient,
+    app
+  );
  if (appCredentials) {
    return false; // modern credentials already exist
  }

  const legacyAppCredentials =
-    await ctx.android.getLegacyAndroidAppCredentialsWithCommonFieldsAsync(app);
+    await ctx.android.getLegacyAndroidAppCredentialsWithCommonFieldsAsync(ctx.graphqlClient, app);
  return !!legacyAppCredentials; // user has some legacy credentials
 }

@@ -44,30 +47,37 @@ export async function promptUserAndCopyLegacyCredentialsAsync(

  try {
    const legacyAppCredentials =
-      await ctx.android.getLegacyAndroidAppCredentialsWithCommonFieldsAsync(app);
+      await ctx.android.getLegacyAndroidAppCredentialsWithCommonFieldsAsync(ctx.graphqlClient, app);
    if (!legacyAppCredentials) {
      return;
    }

    const appCredentials =
-      await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(app);
+      await ctx.android.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(
+        ctx.graphqlClient,
+        app
+      );
    const legacyFcm = legacyAppCredentials.androidFcm;
    if (legacyFcm) {
      const clonedFcm = await ctx.android.createFcmAsync(
+        ctx.graphqlClient,
        app.account,
        legacyFcm.credential,
        legacyFcm.version
      );
-      await ctx.android.updateAndroidAppCredentialsAsync(appCredentials, {
+      await ctx.android.updateAndroidAppCredentialsAsync(ctx.graphqlClient, appCredentials, {
        androidFcmId: clonedFcm.id,
      });
    }

-    const legacyBuildCredentials = await ctx.android.getLegacyAndroidAppBuildCredentialsAsync(app);
+    const legacyBuildCredentials = await ctx.android.getLegacyAndroidAppBuildCredentialsAsync(
+      ctx.graphqlClient,
+      app
+    );
    const legacyKeystore = legacyBuildCredentials?.androidKeystore ?? null;

    if (legacyKeystore) {
-      const clonedKeystore = await ctx.android.createKeystoreAsync(app.account, {
+      const clonedKeystore = await ctx.android.createKeystoreAsync(ctx.graphqlClient, app.account, {
        keystore: legacyKeystore.keystore,
        keystorePassword: legacyKeystore.keystorePassword,
        keyAlias: legacyKeystore.keyAlias,
@@ -93,7 +103,7 @@ export async function getAppLookupParamsFromContextAsync(
  ctx.ensureProjectContext();
  const projectName = ctx.exp.slug;
  const projectId = ctx.projectId;
-  const account = await getOwnerAccountForProjectIdAsync(projectId);
+  const account = await getOwnerAccountForProjectIdAsync(ctx.graphqlClient, projectId);

  const androidApplicationIdentifier = await getApplicationIdAsync(
    ctx.projectDir,
@@ -125,18 +135,23 @@ export async function createOrUpdateDefaultAndroidAppBuildCredentialsAsync(
    'createOrUpdateDefaultAndroidAppBuildCredentialsAsync must be run in interactive mode'
  );
  const existingDefaultBuildCredentials =
-    await ctx.android.getDefaultAndroidAppBuildCredentialsAsync(appLookupParams);
+    await ctx.android.getDefaultAndroidAppBuildCredentialsAsync(ctx.graphqlClient, appLookupParams);
  if (existingDefaultBuildCredentials) {
    return await ctx.android.updateAndroidAppBuildCredentialsAsync(
+      ctx.graphqlClient,
      existingDefaultBuildCredentials,
      { androidKeystoreId }
    );
  }
-  return await ctx.android.createAndroidAppBuildCredentialsAsync(appLookupParams, {
-    name: generateRandomName(),
-    isDefault: true,
-    androidKeystoreId,
-  });
+  return await ctx.android.createAndroidAppBuildCredentialsAsync(
+    ctx.graphqlClient,
+    appLookupParams,
+    {
+      name: generateRandomName(),
+      isDefault: true,
+      androidKeystoreId,
+    }
+  );
 }

 export async function promptForNameAsync(): Promise<string> {
Author	SHA1	Message	Date
Dominik Sokal	cc99bb3326	v2.5.1	2022-10-24 12:18:07 +02:00
Dominik Sokal	08dc52c631	Revert "feat: use versioned cli for export (#1460 )" This reverts commit `2aade4c0c8`.	2022-10-24 12:17:47 +02:00
Dominik Sokal	51db45a861	revert #1460 (#1472 ) * Revert "feat: use versioned cli for export (#1460)" This reverts commit `2aade4c0c8`. * revert CHANGELOG.md change * update CHANGELOG.md	2022-10-24 12:08:06 +02:00
Dominik Sokal	790853b3b2	Update CHANGELOG.md	2022-10-24 09:52:15 +02:00
Expo CI	23479acabc	update CHANGELOG.md	2022-10-24 07:49:28 +00:00
Dominik Sokal	de965e3693	v2.5.0	2022-10-24 09:41:08 +02:00
Dominik Sokal	5c3afc5141	upgrade eas-cli-local-build-plugin to 0.0.115	2022-10-24 09:40:50 +02:00
Dominik Sokal	50814723c5	[ENG-6183] add secret:push command (#1457 ) * add secret:sync command * address PR feedback * address PR feedback	2022-10-21 09:52:09 +02:00
Will Schurman	c6919e9fd6	[eas-cli] Add changelog entry for #1452 (#1468 )	2022-10-20 10:29:08 -07:00
Evan Bacon	6b220f12ae	chore: remove table logging in update:view (#1463 ) * chore: remove table logging in update:view * update CHANGELOG.md	2022-10-20 09:18:34 -07:00
Evan Bacon	2aade4c0c8	feat: use versioned cli for export (#1460 ) * feat: use versioned cli * update CHANGELOG.md * allow EXPO_USE_LOCAL_CLI to disable local CLI	2022-10-19 13:52:37 -07:00
Evan Bacon	f16c40a496	chore(updates): fix up install prompt language (#1462 ) * chore: fixup install prompt * update CHANGELOG.md	2022-10-19 13:44:39 -07:00
Brent Vatne	aed6725d17	[eas-cli] Handle case where git is installed but not working properly (#1454 )	2022-10-19 10:54:16 -07:00
Will Schurman	ac6c240217	[eas-cli] Update init command to handle slug and owner (#1452 )	2022-10-19 09:34:22 -07:00
Will Schurman	34ae7f5e0b	[eas-cli] Clean up withAnalyticsAsync (#1449 )	2022-10-18 09:25:14 -07:00
Dominik Sokal	40aa1c7d35	[ENG-5269] add changelog linter (#1451 ) * [scripts] add simple CHANGELOG.md linter * fix CHANGELOG.md * run lint-changelog in CI	2022-10-18 12:56:03 +02:00
Will Schurman	b128af464c	[eas-cli] Initialize analytics consistently and move analytics into context (#1444 )	2022-10-17 09:43:45 -07:00
Expo CI	1236152120	update CHANGELOG.md	2022-10-17 09:11:35 +00:00
Dominik Sokal	9201af566d	v2.4.1	2022-10-17 10:57:02 +02:00
Dominik Sokal	cf4eb7a4e4	[ENG-6721][submit] move error messages from CLI (#1443 ) * remove submit errors from CLI * update CHANGELOG.md	2022-10-17 09:45:53 +02:00
Dominik Sokal	3ca02ab740	update CHANGELOG.md	2022-10-14 14:36:43 +02:00
Dominik Sokal	c05ef9ccca	upgrade eas-cli-local-build-plugin to 0.0.114	2022-10-14 14:33:52 +02:00
Expo CI	dccd249cb0	update CHANGELOG.md	2022-10-14 08:03:48 +00:00
Dominik Sokal	9e3840a987	v2.4.0	2022-10-14 09:55:46 +02:00
Dominik Sokal	a32e98a72a	handle new EAS Submit errors (#1440 ) * handle new EAS Submit errors * update CHANGELOG.md	2022-10-14 09:47:02 +02:00
Will Schurman	3496c30a2c	Revert "[eas-cli] Fix command statistic analytics (#1439 )" (#1442 ) This reverts commit `38e4b65a8a`.	2022-10-13 18:11:50 -07:00
Will Schurman	38e4b65a8a	[eas-cli] Fix command statistic analytics (#1439 )	2022-10-13 17:17:36 -07:00
Dominik Sokal	5e5273e6a4	[ENG-6652] automatically choose next version when releasing (#1433 ) * automatically choose next version when releasing * Update CONTRIBUTING.md	2022-10-13 09:23:27 +02:00
Will Schurman	e1be834d62	[eas-cli] Update changelog (#1438 )	2022-10-12 10:16:03 -07:00
Will Schurman	55e5ab465a	[25/n][eas-cli] Move graphql and session into context (#1436 )	2022-10-12 10:12:36 -07:00
Will Schurman	5be66f3963	[24/n][eas-cli] Start to move graphql into a context (#1435 )	2022-10-12 10:11:48 -07:00
Expo CI	024c699637	update CHANGELOG.md	2022-10-10 11:42:55 +00:00
Szymon Dziedzic	52a4e9b78d	v2.3.0	2022-10-10 13:32:41 +02:00
Szymon Dziedzic	b3b0350556	[ENG-6571][eas-cli] use resource class flag to select M1 resource class (#1425 ) * [eas-cli] use env variable to select M1 resource class * [eas-cli] create `m1-experimental` option for `--resource-class` flag * improvements after code review * throw an error instead of using oclif/errors in resolveResourceClass function * update CHANGELOG.md	2022-10-10 11:54:20 +02:00
Expo CI	afd445721c	update CHANGELOG.md	2022-10-05 09:25:36 +00:00