feat(eas-cli): Add support for VisionOS in provisioning profiles and tests

feat(eas-cli): Use a fallback generated name during EAS Submit (#2842 )
[eas-cli] [ENG-14633] Start autoIncremented builds at 1 (#2828 )
2026-11-13 20:28:08 -10:00 · 2025-01-29 13:30:41 -08:00 · 2025-01-28 16:49:35 -08:00 · 2025-01-28 15:56:40 +01:00 · 2025-01-27 13:58:25 +01:00 · 2025-01-22 13:31:34 +00:00
160 changed files with 11740 additions and 2054 deletions
@@ -3,24 +3,18 @@ commentConfiguration:
  epilogue: 'Generated by [CodeMention](https://github.com/expo/expo/actions/workflows/codemention.yaml)'
 rules:
  - patterns: ['**/*']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
-  - patterns: ['packages/eas-cli/src/build/**']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
-  - patterns: ['packages/eas-cli/src/commands/build/**']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
-  - patterns: ['packages/eas-cli/src/submit/**']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
-  - patterns: ['packages/eas-cli/src/commands/submit.ts']
    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela', 'radoslawkrzemien']
  - patterns: ['packages/eas-cli/src/update/**']
-    mentions: ['EvanBacon', 'byCedric', 'wschurman']
+    mentions: ['wschurman', 'quinlanj']
  - patterns: ['packages/eas-cli/src/commands/update/**']
-    mentions: ['EvanBacon', 'byCedric', 'wschurman']
+    mentions: ['wschurman', 'quinlanj']
+  - patterns: ['packages/eas-cli/src/channel/**']
+    mentions: ['wschurman', 'quinlanj']
+  - patterns: ['packages/eas-cli/src/commands/channel/**']
+    mentions: ['wschurman', 'quinlanj']
  - patterns: ['packages/eas-cli/schema/**']
    mentions: ['bycedric']
  - patterns: ['packages/eas-cli/src/metadata/**']
    mentions: ['bycedric']
  - patterns: ['packages/eas-cli/src/commands/metadata/**']
    mentions: ['bycedric']
-  - patterns: ['packages/eas-json/**']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
@@ -8,10 +8,228 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🎉 New features

+- Sanitize and generate names for EAS Submit to prevent failures due to invalid characters or taken names. ([#2842](https://github.com/expo/eas-cli/pull/2842) by [@evanbacon](https://github.com/evanbacon))
+
 ### 🐛 Bug fixes

 ### 🧹 Chores

+- Fix tests for VisionOS type.
+- Make new autoIncremented builds start at nr 1 by default ([#2828](https://github.com/expo/eas-cli/pull/2828) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+## [14.5.0](https://github.com/expo/eas-cli/releases/tag/v14.5.0) - 2025-01-22
+
+### 🎉 New features
+
+- Allow filtering by `--fingerprint_hash` in `eas build:list` command. ([#2818](https://github.com/expo/eas-cli/pull/2818) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🐛 Bug fixes
+
+- Ensure that the AASA file is served with content type application/json ([#2829](https://github.com/expo/eas-cli/pull/2829) by [@kadikraman](https://github.com/kadikraman))
+- Ensure that the AppleID provided in prompt or saved to cache does not contain invalid unprintable characters ([#2830](https://github.com/expo/eas-cli/pull/2830) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+### 🧹 Chores
+
+- Fix logs typos in the `eas deploy` command. ([#2822](https://github.com/expo/eas-cli/pull/2822) by [@kadikraman](https://github.com/kadikraman))
+- Make `deploy` the top level command for hosting. ([#2824](https://github.com/expo/eas-cli/pull/2824) by [@kadikraman](https://github.com/kadikraman))
+- Allow longer submit profile extension chain (up to 5, same as build profile) ([#2831](https://github.com/expo/eas-cli/pull/2831) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+- Make variable naming more explicit, remove deprecated runtimeFingerprintSource uses. ([#2816](https://github.com/expo/eas-cli/pull/2816) by [@wschurman](https://github.com/wschurman))
+
+## [14.4.1](https://github.com/expo/eas-cli/releases/tag/v14.4.1) - 2025-01-15
+
+### 🐛 Bug fixes
+
+- Enable shell execution for env:exec commands. ([#2788](https://github.com/expo/eas-cli/pull/2788) by [@tharakadesilva](https://github.com/tharakadesilva))
+
+### 🧹 Chores
+
+- Make automatic env resolution message shorter. ([#2806](https://github.com/expo/eas-cli/pull/2806) by [@szdziedzic](https://github.com/szdziedzic))
+- Make "No remote versions are configured" message green instead of yellow. ([#2805](https://github.com/expo/eas-cli/pull/2805) by [@szdziedzic](https://github.com/szdziedzic))
+- Upload local fingerprint on `eas fingerprint:compare`. ([#2808](https://github.com/expo/eas-cli/pull/2808) by [@quinlanj](https://github.com/quinlanj))
+- Upgrade `eas-cli-local-build-plugin` to `1.0.163` to support Bun's new text-based lock file in local builds. ([#2817](https://github.com/expo/eas-cli/pull/2817) by [@shiroyasha9](https://github.com/shiroyasha9))
+
+## [14.4.0](https://github.com/expo/eas-cli/releases/tag/v14.4.0) - 2025-01-09
+
+### 🎉 New features
+
+- Load `.env` variables even when `--environment` is specified for `deploy` command. Conflicts will be highlighted by a warning message. ([#2783](https://github.com/expo/eas-cli/pull/2783) by [@kitten](https://github.com/kitten))
+- Silence all non-command output in non-interactive mode of eas env:exec. ([#2800](https://github.com/expo/eas-cli/pull/2800) by [@wschurman](https://github.com/wschurman))
+- Unhide `deploy` and `deploy:alias` commands ([#2807](https://github.com/expo/eas-cli/pull/2807) by [@kitten](https://github.com/kitten))
+
+## [14.3.1](https://github.com/expo/eas-cli/releases/tag/v14.3.1) - 2025-01-08
+
+### 🧹 Chores
+
+- Bump `@expo/[email protected]` to support Bun text-based lock files. ([#2801](https://github.com/expo/eas-cli/pull/2801) by [@kudo](https://github.com/kudo))
+
+## [14.3.0](https://github.com/expo/eas-cli/releases/tag/v14.3.0) - 2025-01-07
+
+### 🎉 New features
+
+- Upload `package.json` when uploading workflow sources. ([#2786](https://github.com/expo/eas-cli/pull/2786) by [@sjchmiela](https://github.com/sjchmiela))
+
+### 🐛 Bug fixes
+
+- Show `eas deploy` upload error messages. ([#2771](https://github.com/expo/eas-cli/pull/2771) by [@kadikraman](https://github.com/kadikraman))
+- Prevent EAS CLI dependencies check from running repeatedly. ([#2781](https://github.com/expo/eas-cli/pull/2781) by [@kitten](https://github.com/kitten))
+- Prevent optimistic request body parsing for `eas deploy`. ([#2784](https://github.com/expo/eas-cli/pull/2784) by [@kadikraman](https://github.com/kadikraman))
+
+### 🧹 Chores
+
+- Update log output for `worker` deploy and alias commands. ([#2780](https://github.com/expo/eas-cli/pull/2780) by [@kitten](https://github.com/kitten))
+- Update various messages wording. ([#2790](https://github.com/expo/eas-cli/pull/2790) by [@simek](https://github.com/simek))
+- Use node18 as tsconfig base. ([#2739](https://github.com/expo/eas-cli/pull/2739) by [@quinlanj](https://github.com/quinlanj))
+
+## [14.2.0](https://github.com/expo/eas-cli/releases/tag/v14.2.0) - 2024-12-13
+
+### 🎉 New features
+
+- Add `eas deploy --dry-run` flag to output tarball. ([#2761](https://github.com/expo/eas-cli/pull/2761) by [@kitten](https://github.com/kitten))
+- Allow specifying credentials for android builds. ([#2775](https://github.com/expo/eas-cli/pull/2775) by [@khamilowicz](https://github.com/khamilowicz))
+
+### 🐛 Bug fixes
+
+- Remove random branch name generation for --auto branch name non-vcs fallback. ([#2747](https://github.com/expo/eas-cli/pull/2747) by [@wschurman](https://github.com/wschurman))
+- Upgrade @expo/multipart-body-parser. ([#2751](https://github.com/expo/eas-cli/pull/2751) by [@wschurman](https://github.com/wschurman))
+- Pass env var flag to worker deployments. ([#2763](https://github.com/expo/eas-cli/pull/2763) by [@kadikraman](https://github.com/kadikraman))
+- Fix request for switching providers when doing Apple auth. ([#2769](https://github.com/expo/eas-cli/pull/2769) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
+- Improve logging and validation in `eas env:exec` command. ([#2762](https://github.com/expo/eas-cli/pull/2762) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [14.1.0](https://github.com/expo/eas-cli/releases/tag/v14.1.0) - 2024-12-10
+
+### 🎉 New features
+
+- Add support for enabeling broadcast Push Notifications capability option, by setting `ios.usesBroadcastPushNotifications` to `true` in app config. ([#2748](https://github.com/expo/eas-cli/pull/2748) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
+- Add link to FYI page mentioning the workaround for Apple SMS 2FA issue. ([#2752](https://github.com/expo/eas-cli/pull/2752) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [14.0.3](https://github.com/expo/eas-cli/releases/tag/v14.0.3) - 2024-12-09
+
+### 🐛 Bug fixes
+
+- Bump `@expo/apple-utils` to fix sending two-factor authentication codes via SMS. ([#2750](https://github.com/expo/eas-cli/pull/2750) by [@EvanBacon](https://github.com/EvanBacon))
+
+### 🧹 Chores
+
+- Change update message to allow faster copy and paste. ([#2661](https://github.com/expo/eas-cli/pull/2661) by [@jonluca](https://github.com/jonluca))
+- Allow using `$schema` field in `eas.json`. ([#2624](https://github.com/expo/eas-cli/pull/2624) by [@saiichihashimoto](https://github.com/saiichihashimoto))
+
+## [14.0.2](https://github.com/expo/eas-cli/releases/tag/v14.0.2) - 2024-12-06
+
+### 🧹 Chores
+
+- Print warning instead of throwing an error when validating `CFBundleShortVersionString` against App Store requirements. ([#2741](https://github.com/expo/eas-cli/pull/2741) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [14.0.1](https://github.com/expo/eas-cli/releases/tag/v14.0.1) - 2024-12-06
+
+### 🧹 Chores
+
+- Bump `@expo/apple-utils` to improve error handling and input validation and change auth headers. ([#2745](https://github.com/expo/eas-cli/pull/2745) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [14.0.0](https://github.com/expo/eas-cli/releases/tag/v14.0.0) - 2024-12-06
+
+### 🛠 Breaking changes
+
+- Change behavior of roll-back-to-embedded to not use current project state. ([#2722](https://github.com/expo/eas-cli/pull/2722) by [@wschurman](https://github.com/wschurman))
+
+### 🎉 New features
+
+- Add hidden fingerprint:compare feature. ([#2736](https://github.com/expo/eas-cli/pull/2736) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Update `@expo/config` and `@expo/config-plugins` to fix `eas build` command for bare iOS projects on Windows. ([#2744](https://github.com/expo/eas-cli/pull/2744) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
+- Fix outdated gitignored Google services file warning. ([#2730](https://github.com/expo/eas-cli/pull/2730) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [13.4.2](https://github.com/expo/eas-cli/releases/tag/v13.4.2) - 2024-11-25
+
+### 🧹 Chores
+
+- Upgrade `@expo` packages to SDK 52 versions. ([#2706](https://github.com/expo/eas-cli/pull/2706) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [13.4.1](https://github.com/expo/eas-cli/releases/tag/v13.4.1) - 2024-11-22
+
+### 🧹 Chores
+
+- Improve logging in `eas env:pull`. ([#2720](https://github.com/expo/eas-cli/pull/2720) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [13.4.0](https://github.com/expo/eas-cli/releases/tag/v13.4.0) - 2024-11-22
+
+### 🎉 New features
+
+- Calculate fingerprint on each update. ([#2687](https://github.com/expo/eas-cli/pull/2687) by [@quinlanj](https://github.com/quinlanj))
+- Calculate fingerprint on each update republish. ([#2708](https://github.com/expo/eas-cli/pull/2708) by [@quinlanj](https://github.com/quinlanj))
+- Add `eas env` commands. ([#2711](https://github.com/expo/eas-cli/pull/2711) by [@szdziedzic](https://github.com/szdziedzic))
+- Add `--environment` flag to `eas update` command. ([#2711](https://github.com/expo/eas-cli/pull/2711) by [@szdziedzic](https://github.com/szdziedzic))
+- Load readable environment variables from EAS servers on every build. ([#2644](https://github.com/expo/eas-cli/pull/2644) by [@szdziedzic](https://github.com/szdziedzic))
+- Add environment field to `eas.schema.json`. ([#2719](https://github.com/expo/eas-cli/pull/2719) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
+- Deprecate `eas secret` commands. ([#2705](https://github.com/expo/eas-cli/pull/2705) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [13.3.0](https://github.com/expo/eas-cli/releases/tag/v13.3.0) - 2024-11-18
+
+### 🎉 New features
+
+- Added `eas workflow` commands. [#2650](https://github.com/expo/eas-cli/pull/2650), [#2669](https://github.com/expo/eas-cli/pull/2669), [#2678](https://github.com/expo/eas-cli/pull/2678) by [@jonsamp](https://github.com/jonsamp) and [@sjchmiela](https://github.com/sjchmiela) ([#2683](https://github.com/expo/eas-cli/pull/2683) by [@sjchmiela](https://github.com/sjchmiela))
+
+## [13.2.3](https://github.com/expo/eas-cli/releases/tag/v13.2.3) - 2024-11-15
+
+## [13.2.2](https://github.com/expo/eas-cli/releases/tag/v13.2.2) - 2024-11-15
+
+## [13.2.1](https://github.com/expo/eas-cli/releases/tag/v13.2.1) - 2024-11-14
+
+## [13.2.0](https://github.com/expo/eas-cli/releases/tag/v13.2.0) - 2024-11-13
+
+### 🎉 New features
+
+- Add EAS_SKIP_AUTO_FINGERPRINT to skip fingerprint computation on build ([#2675](https://github.com/expo/eas-cli/pull/2675) by [@quinlanj](https://github.com/quinlanj))
+- Default build-logger-level to debug when EXPO_DEBUG is set. ([#2676](https://github.com/expo/eas-cli/pull/2676) by [@wschurman](https://github.com/wschurman))
+
+## [13.1.1](https://github.com/expo/eas-cli/releases/tag/v13.1.1) - 2024-11-08
+
+## [13.1.0](https://github.com/expo/eas-cli/releases/tag/v13.1.0) - 2024-11-07
+
+### 🎉 New features
+
+- Compute fingerprint for builds with SDK 52 and higher ([#2663](https://github.com/expo/eas-cli/pull/2663) by [@quinlanj](https://github.com/quinlanj))
+
+## [13.0.1](https://github.com/expo/eas-cli/releases/tag/v13.0.1) - 2024-11-05
+
+### 🧹 Chores
+
+- Upgrade EAS Metadata with new properties from App Store. ([#2671](https://github.com/expo/eas-cli/pull/2671) by [@byCedric](https://github.com/byCedric))
+
+## [13.0.0](https://github.com/expo/eas-cli/releases/tag/v13.0.0) - 2024-11-05
+
+### 🛠 Breaking changes
+
+- Resolve versioned expo config using `npx expo config` command instead of using fixed `@expo/config` version shipped with EAS CLI, if available. ([#2529](https://github.com/expo/eas-cli/pull/2529) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
+- Add `macos-sonoma-14.6-xcode-16.1` image and `sdk-52` image tag to `eas.schema.json`. ([#2666](https://github.com/expo/eas-cli/pull/2666) by [@szdziedzic](https://github.com/szdziedzic))
+- Update `@expo` packages versions. ([#2530](https://github.com/expo/eas-cli/pull/2530) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [12.6.2](https://github.com/expo/eas-cli/releases/tag/v12.6.2) - 2024-10-29
+
+### 🐛 Bug fixes
+
+- Make email case insensitive during Apple authentication. ([#2659](https://github.com/expo/eas-cli/pull/2659) by [@byCedric](https://github.com/byCedric))
+
+## [12.6.1](https://github.com/expo/eas-cli/releases/tag/v12.6.1) - 2024-10-25
+
+### 🧹 Chores
+
 - Create dynamic logged in context field and clean up erroneous SessionManager context field uses. ([#2648](https://github.com/expo/eas-cli/pull/2648) by [@wschurman](https://github.com/wschurman))

 ## [12.6.0](https://github.com/expo/eas-cli/releases/tag/v12.6.0) - 2024-10-21
@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
-  "version": "12.6.1",
+  "version": "14.5.0",
  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
@@ -1,34 +1,34 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "12.6.1",
+  "version": "14.5.0",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
  },
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
-    "@expo/apple-utils": "2.0.2",
+    "@expo/apple-utils": "2.1.5",
    "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "8.5.4",
-    "@expo/config-plugins": "7.8.4",
-    "@expo/eas-build-job": "1.0.136",
-    "@expo/eas-json": "12.5.2",
-    "@expo/env": "^0.3.0",
-    "@expo/json-file": "8.2.37",
+    "@expo/config": "10.0.6",
+    "@expo/config-plugins": "9.0.12",
+    "@expo/eas-build-job": "1.0.165",
+    "@expo/eas-json": "14.5.0",
+    "@expo/env": "^1.0.0",
+    "@expo/json-file": "8.3.3",
    "@expo/logger": "1.0.117",
-    "@expo/multipart-body-parser": "1.1.0",
-    "@expo/osascript": "2.0.33",
-    "@expo/package-manager": "1.1.2",
-    "@expo/pkcs12": "0.0.8",
-    "@expo/plist": "0.0.20",
+    "@expo/multipart-body-parser": "2.0.0",
+    "@expo/osascript": "2.1.4",
+    "@expo/package-manager": "1.7.0",
+    "@expo/pkcs12": "0.1.3",
+    "@expo/plist": "0.2.0",
    "@expo/plugin-help": "5.1.23",
    "@expo/plugin-warn-if-update-available": "2.5.1",
-    "@expo/prebuild-config": "6.7.3",
+    "@expo/prebuild-config": "8.0.17",
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
-    "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.136",
+    "@expo/spawn-async": "1.7.2",
+    "@expo/steps": "1.0.166",
    "@expo/timeago.js": "1.0.0",
    "@oclif/core": "^1.26.2",
    "@oclif/plugin-autocomplete": "^2.3.10",
@@ -41,6 +41,7 @@
    "chalk": "4.1.2",
    "cli-progress": "3.12.0",
    "dateformat": "4.6.3",
+    "diff": "7.0.0",
    "dotenv": "16.3.1",
    "env-paths": "2.2.0",
    "envinfo": "7.11.0",
@@ -64,7 +65,7 @@
    "mime": "3.0.0",
    "minimatch": "5.1.2",
    "minizlib": "3.0.1",
-    "nanoid": "3.3.4",
+    "nanoid": "3.3.8",
    "node-fetch": "2.6.7",
    "node-forge": "1.3.1",
    "nullthrows": "1.1.1",
@@ -86,6 +87,7 @@
    "untildify": "4.0.0",
    "uuid": "9.0.1",
    "wrap-ansi": "7.0.0",
+    "yaml": "2.6.0",
    "zod": "^3.23.8"
  },
  "devDependencies": {
@@ -93,8 +95,10 @@
    "@graphql-codegen/introspection": "4.0.0",
    "@graphql-codegen/typescript": "4.0.1",
    "@graphql-codegen/typescript-operations": "4.0.1",
+    "@tsconfig/node18": "18.2.4",
    "@types/cli-progress": "3.11.5",
    "@types/dateformat": "3.0.1",
+    "@types/diff": "6.0.0",
    "@types/envinfo": "7.8.3",
    "@types/express": "4.17.15",
    "@types/fs-extra": "11.0.4",
@@ -176,16 +180,22 @@
      "secret": {
        "description": "manage project and account secrets"
      },
+      "env": {
+        "description": "manage project and account environment variables"
+      },
      "update": {
        "description": "manage individual updates"
      },
      "webhook": {
        "description": "manage webhooks"
+      },
+      "workflow": {
+        "description": "manage workflows"
      }
    },
    "warn-if-update-available": {
      "timeoutInDays": 0.5,
-      "message": "<%= chalk('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available.') %>\n<%= chalk.dim('To upgrade, run ') %><%= chalk.dim(chalk.bold('npm install -g eas-cli')) %><%= chalk.dim('.') %>\n<%= chalk.dim('Proceeding with outdated version.') %>\n"
+      "message": "<%= chalk('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available.') %>\n<%= chalk.dim('To upgrade, run:') %>\n<%= chalk.dim(chalk.bold('npm install -g eas-cli')) %>\n<%= chalk.dim('Proceeding with outdated version.') %>\n"
    },
    "update": {
      "node": {
@@ -1,6 +1,20 @@
 {
  "$schema": "http://json-schema.org/draft-06/schema",
  "type": "object",
+  "properties": {
+    "configVersion": {
+      "enum": [0],
+      "description": "The EAS metadata store configuration version"
+    },
+    "apple": {
+      "$ref": "#/definitions/AppleConfig"
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "configVersion",
+    "apple"
+  ],
  "definitions": {
    "apple": {
      "AppleKidsAge": {
@@ -323,7 +337,8 @@
          "gambling",
          "unrestrictedWebAccess",
          "kidsAgeBand",
-          "seventeenPlus"
+          "ageRatingOverride",
+          "koreaAgeRatingOverride"
        ],
        "defaultSnippets": [
          {
@@ -345,7 +360,9 @@
              "gambling": false,
              "unrestrictedWebAccess": false,
              "kidsAgeBand": null,
-              "seventeenPlus": false
+              "ageRatingOverride": "NONE",
+              "koreaAgeRatingOverride": "NONE",
+              "lootBox": false
            }
          },
          {
@@ -367,7 +384,9 @@
              "unrestrictedWebAccess": false,
              "gambling": false,
              "kidsAgeBand": null,
-              "seventeenPlus": false
+              "ageRatingOverride": "${13|NONE,SEVENTEEN_PLUS,UNRATED|}",
+              "koreaAgeRatingOverride": "${14|NONE,FIFTEEN_PLUS,NINETEEN_PLUS|}",
+              "lootBox": false
            }
          }
        ],
@@ -442,8 +461,24 @@
          },
          "seventeenPlus": {
            "type": "boolean",
+            "deprecated": true,
+            "deprecationMessage": "This property is deprecated, use `ageRatingOverride` instead.",
            "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n@see https://help.apple.com/app-store-connect/#/dev599d50efb",
            "markdownDescription": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
+          },
+          "ageRatingOverride": {
+            "$ref": "#/definitions/apple/AppleAgeRatingOverride",
+            "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n@see https://help.apple.com/app-store-connect/#/dev599d50efb",
+            "markdownDescription": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
+          },
+          "koreaAgeRatingOverride": {
+            "$ref": "#/definitions/apple/AppleKoreaAgeRatingOverride",
+            "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 15 or 19, you can manually set the age rating to 15+ or 19+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n@see https://help.apple.com/app-store-connect/#/dev599d50efb",
+            "markdownDescription": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 15 or 19, you can manually set the age rating to 15+ or 19+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
+          },
+          "lootBox": {
+            "type": "boolean",
+            "description": "Does your app contain purchasable loot boxes? These virtual containers provide players with in-game items, including functional cards or cosmetic modifications, based on random chance."
          }
        }
      },
@@ -565,6 +600,20 @@
            "maxLength": 4000
          }
        }
+      },
+      "AppleAgeRatingOverride": {
+        "enum": [
+          "NONE",
+          "SEVENTEEN_PLUS",
+          "UNRATED"
+        ]
+      },
+      "AppleKoreaAgeRatingOverride": {
+        "enum": [
+          "NONE",
+          "FIFTEEN_PLUS",
+          "NINETEEN_PLUS"
+        ]
      }
    },
    "AppleConfig": {
@@ -775,19 +824,5 @@
        }
      }
    }
-  },
-  "properties": {
-    "configVersion": {
-      "enum": [0],
-      "description": "The EAS metadata store configuration version"
-    },
-    "apple": {
-      "$ref": "#/definitions/AppleConfig"
-    }
-  },
-  "additionalProperties": false,
-  "required": [
-    "configVersion",
-    "apple"
-  ]
+  }
 }
@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import { print } from 'graphql';
 import gql from 'graphql-tag';

 import { BranchNotFoundError } from './utils';
@@ -8,10 +9,11 @@ import { withErrorHandlingAsync } from '../graphql/client';
 import {
  CreateUpdateBranchForAppMutation,
  CreateUpdateBranchForAppMutationVariables,
-  UpdateBranch,
+  UpdateBranchBasicInfoFragment,
  UpdateBranchFragment,
 } from '../graphql/generated';
 import { BranchQuery } from '../graphql/queries/BranchQuery';
+import { UpdateBranchBasicInfoFragmentNode } from '../graphql/types/UpdateBranchBasicInfo';
 import Log from '../log';
 import { formatBranch, getBranchDescription } from '../update/utils';
 import { printJsonOnlyOutput } from '../utils/json';
@@ -126,7 +128,7 @@ function renderPageOfBranches(
 export async function createUpdateBranchOnAppAsync(
  graphqlClient: ExpoGraphqlClient,
  { appId, name }: CreateUpdateBranchForAppMutationVariables
-): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
+): Promise<UpdateBranchBasicInfoFragment> {
  const result = await withErrorHandlingAsync(
    graphqlClient
      .mutation<CreateUpdateBranchForAppMutation, CreateUpdateBranchForAppMutationVariables>(
@@ -135,15 +137,17 @@ export async function createUpdateBranchOnAppAsync(
            updateBranch {
              createUpdateBranchForApp(appId: $appId, name: $name) {
                id
-                name
+                ...UpdateBranchBasicInfoFragment
              }
            }
          }
+          ${print(UpdateBranchBasicInfoFragmentNode)}
        `,
        {
          appId,
          name,
-        }
+        },
+        { additionalTypenames: ['UpdateBranch'] }
      )
      .toPromise()
  );
@@ -163,22 +167,21 @@ export async function ensureBranchExistsAsync(
    appId: string;
    branchName: string;
  }
-): Promise<{ branchId: string; createdBranch: boolean }> {
+): Promise<{ branch: UpdateBranchBasicInfoFragment; createdBranch: boolean }> {
  try {
    const updateBranch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
      appId,
      name: branchName,
    });

-    const { id } = updateBranch;
-    return { branchId: id, createdBranch: false };
+    return { branch: updateBranch, createdBranch: false };
  } catch (error) {
    if (error instanceof BranchNotFoundError) {
      const newUpdateBranch = await createUpdateBranchOnAppAsync(graphqlClient, {
        appId,
        name: branchName,
      });
-      return { branchId: newUpdateBranch.id, createdBranch: true };
+      return { branch: newUpdateBranch, createdBranch: true };
    } else {
      throw error;
    }
@@ -1,9 +1,7 @@
 import { Client } from '../vcs/vcs';

-export async function getDefaultBranchNameAsync(vcsClient: Client): Promise<string> {
-  return (
-    (await vcsClient.getBranchNameAsync()) || `branch-${Math.random().toString(36).substring(2, 4)}`
-  );
+export async function getDefaultBranchNameAsync(vcsClient: Client): Promise<string | null> {
+  return await vcsClient.getBranchNameAsync();
 }

 export class BranchNotFoundError extends Error {
@@ -1,23 +1,43 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
+import { AndroidBuildProfile } from '@expo/eas-json/build/build/types';
 import assert from 'assert';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
 import path from 'path';
+import { instance, mock } from 'ts-mockito';

+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
+import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
 import { resolveVcsClient } from '../../../vcs';
+import { Client } from '../../../vcs/vcs';
 import {
  BumpStrategy,
  bumpVersionAsync,
  bumpVersionInAppJsonAsync,
  maybeResolveVersionsAsync,
+  resolveRemoteVersionCodeAsync,
 } from '../version';

 const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');
+jest.mock('../../../commandUtils/context/contextUtils/createGraphqlClient');
+jest.mock('../../../vcs/vcs');
+jest.mock('../../../graphql/queries/AppVersionQuery');
+jest.mock('../../../graphql/mutations/AppVersionMutation');
+jest.mock('../../../ora', () => ({
+  ora: jest.fn().mockImplementation(() => ({
+    start: jest.fn().mockImplementation(() => ({
+      succeed: jest.fn(),
+      stop: jest.fn(),
+      fail: jest.fn(),
+    })),
+  })),
+}));

 const vcsClient = resolveVcsClient();

@@ -216,12 +236,160 @@ describe(maybeResolveVersionsAsync, () => {
  });
 });

+describe(resolveRemoteVersionCodeAsync, () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('uses current remote versionCode when remote version set, autoIncrement=false', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
+      buildVersion: '11',
+      storeVersion: '1.2.3',
+    });
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject();
+
+    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationId: 'fakeApplicationId',
+      buildProfile: {} as AndroidBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('11');
+    expect(createAppVersionAsyncSpy).not.toHaveBeenCalled();
+  });
+
+  it('initializes versionCode from local files when remote version not set, autoIncrement=false', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ versionCode: 22, versionName: '2.3.4' });
+
+    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationId: 'fakeApplicationId',
+      buildProfile: {} as AndroidBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('22');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('22');
+  });
+
+  it('initializes versionCode starting with 1 when remote version not set and not set in local files, autoIncrement=false', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ versionCode: null, versionName: null });
+
+    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationId: 'fakeApplicationId',
+      buildProfile: {} as AndroidBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('1');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
+  });
+
+  it('increments current remote versionCode when remote version set, autoIncrement=true', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
+      buildVersion: '11',
+      storeVersion: '1.2.3',
+    });
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject();
+
+    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationId: 'fakeApplicationId',
+      buildProfile: { autoIncrement: true } as AndroidBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('12');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('3.0.0');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('12');
+  });
+
+  it('increments versionCode from local files when remote version not set, autoIncrement=true', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ versionCode: 22, versionName: '2.3.4' });
+
+    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationId: 'fakeApplicationId',
+      buildProfile: { autoIncrement: true } as AndroidBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('23');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('23');
+  });
+
+  it('initializes versionCode starting with 1 when remote version not set and not set in local files, autoIncrement=true', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ versionCode: null, versionName: null });
+
+    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationId: 'fakeApplicationId',
+      buildProfile: { autoIncrement: true } as AndroidBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('1');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
+  });
+});
+
 function initBareWorkflowProject({
  versionCode = 123,
  versionName = '3.0.0',
 }: {
-  versionCode?: number;
-  versionName?: string;
+  versionCode?: number | null;
+  versionName?: string | null;
 } = {}): ExpoConfig {
  const fakeExp: ExpoConfig = {
    name: 'myproject',
@@ -239,8 +407,8 @@ function initBareWorkflowProject({
      './android/app/build.gradle': `android {
  defaultConfig {
    applicationId "com.expo.testapp"
-    versionCode ${versionCode}
-    versionName "${versionName}"
+    ${versionCode ? `versionCode "${versionCode}"` : ''}
+    ${versionName ? `versionName "${versionName}"` : ''}
  }
 }`,
      './android/app/src/main/AndroidManifest.xml': 'fake',
@@ -151,6 +151,7 @@ async function ensureAndroidCredentialsAsync(
    ctx.android.gradleContext
  );
  const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {
+    name: ctx.buildProfile.keystoreName,
    app: {
      account: nullthrows(
        ctx.user.accounts.find(a => a.name === ctx.accountName),
@@ -115,6 +115,10 @@ export async function prepareJobAsync(
      },
    }),
    loggerLevel: ctx.loggerLevel,
+    // Technically, these are unused, but let's include them here for type consistency.
+    // See: https://github.com/expo/eas-build/pull/454
+    appId: ctx.projectId,
+    initiatingUserId: ctx.user.id,
  };

  return sanitizeBuildJob(job) as Android.Job;
@@ -99,7 +99,7 @@ export async function maybeResolveVersionsAsync(
  exp: ExpoConfig,
  buildProfile: BuildProfile<Platform.ANDROID>,
  vcsClient: Client
-): Promise<{ appVersion?: string; appBuildVersion?: string }> {
+): Promise<{ appVersion?: string; appBuildVersion?: string; isVersionInitialized?: boolean }> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
  if (workflow === Workflow.GENERIC) {
    const buildGradle = await getAppBuildGradleAsync(projectDir);
@@ -113,6 +113,11 @@ export async function maybeResolveVersionsAsync(
          resolveConfigValue(buildGradle, 'versionName', parsedGradleCommand?.flavor) ?? '1.0.0',
        appBuildVersion:
          resolveConfigValue(buildGradle, 'versionCode', parsedGradleCommand?.flavor) ?? '1',
+        isVersionInitialized: !resolveConfigValue(
+          buildGradle,
+          'versionCode',
+          parsedGradleCommand?.flavor
+        ),
      };
    } catch {
      return {};
@@ -204,14 +209,18 @@ export async function resolveRemoteVersionCodeAsync(

  const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile, vcsClient);
  let currentBuildVersion: string;
+  let shouldInitializeVersionCode = false;
  if (remoteVersions?.buildVersion) {
    currentBuildVersion = remoteVersions.buildVersion;
  } else {
    if (localVersions.appBuildVersion) {
-      Log.warn(
-        'No remote versions are configured for this project, versionCode will be initialized based on the value from the local project.'
+      Log.log(
+        chalk.green(
+          'No remote versions are configured for this project, versionCode will be initialized based on the value from the local project.'
+        )
      );
      currentBuildVersion = localVersions.appBuildVersion;
+      shouldInitializeVersionCode = localVersions.isVersionInitialized ?? false;
    } else {
      Log.error(
        `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
@@ -221,7 +230,10 @@ export async function resolveRemoteVersionCodeAsync(
  }
  if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
    return currentBuildVersion;
-  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
+  } else if (
+    (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) ||
+    shouldInitializeVersionCode
+  ) {
    const spinner = ora(
      `Initializing versionCode with ${chalk.bold(currentBuildVersion)}.`
    ).start();
@@ -66,6 +66,7 @@ import { maybeUploadFingerprintAsync } from '../project/maybeUploadFingerprintAs
 import { resolveRuntimeVersionAsync } from '../project/resolveRuntimeVersionAsync';
 import { uploadFileAtPathToGCSAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
+import { createFingerprintAsync } from '../utils/fingerprintCli';
 import { printJsonOnlyOutput } from '../utils/json';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
@@ -174,8 +175,9 @@ export async function prepareBuildRequestForPlatformAsync<
  }
  assert(projectArchive);

-  const runtimeMetadata = await createAndMaybeUploadFingerprintAsync(ctx);
-  const metadata = await collectMetadataAsync(ctx, runtimeMetadata);
+  const runtimeAndFingerprintMetadata =
+    await computeAndMaybeUploadRuntimeAndFingerprintMetadataAsync(ctx);
+  const metadata = await collectMetadataAsync(ctx, runtimeAndFingerprintMetadata);
  const buildParams = resolveBuildParamsInput(ctx, metadata);
  const job = await builder.prepareJobAsync(ctx, {
    projectArchive,
@@ -660,11 +662,35 @@ function formatAccountBillingUrl(accountName: string): string {
  return new URL(`/accounts/${accountName}/settings/billing`, getExpoWebsiteBaseUrl()).toString();
 }

-async function createAndMaybeUploadFingerprintAsync<T extends Platform>(
+async function computeAndMaybeUploadRuntimeAndFingerprintMetadataAsync<T extends Platform>(
+  ctx: BuildContext<T>
+): Promise<{
+  runtimeVersion?: string | undefined;
+  fingerprintHash?: string | undefined;
+  fingerprintSource?: FingerprintSource | undefined;
+}> {
+  const runtimeAndFingerprintMetadata =
+    await computeAndMaybeUploadFingerprintFromExpoUpdatesAsync(ctx);
+  if (!runtimeAndFingerprintMetadata?.fingerprintHash) {
+    const fingerprint = await computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync(ctx);
+    return {
+      ...runtimeAndFingerprintMetadata,
+      ...fingerprint,
+    };
+  } else {
+    return {
+      ...runtimeAndFingerprintMetadata,
+      fingerprintHash: runtimeAndFingerprintMetadata.runtimeVersion,
+    };
+  }
+}
+
+async function computeAndMaybeUploadFingerprintFromExpoUpdatesAsync<T extends Platform>(
  ctx: BuildContext<T>
 ): Promise<{
  runtimeVersion?: string;
  fingerprintSource?: FingerprintSource;
+  fingerprintHash?: string;
 }> {
  const resolvedRuntimeVersion = await resolveRuntimeVersionAsync({
    exp: ctx.exp,
@@ -683,16 +709,54 @@ async function createAndMaybeUploadFingerprintAsync<T extends Platform>(
   * It's ok for fingerprintSources or runtimeVersion to be empty
   * fingerprintSources only exist if the project is using runtimeVersion.policy: fingerprint
   */
-  if (!resolvedRuntimeVersion.fingerprint || !resolvedRuntimeVersion.runtimeVersion) {
+  if (
+    !resolvedRuntimeVersion.expoUpdatesRuntimeFingerprint ||
+    !resolvedRuntimeVersion.runtimeVersion
+  ) {
    return {
      runtimeVersion: resolvedRuntimeVersion.runtimeVersion ?? undefined,
    };
  }

-  return await maybeUploadFingerprintAsync({
-    runtimeVersion: resolvedRuntimeVersion.runtimeVersion,
-    fingerprint: resolvedRuntimeVersion.fingerprint,
+  const uploadedFingerprint = await maybeUploadFingerprintAsync({
+    hash: resolvedRuntimeVersion.runtimeVersion,
+    fingerprint: resolvedRuntimeVersion.expoUpdatesRuntimeFingerprint,
    graphqlClient: ctx.graphqlClient,
    localBuildMode: ctx.localBuildOptions.localBuildMode,
  });
+  return {
+    runtimeVersion: uploadedFingerprint.hash,
+    fingerprintSource: uploadedFingerprint.fingerprintSource,
+    fingerprintHash: resolvedRuntimeVersion.expoUpdatesRuntimeFingerprintHash ?? undefined,
+  };
+}
+
+async function computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync<T extends Platform>(
+  ctx: BuildContext<T>,
+  { debug }: { debug?: boolean } = {}
+): Promise<{
+  fingerprintHash?: string;
+  fingerprintSource?: FingerprintSource;
+}> {
+  const fingerprint = await createFingerprintAsync(ctx.projectDir, {
+    workflow: ctx.workflow,
+    platforms: [ctx.platform],
+    env: ctx.env,
+  });
+  if (!fingerprint) {
+    return {};
+  }
+  const uploadedFingerprint = await maybeUploadFingerprintAsync({
+    hash: fingerprint.hash,
+    fingerprint: {
+      fingerprintSources: fingerprint.sources,
+      isDebugFingerprintSource: debug ?? false,
+    },
+    graphqlClient: ctx.graphqlClient,
+    localBuildMode: ctx.localBuildOptions.localBuildMode,
+  });
+  return {
+    fingerprintHash: uploadedFingerprint.hash,
+    fingerprintSource: uploadedFingerprint.fingerprintSource,
+  };
 }
@@ -54,9 +54,10 @@ async function resolveEnvVarsAsync({
  projectId: string;
 }): Promise<Env> {
  const environment =
-    buildProfile.environment?.toUpperCase() ?? process.env.EAS_CURRENT_ENVIRONMENT;
+    buildProfile.environment?.toUpperCase() ??
+    resolveSuggestedEnvironmentForBuildProfileConfiguration(buildProfile);

-  if (!environment || !isEnvironment(environment)) {
+  if (!isEnvironment(environment)) {
    Log.log(
      `Loaded "env" configuration for the "${buildProfileName}" profile: ${
        buildProfile.env && Object.keys(buildProfile.env).length > 0
@@ -83,24 +84,13 @@ async function resolveEnvVarsAsync({

    if (Object.keys(serverEnvVars).length > 0) {
      Log.log(
-        `Environment variables loaded from the "${environment.toLowerCase()}" environment on EAS servers: ${Object.keys(
+        `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${Object.keys(
          serverEnvVars
        ).join(', ')}.`
      );
    } else {
      Log.log(
-        `No environment variables found for the "${environment.toLowerCase()}" environment on EAS servers.`
-      );
-    }
-
-    const encryptedEnvVars = environmentVariables.filter(({ name, value }) => name && !value);
-    if (encryptedEnvVars.length > 0) {
-      Log.warn(
-        `Some environment variables defined in the "${environment.toLowerCase()}" environment on EAS servers are of "encrypted" type and cannot be read outside of the EAS servers (including EAS CLI): ${encryptedEnvVars
-          .map(({ name }) => name)
-          .join(
-            ', '
-          )}. However, they will be available during the build process happening on the EAS servers. This can lead to potential configuration mismatches between the local development environment and the build environment if the encrypted environment variables are used to resolve the app config.`
+        `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`
      );
    }

@@ -110,10 +100,6 @@ async function resolveEnvVarsAsync({
          buildProfile.env && Object.keys(buildProfile.env).join(', ')
        }.`
      );
-    } else {
-      Log.log(
-        `No environment variables specified in the "${buildProfileName}" build profile "env" configuration.`
-      );
    }

    if (
@@ -126,7 +112,7 @@ async function resolveEnvVarsAsync({
      );
      if (overlappingKeys.length > 0) {
        Log.warn(
-          `The following environment variables are defined in both the "${buildProfileName}" build profile "env" configuration and the "${environment.toLowerCase()}" environment on EAS servers: ${overlappingKeys.join(
+          `The following environment variables are defined in both the "${buildProfileName}" build profile "env" configuration and the "${environment.toLowerCase()}" environment on EAS: ${overlappingKeys.join(
            ', '
          )}. The values from the build profile configuration will be used.`
        );
@@ -145,3 +131,22 @@ async function resolveEnvVarsAsync({
    return { ...buildProfile.env };
  }
 }
+
+function resolveSuggestedEnvironmentForBuildProfileConfiguration(
+  buildProfile: BuildProfile
+): EnvironmentVariableEnvironment {
+  const environment =
+    buildProfile.distribution === 'store'
+      ? EnvironmentVariableEnvironment.Production
+      : buildProfile.developmentClient
+        ? EnvironmentVariableEnvironment.Development
+        : EnvironmentVariableEnvironment.Preview;
+
+  Log.log(
+    `Resolved "${environment.toLowerCase()}" environment for the build. ${learnMore(
+      'https://docs.expo.dev/eas/environment-variables/#setting-the-environment-for-your-builds'
+    )}`
+  );
+
+  return environment;
+}
@@ -1,13 +1,19 @@
 import { ExpoConfig } from '@expo/config';
 import { IOSConfig } from '@expo/config-plugins';
+import { IosBuildProfile } from '@expo/eas-json/build/build/types';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
+import { instance, mock } from 'ts-mockito';
 import type { XCBuildConfiguration } from 'xcode';

-import { learnMore } from '../../../log';
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { Target } from '../../../credentials/ios/types';
+import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
+import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { readPlistAsync } from '../../../utils/plist';
 import { resolveVcsClient } from '../../../vcs';
+import { Client } from '../../../vcs/vcs';
 import {
  BumpStrategy,
  bumpVersionAsync,
@@ -16,9 +22,23 @@ import {
  getInfoPlistPath,
  readBuildNumberAsync,
  readShortVersionAsync,
+  resolveRemoteBuildNumberAsync,
 } from '../version';

 jest.mock('fs');
+jest.mock('../../../commandUtils/context/contextUtils/createGraphqlClient');
+jest.mock('../../../vcs/vcs');
+jest.mock('../../../graphql/queries/AppVersionQuery');
+jest.mock('../../../graphql/mutations/AppVersionMutation');
+jest.mock('../../../ora', () => ({
+  ora: jest.fn().mockImplementation(() => ({
+    start: jest.fn().mockImplementation(() => ({
+      succeed: jest.fn(),
+      stop: jest.fn(),
+      fail: jest.fn(),
+    })),
+  })),
+}));

 const vcsClient = resolveVcsClient();

@@ -301,27 +321,6 @@ describe(readShortVersionAsync, () => {
      );
      expect(buildNumber).toBe('1.0.0');
    });
-
-    it('fails when build number is invalid', async () => {
-      const exp = initBareWorkflowProject({
-        appVersion: '$(CURRENT_PROJECT_VERSION)',
-      });
-
-      await expect(
-        readShortVersionAsync(
-          '/app',
-          exp,
-          {
-            CURRENT_PROJECT_VERSION: '0.0.7.1.028',
-          },
-          vcsClient
-        )
-      ).rejects.toThrowError(
-        `The required format for "CFBundleShortVersionString" in Info.plist is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: 0.0.7.1.028. Edit the "CFBundleShortVersionString" in your Info.plist to match the required format. ${learnMore(
-          'https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring'
-        )}`
-      );
-    });
  });

  describe('managed project', () => {
@@ -381,6 +380,154 @@ describe(getInfoPlistPath, () => {
  });
 });

+describe(resolveRemoteBuildNumberAsync, () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('uses current remote buildNumber when remote version set, autoIncrement=false', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
+      buildVersion: '11',
+      storeVersion: '1.2.3',
+    });
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject();
+
+    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationTarget: {} as Target,
+      buildProfile: {} as IosBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('11');
+    expect(createAppVersionAsyncSpy).not.toHaveBeenCalled();
+  });
+
+  it('initializes buildNumber from local files when remote version not set, autoIncrement=false', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ buildNumber: '22', appVersion: '2.3.4' });
+
+    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationTarget: {} as Target,
+      buildProfile: {} as IosBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('22');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('22');
+  });
+
+  it('initializes buildNumber starting with 1 when remote version not set and local version is 1, autoIncrement=false', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ buildNumber: '1', appVersion: '1.0.0' });
+
+    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationTarget: {} as Target,
+      buildProfile: {} as IosBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('1');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
+  });
+
+  it('increments current remote buildNumber when remote version set, autoIncrement=true', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
+      buildVersion: '11',
+      storeVersion: '1.2.3',
+    });
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject();
+
+    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationTarget: {} as Target,
+      buildProfile: { autoIncrement: true } as IosBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('12');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('12');
+  });
+
+  it('increments buildNumber from local files when remote version not set, autoIncrement=true', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ buildNumber: '22', appVersion: '2.3.4' });
+
+    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationTarget: {} as Target,
+      buildProfile: { autoIncrement: true } as IosBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('23');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('23');
+  });
+
+  it('initializes buildNumber starting with 1 when remote version not set and local version is 1, autoIncrement=true', async () => {
+    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
+    const vcsClientMock = instance(mock<Client>());
+    vcsClientMock.getRootPathAsync = async () => '/app';
+    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
+    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
+    const exp = initBareWorkflowProject({ buildNumber: '1', appVersion: '1.0.0' });
+
+    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
+      projectDir: '/app',
+      projectId: 'fakeProjectId',
+      exp,
+      applicationTarget: {} as Target,
+      buildProfile: { autoIncrement: true } as IosBuildProfile,
+      vcsClient: vcsClientMock,
+    });
+
+    expect(result).toBe('1');
+    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
+    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
+  });
+});
+
 function initBareWorkflowProject({
  appVersion = '1.0.0',
  buildNumber = '1',
@@ -110,6 +110,10 @@ export async function prepareJobAsync(
      },
    }),
    loggerLevel: ctx.loggerLevel,
+    // Technically, these are unused, but let's include them here for type consistency.
+    // See: https://github.com/expo/eas-build/pull/454
+    appId: ctx.projectId,
+    initiatingUserId: ctx.user.id,
  };
  return sanitizeBuildJob(job) as Ios.Job;
 }
@@ -109,14 +109,14 @@ function validateShortVersion({
 }): void {
  if (shortVersion && !SHORT_VERSION_REGEX.test(shortVersion)) {
    if (workflow === Workflow.MANAGED) {
-      throw new Error(
-        `The required format for "version" field from app.json/app.config.ts is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: ${shortVersion}. Edit the "version" field in your app.json/app.config.ts to match the required format. ${learnMore(
+      Log.warn(
+        `The required format for "version" field from app.json/app.config.ts for App Store iOS builds is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: ${shortVersion}. Edit the "version" field in your app.json/app.config.ts to match the format required by Apple. ${learnMore(
          'https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring'
        )}`
      );
    } else {
-      throw new Error(
-        `The required format for "CFBundleShortVersionString" in Info.plist is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: ${shortVersion}. Edit the "CFBundleShortVersionString" in your Info.plist to match the required format. ${learnMore(
+      Log.warn(
+        `The required format for "CFBundleShortVersionString" in Info.plist for App Store iOS builds is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: ${shortVersion}. Edit the "CFBundleShortVersionString" in your Info.plist to match the format required by Apple. ${learnMore(
          'https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring'
        )}`
      );
@@ -330,14 +330,18 @@ export async function resolveRemoteBuildNumberAsync(
    vcsClient
  );
  let currentBuildVersion: string;
+  let shouldInitializeBuildNumber = false;
  if (remoteVersions?.buildVersion) {
    currentBuildVersion = remoteVersions.buildVersion;
  } else {
    if (localBuildNumber) {
-      Log.warn(
-        'No remote versions are configured for this project, buildNumber will be initialized based on the value from the local project.'
+      Log.log(
+        chalk.green(
+          'No remote versions are configured for this project, buildNumber will be initialized based on the value from the local project.'
+        )
      );
      currentBuildVersion = localBuildNumber;
+      shouldInitializeBuildNumber = localBuildNumber === '1';
    } else {
      Log.error(
        `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
@@ -347,7 +351,10 @@ export async function resolveRemoteBuildNumberAsync(
  }
  if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
    return currentBuildVersion;
-  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
+  } else if (
+    (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) ||
+    shouldInitializeBuildNumber
+  ) {
    const spinner = ora(
      `Initializing buildNumber with ${chalk.bold(currentBuildVersion)}.`
    ).start();
@@ -7,7 +7,7 @@ import Log from '../log';
 import { ora } from '../ora';

 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '1.0.135';
+const PLUGIN_PACKAGE_VERSION = '1.0.163';

 export enum LocalBuildMode {
  /**
@@ -16,8 +16,9 @@ import { easCliVersion } from '../utils/easCli';

 export async function collectMetadataAsync<T extends Platform>(
  ctx: BuildContext<T>,
-  runtimeMetadata: {
+  runtimeAndFingerprintMetadata: {
    runtimeVersion?: string | undefined;
+    fingerprintHash?: string | undefined;
    fingerprintSource?: FingerprintSource | undefined;
  }
 ): Promise<Metadata> {
@@ -30,8 +31,9 @@ export async function collectMetadataAsync<T extends Platform>(
    workflow: ctx.workflow,
    credentialsSource: ctx.buildProfile.credentialsSource,
    sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: runtimeMetadata?.runtimeVersion,
-    fingerprintSource: runtimeMetadata?.fingerprintSource,
+    runtimeVersion: runtimeAndFingerprintMetadata?.runtimeVersion,
+    fingerprintHash: runtimeAndFingerprintMetadata?.fingerprintHash,
+    fingerprintSource: runtimeAndFingerprintMetadata?.fingerprintSource,
    reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
    ...channelObject,
    distribution,
@@ -381,7 +381,7 @@ async function prepareAndStartBuildAsync({
    vcsClient,
    getDynamicPrivateProjectConfigAsync,
    customBuildConfigMetadata,
-    buildLoggerLevel: flags.buildLoggerLevel,
+    buildLoggerLevel: flags.buildLoggerLevel ?? (Log.isDebug ? LoggerLevel.DEBUG : undefined),
    freezeCredentials: flags.freezeCredentials,
    repack: flags.repack,
    env,
@@ -50,3 +50,25 @@ export function getUpdateGroupUrl(
    getExpoWebsiteBaseUrl()
  ).toString();
 }
+
+export function getWorkflowRunUrl(
+  accountName: string,
+  projectName: string,
+  workflowRunId: string
+): string {
+  return new URL(
+    `/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
+      projectName
+    )}/workflows/${workflowRunId}`,
+    getExpoWebsiteBaseUrl()
+  ).toString();
+}
+
+export function getProjectGitHubSettingsUrl(accountName: string, projectName: string): string {
+  return new URL(
+    `/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
+      projectName
+    )}/github`,
+    getExpoWebsiteBaseUrl()
+  ).toString();
+}
@@ -27,24 +27,28 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
  if (!googleServicesFilePath) {
    return;
  }
+  const googleServicesEnvVar =
+    ctx.platform === Platform.ANDROID
+      ? ctx.env.GOOGLE_SERVICES_JSON
+      : ctx.env.GOOGLE_SERVICES_INFO_PLIST;
  const rootDir = path.normalize(await ctx.vcsClient.getRootPathAsync());
  const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
  if (
    (await fs.pathExists(absGoogleServicesFilePath)) &&
    (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-      (await ctx.vcsClient.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
+      (await ctx.vcsClient.isFileIgnoredAsync(
+        path.relative(rootDir, absGoogleServicesFilePath)
+      ))) &&
+    !googleServicesEnvVar
  ) {
    Log.warn(
      `File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`
    );
    Log.warn(
-      `Use EAS Secret to pass all values that you don't want to include in your version control. ${learnMore(
-        'https://docs.expo.dev/build-reference/variables/#using-secrets-in-environment-variables'
+      `Use EAS file environment variables with secret or sensitive visibility to pass all values that you don't want to include in your version control to build process. ${learnMore(
+        'https://docs.expo.dev/eas/environment-variables/#file-environment-variables'
      )}`
    );
-    Log.warn(
-      `If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting your build profile's env.GOOGLE_SERVICES_FILE in eas.json to any non-empty string.`
-    );
    Log.newLine();
  }
 }
@@ -19,7 +19,7 @@ import {
 import { BranchQuery, UpdateBranchOnChannelObject } from '../graphql/queries/BranchQuery';
 import { ChannelQuery, UpdateChannelObject } from '../graphql/queries/ChannelQuery';
 import { UpdateChannelBasicInfoFragmentNode } from '../graphql/types/UpdateChannelBasicInfo';
-import Log from '../log';
+import Log, { learnMore } from '../log';
 import { getDisplayNameForProjectIdAsync } from '../project/projectUtils';
 import formatFields from '../utils/formatFields';
 import { printJsonOnlyOutput } from '../utils/json';
@@ -303,7 +303,6 @@ export async function doesChannelExistAsync(
 }

 /**
- *
 * Creates a channel and links it to a branch with the same name.
 *
 * @param appId the app ID, also known as the project ID
@@ -319,7 +318,7 @@ export async function createAndLinkChannelAsync(
  }: { appId: string; channelName: string; shouldPrintJson?: boolean }
 ): Promise<ChannelBasicInfo> {
  let branchId: string;
-  let branchMessage: string;
+  let hasCreatedBranch = false;

  try {
    const branch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
@@ -327,7 +326,6 @@ export async function createAndLinkChannelAsync(
      name: channelName,
    });
    branchId = branch.id;
-    branchMessage = `We found a branch with the same name`;
  } catch (error) {
    if (error instanceof BranchNotFoundError) {
      const newBranch = await createUpdateBranchOnAppAsync(graphqlClient, {
@@ -335,7 +333,7 @@ export async function createAndLinkChannelAsync(
        name: channelName,
      });
      branchId = newBranch.id;
-      branchMessage = `We also went ahead and made a branch with the same name`;
+      hasCreatedBranch = true;
    } else {
      throw error;
    }
@@ -358,26 +356,25 @@ export async function createAndLinkChannelAsync(
  if (shouldPrintJson) {
    printJsonOnlyOutput(newChannel);
  } else {
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, appId);
+    const learnMoreLink = learnMore('https://docs.expo.dev/eas-update/eas-cli/');
+
    Log.addNewLineIfNone();
-    Log.withTick(
-      `Created a new channel on project ${chalk.bold(
-        await getDisplayNameForProjectIdAsync(graphqlClient, appId)
-      )}`
-    );
-    Log.log(
-      formatFields([
-        { label: 'Name', value: newChannel.name },
-        { label: 'ID', value: newChannel.id },
-      ])
-    );
-    Log.addNewLineIfNone();
-    Log.withTick(`${branchMessage} and have pointed the channel at it.`);
-    Log.log(
-      formatFields([
-        { label: 'Name', value: newChannel.name },
-        { label: 'ID', value: branchId },
-      ])
-    );
+    if (hasCreatedBranch) {
+      Log.withTick(
+        `Created update channel ${chalk.bold(`"${newChannel.name}"`)} and branch ${chalk.bold(
+          `"${newChannel.name}"`
+        )} on ${chalk.bold(projectDisplayName)} project. ${learnMoreLink}`
+      );
+    } else {
+      Log.withTick(
+        `Created update channel ${chalk.bold(`"${newChannel.name}"`)} on ${chalk.bold(
+          projectDisplayName
+        )} project and connected it with existing ${chalk.bold(
+          `"${newChannel.name}"`
+        )} branch. ${learnMoreLink}`
+      );
+    }
  }
  return newChannel;
 }
@@ -38,7 +38,12 @@ export async function fetchBuildsAsync({
 }: {
  graphqlClient: ExpoGraphqlClient;
  projectId: string;
-  filters?: { statuses?: BuildStatus[]; platform?: RequestedPlatform; profile?: string };
+  filters?: {
+    statuses?: BuildStatus[];
+    platform?: RequestedPlatform;
+    profile?: string;
+    hasFingerprint?: boolean;
+  };
 }): Promise<BuildFragment[]> {
  let builds: BuildFragment[];
  const queryFilters: InputMaybe<BuildFilter> = {};
@@ -48,6 +53,9 @@ export async function fetchBuildsAsync({
  if (filters?.profile) {
    queryFilters['buildProfile'] = filters.profile;
  }
+  if (filters?.hasFingerprint) {
+    queryFilters['hasFingerprint'] = filters.hasFingerprint;
+  }
  if (!filters?.statuses) {
    builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
      appId: projectId,
@@ -7,8 +7,8 @@ import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 import { loadServerSideEnvironmentVariablesAsync } from './contextUtils/loadServerSideEnvironmentVariablesAsync';
 import {
  ExpoConfigOptions,
-  getPrivateExpoConfig,
-  getPublicExpoConfig,
+  getPrivateExpoConfigAsync,
+  getPublicExpoConfigAsync,
 } from '../../project/expoConfig';

 export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
@@ -25,7 +25,7 @@ export class DynamicPublicProjectConfigContextField extends ContextField<Dynamic
  }: ContextOptions): Promise<DynamicConfigContextFn> {
    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
    return async (options?: ExpoConfigOptions) => {
-      const expBefore = getPublicExpoConfig(projectDir, options);
+      const expBefore = await getPublicExpoConfigAsync(projectDir, options);
      const projectId = await getProjectIdAsync(sessionManager, expBefore, {
        nonInteractive,
        env: options?.env,
@@ -48,7 +48,7 @@ export class DynamicPublicProjectConfigContextField extends ContextField<Dynamic
          },
        };
      }
-      const exp = getPublicExpoConfig(projectDir, options);
+      const exp = await getPublicExpoConfigAsync(projectDir, options);
      return {
        exp,
        projectDir,
@@ -66,7 +66,7 @@ export class DynamicPrivateProjectConfigContextField extends ContextField<Dynami
  }: ContextOptions): Promise<DynamicConfigContextFn> {
    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
    return async (options?: ExpoConfigOptions) => {
-      const expBefore = getPrivateExpoConfig(projectDir, options);
+      const expBefore = await getPrivateExpoConfigAsync(projectDir, options);
      const projectId = await getProjectIdAsync(sessionManager, expBefore, {
        nonInteractive,
        env: options?.env,
@@ -89,7 +89,7 @@ export class DynamicPrivateProjectConfigContextField extends ContextField<Dynami
          },
        };
      }
-      const exp = getPrivateExpoConfig(projectDir, options);
+      const exp = await getPrivateExpoConfigAsync(projectDir, options);
      return {
        exp,
        projectDir,
@@ -6,7 +6,7 @@ import { createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 import { loadServerSideEnvironmentVariablesAsync } from './contextUtils/loadServerSideEnvironmentVariablesAsync';
-import { getPrivateExpoConfig } from '../../project/expoConfig';
+import { getPrivateExpoConfigAsync } from '../../project/expoConfig';

 export class OptionalPrivateProjectConfigContextField extends ContextField<
  | {
@@ -41,7 +41,7 @@ export class OptionalPrivateProjectConfigContextField extends ContextField<
      return undefined;
    }

-    const expBefore = getPrivateExpoConfig(projectDir);
+    const expBefore = await getPrivateExpoConfigAsync(projectDir);
    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
      nonInteractive,
    });
@@ -58,7 +58,7 @@ export class OptionalPrivateProjectConfigContextField extends ContextField<
      });
      serverSideEnvVars = serverSideEnvironmentVariables;
    }
-    const exp = getPrivateExpoConfig(projectDir, { env: serverSideEnvVars });
+    const exp = await getPrivateExpoConfigAsync(projectDir, { env: serverSideEnvVars });
    return {
      exp,
      projectDir,
@@ -5,7 +5,7 @@ import { createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 import { loadServerSideEnvironmentVariablesAsync } from './contextUtils/loadServerSideEnvironmentVariablesAsync';
-import { getPrivateExpoConfig } from '../../project/expoConfig';
+import { getPrivateExpoConfigAsync } from '../../project/expoConfig';

 export class PrivateProjectConfigContextField extends ContextField<{
  projectId: string;
@@ -22,7 +22,7 @@ export class PrivateProjectConfigContextField extends ContextField<{
    projectDir: string;
  }> {
    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    const expBefore = getPrivateExpoConfig(projectDir);
+    const expBefore = await getPrivateExpoConfigAsync(projectDir);
    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
      nonInteractive,
    });
@@ -39,7 +39,7 @@ export class PrivateProjectConfigContextField extends ContextField<{
      });
      serverSideEnvVars = serverSideEnvironmentVariables;
    }
-    const exp = getPrivateExpoConfig(projectDir, { env: serverSideEnvVars });
+    const exp = await getPrivateExpoConfigAsync(projectDir, { env: serverSideEnvVars });

    return {
      projectId,
@@ -1,12 +1,12 @@
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-import { getPrivateExpoConfig } from '../../project/expoConfig';
+import { getPrivateExpoConfigAsync } from '../../project/expoConfig';

 export class ProjectIdContextField extends ContextField<string> {
  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<string> {
    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    const expBefore = getPrivateExpoConfig(projectDir);
+    const expBefore = await getPrivateExpoConfigAsync(projectDir);
    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
      nonInteractive,
    });
@@ -3,7 +3,7 @@ import { createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 import { loadServerSideEnvironmentVariablesAsync } from './contextUtils/loadServerSideEnvironmentVariablesAsync';
-import { getPublicExpoConfig } from '../../project/expoConfig';
+import { getPublicExpoConfigAsync } from '../../project/expoConfig';

 type GetServerSideEnvironmentVariablesFn = (
  maybeEnv?: Record<string, string>
@@ -22,7 +22,7 @@ export class ServerSideEnvironmentVariablesContextField extends ContextField<Get
          'withServerSideEnvironment parameter is required to evaluate ServerSideEnvironmentVariablesContextField'
        );
      }
-      const exp = getPublicExpoConfig(projectDir, { env: maybeEnv });
+      const exp = await getPublicExpoConfigAsync(projectDir, { env: maybeEnv });
      const projectId = await getProjectIdAsync(sessionManager, exp, {
        nonInteractive,
        env: maybeEnv,
@@ -6,6 +6,7 @@ import { Role } from '../../../../graphql/generated';
 import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { learnMore } from '../../../../log';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
+import { isExpoInstalled } from '../../../../project/projectUtils';
 import SessionManager from '../../../../user/SessionManager';
 import { findProjectRootAsync } from '../findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from '../getProjectIdAsync';
@@ -21,6 +22,7 @@ jest.mock('../../../../ora', () => ({
  }),
 }));
 jest.mock('../../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync');
+jest.mock('../../../../project/projectUtils');

 describe(getProjectIdAsync, () => {
  let sessionManager: SessionManager;
@@ -71,6 +73,7 @@ describe(getProjectIdAsync, () => {
    );

    jest.mocked(findProjectRootAsync).mockResolvedValue('/app');
+    jest.mocked(isExpoInstalled).mockReturnValue(true);
  });

  it('gets the project ID from app config if exists', async () => {
@@ -222,7 +225,7 @@ describe(getProjectIdAsync, () => {
    jest.mocked(getConfig).mockReturnValue({ exp: { name: 'test', slug: 'test' } } as any);
    jest.mocked(modifyConfigAsync).mockResolvedValue({
      type: 'success',
-      config: { expo: { name: 'test', slug: 'test', extra: { eas: { projectId: '2345' } } } },
+      config: { name: 'test', slug: 'test', extra: { eas: { projectId: '2345' } } },
    });
    jest
      .mocked(fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)
@@ -42,7 +42,7 @@ async function ensureEasCliIsNotInDependenciesAsync(projectDir: string): Promise
    consoleWarn(`Found ${chalk.bold('eas-cli')} in your project dependencies.`);
  }

-  const maybeRepoRoot = PackageManagerUtils.findWorkspaceRoot(projectDir) ?? projectDir;
+  const maybeRepoRoot = PackageManagerUtils.resolveWorkspaceRoot(projectDir) ?? projectDir;
  if (maybeRepoRoot !== projectDir && (await isEasCliInDependenciesAsync(maybeRepoRoot))) {
    printCliVersionWarning = true;
    consoleWarn(`Found ${chalk.bold('eas-cli')} in your monorepo dependencies.`);
@@ -103,6 +103,8 @@ export async function findProjectRootAsync({
  }
 }

+let ranEnsureEasCliIsNotInDependencies = false;
+
 /**
 * Determine the project root directory and ensure some constraints about the project setup
 * like CLI version and dependencies.
@@ -113,6 +115,9 @@ export async function findProjectRootAsync({
 export async function findProjectDirAndVerifyProjectSetupAsync(): Promise<string> {
  const projectDir = await findProjectRootAsync();
  await applyCliConfigAsync(projectDir);
-  await ensureEasCliIsNotInDependenciesAsync(projectDir);
+  if (!ranEnsureEasCliIsNotInDependencies) {
+    ranEnsureEasCliIsNotInDependencies = true;
+    await ensureEasCliIsNotInDependenciesAsync(projectDir);
+  }
  return projectDir;
 }
@@ -7,9 +7,11 @@ import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import Log, { learnMore } from '../../../log';
 import { ora } from '../../../ora';
-import { createOrModifyExpoConfigAsync, getPrivateExpoConfig } from '../../../project/expoConfig';
+import {
+  createOrModifyExpoConfigAsync,
+  getPrivateExpoConfigAsync,
+} from '../../../project/expoConfig';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
-import { toAppPrivacy } from '../../../project/projectUtils';
 import SessionManager from '../../../user/SessionManager';
 import { Actor, getActorUsername } from '../../../user/User';

@@ -25,7 +27,7 @@ export async function saveProjectIdToAppConfigAsync(
  options: { env?: Env } = {}
 ): Promise<void> {
  // NOTE(cedric): we disable plugins to avoid writing plugin-generated content to `expo.extra`
-  const exp = getPrivateExpoConfig(projectDir, { skipPlugins: true, ...options });
+  const exp = await getPrivateExpoConfigAsync(projectDir, { skipPlugins: true, ...options });
  const result = await createOrModifyExpoConfigAsync(
    projectDir,
    {
@@ -194,7 +196,6 @@ export async function validateOrSetProjectIdAsync({
    {
      accountName: getAccountNameForEASProjectSync(exp, actor),
      projectName: exp.slug,
-      privacy: toAppPrivacy(exp.privacy),
    },
    {
      nonInteractive: options.nonInteractive,
@@ -42,22 +42,13 @@ export async function loadServerSideEnvironmentVariablesAsync({

  if (Object.keys(serverEnvVars).length > 0) {
    Log.log(
-      `Environment variables loaded from the "${environment.toLowerCase()}" environment on EAS servers: ${Object.keys(
+      `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${Object.keys(
        serverEnvVars
      ).join(', ')}.`
    );
  } else {
    Log.log(
-      `No environment variables found for the "${environment.toLowerCase()}" environment on EAS servers.`
-    );
-  }
-
-  const encryptedEnvVars = environmentVariables.filter(({ name, value }) => name && !value);
-  if (encryptedEnvVars.length > 0) {
-    Log.warn(
-      `Some environment variables defined in the "${environment.toLowerCase()}" environment on EAS servers are of "encrypted" type and cannot be read outside of the EAS servers (including EAS CLI): ${encryptedEnvVars
-        .map(({ name }) => name)
-        .join(', ')}. `
+      `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`
    );
  }
  Log.newLine();
@@ -1,6 +1,6 @@
 import { Flags } from '@oclif/core';

-import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../graphql/generated';
+import { EnvironmentVariableEnvironment } from '../graphql/generated';

 // NOTE: not exactly true, but, provided mapToLowercase and upperCaseAsync
 // are used in tandem, it saves on unnecessary typying in commands
@@ -52,18 +52,19 @@ export const EASVariableFormatFlag = {
 };

 export const EASVariableVisibilityFlag = {
-  visibility: Flags.enum<'plaintext' | 'sensitive' | 'encrypted'>({
+  visibility: Flags.enum<'plaintext' | 'sensitive' | 'secret'>({
    description: 'Visibility of the variable',
-    options: ['plaintext', 'sensitive', 'encrypted'],
+    options: ['plaintext', 'sensitive', 'secret'],
  }),
 };

-export const EASVariableScopeFlag = {
-  scope: Flags.enum<EnvironmentVariableScope>({
+export type EASEnvironmentVariableScopeFlagValue = 'project' | 'account';
+
+export const EASEnvironmentVariableScopeFlag = {
+  scope: Flags.enum<EASEnvironmentVariableScopeFlagValue>({
    description: 'Scope for the variable',
-    options: mapToLowercase([EnvironmentVariableScope.Shared, EnvironmentVariableScope.Project]),
-    parse: upperCaseAsync,
-    default: EnvironmentVariableScope.Project,
+    options: ['project', 'account'],
+    default: 'project',
  }),
 };

@@ -78,3 +79,14 @@ export const EasJsonOnlyFlag = {
    description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
  }),
 };
+
+export const EasUpdateEnvironmentFlag = {
+  environment: Flags.enum<EnvironmentVariableEnvironment | null>({
+    description:
+      'Environment to use for the server-side defined EAS environment variables during command execution.',
+    options: mapToLowercase(Object.values(EnvironmentVariableEnvironment)),
+    parse: upperCaseAsync,
+    required: false,
+    default: null,
+  }),
+};
@@ -58,7 +58,7 @@ export default class BranchCreate extends EasCommand {
        type: 'text',
        name: 'name',
        message: 'Provide a branch name:',
-        initial: await getDefaultBranchNameAsync(vcsClient),
+        initial: (await getDefaultBranchNameAsync(vcsClient)) ?? undefined,
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -7,6 +7,7 @@ import EasCommand from '../../commandUtils/EasCommand';
 import { RequestedPlatform } from '../../platform';
 import { enableJsonOutput } from '../../utils/json';
 import GitNoCommitClient from '../../vcs/clients/gitNoCommit';
+import NoVcsClient from '../../vcs/clients/noVcs';

 /**
 * This command will be run on the EAS Build workers, when building
@@ -63,7 +64,7 @@ export default class BuildInternal extends EasCommand {
      vcsClient,
    } = await this.getContextAsync(BuildInternal, {
      nonInteractive: true,
-      vcsClientOverride: new GitNoCommitClient(),
+      vcsClientOverride: process.env.EAS_NO_VCS ? new NoVcsClient() : new GitNoCommitClient(),
      withServerSideEnvironment: null,
    });

@@ -62,6 +62,9 @@ export default class BuildList extends EasCommand {
      aliases: ['gitCommitHash'],
      description: 'Filter only builds created with the specified git commit hash',
    }),
+    'fingerprint-hash': Flags.string({
+      description: 'Filter only builds with the specified fingerprint hash',
+    }),
    ...EasPaginatedQueryFlags,
    limit: getLimitFlagWithCustomValues({ defaultTo: 10, limit: BUILDS_LIMIT }),
    ...EasNonInteractiveAndJsonFlags,
@@ -130,6 +133,7 @@ export default class BuildList extends EasCommand {
        buildProfile: flags['build-profile'],
        gitCommitHash: flags['git-commit-hash'],
        simulator: flags.simulator,
+        fingerprintHash: flags['fingerprint-hash'],
      },
      paginatedQueryOptions,
    });
@@ -120,7 +120,7 @@ export default class BuildVersionSyncView extends EasCommand {
      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform, vcsClient);
      if (!remoteVersions?.buildVersion) {
        Log.warn(
-          `Skipping versions sync for ${platformDisplayName}. There are no versions configured on Expo servers, use "eas build:version:set" or run a build to initialize it.`
+          `Skipping versions sync for ${platformDisplayName}. There are no versions configured on EAS, use "eas build:version:set" or run a build to initialize it.`
        );
        continue;
      }
@@ -33,12 +33,9 @@ interface RawDeployAliasFlags {
 }

 export default class WorkerAlias extends EasCommand {
-  static override description = 'Assign deployment aliases';
-  static override aliases = ['deploy:alias', 'deploy:promote'];
-
-  // TODO(@kitten): Keep command hidden until worker deployments are live
-  static override hidden = true;
-  static override state = 'beta';
+  static override description = 'Assign deployment aliases.';
+  static override aliases = ['worker:alias', 'deploy:promote'];
+  static override state = 'preview';

  static override flags = {
    prod: Flags.boolean({
@@ -73,7 +70,7 @@ export default class WorkerAlias extends EasCommand {
      enableJsonOutput();
    }

-    Log.warn('EAS Worker Deployments are in beta and subject to breaking changes.');
+    Log.warn('EAS Hosting is still in preview and subject to changes.');

    const {
      getDynamicPrivateProjectConfigAsync,
@@ -43,16 +43,18 @@ interface DeployFlags {
  environment?: EnvironmentVariableEnvironment;
  deploymentIdentifier?: string;
  exportDir: string;
+  dryRun: boolean;
 }

 interface RawDeployFlags {
  'non-interactive': boolean;
-  environment?: string;
+  environment?: EnvironmentVariableEnvironment;
  json: boolean;
  prod: boolean;
  alias?: string;
  id?: string;
  'export-dir': string;
+  'dry-run': boolean;
 }

 interface DeployInProgressParams {
@@ -63,13 +65,10 @@ interface DeployInProgressParams {
 }

 export default class WorkerDeploy extends EasCommand {
-  static override description = 'Deploy your Expo web build';
-  static override aliases = ['deploy'];
+  static override description = 'Deploy your Expo Router web build and API Routes.';
+  static override aliases = ['worker:deploy'];
  static override usage = [chalk`deploy {dim [options]}`, `deploy --prod`];
-
-  // TODO(@kitten): Keep command hidden until worker deployments are live
-  static override hidden = true;
-  static override state = 'beta';
+  static override state = 'preview';

  static override flags = {
    prod: Flags.boolean({
@@ -90,10 +89,11 @@ export default class WorkerDeploy extends EasCommand {
      helpValue: 'dir',
      default: 'dist',
    }),
-    environment: {
-      ...EASEnvironmentFlag.environment,
-      description: 'Deploy with EAS Environment Variables matching the specified environment.',
-    },
+    'dry-run': Flags.boolean({
+      description: 'Outputs a tarball of the new deployment instead of uploading it.',
+      default: false,
+    }),
+    ...EASEnvironmentFlag,
    ...EasNonInteractiveAndJsonFlags,
  };

@@ -111,7 +111,7 @@ export default class WorkerDeploy extends EasCommand {
      enableJsonOutput();
    }

-    Log.warn('EAS Worker Deployments are in beta and subject to breaking changes.');
+    Log.warn('EAS Hosting is still in preview and subject to changes.');

    const {
      getDynamicPrivateProjectConfigAsync,
@@ -250,7 +250,7 @@ export default class WorkerDeploy extends EasCommand {
    let progress = ora('Preparing project').start();

    try {
-      const manifest = await WorkerAssets.createManifestAsync(
+      const manifestResult = await WorkerAssets.createManifestAsync(
        {
          environment: flags.environment,
          projectDir,
@@ -258,16 +258,33 @@ export default class WorkerDeploy extends EasCommand {
        },
        graphqlClient
      );
+      if (manifestResult.conflictingVariableNames?.length) {
+        Log.warn(
+          '> The following environment variables were present in local .env files as well as EAS environment variables. ' +
+            'In case of conflict, the EAS environment variable values will be used: ' +
+            manifestResult.conflictingVariableNames.join(' ')
+        );
+      }
      assetMap = await WorkerAssets.createAssetMapAsync(
        projectDist.type === 'server' ? projectDist.clientPath : projectDist.path
      );
      tarPath = await WorkerAssets.packFilesIterableAsync(
        emitWorkerTarballAsync({
          assetMap,
-          manifest,
+          manifest: manifestResult.manifest,
        })
      );

+      if (flags.dryRun) {
+        const DRY_RUN_OUTPUT_PATH = 'deploy.tar.gz';
+        await fs.promises.copyFile(tarPath, DRY_RUN_OUTPUT_PATH);
+        progress.succeed('Saved deploy.tar.gz tarball');
+        if (flags.json) {
+          printJsonOnlyOutput({ tarPath: DRY_RUN_OUTPUT_PATH });
+        }
+        return;
+      }
+
      const uploadUrl = await getSignedDeploymentUrlAsync(graphqlClient, {
        appId: projectId,
        deploymentIdentifier: flags.deploymentIdentifier,
@@ -382,6 +399,8 @@ export default class WorkerDeploy extends EasCommand {
      aliasName: flags.alias?.trim().toLowerCase(),
      deploymentIdentifier: flags.id?.trim(),
      exportDir: flags['export-dir'],
+      environment: flags['environment'],
+      dryRun: flags['dry-run'],
    };
  }
 }
@@ -411,7 +430,7 @@ async function resolveExportedProjectAsync(

  if (!exportDirStat?.isDirectory()) {
    throw new Error(
-      `No "${flags.exportDir}/" folder found. Prepare your project for deployment with "npx expo export --platform web"`
+      `No "${flags.exportDir}/" folder found. Export your app with "npx expo export --platform web"`
    );
  }

@@ -436,7 +455,8 @@ function logExportedProjectInfo(
  // Only show the timestamp for exports older than 1 minute
  if (project.modifiedAt && Date.now() - project.modifiedAt.getTime() > 60_000) {
    modifiedAgo = ` - exported ${formatTimeAgo(project.modifiedAt)}`;
+    Log.warn(`> Project export: ${project.type}${modifiedAgo}`);
+  } else {
+    Log.log(chalk`{dim > Project export: ${project.type}}`);
  }
-
-  Log.log(chalk`{dim > Project export: ${project.type}${modifiedAgo}}`);
 }
@@ -147,10 +147,10 @@ export default class DeviceDelete extends EasCommand {
    graphqlClient: ExpoGraphqlClient,
    chosenDevice: AppleDevice | AppleDeviceQueryResult
  ): Promise<void> {
-    const removalSpinner = ora(`Removing Apple device on Expo`).start();
+    const removalSpinner = ora(`Removing Apple device on EAS`).start();
    try {
      await AppleDeviceMutation.deleteAppleDeviceAsync(graphqlClient, chosenDevice.id);
-      removalSpinner.succeed('Removed Apple device from Expo');
+      removalSpinner.succeed('Removed Apple device from EAS');
    } catch (err) {
      removalSpinner.fail();
      throw err;
@@ -105,12 +105,12 @@ export default class DeviceRename extends EasCommand {
    chosenDevice: AppleDevice | AppleDeviceQueryResult,
    newDeviceName: string
  ): Promise<void> {
-    const removalSpinner = ora(`Renaming Apple device on Expo`).start();
+    const removalSpinner = ora(`Renaming Apple device on EAS`).start();
    try {
      await AppleDeviceMutation.updateAppleDeviceAsync(graphqlClient, chosenDevice.id, {
        name: newDeviceName,
      });
-      removalSpinner.succeed('Renamed Apple device on Expo');
+      removalSpinner.succeed('Renamed Apple device on EAS');
    } catch (err) {
      removalSpinner.fail();
      throw err;
@@ -19,14 +19,14 @@ import {
  promptVariableTypeAsync,
  promptVariableValueAsync,
 } from '../../../utils/prompts';
-import EnvironmentVariableCreate from '../create';
+import EnvCreate from '../create';

 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../utils/prompts');

-describe(EnvironmentVariableCreate, () => {
+describe(EnvCreate, () => {
  const graphqlClient = {} as any as ExpoGraphqlClient;
  const mockConfig = {} as unknown as Config;
  const variableId = 'testId';
@@ -74,7 +74,7 @@ describe(EnvironmentVariableCreate, () => {

  describe('in interactive mode', () => {
    it('creates a project variable', async () => {
-      const command = new EnvironmentVariableCreate(
+      const command = new EnvCreate(
        [
          '--name',
          'VarName',
@@ -83,7 +83,7 @@ describe(EnvironmentVariableCreate, () => {
          '--environment',
          'production',
          '--visibility',
-          'encrypted',
+          'secret',
        ],
        mockConfig
      );
@@ -110,7 +110,7 @@ describe(EnvironmentVariableCreate, () => {
    });

    it('updates an existing variable in the same environment', async () => {
-      const command = new EnvironmentVariableCreate(
+      const command = new EnvCreate(
        [
          '--name',
          'VarName',
@@ -119,7 +119,7 @@ describe(EnvironmentVariableCreate, () => {
          '--environment',
          'production',
          '--visibility',
-          'encrypted',
+          'secret',
        ],
        mockConfig
      );
@@ -171,8 +171,8 @@ describe(EnvironmentVariableCreate, () => {
      });
    });

-    it('creates a shared variable', async () => {
-      const command = new EnvironmentVariableCreate(
+    it('creates an account-wide variable', async () => {
+      const command = new EnvCreate(
        [
          '--name',
          'VarName',
@@ -181,7 +181,7 @@ describe(EnvironmentVariableCreate, () => {
          '--environment',
          'production',
          '--scope',
-          'shared',
+          'account',
        ],
        mockConfig
      );
@@ -199,6 +199,7 @@ describe(EnvironmentVariableCreate, () => {
        {
          name: 'VarName',
          value: 'VarValue',
+          isGlobal: true,
          environments: [EnvironmentVariableEnvironment.Production],
          visibility: EnvironmentVariableVisibility.Public,
          type: EnvironmentSecretType.String,
@@ -207,8 +208,8 @@ describe(EnvironmentVariableCreate, () => {
      );
    });

-    it('throws if a shared variable already exists', async () => {
-      const command = new EnvironmentVariableCreate(
+    it('throws if an account-wide variable already exists', async () => {
+      const command = new EnvCreate(
        [
          '--name',
          'VarName',
@@ -217,7 +218,7 @@ describe(EnvironmentVariableCreate, () => {
          '--environment',
          'production',
          '--scope',
-          'shared',
+          'account',
        ],
        mockConfig
      );
@@ -242,8 +243,8 @@ describe(EnvironmentVariableCreate, () => {
      await expect(command.runAsync()).rejects.toThrow();
    });

-    it('updates if a shared variable already exists and --force flag is set', async () => {
-      const command = new EnvironmentVariableCreate(
+    it('updates if an account-wide variable already exists and --force flag is set', async () => {
+      const command = new EnvCreate(
        [
          '--name',
          'VarName',
@@ -253,7 +254,7 @@ describe(EnvironmentVariableCreate, () => {
          'production',
          '--force',
          '--scope',
-          'shared',
+          'account',
        ],
        mockConfig
      );
@@ -288,8 +289,8 @@ describe(EnvironmentVariableCreate, () => {
      });
    });

-    it('creates a shared variable and links it', async () => {
-      const command = new EnvironmentVariableCreate(
+    it('creates an account-wide variable and links it', async () => {
+      const command = new EnvCreate(
        [
          '--name',
          'VarName',
@@ -300,7 +301,7 @@ describe(EnvironmentVariableCreate, () => {
          '--environment',
          'development',
          '--scope',
-          'shared',
+          'account',
          '--link',
        ],
        mockConfig
@@ -324,6 +325,7 @@ describe(EnvironmentVariableCreate, () => {
            EnvironmentVariableEnvironment.Development,
          ],
          visibility: EnvironmentVariableVisibility.Public,
+          isGlobal: true,
          type: EnvironmentSecretType.String,
        },
        testAccountId
@@ -343,7 +345,7 @@ describe(EnvironmentVariableCreate, () => {
    });

    it('prompts for missing arguments', async () => {
-      const command = new EnvironmentVariableCreate([], mockConfig);
+      const command = new EnvCreate([], mockConfig);

      jest.mocked(promptVariableNameAsync).mockImplementation(async () => 'VarName');
      jest.mocked(promptVariableValueAsync).mockImplementation(async () => 'VarValue');
@@ -8,14 +8,14 @@ import { EnvironmentVariableMutation } from '../../../graphql/mutations/Environm
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../../log';
 import { promptAsync, toggleConfirmAsync } from '../../../prompts';
-import EnvironmentVariableDelete from '../delete';
+import EnvDelete from '../delete';

 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
 jest.mock('../../../prompts');
 jest.mock('../../../log');

-describe(EnvironmentVariableDelete, () => {
+describe(EnvDelete, () => {
  const projectId = 'test-project-id';
  const variableId = '1';
  const graphqlClient = {};
@@ -40,7 +40,7 @@ describe(EnvironmentVariableDelete, () => {
    ];
    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);

-    const command = new EnvironmentVariableDelete(
+    const command = new EnvDelete(
      [
        '--variable-name',
        'TEST_VARIABLE',
@@ -66,7 +66,7 @@ describe(EnvironmentVariableDelete, () => {
    (promptAsync as jest.Mock).mockResolvedValue({ variable: mockVariables[0] });
    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);

-    const command = new EnvironmentVariableDelete([], mockConfig);
+    const command = new EnvDelete([], mockConfig);
    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
    await command.runAsync();
@@ -82,10 +82,7 @@ describe(EnvironmentVariableDelete, () => {
    ];
    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);

-    const command = new EnvironmentVariableDelete(
-      ['--variable-name', 'NON_EXISTENT_VARIABLE'],
-      mockConfig
-    );
+    const command = new EnvDelete(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
@@ -99,7 +96,7 @@ describe(EnvironmentVariableDelete, () => {
    ];
    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);

-    const command = new EnvironmentVariableDelete(['--variable-name', 'TEST_VARIABLE'], mockConfig);
+    const command = new EnvDelete(['--variable-name', 'TEST_VARIABLE'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
@@ -116,7 +113,7 @@ describe(EnvironmentVariableDelete, () => {
    (promptAsync as jest.Mock).mockResolvedValue({ variable: mockVariables[0] });
    (toggleConfirmAsync as jest.Mock).mockResolvedValue(false);

-    const command = new EnvironmentVariableDelete(['--non-interactive'], mockConfig);
+    const command = new EnvDelete(['--non-interactive'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
@@ -12,14 +12,14 @@ import {
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../../log';
 import { promptVariableEnvironmentAsync, promptVariableNameAsync } from '../../../utils/prompts';
-import EnvironmentVariableGet from '../get';
+import EnvGet from '../get';

 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../utils/prompts');

-describe(EnvironmentVariableGet, () => {
+describe(EnvGet, () => {
  const graphqlClient = {} as any as ExpoGraphqlClient;
  const mockConfig = {} as unknown as Config;
  const mockVariables: EnvironmentVariableFragment[] = [
@@ -42,7 +42,7 @@ describe(EnvironmentVariableGet, () => {
      .mockResolvedValueOnce(mockVariables);
    jest.spyOn(Log, 'log').mockImplementation(() => {});

-    const command = new EnvironmentVariableGet(['--variable-name', 'TEST_VAR_1'], mockConfig);
+    const command = new EnvGet(['--variable-name', 'TEST_VAR_1'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue({
@@ -68,7 +68,7 @@ describe(EnvironmentVariableGet, () => {
    const errorMessage =
      "Variable name is required. Run the command with '--variable-name VARIABLE_NAME' flag";

-    const command = new EnvironmentVariableGet([], mockConfig);
+    const command = new EnvGet([], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue({
@@ -85,7 +85,7 @@ describe(EnvironmentVariableGet, () => {
      .mockResolvedValueOnce(EnvironmentVariableEnvironment.Production);
    jest.mocked(promptVariableNameAsync).mockResolvedValueOnce('TEST_VAR_1');

-    const command = new EnvironmentVariableGet([], mockConfig);
+    const command = new EnvGet([], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue({
@@ -11,7 +11,7 @@ import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../../log';
 import { promptAsync, selectAsync, toggleConfirmAsync } from '../../../prompts';
-import EnvironmentVariableLink from '../link';
+import EnvLink from '../link';

 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
@@ -19,7 +19,7 @@ jest.mock('../../../prompts');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../log');

-describe(EnvironmentVariableLink, () => {
+describe(EnvLink, () => {
  const projectId = 'test-project-id';
  const variableId = '1';
  const graphqlClient = {};
@@ -39,7 +39,7 @@ describe(EnvironmentVariableLink, () => {
    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
  });

-  it('links a shared variable to the current project in non-interactive mode', async () => {
+  it('links an account-wide variable to the current project in non-interactive mode', async () => {
    const mockVariables = [
      {
        id: variableId,
@@ -53,7 +53,7 @@ describe(EnvironmentVariableLink, () => {
      mockVariables[0]
    );

-    const command = new EnvironmentVariableLink(
+    const command = new EnvLink(
      ['--variable-name', 'TEST_VARIABLE', '--non-interactive'],
      mockConfig
    );
@@ -75,7 +75,7 @@ describe(EnvironmentVariableLink, () => {
    );
  });

-  it('links a shared variable to the current project to a specified environment', async () => {
+  it('links an account-wide variable to the current project to a specified environment', async () => {
    const mockVariables = [
      {
        id: variableId,
@@ -89,7 +89,7 @@ describe(EnvironmentVariableLink, () => {
      mockVariables[0]
    );

-    const command = new EnvironmentVariableLink(
+    const command = new EnvLink(
      ['--variable-name', 'TEST_VARIABLE', '--environment', 'production', '--non-interactive'],
      mockConfig
    );
@@ -137,7 +137,7 @@ describe(EnvironmentVariableLink, () => {
    );
    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);

-    const command = new EnvironmentVariableLink(
+    const command = new EnvLink(
      [
        '--variable-name',
        'TEST_VARIABLE',
@@ -186,7 +186,7 @@ describe(EnvironmentVariableLink, () => {
    (promptAsync as jest.Mock).mockResolvedValue({ environments: mockVariables[0].environments });
    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);

-    const command = new EnvironmentVariableLink([], mockConfig);
+    const command = new EnvLink([], mockConfig);
    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
    await command.runAsync();
@@ -207,15 +207,12 @@ describe(EnvironmentVariableLink, () => {
    const mockVariables: never[] = [];
    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);

-    const command = new EnvironmentVariableLink(
-      ['--variable-name', 'NON_EXISTENT_VARIABLE'],
-      mockConfig
-    );
+    const command = new EnvLink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
    await expect(command.runAsync()).rejects.toThrow(
-      "Shared variable NON_EXISTENT_VARIABLE doesn't exist"
+      "Account-wide variable NON_EXISTENT_VARIABLE doesn't exist"
    );
  });

@@ -239,7 +236,7 @@ describe(EnvironmentVariableLink, () => {
    });
    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);

-    const command = new EnvironmentVariableLink([], mockConfig);
+    const command = new EnvLink([], mockConfig);
    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
    await command.runAsync();
@@ -263,15 +260,12 @@ describe(EnvironmentVariableLink, () => {
    const mockVariables: never[] = [];
    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);

-    const command = new EnvironmentVariableLink(
-      ['--variable-name', 'NON_EXISTENT_VARIABLE'],
-      mockConfig
-    );
+    const command = new EnvLink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
    await expect(command.runAsync()).rejects.toThrow(
-      "Shared variable NON_EXISTENT_VARIABLE doesn't exist"
+      "Account-wide variable NON_EXISTENT_VARIABLE doesn't exist"
    );
  });
 });
@@ -13,7 +13,7 @@ import {
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../../log';
-import EnvironmentVariableList from '../list';
+import EnvList from '../list';

 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../graphql/queries/AppQuery');
@@ -44,7 +44,7 @@ const mockVariables: EnvironmentVariableFragment[] = [
  },
 ];

-describe(EnvironmentVariableList, () => {
+describe(EnvList, () => {
  const graphqlClient = {} as any as ExpoGraphqlClient;
  const mockConfig = {} as unknown as Config;

@@ -56,7 +56,7 @@ describe(EnvironmentVariableList, () => {
  it('lists project environment variables successfully', async () => {
    jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValueOnce(mockVariables);

-    const command = new EnvironmentVariableList([], mockConfig);
+    const command = new EnvList([], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue({
@@ -77,7 +77,7 @@ describe(EnvironmentVariableList, () => {
  it('lists project environment variables in specified environments', async () => {
    jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValueOnce(mockVariables);

-    const command = new EnvironmentVariableList(['--environment', 'production'], mockConfig);
+    const command = new EnvList(['--environment', 'production'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue({
@@ -100,7 +100,7 @@ describe(EnvironmentVariableList, () => {
      .mocked(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync)
      .mockResolvedValueOnce(mockVariables);

-    const command = new EnvironmentVariableList(['--include-sensitive'], mockConfig);
+    const command = new EnvList(['--include-sensitive'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue({
@@ -121,10 +121,10 @@ describe(EnvironmentVariableList, () => {
    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
  });

-  it('lists shared environment variables successfully', async () => {
+  it('lists account-wide environment variables successfully', async () => {
    jest.mocked(EnvironmentVariablesQuery.sharedAsync).mockResolvedValueOnce(mockVariables);

-    const command = new EnvironmentVariableList(['--scope', 'shared'], mockConfig);
+    const command = new EnvList(['--scope', 'account'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue({
@@ -142,15 +142,12 @@ describe(EnvironmentVariableList, () => {
    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
  });

-  it('lists shared environment variables including sensitive values', async () => {
+  it('lists account-wide environment variables including sensitive values', async () => {
    jest
      .mocked(EnvironmentVariablesQuery.sharedWithSensitiveAsync)
      .mockResolvedValueOnce(mockVariables);

-    const command = new EnvironmentVariableList(
-      ['--include-sensitive', '--scope', 'shared'],
-      mockConfig
-    );
+    const command = new EnvList(['--include-sensitive', '--scope', 'account'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue({
@@ -11,7 +11,7 @@ import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../../log';
 import { promptAsync, selectAsync, toggleConfirmAsync } from '../../../prompts';
-import EnvironmentVariableUnlink from '../unlink';
+import EnvUnlink from '../unlink';

 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
@@ -19,7 +19,7 @@ jest.mock('../../../prompts');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../log');

-describe(EnvironmentVariableUnlink, () => {
+describe(EnvUnlink, () => {
  const projectId = 'test-project-id';
  const variableId = '1';
  const graphqlClient = {};
@@ -39,7 +39,7 @@ describe(EnvironmentVariableUnlink, () => {
    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
  });

-  it('unlinks a shared variable from the current project in non-interactive mode', async () => {
+  it('unlinks an account-wide variable from the current project in non-interactive mode', async () => {
    const mockVariables = [
      {
        id: variableId,
@@ -54,7 +54,7 @@ describe(EnvironmentVariableUnlink, () => {
      EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync as jest.Mock
    ).mockResolvedValue(mockVariables[0]);

-    const command = new EnvironmentVariableUnlink(
+    const command = new EnvUnlink(
      ['--variable-name', 'TEST_VARIABLE', '--non-interactive'],
      mockConfig
    );
@@ -76,7 +76,7 @@ describe(EnvironmentVariableUnlink, () => {
    );
  });

-  it('unlinks a shared variable from the current project in a specified environment', async () => {
+  it('unlinks an account-wide variable from the current project in a specified environment', async () => {
    const mockVariables = [
      {
        id: variableId,
@@ -91,7 +91,7 @@ describe(EnvironmentVariableUnlink, () => {
      EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync as jest.Mock
    ).mockResolvedValue(mockVariables[0]);

-    const command = new EnvironmentVariableUnlink(
+    const command = new EnvUnlink(
      ['--variable-name', 'TEST_VARIABLE', '--environment', 'production', '--non-interactive'],
      mockConfig
    );
@@ -141,7 +141,7 @@ describe(EnvironmentVariableUnlink, () => {
    });
    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);

-    const command = new EnvironmentVariableUnlink([], mockConfig);
+    const command = new EnvUnlink([], mockConfig);
    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
    await command.runAsync();
@@ -162,15 +162,12 @@ describe(EnvironmentVariableUnlink, () => {
    const mockVariables: never[] = [];
    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);

-    const command = new EnvironmentVariableUnlink(
-      ['--variable-name', 'NON_EXISTENT_VARIABLE'],
-      mockConfig
-    );
+    const command = new EnvUnlink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
    await expect(command.runAsync()).rejects.toThrow(
-      "Shared variable NON_EXISTENT_VARIABLE doesn't exist"
+      "Account-wide variable NON_EXISTENT_VARIABLE doesn't exist"
    );
  });

@@ -194,7 +191,7 @@ describe(EnvironmentVariableUnlink, () => {
    });
    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);

-    const command = new EnvironmentVariableUnlink([], mockConfig);
+    const command = new EnvUnlink([], mockConfig);
    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
    await command.runAsync();
@@ -218,15 +215,12 @@ describe(EnvironmentVariableUnlink, () => {
    const mockVariables: never[] = [];
    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);

-    const command = new EnvironmentVariableUnlink(
-      ['--variable-name', 'NON_EXISTENT_VARIABLE'],
-      mockConfig
-    );
+    const command = new EnvUnlink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
    await expect(command.runAsync()).rejects.toThrow(
-      "Shared variable NON_EXISTENT_VARIABLE doesn't exist"
+      "Account-wide variable NON_EXISTENT_VARIABLE doesn't exist"
    );
  });
 });
@@ -12,7 +12,7 @@ import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../../log';
 import { promptAsync, toggleConfirmAsync } from '../../../prompts';
-import EnvironmentVariableUpdate from '../update';
+import EnvUpdate from '../update';

 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
@@ -20,7 +20,7 @@ jest.mock('../../../prompts');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../log');

-describe(EnvironmentVariableUpdate, () => {
+describe(EnvUpdate, () => {
  const projectId = 'test-project-id';
  const variableId = '1';
  const graphqlClient = {};
@@ -47,7 +47,7 @@ describe(EnvironmentVariableUpdate, () => {
    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
    (EnvironmentVariableMutation.updateAsync as jest.Mock).mockResolvedValue(mockVariables[0]);

-    const command = new EnvironmentVariableUpdate(
+    const command = new EnvUpdate(
      [
        '--variable-name',
        'TEST_VARIABLE',
@@ -81,7 +81,7 @@ describe(EnvironmentVariableUpdate, () => {
    );
  });

-  it('updates a shared variable by selected name in non-interactive mode', async () => {
+  it('updates an account-wide variable by selected name in non-interactive mode', async () => {
    const mockVariables = [
      {
        id: variableId,
@@ -93,7 +93,7 @@ describe(EnvironmentVariableUpdate, () => {
    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
    (EnvironmentVariableMutation.updateAsync as jest.Mock).mockResolvedValue(mockVariables[0]);

-    const command = new EnvironmentVariableUpdate(
+    const command = new EnvUpdate(
      [
        '--variable-name',
        'TEST_VARIABLE',
@@ -107,7 +107,7 @@ describe(EnvironmentVariableUpdate, () => {
        '--environment',
        'production',
        '--scope',
-        'shared',
+        'account',
      ],
      mockConfig
    );
@@ -135,7 +135,7 @@ describe(EnvironmentVariableUpdate, () => {
    (promptAsync as jest.Mock).mockResolvedValue({ name: mockVariables[0].name });
    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);

-    const command = new EnvironmentVariableUpdate([], mockConfig);
+    const command = new EnvUpdate([], mockConfig);
    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
    await command.runAsync();
@@ -154,10 +154,7 @@ describe(EnvironmentVariableUpdate, () => {
    const mockVariables: never[] = [];
    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);

-    const command = new EnvironmentVariableUpdate(
-      ['--variable-name', 'NON_EXISTENT_VARIABLE'],
-      mockConfig
-    );
+    const command = new EnvUpdate(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);

    // @ts-expect-error
    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EnvDelete cancels deletion when user does not confirm 1`] = `"Environment variable needs 'name' to be specified when running in non-interactive mode. Run the command with [1m--variable-name VARIABLE_NAME[22m flag to fix the issue"`;
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`EnvironmentVariableDelete cancels deletion when user does not confirm 1`] = `"Environment variable needs 'name' to be specified when running in non-interactive mode. Run the command with [1m--variable-name VARIABLE_NAME[22m flag to fix the issue"`;
@@ -5,9 +5,10 @@ import path from 'path';

 import EasCommand from '../../commandUtils/EasCommand';
 import {
+  EASEnvironmentVariableScopeFlag,
+  EASEnvironmentVariableScopeFlagValue,
  EASMultiEnvironmentFlag,
  EASNonInteractiveFlag,
-  EASVariableScopeFlag,
  EASVariableVisibilityFlag,
 } from '../../commandUtils/flags';
 import {
@@ -32,25 +33,43 @@ import {
  promptVariableValueAsync,
  promptVariableVisibilityAsync,
 } from '../../utils/prompts';
-import { performForEnvironmentsAsync } from '../../utils/variableUtils';
+import { isEnvironment, performForEnvironmentsAsync } from '../../utils/variableUtils';

-type CreateFlags = {
+interface RawCreateFlags {
  name?: string;
  value?: string;
  link?: boolean;
  force?: boolean;
  type?: 'string' | 'file';
-  visibility?: 'plaintext' | 'sensitive' | 'encrypted';
-  scope?: EnvironmentVariableScope;
+  visibility?: 'plaintext' | 'sensitive' | 'secret';
+  scope: EASEnvironmentVariableScopeFlagValue;
  environment?: EnvironmentVariableEnvironment[];
  'non-interactive': boolean;
-};
+}

-export default class EnvironmentVariableCreate extends EasCommand {
-  static override description =
-    'create an environment variable on the current project or owner account';
+interface CreateFlags {
+  name?: string;
+  value?: string;
+  link?: boolean;
+  force?: boolean;
+  type?: 'string' | 'file';
+  visibility?: 'plaintext' | 'sensitive' | 'secret';
+  scope: EnvironmentVariableScope;
+  environment?: EnvironmentVariableEnvironment[];
+  'non-interactive': boolean;
+}

-  static override hidden = true;
+export default class EnvCreate extends EasCommand {
+  static override description = 'create an environment variable for the current project or account';
+
+  static override args = [
+    {
+      name: 'environment',
+      description:
+        "Environment to create the variable in. One of 'production', 'preview', or 'development'.",
+      required: false,
+    },
+  ];

  static override flags = {
    name: Flags.string({
@@ -60,7 +79,8 @@ export default class EnvironmentVariableCreate extends EasCommand {
      description: 'Text value or the variable',
    }),
    link: Flags.boolean({
-      description: 'Link shared variable to the current project',
+      description: 'Link account-wide variable to the current project',
+      hidden: true, // every account-wide variable is global for now so it's not user facing
    }),
    force: Flags.boolean({
      description: 'Overwrite existing variable',
@@ -71,7 +91,7 @@ export default class EnvironmentVariableCreate extends EasCommand {
      options: ['string', 'file'],
    }),
    ...EASVariableVisibilityFlag,
-    ...EASVariableScopeFlag,
+    ...EASEnvironmentVariableScopeFlag,
    ...EASMultiEnvironmentFlag,
    ...EASNonInteractiveFlag,
  };
@@ -83,9 +103,9 @@ export default class EnvironmentVariableCreate extends EasCommand {
  };

  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(EnvironmentVariableCreate);
+    const { args, flags } = await this.parse(EnvCreate);

-    const validatedFlags = this.validateFlags(flags);
+    const validatedFlags = this.sanitizeFlags(flags);

    const {
      name,
@@ -98,12 +118,12 @@ export default class EnvironmentVariableCreate extends EasCommand {
      force,
      type,
      fileName,
-    } = await this.promptForMissingFlagsAsync(validatedFlags);
+    } = await this.promptForMissingFlagsAsync(validatedFlags, args);

    const {
      projectId,
      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvironmentVariableCreate, {
+    } = await this.getContextAsync(EnvCreate, {
      nonInteractive,
    });

@@ -138,12 +158,12 @@ export default class EnvironmentVariableCreate extends EasCommand {
          await this.promptForOverwriteAsync({
            nonInteractive,
            force,
-            message: `Shared variable with ${name} name already exists on this account.`,
+            message: `Account-wide variable with ${name} name already exists on this account.`,
            suggestion: 'Do you want to unlink it first?',
          });

          Log.withTick(
-            `Unlinking shared variable ${chalk.bold(name)} on project ${chalk.bold(
+            `Unlinking account-wide variable ${chalk.bold(name)} on project ${chalk.bold(
              projectDisplayName
            )}.`
          );
@@ -207,8 +227,8 @@ export default class EnvironmentVariableCreate extends EasCommand {
          overwrite = true;
        } else {
          throw new Error(
-            `Shared variable with ${name} name already exists on this account.\n` +
-              `Use a different name or delete the existing variable on website or by using eas env:delete --name ${name} --scope shared command.`
+            `Account-wide variable with ${name} name already exists on this account.\n` +
+              `Use a different name or delete the existing variable on website or by using the "eas env:delete --name ${name} --scope account" command.`
          );
        }
      }
@@ -230,6 +250,7 @@ export default class EnvironmentVariableCreate extends EasCommand {
                value,
                visibility,
                environments,
+                isGlobal: true, // TODO: every account-wide variable is global for now so it's not user facing
                type: type ?? EnvironmentSecretType.String,
              },
              ownerAccount.id
@@ -247,7 +268,7 @@ export default class EnvironmentVariableCreate extends EasCommand {

      if (link) {
        Log.withTick(
-          `Linking shared variable ${chalk.bold(name)} to project ${chalk.bold(
+          `Linking account-wide variable ${chalk.bold(name)} to project ${chalk.bold(
            projectDisplayName
          )}.`
        );
@@ -262,7 +283,9 @@ export default class EnvironmentVariableCreate extends EasCommand {
        });

        Log.withTick(
-          `Linked shared variable ${chalk.bold(name)} to project ${chalk.bold(projectDisplayName)}.`
+          `Linked account-wide variable ${chalk.bold(name)} to project ${chalk.bold(
+            projectDisplayName
+          )}.`
        );
      }
    }
@@ -293,15 +316,18 @@ export default class EnvironmentVariableCreate extends EasCommand {
    }
  }

-  private async promptForMissingFlagsAsync({
-    name,
-    value,
-    environment,
-    visibility,
-    'non-interactive': nonInteractive,
-    type,
-    ...rest
-  }: CreateFlags): Promise<
+  private async promptForMissingFlagsAsync(
+    {
+      name,
+      value,
+      environment: environments,
+      visibility,
+      'non-interactive': nonInteractive,
+      type,
+      ...rest
+    }: CreateFlags,
+    { environment }: { environment?: string }
+  ): Promise<
    Required<
      Omit<CreateFlags, 'type' | 'visibility'> & {
        type: EnvironmentSecretType | undefined;
@@ -351,10 +377,20 @@ export default class EnvironmentVariableCreate extends EasCommand {

    value = environmentFilePath ? await fs.readFile(environmentFilePath, 'base64') : value;

-    if (!environment) {
-      environment = await promptVariableEnvironmentAsync({ nonInteractive, multiple: true });
+    if (environment && !isEnvironment(environment.toUpperCase())) {
+      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
+    }

-      if (!environment || environment.length === 0) {
+    let newEnvironments = environments
+      ? environments
+      : environment
+        ? [environment.toUpperCase() as EnvironmentVariableEnvironment]
+        : undefined;
+
+    if (!newEnvironments) {
+      newEnvironments = await promptVariableEnvironmentAsync({ nonInteractive, multiple: true });
+
+      if (!newEnvironments || newEnvironments.length === 0) {
        throw new Error('No environments selected');
      }
    }
@@ -364,11 +400,10 @@ export default class EnvironmentVariableCreate extends EasCommand {
    return {
      name,
      value,
-      environment,
+      environment: newEnvironments,
      visibility: newVisibility,
      link: rest.link ?? false,
      force: rest.force ?? false,
-      scope: rest.scope ?? EnvironmentVariableScope.Project,
      'non-interactive': nonInteractive,
      type: newType,
      fileName,
@@ -376,24 +411,19 @@ export default class EnvironmentVariableCreate extends EasCommand {
    };
  }

-  private validateFlags(flags: CreateFlags & { type?: string; visibility?: string }): CreateFlags {
-    if (flags.scope !== EnvironmentVariableScope.Shared && flags.link) {
+  private sanitizeFlags(flags: RawCreateFlags): CreateFlags {
+    if (flags.scope !== 'account' && flags.link) {
      throw new Error(
-        `Unexpected argument: --link can only be used when creating shared variables`
+        `Unexpected argument: --link can only be used when creating account-wide variables`
      );
    }

-    if (
-      flags.scope === EnvironmentVariableScope.Shared &&
-      flags.environment &&
-      !flags.link &&
-      flags['non-interactive']
-    ) {
-      throw new Error(
-        'Unexpected argument: --environment in non-interactive mode can only be used with --link flag.'
-      );
-    }
-
-    return flags;
+    return {
+      ...flags,
+      scope:
+        flags.scope === 'account'
+          ? EnvironmentVariableScope.Shared
+          : EnvironmentVariableScope.Project,
+    };
  }
 }
@@ -4,8 +4,9 @@ import chalk from 'chalk';

 import EasCommand from '../../commandUtils/EasCommand';
 import {
+  EASEnvironmentVariableScopeFlag,
+  EASEnvironmentVariableScopeFlagValue,
  EASNonInteractiveFlag,
-  EASVariableScopeFlag,
  EasEnvironmentFlagParameters,
 } from '../../commandUtils/flags';
 import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../../graphql/generated';
@@ -13,19 +14,24 @@ import { EnvironmentVariableMutation } from '../../graphql/mutations/Environment
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';
-import { formatVariableName } from '../../utils/variableUtils';
+import { formatVariableName, isEnvironment } from '../../utils/variableUtils';

-type DeleteFlags = {
+interface DeleteFlags {
  'variable-name'?: string;
  'variable-environment'?: EnvironmentVariableEnvironment;
  'non-interactive': boolean;
-  scope?: EnvironmentVariableScope;
-};
+  scope: EnvironmentVariableScope;
+}

-export default class EnvironmentVariableDelete extends EasCommand {
-  static override description = 'delete an environment variable by name';
+interface RawDeleteFlags {
+  'variable-name'?: string;
+  'variable-environment'?: EnvironmentVariableEnvironment;
+  'non-interactive': boolean;
+  scope: EASEnvironmentVariableScopeFlagValue;
+}

-  static override hidden = true;
+export default class EnvDelete extends EasCommand {
+  static override description = 'delete an environment variable for the current project or account';

  static override flags = {
    'variable-name': Flags.string({
@@ -35,27 +41,36 @@ export default class EnvironmentVariableDelete extends EasCommand {
      ...EasEnvironmentFlagParameters,
      description: 'Current environment of the variable to delete',
    }),
-    ...EASVariableScopeFlag,
+    ...EASEnvironmentVariableScopeFlag,
    ...EASNonInteractiveFlag,
  };

+  static override args = [
+    {
+      name: 'environment',
+      description:
+        "Current environment of the variable to delete. One of 'production', 'preview', or 'development'.",
+      required: false,
+    },
+  ];
+
  static override contextDefinition = {
    ...this.ContextOptions.ProjectId,
    ...this.ContextOptions.LoggedIn,
  };

  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(EnvironmentVariableDelete);
+    const { args, flags } = await this.parse(EnvDelete);
    const {
      'variable-name': name,
      'variable-environment': environment,
      'non-interactive': nonInteractive,
      scope,
-    } = this.validateFlags(flags);
+    } = this.sanitizeInputs(flags, args);
    const {
      projectId,
      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvironmentVariableDelete, {
+    } = await this.getContextAsync(EnvDelete, {
      nonInteractive,
    });

@@ -130,7 +145,10 @@ export default class EnvironmentVariableDelete extends EasCommand {
    Log.withTick(`️Deleted variable ${selectedVariable.name}".`);
  }

-  private validateFlags(flags: DeleteFlags): DeleteFlags {
+  private sanitizeInputs(
+    flags: RawDeleteFlags,
+    { environment }: { environment?: string }
+  ): DeleteFlags {
    if (flags['non-interactive']) {
      if (!flags['variable-name']) {
        throw new Error(
@@ -141,6 +159,22 @@ export default class EnvironmentVariableDelete extends EasCommand {
      }
    }

-    return flags;
+    const scope =
+      flags.scope === 'account'
+        ? EnvironmentVariableScope.Shared
+        : EnvironmentVariableScope.Project;
+
+    if (environment) {
+      environment = environment.toUpperCase();
+
+      if (!isEnvironment(environment)) {
+        throw new Error(
+          "Invalid environment. Use one of 'production', 'preview', or 'development'."
+        );
+      }
+      return { ...flags, 'variable-environment': environment, scope };
+    }
+
+    return { ...flags, scope };
  }
 }
@@ -3,32 +3,32 @@ import chalk from 'chalk';

 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { EASEnvironmentFlag, EASNonInteractiveFlag } from '../../commandUtils/flags';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
 import { EnvironmentVariableEnvironment } from '../../graphql/generated';
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
+import { isEnvironment } from '../../utils/variableUtils';

 type ParsedFlags =
  | {
      nonInteractive: true;
      environment: EnvironmentVariableEnvironment;
+      command: string;
    }
  | {
      nonInteractive: false;
      environment?: EnvironmentVariableEnvironment;
+      command: string;
    };

 interface RawFlags {
-  environment?: EnvironmentVariableEnvironment;
  'non-interactive': boolean;
 }

 export default class EnvExec extends EasCommand {
  static override description =
-    'execute a bash command with environment variables from the selected environment';
-
-  static override hidden = true;
+    'execute a command with environment variables from the selected environment';

  static override contextDefinition = {
    ...this.ContextOptions.ProjectId,
@@ -36,25 +36,28 @@ export default class EnvExec extends EasCommand {
  };

  static override flags = {
-    ...EASEnvironmentFlag,
    ...EASNonInteractiveFlag,
  };

  static override args = [
    {
-      name: 'BASH_COMMAND',
+      name: 'environment',
+      required: true,
+      description:
+        "Environment to execute the command in. One of 'production', 'preview', or 'development'.",
+    },
+    {
+      name: 'bash_command',
      required: true,
      description: 'bash command to execute with the environment variables from the environment',
    },
  ];

-  async runAsync(): Promise<void> {
-    const {
-      flags,
-      args: { BASH_COMMAND: command },
-    } = await this.parse(EnvExec);
+  private isNonInteractive: boolean = false;

-    const parsedFlags = this.sanitizeFlags(flags);
+  async runAsync(): Promise<void> {
+    const { flags, args } = await this.parse(EnvExec);
+    const parsedFlags = this.sanitizeFlagsAndArgs(flags, args);

    const {
      projectId,
@@ -63,6 +66,8 @@ export default class EnvExec extends EasCommand {
      nonInteractive: parsedFlags.nonInteractive,
    });

+    this.isNonInteractive = parsedFlags.nonInteractive;
+
    const environment =
      parsedFlags.environment ??
      (await promptVariableEnvironmentAsync({ nonInteractive: parsedFlags.nonInteractive }));
@@ -70,30 +75,80 @@ export default class EnvExec extends EasCommand {
      graphqlClient,
      projectId,
      environment,
+      nonInteractive: parsedFlags.nonInteractive,
    });

-    await this.runCommandWithEnvVarsAsync({ command, environmentVariables });
+    if (parsedFlags.nonInteractive) {
+      await this.runCommandNonInteractiveWithEnvVarsAsync({
+        command: parsedFlags.command,
+        environmentVariables,
+      });
+    } else {
+      await this.runCommandWithEnvVarsAsync({
+        command: parsedFlags.command,
+        environmentVariables,
+      });
+    }
  }

-  private sanitizeFlags(rawFlags: RawFlags): ParsedFlags {
-    const environment = rawFlags.environment;
-    if (rawFlags['non-interactive']) {
-      if (!environment) {
-        throw new Error(
-          'You must specify an environment when running in non-interactive mode. Use the --environment flag.'
-        );
-      }
-      return {
-        nonInteractive: true,
-        environment,
-      };
+  private sanitizeFlagsAndArgs(
+    rawFlags: RawFlags,
+    { bash_command, environment }: Record<string, string>
+  ): ParsedFlags {
+    if (rawFlags['non-interactive'] && (!bash_command || !environment)) {
+      throw new Error(
+        "You must specify both environment and bash command when running in non-interactive mode. Run command as `eas env:exec ENVIRONMENT 'bash command'`."
+      );
    }
+
+    environment = environment?.toUpperCase();
+
+    if (!isEnvironment(environment)) {
+      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
+    }
+
+    const firstChar = bash_command[0];
+    const lastChar = bash_command[bash_command.length - 1];
+    const cleanCommand =
+      (firstChar === '"' && lastChar === '"') || (firstChar === "'" && lastChar === "'")
+        ? bash_command.slice(1, -1)
+        : bash_command;
+
    return {
-      nonInteractive: false,
-      environment: rawFlags.environment,
+      nonInteractive: rawFlags['non-interactive'],
+      environment,
+      command: cleanCommand,
    };
  }

+  // eslint-disable-next-line async-protect/async-suffix
+  protected override async catch(err: Error): Promise<any> {
+    // when in non-interactive, make the behavior of this command a pure passthrough, outputting only the subprocess' stdout and stderr and exiting with the
+    // sub-command's exit status
+    if (this.isNonInteractive) {
+      process.exitCode = process.exitCode ?? (err as any).status ?? 1;
+    } else {
+      await super.catch(err);
+    }
+  }
+
+  private async runCommandNonInteractiveWithEnvVarsAsync({
+    command,
+    environmentVariables,
+  }: {
+    command: string;
+    environmentVariables: Record<string, string>;
+  }): Promise<void> {
+    await spawnAsync(command, [], {
+      shell: true,
+      stdio: 'inherit',
+      env: {
+        ...process.env,
+        ...environmentVariables,
+      },
+    });
+  }
+
  private async runCommandWithEnvVarsAsync({
    command,
    environmentVariables,
@@ -102,7 +157,8 @@ export default class EnvExec extends EasCommand {
    environmentVariables: Record<string, string>;
  }): Promise<void> {
    Log.log(`Running command: ${chalk.bold(command)}`);
-    const spawnPromise = spawnAsync('bash', ['-c', command], {
+    const spawnPromise = spawnAsync(command, [], {
+      shell: true,
      stdio: ['inherit', 'pipe', 'pipe'],
      env: {
        ...process.env,
@@ -138,10 +194,12 @@ export default class EnvExec extends EasCommand {
    graphqlClient,
    projectId,
    environment,
+    nonInteractive,
  }: {
    graphqlClient: ExpoGraphqlClient;
    projectId: string;
    environment: EnvironmentVariableEnvironment;
+    nonInteractive: boolean;
  }): Promise<Record<string, string>> {
    const environmentVariablesQueryResult =
      await EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(graphqlClient, {
@@ -149,31 +207,24 @@ export default class EnvExec extends EasCommand {
        environment,
      });

-    const secretEnvironmentVariables = environmentVariablesQueryResult.filter(
-      ({ value }) => !value
-    );
-    if (secretEnvironmentVariables.length > 0) {
-      Log.warn(`The following environment variables are secret and cannot be downloaded locally:`);
-      for (const { name } of secretEnvironmentVariables) {
-        Log.warn(`- ${name}`);
-      }
-      Log.warn('Proceeding with the rest of the environment variables.');
-      Log.newLine();
-    }
-
    const nonSecretEnvironmentVariables = environmentVariablesQueryResult.filter(
      ({ value }) => !!value
    );
-    if (nonSecretEnvironmentVariables.length === 0) {
-      throw new Error('No readable environment variables found for the selected environment.');
+
+    if (!nonInteractive) {
+      if (nonSecretEnvironmentVariables.length > 0) {
+        Log.log(
+          `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${nonSecretEnvironmentVariables
+            .map(e => e.name)
+            .join(', ')}.`
+        );
+      } else {
+        Log.log(
+          `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`
+        );
+      }
+      Log.newLine();
    }
-    Log.log(
-      `Loaded environment variables for the selected environment "${environment.toLowerCase()}":`
-    );
-    for (const { name } of nonSecretEnvironmentVariables) {
-      Log.log(`- ${name}`);
-    }
-    Log.newLine();

    const environmentVariables: Record<string, string> = {};
    for (const { name, value } of nonSecretEnvironmentVariables) {
@@ -4,9 +4,10 @@ import chalk from 'chalk';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import {
+  EASEnvironmentVariableScopeFlag,
+  EASEnvironmentVariableScopeFlagValue,
  EASNonInteractiveFlag,
  EASVariableFormatFlag,
-  EASVariableScopeFlag,
  EasEnvironmentFlagParameters,
 } from '../../commandUtils/flags';
 import {
@@ -18,26 +19,41 @@ import {
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
 import { promptVariableEnvironmentAsync, promptVariableNameAsync } from '../../utils/prompts';
-import { formatVariable, formatVariableValue } from '../../utils/variableUtils';
+import { formatVariable, formatVariableValue, isEnvironment } from '../../utils/variableUtils';

-type GetFlags = {
+interface RawGetFlags {
+  'variable-name'?: string;
+  'variable-environment'?: EnvironmentVariableEnvironment;
+  'non-interactive': boolean;
+  format?: string;
+  scope: EASEnvironmentVariableScopeFlagValue;
+}
+
+interface GetFlags {
  'variable-name'?: string;
  'variable-environment'?: EnvironmentVariableEnvironment;
  'non-interactive': boolean;
  format?: string;
  scope: EnvironmentVariableScope;
-};
+}

-export default class EnvironmentVariableGet extends EasCommand {
-  static override description = 'get environment variable';
-
-  static override hidden = true;
+export default class EnvGet extends EasCommand {
+  static override description = 'view an environment variable for the current project or account';

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

+  static override args = [
+    {
+      name: 'environment',
+      description:
+        "Current environment of the variable. One of 'production', 'preview', or 'development'.",
+      required: false,
+    },
+  ];
+
  static override flags = {
    'variable-name': Flags.string({
      description: 'Name of the variable',
@@ -47,12 +63,12 @@ export default class EnvironmentVariableGet extends EasCommand {
      description: 'Current environment of the variable',
    }),
    ...EASVariableFormatFlag,
-    ...EASVariableScopeFlag,
+    ...EASEnvironmentVariableScopeFlag,
    ...EASNonInteractiveFlag,
  };

  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(EnvironmentVariableGet);
+    const { args, flags } = await this.parse(EnvGet);

    let {
      'variable-environment': environment,
@@ -60,12 +76,12 @@ export default class EnvironmentVariableGet extends EasCommand {
      'non-interactive': nonInteractive,
      format,
      scope,
-    } = this.validateFlags(flags);
+    } = this.sanitizeInputs(flags, args);

    const {
      projectId,
      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvironmentVariableGet, {
+    } = await this.getContextAsync(EnvGet, {
      nonInteractive,
    });

@@ -117,7 +133,7 @@ export default class EnvironmentVariableGet extends EasCommand {
    }
  }

-  private validateFlags(flags: GetFlags): GetFlags {
+  private sanitizeInputs(flags: RawGetFlags, { environment }: { environment?: string }): GetFlags {
    if (flags['non-interactive']) {
      if (!flags['variable-name']) {
        throw new Error('Variable name is required. Run the command with --variable-name flag.');
@@ -125,11 +141,34 @@ export default class EnvironmentVariableGet extends EasCommand {
      if (!flags.scope) {
        throw new Error('Scope is required. Run the command with --scope flag.');
      }
-      if (!flags['variable-environment']) {
+      if (!(flags['variable-environment'] ?? environment)) {
        throw new Error('Environment is required.');
      }
    }
-    return flags;
+    if (environment && flags['variable-environment']) {
+      throw new Error(
+        "You can't use both --variable-environment flag when environment is passed as an argument. Run `eas env:get --help` for more information."
+      );
+    }
+
+    const scope =
+      flags.scope === 'account'
+        ? EnvironmentVariableScope.Shared
+        : EnvironmentVariableScope.Project;
+    if (environment) {
+      environment = environment.toUpperCase();
+      if (!isEnvironment(environment)) {
+        throw new Error(
+          "Invalid environment. Use one of 'production', 'preview', or 'development'."
+        );
+      }
+      return {
+        ...flags,
+        'variable-environment': environment,
+        scope,
+      };
+    }
+    return { ...flags, scope };
  }
 }

@@ -14,11 +14,19 @@ import Log from '../../log';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { selectAsync } from '../../prompts';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
-import { formatVariableName } from '../../utils/variableUtils';
+import { formatVariableName, isEnvironment } from '../../utils/variableUtils';

-export default class EnvironmentVariableLink extends EasCommand {
-  static override description = 'link a shared environment variable to the current project';
+type LinkFlags = {
+  'variable-name'?: string;
+  'variable-environment'?: EnvironmentVariableEnvironment;
+  'non-interactive': boolean;
+  environment?: EnvironmentVariableEnvironment[];
+};

+export default class EnvLink extends EasCommand {
+  static override description = 'link an account-wide environment variable to the current project';
+
+  // for now we only roll out global account-wide env variables so this should stay hidden
  static override hidden = true;

  static override flags = {
@@ -33,24 +41,34 @@ export default class EnvironmentVariableLink extends EasCommand {
    ...EASNonInteractiveFlag,
  };

+  static override args = [
+    {
+      name: 'environment',
+      description:
+        "Environment to pull variables from. One of 'production', 'preview', or 'development'.",
+      required: false,
+    },
+  ];
+
  static override contextDefinition = {
    ...this.ContextOptions.ProjectId,
    ...this.ContextOptions.LoggedIn,
  };

  async runAsync(): Promise<void> {
+    const { args, flags } = await this.parse(EnvLink);
+
    let {
-      flags: {
-        'variable-name': name,
-        'variable-environment': currentEnvironment,
-        'non-interactive': nonInteractive,
-        environment: environments,
-      },
-    } = await this.parse(EnvironmentVariableLink);
+      'variable-name': name,
+      'variable-environment': currentEnvironment,
+      'non-interactive': nonInteractive,
+      environment: environments,
+    } = this.validateInputs(flags, args);
+
    const {
      projectId,
      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvironmentVariableLink, {
+    } = await this.getContextAsync(EnvLink, {
      nonInteractive,
    });

@@ -70,7 +88,7 @@ export default class EnvironmentVariableLink extends EasCommand {
        );
      }
      selectedVariable = await selectAsync(
-        'Select shared variable',
+        'Select account-wide variable',
        variables.map(variable => ({
          title: formatVariableName(variable),
          value: variable,
@@ -79,7 +97,7 @@ export default class EnvironmentVariableLink extends EasCommand {
    }

    if (!selectedVariable) {
-      throw new Error(`Shared variable ${name} doesn't exist`);
+      throw new Error(`Account-wide variable ${name} doesn't exist`);
    }

    let explicitSelect = false;
@@ -155,4 +173,32 @@ export default class EnvironmentVariableLink extends EasCommand {
      }
    }
  }
+  private validateInputs(flags: LinkFlags, { environment }: { environment?: string }): LinkFlags {
+    environment = environment?.toUpperCase();
+
+    if (environment && !isEnvironment(environment)) {
+      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
+    }
+
+    const environments = flags.environment
+      ? flags.environment
+      : environment
+        ? [environment as EnvironmentVariableEnvironment]
+        : undefined;
+
+    if (flags['non-interactive']) {
+      if (!flags['variable-name']) {
+        throw new Error(
+          `Environment variable needs 'name' to be specified when running in non-interactive mode. Run the command with ${chalk.bold(
+            '--variable-name VARIABLE_NAME'
+          )} flag to fix the issue`
+        );
+      }
+    }
+
+    return {
+      ...flags,
+      environment: environments,
+    };
+  }
 }
@@ -4,9 +4,10 @@ import chalk from 'chalk';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import {
+  EASEnvironmentVariableScopeFlag,
+  EASEnvironmentVariableScopeFlagValue,
  EASMultiEnvironmentFlag,
  EASVariableFormatFlag,
-  EASVariableScopeFlag,
 } from '../../commandUtils/flags';
 import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../../graphql/generated';
 import {
@@ -18,6 +19,7 @@ import { promptVariableEnvironmentAsync } from '../../utils/prompts';
 import {
  formatVariable,
  formatVariableValue,
+  isEnvironment,
  performForEnvironmentsAsync,
 } from '../../utils/variableUtils';

@@ -65,10 +67,26 @@ async function getVariablesForScopeAsync(
      });
 }

-export default class EnvironmentValueList extends EasCommand {
-  static override description = 'list environment variables for the current project';
+interface RawListFlags {
+  scope: EASEnvironmentVariableScopeFlagValue;
+  format: string;
+  environment: EnvironmentVariableEnvironment[] | undefined;
+  'include-sensitive': boolean;
+  'include-file-content': boolean;
+  'non-interactive'?: boolean;
+}

-  static override hidden = true;
+interface ListFlags {
+  scope: EnvironmentVariableScope;
+  format: string;
+  environment: EnvironmentVariableEnvironment[] | undefined;
+  'include-sensitive': boolean;
+  'include-file-content': boolean;
+  'non-interactive': boolean;
+}
+
+export default class EnvList extends EasCommand {
+  static override description = 'list environment variables for the current project or account';

  static override contextDefinition = {
    ...this.ContextOptions.ProjectId,
@@ -84,26 +102,36 @@ export default class EnvironmentValueList extends EasCommand {
      description: 'Display files content in the output',
      default: false,
    }),
-    ...EASVariableFormatFlag,
-    ...EASVariableScopeFlag,
    ...EASMultiEnvironmentFlag,
+    ...EASVariableFormatFlag,
+    ...EASEnvironmentVariableScopeFlag,
  };

+  static override args = [
+    {
+      name: 'environment',
+      description:
+        "Environment to list the variables from. One of 'production', 'preview', or 'development'.",
+      required: false,
+    },
+  ];
+
  async runAsync(): Promise<void> {
+    const { args, flags } = await this.parse(EnvList);
+
    let {
-      flags: {
-        environment: environments,
-        format,
-        scope,
-        'include-sensitive': includeSensitive,
-        'include-file-content': includeFileContent,
-        'non-interactive': nonInteractive,
-      },
-    } = await this.parse(EnvironmentValueList);
+      format,
+      environment: environments,
+      scope,
+      'include-sensitive': includeSensitive,
+      'include-file-content': includeFileContent,
+      'non-interactive': nonInteractive,
+    } = this.sanitizeInputs(flags, args);
+
    const {
      projectId,
      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvironmentValueList, {
+    } = await this.getContextAsync(EnvList, {
      nonInteractive: true,
    });

@@ -136,7 +164,7 @@ export default class EnvironmentValueList extends EasCommand {
        }
      } else {
        if (scope === EnvironmentVariableScope.Shared) {
-          Log.log(chalk.bold('Shared variables for this account:'));
+          Log.log(chalk.bold('Account-wide variables for this account:'));
        } else {
          Log.log(chalk.bold(`Variables for this project:`));
        }
@@ -146,4 +174,29 @@ export default class EnvironmentValueList extends EasCommand {
      }
    });
  }
+
+  private sanitizeInputs(
+    flags: RawListFlags,
+    { environment }: { environment?: string }
+  ): ListFlags {
+    if (environment && !isEnvironment(environment.toUpperCase())) {
+      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
+    }
+
+    const environments = flags.environment
+      ? flags.environment
+      : environment
+        ? [environment.toUpperCase() as EnvironmentVariableEnvironment]
+        : undefined;
+
+    return {
+      ...flags,
+      'non-interactive': flags['non-interactive'] ?? false,
+      environment: environments,
+      scope:
+        flags.scope === 'account'
+          ? EnvironmentVariableScope.Shared
+          : EnvironmentVariableScope.Project,
+    };
+  }
 }
@@ -1,14 +1,11 @@
 import { Flags } from '@oclif/core';
+import dotenv from 'dotenv';
 import * as fs from 'fs-extra';
 import path from 'path';

 import EasCommand from '../../commandUtils/EasCommand';
 import { EASEnvironmentFlag, EASNonInteractiveFlag } from '../../commandUtils/flags';
-import {
-  EnvironmentSecretType,
-  EnvironmentVariableFragment,
-  EnvironmentVariableVisibility,
-} from '../../graphql/generated';
+import { EnvironmentSecretType, EnvironmentVariableVisibility } from '../../graphql/generated';
 import {
  EnvironmentVariableWithFileContent,
  EnvironmentVariablesQuery,
@@ -16,11 +13,11 @@ import {
 import Log from '../../log';
 import { confirmAsync } from '../../prompts';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
+import { isEnvironment } from '../../utils/variableUtils';

-export default class EnvironmentVariablePull extends EasCommand {
-  static override description = 'pull env file';
-
-  static override hidden = true;
+export default class EnvPull extends EasCommand {
+  static override description =
+    'pull environment variables for the selected environment to .env file';

  static override contextDefinition = {
    ...this.ContextOptions.ProjectId,
@@ -28,9 +25,18 @@ export default class EnvironmentVariablePull extends EasCommand {
    ...this.ContextOptions.ProjectDir,
  };

+  static override args = [
+    {
+      name: 'environment',
+      description:
+        "Environment to pull variables from. One of 'production', 'preview', or 'development'.",
+      required: false,
+    },
+  ];
+
  static override flags = {
-    ...EASEnvironmentFlag,
    ...EASNonInteractiveFlag,
+    ...EASEnvironmentFlag,
    path: Flags.string({
      description: 'Path to the result `.env` file',
      default: '.env.local',
@@ -39,17 +45,25 @@ export default class EnvironmentVariablePull extends EasCommand {

  async runAsync(): Promise<void> {
    let {
-      flags: { environment, path: targetPath, 'non-interactive': nonInteractive },
-    } = await this.parse(EnvironmentVariablePull);
+      args: { environment: argEnvironment },
+      flags: { environment: flagEnvironment, path: targetPath, 'non-interactive': nonInteractive },
+    } = await this.parse(EnvPull);
+
+    let environment = flagEnvironment?.toUpperCase() ?? argEnvironment?.toUpperCase();

    if (!environment) {
      environment = await promptVariableEnvironmentAsync({ nonInteractive });
    }
+
+    if (!isEnvironment(environment)) {
+      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
+    }
+
    const {
      projectId,
      loggedIn: { graphqlClient },
      projectDir,
-    } = await this.getContextAsync(EnvironmentVariablePull, {
+    } = await this.getContextAsync(EnvPull, {
      nonInteractive,
    });

@@ -74,6 +88,12 @@ export default class EnvironmentVariablePull extends EasCommand {
      }
    }

+    let currentEnvLocal: Record<string, string> = {};
+
+    if (await fs.exists(targetPath)) {
+      currentEnvLocal = dotenv.parse(await fs.readFile(targetPath, 'utf8'));
+    }
+
    const filePrefix = `# Environment: ${environment.toLocaleLowerCase()}\n\n`;

    const isFileVariablePresent = environmentVariables.some(v => {
@@ -85,10 +105,18 @@ export default class EnvironmentVariablePull extends EasCommand {
      await fs.mkdir(envDir, { recursive: true });
    }

+    const skippedSecretVariables: string[] = [];
+    const overridenSecretVariables: string[] = [];
+
    const envFileContentLines = await Promise.all(
      environmentVariables.map(async (variable: EnvironmentVariableWithFileContent) => {
        if (variable.visibility === EnvironmentVariableVisibility.Secret) {
-          return `# ${variable.name}=***** (secret variables are not available for reading)`;
+          if (currentEnvLocal[variable.name]) {
+            overridenSecretVariables.push(variable.name);
+            return `${variable.name}=${currentEnvLocal[variable.name]}`;
+          }
+          skippedSecretVariables.push(variable.name);
+          return `# ${variable.name}=***** (secret)`;
        }
        if (variable.type === EnvironmentSecretType.FileBase64 && variable.valueWithFileContent) {
          const filePath = path.join(envDir, variable.name);
@@ -101,20 +129,22 @@ export default class EnvironmentVariablePull extends EasCommand {

    await fs.writeFile(targetPath, filePrefix + envFileContentLines.join('\n'));

-    const secretEnvVariables = environmentVariables.filter(
-      (variable: EnvironmentVariableFragment) => variable.value === null
+    Log.log(
+      `Pulled plain text and sensitive environment variables from "${environment.toLowerCase()}" environment to ${targetPath}.`
    );
-    if (secretEnvVariables.length > 0) {
-      Log.warn(
-        `The eas env:pull command tried to pull environment variables with "secret" visibility. The variables with "secret" visibility are not available for reading, therefore thet were marked as "*****" in the generated .env file. Provide values for these manually in ${targetPath} if needed. Skipped variables: ${secretEnvVariables
-          .map(v => v.name)
-          .join('\n')}`
-      );
-      Log.warn();
+
+    if (overridenSecretVariables.length > 0) {
+      Log.addNewLineIfNone();
+      Log.log(`Reused local values for following secrets: ${overridenSecretVariables.join('\n')}.`);
    }

-    Log.log(
-      `Pulled environment variables from ${environment.toLowerCase()} environment to ${targetPath}.`
-    );
+    if (skippedSecretVariables.length > 0) {
+      Log.addNewLineIfNone();
+      Log.log(
+        `The following variables have the secret visibility and can't be read outside of EAS servers. Set their values manually in your .env file: ${skippedSecretVariables.join(
+          ', '
+        )}.`
+      );
+    }
  }
 }
@@ -19,11 +19,11 @@ import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVari
 import Log from '../../log';
 import { confirmAsync, promptAsync } from '../../prompts';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
+import { isEnvironment } from '../../utils/variableUtils';

-export default class EnvironmentVariablePush extends EasCommand {
-  static override description = 'push env file';
-
-  static override hidden = true;
+export default class EnvPush extends EasCommand {
+  static override description =
+    'push environment variables from .env file to the selected environment';

  static override contextDefinition = {
    ...this.ContextOptions.ProjectId,
@@ -38,15 +38,24 @@ export default class EnvironmentVariablePush extends EasCommand {
    }),
  };

+  static override args = [
+    {
+      name: 'environment',
+      description:
+        "Environment to push variables to. One of 'production', 'preview', or 'development'.",
+      required: false,
+    },
+  ];
+
  async runAsync(): Promise<void> {
-    let {
-      flags: { environment: environments, path: envPath },
-    } = await this.parse(EnvironmentVariablePush);
+    const { args, flags } = await this.parse(EnvPush);
+
+    let { environment: environments, path: envPath } = this.parseFlagsAndArgs(flags, args);

    const {
      projectId,
      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvironmentVariablePush, {
+    } = await this.getContextAsync(EnvPush, {
      nonInteractive: false,
    });

@@ -96,12 +105,12 @@ export default class EnvironmentVariablePush extends EasCommand {
        const existingDifferentSharedVariablesNames = existingDifferentSharedVariables.map(
          variable => variable.name
        );
-        Log.error('Shared variables cannot be overwritten by eas env:push command.');
+        Log.error('Account-wide variables cannot be overwritten by eas env:push command.');
        Log.error('Remove them from the env file or unlink them from the project to continue:');
        existingDifferentSharedVariablesNames.forEach(name => {
          Log.error(`- ${name}`);
        });
-        throw new Error('Shared variables cannot be overwritten by eas env:push command');
+        throw new Error('Account-wide variables cannot be overwritten by eas env:push command');
      }

      if (existingDifferentVariables.length > 0) {
@@ -189,6 +198,24 @@ export default class EnvironmentVariablePush extends EasCommand {
    Log.log(`Uploaded env file to ${environments.join(', ').toLocaleLowerCase()}.`);
  }

+  parseFlagsAndArgs(
+    flags: { path: string; environment: EnvironmentVariableEnvironment[] | undefined },
+    { environment }: Record<string, string>
+  ): { environment?: EnvironmentVariableEnvironment[]; path: string } {
+    if (environment && !isEnvironment(environment.toUpperCase())) {
+      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
+    }
+
+    const environments =
+      flags.environment ??
+      (environment ? [environment.toUpperCase() as EnvironmentVariableEnvironment] : undefined);
+
+    return {
+      ...flags,
+      environment: environments,
+    };
+  }
+
  private async parseEnvFileAsync(
    envPath: string,
    environments: EnvironmentVariableEnvironment[]
@@ -10,11 +10,19 @@ import Log from '../../log';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { selectAsync } from '../../prompts';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
-import { formatVariableName } from '../../utils/variableUtils';
+import { formatVariableName, isEnvironment } from '../../utils/variableUtils';

-export default class EnvironmentVariableUnlink extends EasCommand {
-  static override description = 'unlink a shared environment variable to the current project';
+type UnlinkFlags = {
+  'variable-name'?: string;
+  'non-interactive': boolean;
+  environment?: EnvironmentVariableEnvironment[];
+};

+export default class EnvUnlink extends EasCommand {
+  static override description =
+    'unlink an account-wide environment variable from the current project';
+
+  // for now we only roll out global account-wide env variables so this should stay hidden
  static override hidden = true;

  static override flags = {
@@ -30,18 +38,28 @@ export default class EnvironmentVariableUnlink extends EasCommand {
    ...this.ContextOptions.LoggedIn,
  };

+  static override args = [
+    {
+      name: 'environment',
+      description:
+        "Environment to unlink the variable from. One of 'production', 'preview', or 'development'.",
+      required: false,
+    },
+  ];
+
  async runAsync(): Promise<void> {
+    const { args, flags } = await this.parse(EnvUnlink);
+
    let {
-      flags: {
-        'variable-name': name,
-        'non-interactive': nonInteractive,
-        environment: unlinkEnvironments,
-      },
-    } = await this.parse(EnvironmentVariableUnlink);
+      'variable-name': name,
+      'non-interactive': nonInteractive,
+      environment: unlinkEnvironments,
+    } = this.validateInputs(flags, args);
+
    const {
      projectId,
      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvironmentVariableUnlink, {
+    } = await this.getContextAsync(EnvUnlink, {
      nonInteractive,
    });

@@ -58,7 +76,7 @@ export default class EnvironmentVariableUnlink extends EasCommand {
        throw new Error("Multiple variables found, please select one using '--variable-name'");
      }
      selectedVariable = await selectAsync(
-        'Select shared variable',
+        'Select account-wide variable',
        variables.map(variable => ({
          title: formatVariableName(variable),
          value: variable,
@@ -67,7 +85,7 @@ export default class EnvironmentVariableUnlink extends EasCommand {
    }

    if (!selectedVariable) {
-      throw new Error(`Shared variable ${name} doesn't exist`);
+      throw new Error(`Account-wide variable ${name} doesn't exist`);
    }

    let explicitSelect = false;
@@ -143,4 +161,32 @@ export default class EnvironmentVariableUnlink extends EasCommand {
      }
    }
  }
+
+  private validateInputs(
+    flags: UnlinkFlags,
+    { environment }: { environment?: string }
+  ): UnlinkFlags {
+    if (flags['non-interactive']) {
+      if (!flags['variable-name']) {
+        throw new Error(
+          'Current name is required in non-interactive mode. Run the command with --variable-name flag.'
+        );
+      }
+    }
+
+    if (environment) {
+      environment = environment.toUpperCase();
+      if (!isEnvironment(environment)) {
+        throw new Error(
+          "Invalid environment. Use one of 'production', 'preview', or 'development'."
+        );
+      }
+      return {
+        environment: [environment],
+        ...flags,
+      };
+    }
+
+    return flags;
+  }
 }
@@ -6,9 +6,10 @@ import path from 'path';

 import EasCommand from '../../commandUtils/EasCommand';
 import {
+  EASEnvironmentVariableScopeFlag,
+  EASEnvironmentVariableScopeFlagValue,
  EASMultiEnvironmentFlag,
  EASNonInteractiveFlag,
-  EASVariableScopeFlag,
  EASVariableVisibilityFlag,
  EasEnvironmentFlagParameters,
 } from '../../commandUtils/flags';
@@ -35,25 +36,34 @@ import {
  promptVariableValueAsync,
  promptVariableVisibilityAsync,
 } from '../../utils/prompts';
-import { formatVariableName } from '../../utils/variableUtils';
+import { formatVariableName, isEnvironment } from '../../utils/variableUtils';

-type UpdateFlags = {
+interface RawUpdateFlags {
  name?: string;
  value?: string;
-  scope?: EnvironmentVariableScope;
+  scope: EASEnvironmentVariableScopeFlagValue;
  environment?: EnvironmentVariableEnvironment[];
-  visibility?: 'plaintext' | 'sensitive' | 'encrypted';
+  visibility?: 'plaintext' | 'sensitive' | 'secret';
  type?: 'string' | 'file';
  'variable-name'?: string;
  'variable-environment'?: EnvironmentVariableEnvironment;
  'non-interactive': boolean;
-};
+}

-export default class EnvironmentVariableUpdate extends EasCommand {
-  static override description =
-    'update an environment variable on the current project or owner account';
+interface UpdateFlags {
+  name?: string;
+  value?: string;
+  scope: EnvironmentVariableScope;
+  environment?: EnvironmentVariableEnvironment[];
+  visibility?: 'plaintext' | 'sensitive' | 'secret';
+  type?: 'string' | 'file';
+  'variable-name'?: string;
+  'variable-environment'?: EnvironmentVariableEnvironment;
+  'non-interactive': boolean;
+}

-  static override hidden = true;
+export default class EnvUpdate extends EasCommand {
+  static override description = 'update an environment variable on the current project or account';

  static override flags = {
    'variable-name': Flags.string({
@@ -74,11 +84,20 @@ export default class EnvironmentVariableUpdate extends EasCommand {
      options: ['string', 'file'],
    }),
    ...EASVariableVisibilityFlag,
-    ...EASVariableScopeFlag,
+    ...EASEnvironmentVariableScopeFlag,
    ...EASMultiEnvironmentFlag,
    ...EASNonInteractiveFlag,
  };

+  static override args = [
+    {
+      name: 'environment',
+      description:
+        "Current environment of the variable to update. One of 'production', 'preview', or 'development'.",
+      required: false,
+    },
+  ];
+
  static override contextDefinition = {
    ...this.ContextOptions.ProjectId,
    ...this.ContextOptions.Analytics,
@@ -86,7 +105,7 @@ export default class EnvironmentVariableUpdate extends EasCommand {
  };

  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(EnvironmentVariableUpdate);
+    const { args, flags } = await this.parse(EnvUpdate);
    const {
      name,
      value: rawValue,
@@ -97,12 +116,12 @@ export default class EnvironmentVariableUpdate extends EasCommand {
      environment: environments,
      type,
      visibility,
-    } = this.validateFlags(flags);
+    } = this.sanitizeInputs(flags, args);

    const {
      projectId,
      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvironmentVariableUpdate, {
+    } = await this.getContextAsync(EnvUpdate, {
      nonInteractive,
    });

@@ -168,6 +187,7 @@ export default class EnvironmentVariableUpdate extends EasCommand {
      visibility,
      'non-interactive': nonInteractive,
      type,
+      scope,
    });

    const variable = await EnvironmentVariableMutation.updateAsync(graphqlClient, {
@@ -185,7 +205,10 @@ export default class EnvironmentVariableUpdate extends EasCommand {

    Log.withTick(`Updated variable ${chalk.bold(selectedVariable.name)} ${suffix}.`);
  }
-  private validateFlags(flags: UpdateFlags): UpdateFlags {
+  private sanitizeInputs(
+    flags: RawUpdateFlags,
+    { environment }: { environment?: string }
+  ): UpdateFlags {
    if (flags['non-interactive']) {
      if (!flags['variable-name']) {
        throw new Error(
@@ -197,7 +220,26 @@ export default class EnvironmentVariableUpdate extends EasCommand {
      }
    }

-    return flags;
+    const scope =
+      flags.scope === 'account'
+        ? EnvironmentVariableScope.Shared
+        : EnvironmentVariableScope.Project;
+
+    if (environment) {
+      environment = environment.toUpperCase();
+      if (!isEnvironment(environment)) {
+        throw new Error(
+          "Invalid environment. Use one of 'production', 'preview', or 'development'."
+        );
+      }
+      return {
+        ...flags,
+        'variable-environment': environment,
+        scope,
+      };
+    }
+
+    return { ...flags, scope };
  }

  private async promptForMissingFlagsAsync(
@@ -303,15 +345,14 @@ export default class EnvironmentVariableUpdate extends EasCommand {
    }

    return {
+      ...rest,
      name,
      value,
      environment: environments,
      visibility: newVisibility,
-      scope: rest.scope ?? EnvironmentVariableScope.Project,
      'non-interactive': nonInteractive,
      type: newType,
      fileName,
-      ...rest,
    };
  }
 }
@@ -0,0 +1,394 @@
+import { Platform } from '@expo/eas-build-job';
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { fetchBuildsAsync, formatBuild } from '../../commandUtils/builds';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { AppPlatform, BuildStatus } from '../../graphql/generated';
+import { FingerprintMutation } from '../../graphql/mutations/FingerprintMutation';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { RequestedPlatform } from '../../platform';
+import { maybeUploadFingerprintAsync } from '../../project/maybeUploadFingerprintAsync';
+import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { resolveWorkflowPerPlatformAsync } from '../../project/workflow';
+import { selectAsync } from '../../prompts';
+import { Fingerprint, FingerprintDiffItem } from '../../utils/fingerprint';
+import { createFingerprintAsync, diffFingerprint } from '../../utils/fingerprintCli';
+import { abridgedDiff } from '../../utils/fingerprintDiff';
+import formatFields, { FormatFieldsItem } from '../../utils/formatFields';
+import { enableJsonOutput } from '../../utils/json';
+
+export default class FingerprintCompare extends EasCommand {
+  static override description = 'compare fingerprints of the current project, builds and updates';
+  static override hidden = true;
+
+  static override flags = {
+    'build-id': Flags.string({
+      aliases: ['buildId'],
+      description: 'Compare the fingerprint with the build with the specified ID',
+    }),
+    ...EasNonInteractiveAndJsonFlags,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
+  };
+
+  async runAsync(): Promise<void> {
+    const { flags } = await this.parse(FingerprintCompare);
+    const { json: jsonFlag, 'non-interactive': nonInteractive, buildId: buildIdFromArg } = flags;
+
+    const {
+      projectId,
+      privateProjectConfig: { projectDir },
+      loggedIn: { graphqlClient },
+      vcsClient,
+    } = await this.getContextAsync(FingerprintCompare, {
+      nonInteractive,
+      withServerSideEnvironment: null,
+    });
+    if (jsonFlag) {
+      enableJsonOutput();
+    }
+
+    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+    let buildId: string | null = buildIdFromArg;
+    if (!buildId) {
+      if (nonInteractive) {
+        throw new Error('Build ID must be provided in non-interactive mode');
+      }
+
+      buildId = await selectBuildToCompareAsync(graphqlClient, projectId, displayName, {
+        filters: { hasFingerprint: true },
+      });
+      if (!buildId) {
+        return;
+      }
+    }
+
+    Log.log(`Comparing fingerprints of the current project and build ${buildId}…`);
+    const buildWithFingerprint = await BuildQuery.withFingerprintByIdAsync(graphqlClient, buildId);
+    const fingerprintDebugUrl = buildWithFingerprint.fingerprint?.debugInfoUrl;
+    if (!fingerprintDebugUrl) {
+      Log.error('A fingerprint for the build could not be found.');
+      return;
+    }
+    const fingerprintResponse = await fetch(fingerprintDebugUrl);
+    const fingerprint = (await fingerprintResponse.json()) as Fingerprint;
+    const workflows = await resolveWorkflowPerPlatformAsync(projectDir, vcsClient);
+    const buildPlatform = buildWithFingerprint.platform;
+    const workflow = workflows[appPlatformToPlatform(buildPlatform)];
+
+    const projectFingerprint = await createFingerprintAsync(projectDir, {
+      workflow,
+      platforms: [appPlatformToString(buildPlatform)],
+      debug: true,
+      env: undefined,
+    });
+    if (!projectFingerprint) {
+      Log.error('Project fingerprints can only be computed for projects with SDK 52 or higher');
+      return;
+    }
+
+    const uploadedFingerprint = await maybeUploadFingerprintAsync({
+      hash: fingerprint.hash,
+      fingerprint: {
+        fingerprintSources: fingerprint.sources,
+        isDebugFingerprintSource: Log.isDebug,
+      },
+      graphqlClient,
+    });
+    await FingerprintMutation.createFingerprintAsync(graphqlClient, projectId, {
+      hash: uploadedFingerprint.hash,
+      source: uploadedFingerprint.fingerprintSource,
+    });
+
+    if (fingerprint.hash === projectFingerprint.hash) {
+      Log.log(`✅ Project fingerprint matches build`);
+      return;
+    } else {
+      Log.log(`🔄 Project fingerprint differs from build`);
+    }
+
+    const fingerprintDiffs = diffFingerprint(projectDir, fingerprint, projectFingerprint);
+    if (!fingerprintDiffs) {
+      Log.error('Fingerprint diffs can only be computed for projects with SDK 52 or higher');
+      return;
+    }
+
+    const filePathDiffs = fingerprintDiffs.filter(diff => {
+      let sourceType;
+      if (diff.op === 'added') {
+        sourceType = diff.addedSource.type;
+      } else if (diff.op === 'removed') {
+        sourceType = diff.removedSource.type;
+      } else if (diff.op === 'changed') {
+        sourceType = diff.beforeSource.type;
+      }
+      return sourceType === 'dir' || sourceType === 'file';
+    });
+    if (filePathDiffs.length > 0) {
+      Log.newLine();
+      Log.log('📁 Paths with native dependencies:');
+    }
+    const fields = [];
+    for (const diff of filePathDiffs) {
+      const field = getDiffFilePathFields(diff);
+      if (!field) {
+        throw new Error(`Unsupported diff: ${JSON.stringify(diff)}`);
+      }
+      fields.push(field);
+    }
+    Log.log(
+      formatFields(fields, {
+        labelFormat: label => `    ${chalk.dim(label)}:`,
+      })
+    );
+
+    const contentDiffs = fingerprintDiffs.filter(diff => {
+      let sourceType;
+      if (diff.op === 'added') {
+        sourceType = diff.addedSource.type;
+      } else if (diff.op === 'removed') {
+        sourceType = diff.removedSource.type;
+      } else if (diff.op === 'changed') {
+        sourceType = diff.beforeSource.type;
+      }
+      return sourceType === 'contents';
+    });
+
+    for (const diff of contentDiffs) {
+      printContentDiff(diff);
+    }
+  }
+}
+
+function printContentDiff(diff: FingerprintDiffItem): void {
+  if (diff.op === 'added') {
+    const sourceType = diff.addedSource.type;
+    if (sourceType === 'contents') {
+      printContentSource({
+        op: diff.op,
+        sourceType,
+        contentsId: diff.addedSource.id,
+        contentsAfter: diff.addedSource.contents,
+      });
+    }
+  } else if (diff.op === 'removed') {
+    const sourceType = diff.removedSource.type;
+    if (sourceType === 'contents') {
+      printContentSource({
+        op: diff.op,
+        sourceType,
+        contentsId: diff.removedSource.id,
+        contentsBefore: diff.removedSource.contents,
+      });
+    }
+  } else if (diff.op === 'changed') {
+    const sourceType = diff.beforeSource.type;
+    if (sourceType === 'contents') {
+      if (diff.afterSource.type !== 'contents') {
+        throw new Error(
+          `Changed fingerprint source types must be the same, received ${diff.beforeSource.type}, ${diff.afterSource.type}`
+        );
+      }
+      printContentSource({
+        op: diff.op,
+        sourceType: diff.beforeSource.type, // before and after source types should be the same
+        contentsId: diff.beforeSource.id, // before and after content ids should be the same
+        contentsBefore: diff.beforeSource.contents,
+        contentsAfter: diff.afterSource.contents,
+      });
+    }
+  }
+}
+
+function getDiffFilePathFields(diff: FingerprintDiffItem): FormatFieldsItem | null {
+  if (diff.op === 'added') {
+    const sourceType = diff.addedSource.type;
+    if (sourceType !== 'contents') {
+      return getFilePathSourceFields({
+        op: diff.op,
+        sourceType,
+        filePath: diff.addedSource.filePath,
+      });
+    }
+  } else if (diff.op === 'removed') {
+    const sourceType = diff.removedSource.type;
+    if (sourceType !== 'contents') {
+      return getFilePathSourceFields({
+        op: diff.op,
+        sourceType,
+        filePath: diff.removedSource.filePath,
+      });
+    }
+  } else if (diff.op === 'changed') {
+    const sourceType = diff.beforeSource.type;
+    if (sourceType !== 'contents') {
+      return getFilePathSourceFields({
+        op: diff.op,
+        sourceType: diff.beforeSource.type, // before and after source types should be the same
+        filePath: diff.beforeSource.filePath, // before and after filePaths should be the same
+      });
+    }
+  }
+  return null;
+}
+
+function getFilePathSourceFields({
+  op,
+  sourceType,
+  filePath,
+}: {
+  op: 'added' | 'removed' | 'changed';
+  sourceType: 'dir' | 'file';
+  filePath: string;
+}): FormatFieldsItem {
+  if (sourceType === 'dir') {
+    if (op === 'added') {
+      return { label: 'new directory', value: filePath };
+    } else if (op === 'removed') {
+      return { label: 'removed directory', value: filePath };
+    } else if (op === 'changed') {
+      return { label: 'modified directory', value: filePath };
+    }
+  } else if (sourceType === 'file') {
+    if (op === 'added') {
+      return { label: 'new file', value: filePath };
+    } else if (op === 'removed') {
+      return { label: 'removed file', value: filePath };
+    } else if (op === 'changed') {
+      return { label: 'modified file', value: filePath };
+    }
+  }
+  throw new Error(`Unsupported source and op: ${sourceType}, ${op}`);
+}
+
+const PRETTY_CONTENT_ID: Record<string, string> = {
+  'expoAutolinkingConfig:ios': 'Expo autolinking config (iOS)',
+  'expoAutolinkingConfig:android': 'Expo autolinking config (Android)',
+  'packageJson:scripts': 'package.json scripts',
+  expoConfig: 'Expo config',
+};
+
+function printContentSource({
+  op,
+  contentsBefore,
+  contentsAfter,
+  contentsId,
+}: {
+  op: 'added' | 'removed' | 'changed';
+  sourceType: 'contents';
+  contentsBefore?: string | Buffer;
+  contentsAfter?: string | Buffer;
+  contentsId: string;
+}): void {
+  Log.newLine();
+  const prettyContentId = PRETTY_CONTENT_ID[contentsId] ?? contentsId;
+  if (op === 'added') {
+    Log.log(`${chalk.dim('📝 New content')}: ${prettyContentId}`);
+  } else if (op === 'removed') {
+    Log.log(`${chalk.dim('📝 Removed content')}: ${prettyContentId}`);
+  } else if (op === 'changed') {
+    Log.log(`${chalk.dim('📝 Modified content')}: ${prettyContentId}`);
+  }
+  printContentsDiff(contentsBefore ?? '', contentsAfter ?? '');
+}
+
+function printContentsDiff(contents1: string | Buffer, contents2: string | Buffer): void {
+  const stringifiedContents1 = Buffer.isBuffer(contents1) ? contents1.toString() : contents1;
+  const stringifiedContents2 = Buffer.isBuffer(contents2) ? contents2.toString() : contents2;
+
+  const isStr1JSON = isJSON(stringifiedContents1);
+  const isStr2JSON = isJSON(stringifiedContents2);
+
+  const prettifiedContents1 = isStr1JSON
+    ? JSON.stringify(JSON.parse(stringifiedContents1), null, 2)
+    : stringifiedContents1;
+  const prettifiedContents2 = isStr2JSON
+    ? JSON.stringify(JSON.parse(stringifiedContents2), null, 2)
+    : stringifiedContents2;
+
+  abridgedDiff(prettifiedContents1, prettifiedContents2, 0);
+}
+
+function isJSON(str: string): boolean {
+  try {
+    JSON.parse(str);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function appPlatformToPlatform(platform: AppPlatform): Platform {
+  switch (platform) {
+    case AppPlatform.Android:
+      return Platform.ANDROID;
+    case AppPlatform.Ios:
+      return Platform.IOS;
+    default:
+      throw new Error(`Unsupported platform: ${platform}`);
+  }
+}
+
+function appPlatformToString(platform: AppPlatform): string {
+  switch (platform) {
+    case AppPlatform.Android:
+      return 'android';
+    case AppPlatform.Ios:
+      return 'ios';
+    default:
+      throw new Error(`Unsupported platform: ${platform}`);
+  }
+}
+
+export async function selectBuildToCompareAsync(
+  graphqlClient: ExpoGraphqlClient,
+  projectId: string,
+  projectDisplayName: string,
+  {
+    filters,
+  }: {
+    filters?: {
+      statuses?: BuildStatus[];
+      platform?: RequestedPlatform;
+      profile?: string;
+      hasFingerprint?: boolean;
+    };
+  } = {}
+): Promise<string | null> {
+  const spinner = ora().start('Fetching builds…');
+
+  let builds;
+  try {
+    builds = await fetchBuildsAsync({ graphqlClient, projectId, filters });
+    spinner.stop();
+  } catch (error) {
+    spinner.fail(
+      `Something went wrong and we couldn't fetch the builds for the project ${projectDisplayName}.`
+    );
+    throw error;
+  }
+  if (builds.length === 0) {
+    Log.warn(`No fingerprints have been computed for builds of project ${projectDisplayName}.`);
+    return null;
+  } else {
+    const build = await selectAsync<string>(
+      'Which build do you want to compare?',
+      builds.map(build => ({
+        title: formatBuild(build),
+        value: build.id,
+      }))
+    );
+
+    return build;
+  }
+}
@@ -14,6 +14,7 @@ import { AppMutation } from '../../../graphql/mutations/AppMutation';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { createOrModifyExpoConfigAsync } from '../../../project/expoConfig';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
+import { isExpoInstalled } from '../../../project/projectUtils';
 import { confirmAsync, promptAsync } from '../../../prompts';
 import ProjectInit from '../init';

@@ -34,6 +35,7 @@ jest.mock('../../../ora', () => ({
 }));
 jest.mock('../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync');
 jest.mock('../../../commandUtils/context/contextUtils/getProjectIdAsync');
+jest.mock('../../../project/projectUtils');

 let originalProcessArgv: string[];

@@ -92,6 +94,7 @@ function mockTestProject(options: {
    graphqlClient,
    authenticationInfo: { accessToken: null, sessionSecret: '1234' },
  });
+  jest.mocked(isExpoInstalled).mockReturnValue(true);
 }

 const commandOptions = { root: '/test-project' } as any;
@@ -8,14 +8,13 @@ import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { saveProjectIdToAppConfigAsync } from '../../commandUtils/context/contextUtils/getProjectIdAsync';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
-import { AppPrivacy, Role } from '../../graphql/generated';
+import { Role } from '../../graphql/generated';
 import { AppMutation } from '../../graphql/mutations/AppMutation';
 import { AppQuery } from '../../graphql/queries/AppQuery';
 import Log, { link } from '../../log';
 import { ora } from '../../ora';
-import { createOrModifyExpoConfigAsync, getPrivateExpoConfig } from '../../project/expoConfig';
+import { createOrModifyExpoConfigAsync, getPrivateExpoConfigAsync } from '../../project/expoConfig';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
-import { toAppPrivacy } from '../../project/projectUtils';
 import { Choice, confirmAsync, promptAsync } from '../../prompts';
 import { Actor } from '../../user/User';

@@ -106,7 +105,7 @@ export default class ProjectInit extends EasCommand {
    projectDir: string,
    { force, nonInteractive }: InitializeMethodOptions
  ): Promise<void> {
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = await getPrivateExpoConfigAsync(projectDir);
    const appForProjectId = await AppQuery.byIdAsync(graphqlClient, projectId);
    const correctOwner = appForProjectId.ownerAccount.name;
    const correctSlug = appForProjectId.slug;
@@ -161,7 +160,7 @@ export default class ProjectInit extends EasCommand {
    projectDir: string,
    { force, nonInteractive }: InitializeMethodOptions
  ): Promise<void> {
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = await getPrivateExpoConfigAsync(projectDir);
    const existingProjectId = exp.extra?.eas?.projectId;

    if (projectId === existingProjectId) {
@@ -218,7 +217,7 @@ export default class ProjectInit extends EasCommand {
    projectDir: string,
    { force, nonInteractive }: InitializeMethodOptions
  ): Promise<string> {
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = await getPrivateExpoConfigAsync(projectDir);
    const existingProjectId = exp.extra?.eas?.projectId;

    if (existingProjectId) {
@@ -337,7 +336,6 @@ export default class ProjectInit extends EasCommand {
      createdProjectId = await AppMutation.createAppAsync(graphqlClient, {
        accountId: account.id,
        projectName,
-        privacy: toAppPrivacy(exp.privacy) ?? AppPrivacy.Public,
      });
      spinner.succeed(`Created ${chalk.bold(projectLink)}`);
    } catch (err) {
@@ -31,7 +31,7 @@ import {
 import { installDependenciesAsync } from '../../onboarding/installDependencies';
 import { runCommandAsync } from '../../onboarding/runCommand';
 import { RequestedPlatform } from '../../platform';
-import { ExpoConfigOptions, getPrivateExpoConfig } from '../../project/expoConfig';
+import { ExpoConfigOptions, getPrivateExpoConfigAsync } from '../../project/expoConfig';
 import { promptAsync } from '../../prompts';
 import { Actor } from '../../user/User';
 import { easCliVersion } from '../../utils/easCli';
@@ -339,7 +339,7 @@ async function getPrivateExpoConfigWithProjectIdAsync({
  actor: Actor;
  options?: ExpoConfigOptions;
 }): Promise<CredentialsContextProjectInfo> {
-  const expBefore = getPrivateExpoConfig(projectDir, options);
+  const expBefore = await getPrivateExpoConfigAsync(projectDir, options);
  const projectId = await validateOrSetProjectIdAsync({
    exp: expBefore,
    graphqlClient,
@@ -349,7 +349,7 @@ async function getPrivateExpoConfigWithProjectIdAsync({
    },
    cwd: projectDir,
  });
-  const exp = getPrivateExpoConfig(projectDir, options);
+  const exp = await getPrivateExpoConfigAsync(projectDir, options);
  return {
    exp,
    projectId,
@@ -25,6 +25,7 @@ import { promptAsync, selectAsync } from '../../prompts';
 export default class EnvironmentSecretCreate extends EasCommand {
  static override description =
    'create an environment secret on the current project or owner account';
+  static override hidden = true;

  static override flags = {
    scope: Flags.enum({
@@ -55,6 +56,9 @@ export default class EnvironmentSecretCreate extends EasCommand {
  };

  async runAsync(): Promise<void> {
+    Log.warn('This command is deprecated. Use eas env:create instead.');
+    Log.newLine();
+
    let {
      flags: {
        name,
@@ -13,6 +13,7 @@ import { promptAsync, toggleConfirmAsync } from '../../prompts';

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

  static override flags = {
    id: Flags.string({
@@ -27,6 +28,9 @@ export default class EnvironmentSecretDelete extends EasCommand {
  };

  async runAsync(): Promise<void> {
+    Log.warn('This command is deprecated. Use eas env:delete instead.');
+    Log.newLine();
+
    let {
      flags: { id, 'non-interactive': nonInteractive },
    } = await this.parse(EnvironmentSecretDelete);
@@ -11,6 +11,7 @@ import formatFields from '../../utils/formatFields';

 export default class EnvironmentSecretList extends EasCommand {
  static override description = 'list environment secrets available for your current app';
+  static override hidden = true;

  static override contextDefinition = {
    ...this.ContextOptions.ProjectId,
@@ -18,6 +19,9 @@ export default class EnvironmentSecretList extends EasCommand {
  };

  async runAsync(): Promise<void> {
+    Log.warn('This command is deprecated. Use eas env:list instead.');
+    Log.newLine();
+
    const {
      projectId,
      loggedIn: { graphqlClient },
@@ -24,6 +24,7 @@ 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 hidden = true;

  static override flags = {
    scope: Flags.enum({
@@ -47,6 +48,9 @@ export default class EnvironmentSecretPush extends EasCommand {
  };

  async runAsync(): Promise<void> {
+    Log.warn('This command is deprecated. Use eas env:push instead.');
+    Log.newLine();
+
    const {
      flags: { scope, force, 'env-file': maybeEnvFilePath, 'non-interactive': nonInteractive },
    } = await this.parse(EnvironmentSecretPush);
@@ -19,6 +19,7 @@ import { SubmissionContext, createSubmissionContextAsync } from '../../submit/co
 import IosSubmitCommand from '../../submit/ios/IosSubmitCommand';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import GitNoCommitClient from '../../vcs/clients/gitNoCommit';
+import NoVcsClient from '../../vcs/clients/noVcs';

 /**
 * This command will be run on the EAS workers.
@@ -64,7 +65,7 @@ export default class SubmitInternal extends EasCommand {
      vcsClient,
    } = await this.getContextAsync(SubmitInternal, {
      nonInteractive: true,
-      vcsClientOverride: new GitNoCommitClient(),
+      vcsClientOverride: process.env.EAS_NO_VCS ? new NoVcsClient() : new GitNoCommitClient(),
      withServerSideEnvironment: null,
    });

@@ -88,7 +88,10 @@ describe(UpdatePublish.name, () => {
    const { platforms, runtimeVersion } = mockTestExport();

    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
-      branchId: 'branch123',
+      branch: {
+        id: 'branch123',
+        name: 'wat',
+      },
      createdBranch: false,
    });

@@ -111,7 +114,10 @@ describe(UpdatePublish.name, () => {
      .mocked(getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync)
      .mockResolvedValue({ branchId: 'branch123', branchName: 'branchFromChannel' });
    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
-      branchId: 'branch123',
+      branch: {
+        id: 'branch123',
+        name: 'wat',
+      },
      createdBranch: false,
    });

@@ -140,24 +146,16 @@ describe(UpdatePublish.name, () => {
    const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];

    // Add configuration to the project that should not be included in the update
-    const { appJson } = mockTestProject({
-      expoConfig: {
-        hooks: {
-          postPublish: [
-            {
-              file: 'custom-hook.js',
-              config: { some: 'config' },
-            },
-          ],
-        },
-      },
-    });
+    const { appJson } = mockTestProject();

    const { platforms, runtimeVersion } = mockTestExport({ platforms: ['ios'] });

    // Mock an existing branch, so we don't create a new one
    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
-      branchId: 'branch123',
+      branch: {
+        id: 'branch123',
+        name: 'wat',
+      },
      createdBranch: false,
    });

@@ -1,5 +1,4 @@
 import { AppJSONConfig, ExpoConfig, PackageJSONConfig, getConfig } from '@expo/config';
-import { Updates } from '@expo/config-plugins';
 import { vol } from 'memfs';
 import nullthrows from 'nullthrows';
 import path from 'path';
@@ -82,16 +81,23 @@ describe(UpdateRollBackToEmbedded.name, () => {
    );
  });

-  it('creates a roll back to embedded with --non-interactive, --branch, and --message', async () => {
-    const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];
+  it('creates a roll back to embedded with --non-interactive, --branch, --message, and --runtime-version', async () => {
+    const flags = [
+      '--non-interactive',
+      '--branch=branch123',
+      '--message=abc',
+      '--runtime-version=exposdk:47.0.0',
+    ];

    mockTestProject();
    const platforms = ['android', 'ios'];
    const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);

    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
-      branchId: 'branch123',
+      branch: {
+        id: 'branch123',
+        name: 'wat',
+      },
      createdBranch: false,
    });

@@ -104,19 +110,26 @@ describe(UpdateRollBackToEmbedded.name, () => {
    expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalled();
  });

-  it('creates a roll back to embedded with --non-interactive, --channel, and --message', async () => {
-    const flags = ['--non-interactive', '--channel=channel123', '--message=abc'];
+  it('creates a roll back to embedded with --non-interactive, --channel, --message, and --runtime-version', async () => {
+    const flags = [
+      '--non-interactive',
+      '--channel=channel123',
+      '--message=abc',
+      '--runtime-version=exposdk:47.0.0',
+    ];

    const { projectId } = mockTestProject();
    const platforms = ['android', 'ios'];
    const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);

    jest
      .mocked(getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync)
      .mockResolvedValue({ branchId: updateStub.branch.id, branchName: 'branchFromChannel' });
    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
-      branchId: 'branch123',
+      branch: {
+        id: 'branch123',
+        name: 'wat',
+      },
      createdBranch: false,
    });

@@ -142,29 +155,25 @@ describe(UpdateRollBackToEmbedded.name, () => {
  });

  it('creates a roll back to embedded with the public expo config', async () => {
-    const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];
+    const flags = [
+      '--non-interactive',
+      '--branch=branch123',
+      '--message=abc',
+      '--runtime-version=exposdk:47.0.0',
+    ];

    // Add configuration to the project that should not be included in the update
-    mockTestProject({
-      expoConfig: {
-        hooks: {
-          postPublish: [
-            {
-              file: 'custom-hook.js',
-              config: { some: 'config' },
-            },
-          ],
-        },
-      },
-    });
+    mockTestProject();

    const platforms = ['ios'];
    const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);

    // Mock an existing branch, so we don't create a new one
    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
-      branchId: 'branch123',
+      branch: {
+        id: 'branch123',
+        name: 'wat',
+      },
      createdBranch: false,
    });

@@ -3,7 +3,7 @@ import chalk from 'chalk';

 import { easJsonExistsAsync } from '../../build/configure';
 import EasCommand from '../../commandUtils/EasCommand';
-import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import { EASNonInteractiveFlag, EasUpdateEnvironmentFlag } from '../../commandUtils/flags';
 import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
 import {
@@ -15,12 +15,13 @@ export default class UpdateConfigure extends EasCommand {
  static override description = 'configure the project to support EAS Update';

  static override flags = {
-    platform: Flags.enum({
+    platform: Flags.enum<RequestedPlatform>({
      description: 'Platform to configure',
      char: 'p',
-      options: ['android', 'ios', 'all'],
-      default: 'all',
+      options: Object.values(RequestedPlatform),
+      default: RequestedPlatform.All,
    }),
+    ...EasUpdateEnvironmentFlag,
    ...EASNonInteractiveFlag,
  };

@@ -32,13 +33,12 @@ export default class UpdateConfigure extends EasCommand {

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(UpdateConfigure);
-    const platform = flags.platform as RequestedPlatform;
    const {
      privateProjectConfig: { projectId, exp, projectDir },
      vcsClient,
    } = await this.getContextAsync(UpdateConfigure, {
      nonInteractive: flags['non-interactive'],
-      withServerSideEnvironment: null,
+      withServerSideEnvironment: flags['environment'],
    });

    Log.log(
@@ -51,7 +51,7 @@ export default class UpdateConfigure extends EasCommand {
      exp,
      projectId,
      projectDir,
-      platform,
+      platform: flags['platform'],
      vcsClient,
      env: undefined,
    });
@@ -8,11 +8,12 @@ import { transformFingerprintSource } from '../../build/graphql';
 import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
 import { getUpdateGroupUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { EasNonInteractiveAndJsonFlags, EasUpdateEnvironmentFlag } from '../../commandUtils/flags';
 import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import fetch from '../../fetch';
 import {
  EnvironmentVariableEnvironment,
+  FingerprintInfoGroup,
  PublishUpdateGroupInput,
  StatuspageServiceName,
  UpdateInfoGroup,
@@ -31,7 +32,6 @@ import {
  buildBundlesAsync,
  buildUnsortedUpdateInfoGroupAsync,
  collectAssetsAsync,
-  defaultPublishPlatforms,
  filterCollectedAssetsByRequestedPlatforms,
  generateEasMetadataAsync,
  getBranchNameForCommandAsync,
@@ -40,6 +40,7 @@ import {
  getRuntimeVersionInfoObjectsAsync,
  getUpdateMessageForCommandAsync,
  isUploadedAssetCountAboveWarningThreshold,
+  maybeCalculateFingerprintForRuntimeVersionInfoObjectsWithoutExpoUpdatesAsync,
  platformDisplayNames,
  resolveInputDirectoryAsync,
  uploadAssetsAsync,
@@ -64,7 +65,7 @@ type RawUpdateFlags = {
  branch?: string;
  channel?: string;
  message?: string;
-  platform: string;
+  platform: RequestedPlatform;
  'input-dir': string;
  'skip-bundler': boolean;
  'clear-cache': boolean;
@@ -73,7 +74,7 @@ type RawUpdateFlags = {
  'rollout-percentage'?: number;
  'non-interactive': boolean;
  json: boolean;
-  'with-eas-environment-variables-set'?: string;
+  environment: EnvironmentVariableEnvironment | null;
 };

 type UpdateFlags = {
@@ -90,7 +91,7 @@ type UpdateFlags = {
  rolloutPercentage?: number;
  json: boolean;
  nonInteractive: boolean;
-  withEasEnvironmentVariablesSet?: EnvironmentVariableEnvironment;
+  environment: EnvironmentVariableEnvironment | null;
 };

 export default class UpdatePublish extends EasCommand {
@@ -133,14 +134,10 @@ export default class UpdatePublish extends EasCommand {
      min: 0,
      max: 100,
    }),
-    platform: Flags.enum({
+    platform: Flags.enum<RequestedPlatform>({
      char: 'p',
-      options: [
-        // TODO: Add web when it's fully supported
-        ...defaultPublishPlatforms,
-        'all',
-      ],
-      default: 'all',
+      options: Object.values(RequestedPlatform), // TODO: Add web when it's fully supported
+      default: RequestedPlatform.All,
      required: false,
    }),
    auto: Flags.boolean({
@@ -152,18 +149,7 @@ export default class UpdatePublish extends EasCommand {
      description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory. Only relevant if you are using code signing: https://docs.expo.dev/eas-update/code-signing/`,
      required: false,
    }),
-    'with-eas-environment-variables-set': Flags.enum({
-      description: 'Environment to use for EAS environment variables',
-      options: [
-        EnvironmentVariableEnvironment.Development,
-        EnvironmentVariableEnvironment.Preview,
-        EnvironmentVariableEnvironment.Production,
-      ].map(env => env.toLowerCase()),
-      // eslint-disable-next-line async-protect/async-suffix
-      parse: async input => input.toUpperCase(),
-      required: false,
-      hidden: true,
-    }),
+    ...EasUpdateEnvironmentFlag,
    ...EasNonInteractiveAndJsonFlags,
  };

@@ -191,7 +177,7 @@ export default class UpdatePublish extends EasCommand {
      branchName: branchNameArg,
      emitMetadata,
      rolloutPercentage,
-      withEasEnvironmentVariablesSet,
+      environment,
    } = this.sanitizeFlags(rawFlags);

    const {
@@ -202,7 +188,7 @@ export default class UpdatePublish extends EasCommand {
      getServerSideEnvironmentVariablesAsync,
    } = await this.getContextAsync(UpdatePublish, {
      nonInteractive,
-      withServerSideEnvironment: withEasEnvironmentVariablesSet ?? null,
+      withServerSideEnvironment: environment,
    });

    if (jsonFlag) {
@@ -262,7 +248,7 @@ export default class UpdatePublish extends EasCommand {
          platformFlag: requestedPlatform,
          clearCache,
          extraEnv: {
-            ...(withEasEnvironmentVariablesSet
+            ...(environment
              ? { ...(await getServerSideEnvironmentVariablesAsync()), EXPO_NO_DOTENV: '1' }
              : {}),
          },
@@ -414,27 +400,38 @@ export default class UpdatePublish extends EasCommand {
        runtimeVersionInfoObjects
      );

-    const { branchId } = await ensureBranchExistsAsync(graphqlClient, {
+    const { branch } = await ensureBranchExistsAsync(graphqlClient, {
      appId: projectId,
      branchName,
    });

-    const runtimeToPlatformsAndFingerprintInfoAndFingerprintSourceMapping = await Promise.all(
-      runtimeToPlatformsAndFingerprintInfoMapping.map(async info => {
-        return {
-          ...info,
-          fingerprintSource: info.fingerprint
-            ? (
-                await maybeUploadFingerprintAsync({
-                  runtimeVersion: info.runtimeVersion,
-                  fingerprint: info.fingerprint,
-                  graphqlClient,
-                })
-              ).fingerprintSource ?? null
-            : null,
-        };
-      })
-    );
+    const runtimeToPlatformsAndFingerprintInfoAndFingerprintSourceMappingFromExpoUpdates =
+      await Promise.all(
+        runtimeToPlatformsAndFingerprintInfoMapping.map(async info => {
+          return {
+            ...info,
+            expoUpdatesRuntimeFingerprintSource: info.expoUpdatesRuntimeFingerprint
+              ? (
+                  await maybeUploadFingerprintAsync({
+                    hash: info.runtimeVersion,
+                    fingerprint: info.expoUpdatesRuntimeFingerprint,
+                    graphqlClient,
+                  })
+                ).fingerprintSource ?? null
+              : null,
+          };
+        })
+      );
+
+    const runtimeToPlatformsAndFingerprintInfoAndFingerprintSourceMapping =
+      await maybeCalculateFingerprintForRuntimeVersionInfoObjectsWithoutExpoUpdatesAsync({
+        projectDir,
+        graphqlClient,
+        runtimeToPlatformsAndFingerprintInfoAndFingerprintSourceMapping:
+          runtimeToPlatformsAndFingerprintInfoAndFingerprintSourceMappingFromExpoUpdates,
+        workflowsByPlatform: workflows,
+        env: undefined,
+      });

    const runtimeVersionToRolloutInfoGroup =
      rolloutPercentage !== undefined
@@ -452,7 +449,7 @@ export default class UpdatePublish extends EasCommand {
    // Sort the updates into different groups based on their platform specific runtime versions
    const updateGroups: PublishUpdateGroupInput[] =
      runtimeToPlatformsAndFingerprintInfoAndFingerprintSourceMapping.map(
-        ({ runtimeVersion, platforms, fingerprintSource }) => {
+        ({ runtimeVersion, platforms, fingerprintInfoGroup }) => {
          const localUpdateInfoGroup = Object.fromEntries(
            platforms.map(platform => [
              platform,
@@ -471,19 +468,30 @@ export default class UpdatePublish extends EasCommand {
                ])
              )
            : null;
+          const transformedFingerprintInfoGroup = Object.entries(fingerprintInfoGroup).reduce(
+            (prev, [platform, fingerprintInfo]) => {
+              return {
+                ...prev,
+                [platform]: {
+                  ...fingerprintInfo,
+                  fingerprintSource: transformFingerprintSource(fingerprintInfo.fingerprintSource),
+                },
+              };
+            },
+            {} as FingerprintInfoGroup
+          );

          return {
-            branchId,
+            branchId: branch.id,
            updateInfoGroup: localUpdateInfoGroup,
            rolloutInfoGroup: localRolloutInfoGroup,
-            runtimeFingerprintSource: fingerprintSource
-              ? transformFingerprintSource(fingerprintSource)
-              : null,
+            fingerprintInfoGroup: transformedFingerprintInfoGroup,
            runtimeVersion,
            message: updateMessage,
            gitCommitHash,
            isGitWorkingTreeDirty,
            awaitingCodeSigningInfo: !!codeSigningInfo,
+            environment: environment ?? null,
          };
        }
      );
@@ -661,22 +669,6 @@ export default class UpdatePublish extends EasCommand {
      );
    }

-    if (
-      flags['with-eas-environment-variables-set'] &&
-      !Object.values(EnvironmentVariableEnvironment).includes(
-        flags['with-eas-environment-variables-set'] as EnvironmentVariableEnvironment
-      )
-    ) {
-      Errors.error(
-        `--with-eas-environment-variables-set must be one of ${Object.values(
-          EnvironmentVariableEnvironment
-        )
-          .map(env => `"${env.toLocaleLowerCase()}"`)
-          .join(', ')}`,
-        { exit: 1 }
-      );
-    }
-
    return {
      auto,
      branchName,
@@ -684,16 +676,14 @@ export default class UpdatePublish extends EasCommand {
      updateMessage,
      inputDir: flags['input-dir'],
      skipBundler,
-      clearCache: flags['clear-cache'] ? true : !!flags['with-eas-environment-variables-set'],
-      platform: flags.platform as RequestedPlatform,
+      clearCache: flags['clear-cache'] ? true : !!flags['environment'],
+      platform: flags.platform,
      privateKeyPath: flags['private-key-path'],
      rolloutPercentage: flags['rollout-percentage'],
      nonInteractive,
      emitMetadata,
      json: flags.json ?? false,
-      withEasEnvironmentVariablesSet: flags[
-        'with-eas-environment-variables-set'
-      ] as EnvironmentVariableEnvironment,
+      environment: flags['environment'],
    };
  }
 }
@@ -1,5 +1,4 @@
 import { Platform as PublishPlatform } from '@expo/config';
-import { Workflow } from '@expo/eas-build-job';
 import { Errors, Flags } from '@oclif/core';
 import nullthrows from 'nullthrows';

@@ -12,10 +11,12 @@ import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import fetch from '../../fetch';
 import {
  PublishUpdateGroupInput,
+  RuntimeFragment,
  StatuspageServiceName,
  UpdatePublishMutation,
 } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
+import { RuntimeQuery } from '../../graphql/queries/RuntimeQuery';
 import Log, { link } from '../../log';
 import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
@@ -29,10 +30,8 @@ import {
  defaultPublishPlatforms,
  getBranchNameForCommandAsync,
  getRuntimeToPlatformsAndFingerprintInfoMappingFromRuntimeVersionInfoObjects,
-  getRuntimeVersionInfoObjectsAsync,
  getUpdateMessageForCommandAsync,
 } from '../../project/publish';
-import { resolveWorkflowPerPlatformAsync } from '../../project/workflow';
 import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
 import { getUpdateJsonInfosForUpdates } from '../../update/utils';
 import {
@@ -45,12 +44,13 @@ import {
 import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { Connection, QueryParams, selectPaginatedAsync } from '../../utils/relay';
 import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';

 type RawUpdateFlags = {
-  auto: boolean;
  branch?: string;
  channel?: string;
+  'runtime-version'?: string;
  message?: string;
  platform: string;
  'private-key-path'?: string;
@@ -59,10 +59,10 @@ type RawUpdateFlags = {
 };

 type UpdateFlags = {
-  auto: boolean;
  platform: RequestedPlatform;
  branchName?: string;
  channelName?: string;
+  runtimeVersion?: string;
  updateMessage?: string;
  privateKeyPath?: string;
  json: boolean;
@@ -81,6 +81,10 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      description: 'Channel that the published rollback to embedded update should affect',
      required: false,
    }),
+    'runtime-version': Flags.string({
+      description: 'Runtime version that the rollback to embedded update should target',
+      required: false,
+    }),
    message: Flags.string({
      description: 'A short message describing the rollback to embedded update',
      required: false,
@@ -95,11 +99,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      default: 'all',
      required: false,
    }),
-    auto: Flags.boolean({
-      description:
-        'Use the current git branch and commit message for the EAS branch and update message',
-      default: false,
-    }),
    'private-key-path': Flags.string({
      description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory. Only relevant if you are using code signing: https://docs.expo.dev/eas-update/code-signing/`,
      required: false,
@@ -117,10 +116,10 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
    const { flags: rawFlags } = await this.parse(UpdateRollBackToEmbedded);
    const paginatedQueryOptions = getPaginatedQueryOptions(rawFlags);
    const {
-      auto: autoFlag,
      platform: platformFlag,
      channelName: channelNameArg,
      updateMessage: updateMessageArg,
+      runtimeVersion: runtimeVersionArg,
      privateKeyPath,
      json: jsonFlag,
      nonInteractive,
@@ -171,14 +170,14 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
      projectId,
      channelNameArg,
      branchNameArg,
-      autoFlag,
+      autoFlag: false,
      nonInteractive,
      paginatedQueryOptions,
    });

    const updateMessage = await getUpdateMessageForCommandAsync(vcsClient, {
      updateMessageArg,
-      autoFlag,
+      autoFlag: false,
      nonInteractive,
      jsonFlag,
    });
@@ -186,28 +185,33 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
    const realizedPlatforms: UpdatePublishPlatform[] =
      platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];

-    const { branchId } = await ensureBranchExistsAsync(graphqlClient, {
+    const { branch } = await ensureBranchExistsAsync(graphqlClient, {
      appId: projectId,
      branchName,
    });

-    const gitCommitHash = await vcsClient.getCommitHashAsync();
-    const isGitWorkingTreeDirty = await vcsClient.hasUncommittedChangesAsync();
+    const selectedRuntime =
+      runtimeVersionArg ??
+      (
+        await UpdateRollBackToEmbedded.selectRuntimeAsync(graphqlClient, {
+          appId: projectId,
+          branchName,
+        })
+      )?.version;
+    if (!selectedRuntime) {
+      Errors.error('Must select a runtime or provide the --runtimeVersion flag', { exit: 1 });
+    }

-    const workflows = await resolveWorkflowPerPlatformAsync(projectDir, vcsClient);
-    const runtimeVersionInfoObjects = await getRuntimeVersionInfoObjectsAsync({
-      exp,
-      platforms: realizedPlatforms,
-      projectDir,
-      workflows: {
-        ...workflows,
-        web: Workflow.UNKNOWN,
-      },
-      env: undefined,
-    });
    const runtimeToPlatformsAndFingerprintInfoMapping =
      getRuntimeToPlatformsAndFingerprintInfoMappingFromRuntimeVersionInfoObjects(
-        runtimeVersionInfoObjects
+        realizedPlatforms.map(platform => ({
+          platform,
+          runtimeVersionInfo: {
+            runtimeVersion: selectedRuntime,
+            expoUpdatesRuntimeFingerprint: null,
+            expoUpdatesRuntimeFingerprintHash: null,
+          },
+        }))
      );

    let newUpdates: UpdatePublishMutation['updateBranch']['publishUpdateGroups'];
@@ -215,10 +219,8 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
    try {
      newUpdates = await this.publishRollbacksAsync({
        graphqlClient,
-        isGitWorkingTreeDirty,
-        gitCommitHash,
        updateMessage,
-        branchId,
+        branchId: branch.id,
        codeSigningInfo,
        runtimeToPlatformsAndFingerprintInfoMapping,
        realizedPlatforms,
@@ -232,13 +234,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
    if (jsonFlag) {
      printJsonOnlyOutput(getUpdateJsonInfosForUpdates(newUpdates));
    } else {
-      if (new Set(newUpdates.map(update => update.group)).size > 1) {
-        Log.addNewLineIfNone();
-        Log.log(
-          '👉 Since multiple runtime versions are defined, multiple update groups have been published.'
-        );
-      }
-
      Log.addNewLineIfNone();

      for (const runtime of uniqBy(
@@ -276,14 +271,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
              : []),
            ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
            { label: 'Message', value: updateMessage ?? '' },
-            ...(gitCommitHash
-              ? [
-                  {
-                    label: 'Commit',
-                    value: `${gitCommitHash}${isGitWorkingTreeDirty ? '*' : ''}`,
-                  },
-                ]
-              : []),
            { label: 'EAS Dashboard', value: updateGroupLink },
          ])
        );
@@ -294,8 +281,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {

  private async publishRollbacksAsync({
    graphqlClient,
-    isGitWorkingTreeDirty,
-    gitCommitHash,
    updateMessage,
    branchId,
    codeSigningInfo,
@@ -303,8 +288,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
    realizedPlatforms,
  }: {
    graphqlClient: ExpoGraphqlClient;
-    isGitWorkingTreeDirty: boolean | undefined;
-    gitCommitHash: string | undefined;
    updateMessage: string | undefined;
    branchId: string;
    codeSigningInfo: CodeSigningInfo | undefined;
@@ -329,8 +312,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
          rollBackToEmbeddedInfoGroup: localRollbackInfoGroup,
          runtimeVersion,
          message: updateMessage,
-          gitCommitHash,
-          isGitWorkingTreeDirty,
          awaitingCodeSigningInfo: !!codeSigningInfo,
        };
      }
@@ -381,22 +362,63 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
    return newUpdates;
  }

+  private static async selectRuntimeAsync(
+    graphqlClient: ExpoGraphqlClient,
+    {
+      appId,
+      branchName,
+      batchSize = 5,
+    }: {
+      appId: string;
+      branchName: string;
+      batchSize?: number;
+    }
+  ): Promise<RuntimeFragment | null> {
+    const queryAsync = async (queryParams: QueryParams): Promise<Connection<RuntimeFragment>> => {
+      return await RuntimeQuery.getRuntimesOnBranchAsync(graphqlClient, {
+        appId,
+        name: branchName,
+        first: queryParams.first,
+        after: queryParams.after,
+        last: queryParams.last,
+        before: queryParams.before,
+      });
+    };
+    const getTitleAsync = async (runtime: RuntimeFragment): Promise<string> => {
+      return runtime.version;
+    };
+    return await selectPaginatedAsync({
+      queryAsync,
+      getTitleAsync,
+      printedType: 'target runtime',
+      pageSize: batchSize,
+    });
+  }
+
  private sanitizeFlags(flags: RawUpdateFlags): UpdateFlags {
    const nonInteractive = flags['non-interactive'] ?? false;

-    const { auto, branch: branchName, channel: channelName, message: updateMessage } = flags;
-    if (nonInteractive && !auto && !(updateMessage && (branchName || channelName))) {
+    const {
+      branch: branchName,
+      channel: channelName,
+      message: updateMessage,
+      'runtime-version': runtimeVersion,
+    } = flags;
+    if (nonInteractive && !(updateMessage && (branchName || channelName))) {
      Errors.error(
-        '--branch and --message, or --channel and --message are required when updating in non-interactive mode unless --auto is specified',
+        '--branch and --message, or --channel and --message are required in non-interactive mode',
        { exit: 1 }
      );
    }
+    if (nonInteractive && !runtimeVersion) {
+      Errors.error('--runtimeVersion is required in non-interactive mode', { exit: 1 });
+    }

    return {
-      auto,
      branchName,
      channelName,
      updateMessage,
+      runtimeVersion,
      platform: flags.platform as RequestedPlatform,
      privateKeyPath: flags['private-key-path'],
      nonInteractive,
@@ -0,0 +1,121 @@
+import chalk from 'chalk';
+import fs from 'fs/promises';
+import fsExtra from 'fs-extra';
+import path from 'path';
+import prompts from 'prompts';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import Log from '../../log';
+import { WorkflowFile } from '../../utils/workflowFile';
+
+const DEFAULT_WORKFLOW_NAME = 'workflow.yml';
+const HELLO_WORLD_TEMPLATE = `name: Hello World
+
+on:
+  push:
+    branches: ['*']
+
+jobs:
+  hello_world:
+    steps:
+      - uses: eas/checkout
+      - run: echo "Hello, World"
+`;
+
+export class WorkflowCreate extends EasCommand {
+  static override description = 'create a new workflow configuration YAML file';
+
+  static override args = [
+    {
+      name: 'name',
+      description: 'Name of the workflow file (must end with .yml or .yaml)',
+      required: false,
+    },
+  ];
+
+  static override flags = {
+    ...EASNonInteractiveFlag,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectDir,
+  };
+
+  async runAsync(): Promise<void> {
+    const {
+      args: { name: argFileName },
+      flags,
+    } = await this.parse(WorkflowCreate);
+
+    const { projectDir } = await this.getContextAsync(WorkflowCreate, {
+      nonInteractive: flags['non-interactive'],
+    });
+
+    let fileName = argFileName;
+
+    if (!fileName) {
+      const response = await prompts({
+        type: 'text',
+        name: 'fileName',
+        message: 'What would you like to name your workflow file?',
+        initial: DEFAULT_WORKFLOW_NAME,
+        validate: value => {
+          try {
+            WorkflowFile.validateYamlExtension(value);
+            return true;
+          } catch (error) {
+            return error instanceof Error ? error.message : 'Invalid file name';
+          }
+        },
+      });
+
+      if (!response.fileName) {
+        Log.warn('Workflow creation cancelled.');
+        process.exit(0);
+      }
+
+      fileName = response.fileName;
+    }
+
+    try {
+      await this.ensureWorkflowsDirectoryExistsAsync({ projectDir });
+      await this.createWorkflowFileAsync({ fileName, projectDir });
+    } catch (error) {
+      Log.error('Failed to create workflow file.');
+      throw error;
+    }
+  }
+
+  private async ensureWorkflowsDirectoryExistsAsync({
+    projectDir,
+  }: {
+    projectDir: string;
+  }): Promise<void> {
+    try {
+      await fs.access(path.join(projectDir, '.eas', 'workflows'));
+    } catch {
+      await fs.mkdir(path.join(projectDir, '.eas', 'workflows'), { recursive: true });
+      Log.withTick(`Created directory ${chalk.bold(path.join(projectDir, '.eas', 'workflows'))}`);
+    }
+  }
+
+  private async createWorkflowFileAsync({
+    fileName,
+    projectDir,
+  }: {
+    fileName: string;
+    projectDir: string;
+  }): Promise<void> {
+    WorkflowFile.validateYamlExtension(fileName);
+
+    const filePath = path.join(projectDir, '.eas', 'workflows', fileName);
+
+    if (await fsExtra.pathExists(filePath)) {
+      throw new Error(`Workflow file already exists: ${filePath}`);
+    }
+
+    await fs.writeFile(filePath, HELLO_WORLD_TEMPLATE);
+    Log.withTick(`Created ${chalk.bold(filePath)}`);
+  }
+}
@@ -0,0 +1,142 @@
+import { CombinedError } from '@urql/core';
+import * as path from 'node:path';
+
+import { getWorkflowRunUrl } from '../../build/utils/url';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import { WorkflowProjectSourceType } from '../../graphql/generated';
+import { WorkflowRevisionMutation } from '../../graphql/mutations/WorkflowRevisionMutation';
+import { WorkflowRunMutation } from '../../graphql/mutations/WorkflowRunMutation';
+import Log, { link } from '../../log';
+import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
+import { uploadAccountScopedFileAsync } from '../../project/uploadAccountScopedFileAsync';
+import { uploadAccountScopedProjectSourceAsync } from '../../project/uploadAccountScopedProjectSourceAsync';
+import { WorkflowFile } from '../../utils/workflowFile';
+
+export default class WorkflowRun extends EasCommand {
+  static override description = 'Run an EAS workflow';
+
+  static override args = [{ name: 'file', description: 'Path to the workflow file to run' }];
+
+  static override flags = {
+    ...EASNonInteractiveFlag,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.DynamicProjectConfig,
+    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.Vcs,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  async runAsync(): Promise<void> {
+    const { flags, args } = await this.parse(WorkflowRun);
+
+    const {
+      getDynamicPrivateProjectConfigAsync,
+      loggedIn: { graphqlClient },
+      vcsClient,
+      projectDir,
+    } = await this.getContextAsync(WorkflowRun, {
+      nonInteractive: flags['non-interactive'],
+      withServerSideEnvironment: null,
+    });
+
+    let yamlConfig: string;
+    try {
+      const workflowFileContents = await WorkflowFile.readWorkflowFileContentsAsync({
+        projectDir,
+        filePath: args.file,
+      });
+      Log.log(`Using workflow file from ${workflowFileContents.filePath}`);
+      yamlConfig = workflowFileContents.yamlConfig;
+    } catch (err) {
+      Log.error('Failed to read workflow file.');
+
+      throw err;
+    }
+
+    const {
+      projectId,
+      exp: { slug: projectName },
+    } = await getDynamicPrivateProjectConfigAsync();
+    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
+
+    try {
+      await WorkflowRevisionMutation.validateWorkflowYamlConfigAsync(graphqlClient, {
+        appId: projectId,
+        yamlConfig,
+      });
+    } catch (error) {
+      if (error instanceof CombinedError) {
+        WorkflowFile.maybePrintWorkflowFileValidationErrors({
+          error,
+          accountName: account.name,
+          projectName,
+        });
+
+        throw error;
+      }
+    }
+
+    let projectArchiveBucketKey: string;
+    let easJsonBucketKey: string;
+    let packageJsonBucketKey: string;
+
+    try {
+      ({ projectArchiveBucketKey } = await uploadAccountScopedProjectSourceAsync({
+        graphqlClient,
+        vcsClient,
+        accountId: account.id,
+      }));
+      ({ fileBucketKey: easJsonBucketKey } = await uploadAccountScopedFileAsync({
+        graphqlClient,
+        accountId: account.id,
+        filePath: path.join(projectDir, 'eas.json'),
+        maxSizeBytes: 1024 * 1024,
+      }));
+      ({ fileBucketKey: packageJsonBucketKey } = await uploadAccountScopedFileAsync({
+        graphqlClient,
+        accountId: account.id,
+        filePath: path.join(projectDir, 'package.json'),
+        maxSizeBytes: 1024 * 1024,
+      }));
+    } catch (err) {
+      Log.error('Failed to upload project sources.');
+
+      throw err;
+    }
+
+    try {
+      const { id: workflowRunId } = await WorkflowRunMutation.createWorkflowRunAsync(
+        graphqlClient,
+        {
+          appId: projectId,
+          workflowRevisionInput: {
+            fileName: path.basename(args.file),
+            yamlConfig,
+          },
+          workflowRunInput: {
+            projectSource: {
+              type: WorkflowProjectSourceType.Gcs,
+              projectArchiveBucketKey,
+              easJsonBucketKey,
+              packageJsonBucketKey,
+            },
+          },
+        }
+      );
+
+      Log.newLine();
+      Log.succeed(
+        `Workflow started successfully. ${link(
+          getWorkflowRunUrl(account.name, projectName, workflowRunId)
+        )}`
+      );
+    } catch (err) {
+      Log.error('Failed to start the workflow with the API.');
+
+      throw err;
+    }
+  }
+}
@@ -0,0 +1,102 @@
+import { CombinedError } from '@urql/core';
+import * as YAML from 'yaml';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import { WorkflowRevisionMutation } from '../../graphql/mutations/WorkflowRevisionMutation';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
+import { WorkflowFile } from '../../utils/workflowFile';
+
+export class WorkflowValidate extends EasCommand {
+  static override description = 'validate a workflow configuration yaml file';
+
+  static override args = [
+    {
+      name: 'path',
+      description: 'Path to the workflow configuration YAML file (must end with .yml or .yaml)',
+      required: true,
+    },
+  ];
+
+  static override flags = {
+    ...EASNonInteractiveFlag,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.DynamicProjectConfig,
+    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  async runAsync(): Promise<void> {
+    const {
+      args: { path: filePath },
+      flags,
+    } = await this.parse(WorkflowValidate);
+
+    const {
+      getDynamicPrivateProjectConfigAsync,
+      loggedIn: { graphqlClient },
+      projectDir,
+    } = await this.getContextAsync(WorkflowValidate, {
+      nonInteractive: flags['non-interactive'],
+      withServerSideEnvironment: null,
+    });
+
+    const {
+      projectId,
+      exp: { slug: projectName },
+    } = await getDynamicPrivateProjectConfigAsync();
+    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
+
+    const spinner = ora().start('Validating the workflow YAML file…');
+
+    try {
+      const workflowFileContents = await WorkflowFile.readWorkflowFileContentsAsync({
+        projectDir,
+        filePath,
+      });
+      Log.log(`Using workflow file from ${workflowFileContents.filePath}`);
+
+      const parsedYaml = YAML.parse(workflowFileContents.yamlConfig);
+
+      // Check if the parsed result is empty or null
+      if (
+        parsedYaml === null ||
+        parsedYaml === undefined ||
+        (typeof parsedYaml === 'object' && Object.keys(parsedYaml).length === 0)
+      ) {
+        throw new Error('YAML file is empty or contains only comments.');
+      }
+
+      await WorkflowRevisionMutation.validateWorkflowYamlConfigAsync(graphqlClient, {
+        appId: projectId,
+        yamlConfig: workflowFileContents.yamlConfig,
+      });
+
+      spinner.succeed('Workflow configuration YAML is valid.');
+    } catch (error) {
+      spinner.fail('Workflow configuration YAML is not valid.');
+
+      if (error instanceof YAML.YAMLParseError) {
+        Log.error(`YAML syntax error: ${error.message}`);
+      } else if (error instanceof CombinedError) {
+        WorkflowFile.maybePrintWorkflowFileValidationErrors({
+          error,
+          accountName: account.name,
+          projectName,
+        });
+
+        throw error;
+      } else if (error instanceof Error) {
+        Log.error(error.message);
+      } else {
+        Log.error(`Unexpected error: ${String(error)}`);
+      }
+
+      throw error;
+    }
+  }
+}
@@ -21,8 +21,9 @@ export function createCtxMock(mockOverride: Record<string, any> = {}): Credentia
    },
    hasAppleCtx: jest.fn(() => true),
    hasProjectContext: true,
-    exp: testAppJson,
+    getExpoConfigAsync: async () => testAppJson,
    projectDir: '.',
+    getProjectIdAsync: async () => 'test-project-id',
  };
  return merge(defaultMock, mockOverride) as any;
 }
@@ -15,6 +15,7 @@ export interface AndroidCredentials {

 interface Options {
  app: AppLookupParams;
+  name?: string;
 }

 export default class AndroidCredentialsProvider {
@@ -37,7 +38,7 @@ export default class AndroidCredentialsProvider {
  }

  private async getRemoteAsync(): Promise<AndroidCredentials> {
-    const setupBuildCredentialsAction = new SetUpBuildCredentials({ app: this.options.app });
+    const setupBuildCredentialsAction = new SetUpBuildCredentials(this.options);
    const buildCredentials = await setupBuildCredentialsAction.runAsync(this.ctx);
    return this.toAndroidCredentials(buildCredentials);
  }
@@ -101,14 +101,14 @@ export async function getAppLookupParamsFromContextAsync(
  ctx: CredentialsContext,
  gradleContext?: GradleBuildContext
 ): Promise<AppLookupParams> {
-  ctx.ensureProjectContext();
-  const projectName = ctx.exp.slug;
-  const projectId = ctx.projectId;
+  const exp = await ctx.getExpoConfigAsync();
+  const projectName = exp.slug;
+  const projectId = await ctx.getProjectIdAsync();
  const account = await getOwnerAccountForProjectIdAsync(ctx.graphqlClient, projectId);

  const androidApplicationIdentifier = await getApplicationIdAsync(
    ctx.projectDir,
-    ctx.exp,
+    exp,
    ctx.vcsClient,
    gradleContext
  );
@@ -16,7 +16,7 @@ export class CreateKeystore {
      throw new Error(`New keystore cannot be created in non-interactive mode.`);
    }

-    const projectId = ctx.projectId;
+    const projectId = await ctx.getProjectIdAsync();
    const keystore = await this.provideOrGenerateAsync(ctx.graphqlClient, ctx.analytics, projectId);
    const keystoreFragment = await ctx.android.createKeystoreAsync(
      ctx.graphqlClient,
@@ -10,7 +10,7 @@ import { AuthenticationMode } from './ios/appstore/authenticateTypes';
 import { Analytics } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import Log from '../log';
-import { getPrivateExpoConfig } from '../project/expoConfig';
+import { getPrivateExpoConfigAsync } from '../project/expoConfig';
 import { confirmAsync } from '../prompts';
 import { Actor } from '../user/User';
 import { Client } from '../vcs/vcs';
@@ -32,6 +32,7 @@ export class CredentialsContext {
  public readonly analytics: Analytics;
  public readonly vcsClient: Client;
  public readonly easJsonCliConfig?: EasJson['cli'];
+  public readonly usesBroadcastPushNotifications: boolean;

  private shouldAskAuthenticateAppStore: boolean = true;

@@ -61,28 +62,30 @@ export class CredentialsContext {
    this.nonInteractive = options.nonInteractive ?? false;
    this.projectInfo = options.projectInfo;
    this.freezeCredentials = options.freezeCredentials ?? false;
+    this.usesBroadcastPushNotifications =
+      options.projectInfo?.exp.ios?.usesBroadcastPushNotifications ?? false;
  }

  get hasProjectContext(): boolean {
    return !!this.projectInfo;
  }

-  get exp(): ExpoConfig {
-    this.ensureProjectContext();
+  public async getExpoConfigAsync(): Promise<ExpoConfig> {
+    await this.ensureProjectContextAsync();
    return this.projectInfo!.exp;
  }

-  get projectId(): string {
-    this.ensureProjectContext();
+  public async getProjectIdAsync(): Promise<string> {
+    await this.ensureProjectContextAsync();
    return this.projectInfo!.projectId;
  }

-  public ensureProjectContext(): void {
+  public async ensureProjectContextAsync(): Promise<void> {
    if (this.hasProjectContext) {
      return;
    }
    // trigger getConfig error
-    getPrivateExpoConfig(this.options.projectDir);
+    await getPrivateExpoConfigAsync(this.options.projectDir);
  }

  async bestEffortAppStoreAuthenticateAsync(): Promise<void> {
@@ -91,9 +91,9 @@ export async function assignBuildCredentialsAsync(
 }

 export async function getAppFromContextAsync(ctx: CredentialsContext): Promise<App> {
-  ctx.ensureProjectContext();
-  const projectName = ctx.exp.slug;
-  const projectId = ctx.projectId;
+  const exp = await ctx.getExpoConfigAsync();
+  const projectName = exp.slug;
+  const projectId = await ctx.getProjectIdAsync();
  const account = await getOwnerAccountForProjectIdAsync(ctx.graphqlClient, projectId);
  return {
    account,
@@ -35,7 +35,7 @@ export class SetUpTargetBuildCredentials {
          bundleIdentifier: app.bundleIdentifier,
          projectName: app.projectName,
        },
-        { entitlements }
+        { entitlements, usesBroadcastPushNotifications: ctx.usesBroadcastPushNotifications }
      );
    }
    try {
@@ -45,7 +45,9 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
      id: 'XXX',
    } as any;

-    await syncCapabilitiesForEntitlementsAsync(bundleId, entitlements);
+    await syncCapabilitiesForEntitlementsAsync(bundleId, entitlements, {
+      usesBroadcastPushNotifications: false,
+    });

    expect(bundleId.updateBundleIdCapabilityAsync).toBeCalledWith([
      {
@@ -62,63 +64,70 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
      id: 'XXX',
    } as any;

-    const results = await syncCapabilitiesForEntitlementsAsync(bundleId, {
-      'com.apple.developer.healthkit': true,
-      //   'com.apple.developer.healthkit.access': [],
-      'com.apple.developer.in-app-payments': ['merchant.com.example.development'],
-      'com.apple.developer.icloud-container-identifiers': [],
-      'com.apple.developer.ClassKit-environment': 'development',
-      'com.apple.developer.default-data-protection':
-        'NSFileProtectionCompleteUntilFirstUserAuthentication',
-      'com.apple.developer.networking.networkextension': ['dns-proxy'],
-      'com.apple.developer.networking.vpn.api': ['allow-vpn'],
-      'com.apple.developer.networking.HotspotConfiguration': true,
-      'com.apple.developer.kernel.extended-virtual-addressing': true,
-      'com.apple.developer.homekit': true,
-      'com.apple.developer.networking.multipath': true,
-      'com.apple.external-accessory.wireless-configuration': true,
-      'inter-app-audio': true,
-      'com.apple.developer.pass-type-identifiers': ['$(TeamIdentifierPrefix)*'],
-      'com.apple.developer.user-fonts': ['app-usage'],
-      'com.apple.developer.devicecheck.appattest-environment': 'development',
-      'com.apple.developer.nfc.readersession.formats': ['NDEF', 'TAG'],
-      'com.apple.developer.applesignin': ['Default'],
-      'com.apple.developer.siri': true,
-      'com.apple.developer.networking.wifi-info': true,
-      'com.apple.developer.usernotifications.communication': true,
-      'com.apple.developer.usernotifications.time-sensitive': true,
-      'com.apple.developer.group-session': true,
-      'com.apple.developer.family-controls': true,
-      'com.apple.developer.authentication-services.autofill-credential-provider': true,
-      //   'com.apple.developer.game-center': true,
-      'com.apple.security.application-groups': [
-        'group.CY-A5149AC2-49FC-11E7-B3F3-0335A16FFB8D.com.cydia.Extender',
-      ],
+    const results = await syncCapabilitiesForEntitlementsAsync(
+      bundleId,
+      {
+        'com.apple.developer.healthkit': true,
+        //   'com.apple.developer.healthkit.access': [],
+        'com.apple.developer.in-app-payments': ['merchant.com.example.development'],
+        'com.apple.developer.icloud-container-identifiers': [],
+        'com.apple.developer.ClassKit-environment': 'development',
+        'com.apple.developer.default-data-protection':
+          'NSFileProtectionCompleteUntilFirstUserAuthentication',
+        'com.apple.developer.networking.networkextension': ['dns-proxy'],
+        'com.apple.developer.networking.vpn.api': ['allow-vpn'],
+        'com.apple.developer.networking.HotspotConfiguration': true,
+        'com.apple.developer.kernel.extended-virtual-addressing': true,
+        'com.apple.developer.homekit': true,
+        'com.apple.developer.networking.multipath': true,
+        'com.apple.external-accessory.wireless-configuration': true,
+        'inter-app-audio': true,
+        'com.apple.developer.pass-type-identifiers': ['$(TeamIdentifierPrefix)*'],
+        'com.apple.developer.user-fonts': ['app-usage'],
+        'com.apple.developer.devicecheck.appattest-environment': 'development',
+        'com.apple.developer.nfc.readersession.formats': ['NDEF', 'TAG'],
+        'com.apple.developer.applesignin': ['Default'],
+        'com.apple.developer.siri': true,
+        'com.apple.developer.networking.wifi-info': true,
+        'com.apple.developer.usernotifications.communication': true,
+        'com.apple.developer.usernotifications.time-sensitive': true,
+        'com.apple.developer.group-session': true,
+        'com.apple.developer.family-controls': true,
+        'com.apple.developer.authentication-services.autofill-credential-provider': true,
+        //   'com.apple.developer.game-center': true,
+        'com.apple.security.application-groups': [
+          'group.CY-A5149AC2-49FC-11E7-B3F3-0335A16FFB8D.com.cydia.Extender',
+        ],

-      'com.apple.developer.fileprovider.testing-mode': true,
-      'com.apple.developer.healthkit.recalibrate-estimates': true,
-      'com.apple.developer.maps': true,
-      'com.apple.developer.user-management': true,
-      'com.apple.developer.networking.custom-protocol': true,
-      'com.apple.developer.system-extension.install': true,
-      'com.apple.developer.push-to-talk': true,
-      'com.apple.developer.driverkit.transport.usb': true,
-      'com.apple.developer.kernel.increased-memory-limit': true,
-      'com.apple.developer.driverkit.communicates-with-drivers': true,
-      'com.apple.developer.media-device-discovery-extension': true,
-      'com.apple.developer.driverkit.allow-third-party-userclients': true,
-      'com.apple.developer.weatherkit': true,
-      'com.apple.developer.on-demand-install-capable': true,
-      'com.apple.developer.driverkit.family.scsicontroller': true,
-      'com.apple.developer.driverkit.family.serial': true,
-      'com.apple.developer.driverkit.family.networking': true,
-      'com.apple.developer.driverkit.family.hid.eventservice': true,
-      'com.apple.developer.driverkit.family.hid.device': true,
-      'com.apple.developer.driverkit': true,
-      'com.apple.developer.driverkit.transport.hid': true,
-      'com.apple.developer.driverkit.family.audio': true,
-      'com.apple.developer.shared-with-you': true,
-    });
+        'com.apple.developer.fileprovider.testing-mode': true,
+        'com.apple.developer.healthkit.recalibrate-estimates': true,
+        'com.apple.developer.maps': true,
+        'com.apple.developer.user-management': true,
+        'com.apple.developer.networking.custom-protocol': true,
+        'com.apple.developer.system-extension.install': true,
+        'com.apple.developer.push-to-talk': true,
+        'com.apple.developer.driverkit.transport.usb': true,
+        'com.apple.developer.kernel.increased-memory-limit': true,
+        'com.apple.developer.driverkit.communicates-with-drivers': true,
+        'com.apple.developer.media-device-discovery-extension': true,
+        'com.apple.developer.driverkit.allow-third-party-userclients': true,
+        'com.apple.developer.weatherkit': true,
+        'com.apple.developer.on-demand-install-capable': true,
+        'com.apple.developer.driverkit.family.scsicontroller': true,
+        'com.apple.developer.driverkit.family.serial': true,
+        'com.apple.developer.driverkit.family.networking': true,
+        'com.apple.developer.driverkit.family.hid.eventservice': true,
+        'com.apple.developer.driverkit.family.hid.device': true,
+        'com.apple.developer.driverkit': true,
+        'com.apple.developer.driverkit.transport.hid': true,
+        'com.apple.developer.driverkit.family.audio': true,
+        'com.apple.developer.shared-with-you': true,
+        'aps-environment': 'production',
+      },
+      {
+        usesBroadcastPushNotifications: false,
+      }
+    );

    expect(bundleId.updateBundleIdCapabilityAsync).toBeCalledWith([
      { capabilityType: 'HEALTHKIT', option: 'ON' },
@@ -251,6 +260,10 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
        capabilityType: 'SHARED_WITH_YOU',
        option: 'ON',
      },
+      {
+        capabilityType: 'PUSH_NOTIFICATIONS',
+        option: 'ON',
+      },
    ]);

    expect(results.enabled).toMatchInlineSnapshot(`
@@ -304,6 +317,7 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
        "DriverKit Transport HID (development)",
        "DriverKit Family Audio (development)",
        "Shared with You",
+        "Push Notifications",
      ]
    `);
    expect(results.disabled).toStrictEqual([]);
@@ -318,9 +332,15 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
      id: 'XXX',
    } as any;

-    const results = await syncCapabilitiesForEntitlementsAsync(bundleId, {
-      'com.apple.developer.healthkit': true,
-    });
+    const results = await syncCapabilitiesForEntitlementsAsync(
+      bundleId,
+      {
+        'com.apple.developer.healthkit': true,
+      },
+      {
+        usesBroadcastPushNotifications: false,
+      }
+    );

    expect(bundleId.updateBundleIdCapabilityAsync).not.toBeCalled();

@@ -344,9 +364,15 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
    } as any;

    await expect(
-      syncCapabilitiesForEntitlementsAsync(bundleId, {
-        'com.apple.developer.healthkit': true,
-      })
+      syncCapabilitiesForEntitlementsAsync(
+        bundleId,
+        {
+          'com.apple.developer.healthkit': true,
+        },
+        {
+          usesBroadcastPushNotifications: false,
+        }
+      )
    ).rejects.toThrowError(
      `https://developer-mdn.apple.com/account/resources/identifiers/bundleId/edit/XXX333`
    );
@@ -361,9 +387,15 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
      id: 'XXX',
    } as any;

-    const results = await syncCapabilitiesForEntitlementsAsync(bundleId, {
-      'com.apple.developer.healthkit': true,
-    });
+    const results = await syncCapabilitiesForEntitlementsAsync(
+      bundleId,
+      {
+        'com.apple.developer.healthkit': true,
+      },
+      {
+        usesBroadcastPushNotifications: false,
+      }
+    );

    expect(bundleId.updateBundleIdCapabilityAsync).toBeCalledWith([
      { capabilityType: 'HEALTHKIT', option: 'ON' },
@@ -382,9 +414,15 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
      id: 'XXX',
    } as any;

-    const results = await syncCapabilitiesForEntitlementsAsync(bundleId, {
-      'com.apple.developer.healthkit': true,
-    });
+    const results = await syncCapabilitiesForEntitlementsAsync(
+      bundleId,
+      {
+        'com.apple.developer.healthkit': true,
+      },
+      {
+        usesBroadcastPushNotifications: false,
+      }
+    );

    expect(bundleId.updateBundleIdCapabilityAsync).toBeCalledWith([
      { capabilityType: 'HEALTHKIT', option: 'ON' },
@@ -406,7 +444,13 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
      id: 'XXX',
    } as any;

-    const results = await syncCapabilitiesForEntitlementsAsync(bundleId, {});
+    const results = await syncCapabilitiesForEntitlementsAsync(
+      bundleId,
+      {},
+      {
+        usesBroadcastPushNotifications: false,
+      }
+    );

    expect(bundleId.updateBundleIdCapabilityAsync).not.toBeCalled();

@@ -423,9 +467,15 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
      id: 'XXX',
    } as any;

-    const results = await syncCapabilitiesForEntitlementsAsync(bundleId, {
-      'com.apple.developer.healthkit': true,
-    });
+    const results = await syncCapabilitiesForEntitlementsAsync(
+      bundleId,
+      {
+        'com.apple.developer.healthkit': true,
+      },
+      {
+        usesBroadcastPushNotifications: false,
+      }
+    );

    expect(bundleId.updateBundleIdCapabilityAsync).toBeCalledWith([
      { capabilityType: 'HEALTHKIT', option: 'ON' },
@@ -434,4 +484,164 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
    expect(results.enabled).toStrictEqual(['HealthKit']);
    expect(results.disabled).toStrictEqual([]);
  });
+
+  it('enables push notifications capability with broadcast option when the capability is disabled and usesBroadcastPushNotifications is true', async () => {
+    const bundleId = {
+      getBundleIdCapabilitiesAsync: jest.fn(() => []),
+      updateBundleIdCapabilityAsync: jest.fn(),
+      id: 'XXX',
+    } as any;
+
+    const results = await syncCapabilitiesForEntitlementsAsync(
+      bundleId,
+      {
+        'aps-environment': 'production',
+      },
+      {
+        usesBroadcastPushNotifications: true,
+      }
+    );
+
+    expect(bundleId.updateBundleIdCapabilityAsync).toBeCalledWith([
+      { capabilityType: 'PUSH_NOTIFICATIONS', option: 'PUSH_NOTIFICATION_FEATURE_BROADCAST' },
+    ]);
+
+    expect(results.enabled).toStrictEqual(['Push Notifications']);
+    expect(results.disabled).toStrictEqual([]);
+  });
+
+  it('updates push notifications capability with broadcast option when the capability is enabled without settings and usesBroadcastPushNotifications is true', async () => {
+    const bundleId = {
+      getBundleIdCapabilitiesAsync: jest.fn(() => [
+        new BundleIdCapability({}, 'XXX_PUSH_NOTIFICATIONS', { settings: null }),
+      ]),
+      updateBundleIdCapabilityAsync: jest.fn(),
+      id: 'XXX',
+    } as any;
+
+    const results = await syncCapabilitiesForEntitlementsAsync(
+      bundleId,
+      {
+        'aps-environment': 'production',
+      },
+      {
+        usesBroadcastPushNotifications: true,
+      }
+    );
+
+    expect(bundleId.updateBundleIdCapabilityAsync).toBeCalledWith([
+      { capabilityType: 'PUSH_NOTIFICATIONS', option: 'PUSH_NOTIFICATION_FEATURE_BROADCAST' },
+    ]);
+
+    expect(results.enabled).toStrictEqual(['Push Notifications']);
+    expect(results.disabled).toStrictEqual([]);
+  });
+
+  it('disables push notifications capability', async () => {
+    const bundleId = {
+      getBundleIdCapabilitiesAsync: jest.fn(() => [
+        new BundleIdCapability({}, 'XXX_PUSH_NOTIFICATIONS', { settings: null }),
+      ]),
+      updateBundleIdCapabilityAsync: jest.fn(),
+      id: 'XXX',
+    } as any;
+
+    const results = await syncCapabilitiesForEntitlementsAsync(
+      bundleId,
+      {},
+      {
+        usesBroadcastPushNotifications: true,
+      }
+    );
+
+    expect(bundleId.updateBundleIdCapabilityAsync).toBeCalledWith([
+      { capabilityType: 'PUSH_NOTIFICATIONS', option: 'OFF' },
+    ]);
+
+    expect(results.disabled).toStrictEqual(['Push Notifications']);
+    expect(results.enabled).toStrictEqual([]);
+  });
+
+  it('does nothing when push notifications capability is enabled with broadcast options and usesBroadcastPushNotifications is true', async () => {
+    const bundleId = {
+      getBundleIdCapabilitiesAsync: jest.fn(() => [
+        new BundleIdCapability({}, 'XXX_PUSH_NOTIFICATIONS', {
+          settings: [],
+        }),
+      ]),
+      updateBundleIdCapabilityAsync: jest.fn(),
+      id: 'XXX',
+    } as any;
+
+    const results = await syncCapabilitiesForEntitlementsAsync(
+      bundleId,
+      {
+        'aps-environment': 'production',
+      },
+      {
+        usesBroadcastPushNotifications: true,
+      }
+    );
+
+    expect(bundleId.updateBundleIdCapabilityAsync).not.toBeCalled();
+
+    expect(results.disabled).toStrictEqual([]);
+    expect(results.enabled).toStrictEqual([]);
+  });
+
+  it('does nothing when push notifications capability is enabled without broadcast options and usesBroadcastPushNotifications is false', async () => {
+    const bundleId = {
+      getBundleIdCapabilitiesAsync: jest.fn(() => [
+        new BundleIdCapability({}, 'XXX_PUSH_NOTIFICATIONS', {
+          settings: null,
+        }),
+      ]),
+      updateBundleIdCapabilityAsync: jest.fn(),
+      id: 'XXX',
+    } as any;
+
+    const results = await syncCapabilitiesForEntitlementsAsync(
+      bundleId,
+      {
+        'aps-environment': 'production',
+      },
+      {
+        usesBroadcastPushNotifications: false,
+      }
+    );
+
+    expect(bundleId.updateBundleIdCapabilityAsync).not.toBeCalled();
+
+    expect(results.disabled).toStrictEqual([]);
+    expect(results.enabled).toStrictEqual([]);
+  });
+
+  it('updates push notifications capability without broadcast options when it is enabled and usesBroadcastPushNotifications is false', async () => {
+    const bundleId = {
+      getBundleIdCapabilitiesAsync: jest.fn(() => [
+        new BundleIdCapability({}, 'XXX_PUSH_NOTIFICATIONS', {
+          settings: [],
+        }),
+      ]),
+      updateBundleIdCapabilityAsync: jest.fn(),
+      id: 'XXX',
+    } as any;
+
+    const results = await syncCapabilitiesForEntitlementsAsync(
+      bundleId,
+      {
+        'aps-environment': 'production',
+      },
+      {
+        usesBroadcastPushNotifications: false,
+      }
+    );
+
+    expect(bundleId.updateBundleIdCapabilityAsync).toBeCalledWith([
+      { capabilityType: 'PUSH_NOTIFICATIONS', option: 'ON' },
+    ]);
+
+    expect(results.disabled).toStrictEqual([]);
+    expect(results.enabled).toStrictEqual(['Push Notifications']);
+  });
 });
@@ -0,0 +1,168 @@
+import { Session } from '@expo/apple-utils';
+import nock from 'nock';
+
+import { createAppAsync } from '../ensureAppExists';
+
+const FIXTURE_SUCCESS = {
+  data: {
+    type: 'apps',
+    id: '6741087677',
+    attributes: {
+      name: 'expo (xxx)',
+      bundleId: 'com.bacon.jan27.x',
+    },
+  },
+};
+
+const FIXTURE_INVALID_NAME = {
+  errors: [
+    {
+      id: 'b3e7ca18-e4ce-4e55-83ce-8fff35dbaeca',
+      status: '409',
+      code: 'ENTITY_ERROR.ATTRIBUTE.INVALID.INVALID_CHARACTERS',
+      title: 'An attribute value has invalid characters.',
+      detail:
+        'App Name contains certain Unicode symbols, emoticons, diacritics, special characters, or private use characters that are not permitted.',
+      source: {
+        pointer: '/included/1/name',
+      },
+    },
+  ],
+};
+
+const FIXTURE_ALREADY_USED_ON_ACCOUNT = {
+  errors: [
+    {
+      id: 'b91aefc5-0e94-48d9-8613-5b1a464a20f0',
+      status: '409',
+      code: 'ENTITY_ERROR.ATTRIBUTE.INVALID.DUPLICATE.SAME_ACCOUNT',
+      title:
+        'The provided entity includes an attribute with a value that has already been used on this account.',
+      detail:
+        'The app name you entered is already being used for another app in your account. If you would like to use the name for this app you will need to submit an update to your other app to change the name, or remove it from App Store Connect.',
+      source: {
+        pointer: '/included/1/name',
+      },
+    },
+  ],
+};
+
+const FIXTURE_ALREADY_USED_ON_ANOTHER_ACCOUNT = {
+  errors: [
+    {
+      id: '72b960f2-9e51-4f19-8d83-7cc08d42fec4',
+      status: '409',
+      code: 'ENTITY_ERROR.ATTRIBUTE.INVALID.DUPLICATE.DIFFERENT_ACCOUNT',
+      title:
+        'The provided entity includes an attribute with a value that has already been used on a different account.',
+      detail:
+        'The App Name you entered is already being used. If you have trademark rights to this name and would like it released for your use, submit a claim.',
+      source: {
+        pointer: '/included/1/name',
+      },
+    },
+  ],
+};
+
+const MOCK_CONTEXT = {
+  providerId: 1337,
+  teamId: 'test-team-id',
+  token: 'test-token',
+};
+
+beforeAll(async () => {
+  // Mock setup cookies API calls.
+  nock('https://appstoreconnect.apple.com')
+    .get(`/olympus/v1/session`)
+    .reply(200, {
+      provider: {
+        providerId: 1337,
+        publicProviderId: 'xxx-xxx-xxx-xxx-xxx',
+        name: 'Evan Bacon',
+        contentTypes: ['SOFTWARE'],
+        subType: 'INDIVIDUAL',
+      },
+    });
+
+  await Session.fetchCurrentSessionInfoAsync();
+});
+
+function getNameFromBody(body: any): any {
+  return body.included.find((item: any) => item.id === '${new-appInfoLocalization-id}')?.attributes
+    ?.name;
+}
+
+it('asserts invalid name cases', async () => {
+  const scope = nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`, body => {
+      expect(getNameFromBody(body)).toBe('Expo 🚀');
+
+      return true;
+    })
+    .reply(409, FIXTURE_INVALID_NAME);
+
+  // Already used on same account
+  nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`, body => {
+      expect(getNameFromBody(body)).toBe('Expo -');
+      return true;
+    })
+    .reply(409, FIXTURE_ALREADY_USED_ON_ACCOUNT);
+
+  // Already used on different account
+  nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`, body => {
+      expect(getNameFromBody(body)).toMatch(/Expo - \([\w\d]+\)/);
+      return true;
+    })
+    .reply(409, FIXTURE_ALREADY_USED_ON_ANOTHER_ACCOUNT);
+
+  // Success
+  nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`, body => {
+      expect(getNameFromBody(body)).toMatch(/Expo - \([\w\d]+\)/);
+      return true;
+    })
+    .reply(200, FIXTURE_SUCCESS);
+
+  await createAppAsync(MOCK_CONTEXT, {
+    bundleId: 'com.bacon.jan27.x',
+    name: 'Expo 🚀',
+    companyName: 'expo',
+  });
+
+  expect(scope.isDone()).toBeTruthy();
+});
+
+it('works on first try', async () => {
+  nock('https://appstoreconnect.apple.com').post(`/iris/v1/apps`).reply(200, FIXTURE_SUCCESS);
+
+  await createAppAsync(MOCK_CONTEXT, {
+    bundleId: 'com.bacon.jan27.x',
+    name: 'Expo',
+    companyName: 'expo',
+  });
+});
+
+it('doubles up entropy', async () => {
+  nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`)
+    .reply(409, FIXTURE_ALREADY_USED_ON_ANOTHER_ACCOUNT);
+
+  nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`)
+    .reply(409, FIXTURE_ALREADY_USED_ON_ANOTHER_ACCOUNT);
+
+  nock('https://appstoreconnect.apple.com')
+    .post(`/iris/v1/apps`, body => {
+      expect(getNameFromBody(body)).toMatch(/Expo \([\w\d]+\) \([\w\d]+\)/);
+      return true;
+    })
+    .reply(200, FIXTURE_SUCCESS);
+
+  await createAppAsync(MOCK_CONTEXT, {
+    bundleId: 'com.bacon.jan27.x',
+    name: 'Expo',
+    companyName: 'expo',
+  });
+});
@@ -1,11 +1,26 @@
+import { JsonFileCache } from '@expo/apple-utils';
+import * as fs from 'fs-extra';
 import { vol } from 'memfs';

 import { promptAsync } from '../../../../prompts';
 import { AppleTeamType } from '../authenticateTypes';
-import { resolveAppleTeamAsync, resolveAscApiKeyAsync } from '../resolveCredentials';
+import * as Keychain from '../keychain';
+import {
+  resolveAppleTeamAsync,
+  resolveAscApiKeyAsync,
+  resolveUserCredentialsAsync,
+} from '../resolveCredentials';

 jest.mock('../../../../prompts');
 jest.mock('fs');
+jest.mock('@expo/apple-utils', () => {
+  return {
+    getCacheAsync: jest.fn(),
+    usernameCachePath: jest.fn(),
+    ...jest.requireActual('@expo/apple-utils'),
+  };
+});
+jest.mock('../keychain');

 const testAscApiKey = {
  keyP8: 'test-key-p8',
@@ -89,3 +104,139 @@ describe(resolveAppleTeamAsync, () => {
    });
  });
 });
+
+describe(resolveUserCredentialsAsync, () => {
+  let KeychainMock: any;
+  beforeAll(() => {
+    JsonFileCache.getCacheAsync = jest.fn().mockImplementation(async (filePath: string) => {
+      const content = await fs.readFile(filePath, 'utf-8');
+      return content ? JSON.parse(content) : null;
+    });
+    KeychainMock = jest.mocked(Keychain);
+  });
+  beforeEach(() => {
+    jest.clearAllMocks();
+    KeychainMock.EXPO_NO_KEYCHAIN = '';
+  });
+
+  it('uses credentials resolved from options', async () => {
+    const result = await resolveUserCredentialsAsync({
+      username: 'fakeUsername',
+      password: 'fakePassword',
+    });
+    expect(result).toMatchObject({
+      username: 'fakeUsername',
+      password: 'fakePassword',
+    });
+  });
+
+  it('uses credentials resolved from environment', async () => {
+    process.env.EXPO_APPLE_ID = 'fakeUsername';
+    process.env.EXPO_APPLE_PASSWORD = 'fakePassword';
+
+    const result = await resolveUserCredentialsAsync({});
+    expect(result).toMatchObject({
+      username: 'fakeUsername',
+      password: 'fakePassword',
+    });
+  });
+
+  it('uses credentials from prompt, does not update cache if they match', async () => {
+    vol.fromJSON({
+      './.app-store/auth/username.json': `
+      {
+        "username": "fakeUsername"
+      }
+      `,
+    });
+    jest.mocked(promptAsync).mockResolvedValueOnce({ username: 'fakeUsername' });
+    JsonFileCache.usernameCachePath = jest.fn().mockReturnValue('./.app-store/auth/username.json');
+    const cacheAsyncSpy = jest.spyOn(JsonFileCache, 'cacheAsync');
+
+    const result = await resolveUserCredentialsAsync({});
+    expect(result).toMatchObject({
+      username: 'fakeUsername',
+    });
+    expect(cacheAsyncSpy).not.toHaveBeenCalled();
+  });
+
+  it("uses credentials from prompt, updates cache if they don't match", async () => {
+    vol.fromJSON({
+      './.app-store/auth/username.json': `
+      {
+        "username": "fakeUsername"
+      }
+      `,
+    });
+    jest.mocked(promptAsync).mockResolvedValueOnce({ username: 'newFakeUsername' });
+    JsonFileCache.usernameCachePath = jest.fn().mockReturnValue('./.app-store/auth/username.json');
+    const cacheAsyncSpy = jest.spyOn(JsonFileCache, 'cacheAsync');
+
+    expect(JSON.parse(await fs.readFile('./.app-store/auth/username.json', 'utf-8'))).toMatchObject(
+      { username: 'fakeUsername' }
+    );
+    const result = await resolveUserCredentialsAsync({});
+    expect(result).toMatchObject({
+      username: 'newFakeUsername',
+    });
+    expect(cacheAsyncSpy).toHaveBeenCalledWith('./.app-store/auth/username.json', {
+      username: 'newFakeUsername',
+    });
+    expect(JSON.parse(await fs.readFile('./.app-store/auth/username.json', 'utf-8'))).toMatchObject(
+      { username: 'newFakeUsername' }
+    );
+  });
+
+  it("uses credentials from prompt, doesn't read or update cache if EXPO_NO_KEYCHAIN is set", async () => {
+    vol.fromJSON({
+      './.app-store/auth/username.json': `
+      {
+        "username": "fakeUsername"
+      }
+      `,
+    });
+    jest.mocked(promptAsync).mockResolvedValueOnce({ username: 'newFakeUsername' });
+    JsonFileCache.usernameCachePath = jest.fn().mockReturnValue('./.app-store/auth/username.json');
+    KeychainMock.EXPO_NO_KEYCHAIN = 'true';
+    const getCacheAsyncSpy = jest.spyOn(JsonFileCache, 'getCacheAsync');
+    const cacheAsyncSpy = jest.spyOn(JsonFileCache, 'cacheAsync');
+
+    expect(JSON.parse(await fs.readFile('./.app-store/auth/username.json', 'utf-8'))).toMatchObject(
+      { username: 'fakeUsername' }
+    );
+    const result = await resolveUserCredentialsAsync({});
+    expect(result).toMatchObject({
+      username: 'newFakeUsername',
+    });
+    expect(getCacheAsyncSpy).not.toHaveBeenCalled();
+    expect(cacheAsyncSpy).not.toHaveBeenCalled();
+    await expect(fs.access('./.app-store/auth/username.json')).rejects.toThrow();
+  });
+
+  it('clears credentials from prompt if malformed before using and updating cache', async () => {
+    vol.fromJSON({
+      './.app-store/auth/username.json': `
+      {
+        "username": "fakeUsername"
+      }
+      `,
+    });
+    jest.mocked(promptAsync).mockResolvedValueOnce({ username: '\x17newFake\x01Username\x1F' });
+    JsonFileCache.usernameCachePath = jest.fn().mockReturnValue('./.app-store/auth/username.json');
+    const cacheAsyncSpy = jest.spyOn(JsonFileCache, 'cacheAsync');
+
+    expect(JSON.parse(await fs.readFile('./.app-store/auth/username.json', 'utf-8'))).toMatchObject(
+      { username: 'fakeUsername' }
+    );
+    const result = await resolveUserCredentialsAsync({});
+    expect(result).toMatchObject({
+      username: 'newFakeUsername',
+    });
+    expect(cacheAsyncSpy).toHaveBeenCalledWith('./.app-store/auth/username.json', {
+      username: 'newFakeUsername',
+    });
+    expect(JSON.parse(await fs.readFile('./.app-store/auth/username.json', 'utf-8'))).toMatchObject(
+      { username: 'newFakeUsername' }
+    );
+  });
+});
@@ -6,6 +6,7 @@ import {
  CapabilityType,
  CapabilityTypeDataProtectionOption,
  CapabilityTypeOption,
+  CapabilityTypePushNotificationsOption,
  CloudContainer,
  MerchantId,
 } from '@expo/apple-utils';
@@ -19,7 +20,10 @@ export const EXPO_NO_CAPABILITY_SYNC = getenv.boolish('EXPO_NO_CAPABILITY_SYNC',

 type GetOptionsMethod<T extends CapabilityType = any> = (
  entitlement: JSONValue,
-  entitlementsJson: JSONObject
+  entitlementsJson: JSONObject,
+  additionalOptions: {
+    usesBroadcastPushNotifications?: boolean;
+  }
 ) => CapabilityOptionMap[T];

 const validateBooleanOptions = (options: any): boolean => {
@@ -78,7 +82,10 @@ const getDefinedOptions: GetOptionsMethod = entitlement => {
 */
 export async function syncCapabilitiesForEntitlementsAsync(
  bundleId: BundleId,
-  entitlements: JSONObject = {}
+  entitlements: JSONObject = {},
+  additionalOptions: {
+    usesBroadcastPushNotifications: boolean;
+  }
 ): Promise<{ enabled: string[]; disabled: string[] }> {
  if (EXPO_NO_CAPABILITY_SYNC) {
    return { enabled: [], disabled: [] };
@@ -91,7 +98,8 @@ export async function syncCapabilitiesForEntitlementsAsync(

  const { enabledCapabilityNames, request, remainingCapabilities } = getCapabilitiesToEnable(
    currentCapabilities,
-    entitlements
+    entitlements,
+    additionalOptions
  );

  const { disabledCapabilityNames, request: modifiedRequest } = getCapabilitiesToDisable(
@@ -125,9 +133,25 @@ interface CapabilitiesRequest {
  option: any;
 }

+function shouldSkipPushNotificationsCapabilityUpdate(
+  existing: BundleIdCapability,
+  additionalOptions: {
+    usesBroadcastPushNotifications: boolean;
+  }
+): boolean {
+  // For push notifications, we should always update the capabaility if
+  // - settings are not defined in the existing capability, but usesBroadcastPushNotifications is enabled (we want to add settings for this capability)
+  // - settings are defined in the existing capability, but usesBroadcastPushNotifications is disabled (we want to remove settings for this capability)
+  const noSettingsAttributes = existing.attributes.settings == null;
+  return !noSettingsAttributes === additionalOptions.usesBroadcastPushNotifications;
+}
+
 function getCapabilitiesToEnable(
  currentCapabilities: BundleIdCapability[],
-  entitlements: JSONObject
+  entitlements: JSONObject,
+  additionalOptions: {
+    usesBroadcastPushNotifications: boolean;
+  }
 ): {
  enabledCapabilityNames: string[];
  request: CapabilitiesRequest[];
@@ -156,7 +180,17 @@ function getCapabilitiesToEnable(
    // Only skip if the existing capability is a simple boolean value,
    // if it has more complex settings then we should always update it.
    // If the `existing.attributes.settings` object is defined, then we can determine that it has extra configuration.
-    if (existing && existing?.attributes.settings == null) {
+    // For push notifications, we should always update the capabaility if
+    // - settings are not defined in the existing capability, but usesBroadcastPushNotifications is enabled (we want to add settings for this capability)
+    // - settings are defined in the existing capability, but usesBroadcastPushNotifications is disabled (we want to remove settings for this capability)
+    const isPushNotificationsCapability =
+      staticCapabilityInfo.capability === CapabilityType.PUSH_NOTIFICATIONS;
+    if (
+      existing &&
+      ((!isPushNotificationsCapability && existing.attributes.settings == null) ||
+        (isPushNotificationsCapability &&
+          shouldSkipPushNotificationsCapabilityUpdate(existing, additionalOptions)))
+    ) {
      // Remove the item from the list of capabilities so we don't disable it.
      remainingCapabilities.splice(existingIndex, 1);
      if (Log.isDebug) {
@@ -173,7 +207,7 @@ function getCapabilitiesToEnable(

    enabledCapabilityNames.push(staticCapabilityInfo.name);

-    const option = staticCapabilityInfo.getOptions(value, entitlements);
+    const option = staticCapabilityInfo.getOptions(value, entitlements, additionalOptions);

    request.push({
      capabilityType: staticCapabilityInfo.capability,
@@ -488,7 +522,13 @@ export const CapabilityMapping: CapabilityClassifier[] = [
    entitlement: 'aps-environment',
    capability: CapabilityType.PUSH_NOTIFICATIONS,
    validateOptions: validateDevProdString,
-    getOptions: getDefinedOptions,
+    getOptions(entitlement, _entitlementsJson, { usesBroadcastPushNotifications }) {
+      const option = entitlement ? CapabilityTypeOption.ON : CapabilityTypeOption.OFF;
+      if (option === CapabilityTypeOption.ON && usesBroadcastPushNotifications) {
+        return CapabilityTypePushNotificationsOption.PUSH_NOTIFICATION_FEATURE_BROADCAST;
+      }
+      return option;
+    },
  },
  {
    name: 'Wallet',
@@ -1,6 +1,7 @@
-import { App, BundleId } from '@expo/apple-utils';
+import { App, BundleId, RequestContext } from '@expo/apple-utils';
 import { JSONObject } from '@expo/json-file';
 import chalk from 'chalk';
+import { randomBytes } from 'node:crypto';

 import { getRequestContext, isUserAuthCtx } from './authenticate';
 import { AuthCtx, UserAuthCtx } from './authenticateTypes';
@@ -12,6 +13,7 @@ import { ora } from '../../../ora';

 export interface IosCapabilitiesOptions {
  entitlements: JSONObject;
+  usesBroadcastPushNotifications: boolean;
 }

 export interface AppLookupParams {
@@ -93,7 +95,7 @@ export async function ensureBundleIdExistsWithNameAsync(

 export async function syncCapabilitiesAsync(
  bundleId: BundleId,
-  { entitlements }: IosCapabilitiesOptions
+  { entitlements, ...rest }: IosCapabilitiesOptions
 ): Promise<void> {
  const spinner = ora(`Syncing capabilities`).start();

@@ -105,7 +107,8 @@ export async function syncCapabilitiesAsync(
  try {
    const { enabled, disabled } = await syncCapabilitiesForEntitlementsAsync(
      bundleId,
-      entitlements
+      entitlements,
+      rest
    );
    const results =
      [buildMessage('Enabled', enabled), buildMessage('Disabled', disabled)]
@@ -119,7 +122,7 @@ export async function syncCapabilitiesAsync(
  }

  // Always run this after syncing the capabilities...
-  await syncCapabilityIdentifiersAsync(bundleId, { entitlements });
+  await syncCapabilityIdentifiersAsync(bundleId, { entitlements, ...rest });
 }

 const buildMessage = (title: string, items: string[]): string =>
@@ -186,7 +189,7 @@ export async function ensureAppExistsAsync(
      /**
       * **Does not support App Store Connect API (CI).**
       */
-      app = await App.createAsync(context, {
+      app = await createAppAsync(context, {
        bundleId: bundleIdentifier,
        name,
        primaryLocale: language,
@@ -213,3 +216,120 @@ export async function ensureAppExistsAsync(
  );
  return app;
 }
+
+function sanitizeName(name: string): string {
+  return (
+    name
+      // Replace emojis with a `-`
+      .replace(/[\p{Emoji}]/gu, '-')
+      .normalize('NFD')
+      .replace(/[\u0300-\u036f]/g, '')
+      .trim()
+  );
+}
+
+export async function createAppAsync(
+  context: RequestContext,
+  props: {
+    bundleId: string;
+    name: string;
+    primaryLocale?: string;
+    companyName?: string;
+    sku?: string;
+  },
+  retryCount = 0
+): Promise<App> {
+  try {
+    /**
+     * **Does not support App Store Connect API (CI).**
+     */
+    return await App.createAsync(context, props);
+  } catch (error) {
+    if (retryCount >= 5) {
+      throw error;
+    }
+    if (error instanceof Error) {
+      const handleDuplicateNameErrorAsync = async (): Promise<App> => {
+        const generatedName = props.name + ` (${randomBytes(3).toString('hex')})`;
+        Log.warn(
+          `App name "${props.name}" is already taken. Using generated name "${generatedName}" which can be changed later from https://appstoreconnect.apple.com.`
+        );
+        // Sanitize the name and try again.
+        return await createAppAsync(
+          context,
+          {
+            ...props,
+            name: generatedName,
+          },
+          retryCount + 1
+        );
+      };
+
+      if (isAppleError(error)) {
+        // New error class that is thrown when the name is already taken but belongs to you.
+        if (
+          error.data.errors.some(
+            e =>
+              e.code === 'ENTITY_ERROR.ATTRIBUTE.INVALID.DUPLICATE.SAME_ACCOUNT' ||
+              e.code === 'ENTITY_ERROR.ATTRIBUTE.INVALID.DUPLICATE.DIFFERENT_ACCOUNT'
+          )
+        ) {
+          return await handleDuplicateNameErrorAsync();
+        }
+      }
+
+      if ('code' in error && typeof error.code === 'string') {
+        if (
+          // Name is invalid
+          error.code === 'APP_CREATE_NAME_INVALID'
+          // UnexpectedAppleResponse: An attribute value has invalid characters. - App Name contains certain Unicode symbols, emoticons, diacritics, special characters, or private use characters that are not permitted.
+          // Name is taken
+        ) {
+          const sanitizedName = sanitizeName(props.name);
+          if (sanitizedName === props.name) {
+            throw error;
+          }
+          Log.warn(
+            `App name "${props.name}" contains invalid characters. Using sanitized name "${sanitizedName}" which can be changed later from https://appstoreconnect.apple.com.`
+          );
+          // Sanitize the name and try again.
+          return await createAppAsync(
+            context,
+            {
+              ...props,
+              name: sanitizedName,
+            },
+            retryCount + 1
+          );
+        }
+
+        if (
+          // UnexpectedAppleResponse: The provided entity includes an attribute with a value that has already been used on a different account. - The App Name you entered is already being used. If you have trademark rights to
+          // this name and would like it released for your use, submit a claim.
+          error.code === 'APP_CREATE_NAME_UNAVAILABLE'
+        ) {
+          return await handleDuplicateNameErrorAsync();
+        }
+      }
+    }
+
+    throw error;
+  }
+}
+
+function isAppleError(error: any): error is {
+  data: {
+    errors: {
+      id: string;
+      status: string;
+      /** 'ENTITY_ERROR.ATTRIBUTE.INVALID.INVALID_CHARACTERS' */
+      code: string;
+      /** 'An attribute value has invalid characters.' */
+      title: string;
+      /** 'App Name contains certain Unicode symbols, emoticons, diacritics, special characters, or private use characters that are not permitted.' */
+      detail: string;
+    }[];
+  };
+} {
+  return 'data' in error && 'errors' in error.data && Array.isArray(error.data.errors);
+}
@@ -30,6 +30,7 @@ function resolveProfileType(
    case ApplePlatform.TV_OS:
      return resolveProfileTypeAppleTv(profileClass, isEnterprise);
    case ApplePlatform.MAC_OS:
+    case ApplePlatform.VISION_OS:
      throw new Error(`${applePlatform} profiles are not supported`);
  }
 }
@@ -208,13 +208,18 @@ async function promptUsernameAsync(): Promise<string> {
  // the default value for quicker authentication.
  const lastAppleId = await getCachedUsernameAsync();

-  const { username } = await promptAsync({
+  let { username } = await promptAsync({
    type: 'text',
    name: 'username',
    message: `Apple ID:`,
    validate: (val: string) => val !== '',
    initial: lastAppleId ?? undefined,
  });
+  // https://github.com/expo/eas-cli/issues/2254
+  // user got an invalid unprintable character in their username, which was saved to cache and used to prefill the prompt
+  // which made them accept the prefilled value not knowing it contains the character and fail to log in
+  // this replace makes sure no such characters are used or cached
+  username = username.replace(/[\x00-\x1F]/gi, '');

  if (username && username !== lastAppleId) {
    await cacheUsernameAsync(username);
@@ -94,7 +94,7 @@ export class ManageIos {
    };

    const account = ctx.hasProjectContext
-      ? await getAccountForProjectAsync(ctx.projectId)
+      ? await getAccountForProjectAsync(await ctx.getProjectIdAsync())
      : ensureActorHasPrimaryAccount(ctx.user);

    let app = null;
@@ -195,18 +195,19 @@ export class ManageIos {
  }> {
    assert(ctx.hasProjectContext, 'createProjectContextAsync: must have project context.');

-    const app = { account, projectName: ctx.exp.slug };
+    const exp = await ctx.getExpoConfigAsync();
+    const app = { account, projectName: exp.slug };
    const xcodeBuildContext = await resolveXcodeBuildContextAsync(
      {
        projectDir: ctx.projectDir,
        nonInteractive: ctx.nonInteractive,
-        exp: ctx.exp,
+        exp,
        vcsClient: ctx.vcsClient,
      },
      buildProfile
    );
    const targets = await resolveTargetsAsync({
-      exp: ctx.exp,
+      exp,
      projectDir: ctx.projectDir,
      xcodeBuildContext,
      env: buildProfile.env,
@@ -55,7 +55,7 @@ export class SetUpIosBuildCredentials extends ManageIos {
    };

    const account = ctx.hasProjectContext
-      ? await getAccountForProjectAsync(ctx.projectId)
+      ? await getAccountForProjectAsync(await ctx.getProjectIdAsync())
      : ensureActorHasPrimaryAccount(ctx.user);

    let app = null;
@@ -48,7 +48,7 @@ async function collectDataAndRegisterDeviceAsync(
  }

  const { udid, deviceClass, name } = deviceData;
-  const spinner = ora(`Registering Apple device on Expo`).start();
+  const spinner = ora(`Registering Apple device on EAS`).start();
  try {
    await AppleDeviceMutation.createAppleDeviceAsync(
      graphqlClient,
@@ -45,7 +45,7 @@ async function collectDataAndRegisterDeviceAsync(
 ): Promise<void> {
  const { udid, deviceClass, name } = await collectDeviceDataAsync(appleTeam);

-  const spinner = ora(`Registering Apple device on Expo`).start();
+  const spinner = ora(`Registering Apple device on EAS`).start();
  try {
    await AppleDeviceMutation.createAppleDeviceAsync(
      graphqlClient,
@@ -3,7 +3,7 @@ import gql from 'graphql-tag';

 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../client';
-import { AppPrivacy, CreateAppMutation, CreateAppMutationVariables } from '../generated';
+import { CreateAppMutation, CreateAppMutationVariables } from '../generated';

 export const AppMutation = {
  async createAppAsync(
@@ -11,7 +11,6 @@ export const AppMutation = {
    appInput: {
      accountId: string;
      projectName: string;
-      privacy: AppPrivacy;
    }
  ): Promise<string> {
    const data = await withErrorHandlingAsync(
@@ -24,6 +24,7 @@ type CreateVariableArgs = {
  visibility: EnvironmentVariableVisibility;
  environments: EnvironmentVariableEnvironment[];
  type: EnvironmentSecretType;
+  isGlobal?: boolean;
  fileName?: string;
 };