v12.5.4

* fix(eas-cli): resolve Apple authentication error

* docs(eas-cli): fix changelog entry

* chore(eas-cli): bump `@expo/apple-utils` again

.github/codemention.yml

@@ -0,0 +1,23 @@
+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']
+  - patterns: ['packages/eas-cli/src/commands/update/**']
+    mentions: ['EvanBacon', 'byCedric', 'wschurman']
+  - 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']

.github/workflows/changelog-bot.yml

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

.github/workflows/changelog.yml

@@ -36,6 +36,5 @@ jobs:
           refresh-message-position: true
           message: ${{ contains(github.event.pull_request.labels.*.name, 'no changelog') && '⏩ The changelog entry check has been skipped since the "no changelog" label is present.' || '✅ Thank you for adding the changelog entry!' }}
           message-failure: |
-            ❌ It looks like a changelog entry is missing for this PR. You have two options: you can add it manually, or you can use the changelog bot to do it for you.
-            🤖 To use the bot, simply comment on this PR with the command `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]`.
+            ❌ It looks like a changelog entry is missing for this PR. Add it manually to CHANGELOG.md.
             ⏩ If this PR doesn't require a changelog entry, such as if it's an internal change that doesn't affect the user experience, you can add the "no changelog" label to the PR.

.github/workflows/codemention.yml

@@ -0,0 +1,14 @@
+name: codemention
+on:
+  pull_request_target:
+    types: [opened, synchronize, ready_for_review]
+jobs:
+  codemention:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - uses: tobyhs/[email protected]
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -12,6 +12,49 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🧹 Chores
 
+## [12.5.3](https://github.com/expo/eas-cli/releases/tag/v12.5.3) - 2024-10-16
+
+## [12.5.2](https://github.com/expo/eas-cli/releases/tag/v12.5.2) - 2024-10-11
+
+### 🐛 Bug fixes
+
+- Disallow republishing an update that is being rolled-out. ([#2602](https://github.com/expo/eas-cli/pull/2602) by [@wschurman](https://github.com/wschurman))
+- Bump `@expo/apple-utils` to `2.0.2` resolving the Apple authentication error. ([#2641](https://github.com/expo/eas-cli/pull/2641) by [@byCedric](https://github.com/byCedric))
+
+### 🧹 Chores
+
+- Implement new `worker` deploy API flow. ([#2601](https://github.com/expo/eas-cli/pull/2601) by [@kitten](https://github.com/kitten)))
+- Unhide rollout-percentage flag on update publish command. ([#2608](https://github.com/expo/eas-cli/pull/2608) by [@wschurman](https://github.com/wschurman))
+- Let folks know about the new concurrency add-on ([#2611](https://github.com/expo/eas-cli/pull/2611) by [@brentvatne](https://github.com/brentvatne))
+
+## [12.5.1](https://github.com/expo/eas-cli/releases/tag/v12.5.1) - 2024-09-27
+
+### 🐛 Bug fixes
+
+- Support assigning dev domain names in non interactive mode. ([#2595](https://github.com/expo/eas-cli/pull/2595) by [@byCedric](https://github.com/byCedric))
+
+### 🧹 Chores
+
+- Simplify the output of `eas deploy --json`. ([#2596](https://github.com/expo/eas-cli/pull/2596) by [@byCedric](https://github.com/byCedric))
+- Support deploying Expo Router server exports without client directory. ([#2597](https://github.com/expo/eas-cli/pull/2597) by [@byCedric](https://github.com/byCedric))
+- Add exit option to `eas credentials` interactive menu. ([#2570](https://github.com/expo/eas-cli/pull/2570) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [12.5.0](https://github.com/expo/eas-cli/releases/tag/v12.5.0) - 2024-09-23
+
+### 🎉 New features
+
+- Log command execution to assist in debugging local builds. ([#2526](https://github.com/expo/eas-cli/pull/2526) by [@trajano](https://github.com/trajano))
+- Allow submitting builds in progress ([#2543](https://github.com/expo/eas-cli/pull/2543) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+- Use `EAS_DANGEROUS_OVERRIDE_ANDROID_APPLICATION_ID` and `EAS_DANGEROUS_OVERRIDE_IOS_BUNDLE_IDENTIFIER` environment variables as overrides of the Android application ID and iOS bundle identifier in managed workflow too. ([#2576](https://github.com/expo/eas-cli/pull/2576) by [@sjchmiela](https://github.com/sjchmiela))
+- Add destination branch arguments to update:republish command. ([#2575](https://github.com/expo/eas-cli/pull/2575) by [@wschurman](https://github.com/wschurman))
+
+### 🐛 Bug fixes
+
+- Avoid malforming `app.json` with empty `.expo` object. ([#2573](https://github.com/expo/eas-cli/pull/2573) by [@byCedric](https://github.com/byCedric))
+- Fix typo causing `worker:deploy` asset upload errors not to be shown properly. ([#2579](https://github.com/expo/eas-cli/pull/2579) by [@kitten](https://github.com/kitten))
+
+## [12.4.1](https://github.com/expo/eas-cli/releases/tag/v12.4.1) - 2024-09-14
+
 ## [12.4.0](https://github.com/expo/eas-cli/releases/tag/v12.4.0) - 2024-09-14
 
 ### 🎉 New features
@@ -29,6 +72,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 - Avoid merging `expo.extra` plugin-generated data with `expo.extra.eas.projectId` in `eas init`. ([#2554](https://github.com/expo/eas-cli/pull/2554) by [@byCedric](https://github.com/byCedric)))
 - Restore "export not found" error and hide recent export timestamps. ([#2566](https://github.com/expo/eas-cli/pull/2566) by [@byCedric](https://github.com/byCedric)))
+- Check if export is available before validating project ID in `eas worker`. ([#2569](https://github.com/expo/eas-cli/pull/2569) by [@byCedric](https://github.com/byCedric)))
 
 ### 🧹 Chores
 
@@ -42,6 +86,7 @@ This is the log of notable changes to EAS CLI and related packages.
 - Always assume `static` exports in `eas deploy` and add modified time. ([#2565](https://github.com/expo/eas-cli/pull/2565) by [@byCedric](https://github.com/byCedric)))
 - Update the `eas worker --help` `--environment` description. ([#2567](https://github.com/expo/eas-cli/pull/2567) by [@byCedric](https://github.com/byCedric)))
 - Remove the cursor space after selecting project dev domain. ([#2568](https://github.com/expo/eas-cli/pull/2568) by [@byCedric](https://github.com/byCedric)))
+- Reword the dev domain prompt to mention "preview URL". ([#2572](https://github.com/expo/eas-cli/pull/2572) by [@byCedric](https://github.com/byCedric)))
 
 ## [12.3.0](https://github.com/expo/eas-cli/releases/tag/v12.3.0) - 2024-09-09
 

CODEOWNERS

@@ -1,16 +0,0 @@
-* @szdziedzic @khamilowicz @sjchmiela
-
-packages/eas-cli/src/build @szdziedzic @khamilowicz @sjchmiela
-packages/eas-cli/src/commands/build @szdziedzic @khamilowicz @sjchmiela
-
-packages/eas-cli/src/submit @szdziedzic @khamilowicz @sjchmiela
-packages/eas-cli/src/commands/submit.ts @szdziedzic @khamilowicz @sjchmiela
-
-packages/eas-cli/src/update @EvanBacon @byCedric @wschurman
-packages/eas-cli/src/commands/update @EvanBacon @byCedric @wschurman
-
-packages/eas-cli/schema @bycedric
-packages/eas-cli/src/metadata @bycedric
-packages/eas-cli/src/commands/metadata @bycedric
-
-packages/eas-json @szdziedzic @khamilowicz @sjchmiela

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
-  "version": "12.4.1",
+  "version": "12.5.4",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

packages/eas-cli/README.md

@@ -143,7 +143,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [packages/eas-cli/src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [packages/eas-cli/src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -160,7 +160,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [packages/eas-cli/src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [packages/eas-cli/src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -177,7 +177,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [packages/eas-cli/src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [packages/eas-cli/src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -191,7 +191,7 @@ DESCRIPTION
   display or change analytics settings
 ```
 
-_See code: [packages/eas-cli/src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [packages/eas-cli/src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/analytics.ts)_
 
 ## `eas autocomplete [SHELL]`
 
@@ -243,7 +243,7 @@ DESCRIPTION
   create a branch
 ```
 
-_See code: [packages/eas-cli/src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [packages/eas-cli/src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/branch/create.ts)_
 
 ## `eas branch:delete [NAME]`
 
@@ -264,7 +264,7 @@ DESCRIPTION
   delete a branch
 ```
 
-_See code: [packages/eas-cli/src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [packages/eas-cli/src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/branch/delete.ts)_
 
 ## `eas branch:list`
 
@@ -284,7 +284,7 @@ DESCRIPTION
   list all branches
 ```
 
-_See code: [packages/eas-cli/src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [packages/eas-cli/src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/branch/list.ts)_
 
 ## `eas branch:rename`
 
@@ -304,7 +304,7 @@ DESCRIPTION
   rename a branch
 ```
 
-_See code: [packages/eas-cli/src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [packages/eas-cli/src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/branch/rename.ts)_
 
 ## `eas branch:view [NAME]`
 
@@ -327,7 +327,7 @@ DESCRIPTION
   view a branch
 ```
 
-_See code: [packages/eas-cli/src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [packages/eas-cli/src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/branch/view.ts)_
 
 ## `eas build`
 
@@ -364,7 +364,7 @@ DESCRIPTION
   start a build
 ```
 
-_See code: [packages/eas-cli/src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [packages/eas-cli/src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -383,7 +383,7 @@ DESCRIPTION
   cancel a build
 ```
 
-_See code: [packages/eas-cli/src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [packages/eas-cli/src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -400,7 +400,7 @@ DESCRIPTION
   configure the project to support EAS Build
 ```
 
-_See code: [packages/eas-cli/src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [packages/eas-cli/src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/build/configure.ts)_
 
 ## `eas build:delete [BUILD_ID]`
 
@@ -419,7 +419,7 @@ DESCRIPTION
   delete a build
 ```
 
-_See code: [packages/eas-cli/src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/build/delete.ts)_
+_See code: [packages/eas-cli/src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/build/delete.ts)_
 
 ## `eas build:inspect`
 
@@ -454,7 +454,7 @@ DESCRIPTION
   inspect the state of the project at specific build stages, useful for troubleshooting
 ```
 
-_See code: [packages/eas-cli/src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [packages/eas-cli/src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/build/inspect.ts)_
 
 ## `eas build:list`
 
@@ -504,7 +504,7 @@ DESCRIPTION
   list all builds for your project
 ```
 
-_See code: [packages/eas-cli/src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [packages/eas-cli/src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/build/list.ts)_
 
 ## `eas build:resign`
 
@@ -533,7 +533,7 @@ DESCRIPTION
   re-sign a build archive
 ```
 
-_See code: [packages/eas-cli/src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/build/resign.ts)_
+_See code: [packages/eas-cli/src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/build/resign.ts)_
 
 ## `eas build:run`
 
@@ -559,7 +559,7 @@ DESCRIPTION
   run simulator/emulator builds from eas-cli
 ```
 
-_See code: [packages/eas-cli/src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/build/run.ts)_
+_See code: [packages/eas-cli/src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/build/run.ts)_
 
 ## `eas build:submit`
 
@@ -609,7 +609,7 @@ DESCRIPTION
   get the latest version from EAS servers
 ```
 
-_See code: [packages/eas-cli/src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/build/version/get.ts)_
+_See code: [packages/eas-cli/src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/build/version/get.ts)_
 
 ## `eas build:version:set`
 
@@ -628,7 +628,7 @@ DESCRIPTION
   update version of an app
 ```
 
-_See code: [packages/eas-cli/src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/build/version/set.ts)_
+_See code: [packages/eas-cli/src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/build/version/set.ts)_
 
 ## `eas build:version:sync`
 
@@ -647,7 +647,7 @@ DESCRIPTION
   update a version in native code with a value stored on EAS servers
 ```
 
-_See code: [packages/eas-cli/src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/build/version/sync.ts)_
+_See code: [packages/eas-cli/src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/build/version/sync.ts)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -664,7 +664,7 @@ DESCRIPTION
   view a build for your project
 ```
 
-_See code: [packages/eas-cli/src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [packages/eas-cli/src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/build/view.ts)_
 
 ## `eas channel:create [NAME]`
 
@@ -685,7 +685,7 @@ DESCRIPTION
   create a channel
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [packages/eas-cli/src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/channel/create.ts)_
 
 ## `eas channel:edit [NAME]`
 
@@ -707,7 +707,7 @@ DESCRIPTION
   point a channel at a new branch
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [packages/eas-cli/src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/channel/edit.ts)_
 
 ## `eas channel:list`
 
@@ -727,7 +727,7 @@ DESCRIPTION
   list all channels
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [packages/eas-cli/src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/channel/list.ts)_
 
 ## `eas channel:rollout [CHANNEL]`
 
@@ -760,7 +760,7 @@ DESCRIPTION
   Roll a new branch out on a channel incrementally.
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/channel/rollout.ts)_
+_See code: [packages/eas-cli/src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/channel/rollout.ts)_
 
 ## `eas channel:view [NAME]`
 
@@ -783,7 +783,7 @@ DESCRIPTION
   view a channel
 ```
 
-_See code: [packages/eas-cli/src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [packages/eas-cli/src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/channel/view.ts)_
 
 ## `eas config`
 
@@ -804,7 +804,7 @@ DESCRIPTION
   display project configuration (app.json + eas.json)
 ```
 
-_See code: [packages/eas-cli/src/commands/config.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/config.ts)_
+_See code: [packages/eas-cli/src/commands/config.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -821,7 +821,7 @@ DESCRIPTION
   manage credentials
 ```
 
-_See code: [packages/eas-cli/src/commands/credentials/index.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/credentials/index.ts)_
+_See code: [packages/eas-cli/src/commands/credentials/index.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/credentials/index.ts)_
 
 ## `eas credentials:configure-build`
 
@@ -839,7 +839,7 @@ DESCRIPTION
   Set up credentials for building your project.
 ```
 
-_See code: [packages/eas-cli/src/commands/credentials/configure-build.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/credentials/configure-build.ts)_
+_See code: [packages/eas-cli/src/commands/credentials/configure-build.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/credentials/configure-build.ts)_
 
 ## `eas device:create`
 
@@ -853,7 +853,7 @@ DESCRIPTION
   register new Apple Devices to use for internal distribution
 ```
 
-_See code: [packages/eas-cli/src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [packages/eas-cli/src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/device/create.ts)_
 
 ## `eas device:delete`
 
@@ -873,7 +873,7 @@ DESCRIPTION
   remove a registered device from your account
 ```
 
-_See code: [packages/eas-cli/src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [packages/eas-cli/src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/device/delete.ts)_
 
 ## `eas device:list`
 
@@ -894,7 +894,7 @@ DESCRIPTION
   list all registered devices for your account
 ```
 
-_See code: [packages/eas-cli/src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [packages/eas-cli/src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/device/list.ts)_
 
 ## `eas device:rename`
 
@@ -915,7 +915,7 @@ DESCRIPTION
   rename a registered device
 ```
 
-_See code: [packages/eas-cli/src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/device/rename.ts)_
+_See code: [packages/eas-cli/src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/device/rename.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -929,7 +929,7 @@ DESCRIPTION
   view a device for your project
 ```
 
-_See code: [packages/eas-cli/src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [packages/eas-cli/src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -943,7 +943,7 @@ DESCRIPTION
   display environment info
 ```
 
-_See code: [packages/eas-cli/src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [packages/eas-cli/src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/diagnostics.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -1051,7 +1051,7 @@ DESCRIPTION
   validate the local store configuration
 ```
 
-_See code: [packages/eas-cli/src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/metadata/lint.ts)_
+_See code: [packages/eas-cli/src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/metadata/lint.ts)_
 
 ## `eas metadata:pull`
 
@@ -1068,7 +1068,7 @@ DESCRIPTION
   generate the local store configuration from the app stores
 ```
 
-_See code: [packages/eas-cli/src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [packages/eas-cli/src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/metadata/pull.ts)_
 
 ## `eas metadata:push`
 
@@ -1085,7 +1085,7 @@ DESCRIPTION
   sync the local store configuration to the app stores
 ```
 
-_See code: [packages/eas-cli/src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [packages/eas-cli/src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/metadata/push.ts)_
 
 ## `eas onboarding [TARGET_PROJECT_DIRECTORY]`
 
@@ -1115,7 +1115,7 @@ DESCRIPTION
   open the project page in a web browser
 ```
 
-_See code: [packages/eas-cli/src/commands/open.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/open.ts)_
+_See code: [packages/eas-cli/src/commands/open.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/open.ts)_
 
 ## `eas project:info`
 
@@ -1129,7 +1129,7 @@ DESCRIPTION
   information about the current project
 ```
 
-_See code: [packages/eas-cli/src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [packages/eas-cli/src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -1152,7 +1152,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [packages/eas-cli/src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [packages/eas-cli/src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/project/init.ts)_
 
 ## `eas project:onboarding [TARGET_PROJECT_DIRECTORY]`
 
@@ -1170,7 +1170,7 @@ ALIASES
   $ eas onboarding
 ```
 
-_See code: [packages/eas-cli/src/commands/project/onboarding.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/project/onboarding.ts)_
+_See code: [packages/eas-cli/src/commands/project/onboarding.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/project/onboarding.ts)_
 
 ## `eas secret:create`
 
@@ -1193,7 +1193,7 @@ DESCRIPTION
   create an environment secret on the current project or owner account
 ```
 
-_See code: [packages/eas-cli/src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [packages/eas-cli/src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/secret/create.ts)_
 
 ## `eas secret:delete`
 
@@ -1211,7 +1211,7 @@ DESCRIPTION
   delete an environment secret by ID
 ```
 
-_See code: [packages/eas-cli/src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [packages/eas-cli/src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/secret/delete.ts)_
 
 ## `eas secret:list`
 
@@ -1225,7 +1225,7 @@ DESCRIPTION
   list environment secrets available for your current app
 ```
 
-_See code: [packages/eas-cli/src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [packages/eas-cli/src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/secret/list.ts)_
 
 ## `eas secret:push`
 
@@ -1245,7 +1245,7 @@ DESCRIPTION
   read environment secrets from env file and store on the server
 ```
 
-_See code: [packages/eas-cli/src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/secret/push.ts)_
+_See code: [packages/eas-cli/src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/secret/push.ts)_
 
 ## `eas submit`
 
@@ -1276,7 +1276,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [packages/eas-cli/src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/submit.ts)_
+_See code: [packages/eas-cli/src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/submit.ts)_
 
 ## `eas update`
 
@@ -1285,8 +1285,8 @@ publish an update group
 ```
 USAGE
   $ eas update [--branch <value>] [--channel <value>] [-m <value>] [--input-dir <value>] [--skip-bundler]
-    [--clear-cache] [--emit-metadata] [-p android|ios|all] [--auto] [--private-key-path <value>] [--json
-    --non-interactive]
+    [--clear-cache] [--emit-metadata] [--rollout-percentage <value>] [-p android|ios|all] [--auto] [--private-key-path
+    <value>] [--json --non-interactive]
 
 FLAGS
   -m, --message=<value>             A short message describing the update
@@ -1304,13 +1304,17 @@ FLAGS
                                     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/
+  --rollout-percentage=<value>      Percentage of users this update should be immediately available to. Users not in the
+                                    rollout will be served the previous latest update on the branch, even if that update
+                                    is itself being rolled out. The specified number must be an integer between 1 and
+                                    100. When not specified, this defaults to 100.
   --skip-bundler                    Skip running Expo CLI to bundle the app before publishing
 
 DESCRIPTION
   publish an update group
 ```
 
-_See code: [packages/eas-cli/src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [packages/eas-cli/src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/update/index.ts)_
 
 ## `eas update:configure`
 
@@ -1328,7 +1332,7 @@ DESCRIPTION
   configure the project to support EAS Update
 ```
 
-_See code: [packages/eas-cli/src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [packages/eas-cli/src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/update/configure.ts)_
 
 ## `eas update:delete GROUPID`
 
@@ -1349,7 +1353,7 @@ DESCRIPTION
   delete all the updates in an update group
 ```
 
-_See code: [packages/eas-cli/src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [packages/eas-cli/src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/update/delete.ts)_
 
 ## `eas update:list`
 
@@ -1371,7 +1375,7 @@ DESCRIPTION
   view the recent updates
 ```
 
-_See code: [packages/eas-cli/src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [packages/eas-cli/src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/update/list.ts)_
 
 ## `eas update:republish`
 
@@ -1379,14 +1383,18 @@ roll back to an existing update
 
 ```
 USAGE
-  $ eas update:republish [--channel <value> | --branch <value> | --group <value>] [-m <value>] [-p android|ios|all]
-    [--private-key-path <value>] [--json --non-interactive]
+  $ eas update:republish [--channel <value> | --branch <value> | --group <value>] [--destination-channel <value> |
+    --destination-branch <value>] [-m <value>] [-p android|ios|all] [--private-key-path <value>] [--json
+    --non-interactive]
 
 FLAGS
   -m, --message=<value>             Short message describing the republished update group
   -p, --platform=(android|ios|all)  [default: all]
   --branch=<value>                  Branch name to select an update group to republish from
   --channel=<value>                 Channel name to select an update group to republish from
+  --destination-branch=<value>      Branch name to republish to if republishing to a different branch
+  --destination-channel=<value>     Channel name to select a branch to republish to if republishing to a different
+                                    branch
   --group=<value>                   Update group ID to republish
   --json                            Enable JSON output, non-JSON messages will be printed to stderr.
   --non-interactive                 Run the command in non-interactive mode.
@@ -1399,7 +1407,7 @@ DESCRIPTION
   roll back to an existing update
 ```
 
-_See code: [packages/eas-cli/src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/update/republish.ts)_
+_See code: [packages/eas-cli/src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/update/republish.ts)_
 
 ## `eas update:roll-back-to-embedded`
 
@@ -1427,7 +1435,7 @@ DESCRIPTION
   roll back to the embedded update
 ```
 
-_See code: [packages/eas-cli/src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/update/roll-back-to-embedded.ts)_
+_See code: [packages/eas-cli/src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/update/roll-back-to-embedded.ts)_
 
 ## `eas update:rollback`
 
@@ -1447,7 +1455,7 @@ DESCRIPTION
   roll back to an embedded update or an existing update
 ```
 
-_See code: [packages/eas-cli/src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/update/rollback.ts)_
+_See code: [packages/eas-cli/src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/update/rollback.ts)_
 
 ## `eas update:view GROUPID`
 
@@ -1467,7 +1475,7 @@ DESCRIPTION
   update group details
 ```
 
-_See code: [packages/eas-cli/src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [packages/eas-cli/src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/update/view.ts)_
 
 ## `eas webhook:create`
 
@@ -1488,7 +1496,7 @@ DESCRIPTION
   create a webhook
 ```
 
-_See code: [packages/eas-cli/src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -1508,7 +1516,7 @@ DESCRIPTION
   delete a webhook
 ```
 
-_See code: [packages/eas-cli/src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -1526,7 +1534,7 @@ DESCRIPTION
   list webhooks
 ```
 
-_See code: [packages/eas-cli/src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -1548,7 +1556,7 @@ DESCRIPTION
   update a webhook
 ```
 
-_See code: [packages/eas-cli/src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -1565,7 +1573,7 @@ DESCRIPTION
   view a webhook
 ```
 
-_See code: [packages/eas-cli/src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v12.4.1/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [packages/eas-cli/src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v12.5.4/packages/eas-cli/src/commands/webhook/view.ts)_
 
 ## `eas whoami`
 

packages/eas-cli/package.json

@@ -1,20 +1,19 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "12.4.1",
+  "version": "12.5.4",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "1.8.0",
+    "@expo/apple-utils": "2.0.2",
     "@expo/code-signing-certificates": "0.0.5",
     "@expo/config": "8.5.4",
     "@expo/config-plugins": "7.8.4",
-    "@expo/config-types": "50.0.0",
-    "@expo/eas-build-job": "1.0.133",
-    "@expo/eas-json": "12.0.0",
+    "@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/logger": "1.0.117",
@@ -29,7 +28,7 @@
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.134",
+    "@expo/steps": "1.0.136",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "^1.26.2",
     "@oclif/plugin-autocomplete": "^2.3.10",
@@ -86,7 +85,8 @@
     "turndown": "7.1.2",
     "untildify": "4.0.0",
     "uuid": "9.0.1",
-    "wrap-ansi": "7.0.0"
+    "wrap-ansi": "7.0.0",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.0",

packages/eas-cli/src/__tests__/commands/utils.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from '@expo/config';
 import { AppVersionSource, EasJson } from '@expo/eas-json';
 import { Command, Config } from '@oclif/core';
 import { vol } from 'memfs';

packages/eas-cli/src/build/build.ts

@@ -486,8 +486,8 @@ async function handleSingleBuildProgressAsync(
       spinner.succeed('Build finished');
       return { refetch: false };
     case BuildStatus.New:
-      spinner.text = `Build is waiting to enter the queue. Check your concurrency limit at ${link(
-        formatAccountSubscriptionsUrl(accountName)
+      spinner.text = `Build concurrency limit reached for your account. Build will enter queue once a concurrency becomes available. Add additional concurrencies at ${link(
+        formatAccountBillingUrl(accountName)
       )}.`;
       break;
     case BuildStatus.InQueue: {
@@ -509,7 +509,7 @@ async function handleSingleBuildProgressAsync(
           Log.log('Start builds sooner in the priority queue.');
           Log.log(
             `Sign up for EAS Production or Enterprise at ${link(
-              formatAccountSubscriptionsUrl(accountName)
+              formatAccountBillingUrl(accountName)
             )}`
           );
         }
@@ -656,11 +656,8 @@ function formatEstimatedWaitTime(estimatedWaitTimeLeftSeconds: number): string {
   }
 }
 
-function formatAccountSubscriptionsUrl(accountName: string): string {
-  return new URL(
-    `/accounts/${accountName}/settings/subscriptions`,
-    getExpoWebsiteBaseUrl()
-  ).toString();
+function formatAccountBillingUrl(accountName: string): string {
+  return new URL(`/accounts/${accountName}/settings/billing`, getExpoWebsiteBaseUrl()).toString();
 }
 
 async function createAndMaybeUploadFingerprintAsync<T extends Platform>(

packages/eas-cli/src/build/evaluateConfigWithEnvVarsAsync.ts

@@ -13,14 +13,12 @@ function isEnvironment(env: string): env is EnvironmentVariableEnvironment {
 }
 
 export async function evaluateConfigWithEnvVarsAsync<Config extends { projectId: string }, Opts>({
-  flags,
   buildProfile,
   buildProfileName,
   graphqlClient,
   getProjectConfig,
   opts,
 }: {
-  flags: { environment?: string };
   buildProfile: BuildProfile;
   buildProfileName: string;
   graphqlClient: ExpoGraphqlClient | null;
@@ -34,7 +32,6 @@ export async function evaluateConfigWithEnvVarsAsync<Config extends { projectId:
   }
   const { projectId } = await getProjectConfig({ env: buildProfile.env, ...opts });
   const env = await resolveEnvVarsAsync({
-    flags,
     buildProfile,
     buildProfileName,
     graphqlClient,
@@ -46,22 +43,18 @@ export async function evaluateConfigWithEnvVarsAsync<Config extends { projectId:
 }
 
 async function resolveEnvVarsAsync({
-  flags,
   buildProfile,
   buildProfileName,
   graphqlClient,
   projectId,
 }: {
-  flags: { environment?: string };
   buildProfile: BuildProfile;
   buildProfileName: string;
   graphqlClient: ExpoGraphqlClient;
   projectId: string;
 }): Promise<Env> {
   const environment =
-    flags.environment ??
-    buildProfile.environment?.toUpperCase() ??
-    process.env.EAS_CURRENT_ENVIRONMENT;
+    buildProfile.environment?.toUpperCase() ?? process.env.EAS_CURRENT_ENVIRONMENT;
 
   if (!environment || !isEnvironment(environment)) {
     Log.log(

packages/eas-cli/src/build/local.ts

@@ -3,6 +3,7 @@ import spawnAsync from '@expo/spawn-async';
 import { ChildProcess } from 'child_process';
 import semver from 'semver';
 
+import Log from '../log';
 import { ora } from '../ora';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
@@ -55,19 +56,26 @@ export async function runLocalBuildAsync(
   };
   process.on('SIGINT', interruptHandler);
   try {
+    const mergedEnv = {
+      ...env,
+      ...process.env,
+      EAS_LOCAL_BUILD_WORKINGDIR: options.workingdir ?? process.env.EAS_LOCAL_BUILD_WORKINGDIR,
+      ...(options.skipCleanup || options.skipNativeBuild
+        ? { EAS_LOCAL_BUILD_SKIP_CLEANUP: '1' }
+        : {}),
+      ...(options.skipNativeBuild ? { EAS_LOCAL_BUILD_SKIP_NATIVE_BUILD: '1' } : {}),
+      ...(options.artifactsDir ? { EAS_LOCAL_BUILD_ARTIFACTS_DIR: options.artifactsDir } : {}),
+      ...(options.artifactPath ? { EAS_LOCAL_BUILD_ARTIFACT_PATH: options.artifactPath } : {}),
+    };
+    // log command execution to assist in debugging local builds
+    Log.debug('Running local build, using local-build-plugin', {
+      command,
+      args,
+      env: mergedEnv,
+    });
     const spawnPromise = spawnAsync(command, args, {
       stdio: options.verbose ? 'inherit' : 'pipe',
-      env: {
-        ...env,
-        ...process.env,
-        EAS_LOCAL_BUILD_WORKINGDIR: options.workingdir ?? process.env.EAS_LOCAL_BUILD_WORKINGDIR,
-        ...(options.skipCleanup || options.skipNativeBuild
-          ? { EAS_LOCAL_BUILD_SKIP_CLEANUP: '1' }
-          : {}),
-        ...(options.skipNativeBuild ? { EAS_LOCAL_BUILD_SKIP_NATIVE_BUILD: '1' } : {}),
-        ...(options.artifactsDir ? { EAS_LOCAL_BUILD_ARTIFACTS_DIR: options.artifactsDir } : {}),
-        ...(options.artifactPath ? { EAS_LOCAL_BUILD_ARTIFACT_PATH: options.artifactPath } : {}),
-      },
+      env: mergedEnv,
     });
     childProcess = spawnPromise.child;
     await spawnPromise;

packages/eas-cli/src/build/runBuildAndSubmit.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from '@expo/config';
 import { Env, Platform, Workflow } from '@expo/eas-build-job';
 import {
   AppVersionSource,
@@ -33,7 +33,6 @@ import {
   BuildFragment,
   BuildStatus,
   BuildWithSubmissionsFragment,
-  EnvironmentVariableEnvironment,
   SubmissionFragment,
 } from '../graphql/generated';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
@@ -98,7 +97,6 @@ export interface BuildFlags {
   buildLoggerLevel?: LoggerLevel;
   freezeCredentials: boolean;
   repack: boolean;
-  environment?: EnvironmentVariableEnvironment;
 }
 
 export async function runBuildAndSubmitAsync(
@@ -195,7 +193,6 @@ export async function runBuildAndSubmitAsync(
     const platform = toAppPlatform(buildProfile.platform);
 
     const { env } = await evaluateConfigWithEnvVarsAsync({
-      flags,
       buildProfile: buildProfile.profile,
       buildProfileName: buildProfile.profileName,
       graphqlClient,

packages/eas-cli/src/commandUtils/context/DynamicProjectConfigContextField.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from '@expo/config';
 
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';

packages/eas-cli/src/commandUtils/context/OptionalPrivateProjectConfigContextField.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from '@expo/config';
 import { InvalidEasJsonError } from '@expo/eas-json/build/errors';
 
 import ContextField, { ContextOptions } from './ContextField';

packages/eas-cli/src/commandUtils/context/PrivateProjectConfigContextField.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from '@expo/config';
 
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';

packages/eas-cli/src/commandUtils/context/contextUtils/getProjectIdAsync.ts

@@ -1,5 +1,4 @@
-import { getProjectConfigDescription } from '@expo/config';
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig, getProjectConfigDescription } from '@expo/config';
 import { Env } from '@expo/eas-build-job';
 import chalk from 'chalk';
 

packages/eas-cli/src/commandUtils/flags.ts

@@ -1,10 +1,6 @@
 import { Flags } from '@oclif/core';
 
-import {
-  EnvironmentVariableEnvironment,
-  EnvironmentVariableScope,
-  EnvironmentVariableVisibility,
-} from '../graphql/generated';
+import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../graphql/generated';
 
 // NOTE: not exactly true, but, provided mapToLowercase and upperCaseAsync
 // are used in tandem, it saves on unnecessary typying in commands
@@ -26,30 +22,24 @@ export const EasNonInteractiveAndJsonFlags = {
   }),
 };
 
-export const EASEnvironmentFlag = {
-  environment: Flags.enum<EnvironmentVariableEnvironment>({
-    description: "Environment variable's environment",
-    parse: upperCaseAsync,
-    options: mapToLowercase([
-      EnvironmentVariableEnvironment.Development,
-      EnvironmentVariableEnvironment.Preview,
-      EnvironmentVariableEnvironment.Production,
-    ]),
-  }),
+export const EasEnvironmentFlagParameters = {
+  description: "Environment variable's environment",
+  parse: upperCaseAsync,
+  options: mapToLowercase([
+    EnvironmentVariableEnvironment.Development,
+    EnvironmentVariableEnvironment.Preview,
+    EnvironmentVariableEnvironment.Production,
+  ]),
 };
 
-// NOTE: Used in build commands, should be replaced with EASEnvironmentFlag when
-// the feature is public
-export const EASEnvironmentFlagHidden = {
+export const EASEnvironmentFlag = {
+  environment: Flags.enum<EnvironmentVariableEnvironment>(EasEnvironmentFlagParameters),
+};
+
+export const EASMultiEnvironmentFlag = {
   environment: Flags.enum<EnvironmentVariableEnvironment>({
-    description: "Environment variable's environment",
-    parse: upperCaseAsync,
-    hidden: true,
-    options: mapToLowercase([
-      EnvironmentVariableEnvironment.Development,
-      EnvironmentVariableEnvironment.Preview,
-      EnvironmentVariableEnvironment.Production,
-    ]),
+    ...EasEnvironmentFlagParameters,
+    multiple: true,
   }),
 };
 
@@ -62,14 +52,9 @@ export const EASVariableFormatFlag = {
 };
 
 export const EASVariableVisibilityFlag = {
-  visibility: Flags.enum<EnvironmentVariableVisibility>({
+  visibility: Flags.enum<'plaintext' | 'sensitive' | 'encrypted'>({
     description: 'Visibility of the variable',
-    options: mapToLowercase([
-      EnvironmentVariableVisibility.Secret,
-      EnvironmentVariableVisibility.Sensitive,
-      EnvironmentVariableVisibility.Public,
-    ]),
-    parse: upperCaseAsync,
+    options: ['plaintext', 'sensitive', 'encrypted'],
   }),
 };
 

packages/eas-cli/src/commands/build/index.ts

@@ -10,8 +10,8 @@ import path from 'path';
 import { LocalBuildMode } from '../../build/local';
 import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
 import EasCommand from '../../commandUtils/EasCommand';
-import { EASEnvironmentFlagHidden, EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { EnvironmentVariableEnvironment, StatuspageServiceName } from '../../graphql/generated';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { StatuspageServiceName } from '../../graphql/generated';
 import Log, { link } from '../../log';
 import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform';
 import { selectAsync } from '../../prompts';
@@ -37,7 +37,6 @@ interface RawBuildFlags {
   'build-logger-level'?: LoggerLevel;
   'freeze-credentials': boolean;
   repack: boolean;
-  environment?: EnvironmentVariableEnvironment;
 }
 
 export default class Build extends EasCommand {
@@ -117,7 +116,6 @@ export default class Build extends EasCommand {
       description: 'Use the golden dev client build repack flow as it works for onboarding',
     }),
     ...EasNonInteractiveAndJsonFlags,
-    ...EASEnvironmentFlagHidden,
   };
 
   static override contextDefinition = {
@@ -232,7 +230,6 @@ export default class Build extends EasCommand {
       buildLoggerLevel: flags['build-logger-level'],
       freezeCredentials: flags['freeze-credentials'],
       repack: flags.repack,
-      environment: flags.environment,
     };
   }
 

packages/eas-cli/src/commands/build/resign.ts

@@ -13,7 +13,7 @@ import { listAndSelectBuildOnAppAsync } from '../../build/queries';
 import { printBuildResults, printLogsUrls } from '../../build/utils/printBuildInfo';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { EASEnvironmentFlagHidden, EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { EasPaginatedQueryFlags } from '../../commandUtils/pagination';
 import { CredentialsContext } from '../../credentials/context';
 import {
@@ -93,7 +93,6 @@ export default class BuildResign extends EasCommand {
     }),
     ...EasPaginatedQueryFlags,
     ...EasNonInteractiveAndJsonFlags,
-    ...EASEnvironmentFlagHidden,
   };
 
   static override contextDefinition = {
@@ -147,7 +146,6 @@ export default class BuildResign extends EasCommand {
     );
 
     const { exp, projectId, env } = await evaluateConfigWithEnvVarsAsync({
-      flags,
       buildProfile,
       buildProfileName: flags.targetProfile ?? 'production',
       graphqlClient,

packages/eas-cli/src/commands/build/version/get.ts

@@ -5,10 +5,7 @@ import chalk from 'chalk';
 
 import { evaluateConfigWithEnvVarsAsync } from '../../../build/evaluateConfigWithEnvVarsAsync';
 import EasCommand from '../../../commandUtils/EasCommand';
-import {
-  EASEnvironmentFlagHidden,
-  EasNonInteractiveAndJsonFlags,
-} from '../../../commandUtils/flags';
+import { EasNonInteractiveAndJsonFlags } from '../../../commandUtils/flags';
 import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { toAppPlatform } from '../../../graphql/types/AppPlatform';
 import Log from '../../../log';
@@ -35,7 +32,6 @@ export default class BuildVersionGetView extends EasCommand {
         'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
       helpValue: 'PROFILE_NAME',
     }),
-    ...EASEnvironmentFlagHidden,
     ...EasNonInteractiveAndJsonFlags,
   };
 
@@ -80,7 +76,6 @@ export default class BuildVersionGetView extends EasCommand {
     const results: { [key in Platform]?: string } = {};
     for (const { profile, platform } of buildProfiles) {
       const { exp, projectId, env } = await evaluateConfigWithEnvVarsAsync({
-        flags,
         buildProfile: profile,
         buildProfileName: flags.profile ?? 'production',
         graphqlClient,

packages/eas-cli/src/commands/build/version/set.ts

@@ -6,7 +6,6 @@ import chalk from 'chalk';
 
 import { evaluateConfigWithEnvVarsAsync } from '../../../build/evaluateConfigWithEnvVarsAsync';
 import EasCommand from '../../../commandUtils/EasCommand';
-import { EASEnvironmentFlagHidden } from '../../../commandUtils/flags';
 import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
 import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { toAppPlatform } from '../../../graphql/types/AppPlatform';
@@ -37,7 +36,6 @@ export default class BuildVersionSetView extends EasCommand {
         'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
       helpValue: 'PROFILE_NAME',
     }),
-    ...EASEnvironmentFlagHidden,
   };
 
   static override contextDefinition = {
@@ -68,7 +66,6 @@ export default class BuildVersionSetView extends EasCommand {
     );
 
     const { exp, projectId, env } = await evaluateConfigWithEnvVarsAsync({
-      flags,
       buildProfile: profile,
       buildProfileName: flags.profile ?? 'production',
       graphqlClient,

packages/eas-cli/src/commands/build/version/sync.ts

@@ -8,7 +8,6 @@ import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '.
 import { evaluateConfigWithEnvVarsAsync } from '../../../build/evaluateConfigWithEnvVarsAsync';
 import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../../build/ios/version';
 import EasCommand from '../../../commandUtils/EasCommand';
-import { EASEnvironmentFlagHidden } from '../../../commandUtils/flags';
 import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { toAppPlatform } from '../../../graphql/types/AppPlatform';
 import Log from '../../../log';
@@ -56,7 +55,6 @@ export default class BuildVersionSyncView extends EasCommand {
         'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
       helpValue: 'PROFILE_NAME',
     }),
-    ...EASEnvironmentFlagHidden,
   };
 
   static override contextDefinition = {
@@ -91,7 +89,6 @@ export default class BuildVersionSyncView extends EasCommand {
     });
     for (const profileInfo of buildProfiles) {
       const { exp, projectId, env } = await evaluateConfigWithEnvVarsAsync({
-        flags,
         buildProfile: profileInfo.profile,
         buildProfileName: profileInfo.profileName,
         graphqlClient,

packages/eas-cli/src/commands/config.ts

@@ -7,7 +7,7 @@ import chalk from 'chalk';
 import { evaluateConfigWithEnvVarsAsync } from '../build/evaluateConfigWithEnvVarsAsync';
 import EasCommand from '../commandUtils/EasCommand';
 import { createGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { EASEnvironmentFlagHidden, EasNonInteractiveAndJsonFlags } from '../commandUtils/flags';
+import { EasNonInteractiveAndJsonFlags } from '../commandUtils/flags';
 import { toAppPlatform } from '../graphql/types/AppPlatform';
 import Log from '../log';
 import { appPlatformEmojis } from '../platform';
@@ -29,7 +29,6 @@ export default class Config extends EasCommand {
     'eas-json-only': Flags.boolean({
       hidden: true,
     }),
-    ...EASEnvironmentFlagHidden,
     ...EasNonInteractiveAndJsonFlags,
   };
 
@@ -94,7 +93,6 @@ export default class Config extends EasCommand {
       });
       const graphqlClient = createGraphqlClient(authenticationInfo);
       const { exp: appConfig } = await evaluateConfigWithEnvVarsAsync({
-        flags,
         buildProfile: profile,
         buildProfileName: profileName,
         graphqlClient,

packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableCreate.test.ts

@@ -0,0 +1,383 @@
+import { Config } from '@oclif/core';
+
+import { getMockAppFragment } from '../../../__tests__/commands/utils';
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { testProjectId } from '../../../credentials/__tests__/fixtures-constants';
+import {
+  EnvironmentSecretType,
+  EnvironmentVariableEnvironment,
+  EnvironmentVariableScope,
+  EnvironmentVariableVisibility,
+} from '../../../graphql/generated';
+import { EnvironmentVariableMutation } from '../../../graphql/mutations/EnvironmentVariableMutation';
+import { AppQuery } from '../../../graphql/queries/AppQuery';
+import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
+import {
+  parseVisibility,
+  promptVariableEnvironmentAsync,
+  promptVariableNameAsync,
+  promptVariableTypeAsync,
+  promptVariableValueAsync,
+} from '../../../utils/prompts';
+import EnvironmentVariableCreate from '../create';
+
+jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
+jest.mock('../../../graphql/queries/AppQuery');
+jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
+jest.mock('../../../utils/prompts');
+
+describe(EnvironmentVariableCreate, () => {
+  const graphqlClient = {} as any as ExpoGraphqlClient;
+  const mockConfig = {} as unknown as Config;
+  const variableId = 'testId';
+  const testAccountId = 'test-account-id';
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest
+      .mocked(parseVisibility)
+      .mockImplementation(jest.requireActual('../../../utils/prompts').parseVisibility);
+
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    jest
+      .mocked(EnvironmentVariableMutation.createForAppAsync)
+      .mockImplementation(async (_client, input, _appId) => ({
+        ...input,
+        id: variableId,
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+        scope: EnvironmentVariableScope.Project,
+      }));
+    jest
+      .mocked(EnvironmentVariableMutation.createSharedVariableAsync)
+      .mockImplementation(async (_client, input, _appId) => ({
+        ...input,
+        id: variableId,
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+        scope: EnvironmentVariableScope.Shared,
+      }));
+    jest
+      .mocked(EnvironmentVariableMutation.updateAsync)
+      .mockImplementation(async (_client, input) => ({
+        ...input,
+        id: variableId,
+        name: 'VarName',
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+        scope: EnvironmentVariableScope.Shared,
+        type: EnvironmentSecretType.String,
+      }));
+    jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockImplementation(async () => []);
+    jest.mocked(EnvironmentVariablesQuery.sharedAsync).mockImplementation(async () => []);
+  });
+
+  describe('in interactive mode', () => {
+    it('creates a project variable', async () => {
+      const command = new EnvironmentVariableCreate(
+        [
+          '--name',
+          'VarName',
+          '--value',
+          'VarValue',
+          '--environment',
+          'production',
+          '--visibility',
+          'encrypted',
+        ],
+        mockConfig
+      );
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        privateProjectConfig: { projectId: testProjectId },
+      });
+
+      await command.runAsync();
+
+      expect(EnvironmentVariableMutation.createForAppAsync).toHaveBeenCalledWith(
+        graphqlClient,
+        {
+          name: 'VarName',
+          value: 'VarValue',
+          environments: [EnvironmentVariableEnvironment.Production],
+          visibility: EnvironmentVariableVisibility.Secret,
+          type: EnvironmentSecretType.String,
+        },
+        testProjectId
+      );
+    });
+
+    it('updates an existing variable in the same environment', async () => {
+      const command = new EnvironmentVariableCreate(
+        [
+          '--name',
+          'VarName',
+          '--value',
+          'VarValue',
+          '--environment',
+          'production',
+          '--visibility',
+          'encrypted',
+        ],
+        mockConfig
+      );
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        privateProjectConfig: { projectId: testProjectId },
+      });
+
+      const otherVariableId = 'otherId';
+
+      jest
+        .mocked(EnvironmentVariablesQuery.byAppIdAsync)
+        // @ts-expect-error
+        .mockImplementation(async () => [
+          {
+            id: otherVariableId,
+            environments: [EnvironmentVariableEnvironment.Production],
+            scope: EnvironmentVariableScope.Project,
+          },
+        ]);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'promptForOverwriteAsync').mockResolvedValue(true);
+      jest
+        .mocked(EnvironmentVariableMutation.updateAsync)
+        // @ts-expect-error
+        .mockImplementation(async (_client, input) => ({
+          ...input,
+          createdAt: new Date().toISOString(),
+          updatedAt: new Date().toISOString(),
+          scope: EnvironmentVariableScope.Project,
+        }));
+
+      await command.runAsync();
+
+      expect(EnvironmentVariablesQuery.byAppIdAsync).toHaveBeenCalledWith(graphqlClient, {
+        appId: testProjectId,
+        filterNames: ['VarName'],
+      });
+
+      expect(EnvironmentVariableMutation.updateAsync).toHaveBeenCalledWith(graphqlClient, {
+        id: otherVariableId,
+        name: 'VarName',
+        value: 'VarValue',
+        environments: [EnvironmentVariableEnvironment.Production],
+        visibility: EnvironmentVariableVisibility.Secret,
+      });
+    });
+
+    it('creates a shared variable', async () => {
+      const command = new EnvironmentVariableCreate(
+        [
+          '--name',
+          'VarName',
+          '--value',
+          'VarValue',
+          '--environment',
+          'production',
+          '--scope',
+          'shared',
+        ],
+        mockConfig
+      );
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        privateProjectConfig: { projectId: testProjectId },
+      });
+
+      await command.runAsync();
+
+      expect(EnvironmentVariableMutation.createSharedVariableAsync).toHaveBeenCalledWith(
+        graphqlClient,
+        {
+          name: 'VarName',
+          value: 'VarValue',
+          environments: [EnvironmentVariableEnvironment.Production],
+          visibility: EnvironmentVariableVisibility.Public,
+          type: EnvironmentSecretType.String,
+        },
+        'test-account-id'
+      );
+    });
+
+    it('throws if a shared variable already exists', async () => {
+      const command = new EnvironmentVariableCreate(
+        [
+          '--name',
+          'VarName',
+          '--value',
+          'VarValue',
+          '--environment',
+          'production',
+          '--scope',
+          'shared',
+        ],
+        mockConfig
+      );
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        privateProjectConfig: { projectId: testProjectId },
+      });
+
+      jest
+        .mocked(EnvironmentVariablesQuery.sharedAsync)
+        // @ts-expect-error
+        .mockImplementation(async () => [
+          {
+            id: 'otherId',
+            environments: [EnvironmentVariableEnvironment.Production],
+            scope: EnvironmentVariableScope.Shared,
+          },
+        ]);
+
+      await expect(command.runAsync()).rejects.toThrow();
+    });
+
+    it('updates if a shared variable already exists and --force flag is set', async () => {
+      const command = new EnvironmentVariableCreate(
+        [
+          '--name',
+          'VarName',
+          '--value',
+          'VarValue',
+          '--environment',
+          'production',
+          '--force',
+          '--scope',
+          'shared',
+        ],
+        mockConfig
+      );
+
+      const otherVariableId = 'otherId';
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        privateProjectConfig: { projectId: testProjectId },
+      });
+
+      jest
+        .mocked(EnvironmentVariablesQuery.sharedAsync)
+        // @ts-expect-error
+        .mockImplementation(async () => [
+          {
+            id: otherVariableId,
+            environments: [EnvironmentVariableEnvironment.Production],
+            scope: EnvironmentVariableScope.Shared,
+          },
+        ]);
+
+      await command.runAsync();
+
+      expect(EnvironmentVariableMutation.updateAsync).toHaveBeenCalledWith(graphqlClient, {
+        id: otherVariableId,
+        name: 'VarName',
+        value: 'VarValue',
+        environments: [EnvironmentVariableEnvironment.Production],
+        visibility: EnvironmentVariableVisibility.Public,
+      });
+    });
+
+    it('creates a shared variable and links it', async () => {
+      const command = new EnvironmentVariableCreate(
+        [
+          '--name',
+          'VarName',
+          '--value',
+          'VarValue',
+          '--environment',
+          'production',
+          '--environment',
+          'development',
+          '--scope',
+          'shared',
+          '--link',
+        ],
+        mockConfig
+      );
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        privateProjectConfig: { projectId: testProjectId },
+      });
+
+      await command.runAsync();
+
+      expect(EnvironmentVariableMutation.createSharedVariableAsync).toHaveBeenCalledWith(
+        graphqlClient,
+        {
+          name: 'VarName',
+          value: 'VarValue',
+          environments: [
+            EnvironmentVariableEnvironment.Production,
+            EnvironmentVariableEnvironment.Development,
+          ],
+          visibility: EnvironmentVariableVisibility.Public,
+          type: EnvironmentSecretType.String,
+        },
+        testAccountId
+      );
+      expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+        graphqlClient,
+        'testId',
+        testProjectId,
+        EnvironmentVariableEnvironment.Production
+      );
+      expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+        graphqlClient,
+        'testId',
+        testProjectId,
+        EnvironmentVariableEnvironment.Development
+      );
+    });
+
+    it('prompts for missing arguments', async () => {
+      const command = new EnvironmentVariableCreate([], mockConfig);
+
+      jest.mocked(promptVariableNameAsync).mockImplementation(async () => 'VarName');
+      jest.mocked(promptVariableValueAsync).mockImplementation(async () => 'VarValue');
+      jest
+        .mocked(promptVariableTypeAsync)
+        .mockImplementation(async () => EnvironmentSecretType.String);
+
+      jest
+        .mocked(promptVariableEnvironmentAsync)
+        // @ts-expect-error
+        .mockImplementation(async () => [EnvironmentVariableEnvironment.Production]);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        privateProjectConfig: { projectId: testProjectId },
+      });
+
+      await command.runAsync();
+
+      expect(promptVariableNameAsync).toHaveBeenCalled();
+      expect(promptVariableValueAsync).toHaveBeenCalled();
+      expect(promptVariableEnvironmentAsync).toHaveBeenCalled();
+      expect(EnvironmentVariableMutation.createForAppAsync).toHaveBeenCalledWith(
+        graphqlClient,
+        {
+          name: 'VarName',
+          value: 'VarValue',
+          environments: [EnvironmentVariableEnvironment.Production],
+          visibility: EnvironmentVariableVisibility.Public,
+          type: EnvironmentSecretType.String,
+        },
+        testProjectId
+      );
+    });
+  });
+});

packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableDelete.test.ts

@@ -0,0 +1,127 @@
+import { Config } from '@oclif/core';
+
+import {
+  EnvironmentVariableEnvironment,
+  EnvironmentVariableScope,
+} from '../../../graphql/generated';
+import { EnvironmentVariableMutation } from '../../../graphql/mutations/EnvironmentVariableMutation';
+import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
+import Log from '../../../log';
+import { promptAsync, toggleConfirmAsync } from '../../../prompts';
+import EnvironmentVariableDelete from '../delete';
+
+jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
+jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
+jest.mock('../../../prompts');
+jest.mock('../../../log');
+
+describe(EnvironmentVariableDelete, () => {
+  const projectId = 'test-project-id';
+  const variableId = '1';
+  const graphqlClient = {};
+  const mockConfig = {} as unknown as Config;
+  const mockContext = {
+    privateProjectConfig: { projectId },
+    loggedIn: { graphqlClient },
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('deletes a variable by name in non-interactive mode', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Project,
+        environments: [EnvironmentVariableEnvironment.Production],
+      },
+    ];
+    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
+
+    const command = new EnvironmentVariableDelete(
+      [
+        '--variable-name',
+        'TEST_VARIABLE',
+        '--variable-environment',
+        'production',
+        '--non-interactive',
+      ],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(EnvironmentVariableMutation.deleteAsync).toHaveBeenCalledWith(graphqlClient, variableId);
+    expect(Log.withTick).toHaveBeenCalledWith('️Deleted variable TEST_VARIABLE".');
+  });
+
+  it('prompts for variable selection when name is not provided', async () => {
+    const mockVariables = [
+      { id: variableId, name: 'TEST_VARIABLE', scope: EnvironmentVariableScope.Project },
+    ];
+    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (promptAsync as jest.Mock).mockResolvedValue({ variable: mockVariables[0] });
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
+
+    const command = new EnvironmentVariableDelete([], mockConfig);
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(promptAsync).toHaveBeenCalled();
+    expect(EnvironmentVariableMutation.deleteAsync).toHaveBeenCalledWith(graphqlClient, variableId);
+    expect(Log.withTick).toHaveBeenCalledWith('️Deleted variable TEST_VARIABLE".');
+  });
+
+  it('throws an error when variable name is not found', async () => {
+    const mockVariables = [
+      { id: variableId, name: 'TEST_VARIABLE', scope: EnvironmentVariableScope.Project },
+    ];
+    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
+
+    const command = new EnvironmentVariableDelete(
+      ['--variable-name', 'NON_EXISTENT_VARIABLE'],
+      mockConfig
+    );
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await expect(command.runAsync()).rejects.toThrow('Variable "NON_EXISTENT_VARIABLE" not found.');
+  });
+
+  it('throws an error when multiple variables with the same name are found', async () => {
+    const mockVariables = [
+      { id: variableId, name: 'TEST_VARIABLE', scope: EnvironmentVariableScope.Project },
+      { id: '2', name: 'TEST_VARIABLE', scope: EnvironmentVariableScope.Project },
+    ];
+    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
+
+    const command = new EnvironmentVariableDelete(['--variable-name', 'TEST_VARIABLE'], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await expect(command.runAsync()).rejects.toThrow(
+      'Multiple variables with name "TEST_VARIABLE" found. Please select the variable to delete interactively or run command with --variable-environment ENVIRONMENT option.'
+    );
+  });
+
+  it('cancels deletion when user does not confirm', async () => {
+    const mockVariables = [
+      { id: variableId, name: 'TEST_VARIABLE', scope: EnvironmentVariableScope.Project },
+    ];
+    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (promptAsync as jest.Mock).mockResolvedValue({ variable: mockVariables[0] });
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(false);
+
+    const command = new EnvironmentVariableDelete(['--non-interactive'], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await expect(command.runAsync()).rejects.toThrowErrorMatchingSnapshot();
+
+    expect(EnvironmentVariableMutation.deleteAsync).not.toHaveBeenCalled();
+  });
+});

packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableGet.test.ts

@@ -0,0 +1,114 @@
+import { Config } from '@oclif/core';
+
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { testProjectId } from '../../../credentials/__tests__/fixtures-constants';
+import {
+  EnvironmentSecretType,
+  EnvironmentVariableEnvironment,
+  EnvironmentVariableFragment,
+  EnvironmentVariableScope,
+  EnvironmentVariableVisibility,
+} from '../../../graphql/generated';
+import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
+import Log from '../../../log';
+import { promptVariableEnvironmentAsync, promptVariableNameAsync } from '../../../utils/prompts';
+import EnvironmentVariableGet from '../get';
+
+jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
+jest.mock('../../../graphql/queries/AppQuery');
+jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
+jest.mock('../../../utils/prompts');
+
+describe(EnvironmentVariableGet, () => {
+  const graphqlClient = {} as any as ExpoGraphqlClient;
+  const mockConfig = {} as unknown as Config;
+  const mockVariables: EnvironmentVariableFragment[] = [
+    {
+      id: 'var1',
+      name: 'TEST_VAR_1',
+      value: 'value1',
+      environments: [EnvironmentVariableEnvironment.Production],
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      scope: EnvironmentVariableScope.Project,
+      visibility: EnvironmentVariableVisibility.Public,
+      type: EnvironmentSecretType.String,
+    },
+  ];
+
+  it('retrieves environment variables successfully', async () => {
+    jest
+      .mocked(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync)
+      .mockResolvedValueOnce(mockVariables);
+    jest.spyOn(Log, 'log').mockImplementation(() => {});
+
+    const command = new EnvironmentVariableGet(['--variable-name', 'TEST_VAR_1'], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      privateProjectConfig: { projectId: testProjectId },
+    });
+
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      {
+        appId: testProjectId,
+        environment: undefined,
+        filterNames: ['TEST_VAR_1'],
+        includeFileContent: true,
+      }
+    );
+    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
+  });
+
+  it('handles errors during retrieval', async () => {
+    const errorMessage =
+      "Variable name is required. Run the command with '--variable-name VARIABLE_NAME' flag";
+
+    const command = new EnvironmentVariableGet([], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      privateProjectConfig: { projectId: testProjectId },
+    });
+
+    await expect(command.runAsync()).rejects.toThrow(errorMessage);
+  });
+
+  it('prompts for variable name and environment if the name is ambigous', async () => {
+    jest
+      .mocked(promptVariableEnvironmentAsync)
+      .mockResolvedValueOnce(EnvironmentVariableEnvironment.Production);
+    jest.mocked(promptVariableNameAsync).mockResolvedValueOnce('TEST_VAR_1');
+
+    const command = new EnvironmentVariableGet([], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      privateProjectConfig: { projectId: testProjectId },
+    });
+    jest.mocked(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync).mockResolvedValueOnce([
+      ...mockVariables,
+      {
+        id: 'var2',
+        name: 'TEST_VAR_1',
+        value: 'value1',
+        environments: [EnvironmentVariableEnvironment.Development],
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+        scope: EnvironmentVariableScope.Project,
+        visibility: EnvironmentVariableVisibility.Public,
+        type: EnvironmentSecretType.String,
+      },
+    ]);
+    await command.runAsync();
+
+    expect(promptVariableEnvironmentAsync).toHaveBeenCalled();
+    expect(promptVariableNameAsync).toHaveBeenCalled();
+  });
+});

packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableLink.test.ts

@@ -0,0 +1,277 @@
+import { Config } from '@oclif/core';
+import chalk from 'chalk';
+
+import { getMockAppFragment } from '../../../__tests__/commands/utils';
+import {
+  EnvironmentVariableEnvironment,
+  EnvironmentVariableScope,
+} from '../../../graphql/generated';
+import { EnvironmentVariableMutation } from '../../../graphql/mutations/EnvironmentVariableMutation';
+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';
+
+jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
+jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
+jest.mock('../../../prompts');
+jest.mock('../../../graphql/queries/AppQuery');
+jest.mock('../../../log');
+
+describe(EnvironmentVariableLink, () => {
+  const projectId = 'test-project-id';
+  const variableId = '1';
+  const graphqlClient = {};
+  const mockConfig = {} as unknown as Config;
+  const mockContext = {
+    privateProjectConfig: { projectId },
+    loggedIn: { graphqlClient },
+  };
+
+  const successMessage = (env: EnvironmentVariableEnvironment): string =>
+    `Linked variable ${chalk.bold('TEST_VARIABLE')} to project ${chalk.bold(
+      '@testuser/testpp'
+    )} in ${env.toLocaleLowerCase()}.`;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+  });
+
+  it('links a shared variable to the current project in non-interactive mode', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync as jest.Mock).mockResolvedValue(
+      mockVariables[0]
+    );
+
+    const command = new EnvironmentVariableLink(
+      ['--variable-name', 'TEST_VARIABLE', '--non-interactive'],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.run();
+
+    expect(EnvironmentVariablesQuery.sharedAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: projectId,
+      filterNames: ['TEST_VARIABLE'],
+    });
+    expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Development)
+    );
+  });
+
+  it('links a shared variable to the current project to a specified environment', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync as jest.Mock).mockResolvedValue(
+      mockVariables[0]
+    );
+
+    const command = new EnvironmentVariableLink(
+      ['--variable-name', 'TEST_VARIABLE', '--environment', 'production', '--non-interactive'],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.run();
+
+    expect(EnvironmentVariablesQuery.sharedAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: projectId,
+      filterNames: ['TEST_VARIABLE'],
+    });
+    expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Production
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Production)
+    );
+  });
+
+  it('uses --variable-environment to select the variable with ambigous name', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Preview],
+      },
+      {
+        id: 'other-id',
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockImplementation(
+      (_client, { environment }) => {
+        return mockVariables.filter(v => v.environments.includes(environment));
+      }
+    );
+    (EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync as jest.Mock).mockResolvedValue(
+      mockVariables[0]
+    );
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
+
+    const command = new EnvironmentVariableLink(
+      [
+        '--variable-name',
+        'TEST_VARIABLE',
+        '--variable-environment',
+        'development',
+        '--environment',
+        'production',
+      ],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      'other-id',
+      projectId,
+      EnvironmentVariableEnvironment.Production
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Production)
+    );
+  });
+
+  it('prompts for variable selection when the name is ambigous', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Preview],
+      },
+      {
+        id: 'other-id',
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync as jest.Mock).mockResolvedValue(
+      mockVariables[0]
+    );
+    (selectAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
+    (promptAsync as jest.Mock).mockResolvedValue({ environments: mockVariables[0].environments });
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
+
+    const command = new EnvironmentVariableLink([], mockConfig);
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(selectAsync).toHaveBeenCalled();
+    expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Preview
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Preview)
+    );
+  });
+
+  it('throws an error when variable name is not found', async () => {
+    const mockVariables: never[] = [];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+
+    const command = new EnvironmentVariableLink(
+      ['--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"
+    );
+  });
+
+  it('uses environments from prompt to both link and unlink environments', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Preview],
+        linkedEnvironments: [EnvironmentVariableEnvironment.Preview],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync as jest.Mock).mockResolvedValue(
+      mockVariables[0]
+    );
+    (selectAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
+    (promptAsync as jest.Mock).mockResolvedValue({
+      environments: [EnvironmentVariableEnvironment.Production],
+    });
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
+
+    const command = new EnvironmentVariableLink([], mockConfig);
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(promptAsync).toHaveBeenCalled();
+    expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Production
+    );
+    expect(EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Preview
+    );
+  });
+
+  it('throws an error when variable name is not found', async () => {
+    const mockVariables: never[] = [];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+
+    const command = new EnvironmentVariableLink(
+      ['--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"
+    );
+  });
+});

packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableList.test.ts

@@ -0,0 +1,170 @@
+import { Config } from '@oclif/core';
+
+import { getMockAppFragment } from '../../../__tests__/commands/utils';
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { testProjectId } from '../../../credentials/__tests__/fixtures-constants';
+import {
+  EnvironmentSecretType,
+  EnvironmentVariableEnvironment,
+  EnvironmentVariableFragment,
+  EnvironmentVariableScope,
+  EnvironmentVariableVisibility,
+} from '../../../graphql/generated';
+import { AppQuery } from '../../../graphql/queries/AppQuery';
+import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
+import Log from '../../../log';
+import EnvironmentVariableList from '../list';
+
+jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
+jest.mock('../../../graphql/queries/AppQuery');
+jest.mock('../../../log');
+
+const mockVariables: EnvironmentVariableFragment[] = [
+  {
+    id: 'var1',
+    name: 'TEST_VAR_1',
+    value: 'value1',
+    environments: [EnvironmentVariableEnvironment.Production],
+    scope: EnvironmentVariableScope.Project,
+    visibility: EnvironmentVariableVisibility.Public,
+    createdAt: undefined,
+    updatedAt: undefined,
+    type: EnvironmentSecretType.String,
+  },
+  {
+    id: 'var2',
+    name: 'TEST_VAR_2',
+    value: 'value2',
+    environments: [EnvironmentVariableEnvironment.Development],
+    scope: EnvironmentVariableScope.Project,
+    visibility: EnvironmentVariableVisibility.Public,
+    createdAt: undefined,
+    updatedAt: undefined,
+    type: EnvironmentSecretType.String,
+  },
+];
+
+describe(EnvironmentVariableList, () => {
+  const graphqlClient = {} as any as ExpoGraphqlClient;
+  const mockConfig = {} as unknown as Config;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+  });
+
+  it('lists project environment variables successfully', async () => {
+    jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValueOnce(mockVariables);
+
+    const command = new EnvironmentVariableList([], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      privateProjectConfig: { projectId: testProjectId },
+    });
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.byAppIdAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: testProjectId,
+      environment: undefined,
+      includeFileContent: false,
+    });
+    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
+    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
+  });
+
+  it('lists project environment variables in specified environments', async () => {
+    jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValueOnce(mockVariables);
+
+    const command = new EnvironmentVariableList(['--environment', 'production'], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      privateProjectConfig: { projectId: testProjectId },
+    });
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.byAppIdAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: testProjectId,
+      environment: EnvironmentVariableEnvironment.Production,
+      includeFileContent: false,
+    });
+    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
+    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
+  });
+
+  it('lists project environment variables including sensitive values', async () => {
+    jest
+      .mocked(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync)
+      .mockResolvedValueOnce(mockVariables);
+
+    const command = new EnvironmentVariableList(['--include-sensitive'], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      privateProjectConfig: { projectId: testProjectId },
+    });
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      {
+        appId: testProjectId,
+        environment: undefined,
+        includeFileContent: false,
+      }
+    );
+    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
+    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
+  });
+
+  it('lists shared environment variables successfully', async () => {
+    jest.mocked(EnvironmentVariablesQuery.sharedAsync).mockResolvedValueOnce(mockVariables);
+
+    const command = new EnvironmentVariableList(['--scope', 'shared'], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      privateProjectConfig: { projectId: testProjectId },
+    });
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.sharedAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: testProjectId,
+      environment: undefined,
+      includeFileContent: false,
+    });
+    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
+    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
+  });
+
+  it('lists shared environment variables including sensitive values', async () => {
+    jest
+      .mocked(EnvironmentVariablesQuery.sharedWithSensitiveAsync)
+      .mockResolvedValueOnce(mockVariables);
+
+    const command = new EnvironmentVariableList(
+      ['--include-sensitive', '--scope', 'shared'],
+      mockConfig
+    );
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      privateProjectConfig: { projectId: testProjectId },
+    });
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.sharedWithSensitiveAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: testProjectId,
+      environment: undefined,
+      includeFileContent: false,
+    });
+    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
+    expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
+  });
+});

packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableUnlink.test.ts

@@ -0,0 +1,232 @@
+import { Config } from '@oclif/core';
+import chalk from 'chalk';
+
+import { getMockAppFragment } from '../../../__tests__/commands/utils';
+import {
+  EnvironmentVariableEnvironment,
+  EnvironmentVariableScope,
+} from '../../../graphql/generated';
+import { EnvironmentVariableMutation } from '../../../graphql/mutations/EnvironmentVariableMutation';
+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';
+
+jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
+jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
+jest.mock('../../../prompts');
+jest.mock('../../../graphql/queries/AppQuery');
+jest.mock('../../../log');
+
+describe(EnvironmentVariableUnlink, () => {
+  const projectId = 'test-project-id';
+  const variableId = '1';
+  const graphqlClient = {};
+  const mockConfig = {} as unknown as Config;
+  const mockContext = {
+    privateProjectConfig: { projectId },
+    loggedIn: { graphqlClient },
+  };
+
+  const successMessage = (env: EnvironmentVariableEnvironment): string =>
+    `Unlinked variable ${chalk.bold('TEST_VARIABLE')} from project ${chalk.bold(
+      '@testuser/testpp'
+    )} in ${env.toLocaleLowerCase()}.`;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+  });
+
+  it('unlinks a shared variable from the current project in non-interactive mode', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+        linkedEnvironments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (
+      EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync as jest.Mock
+    ).mockResolvedValue(mockVariables[0]);
+
+    const command = new EnvironmentVariableUnlink(
+      ['--variable-name', 'TEST_VARIABLE', '--non-interactive'],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.run();
+
+    expect(EnvironmentVariablesQuery.sharedAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: projectId,
+      filterNames: ['TEST_VARIABLE'],
+    });
+    expect(EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Development)
+    );
+  });
+
+  it('unlinks a shared variable from the current project in a specified environment', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+        linkedEnvironments: [EnvironmentVariableEnvironment.Production],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (
+      EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync as jest.Mock
+    ).mockResolvedValue(mockVariables[0]);
+
+    const command = new EnvironmentVariableUnlink(
+      ['--variable-name', 'TEST_VARIABLE', '--environment', 'production', '--non-interactive'],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.run();
+
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Production)
+    );
+    expect(EnvironmentVariablesQuery.sharedAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: projectId,
+      filterNames: ['TEST_VARIABLE'],
+    });
+    expect(EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Production
+    );
+  });
+
+  it('prompts for variable selection when the name is ambigous', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Preview],
+        linkedEnvironments: [EnvironmentVariableEnvironment.Preview],
+      },
+      {
+        id: 'other-id',
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+        linkedEnvironments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (
+      EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync as jest.Mock
+    ).mockResolvedValue(mockVariables[0]);
+    (selectAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
+    (promptAsync as jest.Mock).mockResolvedValue({
+      environments: [],
+    });
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
+
+    const command = new EnvironmentVariableUnlink([], mockConfig);
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(selectAsync).toHaveBeenCalled();
+    expect(EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Preview
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Preview)
+    );
+  });
+
+  it('throws an error when variable name is not found', async () => {
+    const mockVariables: never[] = [];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+
+    const command = new EnvironmentVariableUnlink(
+      ['--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"
+    );
+  });
+
+  it('uses environments from prompt to both link and unlink environments', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Preview],
+        linkedEnvironments: [EnvironmentVariableEnvironment.Preview],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync as jest.Mock).mockResolvedValue(
+      mockVariables[0]
+    );
+    (selectAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
+    (promptAsync as jest.Mock).mockResolvedValue({
+      environments: [EnvironmentVariableEnvironment.Production],
+    });
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
+
+    const command = new EnvironmentVariableUnlink([], mockConfig);
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(promptAsync).toHaveBeenCalled();
+    expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Production
+    );
+    expect(EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Preview
+    );
+  });
+
+  it('throws an error when variable name is not found', async () => {
+    const mockVariables: never[] = [];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+
+    const command = new EnvironmentVariableUnlink(
+      ['--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"
+    );
+  });
+});

packages/eas-cli/src/commands/env/__tests__/EnvironmentVariableUpdate.test.ts

@@ -0,0 +1,168 @@
+import { Config } from '@oclif/core';
+import chalk from 'chalk';
+
+import { getMockAppFragment } from '../../../__tests__/commands/utils';
+import {
+  EnvironmentVariableEnvironment,
+  EnvironmentVariableScope,
+  EnvironmentVariableVisibility,
+} from '../../../graphql/generated';
+import { EnvironmentVariableMutation } from '../../../graphql/mutations/EnvironmentVariableMutation';
+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';
+
+jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
+jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
+jest.mock('../../../prompts');
+jest.mock('../../../graphql/queries/AppQuery');
+jest.mock('../../../log');
+
+describe(EnvironmentVariableUpdate, () => {
+  const projectId = 'test-project-id';
+  const variableId = '1';
+  const graphqlClient = {};
+  const mockConfig = {} as unknown as Config;
+  const mockContext = {
+    privateProjectConfig: { projectId },
+    loggedIn: { graphqlClient },
+  };
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+  });
+
+  it('updates a project variable by selected name in non-interactive mode', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Project,
+        environments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.updateAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
+
+    const command = new EnvironmentVariableUpdate(
+      [
+        '--variable-name',
+        'TEST_VARIABLE',
+        '--variable-environment',
+        'development',
+        '--non-interactive',
+        '--value',
+        'new-value',
+        '--name',
+        'NEW_VARIABLE',
+        '--environment',
+        'production',
+        '--visibility',
+        'plaintext',
+      ],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(EnvironmentVariableMutation.updateAsync).toHaveBeenCalledWith(graphqlClient, {
+      id: variableId,
+      name: 'NEW_VARIABLE',
+      value: 'new-value',
+      environments: [EnvironmentVariableEnvironment.Production],
+      visibility: EnvironmentVariableVisibility.Public,
+    });
+    expect(Log.withTick).toHaveBeenCalledWith(
+      `Updated variable ${chalk.bold('TEST_VARIABLE')} on project @testuser/testpp.`
+    );
+  });
+
+  it('updates a shared variable by selected name in non-interactive mode', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.updateAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
+
+    const command = new EnvironmentVariableUpdate(
+      [
+        '--variable-name',
+        'TEST_VARIABLE',
+        '--variable-environment',
+        'development',
+        '--non-interactive',
+        '--value',
+        'new-value',
+        '--name',
+        'NEW_VARIABLE',
+        '--environment',
+        'production',
+        '--scope',
+        'shared',
+      ],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(EnvironmentVariableMutation.updateAsync).toHaveBeenCalledWith(graphqlClient, {
+      id: variableId,
+      name: 'NEW_VARIABLE',
+      value: 'new-value',
+      environments: [EnvironmentVariableEnvironment.Production],
+    });
+    expect(Log.withTick).toHaveBeenCalledWith(
+      `Updated variable ${chalk.bold('TEST_VARIABLE')} on account testuser.`
+    );
+  });
+
+  it('prompts for variable selection when selected name is not provided', async () => {
+    const mockVariables = [
+      { id: variableId, name: 'TEST_VARIABLE', scope: EnvironmentVariableScope.Project },
+    ];
+    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.updateAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
+    (promptAsync as jest.Mock).mockResolvedValue({ name: mockVariables[0].name });
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
+
+    const command = new EnvironmentVariableUpdate([], mockConfig);
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(promptAsync).toHaveBeenCalled();
+    expect(EnvironmentVariableMutation.updateAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      expect.objectContaining({ id: variableId })
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      `Updated variable ${chalk.bold('TEST_VARIABLE')} on project @testuser/testpp.`
+    );
+  });
+
+  it('throws an error when variable name is not found', async () => {
+    const mockVariables: never[] = [];
+    (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
+
+    const command = new EnvironmentVariableUpdate(
+      ['--variable-name', 'NON_EXISTENT_VARIABLE'],
+      mockConfig
+    );
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await expect(command.runAsync()).rejects.toThrow(
+      'Variable with name NON_EXISTENT_VARIABLE  does not exist on project @testuser/testpp.'
+    );
+  });
+});

packages/eas-cli/src/commands/env/__tests__/__snapshots__/EnvironmentVariableDelete.test.ts.snap

@@ -0,0 +1,3 @@
+// 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 --variable-name VARIABLE_NAME flag to fix the issue"`;

packages/eas-cli/src/commands/env/create.ts

@@ -1,14 +1,17 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import {
-  EASEnvironmentFlag,
+  EASMultiEnvironmentFlag,
   EASNonInteractiveFlag,
   EASVariableScopeFlag,
   EASVariableVisibilityFlag,
 } from '../../commandUtils/flags';
 import {
+  EnvironmentSecretType,
   EnvironmentVariableEnvironment,
   EnvironmentVariableScope,
   EnvironmentVariableVisibility,
@@ -22,19 +25,24 @@ import {
 } from '../../project/projectUtils';
 import { confirmAsync } from '../../prompts';
 import {
+  parseVisibility,
   promptVariableEnvironmentAsync,
   promptVariableNameAsync,
+  promptVariableTypeAsync,
   promptVariableValueAsync,
+  promptVariableVisibilityAsync,
 } from '../../utils/prompts';
+import { performForEnvironmentsAsync } from '../../utils/variableUtils';
 
 type CreateFlags = {
   name?: string;
   value?: string;
   link?: boolean;
   force?: boolean;
-  visibility?: EnvironmentVariableVisibility;
+  type?: 'string' | 'file';
+  visibility?: 'plaintext' | 'sensitive' | 'encrypted';
   scope?: EnvironmentVariableScope;
-  environment?: EnvironmentVariableEnvironment;
+  environment?: EnvironmentVariableEnvironment[];
   'non-interactive': boolean;
 };
 
@@ -58,9 +66,13 @@ export default class EnvironmentVariableCreate extends EasCommand {
       description: 'Overwrite existing variable',
       default: false,
     }),
+    type: Flags.enum<'string' | 'file'>({
+      description: 'The type of variable',
+      options: ['string', 'file'],
+    }),
     ...EASVariableVisibilityFlag,
     ...EASVariableScopeFlag,
-    ...EASEnvironmentFlag,
+    ...EASMultiEnvironmentFlag,
     ...EASNonInteractiveFlag,
   };
 
@@ -73,16 +85,19 @@ export default class EnvironmentVariableCreate extends EasCommand {
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(EnvironmentVariableCreate);
 
-    let {
+    const validatedFlags = this.validateFlags(flags);
+
+    const {
       name,
       value,
       scope,
       'non-interactive': nonInteractive,
-      environment,
+      environment: environments,
       visibility,
       link,
       force,
-    } = this.validateFlags(flags);
+      type,
+    } = await this.promptForMissingFlagsAsync(validatedFlags);
 
     const {
       privateProjectConfig: { projectId },
@@ -96,90 +111,75 @@ export default class EnvironmentVariableCreate extends EasCommand {
       getOwnerAccountForProjectIdAsync(graphqlClient, projectId),
     ]);
 
-    if (!name) {
-      name = await promptVariableNameAsync(nonInteractive);
-    }
-
     let overwrite = false;
-    visibility = visibility ?? EnvironmentVariableVisibility.Public;
-
-    if (!value) {
-      value = await promptVariableValueAsync({
-        nonInteractive,
-        hidden: visibility !== EnvironmentVariableVisibility.Public,
-      });
-    }
 
     if (scope === EnvironmentVariableScope.Project) {
-      if (!environment) {
-        environment = await promptVariableEnvironmentAsync(nonInteractive);
-      }
       const existingVariables = await EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
         appId: projectId,
-        environment,
+        filterNames: [name],
       });
-      const existingVariable = existingVariables.find(variable => variable.name === name);
+
+      const existingVariable = existingVariables.find(
+        variable => !environments || variable.environments?.some(env => environments?.includes(env))
+      );
 
       if (existingVariable) {
+        if (existingVariable.scope === EnvironmentVariableScope.Project) {
+          await this.promptForOverwriteAsync({
+            nonInteractive,
+            force,
+            message: `Variable ${name} already exists on this project.`,
+            suggestion: 'Do you want to overwrite it?',
+          });
+          overwrite = true;
+        }
         if (existingVariable.scope === EnvironmentVariableScope.Shared) {
-          if (!nonInteractive) {
-            const confirmation = await confirmAsync({
-              message: `Shared variable ${name} already exists on this project. Do you want to unlink it first?`,
-            });
+          await this.promptForOverwriteAsync({
+            nonInteractive,
+            force,
+            message: `Shared variable with ${name} name already exists on this account.`,
+            suggestion: 'Do you want to unlink it first?',
+          });
 
-            if (!confirmation) {
-              Log.log('Aborting');
-              throw new Error(`Shared variable ${name} already exists on this project.`);
-            }
-          } else if (!force) {
-            throw new Error(
-              `Shared variable ${name} already exists on this project. Use --force to overwrite it.`
-            );
-          }
-
-          await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
-            graphqlClient,
-            existingVariable.id,
-            projectId,
-            environment
-          );
           Log.withTick(
             `Unlinking shared variable ${chalk.bold(name)} on project ${chalk.bold(
               projectDisplayName
             )}.`
           );
-        } else {
-          if (!nonInteractive) {
-            const confirmation = await confirmAsync({
-              message: `Variable ${name} already exists on this project. Do you want to overwrite it?`,
-            });
 
-            if (!confirmation) {
-              Log.log('Aborting');
-              throw new Error(
-                `Variable ${name} already exists on this project.  Use --force to overwrite it.`
-              );
-            }
-          } else if (!force) {
-            throw new Error(
-              `Variable ${name} already exists on this project. Use --force to overwrite it.`
+          await performForEnvironmentsAsync(environments, async environment => {
+            await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
+              graphqlClient,
+              existingVariable.id,
+              projectId,
+              environment
             );
-          }
-          overwrite = true;
+          });
         }
       }
 
-      const variable = await EnvironmentVariableMutation.createForAppAsync(
-        graphqlClient,
-        {
-          name,
-          value,
-          environment,
-          visibility,
-          overwrite,
-        },
-        projectId
-      );
+      const variable =
+        overwrite && existingVariable
+          ? await EnvironmentVariableMutation.updateAsync(graphqlClient, {
+              id: existingVariable.id,
+              name,
+              value,
+              visibility,
+              environments,
+              type,
+            })
+          : await EnvironmentVariableMutation.createForAppAsync(
+              graphqlClient,
+              {
+                name,
+                value,
+                environments,
+                visibility,
+                type: type ?? EnvironmentSecretType.String,
+              },
+              projectId
+            );
+
       if (!variable) {
         throw new Error(
           `Could not create variable with name ${name} on project ${projectDisplayName}`
@@ -190,41 +190,47 @@ export default class EnvironmentVariableCreate extends EasCommand {
         `Created a new variable ${chalk.bold(name)} on project ${chalk.bold(projectDisplayName)}.`
       );
     } else if (scope === EnvironmentVariableScope.Shared) {
-      const sharedVariables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
+      const existingVariables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
         appId: projectId,
+        filterNames: [name],
       });
-      const existingVariable = sharedVariables.find(variable => variable.name === name);
+
+      const existingVariable = existingVariables.find(
+        variable => !environments || variable.environments?.some(env => environments?.includes(env))
+      );
+
       if (existingVariable) {
-        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.`
-        );
-      }
-
-      if (environment && !link) {
-        const confirmation = await confirmAsync({
-          message: `Unexpected argument: --environment can only be used with --link flag. Do you want to link the variable to the current project?`,
-        });
-
-        if (!confirmation) {
-          Log.log('Aborting');
-          throw new Error('Unexpected argument: --environment can only be used with --link flag.');
+        if (force) {
+          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.`
+          );
         }
       }
 
-      if (!environment && link) {
-        environment = await promptVariableEnvironmentAsync(nonInteractive);
-      }
-
-      const variable = await EnvironmentVariableMutation.createSharedVariableAsync(
-        graphqlClient,
-        {
-          name,
-          value,
-          visibility,
-        },
-        ownerAccount.id
-      );
+      const variable =
+        overwrite && existingVariable
+          ? await EnvironmentVariableMutation.updateAsync(graphqlClient, {
+              id: existingVariable.id,
+              name,
+              value,
+              visibility,
+              environments,
+              type,
+            })
+          : await EnvironmentVariableMutation.createSharedVariableAsync(
+              graphqlClient,
+              {
+                name,
+                value,
+                visibility,
+                environments,
+                type: type ?? EnvironmentSecretType.String,
+              },
+              ownerAccount.id
+            );
 
       if (!variable) {
         throw new Error(
@@ -236,18 +242,22 @@ export default class EnvironmentVariableCreate extends EasCommand {
         `Created a new variable ${chalk.bold(name)} on account ${chalk.bold(ownerAccount.name)}.`
       );
 
-      if (link && environment) {
+      if (link) {
         Log.withTick(
           `Linking shared variable ${chalk.bold(name)} to project ${chalk.bold(
             projectDisplayName
           )}.`
         );
-        await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
-          graphqlClient,
-          variable.id,
-          projectId,
-          environment
-        );
+
+        await performForEnvironmentsAsync(environments, async environment => {
+          await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
+            graphqlClient,
+            variable.id,
+            projectId,
+            environment
+          );
+        });
+
         Log.withTick(
           `Linked shared variable ${chalk.bold(name)} to project ${chalk.bold(projectDisplayName)}.`
         );
@@ -255,12 +265,118 @@ export default class EnvironmentVariableCreate extends EasCommand {
     }
   }
 
-  private validateFlags(flags: CreateFlags): CreateFlags {
+  private async promptForOverwriteAsync({
+    nonInteractive,
+    force,
+    message,
+    suggestion,
+  }: {
+    nonInteractive: boolean;
+    force: boolean;
+    message: string;
+    suggestion: string;
+  }): Promise<void> {
+    if (!nonInteractive) {
+      const confirmation = await confirmAsync({
+        message: `${message} ${suggestion}`,
+      });
+
+      if (!confirmation) {
+        Log.log('Aborting');
+        throw new Error(`${message}`);
+      }
+    } else if (!force) {
+      throw new Error(`${message} Use --force to overwrite it.`);
+    }
+  }
+
+  private async promptForMissingFlagsAsync({
+    name,
+    value,
+    environment,
+    visibility,
+    'non-interactive': nonInteractive,
+    type,
+    ...rest
+  }: CreateFlags): Promise<
+    Required<
+      Omit<CreateFlags, 'type' | 'visibility'> & {
+        type: EnvironmentSecretType | undefined;
+        visibility: EnvironmentVariableVisibility;
+      }
+    >
+  > {
+    if (!name) {
+      name = await promptVariableNameAsync(nonInteractive);
+    }
+
+    let newType;
+    let newVisibility = visibility ? parseVisibility(visibility) : undefined;
+
+    if (type === 'file') {
+      newType = EnvironmentSecretType.FileBase64;
+    } else if (type === 'string') {
+      newType = EnvironmentSecretType.String;
+    }
+
+    if (!type && !value && !nonInteractive) {
+      newType = await promptVariableTypeAsync(nonInteractive);
+    }
+
+    if (!newVisibility) {
+      newVisibility = await promptVariableVisibilityAsync(nonInteractive);
+    }
+
+    if (!value) {
+      value = await promptVariableValueAsync({
+        nonInteractive,
+        hidden: newVisibility !== EnvironmentVariableVisibility.Public,
+        filePath: newType === EnvironmentSecretType.FileBase64,
+      });
+    }
+
+    let environmentFilePath: string | undefined;
+
+    if (newType === EnvironmentSecretType.FileBase64) {
+      environmentFilePath = path.resolve(value);
+      if (!(await fs.pathExists(environmentFilePath))) {
+        throw new Error(`File "${value}" does not exist`);
+      }
+    }
+
+    value = environmentFilePath ? await fs.readFile(environmentFilePath, 'base64') : value;
+
+    if (!environment) {
+      environment = await promptVariableEnvironmentAsync({ nonInteractive, multiple: true });
+
+      if (!environment || environment.length === 0) {
+        throw new Error('No environments selected');
+      }
+    }
+
+    newVisibility = newVisibility ?? EnvironmentVariableVisibility.Public;
+
+    return {
+      name,
+      value,
+      environment,
+      visibility: newVisibility,
+      link: rest.link ?? false,
+      force: rest.force ?? false,
+      scope: rest.scope ?? EnvironmentVariableScope.Project,
+      'non-interactive': nonInteractive,
+      type: newType,
+      ...rest,
+    };
+  }
+
+  private validateFlags(flags: CreateFlags & { type?: string; visibility?: string }): CreateFlags {
     if (flags.scope !== EnvironmentVariableScope.Shared && 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 shared variables`
       );
     }
+
     if (
       flags.scope === EnvironmentVariableScope.Shared &&
       flags.environment &&
@@ -271,6 +387,7 @@ export default class EnvironmentVariableCreate extends EasCommand {
         'Unexpected argument: --environment in non-interactive mode can only be used with --link flag.'
       );
     }
+
     return flags;
   }
 }

packages/eas-cli/src/commands/env/delete.ts

@@ -1,22 +1,23 @@
 import { Flags } from '@oclif/core';
+import assert from 'assert';
 import chalk from 'chalk';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import {
-  EASEnvironmentFlag,
   EASNonInteractiveFlag,
   EASVariableScopeFlag,
+  EasEnvironmentFlagParameters,
 } from '../../commandUtils/flags';
 import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../../graphql/generated';
 import { EnvironmentVariableMutation } from '../../graphql/mutations/EnvironmentVariableMutation';
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';
-import { promptVariableEnvironmentAsync } from '../../utils/prompts';
+import { formatVariableName } from '../../utils/variableUtils';
 
 type DeleteFlags = {
-  name?: string;
-  environment?: EnvironmentVariableEnvironment;
+  'variable-name'?: string;
+  'variable-environment'?: EnvironmentVariableEnvironment;
   'non-interactive': boolean;
   scope?: EnvironmentVariableScope;
 };
@@ -27,11 +28,14 @@ export default class EnvironmentVariableDelete extends EasCommand {
   static override hidden = true;
 
   static override flags = {
-    name: Flags.string({
+    'variable-name': Flags.string({
       description: 'Name of the variable to delete',
     }),
+    'variable-environment': Flags.enum<EnvironmentVariableEnvironment>({
+      ...EasEnvironmentFlagParameters,
+      description: 'Current environment of the variable to delete',
+    }),
     ...EASVariableScopeFlag,
-    ...EASEnvironmentFlag,
     ...EASNonInteractiveFlag,
   };
 
@@ -42,7 +46,12 @@ export default class EnvironmentVariableDelete extends EasCommand {
 
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(EnvironmentVariableDelete);
-    let { name, environment, 'non-interactive': nonInteractive, scope } = this.validateFlags(flags);
+    const {
+      'variable-name': name,
+      'variable-environment': environment,
+      'non-interactive': nonInteractive,
+      scope,
+    } = this.validateFlags(flags);
     const {
       privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
@@ -50,47 +59,53 @@ export default class EnvironmentVariableDelete extends EasCommand {
       nonInteractive,
     });
 
-    if (scope === EnvironmentVariableScope.Project) {
-      if (!environment) {
-        environment = await promptVariableEnvironmentAsync(nonInteractive);
-      }
-    }
-
     const variables =
-      scope === EnvironmentVariableScope.Project && environment
+      scope === EnvironmentVariableScope.Project
         ? await EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
             appId: projectId,
             environment,
           })
-        : await EnvironmentVariablesQuery.sharedAsync(graphqlClient, { appId: projectId });
+        : await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
+            appId: projectId,
+            environment,
+          });
+
+    let selectedVariable;
 
     if (!name) {
-      ({ name } = await promptAsync({
+      ({ variable: selectedVariable } = await promptAsync({
         type: 'select',
-        name: 'name',
+        name: 'variable',
         message: 'Pick the variable to be deleted:',
         choices: variables
           .filter(({ scope: variableScope }) => scope === variableScope)
-          .map(variable => ({
-            title: variable.name,
-            value: variable.name,
-          })),
+          .map(variable => {
+            return {
+              title: formatVariableName(variable),
+              value: variable,
+            };
+          }),
       }));
+    } else {
+      const selectedVariables = variables.filter(
+        variable =>
+          variable.name === name && (!environment || variable.environments?.includes(environment))
+      );
 
-      if (!name) {
-        throw new Error(
-          `Environment variable wasn't selected. Run the command again and select existing variable or run it with ${chalk.bold(
-            '--name VARIABLE_NAME'
-          )} flag to fix the issue.`
-        );
+      if (selectedVariables.length !== 1) {
+        if (selectedVariables.length === 0) {
+          throw new Error(`Variable "${name}" not found.`);
+        } else {
+          throw new Error(
+            `Multiple variables with name "${name}" found. Please select the variable to delete interactively or run command with --variable-environment ENVIRONMENT option.`
+          );
+        }
       }
+
+      selectedVariable = selectedVariables[0];
     }
 
-    const selectedVariable = variables.find(variable => variable.name === name);
-
-    if (!selectedVariable) {
-      throw new Error(`Variable "${name}" not found.`);
-    }
+    assert(selectedVariable, `Variable "${name}" not found.`);
 
     if (!nonInteractive) {
       Log.addNewLineIfNone();
@@ -106,7 +121,7 @@ export default class EnvironmentVariableDelete extends EasCommand {
       });
       if (!confirmed) {
         Log.error(`Canceled deletion of variable ${selectedVariable.name}.`);
-        throw new Error(`Variable "${name}" not deleted.`);
+        throw new Error(`Variable "${selectedVariable.name}" not deleted.`);
       }
     }
 
@@ -117,10 +132,10 @@ export default class EnvironmentVariableDelete extends EasCommand {
 
   private validateFlags(flags: DeleteFlags): DeleteFlags {
     if (flags['non-interactive']) {
-      if (!flags.name) {
+      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(
-            '--name VARIABLE_NAME'
+            '--variable-name VARIABLE_NAME'
           )} flag to fix the issue`
         );
       }

packages/eas-cli/src/commands/env/exec.ts

@@ -0,0 +1,186 @@
+import spawnAsync from '@expo/spawn-async';
+import chalk from 'chalk';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { EASEnvironmentFlag, EASNonInteractiveFlag } from '../../commandUtils/flags';
+import { EnvironmentVariableEnvironment } from '../../graphql/generated';
+import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
+import Log from '../../log';
+import { promptVariableEnvironmentAsync } from '../../utils/prompts';
+
+type ParsedFlags =
+  | {
+      nonInteractive: true;
+      environment: EnvironmentVariableEnvironment;
+    }
+  | {
+      nonInteractive: false;
+      environment?: EnvironmentVariableEnvironment;
+    };
+
+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;
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  static override flags = {
+    ...EASEnvironmentFlag,
+    ...EASNonInteractiveFlag,
+  };
+
+  static override args = [
+    {
+      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);
+
+    const parsedFlags = this.sanitizeFlags(flags);
+
+    const {
+      privateProjectConfig: { projectId },
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(EnvExec, {
+      nonInteractive: parsedFlags.nonInteractive,
+    });
+
+    const environment =
+      parsedFlags.environment ??
+      (await promptVariableEnvironmentAsync({ nonInteractive: parsedFlags.nonInteractive }));
+    const environmentVariables = await this.loadEnvironmentVariablesAsync({
+      graphqlClient,
+      projectId,
+      environment,
+    });
+
+    await this.runCommandWithEnvVarsAsync({ 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,
+      };
+    }
+    return {
+      nonInteractive: false,
+      environment: rawFlags.environment,
+    };
+  }
+
+  private async runCommandWithEnvVarsAsync({
+    command,
+    environmentVariables,
+  }: {
+    command: string;
+    environmentVariables: Record<string, string>;
+  }): Promise<void> {
+    Log.log(`Running command: ${chalk.bold(command)}`);
+    const spawnPromise = spawnAsync('bash', ['-c', command], {
+      stdio: ['inherit', 'pipe', 'pipe'],
+      env: {
+        ...process.env,
+        ...environmentVariables,
+      },
+    });
+    const {
+      child: { stdout, stderr },
+    } = spawnPromise;
+    if (!stdout || !stderr) {
+      throw new Error(`Failed to spawn ${command}`);
+    }
+    stdout.on('data', data => {
+      for (const line of data.toString().trim().split('\n')) {
+        Log.log(`${chalk.gray('[stdout]')} ${line}`);
+      }
+    });
+    stderr.on('data', data => {
+      for (const line of data.toString().trim().split('\n')) {
+        Log.warn(`${chalk.gray('[stderr]')} ${line}`);
+      }
+    });
+
+    try {
+      await spawnPromise;
+    } catch (error) {
+      Log.error(`❌ ${chalk.bold(command)} failed`);
+      throw error;
+    }
+  }
+
+  private async loadEnvironmentVariablesAsync({
+    graphqlClient,
+    projectId,
+    environment,
+  }: {
+    graphqlClient: ExpoGraphqlClient;
+    projectId: string;
+    environment: EnvironmentVariableEnvironment;
+  }): Promise<Record<string, string>> {
+    const environmentVariablesQueryResult =
+      await EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(graphqlClient, {
+        appId: projectId,
+        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.');
+    }
+    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) {
+      if (value) {
+        environmentVariables[name] = value;
+      }
+    }
+    return environmentVariables;
+  }
+}

packages/eas-cli/src/commands/env/get.ts

@@ -4,24 +4,25 @@ import chalk from 'chalk';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import {
-  EASEnvironmentFlag,
   EASNonInteractiveFlag,
   EASVariableFormatFlag,
   EASVariableScopeFlag,
+  EasEnvironmentFlagParameters,
 } from '../../commandUtils/flags';
 import {
   EnvironmentVariableEnvironment,
   EnvironmentVariableFragment,
   EnvironmentVariableScope,
+  EnvironmentVariableVisibility,
 } from '../../graphql/generated';
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
-import { formatVariable } from '../../utils/formatVariable';
 import { promptVariableEnvironmentAsync, promptVariableNameAsync } from '../../utils/prompts';
+import { formatVariable, formatVariableValue } from '../../utils/variableUtils';
 
 type GetFlags = {
-  name?: string;
-  environment?: EnvironmentVariableEnvironment;
+  'variable-name'?: string;
+  'variable-environment'?: EnvironmentVariableEnvironment;
   'non-interactive': boolean;
   format?: string;
   scope: EnvironmentVariableScope;
@@ -38,21 +39,24 @@ export default class EnvironmentVariableGet extends EasCommand {
   };
 
   static override flags = {
-    name: Flags.string({
+    'variable-name': Flags.string({
       description: 'Name of the variable',
     }),
+    'variable-environment': Flags.enum<EnvironmentVariableEnvironment>({
+      ...EasEnvironmentFlagParameters,
+      description: 'Current environment of the variable',
+    }),
     ...EASVariableFormatFlag,
     ...EASVariableScopeFlag,
     ...EASNonInteractiveFlag,
-    ...EASEnvironmentFlag,
   };
 
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(EnvironmentVariableGet);
 
     let {
-      environment,
-      name,
+      'variable-environment': environment,
+      'variable-name': name,
       'non-interactive': nonInteractive,
       format,
       scope,
@@ -69,16 +73,36 @@ export default class EnvironmentVariableGet extends EasCommand {
       name = await promptVariableNameAsync(nonInteractive);
     }
 
-    if (!environment && scope === EnvironmentVariableScope.Project) {
-      environment = await promptVariableEnvironmentAsync(nonInteractive);
+    if (!environment) {
+      environment = await promptVariableEnvironmentAsync({
+        nonInteractive,
+        multiple: false,
+      });
     }
-    const variable = await getVariableAsync(graphqlClient, scope, projectId, name, environment);
 
-    if (!variable) {
+    const variables = await getVariablesAsync(graphqlClient, scope, projectId, name, environment);
+
+    if (variables.length === 0) {
       Log.error(`Variable with name "${name}" not found`);
       return;
     }
-    if (!variable.value) {
+
+    let variable;
+
+    if (variables.length > 1) {
+      const variableInEnvironment = variables.find(v => v.environments?.includes(environment!));
+      if (!variableInEnvironment) {
+        throw new Error(
+          `Variable with name "${name}" not found in environment "${environment.toLocaleLowerCase()}"`
+        );
+      }
+
+      variable = variableInEnvironment;
+    } else {
+      variable = variables[0];
+    }
+
+    if (variable.visibility === EnvironmentVariableVisibility.Secret) {
       throw new Error(
         `${chalk.bold(
           variable.name
@@ -87,24 +111,21 @@ export default class EnvironmentVariableGet extends EasCommand {
     }
 
     if (format === 'short') {
-      Log.log(`${chalk.bold(variable.name)}=${variable.value}`);
+      Log.log(`${chalk.bold(variable.name)}=${formatVariableValue(variable)}`);
     } else {
       Log.log(formatVariable(variable));
     }
   }
 
   private validateFlags(flags: GetFlags): GetFlags {
-    if (flags.environment && flags.scope === EnvironmentVariableScope.Shared) {
-      throw new Error(`Unexpected argument: --environment can only be used with project variables`);
-    }
     if (flags['non-interactive']) {
-      if (!flags.name) {
-        throw new Error('Variable name is required. Run the command with --name flag.');
+      if (!flags['variable-name']) {
+        throw new Error('Variable name is required. Run the command with --variable-name flag.');
       }
       if (!flags.scope) {
         throw new Error('Scope is required. Run the command with --scope flag.');
       }
-      if (!flags.environment && flags.scope === EnvironmentVariableScope.Project) {
+      if (!flags['variable-environment']) {
         throw new Error('Environment is required.');
       }
     }
@@ -112,38 +133,35 @@ export default class EnvironmentVariableGet extends EasCommand {
   }
 }
 
-async function getVariableAsync(
+async function getVariablesAsync(
   graphqlClient: ExpoGraphqlClient,
   scope: string,
   projectId: string,
   name: string | undefined,
-  environment: string | undefined
-): Promise<EnvironmentVariableFragment | null> {
-  if (!environment && scope === EnvironmentVariableScope.Project) {
-    throw new Error('Environment is required.');
-  }
+  environment: EnvironmentVariableEnvironment | undefined
+): Promise<EnvironmentVariableFragment[]> {
   if (!name) {
-    throw new Error("Variable name is required. Run the command with '--name VARIABLE_NAME' flag.");
+    throw new Error(
+      "Variable name is required. Run the command with '--variable-name VARIABLE_NAME' flag."
+    );
   }
-  if (environment && scope === EnvironmentVariableScope.Project) {
+  if (scope === EnvironmentVariableScope.Project) {
     const appVariables = await EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(graphqlClient, {
       appId: projectId,
       environment,
       filterNames: [name],
+      includeFileContent: true,
     });
-    return appVariables[0];
-  }
-
-  if (scope === EnvironmentVariableScope.Shared) {
+    return appVariables;
+  } else {
     const sharedVariables = await EnvironmentVariablesQuery.sharedWithSensitiveAsync(
       graphqlClient,
       {
         appId: projectId,
         filterNames: [name],
+        includeFileContent: true,
       }
     );
-    return sharedVariables[0];
+    return sharedVariables;
   }
-
-  return null;
 }

packages/eas-cli/src/commands/env/link.ts

@@ -2,13 +2,19 @@ import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
 import EasCommand from '../../commandUtils/EasCommand';
-import { EASEnvironmentFlag, EASNonInteractiveFlag } from '../../commandUtils/flags';
+import {
+  EASMultiEnvironmentFlag,
+  EASNonInteractiveFlag,
+  EasEnvironmentFlagParameters,
+} from '../../commandUtils/flags';
+import { EnvironmentVariableEnvironment } from '../../graphql/generated';
 import { EnvironmentVariableMutation } from '../../graphql/mutations/EnvironmentVariableMutation';
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { selectAsync } from '../../prompts';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
+import { formatVariableName } from '../../utils/variableUtils';
 
 export default class EnvironmentVariableLink extends EasCommand {
   static override description = 'link a shared environment variable to the current project';
@@ -16,10 +22,14 @@ export default class EnvironmentVariableLink extends EasCommand {
   static override hidden = true;
 
   static override flags = {
-    name: Flags.string({
+    'variable-name': Flags.string({
       description: 'Name of the variable',
     }),
-    ...EASEnvironmentFlag,
+    'variable-environment': Flags.enum<EnvironmentVariableEnvironment>({
+      ...EasEnvironmentFlagParameters,
+      description: 'Current environment of the variable to link',
+    }),
+    ...EASMultiEnvironmentFlag,
     ...EASNonInteractiveFlag,
   };
 
@@ -30,7 +40,12 @@ export default class EnvironmentVariableLink extends EasCommand {
 
   async runAsync(): Promise<void> {
     let {
-      flags: { name, 'non-interactive': nonInteractive, environment },
+      flags: {
+        'variable-name': name,
+        'variable-environment': currentEnvironment,
+        'non-interactive': nonInteractive,
+        environment: environments,
+      },
     } = await this.parse(EnvironmentVariableLink);
     const {
       privateProjectConfig: { projectId },
@@ -42,44 +57,102 @@ export default class EnvironmentVariableLink extends EasCommand {
     const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
     const variables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
       appId: projectId,
+      environment: currentEnvironment,
+      filterNames: name ? [name] : undefined,
     });
 
-    if (!name) {
-      name = await selectAsync(
+    let selectedVariable = variables[0];
+
+    if (variables.length > 1) {
+      if (nonInteractive) {
+        throw new Error(
+          'Multiple variables found, run command with --variable-name and --variable-environment arguments.'
+        );
+      }
+      selectedVariable = await selectAsync(
         'Select shared variable',
         variables.map(variable => ({
-          title: variable.name,
-          value: variable.name,
+          title: formatVariableName(variable),
+          value: variable,
         }))
       );
     }
 
-    const selectedVariable = variables.find(variable => variable.name === name);
-
     if (!selectedVariable) {
       throw new Error(`Shared variable ${name} doesn't exist`);
     }
 
-    if (!environment) {
-      environment = await promptVariableEnvironmentAsync(nonInteractive);
+    let explicitSelect = false;
+    if (!nonInteractive && !environments) {
+      const selectedEnvironments =
+        (selectedVariable.linkedEnvironments ?? []).length > 0
+          ? selectedVariable.linkedEnvironments
+          : selectedVariable.environments;
+      environments = await promptVariableEnvironmentAsync({
+        nonInteractive,
+        multiple: true,
+        selectedEnvironments: selectedEnvironments ?? [],
+      });
+      explicitSelect = true;
     }
 
-    const linkedVariable = await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
-      graphqlClient,
-      selectedVariable.id,
-      projectId,
-      environment
-    );
-    if (!linkedVariable) {
-      throw new Error(
-        `Could not link variable with name ${selectedVariable.name} to project with id ${projectId}`
+    if (!environments) {
+      await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
+        graphqlClient,
+        selectedVariable.id,
+        projectId
       );
+      Log.withTick(
+        `Linked variable ${chalk.bold(selectedVariable.name)} to project ${chalk.bold(
+          projectDisplayName
+        )} in ${selectedVariable.environments?.join(', ').toLocaleLowerCase()}.`
+      );
+      return;
     }
 
-    Log.withTick(
-      `Linked variable ${chalk.bold(linkedVariable.name)} to project ${chalk.bold(
-        projectDisplayName
-      )}.`
-    );
+    for (const environment of Object.values(EnvironmentVariableEnvironment)) {
+      try {
+        if (
+          selectedVariable.linkedEnvironments?.includes(environment) ===
+          environments.includes(environment)
+        ) {
+          if (!explicitSelect && environments.includes(environment)) {
+            Log.withTick(
+              `Variable ${chalk.bold(
+                selectedVariable.name
+              )} is already linked to ${environment.toLocaleLowerCase()}.`
+            );
+          }
+          continue;
+        }
+        if (environments.includes(environment)) {
+          await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
+            graphqlClient,
+            selectedVariable.id,
+            projectId,
+            environment
+          );
+          Log.withTick(
+            `Linked variable ${chalk.bold(selectedVariable.name)} to project ${chalk.bold(
+              projectDisplayName
+            )} in ${environment.toLocaleLowerCase()}.`
+          );
+        } else if (explicitSelect) {
+          await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
+            graphqlClient,
+            selectedVariable.id,
+            projectId,
+            environment
+          );
+          Log.withTick(
+            `Unlinked variable ${chalk.bold(selectedVariable.name)} from project ${chalk.bold(
+              projectDisplayName
+            )} in ${environment.toLocaleLowerCase()}.`
+          );
+        }
+      } catch (err: any) {
+        Log.warn(err.message);
+      }
+    }
   }
 }

packages/eas-cli/src/commands/env/list.ts

@@ -4,19 +4,66 @@ import chalk from 'chalk';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import {
-  EASEnvironmentFlag,
+  EASMultiEnvironmentFlag,
   EASVariableFormatFlag,
   EASVariableScopeFlag,
 } from '../../commandUtils/flags';
+import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../../graphql/generated';
 import {
-  EnvironmentVariableEnvironment,
-  EnvironmentVariableFragment,
-  EnvironmentVariableScope,
-} from '../../graphql/generated';
-import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
+  EnvironmentVariableWithFileContent,
+  EnvironmentVariablesQuery,
+} from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
-import { formatVariable } from '../../utils/formatVariable';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
+import {
+  formatVariable,
+  formatVariableValue,
+  performForEnvironmentsAsync,
+} from '../../utils/variableUtils';
+
+async function getVariablesForScopeAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    scope,
+    includingSensitive,
+    includeFileContent,
+    environment,
+    projectId,
+  }: {
+    scope: EnvironmentVariableScope;
+    includingSensitive: boolean;
+    includeFileContent: boolean;
+    environment?: EnvironmentVariableEnvironment;
+    projectId: string;
+  }
+): Promise<EnvironmentVariableWithFileContent[]> {
+  if (scope === EnvironmentVariableScope.Project) {
+    if (includingSensitive) {
+      return await EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(graphqlClient, {
+        appId: projectId,
+        environment,
+        includeFileContent,
+      });
+    }
+    return await EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
+      appId: projectId,
+      environment,
+      includeFileContent,
+    });
+  }
+
+  return includingSensitive
+    ? await EnvironmentVariablesQuery.sharedWithSensitiveAsync(graphqlClient, {
+        appId: projectId,
+        environment,
+        includeFileContent,
+      })
+    : await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
+        appId: projectId,
+        environment,
+        includeFileContent,
+      });
+}
 
 export default class EnvironmentValueList extends EasCommand {
   static override description = 'list environment variables for the current project';
@@ -33,14 +80,25 @@ export default class EnvironmentValueList extends EasCommand {
       description: 'Display sensitive values in the output',
       default: false,
     }),
+    'include-file-content': Flags.boolean({
+      description: 'Display files content in the output',
+      default: false,
+    }),
     ...EASVariableFormatFlag,
     ...EASVariableScopeFlag,
-    ...EASEnvironmentFlag,
+    ...EASMultiEnvironmentFlag,
   };
 
   async runAsync(): Promise<void> {
     let {
-      flags: { environment, format, scope, 'include-sensitive': includeSensitive },
+      flags: {
+        environment: environments,
+        format,
+        scope,
+        'include-sensitive': includeSensitive,
+        'include-file-content': includeFileContent,
+        'non-interactive': nonInteractive,
+      },
     } = await this.parse(EnvironmentValueList);
     const {
       privateProjectConfig: { projectId },
@@ -49,70 +107,43 @@ export default class EnvironmentValueList extends EasCommand {
       nonInteractive: true,
     });
 
-    if (scope === EnvironmentVariableScope.Project && !environment) {
-      environment = await promptVariableEnvironmentAsync(false);
+    if (!environments) {
+      environments = await promptVariableEnvironmentAsync({ nonInteractive, multiple: true });
     }
 
-    const variables = await this.getVariablesForScopeAsync(graphqlClient, {
-      scope,
-      includingSensitive: includeSensitive,
-      environment,
-      projectId,
-    });
+    await performForEnvironmentsAsync(environments, async environment => {
+      const variables = await getVariablesForScopeAsync(graphqlClient, {
+        scope,
+        includingSensitive: includeSensitive,
+        includeFileContent,
+        environment,
+        projectId,
+      });
 
-    if (format === 'short') {
-      for (const variable of variables) {
-        // TODO: Add Learn more link
+      Log.addNewLineIfNone();
+      if (environment) {
+        Log.log(chalk.bold(`Environment: ${environment.toLocaleLowerCase()}`));
+      }
+
+      if (variables.length === 0) {
+        Log.log('No variables found for this environment.');
+        return;
+      }
+
+      if (format === 'short') {
+        for (const variable of variables) {
+          Log.log(`${chalk.bold(variable.name)}=${formatVariableValue(variable)}`);
+        }
+      } else {
+        if (scope === EnvironmentVariableScope.Shared) {
+          Log.log(chalk.bold('Shared variables for this account:'));
+        } else {
+          Log.log(chalk.bold(`Variables for this project:`));
+        }
         Log.log(
-          `${chalk.bold(variable.name)}=${
-            variable.value ??
-            "***** (This is a secret env variable that can only be accessed on EAS builder and can't be read in any UI. Learn more.)"
-          }`
+          variables.map(variable => formatVariable(variable)).join(`\n\n${chalk.dim('———')}\n\n`)
         );
       }
-    } else {
-      if (scope === EnvironmentVariableScope.Shared) {
-        Log.log(chalk.bold('Shared variables for this account:'));
-      } else {
-        Log.log(chalk.bold(`Variables for this project for environment ${environment}:`));
-      }
-      Log.log(
-        variables.map(variable => formatVariable(variable)).join(`\n\n${chalk.dim('———')}\n\n`)
-      );
-    }
-  }
-
-  private async getVariablesForScopeAsync(
-    graphqlClient: ExpoGraphqlClient,
-    {
-      scope,
-      includingSensitive,
-      environment,
-      projectId,
-    }: {
-      scope: EnvironmentVariableScope;
-      includingSensitive: boolean;
-      environment?: EnvironmentVariableEnvironment;
-      projectId: string;
-    }
-  ): Promise<EnvironmentVariableFragment[]> {
-    if (scope === EnvironmentVariableScope.Project && environment) {
-      if (includingSensitive) {
-        return await EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(graphqlClient, {
-          appId: projectId,
-          environment,
-        });
-      }
-      return await EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
-        appId: projectId,
-        environment,
-      });
-    }
-
-    return includingSensitive
-      ? await EnvironmentVariablesQuery.sharedWithSensitiveAsync(graphqlClient, {
-          appId: projectId,
-        })
-      : await EnvironmentVariablesQuery.sharedAsync(graphqlClient, { appId: projectId });
+    });
   }
 }

packages/eas-cli/src/commands/env/pull.ts

@@ -34,7 +34,7 @@ export default class EnvironmentVariablePull extends EasCommand {
     } = await this.parse(EnvironmentVariablePull);
 
     if (!environment) {
-      environment = await promptVariableEnvironmentAsync(nonInteractive);
+      environment = await promptVariableEnvironmentAsync({ nonInteractive });
     }
     const {
       privateProjectConfig: { projectId },
@@ -63,7 +63,7 @@ export default class EnvironmentVariablePull extends EasCommand {
       }
     }
 
-    const filePrefix = `# Environment: ${environment}\n\n`;
+    const filePrefix = `# Environment: ${environment.toLocaleLowerCase()}\n\n`;
 
     const envFileContent = environmentVariables
       .map((variable: EnvironmentVariableFragment) => {

packages/eas-cli/src/commands/env/push.ts

@@ -3,7 +3,7 @@ import dotenv from 'dotenv';
 import fs from 'fs-extra';
 
 import EasCommand from '../../commandUtils/EasCommand';
-import { EASEnvironmentFlag } from '../../commandUtils/flags';
+import { EASMultiEnvironmentFlag } from '../../commandUtils/flags';
 import {
   EnvironmentVariableEnvironment,
   EnvironmentVariableFragment,
@@ -19,7 +19,7 @@ import Log from '../../log';
 import { confirmAsync, promptAsync } from '../../prompts';
 
 type PushFlags = {
-  environment?: EnvironmentVariableEnvironment;
+  environment?: EnvironmentVariableEnvironment[];
   path: string;
 };
 
@@ -34,7 +34,7 @@ export default class EnvironmentVariablePush extends EasCommand {
   };
 
   static override flags = {
-    ...EASEnvironmentFlag,
+    ...EASMultiEnvironmentFlag,
     path: Flags.string({
       description: 'Path to the input `.env` file',
       default: '.env.local',
@@ -44,7 +44,7 @@ export default class EnvironmentVariablePush extends EasCommand {
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(EnvironmentVariablePush);
 
-    const { environment, path: envPath } = this.validateFlags(flags);
+    const { environment: environments, path: envPath } = this.validateFlags(flags);
     const {
       privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
@@ -53,109 +53,119 @@ export default class EnvironmentVariablePush extends EasCommand {
     });
 
     const updateVariables: Record<string, EnvironmentVariablePushInput> =
-      await this.parseEnvFileAsync(envPath, environment);
+      await this.parseEnvFileAsync(envPath, environments);
 
     const variableNames = Object.keys(updateVariables);
 
-    const existingVariables = await EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
-      appId: projectId,
-      environment,
-      filterNames: variableNames,
-    });
+    for (const environment of environments) {
+      const displayedEnvironment = environment.toLocaleLowerCase();
+      const existingVariables = await EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
+        appId: projectId,
+        environment,
+        filterNames: variableNames,
+      });
 
-    const existingDifferentVariables: EnvironmentVariableFragment[] = [];
-    // Remove variables that are the same as the ones in the environment
-    existingVariables.forEach(variable => {
-      const existingVariableUpdate = updateVariables[variable.name];
-      if (existingVariableUpdate && existingVariableUpdate.value !== variable.value) {
-        existingDifferentVariables.push(variable);
-      } else {
-        delete updateVariables[variable.name];
-      }
-    });
+      const existingDifferentVariables: EnvironmentVariableFragment[] = [];
+      // Remove variables that are the same as the ones in the environment
+      existingVariables.forEach(existingVariable => {
+        const existingVariableUpdate = updateVariables[existingVariable.name];
 
-    const existingDifferentSharedVariables = existingDifferentVariables.filter(
-      variable => variable.scope === EnvironmentVariableScope.Shared
-    );
+        if (existingVariableUpdate) {
+          const hasMoreEnvironments = existingVariableUpdate.environments.some(
+            newEnv => !existingVariable.environments?.includes(newEnv)
+          );
 
-    if (existingDifferentSharedVariables.length > 0) {
-      const existingDifferentSharedVariablesNames = existingDifferentSharedVariables.map(
-        variable => variable.name
+          if (existingVariableUpdate.value !== existingVariable.value || hasMoreEnvironments) {
+            existingDifferentVariables.push(existingVariable);
+          } else {
+            delete updateVariables[existingVariable.name];
+          }
+        }
+      });
+
+      const existingDifferentSharedVariables = existingDifferentVariables.filter(
+        variable => variable.scope === EnvironmentVariableScope.Shared
       );
-      Log.error('Shared 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');
-    }
 
-    if (existingDifferentVariables.length > 0) {
-      Log.warn('Some variables already exist in the environment.');
-      const variableNames = existingDifferentVariables.map(variable => variable.name);
-
-      const confirmationMessage =
-        variableNames.length > 1
-          ? `The ${variableNames.join(
-              ', '
-            )} environment variables already exist in ${environment} environment. Do you want to override them all?`
-          : `The ${variableNames[0]} environment variable already exists in ${environment} environment. Do you want to override it?`;
-
-      const confirm = await confirmAsync({
-        message: confirmationMessage,
-      });
-
-      let variablesToOverwrite: string[] = [];
-
-      if (!confirm && existingDifferentVariables.length === 1) {
-        throw new Error('No new variables to push.');
-      }
-
-      if (confirm) {
-        variablesToOverwrite = existingDifferentVariables.map(variable => variable.name);
-      } else {
-        const promptResult = await promptAsync({
-          type: 'multiselect',
-          name: 'variablesToOverwrite',
-          message: 'Select variables to overwrite:',
-          // @ts-expect-error property missing from `@types/prompts`
-          optionsPerPage: 20,
-          choices: existingDifferentVariables.map(variable => ({
-            title: `${variable.name}: ${updateVariables[variable.name].value} (was ${
-              variable.value ?? '(secret)'
-            })`,
-            value: variable.name,
-          })),
+      if (existingDifferentSharedVariables.length > 0) {
+        const existingDifferentSharedVariablesNames = existingDifferentSharedVariables.map(
+          variable => variable.name
+        );
+        Log.error('Shared 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}`);
         });
-        variablesToOverwrite = promptResult.variablesToOverwrite;
+        throw new Error('Shared variables cannot be overwritten by eas env:push command');
       }
 
-      for (const existingVariable of existingVariables) {
-        const name = existingVariable.name;
-        if (variablesToOverwrite.includes(name)) {
-          updateVariables[name]['overwrite'] = true;
+      if (existingDifferentVariables.length > 0) {
+        Log.warn(`Some variables already exist in the ${displayedEnvironment} environment.`);
+        const variableNames = existingDifferentVariables.map(variable => variable.name);
+
+        const confirmationMessage =
+          variableNames.length > 1
+            ? `The ${variableNames.join(
+                ', '
+              )} environment variables already exist in ${displayedEnvironment} environment. Do you want to override them all?`
+            : `The ${variableNames[0]} environment variable already exists in ${displayedEnvironment} environment. Do you want to override it?`;
+
+        const confirm = await confirmAsync({
+          message: confirmationMessage,
+        });
+
+        let variablesToOverwrite: string[] = [];
+
+        if (!confirm && existingDifferentVariables.length === 0) {
+          throw new Error('No new variables to push.');
+        }
+
+        if (confirm) {
+          variablesToOverwrite = existingDifferentVariables.map(variable => variable.name);
         } else {
-          delete updateVariables[name];
+          const promptResult = await promptAsync({
+            type: 'multiselect',
+            name: 'variablesToOverwrite',
+            message: 'Select variables to overwrite:',
+            // @ts-expect-error property missing from `@types/prompts`
+            optionsPerPage: 20,
+            choices: existingDifferentVariables.map(variable => ({
+              title: `${variable.name}: ${updateVariables[variable.name].value} (was ${
+                variable.value ?? '(secret)'
+              })`,
+              value: variable.name,
+            })),
+          });
+          variablesToOverwrite = promptResult.variablesToOverwrite;
+        }
+
+        for (const existingVariable of existingVariables) {
+          const name = existingVariable.name;
+          if (variablesToOverwrite.includes(name)) {
+            updateVariables[name]['overwrite'] = true;
+          } else {
+            delete updateVariables[name];
+          }
         }
       }
-    }
 
-    // Check if any of the sensitive variables already exist in the environment. Prompt the user to overwrite them.
-    const existingSensitiveVariables = existingVariables.filter(
-      variable => variable.value === null
-    );
-
-    if (existingSensitiveVariables.length > 0) {
-      const existingSensitiveVariablesNames = existingSensitiveVariables.map(
-        variable => `- ${variable.name}`
+      // Check if any of the sensitive variables already exist in the environment. Prompt the user to overwrite them.
+      const existingSensitiveVariables = existingVariables.filter(
+        variable => variable.visibility !== EnvironmentVariableVisibility.Public
       );
-      const confirm = await confirmAsync({
-        message: `You are about to overwrite sensitive variables.\n${existingSensitiveVariablesNames.join(
-          '\n'
-        )}\n Do you want to continue?`,
-      });
-      if (!confirm) {
-        throw new Error('Aborting...');
+
+      if (existingSensitiveVariables.length > 0) {
+        const existingSensitiveVariablesNames = existingSensitiveVariables.map(
+          variable => `- ${variable.name}`
+        );
+        const confirm = await confirmAsync({
+          message: `You are about to overwrite sensitive variables.\n${existingSensitiveVariablesNames.join(
+            '\n'
+          )}\n Do you want to continue?`,
+        });
+        if (!confirm) {
+          throw new Error('Aborting...');
+        }
       }
     }
 
@@ -171,13 +181,12 @@ export default class EnvironmentVariablePush extends EasCommand {
       variablesToPush,
       projectId
     );
-
-    Log.log(`Uploaded env file to ${environment} environment.`);
+    Log.log(`Uploaded env file to ${environments.join(', ').toLocaleLowerCase()}.`);
   }
 
   private async parseEnvFileAsync(
     envPath: string,
-    environment: string
+    environments: EnvironmentVariableEnvironment[]
   ): Promise<Record<string, EnvironmentVariablePushInput>> {
     if (!(await fs.exists(envPath))) {
       throw new Error(`File ${envPath} does not exist.`);
@@ -190,7 +199,7 @@ export default class EnvironmentVariablePush extends EasCommand {
       pushInput[name] = {
         name,
         value,
-        environment,
+        environments,
         visibility: name.startsWith('EXPO_SENSITIVE')
           ? EnvironmentVariableVisibility.Sensitive
           : EnvironmentVariableVisibility.Public,
@@ -201,7 +210,7 @@ export default class EnvironmentVariablePush extends EasCommand {
   }
 
   private validateFlags(flags: PushFlags): Required<PushFlags> {
-    if (!flags.environment) {
+    if (!flags.environment || flags.environment.length === 0) {
       throw new Error('Please provide an environment to push the env file to.');
     }
 

packages/eas-cli/src/commands/env/unlink.ts

@@ -2,14 +2,15 @@ import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
 import EasCommand from '../../commandUtils/EasCommand';
-import { EASEnvironmentFlag, EASNonInteractiveFlag } from '../../commandUtils/flags';
-import { EnvironmentVariableScope } from '../../graphql/generated';
+import { EASMultiEnvironmentFlag, EASNonInteractiveFlag } from '../../commandUtils/flags';
+import { EnvironmentVariableEnvironment } from '../../graphql/generated';
 import { EnvironmentVariableMutation } from '../../graphql/mutations/EnvironmentVariableMutation';
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { selectAsync } from '../../prompts';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
+import { formatVariableName } from '../../utils/variableUtils';
 
 export default class EnvironmentVariableUnlink extends EasCommand {
   static override description = 'unlink a shared environment variable to the current project';
@@ -17,10 +18,10 @@ export default class EnvironmentVariableUnlink extends EasCommand {
   static override hidden = true;
 
   static override flags = {
-    name: Flags.string({
+    'variable-name': Flags.string({
       description: 'Name of the variable',
     }),
-    ...EASEnvironmentFlag,
+    ...EASMultiEnvironmentFlag,
     ...EASNonInteractiveFlag,
   };
 
@@ -31,7 +32,11 @@ export default class EnvironmentVariableUnlink extends EasCommand {
 
   async runAsync(): Promise<void> {
     let {
-      flags: { name, 'non-interactive': nonInteractive, environment },
+      flags: {
+        'variable-name': name,
+        'non-interactive': nonInteractive,
+        environment: unlinkEnvironments,
+      },
     } = await this.parse(EnvironmentVariableUnlink);
     const {
       privateProjectConfig: { projectId },
@@ -40,57 +45,102 @@ export default class EnvironmentVariableUnlink extends EasCommand {
       nonInteractive,
     });
 
-    if (!environment) {
-      environment = await promptVariableEnvironmentAsync(nonInteractive);
-    }
-
     const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
-
-    const appVariables = await EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
+    const variables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
       appId: projectId,
-      environment,
+      filterNames: name ? [name] : undefined,
     });
-    const linkedVariables = appVariables.filter(
-      ({ scope }) => scope === EnvironmentVariableScope.Shared
-    );
 
-    if (linkedVariables.length === 0) {
-      throw new Error(`There are no linked shared env variables for project ${projectDisplayName}`);
-    }
+    let selectedVariable = variables[0];
 
-    if (!name) {
-      name = await selectAsync(
-        'Select shared variable to unlink',
-        linkedVariables.map(variable => ({
-          title: variable.name,
-          value: variable.name,
+    if (variables.length > 1) {
+      if (nonInteractive) {
+        throw new Error("Multiple variables found, please select one using '--variable-name'");
+      }
+      selectedVariable = await selectAsync(
+        'Select shared variable',
+        variables.map(variable => ({
+          title: formatVariableName(variable),
+          value: variable,
         }))
       );
     }
 
-    const selectedVariable = linkedVariables.find(variable => variable.name === name);
-
     if (!selectedVariable) {
       throw new Error(`Shared variable ${name} doesn't exist`);
     }
 
-    const unlinkedVariable = await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
-      graphqlClient,
-      selectedVariable.id,
-      projectId,
-      environment
-    );
+    let explicitSelect = false;
 
-    if (!unlinkedVariable) {
-      throw new Error(
-        `Could not unlink variable with name ${selectedVariable.name} from project ${projectDisplayName}`
+    if (!nonInteractive && !unlinkEnvironments) {
+      const selectedEnvironments =
+        (selectedVariable.linkedEnvironments ?? []).length > 0
+          ? selectedVariable.linkedEnvironments
+          : selectedVariable.environments;
+      const environments = await promptVariableEnvironmentAsync({
+        nonInteractive,
+        multiple: true,
+        selectedEnvironments: selectedEnvironments ?? [],
+      });
+      explicitSelect = true;
+      unlinkEnvironments = Object.values(EnvironmentVariableEnvironment).filter(
+        env => !environments.includes(env)
       );
     }
 
-    Log.withTick(
-      `Unlinked variable ${chalk.bold(unlinkedVariable.name)} from the project ${chalk.bold(
-        projectDisplayName
-      )}.`
-    );
+    if (!unlinkEnvironments) {
+      await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
+        graphqlClient,
+        selectedVariable.id,
+        projectId
+      );
+      Log.withTick(
+        `Unlinked variable ${chalk.bold(selectedVariable.name)} from project ${chalk.bold(
+          projectDisplayName
+        )} in ${selectedVariable.environments?.join(', ').toLocaleLowerCase()}.`
+      );
+      return;
+    }
+
+    for (const environment of Object.values(EnvironmentVariableEnvironment)) {
+      if (
+        selectedVariable.linkedEnvironments?.includes(environment) !==
+        unlinkEnvironments.includes(environment)
+      ) {
+        if (!explicitSelect && unlinkEnvironments.includes(environment)) {
+          Log.withTick(
+            `Variable ${chalk.bold(
+              selectedVariable.name
+            )} is already unlinked from ${environment.toLocaleLowerCase()}.`
+          );
+        }
+        continue;
+      }
+      if (unlinkEnvironments.includes(environment)) {
+        await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
+          graphqlClient,
+          selectedVariable.id,
+          projectId,
+          environment
+        );
+        Log.withTick(
+          `Unlinked variable ${chalk.bold(selectedVariable.name)} from project ${chalk.bold(
+            projectDisplayName
+          )} in ${environment.toLocaleLowerCase()}.`
+        );
+      } else if (explicitSelect) {
+        await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
+          graphqlClient,
+          selectedVariable.id,
+          projectId,
+          environment
+        );
+        Log.withTick(
+          `Linked variable ${chalk.bold(selectedVariable.name)} to project ${chalk.bold(
+            projectDisplayName
+          )} in ${environment.toLocaleLowerCase()}.`
+        );
+      }
+    }
   }
 }

packages/eas-cli/src/commands/env/update.ts

@@ -1,14 +1,24 @@
 import { Flags } from '@oclif/core';
+import assert from 'assert';
 import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import {
-  EASEnvironmentFlag,
+  EASMultiEnvironmentFlag,
   EASNonInteractiveFlag,
   EASVariableScopeFlag,
   EASVariableVisibilityFlag,
+  EasEnvironmentFlagParameters,
 } from '../../commandUtils/flags';
-import { EnvironmentVariableScope, EnvironmentVariableVisibility } from '../../graphql/generated';
+import {
+  EnvironmentSecretType,
+  EnvironmentVariableEnvironment,
+  EnvironmentVariableFragment,
+  EnvironmentVariableScope,
+  EnvironmentVariableVisibility,
+} from '../../graphql/generated';
 import { EnvironmentVariableMutation } from '../../graphql/mutations/EnvironmentVariableMutation';
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
@@ -17,14 +27,25 @@ import {
   getOwnerAccountForProjectIdAsync,
 } from '../../project/projectUtils';
 import { selectAsync } from '../../prompts';
-import { promptVariableEnvironmentAsync, promptVariableValueAsync } from '../../utils/prompts';
+import {
+  parseVisibility,
+  promptVariableEnvironmentAsync,
+  promptVariableNameAsync,
+  promptVariableTypeAsync,
+  promptVariableValueAsync,
+  promptVariableVisibilityAsync,
+} from '../../utils/prompts';
+import { formatVariableName } from '../../utils/variableUtils';
 
 type UpdateFlags = {
   name?: string;
   value?: string;
   scope?: EnvironmentVariableScope;
-  environment?: string;
-  visibility?: EnvironmentVariableVisibility;
+  environment?: EnvironmentVariableEnvironment[];
+  visibility?: 'plaintext' | 'sensitive' | 'encrypted';
+  type?: 'string' | 'file';
+  'variable-name'?: string;
+  'variable-environment'?: EnvironmentVariableEnvironment;
   'non-interactive': boolean;
 };
 
@@ -35,15 +56,26 @@ export default class EnvironmentVariableUpdate extends EasCommand {
   static override hidden = true;
 
   static override flags = {
+    'variable-name': Flags.string({
+      description: 'Current name of the variable',
+    }),
+    'variable-environment': Flags.enum<EnvironmentVariableEnvironment>({
+      ...EasEnvironmentFlagParameters,
+      description: 'Current environment of the variable to update',
+    }),
     name: Flags.string({
-      description: 'Name of the variable',
+      description: 'New name of the variable',
     }),
     value: Flags.string({
-      description: 'Text value or the variable',
+      description: 'New value or the variable',
+    }),
+    type: Flags.enum<'string' | 'file'>({
+      description: 'The type of variable',
+      options: ['string', 'file'],
     }),
     ...EASVariableVisibilityFlag,
     ...EASVariableScopeFlag,
-    ...EASEnvironmentFlag,
+    ...EASMultiEnvironmentFlag,
     ...EASNonInteractiveFlag,
   };
 
@@ -55,12 +87,15 @@ export default class EnvironmentVariableUpdate extends EasCommand {
 
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(EnvironmentVariableUpdate);
-    let {
+    const {
       name,
-      value,
+      value: rawValue,
       scope,
+      'variable-name': currentName,
+      'variable-environment': currentEnvironment,
       'non-interactive': nonInteractive,
-      environment,
+      environment: environments,
+      type,
       visibility,
     } = this.validateFlags(flags);
 
@@ -76,132 +111,204 @@ export default class EnvironmentVariableUpdate extends EasCommand {
       getOwnerAccountForProjectIdAsync(graphqlClient, projectId),
     ]);
 
+    let selectedVariable: EnvironmentVariableFragment;
+    let existingVariables: EnvironmentVariableFragment[] = [];
+    const suffix =
+      scope === EnvironmentVariableScope.Project
+        ? `on project ${projectDisplayName}`
+        : `on account ${ownerAccount.name}`;
+
     if (scope === EnvironmentVariableScope.Project) {
-      if (!environment) {
-        environment = await promptVariableEnvironmentAsync(nonInteractive);
-      }
-      const existingVariables = await EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
+      existingVariables = await EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
         appId: projectId,
-        environment,
+        environment: currentEnvironment,
+        filterNames: currentName ? [currentName] : undefined,
       });
-      if (!name) {
-        name = await selectAsync(
-          'Select variable',
-          existingVariables.map(variable => ({
-            title: variable.name,
-            value: variable.name,
-          }))
-        );
-      }
-
-      const existingVariable = existingVariables.find(variable => variable.name === name);
-      if (!existingVariable) {
-        throw new Error(
-          `Variable with name ${name} does not exist on project ${projectDisplayName}`
-        );
-      }
-
-      if (!value) {
-        value = await promptVariableValueAsync({
-          nonInteractive,
-          required: false,
-          initial: existingVariable.value,
-        });
-        if (!value || value.length === 0) {
-          value = '';
-        }
-      }
-
-      const variable = await EnvironmentVariableMutation.createForAppAsync(
-        graphqlClient,
-        {
-          name,
-          value,
-          environment,
-          visibility,
-          overwrite: true,
-        },
-        projectId
-      );
-      if (!variable) {
-        throw new Error(
-          `Could not update variable with name ${name} on project ${projectDisplayName}`
-        );
-      }
-
-      Log.withTick(
-        `Updated variable ${chalk.bold(name)} on project ${chalk.bold(projectDisplayName)}.`
-      );
-    } else if (scope === EnvironmentVariableScope.Shared) {
-      const sharedVariables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
-        appId: projectId,
-      });
-
-      if (!name) {
-        name = await selectAsync(
-          'Select variable',
-          sharedVariables.map(variable => ({
-            title: variable.name,
-            value: variable.name,
-          }))
-        );
-      }
-
-      const existingVariable = sharedVariables.find(variable => variable.name === name);
-      if (!existingVariable) {
-        throw new Error(
-          "Variable with this name  doesn't exist on this account. Use a different name."
-        );
-      }
-
-      if (!value) {
-        value = await promptVariableValueAsync({
-          nonInteractive,
-          required: false,
-          initial: existingVariable.value,
-        });
-        if (!value || value.length === 0) {
-          value = '';
-        }
-      }
-
-      const variable = await EnvironmentVariableMutation.createSharedVariableAsync(
-        graphqlClient,
-        {
-          name,
-          value,
-          visibility,
-          overwrite: true,
-        },
-        ownerAccount.id
-      );
-
-      if (!variable) {
-        throw new Error(
-          `Could not update variable with name ${name} on account ${ownerAccount.name}`
-        );
-      }
-
-      Log.withTick(
-        `Updated shared variable ${chalk.bold(name)} on account ${chalk.bold(ownerAccount.name)}.`
-      );
     }
+
+    if (scope === EnvironmentVariableScope.Shared) {
+      existingVariables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
+        appId: projectId,
+        environment: currentEnvironment,
+        filterNames: currentName ? [currentName] : undefined,
+      });
+    }
+
+    if (existingVariables.length === 0) {
+      throw new Error(
+        `Variable with name ${currentName} ${
+          currentEnvironment ? `in environment ${currentEnvironment.toLocaleLowerCase()}` : ''
+        } does not exist ${suffix}.`
+      );
+    } else if (existingVariables.length > 1) {
+      selectedVariable = await selectAsync(
+        'Select variable',
+        existingVariables.map(variable => ({
+          title: formatVariableName(variable),
+          value: variable,
+        }))
+      );
+    } else {
+      selectedVariable = existingVariables[0];
+    }
+
+    assert(selectedVariable, 'Variable must be selected');
+
+    const {
+      name: newName,
+      value: newValue,
+      environment: newEnvironments,
+      visibility: newVisibility,
+      type: newType,
+    } = await this.promptForMissingFlagsAsync(selectedVariable, {
+      name,
+      value: rawValue,
+      environment: environments,
+      visibility,
+      'non-interactive': nonInteractive,
+      type,
+    });
+
+    const variable = await EnvironmentVariableMutation.updateAsync(graphqlClient, {
+      id: selectedVariable.id,
+      name: newName,
+      value: newValue,
+      environments: newEnvironments,
+      type: newType,
+      visibility: newVisibility,
+    });
+    if (!variable) {
+      throw new Error(`Could not update variable with name ${name} ${suffix}`);
+    }
+
+    Log.withTick(`Updated variable ${chalk.bold(selectedVariable.name)} ${suffix}.`);
   }
   private validateFlags(flags: UpdateFlags): UpdateFlags {
     if (flags['non-interactive']) {
-      if (!flags.name) {
+      if (!flags['variable-name']) {
         throw new Error(
-          'Variable name is required in non-interactive mode. Run the command with --name flag.'
+          'Current name is required in non-interactive mode. Run the command with --variable-name flag.'
         );
       }
-
-      if (flags.scope === EnvironmentVariableScope.Project && !flags.environment) {
-        throw new Error(
-          'Environment is required when updating project-wide variable in non-interactive mode. Run the command with --environment flag.'
-        );
+      if (flags['type'] && !flags['value']) {
+        throw new Error('Value is required when type is set. Run the command with --value flag.');
       }
     }
 
     return flags;
   }
+
+  private async promptForMissingFlagsAsync(
+    selectedVariable: EnvironmentVariableFragment,
+    {
+      name,
+      value,
+      environment: environments,
+      visibility,
+      'non-interactive': nonInteractive,
+      type,
+      ...rest
+    }: UpdateFlags
+  ): Promise<
+    Omit<UpdateFlags, 'type' | 'visibility'> & {
+      type?: EnvironmentSecretType;
+      visibility?: EnvironmentVariableVisibility;
+    }
+  > {
+    let newType;
+    let newVisibility: EnvironmentVariableVisibility | undefined;
+
+    if (type === 'file') {
+      newType = EnvironmentSecretType.FileBase64;
+    } else if (type === 'string') {
+      newType = EnvironmentSecretType.String;
+    }
+
+    if (!nonInteractive) {
+      if (!name) {
+        name = await promptVariableNameAsync(nonInteractive, selectedVariable.name);
+
+        if (!name || name.length === 0) {
+          name = undefined;
+        }
+      }
+
+      if (!type && !value && !nonInteractive) {
+        newType = await promptVariableTypeAsync(nonInteractive, selectedVariable.type);
+
+        if (!newType || newType === selectedVariable.type) {
+          newType = undefined;
+        }
+      }
+
+      if (!value) {
+        value = await promptVariableValueAsync({
+          nonInteractive,
+          required: false,
+          filePath: (newType ?? selectedVariable.type) === EnvironmentSecretType.FileBase64,
+          initial:
+            (newType ?? selectedVariable.type) === EnvironmentSecretType.FileBase64
+              ? undefined
+              : selectedVariable.value,
+        });
+
+        if (!value || value.length === 0 || value === selectedVariable.value) {
+          value = undefined;
+        }
+      }
+
+      let environmentFilePath: string | undefined;
+
+      if ((newType ?? selectedVariable.type) === EnvironmentSecretType.FileBase64 && value) {
+        environmentFilePath = path.resolve(value);
+        if (!(await fs.pathExists(environmentFilePath))) {
+          throw new Error(`File "${value}" does not exist`);
+        }
+      }
+
+      value = environmentFilePath ? await fs.readFile(environmentFilePath, 'base64') : value;
+
+      if (!environments || environments.length === 0) {
+        environments = await promptVariableEnvironmentAsync({
+          nonInteractive,
+          multiple: true,
+          selectedEnvironments: selectedVariable.environments ?? [],
+        });
+
+        if (
+          !environments ||
+          environments.length === 0 ||
+          environments === selectedVariable.environments
+        ) {
+          environments = undefined;
+        }
+      }
+
+      if (!visibility) {
+        newVisibility = await promptVariableVisibilityAsync(
+          nonInteractive,
+          selectedVariable.visibility
+        );
+
+        if (!newVisibility || newVisibility === selectedVariable.visibility) {
+          newVisibility = undefined;
+        }
+      }
+    }
+
+    if (visibility) {
+      newVisibility = parseVisibility(visibility);
+    }
+
+    return {
+      name,
+      value,
+      environment: environments,
+      visibility: newVisibility,
+      scope: rest.scope ?? EnvironmentVariableScope.Project,
+      'non-interactive': nonInteractive,
+      type: newType,
+      ...rest,
+    };
+  }
 }

packages/eas-cli/src/commands/project/init.ts

@@ -1,5 +1,4 @@
-import { ConfigError, getProjectConfigDescription } from '@expo/config';
-import { ExpoConfig } from '@expo/config-types';
+import { ConfigError, ExpoConfig, getProjectConfigDescription } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';

packages/eas-cli/src/commands/project/onboarding.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { AppVersionSource, EasJson } from '@expo/eas-json';
 import chalk from 'chalk';

packages/eas-cli/src/commands/submit/internal.ts

@@ -0,0 +1,217 @@
+import { Platform, SubmissionConfig } from '@expo/eas-build-job';
+import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
+import { Flags } from '@oclif/core';
+import nullthrows from 'nullthrows';
+import { z } from 'zod';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import {
+  AndroidSubmissionConfigInput,
+  IosSubmissionConfigInput,
+  SubmissionAndroidReleaseStatus,
+  SubmissionAndroidTrack,
+} from '../../graphql/generated';
+import { AppStoreConnectApiKeyQuery } from '../../graphql/queries/AppStoreConnectApiKeyQuery';
+import { GoogleServiceAccountKeyQuery } from '../../graphql/queries/GoogleServiceAccountKeyQuery';
+import AndroidSubmitCommand from '../../submit/android/AndroidSubmitCommand';
+import { SubmissionContext, createSubmissionContextAsync } from '../../submit/context';
+import IosSubmitCommand from '../../submit/ios/IosSubmitCommand';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import GitNoCommitClient from '../../vcs/clients/gitNoCommit';
+
+/**
+ * This command will be run on the EAS workers.
+ * This command resolves credentials and other
+ * configuration, that normally would be included in the
+ * job and metadata objects, and prints them to stdout.
+ */
+export default class SubmitInternal extends EasCommand {
+  static override hidden = true;
+
+  static override flags = {
+    platform: Flags.enum<Platform>({
+      options: [Platform.ANDROID, Platform.IOS],
+      required: true,
+    }),
+    profile: Flags.string({
+      description:
+        'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
+    }),
+    id: Flags.string({
+      description: 'ID of the build to submit',
+      required: true,
+    }),
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.Analytics,
+    ...this.ContextOptions.Vcs,
+  };
+
+  async runAsync(): Promise<void> {
+    const { flags } = await this.parse(SubmitInternal);
+    // This command is always run with implicit --non-interactive and --json options
+    enableJsonOutput();
+
+    const {
+      loggedIn: { actor, graphqlClient },
+      privateProjectConfig: { exp, projectId, projectDir },
+      analytics,
+      vcsClient,
+    } = await this.getContextAsync(SubmitInternal, {
+      nonInteractive: true,
+      vcsClientOverride: new GitNoCommitClient(),
+    });
+
+    const submissionProfile = await EasJsonUtils.getSubmitProfileAsync(
+      EasJsonAccessor.fromProjectPath(projectDir),
+      flags.platform,
+      flags.profile
+    );
+
+    const ctx = await createSubmissionContextAsync({
+      platform: flags.platform,
+      projectDir,
+      profile: submissionProfile,
+      archiveFlags: {
+        id: flags.id,
+      },
+      nonInteractive: true,
+      isVerboseFastlaneEnabled: false,
+      actor,
+      graphqlClient,
+      analytics,
+      exp,
+      projectId,
+      vcsClient,
+      specifiedProfile: flags.profile,
+    });
+
+    let config;
+
+    if (ctx.platform === Platform.IOS) {
+      const command = new IosSubmitCommand(ctx as SubmissionContext<Platform.IOS>);
+      const submitter = await command.runAsync();
+      const mutationInput = await submitter.getSubmissionInputAsync();
+      const iosConfig = mutationInput.submissionConfig;
+
+      const ascApiKeyJson = await getAppStoreConnectApiKeyJsonAsync({
+        iosConfig,
+        graphqlClient,
+      });
+
+      const configInput: z.input<typeof SubmissionConfig.Ios.SchemaZ> = {
+        ascAppIdentifier: iosConfig.ascAppIdentifier,
+        isVerboseFastlaneEnabled: iosConfig.isVerboseFastlaneEnabled ?? undefined,
+        ...(ascApiKeyJson
+          ? { ascApiJsonKey: ascApiKeyJson }
+          : {
+              appleIdUsername: nullthrows(iosConfig.appleIdUsername),
+              appleAppSpecificPassword: nullthrows(iosConfig.appleAppSpecificPassword),
+            }),
+      };
+
+      config = SubmissionConfig.Ios.SchemaZ.parse(configInput);
+    } else if (ctx.platform === Platform.ANDROID) {
+      const command = new AndroidSubmitCommand(ctx as SubmissionContext<Platform.ANDROID>);
+      const submitter = await command.runAsync();
+      const mutationInput = await submitter.getSubmissionInputAsync();
+      const androidConfig = mutationInput.submissionConfig;
+
+      const changesNotSentForReview = androidConfig.changesNotSentForReview ?? undefined;
+      const releaseStatus = androidConfig.releaseStatus
+        ? graphQlReleaseStatusToConfigReleaseStatus[androidConfig.releaseStatus]
+        : undefined;
+      const googleServiceAccountKeyJson = nullthrows(
+        await getGoogleServiceAccountKeyJsonAsync({
+          androidConfig,
+          graphqlClient,
+        })
+      );
+      const track = graphQlTrackToConfigTrack[androidConfig.track];
+
+      const configInput: z.input<typeof SubmissionConfig.Android.SchemaZ> = {
+        changesNotSentForReview,
+        googleServiceAccountKeyJson,
+        track,
+        ...(releaseStatus === SubmissionConfig.Android.ReleaseStatus.IN_PROGRESS
+          ? {
+              releaseStatus: SubmissionConfig.Android.ReleaseStatus.IN_PROGRESS,
+              rollout: androidConfig.rollout ?? undefined,
+            }
+          : { releaseStatus }),
+      };
+
+      config = SubmissionConfig.Android.SchemaZ.parse(configInput);
+    } else {
+      throw new Error(`Unsupported platform: ${ctx.platform}`);
+    }
+
+    printJsonOnlyOutput({ config });
+  }
+}
+
+async function getGoogleServiceAccountKeyJsonAsync({
+  androidConfig,
+  graphqlClient,
+}: {
+  androidConfig: AndroidSubmissionConfigInput;
+  graphqlClient: ExpoGraphqlClient;
+}): Promise<string | null> {
+  if (androidConfig.googleServiceAccountKeyJson) {
+    return androidConfig.googleServiceAccountKeyJson;
+  } else if (androidConfig.googleServiceAccountKeyId) {
+    const key = await GoogleServiceAccountKeyQuery.getByIdAsync(
+      graphqlClient,
+      androidConfig.googleServiceAccountKeyId
+    );
+
+    return key.keyJson;
+  }
+
+  return null;
+}
+
+async function getAppStoreConnectApiKeyJsonAsync({
+  iosConfig,
+  graphqlClient,
+}: {
+  iosConfig: IosSubmissionConfigInput;
+  graphqlClient: ExpoGraphqlClient;
+}): Promise<string | null> {
+  if (iosConfig.ascApiKey) {
+    return JSON.stringify({
+      key_id: iosConfig.ascApiKey.keyIdentifier,
+      issuer_id: iosConfig.ascApiKey.issuerIdentifier,
+      key: iosConfig.ascApiKey.keyP8,
+    });
+  } else if (iosConfig.ascApiKeyId) {
+    const key = await AppStoreConnectApiKeyQuery.getByIdAsync(graphqlClient, iosConfig.ascApiKeyId);
+
+    return JSON.stringify({
+      key_id: key.keyIdentifier,
+      issuer_id: key.issuerIdentifier,
+      key: key.keyP8,
+    });
+  }
+
+  return null;
+}
+
+const graphQlReleaseStatusToConfigReleaseStatus = {
+  [SubmissionAndroidReleaseStatus.Draft]: SubmissionConfig.Android.ReleaseStatus.DRAFT,
+  [SubmissionAndroidReleaseStatus.InProgress]: SubmissionConfig.Android.ReleaseStatus.IN_PROGRESS,
+  [SubmissionAndroidReleaseStatus.Completed]: SubmissionConfig.Android.ReleaseStatus.COMPLETED,
+  [SubmissionAndroidReleaseStatus.Halted]: SubmissionConfig.Android.ReleaseStatus.HALTED,
+};
+
+const graphQlTrackToConfigTrack = {
+  [SubmissionAndroidTrack.Production]: SubmissionConfig.Android.ReleaseTrack.PRODUCTION,
+  [SubmissionAndroidTrack.Beta]: SubmissionConfig.Android.ReleaseTrack.BETA,
+  [SubmissionAndroidTrack.Alpha]: SubmissionConfig.Android.ReleaseTrack.ALPHA,
+  [SubmissionAndroidTrack.Internal]: SubmissionConfig.Android.ReleaseTrack.INTERNAL,
+};

packages/eas-cli/src/commands/update/__tests__/index.test.ts

@@ -21,7 +21,7 @@ import { UpdateFragment } from '../../../graphql/generated';
 import { PublishMutation } from '../../../graphql/mutations/PublishMutation';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { collectAssetsAsync, uploadAssetsAsync } from '../../../project/publish';
-import { getBranchNameFromChannelNameAsync } from '../../../update/getBranchNameFromChannelNameAsync';
+import { getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync } from '../../../update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync';
 import { resolveVcsClient } from '../../../vcs';
 
 const projectRoot = '/test-project';
@@ -47,7 +47,7 @@ jest.mock('@expo/config-plugins');
 jest.mock('../../../branch/queries');
 jest.mock('../../../commandUtils/context/contextUtils/getProjectIdAsync');
 jest.mock('../../../update/configure');
-jest.mock('../../../update/getBranchNameFromChannelNameAsync');
+jest.mock('../../../update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync');
 jest.mock('../../../graphql/mutations/PublishMutation');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../graphql/queries/UpdateQuery');
@@ -106,7 +106,9 @@ describe(UpdatePublish.name, () => {
     const { projectId } = mockTestProject();
     const { platforms, runtimeVersion } = mockTestExport();
 
-    jest.mocked(getBranchNameFromChannelNameAsync).mockResolvedValue('branchFromChannel');
+    jest
+      .mocked(getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync)
+      .mockResolvedValue({ branchId: 'branch123', branchName: 'branchFromChannel' });
     jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
       branchId: 'branch123',
       createdBranch: false,

packages/eas-cli/src/commands/update/__tests__/republish.test.ts

@@ -11,8 +11,9 @@ import { jester } from '../../../credentials/__tests__/fixtures-constants';
 import { UpdateFragment } from '../../../graphql/generated';
 import { PublishMutation } from '../../../graphql/mutations/PublishMutation';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
+import { BranchQuery } from '../../../graphql/queries/BranchQuery';
 import { UpdateQuery } from '../../../graphql/queries/UpdateQuery';
-import { getBranchNameFromChannelNameAsync } from '../../../update/getBranchNameFromChannelNameAsync';
+import { getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync } from '../../../update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync';
 import { selectUpdateGroupOnBranchAsync } from '../../../update/queries';
 import {
   getCodeSigningInfoAsync,
@@ -44,7 +45,8 @@ jest.mock('../../../commandUtils/context/contextUtils/getProjectIdAsync');
 jest.mock('../../../graphql/mutations/PublishMutation');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../graphql/queries/UpdateQuery');
-jest.mock('../../../update/getBranchNameFromChannelNameAsync');
+jest.mock('../../../graphql/queries/BranchQuery');
+jest.mock('../../../update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync');
 jest.mock('../../../update/queries');
 jest.mock('../../../ora', () => ({
   ora: () => ({
@@ -57,6 +59,7 @@ jest.mock('../../../fetch');
 describe(UpdateRepublish.name, () => {
   afterEach(() => {
     vol.reset();
+    jest.resetAllMocks();
   });
 
   it('errors when providing both --group and --branch', async () => {
@@ -89,6 +92,16 @@ describe(UpdateRepublish.name, () => {
     );
   });
 
+  it('errors when providing both --destination-channel and --destination-branch', async () => {
+    const flags = ['--group=1234', '--destination-channel=test', '--destination-branch=wat'];
+
+    mockTestProject();
+
+    await expect(new UpdateRepublish(flags, commandOptions).run()).rejects.toThrow(
+      /--destination-branch=wat cannot also be provided when using --destination-channel/
+    );
+  });
+
   it('errors when update group is empty', async () => {
     const flags = ['--group=1234'];
 
@@ -271,7 +284,9 @@ describe(UpdateRepublish.name, () => {
 
     mockTestProject();
     // Mock resolving the channel to branch name, only valid for a single branch connected
-    jest.mocked(getBranchNameFromChannelNameAsync).mockResolvedValue('branchFromChannel');
+    jest
+      .mocked(getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync)
+      .mockResolvedValue({ branchId: updateStub.branch.id, branchName: 'branchFromChannel' });
     // Mock the prompt to ask the user which update to republish, from branch
     jest.mocked(selectUpdateGroupOnBranchAsync).mockResolvedValue([updateStub]);
     // Mock mutations to store the new update
@@ -306,6 +321,94 @@ describe(UpdateRepublish.name, () => {
       ])
     );
   });
+
+  it('republishes to a different branch when --destination-branch is supplied', async () => {
+    const flags = ['--branch=branch123', '--message=test-republish', '--destination-branch=other'];
+
+    mockTestProject();
+    // Mock the prompt to ask the user which update to republish, from branch
+    jest.mocked(selectUpdateGroupOnBranchAsync).mockResolvedValue([updateStub]);
+    // Mock mutations to store the new update
+    jest.mocked(PublishMutation.publishUpdateGroupAsync).mockResolvedValue([
+      {
+        ...updateStub,
+        branch: { id: 'other-id', name: 'other' },
+        id: 'update-new',
+        platform: 'ios',
+        manifestPermalink: 'https://expo.dev/@test/test-project/manifest',
+      },
+    ]);
+    jest.mocked(BranchQuery.getBranchByNameAsync).mockResolvedValue({
+      id: 'other-id',
+      name: 'other',
+    });
+
+    await new UpdateRepublish(flags, commandOptions).run();
+
+    expect(selectUpdateGroupOnBranchAsync).toHaveBeenCalledWith(
+      expect.any(Object), // graphql client
+      expect.objectContaining({ branchName: 'branch123' })
+    );
+
+    expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalledWith(
+      expect.any(Object), // graphql client
+      expect.arrayContaining([
+        expect.objectContaining({
+          branchId: 'other-id',
+          runtimeVersion: updateStub.runtimeVersion,
+          updateInfoGroup: expect.objectContaining({
+            ios: expect.any(Object),
+          }),
+          gitCommitHash: updateStub.gitCommitHash,
+          awaitingCodeSigningInfo: false,
+        }),
+      ])
+    );
+  });
+
+  it('republishes to a different branch when --destination-channel is supplied', async () => {
+    const flags = ['--branch=branch123', '--message=test-republish', '--destination-channel=blah'];
+
+    mockTestProject();
+    // Mock the prompt to ask the user which update to republish, from branch
+    jest.mocked(selectUpdateGroupOnBranchAsync).mockResolvedValue([updateStub]);
+    // Mock mutations to store the new update
+    jest.mocked(PublishMutation.publishUpdateGroupAsync).mockResolvedValue([
+      {
+        ...updateStub,
+        branch: { id: 'other-id', name: 'other' },
+        id: 'update-new',
+        platform: 'ios',
+        manifestPermalink: 'https://expo.dev/@test/test-project/manifest',
+      },
+    ]);
+
+    jest
+      .mocked(getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync)
+      .mockResolvedValue({ branchId: 'blah-id', branchName: 'blah' });
+
+    await new UpdateRepublish(flags, commandOptions).run();
+
+    expect(selectUpdateGroupOnBranchAsync).toHaveBeenCalledWith(
+      expect.any(Object), // graphql client
+      expect.objectContaining({ branchName: 'branch123' })
+    );
+
+    expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalledWith(
+      expect.any(Object), // graphql client
+      expect.arrayContaining([
+        expect.objectContaining({
+          branchId: 'blah-id',
+          runtimeVersion: updateStub.runtimeVersion,
+          updateInfoGroup: expect.objectContaining({
+            ios: expect.any(Object),
+          }),
+          gitCommitHash: updateStub.gitCommitHash,
+          awaitingCodeSigningInfo: false,
+        }),
+      ])
+    );
+  });
 });
 
 /** Create a new in-memory project, based on src/commands/project/__tests__/init.test.ts */

packages/eas-cli/src/commands/update/__tests__/roll-back-to-embedded.test.ts

@@ -19,7 +19,7 @@ import { jester } from '../../../credentials/__tests__/fixtures-constants';
 import { UpdateFragment } from '../../../graphql/generated';
 import { PublishMutation } from '../../../graphql/mutations/PublishMutation';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
-import { getBranchNameFromChannelNameAsync } from '../../../update/getBranchNameFromChannelNameAsync';
+import { getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync } from '../../../update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync';
 import { resolveVcsClient } from '../../../vcs';
 import UpdateRollBackToEmbedded from '../roll-back-to-embedded';
 
@@ -50,7 +50,7 @@ jest.mock('../../../project/projectUtils', () => ({
   enforceRollBackToEmbeddedUpdateSupportAsync: jest.fn(),
 }));
 jest.mock('../../../update/configure');
-jest.mock('../../../update/getBranchNameFromChannelNameAsync');
+jest.mock('../../../update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync');
 jest.mock('../../../graphql/mutations/PublishMutation');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../graphql/queries/UpdateQuery');
@@ -112,7 +112,9 @@ describe(UpdateRollBackToEmbedded.name, () => {
     const runtimeVersion = 'exposdk:47.0.0';
     jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);
 
-    jest.mocked(getBranchNameFromChannelNameAsync).mockResolvedValue('branchFromChannel');
+    jest
+      .mocked(getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync)
+      .mockResolvedValue({ branchId: updateStub.branch.id, branchName: 'branchFromChannel' });
     jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
       branchId: 'branch123',
       createdBranch: false,

packages/eas-cli/src/commands/update/index.ts

@@ -127,7 +127,6 @@ export default class UpdatePublish extends EasCommand {
     'rollout-percentage': Flags.integer({
       description: `Percentage of users this update should be immediately available to. Users not in the rollout will be served the previous latest update on the branch, even if that update is itself being rolled out. The specified number must be an integer between 1 and 100. When not specified, this defaults to 100.`,
       required: false,
-      hidden: true,
       min: 0,
       max: 100,
     }),

packages/eas-cli/src/commands/update/republish.ts

@@ -7,10 +7,11 @@ import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
+import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
 import { promptAsync } from '../../prompts';
-import { getBranchNameFromChannelNameAsync } from '../../update/getBranchNameFromChannelNameAsync';
+import { getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync } from '../../update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync';
 import { selectUpdateGroupOnBranchAsync } from '../../update/queries';
 import { UpdateToRepublish, republishAsync } from '../../update/republish';
 import { truncateString as truncateUpdateMessage } from '../../update/utils';
@@ -22,6 +23,8 @@ const defaultRepublishPlatforms: Platform[] = ['android', 'ios'];
 type UpdateRepublishRawFlags = {
   branch?: string;
   channel?: string;
+  'destination-channel'?: string;
+  'destination-branch'?: string;
   group?: string;
   message?: string;
   platform: string;
@@ -33,6 +36,8 @@ type UpdateRepublishRawFlags = {
 type UpdateRepublishFlags = {
   branchName?: string;
   channelName?: string;
+  destinationChannelName?: string;
+  destinationBranchName?: string;
   groupId?: string;
   updateMessage?: string;
   platform: Platform[];
@@ -57,6 +62,15 @@ export default class UpdateRepublish extends EasCommand {
       description: 'Update group ID to republish',
       exclusive: ['branch', 'channel'],
     }),
+    'destination-channel': Flags.string({
+      description:
+        'Channel name to select a branch to republish to if republishing to a different branch',
+      exclusive: ['destination-branch'],
+    }),
+    'destination-branch': Flags.string({
+      description: 'Branch name to republish to if republishing to a different branch',
+      exclusive: ['destination-channel'],
+    }),
     message: Flags.string({
       char: 'm',
       description: 'Short message describing the republished update group',
@@ -130,13 +144,21 @@ export default class UpdateRepublish extends EasCommand {
       );
     }
 
-    const updateMessage = await getOrAskUpdateMessageAsync(updatesToPublish, flags);
     const arbitraryUpdate = updatesToPublish[0];
+    const targetBranch = await getOrAskTargetBranchAsync(
+      graphqlClient,
+      projectId,
+      flags,
+      arbitraryUpdate
+    );
+
+    const updateMessage = await getOrAskUpdateMessageAsync(updatesToPublish, flags);
+
     await republishAsync({
       graphqlClient,
       app: { exp, projectId },
       updatesToPublish,
-      targetBranch: { branchId: arbitraryUpdate.branchId, branchName: arbitraryUpdate.branchName },
+      targetBranch,
       updateMessage,
       codeSigningInfo,
       json: flags.json,
@@ -147,6 +169,8 @@ export default class UpdateRepublish extends EasCommand {
     const branchName = rawFlags.branch;
     const channelName = rawFlags.channel;
     const groupId = rawFlags.group;
+    const destinationChannelName = rawFlags['destination-channel'];
+    const destinationBranchName = rawFlags['destination-branch'];
     const nonInteractive = rawFlags['non-interactive'];
     const privateKeyPath = rawFlags['private-key-path'];
 
@@ -160,6 +184,8 @@ export default class UpdateRepublish extends EasCommand {
     return {
       branchName,
       channelName,
+      destinationChannelName,
+      destinationBranchName,
       groupId,
       platform,
       updateMessage: rawFlags.message,
@@ -170,6 +196,34 @@ export default class UpdateRepublish extends EasCommand {
   }
 }
 
+async function getOrAskTargetBranchAsync(
+  graphqlClient: ExpoGraphqlClient,
+  projectId: string,
+  flags: UpdateRepublishFlags,
+  arbitraryUpdate: UpdateToRepublish
+): Promise<{ branchId: string; branchName: string }> {
+  // if branch name supplied, use that
+  if (flags.destinationBranchName) {
+    const branch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
+      appId: projectId,
+      name: flags.destinationBranchName,
+    });
+    return { branchId: branch.id, branchName: branch.name };
+  }
+
+  // if provided channel name but was non-interactive
+  if (flags.destinationChannelName) {
+    return await getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync(
+      graphqlClient,
+      projectId,
+      flags.destinationChannelName
+    );
+  }
+
+  // if neither provided, assume republish on same branch
+  return { branchId: arbitraryUpdate.branchId, branchName: arbitraryUpdate.branchName };
+}
+
 /** Retrieve the update group from either the update group id, or select from branch name. */
 async function getOrAskUpdatesAsync(
   graphqlClient: ExpoGraphqlClient,
@@ -293,7 +347,11 @@ async function askUpdatesFromChannelNameAsync(
     nonInteractive,
   }: { projectId: string; channelName: string; json: boolean; nonInteractive: boolean }
 ): Promise<UpdateToRepublish[]> {
-  const branchName = await getBranchNameFromChannelNameAsync(graphqlClient, projectId, channelName);
+  const { branchName } = await getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync(
+    graphqlClient,
+    projectId,
+    channelName
+  );
 
   return await askUpdatesFromBranchNameAsync(graphqlClient, {
     projectId,

packages/eas-cli/src/commands/worker/deploy.ts

@@ -6,10 +6,7 @@ import * as path from 'node:path';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASEnvironmentFlag, EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import {
-  EnvironmentVariableEnvironment,
-  WorkerDeploymentAliasFragment,
-} from '../../graphql/generated';
+import { EnvironmentVariableEnvironment } from '../../graphql/generated';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -20,7 +17,12 @@ import {
   assignWorkerDeploymentProductionAsync,
   getSignedDeploymentUrlAsync,
 } from '../../worker/deployment';
-import { UploadParams, batchUploadAsync, uploadAsync } from '../../worker/upload';
+import {
+  UploadParams,
+  batchUploadAsync,
+  callUploadApiAsync,
+  uploadAsync,
+} from '../../worker/upload';
 import {
   formatWorkerDeploymentJson,
   formatWorkerDeploymentTable,
@@ -53,6 +55,13 @@ interface RawDeployFlags {
   'export-dir': string;
 }
 
+interface DeployInProgressParams {
+  id: string;
+  fullName: string;
+  baseURL: string;
+  token: string;
+}
+
 export default class WorkerDeploy extends EasCommand {
   static override description = 'Deploy your Expo web build';
   static override aliases = ['deploy'];
@@ -110,10 +119,8 @@ export default class WorkerDeploy extends EasCommand {
       projectDir,
     } = await this.getContextAsync(WorkerDeploy, flags);
 
-    const [{ projectId }, projectDist] = await Promise.all([
-      getDynamicPrivateProjectConfigAsync(),
-      resolveExportedProjectAsync(flags, projectDir),
-    ]);
+    const projectDist = await resolveExportedProjectAsync(flags, projectDir);
+    const { projectId } = await getDynamicPrivateProjectConfigAsync();
 
     logExportedProjectInfo(projectDist);
 
@@ -131,7 +138,24 @@ export default class WorkerDeploy extends EasCommand {
       }
     }
 
-    async function uploadTarballAsync(tarPath: string, uploadUrl: string): Promise<any> {
+    async function finalizeDeployAsync(deployParams: DeployInProgressParams): Promise<void> {
+      const finalizeDeployUrl = new URL('/deploy/finalize', deployParams.baseURL);
+      finalizeDeployUrl.searchParams.set('token', deployParams.token);
+      const result = await callUploadApiAsync(finalizeDeployUrl, {
+        method: 'POST',
+        headers: {
+          accept: 'application/json',
+        },
+      });
+      if (!result || typeof result !== 'object' || !('success' in result) || !result.success) {
+        throw new Error('Deploy failed: Incomplete asset uploads. Please try again');
+      }
+    }
+
+    async function uploadTarballAsync(
+      tarPath: string,
+      uploadUrl: string
+    ): Promise<DeployInProgressParams> {
       const { response } = await uploadAsync({
         url: uploadUrl,
         filePath: tarPath,
@@ -155,26 +179,33 @@ export default class WorkerDeploy extends EasCommand {
         if (!json.success || !json.result || typeof json.result !== 'object') {
           throw new Error(json.message ? `Upload failed: ${json.message}` : 'Upload failed!');
         }
-        return json.result;
+        const { id, fullName, token } = json.result;
+        if (typeof token !== 'string') {
+          throw new Error('Upload failed: API failed to return a deployment token');
+        } else if (typeof id !== 'string') {
+          throw new Error('Upload failed: API failed to return a deployment identifier');
+        } else if (typeof fullName !== 'string') {
+          throw new Error('Upload failed: API failed to return a script name');
+        }
+        const baseURL = new URL('/', uploadUrl).toString();
+        return { id, fullName, baseURL, token };
       }
     }
 
     async function uploadAssetsAsync(
       assetMap: WorkerAssets.AssetMap,
-      uploads: Record<string, string>
+      deployParams: DeployInProgressParams
     ): Promise<void> {
-      if (typeof uploads !== 'object' || !uploads) {
+      const uploadParams: UploadParams[] = [];
+      const assetPath = projectDist.type === 'server' ? projectDist.clientPath : projectDist.path;
+      if (!assetPath) {
         return;
       }
 
-      // TODO(@kitten): Batch and upload multiple files in parallel
-      const uploadParams: UploadParams[] = [];
-      const assetPath = projectDist.type === 'server' ? projectDist.clientPath : projectDist.path;
       for await (const asset of WorkerAssets.listAssetMapFilesAsync(assetPath, assetMap)) {
-        const uploadURL = uploads[asset.normalizedPath];
-        if (uploadURL) {
-          uploadParams.push({ url: uploadURL, filePath: asset.path });
-        }
+        const uploadURL = new URL(`/asset/${asset.sha512}`, deployParams.baseURL);
+        uploadURL.searchParams.set('token', deployParams.token);
+        uploadParams.push({ url: uploadURL.toString(), filePath: asset.path });
       }
 
       const progress = {
@@ -215,7 +246,7 @@ export default class WorkerDeploy extends EasCommand {
 
     let assetMap: WorkerAssets.AssetMap;
     let tarPath: string;
-    let deployResult: any;
+    let deployResult: DeployInProgressParams;
     let progress = ora('Preparing project').start();
 
     try {
@@ -254,7 +285,8 @@ export default class WorkerDeploy extends EasCommand {
       throw error;
     }
 
-    await uploadAssetsAsync(assetMap, deployResult.uploads);
+    await uploadAssetsAsync(assetMap, deployResult);
+    await finalizeDeployAsync(deployResult);
 
     let deploymentAlias: null | Awaited<ReturnType<typeof assignWorkerDeploymentAliasAsync>> = null;
     if (flags.aliasName) {
@@ -313,7 +345,7 @@ export default class WorkerDeploy extends EasCommand {
             deploymentIdentifier: deployResult.id,
             url: getDeploymentUrlFromFullName(deployResult.fullName),
           },
-          aliases: [deploymentAlias].filter(Boolean) as WorkerDeploymentAliasFragment[],
+          aliases: [deploymentAlias],
           production: deploymentProdAlias,
         })
       );
@@ -330,7 +362,7 @@ export default class WorkerDeploy extends EasCommand {
           deploymentIdentifier: deployResult.id,
           url: getDeploymentUrlFromFullName(deployResult.fullName),
         },
-        aliases: [deploymentAlias].filter(Boolean) as WorkerDeploymentAliasFragment[],
+        aliases: [deploymentAlias],
         production: deploymentProdAlias,
       })
     );
@@ -364,36 +396,36 @@ async function resolveExportedProjectAsync(
       modifiedAt: Date | null;
       path: string;
       serverPath: string;
-      clientPath: string;
+      clientPath?: string;
     }
 > {
   const exportPath = path.join(projectDir, flags.exportDir);
   const serverPath = path.join(exportPath, 'server');
   const clientPath = path.join(exportPath, 'client');
 
-  const [hasServerPath, hasClientPath, exportStat] = await Promise.all([
-    isDirectory(serverPath),
-    isDirectory(clientPath),
+  const [exportDirStat, expoRoutesStat, hasClientDir] = await Promise.all([
     fs.promises.stat(exportPath).catch(() => null),
+    fs.promises.stat(path.join(serverPath, '_expo/routes.json')).catch(() => null),
+    isDirectory(clientPath),
   ]);
 
-  if (!exportStat?.isDirectory()) {
+  if (!exportDirStat?.isDirectory()) {
     throw new Error(
       `No "${flags.exportDir}/" folder found. Prepare your project for deployment with "npx expo export --platform web"`
     );
   }
 
-  if (hasServerPath && hasClientPath) {
+  if (expoRoutesStat?.isFile()) {
     return {
       type: 'server',
       path: exportPath,
-      modifiedAt: exportStat.mtime,
+      modifiedAt: exportDirStat.mtime,
       serverPath,
-      clientPath,
+      clientPath: hasClientDir ? clientPath : undefined,
     };
   }
 
-  return { type: 'static', path: exportPath, modifiedAt: exportStat.mtime };
+  return { type: 'static', path: exportPath, modifiedAt: exportDirStat.mtime };
 }
 
 function logExportedProjectInfo(

packages/eas-cli/src/credentials/manager/Actions.ts

@@ -36,6 +36,7 @@ export enum AndroidActionType {
   UpdateCredentialsJson,
   SetUpBuildCredentialsFromCredentialsJson,
   SetUpBuildCredentials,
+  Exit,
 }
 
 export enum IosActionType {
@@ -60,4 +61,5 @@ export enum IosActionType {
   UseExistingAscApiKeyForSubmissions,
   CreateAscApiKeyForSubmissions,
   RemoveAscApiKey,
+  Exit,
 }

packages/eas-cli/src/credentials/manager/AndroidActions.ts

@@ -26,6 +26,11 @@ export const highLevelActions: ActionInfo[] = [
     title: 'Go back',
     scope: Scope.Manager,
   },
+  {
+    value: AndroidActionType.Exit,
+    title: 'Exit',
+    scope: Scope.Manager,
+  },
 ];
 
 export const credentialsJsonActions: ActionInfo[] = [

packages/eas-cli/src/credentials/manager/IosActions.ts

@@ -27,6 +27,11 @@ export const highLevelActions: ActionInfo[] = [
     title: 'Go back',
     scope: Scope.Manager,
   },
+  {
+    value: IosActionType.Exit,
+    title: 'Exit',
+    scope: Scope.Manager,
+  },
 ];
 
 export const credentialsJsonActions: ActionInfo[] = [

packages/eas-cli/src/credentials/manager/ManageAndroid.ts

@@ -145,6 +145,8 @@ export class ManageAndroid {
           } else if (chosenAction === AndroidActionType.GoBackToCaller) {
             await this.callingAction.runAsync(ctx);
             return;
+          } else if (chosenAction === AndroidActionType.Exit) {
+            return;
           }
         }
 

packages/eas-cli/src/credentials/manager/ManageIos.ts

@@ -154,6 +154,8 @@ export class ManageIos {
           } else if (chosenAction === IosActionType.GoBackToCaller) {
             await this.callingAction.runAsync(ctx);
             return;
+          } else if (chosenAction === IosActionType.Exit) {
+            return;
           }
         } else if (actionInfo.scope === Scope.Project) {
           assert(

packages/eas-cli/src/eas-update/utils.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from '@expo/config';
 
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { Client } from '../vcs/vcs';

packages/eas-cli/src/graphql/generated.ts

@@ -374,6 +374,7 @@ export type AccountEnvironmentSecretsArgs = {
  * data and settings. Actors may own and be members of accounts.
  */
 export type AccountEnvironmentVariablesArgs = {
+  environment?: InputMaybe<EnvironmentVariableEnvironment>;
   filterNames?: InputMaybe<Array<Scalars['String']['input']>>;
 };
 
@@ -383,6 +384,7 @@ export type AccountEnvironmentVariablesArgs = {
  * data and settings. Actors may own and be members of accounts.
  */
 export type AccountEnvironmentVariablesIncludingSensitiveArgs = {
+  environment?: InputMaybe<EnvironmentVariableEnvironment>;
   filterNames?: InputMaybe<Array<Scalars['String']['input']>>;
 };
 
@@ -1619,15 +1621,15 @@ export type AppWorkerDeploymentsArgs = {
 
 /** Represents an Exponent App (or Experience in legacy terms) */
 export type AppWorkerDeploymentsCrashArgs = {
-  crashId: Scalars['ID']['input'];
+  crashKey: Scalars['ID']['input'];
   sampleFor?: InputMaybe<CrashSampleFor>;
 };
 
 
 /** Represents an Exponent App (or Experience in legacy terms) */
 export type AppWorkerDeploymentsCrashesArgs = {
-  limit?: Scalars['Int']['input'];
-  timespan: CrashesTimespan;
+  filters?: InputMaybe<CrashesFilters>;
+  timespan: DatasetTimespan;
 };
 
 
@@ -1640,7 +1642,7 @@ export type AppWorkerDeploymentsRequestArgs = {
 /** Represents an Exponent App (or Experience in legacy terms) */
 export type AppWorkerDeploymentsRequestsArgs = {
   filters?: InputMaybe<RequestsFilters>;
-  timespan: RequestsTimespan;
+  timespan: DatasetTimespan;
 };
 
 export type AppBranchEdge = {
@@ -1973,6 +1975,16 @@ export type AppStoreConnectApiKeyMutationUpdateAppStoreConnectApiKeyArgs = {
   id: Scalars['ID']['input'];
 };
 
+export type AppStoreConnectApiKeyQuery = {
+  __typename?: 'AppStoreConnectApiKeyQuery';
+  byId: AppStoreConnectApiKey;
+};
+
+
+export type AppStoreConnectApiKeyQueryByIdArgs = {
+  id: Scalars['ID']['input'];
+};
+
 export type AppStoreConnectApiKeyUpdateInput = {
   appleTeamId?: InputMaybe<Scalars['ID']['input']>;
 };
@@ -3244,9 +3256,8 @@ export enum CrashSampleFor {
   Oldest = 'OLDEST'
 }
 
-export type CrashesTimespan = {
-  end: Scalars['DateTime']['input'];
-  start?: InputMaybe<Scalars['DateTime']['input']>;
+export type CrashesFilters = {
+  name?: InputMaybe<Array<Scalars['String']['input']>>;
 };
 
 export type CreateAccessTokenInput = {
@@ -3289,9 +3300,11 @@ export type CreateEnvironmentSecretInput = {
 };
 
 export type CreateEnvironmentVariableInput = {
-  environment: EnvironmentVariableEnvironment;
+  environment?: InputMaybe<EnvironmentVariableEnvironment>;
+  environments?: InputMaybe<Array<EnvironmentVariableEnvironment>>;
   name: Scalars['String']['input'];
   overwrite?: InputMaybe<Scalars['Boolean']['input']>;
+  type?: InputMaybe<EnvironmentSecretType>;
   value: Scalars['String']['input'];
   visibility: EnvironmentVariableVisibility;
 };
@@ -3354,8 +3367,10 @@ export type CreateServerlessFunctionUploadUrlResult = {
 };
 
 export type CreateSharedEnvironmentVariableInput = {
+  environments?: InputMaybe<Array<EnvironmentVariableEnvironment>>;
   name: Scalars['String']['input'];
   overwrite?: InputMaybe<Scalars['Boolean']['input']>;
+  type?: InputMaybe<EnvironmentSecretType>;
   value: Scalars['String']['input'];
   visibility: EnvironmentVariableVisibility;
 };
@@ -3366,12 +3381,24 @@ export type CreateSubmissionResult = {
   submission: Submission;
 };
 
+export type CumulativeMetrics = {
+  __typename?: 'CumulativeMetrics';
+  /** Totals from the beginning of time till now */
+  totals: CumulativeMetricsTotals;
+};
+
 export type CumulativeMetricsOverTimeData = {
   __typename?: 'CumulativeMetricsOverTimeData';
   data: LineChartData;
   metricsAtLastTimestamp: Array<LineDatapoint>;
 };
 
+export type CumulativeMetricsTotals = {
+  __typename?: 'CumulativeMetricsTotals';
+  totalFailedInstalls: Scalars['Int']['output'];
+  totalInstalls: Scalars['Int']['output'];
+};
+
 export type CustomBuildConfigInput = {
   path: Scalars['String']['input'];
 };
@@ -3430,6 +3457,11 @@ export enum CustomDomainStatus {
   TimedOut = 'TIMED_OUT'
 }
 
+export type DatasetTimespan = {
+  end: Scalars['DateTime']['input'];
+  start: Scalars['DateTime']['input'];
+};
+
 export type DeleteAccessTokenResult = {
   __typename?: 'DeleteAccessTokenResult';
   id: Scalars['ID']['output'];
@@ -3553,6 +3585,12 @@ export type DeleteWebhookResult = {
   id: Scalars['ID']['output'];
 };
 
+export type DeleteWorkerDeploymentResult = {
+  __typename?: 'DeleteWorkerDeploymentResult';
+  deploymentIdentifier: Scalars['WorkerDeploymentIdentifier']['output'];
+  id: Scalars['ID']['output'];
+};
+
 export type DeployServerlessFunctionResult = {
   __typename?: 'DeployServerlessFunctionResult';
   url: Scalars['String']['output'];
@@ -3561,6 +3599,7 @@ export type DeployServerlessFunctionResult = {
 /** Represents a Deployment - a set of Builds with the same Runtime Version and Channel */
 export type Deployment = {
   __typename?: 'Deployment';
+  buildCount: Scalars['Int']['output'];
   builds: DeploymentBuildsConnection;
   channel: UpdateChannel;
   id: Scalars['ID']['output'];
@@ -3572,6 +3611,12 @@ export type Deployment = {
 };
 
 
+/** Represents a Deployment - a set of Builds with the same Runtime Version and Channel */
+export type DeploymentBuildCountArgs = {
+  statuses?: InputMaybe<Array<BuildStatus>>;
+};
+
+
 /** Represents a Deployment - a set of Builds with the same Runtime Version and Channel */
 export type DeploymentBuildsArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
@@ -3664,6 +3709,13 @@ export type DeploymentQueryByIdArgs = {
   deploymentId: Scalars['ID']['input'];
 };
 
+export type DeploymentResult = {
+  __typename?: 'DeploymentResult';
+  data?: Maybe<UpdateDeploymentsConnection>;
+  error?: Maybe<Scalars['String']['output']>;
+  success: Scalars['Boolean']['output'];
+};
+
 export type DeploymentSignedUrlResult = {
   __typename?: 'DeploymentSignedUrlResult';
   deploymentIdentifier: Scalars['ID']['output'];
@@ -3684,6 +3736,7 @@ export type DeploymentsMutation = {
   /** Create a signed deployment URL */
   createSignedDeploymentUrl: DeploymentSignedUrlResult;
   deleteAlias: DeleteAliasResult;
+  deleteWorkerDeployment: DeleteWorkerDeploymentResult;
 };
 
 
@@ -3705,6 +3758,11 @@ export type DeploymentsMutationDeleteAliasArgs = {
   appId: Scalars['ID']['input'];
 };
 
+
+export type DeploymentsMutationDeleteWorkerDeploymentArgs = {
+  workerDeploymentId: Scalars['ID']['input'];
+};
+
 export type DiscordUser = {
   __typename?: 'DiscordUser';
   discordIdentifier: Scalars['String']['output'];
@@ -3872,14 +3930,28 @@ export type EnvironmentVariable = {
   apps: Array<App>;
   createdAt: Scalars['DateTime']['output'];
   environment?: Maybe<EnvironmentVariableEnvironment>;
+  environments?: Maybe<Array<EnvironmentVariableEnvironment>>;
   id: Scalars['ID']['output'];
+  linkedEnvironments?: Maybe<Array<EnvironmentVariableEnvironment>>;
   name: Scalars['String']['output'];
   scope: EnvironmentVariableScope;
+  type: EnvironmentSecretType;
   updatedAt: Scalars['DateTime']['output'];
   value?: Maybe<Scalars['String']['output']>;
   visibility?: Maybe<EnvironmentVariableVisibility>;
 };
 
+
+export type EnvironmentVariableLinkedEnvironmentsArgs = {
+  appFullName?: InputMaybe<Scalars['String']['input']>;
+  appId?: InputMaybe<Scalars['String']['input']>;
+};
+
+
+export type EnvironmentVariableValueArgs = {
+  includeFileContent?: InputMaybe<Scalars['Boolean']['input']>;
+};
+
 export enum EnvironmentVariableEnvironment {
   Development = 'DEVELOPMENT',
   Preview = 'PREVIEW',
@@ -3904,6 +3976,8 @@ export type EnvironmentVariableMutation = {
   linkSharedEnvironmentVariable: EnvironmentVariable;
   /** Unlink shared environment variable */
   unlinkSharedEnvironmentVariable: EnvironmentVariable;
+  /** Update an environment variable */
+  updateEnvironmentVariable: EnvironmentVariable;
 };
 
 
@@ -3943,17 +4017,22 @@ export type EnvironmentVariableMutationLinkBulkSharedEnvironmentVariablesArgs =
 
 export type EnvironmentVariableMutationLinkSharedEnvironmentVariableArgs = {
   appId: Scalars['ID']['input'];
-  environment: EnvironmentVariableEnvironment;
+  environment?: InputMaybe<EnvironmentVariableEnvironment>;
   environmentVariableId: Scalars['ID']['input'];
 };
 
 
 export type EnvironmentVariableMutationUnlinkSharedEnvironmentVariableArgs = {
   appId: Scalars['ID']['input'];
-  environment: EnvironmentVariableEnvironment;
+  environment?: InputMaybe<EnvironmentVariableEnvironment>;
   environmentVariableId: Scalars['ID']['input'];
 };
 
+
+export type EnvironmentVariableMutationUpdateEnvironmentVariableArgs = {
+  environmentVariableData: UpdateEnvironmentVariableInput;
+};
+
 export enum EnvironmentVariableScope {
   Project = 'PROJECT',
   Shared = 'SHARED'
@@ -3970,15 +4049,29 @@ export type EnvironmentVariableWithSecret = {
   apps: Array<App>;
   createdAt: Scalars['DateTime']['output'];
   environment?: Maybe<EnvironmentVariableEnvironment>;
+  environments?: Maybe<Array<EnvironmentVariableEnvironment>>;
   id: Scalars['ID']['output'];
+  linkedEnvironments?: Maybe<Array<EnvironmentVariableEnvironment>>;
   name: Scalars['String']['output'];
   scope: EnvironmentVariableScope;
   sensitive: Scalars['Boolean']['output'];
+  type: EnvironmentSecretType;
   updatedAt: Scalars['DateTime']['output'];
   value?: Maybe<Scalars['String']['output']>;
   visibility: EnvironmentVariableVisibility;
 };
 
+
+export type EnvironmentVariableWithSecretLinkedEnvironmentsArgs = {
+  appFullName?: InputMaybe<Scalars['String']['input']>;
+  appId?: InputMaybe<Scalars['String']['input']>;
+};
+
+
+export type EnvironmentVariableWithSecretValueArgs = {
+  includeFileContent?: InputMaybe<Scalars['Boolean']['input']>;
+};
+
 export type EstimatedOverageAndCost = {
   __typename?: 'EstimatedOverageAndCost';
   id: Scalars['ID']['output'];
@@ -4415,6 +4508,7 @@ export type GoogleServiceAccountKey = {
   clientIdentifier: Scalars['String']['output'];
   createdAt: Scalars['DateTime']['output'];
   id: Scalars['ID']['output'];
+  keyJson: Scalars['String']['output'];
   privateKeyIdentifier: Scalars['String']['output'];
   projectIdentifier: Scalars['String']['output'];
   updatedAt: Scalars['DateTime']['output'];
@@ -4443,6 +4537,16 @@ export type GoogleServiceAccountKeyMutationDeleteGoogleServiceAccountKeyArgs = {
   id: Scalars['ID']['input'];
 };
 
+export type GoogleServiceAccountKeyQuery = {
+  __typename?: 'GoogleServiceAccountKeyQuery';
+  byId: GoogleServiceAccountKey;
+};
+
+
+export type GoogleServiceAccountKeyQueryByIdArgs = {
+  id: Scalars['ID']['input'];
+};
+
 /**
  * The value field is always sent from the client as a string,
  * and then it's parsed server-side according to the filterType
@@ -4926,7 +5030,7 @@ export type LineDataset = {
 
 export type LinkSharedEnvironmentVariableInput = {
   appId: Scalars['ID']['input'];
-  environment: EnvironmentVariableEnvironment;
+  environment?: InputMaybe<EnvironmentVariableEnvironment>;
   environmentVariableId: Scalars['ID']['input'];
 };
 
@@ -5359,11 +5463,6 @@ export type RequestsFilters = {
   statusType?: InputMaybe<Array<ResponseStatusType>>;
 };
 
-export type RequestsTimespan = {
-  end: Scalars['DateTime']['input'];
-  start: Scalars['DateTime']['input'];
-};
-
 export type RescindUserInvitationResult = {
   __typename?: 'RescindUserInvitationResult';
   id: Scalars['ID']['output'];
@@ -5570,6 +5669,7 @@ export type RootMutation = {
   webhook: WebhookMutation;
   /** Mutations that modify a websiteNotification */
   websiteNotifications: WebsiteNotificationMutation;
+  workflowJob: WorkflowJobMutation;
 };
 
 
@@ -5614,6 +5714,8 @@ export type RootQuery = {
    * @deprecated Use 'byId' field under 'app'.
    */
   appByAppId?: Maybe<App>;
+  /** Top-level query object for querying App Store Connect API Keys. */
+  appStoreConnectApiKey: AppStoreConnectApiKeyQuery;
   /** Top-level query object for querying Apple Device registration requests. */
   appleDeviceRegistrationRequest: AppleDeviceRegistrationRequestQuery;
   /** Top-level query object for querying Apple Teams. */
@@ -5637,6 +5739,8 @@ export type RootQuery = {
   experimentation: ExperimentationQuery;
   /** Top-level query object for querying GitHub App information and resources it has access to. */
   githubApp: GitHubAppQuery;
+  /** Top-level query object for querying Google Service Account Keys. */
+  googleServiceAccountKey: GoogleServiceAccountKeyQuery;
   /** Top-level query object for querying Stripe Invoices. */
   invoice: InvoiceQuery;
   jobRun: JobRunQuery;
@@ -6353,7 +6457,7 @@ export type Update = ActivityTimelineProjectActivity & {
   branchId: Scalars['ID']['output'];
   codeSigningInfo?: Maybe<CodeSigningInfo>;
   createdAt: Scalars['DateTime']['output'];
-  deployments: UpdateDeploymentsConnection;
+  deployments: DeploymentResult;
   expoGoSDKVersion?: Maybe<Scalars['String']['output']>;
   gitCommitHash?: Maybe<Scalars['String']['output']>;
   group: Scalars['String']['output'];
@@ -6463,6 +6567,7 @@ export type UpdateChannel = {
   branchMapping: Scalars['String']['output'];
   createdAt: Scalars['DateTime']['output'];
   id: Scalars['ID']['output'];
+  isPaused: Scalars['Boolean']['output'];
   name: Scalars['String']['output'];
   updateBranches: Array<UpdateBranch>;
   updatedAt: Scalars['DateTime']['output'];
@@ -6492,6 +6597,10 @@ export type UpdateChannelMutation = {
    * stringified JSON supplied to the mutation as a variable.
    */
   editUpdateChannel: UpdateChannel;
+  /** Pause updates for an EAS channel. */
+  pauseUpdateChannel: UpdateChannel;
+  /** Resume updates for an EAS channel. */
+  resumeUpdateChannel: UpdateChannel;
 };
 
 
@@ -6512,6 +6621,16 @@ export type UpdateChannelMutationEditUpdateChannelArgs = {
   channelId: Scalars['ID']['input'];
 };
 
+
+export type UpdateChannelMutationPauseUpdateChannelArgs = {
+  channelId: Scalars['ID']['input'];
+};
+
+
+export type UpdateChannelMutationResumeUpdateChannelArgs = {
+  channelId: Scalars['ID']['input'];
+};
+
 export type UpdateDeploymentEdge = {
   __typename?: 'UpdateDeploymentEdge';
   cursor: Scalars['String']['output'];
@@ -6524,6 +6643,15 @@ export type UpdateDeploymentsConnection = {
   pageInfo: PageInfo;
 };
 
+export type UpdateEnvironmentVariableInput = {
+  environments?: InputMaybe<Array<EnvironmentVariableEnvironment>>;
+  id: Scalars['ID']['input'];
+  name?: InputMaybe<Scalars['String']['input']>;
+  type?: InputMaybe<EnvironmentSecretType>;
+  value?: InputMaybe<Scalars['String']['input']>;
+  visibility?: InputMaybe<EnvironmentVariableVisibility>;
+};
+
 export type UpdateGitHubBuildTriggerInput = {
   autoSubmit: Scalars['Boolean']['input'];
   buildProfile: Scalars['String']['input'];
@@ -6555,6 +6683,7 @@ export type UpdateInfoGroup = {
 
 export type UpdateInsights = {
   __typename?: 'UpdateInsights';
+  cumulativeMetrics: CumulativeMetrics;
   cumulativeMetricsOverTime: CumulativeMetricsOverTimeData;
   id: Scalars['ID']['output'];
   totalUniqueUsers: Scalars['Int']['output'];
@@ -7088,6 +7217,7 @@ export enum UserEntityTypeName {
   Password = 'Password',
   SsoUser = 'SSOUser',
   User = 'User',
+  UserPermission = 'UserPermission',
   UserSecondFactorBackupCodes = 'UserSecondFactorBackupCodes',
   UserSecondFactorDevice = 'UserSecondFactorDevice'
 }
@@ -7390,6 +7520,7 @@ export type WorkerCustomDomain = {
 export type WorkerDeployment = {
   __typename?: 'WorkerDeployment';
   aliases?: Maybe<Array<WorkerDeploymentAlias>>;
+  crashes?: Maybe<WorkerDeploymentCrashes>;
   createdAt: Scalars['DateTime']['output'];
   deploymentDomain: Scalars['String']['output'];
   deploymentIdentifier: Scalars['WorkerDeploymentIdentifier']['output'];
@@ -7403,6 +7534,12 @@ export type WorkerDeployment = {
 };
 
 
+export type WorkerDeploymentCrashesArgs = {
+  filters?: InputMaybe<CrashesFilters>;
+  timespan: DatasetTimespan;
+};
+
+
 export type WorkerDeploymentLogsArgs = {
   limit?: InputMaybe<Scalars['Int']['input']>;
   timespan: LogsTimespan;
@@ -7411,7 +7548,7 @@ export type WorkerDeploymentLogsArgs = {
 
 export type WorkerDeploymentRequestsArgs = {
   filters?: InputMaybe<RequestsFilters>;
-  timespan: RequestsTimespan;
+  timespan: DatasetTimespan;
 };
 
 export type WorkerDeploymentAlias = {
@@ -7442,33 +7579,65 @@ export type WorkerDeploymentAliasesConnection = {
 export type WorkerDeploymentCrashEdge = {
   __typename?: 'WorkerDeploymentCrashEdge';
   logs: Array<WorkerDeploymentLogNode>;
+  node: WorkerDeploymentCrashNode;
   request?: Maybe<WorkerDeploymentRequestNode>;
-  sample: WorkerDeploymentCrashSample;
 };
 
 export type WorkerDeploymentCrashNode = {
   __typename?: 'WorkerDeploymentCrashNode';
-  id: Scalars['ID']['output'];
-  minOccurrences: Scalars['Int']['output'];
-  mostRecentlyOccurredAt: Scalars['DateTime']['output'];
-  oldestOccurredAt: Scalars['DateTime']['output'];
-  sample: WorkerDeploymentCrashSample;
-};
-
-export type WorkerDeploymentCrashSample = {
-  __typename?: 'WorkerDeploymentCrashSample';
+  crashHash: Scalars['ID']['output'];
+  crashTimestamp: Scalars['DateTime']['output'];
+  deploymentIdentifier: Scalars['String']['output'];
   firstStackLine?: Maybe<Scalars['String']['output']>;
+  key: Scalars['ID']['output'];
   message: Scalars['String']['output'];
   name: Scalars['String']['output'];
+  requestTimestamp: Scalars['DateTime']['output'];
   scriptName: Scalars['String']['output'];
   stack?: Maybe<Array<Scalars['String']['output']>>;
-  timestamp: Scalars['DateTime']['output'];
 };
 
 export type WorkerDeploymentCrashes = {
   __typename?: 'WorkerDeploymentCrashes';
-  minRowsWithoutLimit?: Maybe<Scalars['Int']['output']>;
+  byCrashHash: Array<WorkerDeploymentCrashesHashEdge>;
+  byName: Array<WorkerDeploymentCrashesNameEdge>;
+  interval: Scalars['Int']['output'];
+  minRowsWithoutLimit: Scalars['Int']['output'];
   nodes: Array<WorkerDeploymentCrashNode>;
+  summary: WorkerDeploymentCrashesAggregationNode;
+  timeseries: Array<WorkerDeploymentCrashesTimeseriesEdge>;
+};
+
+export type WorkerDeploymentCrashesAggregationNode = {
+  __typename?: 'WorkerDeploymentCrashesAggregationNode';
+  crashesPerMs?: Maybe<Scalars['Float']['output']>;
+  crashesSum: Scalars['Int']['output'];
+  distinctCrashes: Scalars['Int']['output'];
+  firstOccurredAt: Scalars['DateTime']['output'];
+  mostRecentlyOccurredAt: Scalars['DateTime']['output'];
+  sampleRate: Scalars['Float']['output'];
+};
+
+export type WorkerDeploymentCrashesHashEdge = {
+  __typename?: 'WorkerDeploymentCrashesHashEdge';
+  crashHash: Scalars['ID']['output'];
+  node: WorkerDeploymentCrashesAggregationNode;
+  sample: WorkerDeploymentCrashNode;
+  timeseries: Array<WorkerDeploymentCrashesTimeseriesEdge>;
+};
+
+export type WorkerDeploymentCrashesNameEdge = {
+  __typename?: 'WorkerDeploymentCrashesNameEdge';
+  name: Scalars['String']['output'];
+  node: WorkerDeploymentCrashesAggregationNode;
+  sample: WorkerDeploymentCrashNode;
+  timeseries: Array<WorkerDeploymentCrashesTimeseriesEdge>;
+};
+
+export type WorkerDeploymentCrashesTimeseriesEdge = {
+  __typename?: 'WorkerDeploymentCrashesTimeseriesEdge';
+  node?: Maybe<WorkerDeploymentCrashesAggregationNode>;
+  timestamp: Scalars['DateTime']['output'];
 };
 
 export type WorkerDeploymentEdge = {
@@ -7511,7 +7680,7 @@ export type WorkerDeploymentQueryByIdArgs = {
 
 export type WorkerDeploymentRequestEdge = {
   __typename?: 'WorkerDeploymentRequestEdge';
-  crash?: Maybe<WorkerDeploymentCrashSample>;
+  crash?: Maybe<WorkerDeploymentCrashNode>;
   logs: Array<WorkerDeploymentLogNode>;
   node: WorkerDeploymentRequestNode;
 };
@@ -7664,6 +7833,16 @@ export enum WorkerLoggerLevel {
   Warn = 'WARN'
 }
 
+export type WorkflowJobMutation = {
+  __typename?: 'WorkflowJobMutation';
+  approveWorkflowJob: Scalars['ID']['output'];
+};
+
+
+export type WorkflowJobMutationApproveWorkflowJobArgs = {
+  workflowJobId: Scalars['ID']['input'];
+};
+
 export type DeleteAndroidAppBuildCredentialsResult = {
   __typename?: 'deleteAndroidAppBuildCredentialsResult';
   id: Scalars['ID']['output'];
@@ -8252,21 +8431,21 @@ export type DeleteEnvironmentSecretMutation = { __typename?: 'RootMutation', env
 
 export type LinkSharedEnvironmentVariableMutationVariables = Exact<{
   appId: Scalars['ID']['input'];
-  environment: EnvironmentVariableEnvironment;
+  environment?: InputMaybe<EnvironmentVariableEnvironment>;
   environmentVariableId: Scalars['ID']['input'];
 }>;
 
 
-export type LinkSharedEnvironmentVariableMutation = { __typename?: 'RootMutation', environmentVariable: { __typename?: 'EnvironmentVariableMutation', linkSharedEnvironmentVariable: { __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environment?: EnvironmentVariableEnvironment | null, createdAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null } } };
+export type LinkSharedEnvironmentVariableMutation = { __typename?: 'RootMutation', environmentVariable: { __typename?: 'EnvironmentVariableMutation', linkSharedEnvironmentVariable: { __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environments?: Array<EnvironmentVariableEnvironment> | null, createdAt: any, updatedAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null, type: EnvironmentSecretType } } };
 
 export type UnlinkSharedEnvironmentVariableMutationVariables = Exact<{
   appId: Scalars['ID']['input'];
-  environment: EnvironmentVariableEnvironment;
+  environment?: InputMaybe<EnvironmentVariableEnvironment>;
   environmentVariableId: Scalars['ID']['input'];
 }>;
 
 
-export type UnlinkSharedEnvironmentVariableMutation = { __typename?: 'RootMutation', environmentVariable: { __typename?: 'EnvironmentVariableMutation', unlinkSharedEnvironmentVariable: { __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environment?: EnvironmentVariableEnvironment | null, createdAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null } } };
+export type UnlinkSharedEnvironmentVariableMutation = { __typename?: 'RootMutation', environmentVariable: { __typename?: 'EnvironmentVariableMutation', unlinkSharedEnvironmentVariable: { __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environments?: Array<EnvironmentVariableEnvironment> | null, createdAt: any, updatedAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null, type: EnvironmentSecretType } } };
 
 export type CreateEnvironmentVariableForAccountMutationVariables = Exact<{
   input: CreateSharedEnvironmentVariableInput;
@@ -8274,7 +8453,7 @@ export type CreateEnvironmentVariableForAccountMutationVariables = Exact<{
 }>;
 
 
-export type CreateEnvironmentVariableForAccountMutation = { __typename?: 'RootMutation', environmentVariable: { __typename?: 'EnvironmentVariableMutation', createEnvironmentVariableForAccount: { __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environment?: EnvironmentVariableEnvironment | null, createdAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null } } };
+export type CreateEnvironmentVariableForAccountMutation = { __typename?: 'RootMutation', environmentVariable: { __typename?: 'EnvironmentVariableMutation', createEnvironmentVariableForAccount: { __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environments?: Array<EnvironmentVariableEnvironment> | null, createdAt: any, updatedAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null, type: EnvironmentSecretType } } };
 
 export type CreateEnvironmentVariableForAppMutationVariables = Exact<{
   input: CreateEnvironmentVariableInput;
@@ -8282,7 +8461,14 @@ export type CreateEnvironmentVariableForAppMutationVariables = Exact<{
 }>;
 
 
-export type CreateEnvironmentVariableForAppMutation = { __typename?: 'RootMutation', environmentVariable: { __typename?: 'EnvironmentVariableMutation', createEnvironmentVariableForApp: { __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environment?: EnvironmentVariableEnvironment | null, createdAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null } } };
+export type CreateEnvironmentVariableForAppMutation = { __typename?: 'RootMutation', environmentVariable: { __typename?: 'EnvironmentVariableMutation', createEnvironmentVariableForApp: { __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environments?: Array<EnvironmentVariableEnvironment> | null, createdAt: any, updatedAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null, type: EnvironmentSecretType } } };
+
+export type UpdateEnvironmentVariableMutationVariables = Exact<{
+  input: UpdateEnvironmentVariableInput;
+}>;
+
+
+export type UpdateEnvironmentVariableMutation = { __typename?: 'RootMutation', environmentVariable: { __typename?: 'EnvironmentVariableMutation', updateEnvironmentVariable: { __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environments?: Array<EnvironmentVariableEnvironment> | null, createdAt: any, updatedAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null, type: EnvironmentSecretType } } };
 
 export type DeleteEnvironmentVariableMutationVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -8342,7 +8528,7 @@ export type CreateAndroidSubmissionMutationVariables = Exact<{
 }>;
 
 
-export type CreateAndroidSubmissionMutation = { __typename?: 'RootMutation', submission: { __typename?: 'SubmissionMutation', createAndroidSubmission: { __typename?: 'CreateSubmissionResult', submission: { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null } } } };
+export type CreateAndroidSubmissionMutation = { __typename?: 'RootMutation', submission: { __typename?: 'SubmissionMutation', createAndroidSubmission: { __typename?: 'CreateSubmissionResult', submission: { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logFiles: Array<string>, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null } } } };
 
 export type CreateIosSubmissionMutationVariables = Exact<{
   appId: Scalars['ID']['input'];
@@ -8352,7 +8538,7 @@ export type CreateIosSubmissionMutationVariables = Exact<{
 }>;
 
 
-export type CreateIosSubmissionMutation = { __typename?: 'RootMutation', submission: { __typename?: 'SubmissionMutation', createIosSubmission: { __typename?: 'CreateSubmissionResult', submission: { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null } } } };
+export type CreateIosSubmissionMutation = { __typename?: 'RootMutation', submission: { __typename?: 'SubmissionMutation', createIosSubmission: { __typename?: 'CreateSubmissionResult', submission: { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logFiles: Array<string>, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null } } } };
 
 export type CreateUploadSessionMutationVariables = Exact<{
   type: UploadSessionType;
@@ -8405,6 +8591,13 @@ export type AppByFullNameQueryVariables = Exact<{
 
 export type AppByFullNameQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byFullName: { __typename?: 'App', id: string, name: string, fullName: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string, ownerUserActor?: { __typename?: 'SSOUser', id: string, username: string } | { __typename?: 'User', id: string, username: string } | null, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }, githubRepository?: { __typename?: 'GitHubRepository', id: string, metadata: { __typename?: 'GitHubRepositoryMetadata', githubRepoOwnerName: string, githubRepoName: string } } | null } } };
 
+export type AppStoreConnectApiKeyByIdQueryVariables = Exact<{
+  ascApiKeyId: Scalars['ID']['input'];
+}>;
+
+
+export type AppStoreConnectApiKeyByIdQuery = { __typename?: 'RootQuery', appStoreConnectApiKey: { __typename?: 'AppStoreConnectApiKeyQuery', byId: { __typename?: 'AppStoreConnectApiKey', id: string, issuerIdentifier: string, keyIdentifier: string, keyP8: string } } };
+
 export type LatestAppVersionQueryVariables = Exact<{
   appId: Scalars['String']['input'];
   platform: AppPlatform;
@@ -8474,7 +8667,7 @@ export type BuildsWithSubmissionsByIdQueryVariables = Exact<{
 }>;
 
 
-export type BuildsWithSubmissionsByIdQuery = { __typename?: 'RootQuery', builds: { __typename?: 'BuildQuery', byId: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, message?: string | null, completedAt?: any | null, expirationDate?: any | null, isForIosSimulator: boolean, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }>, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null, buildArtifactsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'SSOUser', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } } } };
+export type BuildsWithSubmissionsByIdQuery = { __typename?: 'RootQuery', builds: { __typename?: 'BuildQuery', byId: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, message?: string | null, completedAt?: any | null, expirationDate?: any | null, isForIosSimulator: boolean, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logFiles: Array<string>, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }>, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null, buildArtifactsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'SSOUser', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } } } };
 
 export type ViewBuildsOnAppQueryVariables = Exact<{
   appId: Scalars['String']['input'];
@@ -8525,36 +8718,49 @@ export type EnvironmentSecretsByAppIdQuery = { __typename?: 'RootQuery', app: {
 export type EnvironmentVariablesIncludingSensitiveByAppIdQueryVariables = Exact<{
   appId: Scalars['String']['input'];
   filterNames?: InputMaybe<Array<Scalars['String']['input']> | Scalars['String']['input']>;
-  environment: EnvironmentVariableEnvironment;
+  environment?: InputMaybe<EnvironmentVariableEnvironment>;
+  includeFileContent: Scalars['Boolean']['input'];
 }>;
 
 
-export type EnvironmentVariablesIncludingSensitiveByAppIdQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, environmentVariablesIncludingSensitive: Array<{ __typename?: 'EnvironmentVariableWithSecret', id: string, name: string, value?: string | null }> } } };
+export type EnvironmentVariablesIncludingSensitiveByAppIdQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, environmentVariablesIncludingSensitive: Array<{ __typename?: 'EnvironmentVariableWithSecret', id: string, name: string, value?: string | null, environments?: Array<EnvironmentVariableEnvironment> | null, valueWithFileContent?: string | null }> } } };
 
 export type EnvironmentVariablesByAppIdQueryVariables = Exact<{
   appId: Scalars['String']['input'];
   filterNames?: InputMaybe<Array<Scalars['String']['input']> | Scalars['String']['input']>;
-  environment: EnvironmentVariableEnvironment;
+  environment?: InputMaybe<EnvironmentVariableEnvironment>;
+  includeFileContent: Scalars['Boolean']['input'];
 }>;
 
 
-export type EnvironmentVariablesByAppIdQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, environmentVariables: Array<{ __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environment?: EnvironmentVariableEnvironment | null, createdAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null }> } } };
+export type EnvironmentVariablesByAppIdQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, environmentVariables: Array<{ __typename?: 'EnvironmentVariable', id: string, linkedEnvironments?: Array<EnvironmentVariableEnvironment> | null, name: string, value?: string | null, environments?: Array<EnvironmentVariableEnvironment> | null, createdAt: any, updatedAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null, type: EnvironmentSecretType, valueWithFileContent?: string | null }> } } };
 
 export type EnvironmentVariablesSharedQueryVariables = Exact<{
   appId: Scalars['String']['input'];
   filterNames?: InputMaybe<Array<Scalars['String']['input']> | Scalars['String']['input']>;
+  environment?: InputMaybe<EnvironmentVariableEnvironment>;
+  includeFileContent: Scalars['Boolean']['input'];
 }>;
 
 
-export type EnvironmentVariablesSharedQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, ownerAccount: { __typename?: 'Account', id: string, environmentVariables: Array<{ __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environment?: EnvironmentVariableEnvironment | null, createdAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null }> } } } };
+export type EnvironmentVariablesSharedQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, ownerAccount: { __typename?: 'Account', id: string, environmentVariables: Array<{ __typename?: 'EnvironmentVariable', id: string, linkedEnvironments?: Array<EnvironmentVariableEnvironment> | null, name: string, value?: string | null, environments?: Array<EnvironmentVariableEnvironment> | null, createdAt: any, updatedAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null, type: EnvironmentSecretType, valueWithFileContent?: string | null }> } } } };
 
 export type EnvironmentVariablesSharedWithSensitiveQueryVariables = Exact<{
   appId: Scalars['String']['input'];
   filterNames?: InputMaybe<Array<Scalars['String']['input']> | Scalars['String']['input']>;
+  environment?: InputMaybe<EnvironmentVariableEnvironment>;
+  includeFileContent: Scalars['Boolean']['input'];
 }>;
 
 
-export type EnvironmentVariablesSharedWithSensitiveQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, ownerAccount: { __typename?: 'Account', id: string, environmentVariablesIncludingSensitive: Array<{ __typename?: 'EnvironmentVariableWithSecret', id: string, name: string, value?: string | null }> } } } };
+export type EnvironmentVariablesSharedWithSensitiveQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, ownerAccount: { __typename?: 'Account', id: string, environmentVariablesIncludingSensitive: Array<{ __typename?: 'EnvironmentVariableWithSecret', id: string, name: string, value?: string | null, environments?: Array<EnvironmentVariableEnvironment> | null, valueWithFileContent?: string | null }> } } } };
+
+export type GoogleServiceAccountKeyByIdQueryVariables = Exact<{
+  ascApiKeyId: Scalars['ID']['input'];
+}>;
+
+
+export type GoogleServiceAccountKeyByIdQuery = { __typename?: 'RootQuery', googleServiceAccountKey: { __typename?: 'GoogleServiceAccountKeyQuery', byId: { __typename?: 'GoogleServiceAccountKey', id: string, keyJson: string } } };
 
 export type GetAssetMetadataQueryVariables = Exact<{
   storageKeys: Array<Scalars['String']['input']> | Scalars['String']['input'];
@@ -8595,7 +8801,7 @@ export type SubmissionsByIdQueryVariables = Exact<{
 }>;
 
 
-export type SubmissionsByIdQuery = { __typename?: 'RootQuery', submissions: { __typename?: 'SubmissionQuery', byId: { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null } } };
+export type SubmissionsByIdQuery = { __typename?: 'RootQuery', submissions: { __typename?: 'SubmissionQuery', byId: { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logFiles: Array<string>, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null } } };
 
 export type GetAllSubmissionsForAppQueryVariables = Exact<{
   appId: Scalars['String']['input'];
@@ -8606,7 +8812,7 @@ export type GetAllSubmissionsForAppQueryVariables = Exact<{
 }>;
 
 
-export type GetAllSubmissionsForAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }> } } };
+export type GetAllSubmissionsForAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logFiles: Array<string>, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }> } } };
 
 export type ViewUpdatesByGroupQueryVariables = Exact<{
   groupId: Scalars['ID']['input'];
@@ -8662,17 +8868,17 @@ export type AppFragment = { __typename?: 'App', id: string, name: string, fullNa
 
 export type BuildFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, message?: string | null, completedAt?: any | null, expirationDate?: any | null, isForIosSimulator: boolean, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null, buildArtifactsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'SSOUser', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };
 
-export type BuildWithSubmissionsFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, message?: string | null, completedAt?: any | null, expirationDate?: any | null, isForIosSimulator: boolean, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }>, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null, buildArtifactsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'SSOUser', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };
+export type BuildWithSubmissionsFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, gitCommitMessage?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, message?: string | null, completedAt?: any | null, expirationDate?: any | null, isForIosSimulator: boolean, submissions: Array<{ __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logFiles: Array<string>, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null }>, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null, applicationArchiveUrl?: string | null, buildArtifactsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'SSOUser', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };
 
 export type EnvironmentSecretFragment = { __typename?: 'EnvironmentSecret', id: string, name: string, type: EnvironmentSecretType, createdAt: any };
 
-export type EnvironmentVariableFragment = { __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environment?: EnvironmentVariableEnvironment | null, createdAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null };
+export type EnvironmentVariableFragment = { __typename?: 'EnvironmentVariable', id: string, name: string, value?: string | null, environments?: Array<EnvironmentVariableEnvironment> | null, createdAt: any, updatedAt: any, scope: EnvironmentVariableScope, visibility?: EnvironmentVariableVisibility | null, type: EnvironmentSecretType };
 
 export type RuntimeFragment = { __typename?: 'Runtime', id: string, version: string };
 
 export type StatuspageServiceFragment = { __typename?: 'StatuspageService', id: string, name: StatuspageServiceName, status: StatuspageServiceStatus, incidents: Array<{ __typename?: 'StatuspageIncident', id: string, status: StatuspageIncidentStatus, name: string, impact: StatuspageIncidentImpact, shortlink: string }> };
 
-export type SubmissionFragment = { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null };
+export type SubmissionFragment = { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logFiles: Array<string>, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null, rollout?: number | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null };
 
 export type UpdateFragment = { __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, rolloutPercentage?: number | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null, rolloutControlUpdate?: { __typename?: 'Update', id: string } | null };
 

packages/eas-cli/src/graphql/mutations/EnvironmentVariableMutation.ts

@@ -8,24 +8,28 @@ import {
   CreateEnvironmentVariableForAccountMutation,
   CreateEnvironmentVariableForAppMutation,
   DeleteEnvironmentVariableMutation,
+  EnvironmentSecretType,
+  EnvironmentVariableEnvironment,
   EnvironmentVariableFragment,
   EnvironmentVariableVisibility,
   LinkSharedEnvironmentVariableMutation,
   UnlinkSharedEnvironmentVariableMutation,
+  UpdateEnvironmentVariableMutation,
 } from '../generated';
 import { EnvironmentVariableFragmentNode } from '../types/EnvironmentVariable';
 
-type UpdateVariableArgs = {
-  value?: string;
+type CreateVariableArgs = {
+  value: string;
   name: string;
-  overwrite: true;
-  visibility?: EnvironmentVariableVisibility;
+  visibility: EnvironmentVariableVisibility;
+  environments: EnvironmentVariableEnvironment[];
+  type: EnvironmentSecretType;
 };
 
 export type EnvironmentVariablePushInput = {
   name: string;
   value: string;
-  environment: string;
+  environments: EnvironmentVariableEnvironment[];
   visibility: EnvironmentVariableVisibility;
   overwrite?: boolean;
 };
@@ -35,7 +39,7 @@ export const EnvironmentVariableMutation = {
     graphqlClient: ExpoGraphqlClient,
     environmentVariableId: string,
     appId: string,
-    environment: string
+    environment?: EnvironmentVariableEnvironment
   ): Promise<EnvironmentVariableFragment> {
     const data = await withErrorHandlingAsync(
       graphqlClient
@@ -43,7 +47,7 @@ export const EnvironmentVariableMutation = {
           gql`
             mutation LinkSharedEnvironmentVariable(
               $appId: ID!
-              $environment: EnvironmentVariableEnvironment!
+              $environment: EnvironmentVariableEnvironment
               $environmentVariableId: ID!
             ) {
               environmentVariable {
@@ -70,7 +74,7 @@ export const EnvironmentVariableMutation = {
     graphqlClient: ExpoGraphqlClient,
     environmentVariableId: string,
     appId: string,
-    environment: string
+    environment?: EnvironmentVariableEnvironment
   ): Promise<EnvironmentVariableFragment> {
     const data = await withErrorHandlingAsync(
       graphqlClient
@@ -78,7 +82,7 @@ export const EnvironmentVariableMutation = {
           gql`
             mutation UnlinkSharedEnvironmentVariable(
               $appId: ID!
-              $environment: EnvironmentVariableEnvironment!
+              $environment: EnvironmentVariableEnvironment
               $environmentVariableId: ID!
             ) {
               environmentVariable {
@@ -103,14 +107,7 @@ export const EnvironmentVariableMutation = {
   },
   async createSharedVariableAsync(
     graphqlClient: ExpoGraphqlClient,
-    input:
-      | {
-          name: string;
-          value: string;
-          visibility: EnvironmentVariableVisibility;
-          overwrite?: boolean;
-        }
-      | UpdateVariableArgs,
+    input: CreateVariableArgs,
     accountId: string
   ): Promise<EnvironmentVariableFragment> {
     const data = await withErrorHandlingAsync(
@@ -142,15 +139,7 @@ export const EnvironmentVariableMutation = {
   },
   async createForAppAsync(
     graphqlClient: ExpoGraphqlClient,
-    input:
-      | {
-          name: string;
-          value?: string;
-          environment: string;
-          visibility: EnvironmentVariableVisibility;
-          overwrite?: boolean;
-        }
-      | (UpdateVariableArgs & { environment: string }),
+    input: CreateVariableArgs,
     appId: string
   ): Promise<EnvironmentVariableFragment> {
     const data = await withErrorHandlingAsync(
@@ -177,6 +166,31 @@ export const EnvironmentVariableMutation = {
 
     return data.environmentVariable.createEnvironmentVariableForApp;
   },
+  async updateAsync(
+    graphqlClient: ExpoGraphqlClient,
+    input: Partial<CreateVariableArgs> & { id: string }
+  ): Promise<EnvironmentVariableFragment> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .mutation<UpdateEnvironmentVariableMutation>(
+          gql`
+            mutation UpdateEnvironmentVariable($input: UpdateEnvironmentVariableInput!) {
+              environmentVariable {
+                updateEnvironmentVariable(environmentVariableData: $input) {
+                  id
+                  ...EnvironmentVariableFragment
+                }
+              }
+            }
+            ${print(EnvironmentVariableFragmentNode)}
+          `,
+          { input }
+        )
+        .toPromise()
+    );
+
+    return data.environmentVariable.updateEnvironmentVariable;
+  },
   async deleteAsync(graphqlClient: ExpoGraphqlClient, id: string): Promise<{ id: string }> {
     const data = await withErrorHandlingAsync(
       graphqlClient

packages/eas-cli/src/graphql/queries/AppStoreConnectApiKeyQuery.ts

@@ -0,0 +1,50 @@
+import gql from 'graphql-tag';
+
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { withErrorHandlingAsync } from '../client';
+import {
+  AppStoreConnectApiKeyByIdQuery,
+  AppStoreConnectApiKeyByIdQueryVariables,
+} from '../generated';
+
+export const AppStoreConnectApiKeyQuery = {
+  async getByIdAsync(
+    graphqlClient: ExpoGraphqlClient,
+    ascApiKeyId: string
+  ): Promise<{
+    issuerIdentifier: string;
+    keyIdentifier: string;
+    keyP8: string;
+  }> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .query<AppStoreConnectApiKeyByIdQuery, AppStoreConnectApiKeyByIdQueryVariables>(
+          gql`
+            query AppStoreConnectApiKeyById($ascApiKeyId: ID!) {
+              appStoreConnectApiKey {
+                byId(id: $ascApiKeyId) {
+                  id
+                  issuerIdentifier
+                  keyIdentifier
+                  keyP8
+                }
+              }
+            }
+          `,
+          { ascApiKeyId },
+          {
+            additionalTypenames: ['AppStoreConnectApiKey'],
+          }
+        )
+        .toPromise()
+    );
+
+    const key = data.appStoreConnectApiKey.byId;
+
+    return {
+      issuerIdentifier: key.issuerIdentifier,
+      keyIdentifier: key.keyIdentifier,
+      keyP8: key.keyP8,
+    };
+  },
+};

packages/eas-cli/src/graphql/queries/EnvironmentVariablesQuery.ts

@@ -4,12 +4,22 @@ import gql from 'graphql-tag';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../client';
 import {
+  EnvironmentVariableEnvironment,
   EnvironmentVariableFragment,
   EnvironmentVariablesByAppIdQuery,
   EnvironmentVariablesSharedQuery,
   EnvironmentVariablesSharedQueryVariables,
 } from '../generated';
 import { EnvironmentVariableFragmentNode } from '../types/EnvironmentVariable';
+import { EnvironmentVariableWithSecretFragmentNode } from '../types/EnvironmentVariableWithSecret';
+
+type EnvironmentVariableWithLinkedEnvironments = EnvironmentVariableFragment & {
+  linkedEnvironments?: EnvironmentVariableEnvironment[] | null;
+};
+
+export type EnvironmentVariableWithFileContent = EnvironmentVariableFragment & {
+  valueWithFileContent?: string | null | undefined;
+};
 
 export const EnvironmentVariablesQuery = {
   async byAppIdWithSensitiveAsync(
@@ -18,12 +28,14 @@ export const EnvironmentVariablesQuery = {
       appId,
       environment,
       filterNames,
+      includeFileContent = false,
     }: {
       appId: string;
-      environment: string;
+      environment?: EnvironmentVariableEnvironment;
       filterNames?: string[];
+      includeFileContent?: boolean;
     }
-  ): Promise<EnvironmentVariableFragment[]> {
+  ): Promise<EnvironmentVariableWithFileContent[]> {
     const data = await withErrorHandlingAsync(
       graphqlClient
         .query(
@@ -31,7 +43,8 @@ export const EnvironmentVariablesQuery = {
             query EnvironmentVariablesIncludingSensitiveByAppId(
               $appId: String!
               $filterNames: [String!]
-              $environment: EnvironmentVariableEnvironment!
+              $environment: EnvironmentVariableEnvironment
+              $includeFileContent: Boolean!
             ) {
               app {
                 byId(appId: $appId) {
@@ -41,14 +54,16 @@ export const EnvironmentVariablesQuery = {
                     environment: $environment
                   ) {
                     id
-                    name
-                    value
+                    ...EnvironmentVariableWithSecretFragment
+                    valueWithFileContent: value(includeFileContent: $includeFileContent)
+                      @include(if: $includeFileContent)
                   }
                 }
               }
             }
+            ${print(EnvironmentVariableWithSecretFragmentNode)}
           `,
-          { appId, filterNames, environment },
+          { appId, filterNames, environment, includeFileContent },
           { additionalTypenames: ['EnvironmentVariableWithSecret'] }
         )
         .toPromise()
@@ -62,12 +77,14 @@ export const EnvironmentVariablesQuery = {
       appId,
       environment,
       filterNames,
+      includeFileContent = false,
     }: {
       appId: string;
-      environment: string;
+      environment?: EnvironmentVariableEnvironment;
       filterNames?: string[];
+      includeFileContent?: boolean;
     }
-  ): Promise<EnvironmentVariableFragment[]> {
+  ): Promise<(EnvironmentVariableWithFileContent & EnvironmentVariableWithLinkedEnvironments)[]> {
     const data = await withErrorHandlingAsync(
       graphqlClient
         .query<EnvironmentVariablesByAppIdQuery>(
@@ -75,21 +92,25 @@ export const EnvironmentVariablesQuery = {
             query EnvironmentVariablesByAppId(
               $appId: String!
               $filterNames: [String!]
-              $environment: EnvironmentVariableEnvironment!
+              $environment: EnvironmentVariableEnvironment
+              $includeFileContent: Boolean!
             ) {
               app {
                 byId(appId: $appId) {
                   id
                   environmentVariables(filterNames: $filterNames, environment: $environment) {
                     id
+                    linkedEnvironments(appId: $appId)
                     ...EnvironmentVariableFragment
+                    valueWithFileContent: value(includeFileContent: $includeFileContent)
+                      @include(if: $includeFileContent)
                   }
                 }
               }
             }
             ${print(EnvironmentVariableFragmentNode)}
           `,
-          { appId, filterNames, environment },
+          { appId, filterNames, environment, includeFileContent },
           { additionalTypenames: ['EnvironmentVariable'] }
         )
         .toPromise()
@@ -99,21 +120,39 @@ export const EnvironmentVariablesQuery = {
   },
   async sharedAsync(
     graphqlClient: ExpoGraphqlClient,
-    { appId, filterNames }: { appId: string; filterNames?: string[] }
-  ): Promise<EnvironmentVariableFragment[]> {
+    {
+      appId,
+      filterNames,
+      environment,
+      includeFileContent = false,
+    }: {
+      appId: string;
+      filterNames?: string[];
+      environment?: EnvironmentVariableEnvironment;
+      includeFileContent?: boolean;
+    }
+  ): Promise<(EnvironmentVariableWithFileContent & EnvironmentVariableWithLinkedEnvironments)[]> {
     const data = await withErrorHandlingAsync(
       graphqlClient
         .query<EnvironmentVariablesSharedQuery, EnvironmentVariablesSharedQueryVariables>(
           gql`
-            query EnvironmentVariablesShared($appId: String!, $filterNames: [String!]) {
+            query EnvironmentVariablesShared(
+              $appId: String!
+              $filterNames: [String!]
+              $environment: EnvironmentVariableEnvironment
+              $includeFileContent: Boolean!
+            ) {
               app {
                 byId(appId: $appId) {
                   id
                   ownerAccount {
                     id
-                    environmentVariables(filterNames: $filterNames) {
+                    environmentVariables(filterNames: $filterNames, environment: $environment) {
                       id
+                      linkedEnvironments(appId: $appId)
                       ...EnvironmentVariableFragment
+                      valueWithFileContent: value(includeFileContent: $includeFileContent)
+                        @include(if: $includeFileContent)
                     }
                   }
                 }
@@ -121,7 +160,7 @@ export const EnvironmentVariablesQuery = {
             }
             ${print(EnvironmentVariableFragmentNode)}
           `,
-          { appId, filterNames },
+          { appId, filterNames, environment, includeFileContent },
           { additionalTypenames: ['EnvironmentVariable'] }
         )
         .toPromise()
@@ -131,8 +170,18 @@ export const EnvironmentVariablesQuery = {
   },
   async sharedWithSensitiveAsync(
     graphqlClient: ExpoGraphqlClient,
-    { appId, filterNames }: { appId: string; filterNames?: string[] }
-  ): Promise<EnvironmentVariableFragment[]> {
+    {
+      appId,
+      filterNames,
+      environment,
+      includeFileContent = false,
+    }: {
+      appId: string;
+      filterNames?: string[];
+      environment?: EnvironmentVariableEnvironment;
+      includeFileContent?: boolean;
+    }
+  ): Promise<EnvironmentVariableWithFileContent[]> {
     const data = await withErrorHandlingAsync(
       graphqlClient
         .query(
@@ -140,23 +189,30 @@ export const EnvironmentVariablesQuery = {
             query EnvironmentVariablesSharedWithSensitive(
               $appId: String!
               $filterNames: [String!]
+              $environment: EnvironmentVariableEnvironment
+              $includeFileContent: Boolean!
             ) {
               app {
                 byId(appId: $appId) {
                   id
                   ownerAccount {
                     id
-                    environmentVariablesIncludingSensitive(filterNames: $filterNames) {
+                    environmentVariablesIncludingSensitive(
+                      filterNames: $filterNames
+                      environment: $environment
+                    ) {
                       id
-                      name
-                      value
+                      ...EnvironmentVariableWithSecretFragment
+                      valueWithFileContent: value(includeFileContent: $includeFileContent)
+                        @include(if: $includeFileContent)
                     }
                   }
                 }
               }
             }
+            ${print(EnvironmentVariableWithSecretFragmentNode)}
           `,
-          { appId, filterNames },
+          { appId, filterNames, environment, includeFileContent },
           { additionalTypenames: ['EnvironmentVariableWithSecret'] }
         )
         .toPromise()

packages/eas-cli/src/graphql/queries/GoogleServiceAccountKeyQuery.ts

@@ -0,0 +1,38 @@
+import gql from 'graphql-tag';
+
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { withErrorHandlingAsync } from '../client';
+import {
+  GoogleServiceAccountKeyByIdQuery,
+  GoogleServiceAccountKeyByIdQueryVariables,
+} from '../generated';
+
+export const GoogleServiceAccountKeyQuery = {
+  async getByIdAsync(
+    graphqlClient: ExpoGraphqlClient,
+    ascApiKeyId: string
+  ): Promise<{ keyJson: string }> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .query<GoogleServiceAccountKeyByIdQuery, GoogleServiceAccountKeyByIdQueryVariables>(
+          gql`
+            query GoogleServiceAccountKeyById($ascApiKeyId: ID!) {
+              googleServiceAccountKey {
+                byId(id: $ascApiKeyId) {
+                  id
+                  keyJson
+                }
+              }
+            }
+          `,
+          { ascApiKeyId },
+          {
+            additionalTypenames: ['GoogleServiceAccountKey'],
+          }
+        )
+        .toPromise()
+    );
+
+    return { keyJson: data.googleServiceAccountKey.byId.keyJson };
+  },
+};

packages/eas-cli/src/graphql/types/EnvironmentVariable.ts

@@ -5,9 +5,11 @@ export const EnvironmentVariableFragmentNode = gql`
     id
     name
     value
-    environment
+    environments
     createdAt
+    updatedAt
     scope
     visibility
+    type
   }
 `;

packages/eas-cli/src/graphql/types/EnvironmentVariableWithSecret.ts

@@ -0,0 +1,15 @@
+import gql from 'graphql-tag';
+
+export const EnvironmentVariableWithSecretFragmentNode = gql`
+  fragment EnvironmentVariableWithSecretFragment on EnvironmentVariableWithSecret {
+    id
+    name
+    value
+    environments
+    createdAt
+    updatedAt
+    scope
+    visibility
+    type
+  }
+`;

packages/eas-cli/src/graphql/types/Submission.ts

@@ -28,6 +28,6 @@ export const SubmissionFragmentNode = gql`
       errorCode
       message
     }
-    logsUrl
+    logFiles
   }
 `;

packages/eas-cli/src/metadata/download.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from '@expo/config';
 import { SubmitProfile } from '@expo/eas-json';
 import fs from 'fs-extra';
 import path from 'path';

packages/eas-cli/src/metadata/upload.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from '@expo/config';
 import { SubmitProfile } from '@expo/eas-json';
 
 import { AppleData } from './apple/data';

packages/eas-cli/src/project/__tests__/expoConfig.test.ts

@@ -46,17 +46,5 @@ describe('expoConfig', () => {
       await createOrModifyExpoConfigAsync('/app', { owner: 'ccheever' });
       expect(modifyConfigAsync).toHaveBeenCalledWith('/app', { owner: 'ccheever' });
     });
-
-    it('adds expo key if app.json is missing it', async () => {
-      jest.mocked(getConfigFilePaths).mockReturnValue({
-        staticConfigPath: '/app/app.json',
-        dynamicConfigPath: null,
-      });
-      jest.mocked(JsonFile.readAsync).mockResolvedValue({ name: 'App' });
-
-      await createOrModifyExpoConfigAsync('/app', { owner: 'ccheever' });
-      expect(JsonFile.writeAsync).toHaveBeenCalledWith('/app/app.json', { name: 'App', expo: {} });
-      expect(modifyConfigAsync).toHaveBeenCalledWith('/app', { owner: 'ccheever' });
-    });
   });
 });

packages/eas-cli/src/project/android/applicationId.ts

@@ -65,9 +65,6 @@ export async function getApplicationIdFromBareAsync(
   projectDir: string,
   gradleContext?: GradleBuildContext
 ): Promise<string> {
-  if (env.overrideAndroidApplicationId) {
-    return env.overrideAndroidApplicationId;
-  }
   const errorMessage = 'Could not read applicationId from Android project.';
 
   if (gradleContext) {
@@ -109,6 +106,10 @@ export async function getApplicationIdAsync(
   vcsClient: Client,
   gradleContext?: GradleBuildContext
 ): Promise<string> {
+  if (env.overrideAndroidApplicationId) {
+    return env.overrideAndroidApplicationId;
+  }
+
   const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
   if (workflow === Workflow.GENERIC) {
     warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp);

packages/eas-cli/src/project/expoConfig.ts

@@ -1,9 +1,7 @@
 import { ExpoConfig, getConfig, getConfigFilePaths, modifyConfigAsync } from '@expo/config';
 import { Env } from '@expo/eas-build-job';
-import JsonFile from '@expo/json-file';
 import fs from 'fs-extra';
 import Joi from 'joi';
-import nullthrows from 'nullthrows';
 import path from 'path';
 
 export type PublicExpoConfig = Omit<
@@ -31,7 +29,6 @@ export async function createOrModifyExpoConfigAsync(
   readOptions?: { skipSDKVersionRequirement?: boolean }
 ): ReturnType<typeof modifyConfigAsync> {
   ensureExpoConfigExists(projectDir);
-  await ensureStaticExpoConfigIsValidAsync(projectDir);
 
   if (readOptions) {
     return await modifyConfigAsync(projectDir, exp, readOptions);
@@ -95,20 +92,6 @@ export function ensureExpoConfigExists(projectDir: string): void {
   }
 }
 
-async function ensureStaticExpoConfigIsValidAsync(projectDir: string): Promise<void> {
-  if (isUsingStaticExpoConfig(projectDir)) {
-    const staticConfigPath = nullthrows(getConfigFilePaths(projectDir).staticConfigPath);
-    const staticConfig = await JsonFile.readAsync(staticConfigPath);
-
-    // Add the "expo" key if it doesn't exist on app.json yet, such as in
-    // projects initialized with RNC CLI
-    if (!staticConfig?.expo) {
-      staticConfig.expo = {};
-      await JsonFile.writeAsync(staticConfigPath, staticConfig);
-    }
-  }
-}
-
 export function isUsingStaticExpoConfig(projectDir: string): boolean {
   const paths = getConfigFilePaths(projectDir);
   return !!(paths.staticConfigPath?.endsWith('app.json') && !paths.dynamicConfigPath);

packages/eas-cli/src/project/ios/bundleIdentifier.ts

@@ -59,14 +59,15 @@ export async function getBundleIdentifierAsync(
   vcsClient: Client,
   xcodeContext?: { targetName?: string; buildConfiguration?: string }
 ): Promise<string> {
+  if (env.overrideIosBundleIdentifier) {
+    return env.overrideIosBundleIdentifier;
+  }
+
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+
   if (workflow === Workflow.GENERIC) {
     warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir, exp);
 
-    if (env.overrideIosBundleIdentifier) {
-      return env.overrideIosBundleIdentifier;
-    }
-
     const xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
     const isMultiScheme = IOSConfig.BuildScheme.getSchemesFromXcodeproj(projectDir).length > 1;
     const isMultiTarget =

packages/eas-cli/src/project/publish.ts

@@ -31,7 +31,7 @@ import { PublishQuery } from '../graphql/queries/PublishQuery';
 import Log, { learnMore } from '../log';
 import { RequestedPlatform, requestedPlatformDisplayNames } from '../platform';
 import { promptAsync } from '../prompts';
-import { getBranchNameFromChannelNameAsync } from '../update/getBranchNameFromChannelNameAsync';
+import { getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync } from '../update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync';
 import {
   UpdateJsonInfo,
   formatUpdateMessage,
@@ -598,7 +598,12 @@ export async function getBranchNameForCommandAsync({
   }
 
   if (channelNameArg) {
-    return await getBranchNameFromChannelNameAsync(graphqlClient, projectId, channelNameArg);
+    const { branchName } = await getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync(
+      graphqlClient,
+      projectId,
+      channelNameArg
+    );
+    return branchName;
   }
 
   if (branchNameArg) {

packages/eas-cli/src/prompts.ts

@@ -53,13 +53,16 @@ export async function selectAsync<T>(
   choices: ExpoChoice<T>[],
   config?: {
     options?: Options;
+    initial?: T;
     warningMessageForDisabledEntries?: string;
   }
 ): Promise<T> {
+  const initial = config?.initial ? choices.findIndex(({ value }) => value === config.initial) : 0;
   const { value } = await promptAsync(
     {
       message,
       choices,
+      initial,
       name: 'value',
       type: 'select',
       warn: config?.warningMessageForDisabledEntries,

packages/eas-cli/src/submit/ArchiveSource.ts

@@ -7,7 +7,7 @@ import * as uuid from 'uuid';
 import { getRecentBuildsForSubmissionAsync } from './utils/builds';
 import { isExistingFileAsync, uploadAppArchiveAsync } from './utils/files';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { BuildFragment } from '../graphql/generated';
+import { BuildFragment, BuildStatus } from '../graphql/generated';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
 import { toAppPlatform } from '../graphql/types/AppPlatform';
 import Log, { learnMore } from '../log';
@@ -89,6 +89,16 @@ export type ArchiveSource =
 
 export type ResolvedArchiveSource = ArchiveUrlSource | ArchiveGCSSource | ArchiveBuildSource;
 
+const buildStatusMapping: Record<BuildStatus, string> = {
+  [BuildStatus.New]: 'new',
+  [BuildStatus.InQueue]: 'in queue',
+  [BuildStatus.InProgress]: 'in progress',
+  [BuildStatus.Finished]: 'finished',
+  [BuildStatus.Errored]: 'errored',
+  [BuildStatus.PendingCancel]: 'canceled',
+  [BuildStatus.Canceled]: 'canceled',
+};
+
 export async function getArchiveAsync(
   ctx: ArchiveResolverContext,
   source: ArchiveSource
@@ -344,6 +354,7 @@ function formatBuildChoice(build: BuildFragment): prompts.Choice {
     gitCommitMessage,
     channel,
     message,
+    status,
   } = build;
   const buildDate = new Date(updatedAt);
 
@@ -368,6 +379,7 @@ function formatBuildChoice(build: BuildFragment): prompts.Choice {
         ? chalk.bold(message.length > 200 ? `${message.slice(0, 200)}...` : message)
         : null,
     },
+    { name: 'Status', value: buildStatusMapping[status] },
   ];
 
   const filteredDescriptionArray: string[] = descriptionItems
@@ -385,6 +397,10 @@ function formatBuildChoice(build: BuildFragment): prompts.Choice {
 async function handlePromptSourceAsync(
   ctx: ArchiveResolverContext
 ): Promise<ResolvedArchiveSource> {
+  if (ctx.nonInteractive) {
+    throw new Error('Please run this command with appropriate input.');
+  }
+
   const { sourceType: sourceTypeRaw } = await promptAsync({
     name: 'sourceType',
     type: 'select',

packages/eas-cli/src/submit/BaseSubmitter.ts

@@ -65,9 +65,13 @@ export default abstract class BaseSubmitter<
     return resolvedSourceOptions;
   }
 
-  public async submitAsync(): Promise<SubmissionFragment> {
+  public async getSubmissionInputAsync(): Promise<SubmissionInput<P>> {
     const resolvedSourceOptions = await this.getSourceOptionsAsync();
-    const input = await this.createSubmissionInputAsync(resolvedSourceOptions);
+    return await this.createSubmissionInputAsync(resolvedSourceOptions);
+  }
+
+  public async submitAsync(): Promise<SubmissionFragment> {
+    const input = await this.getSubmissionInputAsync();
     return await this.createSubmissionWithAnalyticsAsync(input);
   }
 

packages/eas-cli/src/submit/__tests__/ArchiveSource-test.ts

@@ -7,6 +7,7 @@ import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/creat
 import {
   AppPlatform,
   BuildFragment,
+  BuildStatus,
   SubmissionArchiveSourceType,
   UploadSessionType,
 } from '../../graphql/generated';
@@ -41,6 +42,17 @@ const MOCK_BUILD_FRAGMENT: Partial<BuildFragment> = {
   appVersion: '1.2.3',
   platform: AppPlatform.Android,
   updatedAt: Date.now(),
+  status: BuildStatus.Finished,
+};
+const MOCK_IN_PROGRESS_BUILD_FRAGMENT: Partial<BuildFragment> = {
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  status: BuildStatus.InProgress,
 };
 
 const SOURCE_STUB_INPUT = {
@@ -246,7 +258,7 @@ describe(getArchiveAsync, () => {
     expect(archive.sourceType).toBe(ArchiveSourceType.url);
   });
 
-  it('handles build-list-select source', async () => {
+  it('handles build-list-select source for finished builds', async () => {
     const projectId = uuidv4();
     jest
       .mocked(getRecentBuildsForSubmissionAsync)
@@ -269,6 +281,57 @@ describe(getArchiveAsync, () => {
     expect(archive.sourceType).toBe(ArchiveSourceType.build);
   });
 
+  it('handles build-list-select source for in-progress builds', async () => {
+    const projectId = uuidv4();
+    jest
+      .mocked(getRecentBuildsForSubmissionAsync)
+      .mockResolvedValueOnce([MOCK_IN_PROGRESS_BUILD_FRAGMENT as BuildFragment]);
+    jest
+      .mocked(promptAsync)
+      .mockResolvedValueOnce({ selectedBuild: MOCK_IN_PROGRESS_BUILD_FRAGMENT });
+
+    const archive = await getArchiveAsync(
+      { ...SOURCE_STUB_INPUT, graphqlClient, projectId },
+      {
+        sourceType: ArchiveSourceType.buildList,
+      }
+    );
+
+    expect(getRecentBuildsForSubmissionAsync).toBeCalledWith(
+      graphqlClient,
+      toAppPlatform(SOURCE_STUB_INPUT.platform),
+      projectId,
+      { limit: BUILD_LIST_ITEM_COUNT }
+    );
+    expect(archive.sourceType).toBe(ArchiveSourceType.build);
+  });
+
+  it('handles build-list-select source for both finished and in-progress builds', async () => {
+    const projectId = uuidv4();
+    jest
+      .mocked(getRecentBuildsForSubmissionAsync)
+      .mockResolvedValueOnce([
+        MOCK_IN_PROGRESS_BUILD_FRAGMENT as BuildFragment,
+        MOCK_BUILD_FRAGMENT as BuildFragment,
+      ]);
+    jest.mocked(promptAsync).mockResolvedValueOnce({ selectedBuild: MOCK_BUILD_FRAGMENT });
+
+    const archive = await getArchiveAsync(
+      { ...SOURCE_STUB_INPUT, graphqlClient, projectId },
+      {
+        sourceType: ArchiveSourceType.buildList,
+      }
+    );
+
+    expect(getRecentBuildsForSubmissionAsync).toBeCalledWith(
+      graphqlClient,
+      toAppPlatform(SOURCE_STUB_INPUT.platform),
+      projectId,
+      { limit: BUILD_LIST_ITEM_COUNT }
+    );
+    expect(archive.sourceType).toBe(ArchiveSourceType.build);
+  });
+
   it('prompts again if all builds have expired', async () => {
     jest.mocked(getRecentBuildsForSubmissionAsync).mockResolvedValueOnce([
       {

packages/eas-cli/src/submit/android/AndroidSubmitCommand.ts

@@ -4,11 +4,7 @@ import { Result, result } from '@expo/results';
 
 import AndroidSubmitter, { AndroidSubmissionOptions } from './AndroidSubmitter';
 import { ServiceAccountSource, ServiceAccountSourceType } from './ServiceAccountSource';
-import {
-  SubmissionAndroidReleaseStatus,
-  SubmissionAndroidTrack,
-  SubmissionFragment,
-} from '../../graphql/generated';
+import { SubmissionAndroidReleaseStatus, SubmissionAndroidTrack } from '../../graphql/generated';
 import Log from '../../log';
 import {
   AmbiguousApplicationIdError,
@@ -22,7 +18,7 @@ import { SubmissionContext } from '../context';
 export default class AndroidSubmitCommand {
   constructor(private ctx: SubmissionContext<Platform.ANDROID>) {}
 
-  async runAsync(): Promise<SubmissionFragment> {
+  async runAsync(): Promise<AndroidSubmitter> {
     Log.addNewLineIfNone();
     const archiveSource = this.resolveArchiveSource();
     if (!archiveSource.ok) {
@@ -48,7 +44,7 @@ export default class AndroidSubmitCommand {
     }
     const submissionOptions = await this.getAndroidSubmissionOptionsAsync(archiveSourceValue);
     const submitter = new AndroidSubmitter(this.ctx, submissionOptions, archive);
-    return await submitter.submitAsync();
+    return submitter;
   }
 
   private async getAndroidSubmissionOptionsAsync(

packages/eas-cli/src/submit/android/__tests__/AndroidSubmitCommand-test.ts

@@ -132,7 +132,9 @@ describe(AndroidSubmitCommand, () => {
         vcsClient,
       });
       const command = new AndroidSubmitCommand(ctx);
-      await expect(command.runAsync()).rejects.toThrowError(
+      await expect(
+        command.runAsync().then(submitter => submitter.submitAsync())
+      ).rejects.toThrowError(
         'Google Service Account Keys cannot be set up in --non-interactive mode.'
       );
     });
@@ -170,7 +172,8 @@ describe(AndroidSubmitCommand, () => {
       });
 
       const command = new AndroidSubmitCommand(ctx);
-      await command.runAsync();
+      const submitter = await command.runAsync();
+      await submitter.submitAsync();
 
       expect(SubmissionMutation.createAndroidSubmissionAsync).toHaveBeenCalledWith(graphqlClient, {
         appId: projectId,
@@ -216,7 +219,8 @@ describe(AndroidSubmitCommand, () => {
       });
 
       const command = new AndroidSubmitCommand(ctx);
-      await command.runAsync();
+      const submitter = await command.runAsync();
+      await submitter.submitAsync();
 
       expect(SubmissionMutation.createAndroidSubmissionAsync).toHaveBeenCalledWith(graphqlClient, {
         appId: projectId,
@@ -264,7 +268,8 @@ describe(AndroidSubmitCommand, () => {
         vcsClient,
       });
       const command = new AndroidSubmitCommand(ctx);
-      await command.runAsync();
+      const submitter = await command.runAsync();
+      await submitter.submitAsync();
 
       expect(SubmissionMutation.createAndroidSubmissionAsync).toHaveBeenCalledWith(graphqlClient, {
         appId: projectId,
@@ -329,7 +334,8 @@ describe(AndroidSubmitCommand, () => {
         });
 
         const command = new AndroidSubmitCommand(ctx);
-        await command.runAsync();
+        const submitter = await command.runAsync();
+        await submitter.submitAsync();
 
         expect(SubmissionMutation.createAndroidSubmissionAsync).toHaveBeenCalledWith(
           graphqlClient,
@@ -391,7 +397,8 @@ describe(AndroidSubmitCommand, () => {
         });
 
         const command = new AndroidSubmitCommand(ctx);
-        await command.runAsync();
+        const submitter = await command.runAsync();
+        await submitter.submitAsync();
 
         expect(SubmissionMutation.createAndroidSubmissionAsync).toHaveBeenCalledWith(
           graphqlClient,
@@ -461,7 +468,8 @@ describe(AndroidSubmitCommand, () => {
         });
 
         const command = new AndroidSubmitCommand(ctx);
-        await command.runAsync();
+        const submitter = await command.runAsync();
+        await submitter.submitAsync();
 
         expect(SubmissionMutation.createAndroidSubmissionAsync).toHaveBeenCalledWith(
           graphqlClient,

packages/eas-cli/src/submit/ios/IosSubmitCommand.ts

@@ -12,7 +12,6 @@ import {
 import { AscApiKeySource, AscApiKeySourceType } from './AscApiKeySource';
 import IosSubmitter, { IosSubmissionOptions } from './IosSubmitter';
 import { MissingCredentialsError } from '../../credentials/errors';
-import { SubmissionFragment } from '../../graphql/generated';
 import Log, { learnMore } from '../../log';
 import { ArchiveSource, ArchiveSourceType, getArchiveAsync } from '../ArchiveSource';
 import { refreshContextSubmitProfileAsync, resolveArchiveSource } from '../commons';
@@ -21,7 +20,7 @@ import { SubmissionContext } from '../context';
 export default class IosSubmitCommand {
   constructor(private ctx: SubmissionContext<Platform.IOS>) {}
 
-  async runAsync(): Promise<SubmissionFragment> {
+  async runAsync(): Promise<IosSubmitter> {
     Log.addNewLineIfNone();
     const archiveSource = this.resolveArchiveSource();
     if (!archiveSource.ok) {
@@ -47,7 +46,7 @@ export default class IosSubmitCommand {
     }
     const options = await this.resolveSubmissionOptionsAsync(archiveSourceValue);
     const submitter = new IosSubmitter(this.ctx, options, archive);
-    return await submitter.submitAsync();
+    return submitter;
   }
 
   private async resolveSubmissionOptionsAsync(

packages/eas-cli/src/submit/ios/__tests__/IosSubmitCommand-test.ts

@@ -109,7 +109,7 @@ describe(IosSubmitCommand, () => {
       vcsClient,
     });
     const command = new IosSubmitCommand(ctx);
-    await expect(command.runAsync()).rejects.toThrow(
+    await expect(command.runAsync().then(submitter => submitter.submitAsync())).rejects.toThrow(
       'EXPO_APPLE_APP_SPECIFIC_PASSWORD must be in the format xxxx-xxxx-xxxx-xxxx, where x is a lowercase letter.'
     );
 
@@ -144,7 +144,9 @@ describe(IosSubmitCommand, () => {
         vcsClient,
       });
       const command = new IosSubmitCommand(ctx);
-      await expect(command.runAsync()).rejects.toThrowError();
+      await expect(
+        command.runAsync().then(submitter => submitter.submitAsync())
+      ).rejects.toThrowError();
     });
   });
 
@@ -180,7 +182,8 @@ describe(IosSubmitCommand, () => {
         vcsClient,
       });
       const command = new IosSubmitCommand(ctx);
-      await command.runAsync();
+      const submitter = await command.runAsync();
+      await submitter.submitAsync();
 
       expect(SubmissionMutation.createIosSubmissionAsync).toHaveBeenCalledWith(graphqlClient, {
         appId: projectId,
@@ -245,7 +248,8 @@ describe(IosSubmitCommand, () => {
           vcsClient,
         });
         const command = new IosSubmitCommand(ctx);
-        await command.runAsync();
+        const submitter = await command.runAsync();
+        await submitter.submitAsync();
 
         expect(SubmissionMutation.createIosSubmissionAsync).toHaveBeenCalledWith(graphqlClient, {
           appId: projectId,
@@ -304,7 +308,8 @@ describe(IosSubmitCommand, () => {
           vcsClient,
         });
         const command = new IosSubmitCommand(ctx);
-        await command.runAsync();
+        const submitter = await command.runAsync();
+        await submitter.submitAsync();
 
         expect(SubmissionMutation.createIosSubmissionAsync).toHaveBeenCalledWith(graphqlClient, {
           appId: projectId,
@@ -369,7 +374,8 @@ describe(IosSubmitCommand, () => {
           specifiedProfile: 'specificProfile',
         });
         const command = new IosSubmitCommand(ctx);
-        await command.runAsync();
+        const submitter = await command.runAsync();
+        await submitter.submitAsync();
 
         expect(SubmissionMutation.createIosSubmissionAsync).toHaveBeenCalledWith(graphqlClient, {
           appId: projectId,

packages/eas-cli/src/submit/submit.ts

@@ -23,7 +23,8 @@ export async function submitAsync<T extends Platform>(
         ctx.platform === Platform.ANDROID
           ? new AndroidSubmitCommand(ctx as SubmissionContext<Platform.ANDROID>)
           : new IosSubmitCommand(ctx as SubmissionContext<Platform.IOS>);
-      return await command.runAsync();
+      const submitter = await command.runAsync();
+      return await submitter.submitAsync();
     },
     {
       attemptEvent: SubmissionEvent.SUBMIT_COMMAND_ATTEMPT,

packages/eas-cli/src/submit/utils/__tests__/builds-test.ts

@@ -0,0 +1,226 @@
+import { v4 as uuidv4 } from 'uuid';
+
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildStatus,
+  SubmissionArchiveSourceType,
+} from '../../../graphql/generated';
+import { BuildQuery } from '../../../graphql/queries/BuildQuery';
+import { getRecentBuildsForSubmissionAsync } from '../builds';
+
+jest.mock('../../../graphql/queries/BuildQuery', () => ({
+  BuildQuery: {
+    viewBuildsOnAppAsync: jest.fn(),
+  },
+}));
+
+const ARCHIVE_SOURCE = {
+  type: SubmissionArchiveSourceType.Url,
+  url: 'https://url.to/archive.tar.gz',
+};
+
+const MOCK_BUILD_FRAGMENTS: Partial<BuildFragment>[] = Array(5).map(() => ({
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  createdAt: Date.now(),
+  status: BuildStatus.Finished,
+}));
+const MOCK_IN_PROGRESS_BUILD_FRAGMENTS: Partial<BuildFragment>[] = Array(2).map(() => ({
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  createdAt: Date.now(),
+  status: BuildStatus.InProgress,
+}));
+const MOCK_IN_QUEUE_BUILD_FRAGMENTS = Array(2).map(() => ({
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  createdAt: Date.now(),
+  status: BuildStatus.InQueue,
+}));
+const MOCK_NEW_BUILD_FRAGMENTS = Array(1).map(() => ({
+  id: uuidv4(),
+  artifacts: {
+    buildUrl: ARCHIVE_SOURCE.url,
+  },
+  appVersion: '1.2.3',
+  platform: AppPlatform.Android,
+  updatedAt: Date.now(),
+  createdAt: Date.now(),
+  status: BuildStatus.New,
+}));
+
+describe(getRecentBuildsForSubmissionAsync, () => {
+  let graphqlClient: ExpoGraphqlClient;
+
+  beforeEach(() => {
+    graphqlClient = {} as any as ExpoGraphqlClient;
+  });
+
+  it('returns finished builds', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce(
+        MOCK_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      );
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit }
+    );
+
+    expect(result).toMatchObject(
+      MOCK_BUILD_FRAGMENTS.slice(0, Math.min(limit, MOCK_BUILD_FRAGMENTS.length))
+    );
+  });
+
+  it('returns in-progress builds', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce(
+        MOCK_IN_PROGRESS_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_IN_PROGRESS_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      )
+      .mockResolvedValueOnce([] as BuildFragment[]);
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit }
+    );
+
+    expect(result).toMatchObject(
+      MOCK_IN_PROGRESS_BUILD_FRAGMENTS.slice(
+        0,
+        Math.min(limit, MOCK_IN_PROGRESS_BUILD_FRAGMENTS.length)
+      )
+    );
+  });
+
+  it('returns in-queue builds', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce(
+        MOCK_IN_QUEUE_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_IN_QUEUE_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      )
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[]);
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit }
+    );
+
+    expect(result).toMatchObject(
+      MOCK_IN_QUEUE_BUILD_FRAGMENTS.slice(0, Math.min(limit, MOCK_IN_QUEUE_BUILD_FRAGMENTS.length))
+    );
+  });
+
+  it('returns new builds', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce(
+        MOCK_NEW_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_NEW_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      )
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[])
+      .mockResolvedValueOnce([] as BuildFragment[]);
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit }
+    );
+
+    expect(result).toMatchObject(
+      MOCK_NEW_BUILD_FRAGMENTS.slice(0, Math.min(limit, MOCK_NEW_BUILD_FRAGMENTS.length))
+    );
+  });
+
+  it('returns up to "limit" newest builds regardless of status', async () => {
+    const appId = uuidv4();
+    const limit = 2;
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockResolvedValueOnce(
+        MOCK_NEW_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_NEW_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      )
+      .mockResolvedValueOnce(
+        MOCK_IN_QUEUE_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_IN_QUEUE_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      )
+      .mockResolvedValueOnce(
+        MOCK_IN_PROGRESS_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_IN_PROGRESS_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      )
+      .mockResolvedValueOnce(
+        MOCK_BUILD_FRAGMENTS.slice(
+          0,
+          Math.min(limit, MOCK_BUILD_FRAGMENTS.length)
+        ) as BuildFragment[]
+      );
+
+    const result = await getRecentBuildsForSubmissionAsync(
+      graphqlClient,
+      AppPlatform.Android,
+      appId,
+      { limit }
+    );
+
+    expect(result).toMatchObject([MOCK_NEW_BUILD_FRAGMENTS[0], MOCK_IN_QUEUE_BUILD_FRAGMENTS[1]]);
+  });
+});

packages/eas-cli/src/submit/utils/builds.ts

@@ -8,14 +8,29 @@ export async function getRecentBuildsForSubmissionAsync(
   appId: string,
   { limit = 1 }: { limit?: number } = {}
 ): Promise<BuildFragment[]> {
-  return await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-    appId,
-    limit,
-    offset: 0,
-    filter: {
-      platform,
-      distribution: DistributionType.Store,
-      status: BuildStatus.Finished,
-    },
-  });
+  const allowedStatuses = [
+    BuildStatus.New,
+    BuildStatus.InQueue,
+    BuildStatus.InProgress,
+    BuildStatus.Finished,
+  ];
+  const buildsPromises: Promise<BuildFragment[]>[] = [];
+  for (const buildStatus of allowedStatuses) {
+    buildsPromises.push(
+      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+        appId,
+        limit,
+        offset: 0,
+        filter: {
+          platform,
+          distribution: DistributionType.Store,
+          status: buildStatus,
+        },
+      })
+    );
+  }
+  const builds = (await Promise.all(buildsPromises)).reduce((acc, value) => acc.concat(value), []);
+  builds.sort((buildA, buildB) => (buildA.createdAt > buildB.createdAt ? -1 : 1));
+
+  return builds.slice(0, limit);
 }

packages/eas-cli/src/submit/utils/logs.ts

@@ -22,21 +22,20 @@ export async function displayLogsAsync(
 }
 
 async function downloadAndPrintSubmissionLogsAsync(submission: SubmissionFragment): Promise<void> {
-  if (!submission.logsUrl) {
-    return;
-  }
-  const response = await fetch(submission.logsUrl);
-  const logs = parseLogs(await response.text());
-  Log.addNewLineIfNone();
-  const prefix = chalk.blueBright('[logs] ');
-  for (const { level, msg } of logs) {
-    const msgWithPrefix = `${prefix}${msg}`;
-    if (level === 'error') {
-      Log.error(msgWithPrefix);
-    } else if (level === 'warn') {
-      Log.warn(msgWithPrefix);
-    } else {
-      Log.log(msgWithPrefix);
+  for (const logFile of submission.logFiles) {
+    const response = await fetch(logFile);
+    const logs = parseLogs(await response.text());
+    Log.addNewLineIfNone();
+    const prefix = chalk.blueBright('[logs] ');
+    for (const { level, msg } of logs) {
+      const msgWithPrefix = `${prefix}${msg}`;
+      if (level === 'error') {
+        Log.error(msgWithPrefix);
+      } else if (level === 'warn') {
+        Log.warn(msgWithPrefix);
+      } else {
+        Log.log(msgWithPrefix);
+      }
     }
   }
 }

packages/eas-cli/src/update/__tests__/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync-test.ts

@@ -3,19 +3,19 @@ import { instance, mock } from 'ts-mockito';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import {
   App,
+  DeploymentResult,
   Runtime,
   UpdateBranch,
   UpdateChannel,
-  UpdateDeploymentsConnection,
   UpdateInsights,
 } from '../../graphql/generated';
 import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
-import { getBranchNameFromChannelNameAsync } from '../getBranchNameFromChannelNameAsync';
+import { getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync } from '../getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync';
 
 jest.mock('../../graphql/queries/ChannelQuery');
 jest.mock('../../graphql/queries/BranchQuery');
 
-describe(getBranchNameFromChannelNameAsync, () => {
+describe(getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync, () => {
   beforeEach(() => {
     jest.resetAllMocks();
   });
@@ -30,13 +30,14 @@ describe(getBranchNameFromChannelNameAsync, () => {
         }) as any
     );
 
-    const result = await getBranchNameFromChannelNameAsync(
+    const result = await getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync(
       graphqlClient,
       'test-project-id',
       'channel-name'
     );
 
-    expect(result).toBe('test-branch-name');
+    expect(result.branchId).toBeTruthy();
+    expect(result.branchName).toBe('test-branch-name');
   });
 
   test('errors when no branch is connected to channel', async () => {
@@ -49,7 +50,11 @@ describe(getBranchNameFromChannelNameAsync, () => {
     );
 
     await expect(
-      getBranchNameFromChannelNameAsync(graphqlClient, 'test-project-id', 'test-channel-name')
+      getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync(
+        graphqlClient,
+        'test-project-id',
+        'test-channel-name'
+      )
     ).rejects.toThrow(
       "Channel has no branches associated with it. Run 'eas channel:edit' to map a branch"
     );
@@ -66,7 +71,11 @@ describe(getBranchNameFromChannelNameAsync, () => {
     );
 
     await expect(
-      getBranchNameFromChannelNameAsync(graphqlClient, 'test-project-id', 'test-channel-name')
+      getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync(
+        graphqlClient,
+        'test-project-id',
+        'test-channel-name'
+      )
     ).rejects.toThrow(
       "Channel has multiple branches associated with it. Instead, use '--branch' instead of '--channel'"
     );
@@ -82,13 +91,13 @@ describe(getBranchNameFromChannelNameAsync, () => {
         }) as any
     );
 
-    const result = await getBranchNameFromChannelNameAsync(
+    const result = await getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync(
       graphqlClient,
       'test-project-id',
       'test-channel-name'
     );
 
-    expect(result).toBe('test-branch-name');
+    expect(result.branchName).toBe('test-branch-name');
   });
 });
 
@@ -109,6 +118,7 @@ function mockUpdateChannel({
     branchMapping:
       '{"data":[{"branchId":"f9dc4dbb-663f-4a19-8cf2-a783b484d2db","branchMappingLogic":"true"}],"version":0}',
     updateBranches: branchNames ? mockUpdateBranches(branchNames) : [],
+    isPaused: false,
     __typename: 'UpdateChannel',
   };
 }
@@ -134,7 +144,7 @@ function mockUpdateBranches(branchNames: string[]): UpdateBranch[] {
           runtimeVersion: '1.0.0',
           runtime: {} as Runtime, // Temporary fix to resolve type errors
           insights: {} as UpdateInsights, // Temporary fix to resolve type errors
-          deployments: {} as UpdateDeploymentsConnection, // Temporary fix to resolve type errors
+          deployments: {} as DeploymentResult, // Temporary fix to resolve type errors
           platform: 'ios',
           manifestFragment: '...',
           isRollBackToEmbedded: false,

packages/eas-cli/src/update/configure.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from '@expo/config';
 import { Env, Platform, Workflow } from '@expo/eas-build-job';
 import { EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';

packages/eas-cli/src/update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync.ts

@@ -4,12 +4,12 @@ import { createChannelOnAppAsync } from '../channel/queries';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { ChannelQuery } from '../graphql/queries/ChannelQuery';
 
-export async function getBranchNameFromChannelNameAsync(
+export async function getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync(
   graphqlClient: ExpoGraphqlClient,
   projectId: string,
   channelName: string
-): Promise<string> {
-  let branchName;
+): Promise<{ branchName: string; branchId: string }> {
+  let branchInfo: { branchName: string; branchId: string };
 
   try {
     const channel = await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
@@ -18,7 +18,8 @@ export async function getBranchNameFromChannelNameAsync(
     });
 
     if (channel.updateBranches.length === 1) {
-      branchName = channel.updateBranches[0].name;
+      const branch = channel.updateBranches[0];
+      branchInfo = { branchId: branch.id, branchName: branch.name };
     } else if (channel.updateBranches.length === 0) {
       throw new Error(
         "Channel has no branches associated with it. Run 'eas channel:edit' to map a branch"
@@ -51,8 +52,8 @@ export async function getBranchNameFromChannelNameAsync(
       );
     }
 
-    branchName = channelName;
+    branchInfo = { branchId, branchName: channelName };
   }
 
-  return branchName;
+  return branchInfo;
 }

packages/eas-cli/src/update/republish.ts

@@ -58,7 +58,10 @@ export async function republishAsync({
     update.branchId === arbitraryUpdate.branchId &&
     update.branchName === arbitraryUpdate.branchName &&
     update.runtimeVersion === arbitraryUpdate.runtimeVersion;
-  assert(updatesToPublish.every(isSameGroup), 'All updates must belong to the same update group');
+  assert(
+    updatesToPublish.every(isSameGroup),
+    'All updates being republished must belong to the same update group'
+  );
 
   assert(
     updatesToPublish.every(u => u.isRollBackToEmbedded) ||
@@ -66,6 +69,11 @@ export async function republishAsync({
     'All updates must either be roll back to embedded updates or not'
   );
 
+  assert(
+    !updatesToPublish.some(u => !!u.rolloutControlUpdate),
+    'Cannot republish an update that is being rolled-out. Either complete the update rollout and then republish or publish a new rollout update.'
+  );
+
   const { runtimeVersion } = arbitraryUpdate;
 
   // If codesigning was created for the original update, we need to add it to the republish.
@@ -90,7 +98,9 @@ export async function republishAsync({
       }
     }
 
-    Log.withTick(`The republished update group will be signed`);
+    Log.withTick(
+      `The republished update group will be signed with the same code signing key and algorithm as the original update`
+    );
   }
 
   const publishIndicator = ora('Republishing...').start();

packages/eas-cli/src/utils/expoCli.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config-types';
+import { ExpoConfig } from '@expo/config';
 import spawnAsync from '@expo/spawn-async';
 import chalk from 'chalk';
 import { boolish } from 'getenv';

packages/eas-cli/src/utils/formatVariable.ts

@@ -1,14 +0,0 @@
-import dateFormat from 'dateformat';
-
-import formatFields from './formatFields';
-import { EnvironmentVariableFragment } from '../graphql/generated';
-
-export function formatVariable(variable: EnvironmentVariableFragment): string {
-  return formatFields([
-    { label: 'ID', value: variable.id },
-    { label: 'Name', value: variable.name },
-    { label: 'Value', value: variable.value ?? '(secret)' },
-    { label: 'Scope', value: variable.scope },
-    { label: 'Created at', value: dateFormat(variable.createdAt, 'mmm dd HH:MM:ss') },
-  ]);
-}

packages/eas-cli/src/utils/prompts.ts

@@ -1,31 +1,138 @@
 import chalk from 'chalk';
 
-import { EnvironmentVariableEnvironment } from '../graphql/generated';
+import {
+  EnvironmentSecretType,
+  EnvironmentVariableEnvironment,
+  EnvironmentVariableVisibility,
+} from '../graphql/generated';
 import { promptAsync, selectAsync } from '../prompts';
 
-export async function promptVariableEnvironmentAsync(
-  nonInteractive: boolean
-): Promise<EnvironmentVariableEnvironment> {
+export async function promptVariableTypeAsync(
+  nonInteractive: boolean,
+  initialType?: EnvironmentSecretType
+): Promise<EnvironmentSecretType> {
+  if (nonInteractive) {
+    throw new Error('The `--type` flag must be set when running in `--non-interactive` mode.');
+  }
+
+  const options = [
+    {
+      title: 'String',
+      value: EnvironmentSecretType.String,
+    },
+    {
+      title: 'File',
+      value: EnvironmentSecretType.FileBase64,
+    },
+  ];
+
+  return await selectAsync('Select the type of variable', options, {
+    initial: initialType,
+  });
+}
+
+export function parseVisibility(
+  stringVisibility: 'plaintext' | 'sensitive' | 'encrypted'
+): EnvironmentVariableVisibility {
+  switch (stringVisibility) {
+    case 'plaintext':
+      return EnvironmentVariableVisibility.Public;
+    case 'sensitive':
+      return EnvironmentVariableVisibility.Sensitive;
+    case 'encrypted':
+      return EnvironmentVariableVisibility.Secret;
+    default:
+      throw new Error(`Invalid visibility: ${stringVisibility}`);
+  }
+}
+
+export async function promptVariableVisibilityAsync(
+  nonInteractive: boolean,
+  selectedVisibility?: EnvironmentVariableVisibility | null
+): Promise<EnvironmentVariableVisibility> {
+  if (nonInteractive) {
+    throw new Error(
+      'The `--visibility` flag must be set when running in `--non-interactive` mode.'
+    );
+  }
+  return await selectAsync('Select visibility:', [
+    {
+      title: 'Plain text',
+      value: EnvironmentVariableVisibility.Public,
+      selected: selectedVisibility === EnvironmentVariableVisibility.Public,
+    },
+    {
+      title: 'Sensitive',
+      value: EnvironmentVariableVisibility.Sensitive,
+      selected: selectedVisibility === EnvironmentVariableVisibility.Sensitive,
+    },
+    {
+      title: 'Encrypted',
+      value: EnvironmentVariableVisibility.Secret,
+      selected: selectedVisibility === EnvironmentVariableVisibility.Secret,
+    },
+  ]);
+}
+
+type EnvironmentPromptArgs = {
+  nonInteractive: boolean;
+  selectedEnvironments?: EnvironmentVariableEnvironment[];
+  availableEnvironments?: EnvironmentVariableEnvironment[];
+};
+
+export function promptVariableEnvironmentAsync(
+  input: EnvironmentPromptArgs & { multiple: true }
+): Promise<EnvironmentVariableEnvironment[]>;
+export function promptVariableEnvironmentAsync(
+  input: EnvironmentPromptArgs & { multiple?: false }
+): Promise<EnvironmentVariableEnvironment>;
+
+export async function promptVariableEnvironmentAsync({
+  nonInteractive,
+  selectedEnvironments,
+  multiple = false,
+  availableEnvironments,
+}: EnvironmentPromptArgs & { multiple?: boolean }): Promise<
+  EnvironmentVariableEnvironment[] | EnvironmentVariableEnvironment
+> {
   if (nonInteractive) {
     throw new Error(
       'The `--environment` flag must be set when running in `--non-interactive` mode.'
     );
   }
-  return await selectAsync('Select environment:', [
-    { title: 'Development', value: EnvironmentVariableEnvironment.Development },
-    { title: 'Preview', value: EnvironmentVariableEnvironment.Preview },
-    { title: 'Production', value: EnvironmentVariableEnvironment.Production },
-  ]);
+  if (!multiple) {
+    return await selectAsync(
+      'Select environment:',
+      (availableEnvironments ?? Object.values(EnvironmentVariableEnvironment)).map(environment => ({
+        title: environment.toLocaleLowerCase(),
+        value: environment,
+      }))
+    );
+  }
+  const { environments } = await promptAsync({
+    message: 'Select environment:',
+    name: 'environments',
+    type: 'multiselect',
+    choices: Object.values(EnvironmentVariableEnvironment).map(environment => ({
+      title: environment.toLocaleLowerCase(),
+      value: environment,
+      selected: selectedEnvironments?.includes(environment),
+    })),
+  });
+  return environments;
 }
+
 export async function promptVariableValueAsync({
   nonInteractive,
   required = true,
   hidden = false,
+  filePath = false,
   initial,
 }: {
   nonInteractive: boolean;
   required?: boolean;
   initial?: string | null;
+  filePath?: boolean;
   hidden?: boolean;
 }): Promise<string> {
   if (nonInteractive && required) {
@@ -37,9 +144,9 @@ export async function promptVariableValueAsync({
   }
 
   const { variableValue } = await promptAsync({
-    type: hidden ? 'password' : 'text',
+    type: hidden && !filePath ? 'password' : 'text',
     name: 'variableValue',
-    message: 'Variable value:',
+    message: filePath ? 'File path:' : 'Variable value:',
     initial: initial ?? '',
     validate: variableValue => {
       if (!required) {
@@ -63,7 +170,10 @@ export async function promptVariableValueAsync({
   return variableValue;
 }
 
-export async function promptVariableNameAsync(nonInteractive: boolean): Promise<string> {
+export async function promptVariableNameAsync(
+  nonInteractive: boolean,
+  initialValue?: string
+): Promise<string> {
   const validationMessage = 'Variable name may not be empty.';
   if (nonInteractive) {
     throw new Error(validationMessage);
@@ -73,6 +183,7 @@ export async function promptVariableNameAsync(nonInteractive: boolean): Promise<
     type: 'text',
     name: 'name',
     message: `Variable name:`,
+    initial: initialValue,
     validate: value => {
       if (!value) {
         return validationMessage;

packages/eas-cli/src/utils/variableUtils.ts

@@ -0,0 +1,75 @@
+import dateFormat from 'dateformat';
+
+import formatFields from './formatFields';
+import {
+  EnvironmentSecretType,
+  EnvironmentVariableEnvironment,
+  EnvironmentVariableFragment,
+  EnvironmentVariableScope,
+  EnvironmentVariableVisibility,
+} from '../graphql/generated';
+import { EnvironmentVariableWithFileContent } from '../graphql/queries/EnvironmentVariablesQuery';
+
+export function formatVariableName(variable: EnvironmentVariableFragment): string {
+  const name = variable.name;
+  const scope = variable.scope === EnvironmentVariableScope.Project ? 'project' : 'shared';
+  const environments = variable.environments?.join(', ') ?? '';
+  const updatedAt = variable.updatedAt ? new Date(variable.updatedAt).toLocaleString() : '';
+  const type = variable.type === EnvironmentSecretType.FileBase64 ? 'file' : 'string';
+  const visibility = variable.visibility;
+  return `${name} | ${scope} | ${type} | ${visibility} | ${environments} | Updated at: ${updatedAt}`;
+}
+
+export function formatVariableValue(variable: EnvironmentVariableWithFileContent): string {
+  // TODO: Add Learn more link
+
+  if (variable.value) {
+    return variable.value;
+  }
+
+  if (variable.valueWithFileContent) {
+    return atob(variable.valueWithFileContent);
+  }
+
+  if (variable.visibility === EnvironmentVariableVisibility.Sensitive) {
+    return '***** (This is a sensitive env variable. To access it, run command with --include-sensitive flag. Learn more.)';
+  }
+
+  if (variable.visibility === EnvironmentVariableVisibility.Secret) {
+    return "***** (This is a secret env variable that can only be accessed on EAS builder and can't be read in any UI. Learn more.)";
+  }
+
+  if (variable.type === EnvironmentSecretType.FileBase64) {
+    return '***** (This is a file env variable. To access it, run command with --include-file-content flag. Learn more.)';
+  }
+
+  return '*****';
+}
+
+export async function performForEnvironmentsAsync(
+  environments: EnvironmentVariableEnvironment[] | null,
+  fun: (environment: EnvironmentVariableEnvironment | undefined) => Promise<any>
+): Promise<any[]> {
+  const selectedEnvironments = environments ?? [undefined];
+  return await Promise.all(selectedEnvironments.map(env => fun(env)));
+}
+
+export function formatVariable(variable: EnvironmentVariableWithFileContent): string {
+  return formatFields([
+    { label: 'ID', value: variable.id },
+    { label: 'Name', value: variable.name },
+    { label: 'Value', value: formatVariableValue(variable) },
+    { label: 'Scope', value: variable.scope },
+    { label: 'Visibility', value: variable.visibility ?? '' },
+    {
+      label: 'Environments',
+      value: variable.environments ? variable.environments.join(', ') : '-',
+    },
+    {
+      label: 'type',
+      value: variable.type === EnvironmentSecretType.FileBase64 ? 'file' : 'string',
+    },
+    { label: 'Created at', value: dateFormat(variable.createdAt, 'mmm dd HH:MM:ss') },
+    { label: 'Updated at', value: dateFormat(variable.updatedAt, 'mmm dd HH:MM:ss') },
+  ]);
+}

packages/eas-cli/src/worker/assets.ts

@@ -82,12 +82,14 @@ export type AssetMap = Record<string, string>;
 
 /** Creates an asset map of a given target path */
 async function createAssetMapAsync(
-  assetPath: string,
+  assetPath?: string,
   options?: AssetMapOptions
 ): Promise<AssetMap> {
   const map: AssetMap = Object.create(null);
-  for await (const file of listFilesRecursively(assetPath)) {
-    map[file.normalizedPath] = await computeSha512HashAsync(file.path, options?.hashOptions);
+  if (assetPath) {
+    for await (const file of listFilesRecursively(assetPath)) {
+      map[file.normalizedPath] = await computeSha512HashAsync(file.path, options?.hashOptions);
+    }
   }
   return map;
 }
@@ -142,18 +144,23 @@ async function* listWorkerFilesAsync(workerPath: string): AsyncGenerator<WorkerF
   }
 }
 
+interface AssetFileEntry {
+  normalizedPath: string;
+  sha512: string;
+  path: string;
+}
+
 /** Reads files of an asset maps and enumerates normalized paths and data */
 async function* listAssetMapFilesAsync(
   assetPath: string,
   assetMap: AssetMap
-): AsyncGenerator<WorkerFileEntry> {
+): AsyncGenerator<AssetFileEntry> {
   for (const normalizedPath in assetMap) {
     const filePath = path.resolve(assetPath, normalizedPath.split('/').join(path.sep));
-    const data = await fs.promises.readFile(filePath);
     yield {
       normalizedPath,
       path: filePath,
-      data,
+      sha512: assetMap[normalizedPath],
     };
   }
 }

packages/eas-cli/src/worker/deployment.ts

@@ -32,32 +32,21 @@ export async function getSignedDeploymentUrlAsync(
       ['APP_NO_DEV_DOMAIN_NAME'].includes(e?.extensions?.errorCode as string)
     );
 
+    // Throw unexpected errors eagerly
     if (!isMissingDevDomain) {
       throw error;
     }
-    if (options.nonInteractive) {
-      throw new Error(
-        'The project URL needs to be set up, but the terminal is running in non-interactive mode.'
-      );
-    }
-
-    const suggestedDevDomainName = await DeploymentsQuery.getSuggestedDevDomainByAppIdAsync(
-      graphqlClient,
-      { appId: options.appId }
-    );
 
+    // Ensure the callback is invoked, containing cleanup logic for possible spinners
     options.onSetupDevDomain?.();
-
-    await chooseDevDomainNameAsync({
+    // Assign the dev domain name by prompting the user
+    await assignDevDomainNameAsync({
       graphqlClient,
       appId: options.appId,
-      initial: suggestedDevDomainName,
-    });
-
-    return await DeploymentsMutation.createSignedDeploymentUrlAsync(graphqlClient, {
-      appId: options.appId,
-      deploymentIdentifier: options.deploymentIdentifier,
+      nonInteractive: options.nonInteractive,
     });
+    // Retry creating the signed URL
+    return await getSignedDeploymentUrlAsync(graphqlClient, options);
   }
 }
 
@@ -89,32 +78,24 @@ function formatDevDomainName(name = ''): string {
     .trim();
 }
 
-async function chooseDevDomainNameAsync({
-  graphqlClient,
-  appId,
-  initial,
-}: {
-  graphqlClient: ExpoGraphqlClient;
-  appId: string;
-  initial: string;
-}): Promise<void> {
+async function promptDevDomainNameAsync(initialDevDomain: string): Promise<string> {
   const rootDomain = `.${EXPO_BASE_DOMAIN}.app`;
   const memoizedFormatDevDomainName = memoize(formatDevDomainName);
 
   const { name } = await promptAsync({
     type: 'text',
     name: 'name',
-    message: 'Choose a URL for your project:',
-    initial,
+    message: 'Choose a preview URL for your project:',
+    initial: initialDevDomain,
     validate: (value: string) => {
       if (!value) {
-        return 'You have to choose a URL for your project';
+        return 'You have to choose a preview URL for your project';
       }
       if (value.length < 3) {
-        return 'Project URLs must be at least 3 characters long';
+        return 'Preview URLs must be at least 3 characters long';
       }
       if (value.endsWith('-')) {
-        return 'Project URLs cannot end with a hyphen (-)';
+        return 'Preview URLs cannot end with a hyphen (-)';
       }
       return true;
     },
@@ -138,32 +119,56 @@ async function chooseDevDomainNameAsync({
     },
   });
 
+  // This should never happen due to the validation, if it does its an error
   if (!name) {
-    throw new Error('No project URL provided, aborting deployment.');
+    throw new Error('No preview URL provided, aborting deployment.');
+  }
+
+  return name;
+}
+
+/**
+ * Assign a dev domain name to a project.
+ *   - When running in interactive mode, it will prompt the user with a suggested domain name.
+ *   - When running in non interactive mode, it will auto-assign the suggested domain name.
+ */
+export async function assignDevDomainNameAsync({
+  graphqlClient,
+  appId,
+  nonInteractive,
+}: {
+  graphqlClient: ExpoGraphqlClient;
+  appId: string;
+  nonInteractive?: boolean;
+}): ReturnType<typeof DeploymentsMutation.assignDevDomainNameAsync> {
+  let devDomainName = await DeploymentsQuery.getSuggestedDevDomainByAppIdAsync(graphqlClient, {
+    appId,
+  });
+
+  if (!nonInteractive) {
+    devDomainName = await promptDevDomainNameAsync(devDomainName);
   }
 
   try {
-    const success = await DeploymentsMutation.assignDevDomainNameAsync(graphqlClient, {
+    return await DeploymentsMutation.assignDevDomainNameAsync(graphqlClient, {
       appId,
-      name,
+      name: devDomainName,
     });
-
-    if (!success) {
-      throw new Error('Failed to assign project URL');
-    }
-  } catch (error: any) {
+  } catch (error) {
     const isChosenNameTaken = (error as GraphqlError)?.graphQLErrors?.some(e =>
       ['DEV_DOMAIN_NAME_TAKEN'].includes(e?.extensions?.errorCode as string)
     );
 
-    if (isChosenNameTaken) {
-      Log.error(`The project URL "${name}" is already taken, choose a different name.`);
-      await chooseDevDomainNameAsync({ graphqlClient, appId, initial });
-    }
-
+    // Throw unexpected errors eagerly
     if (!isChosenNameTaken) {
       throw error;
     }
+
+    if (!nonInteractive) {
+      Log.error(`The preview URL "${devDomainName}" is already taken, choose a different URL.`);
+    }
+
+    return await assignDevDomainNameAsync({ graphqlClient, appId, nonInteractive });
   }
 }
 

packages/eas-cli/src/worker/upload.ts

@@ -139,6 +139,28 @@ export async function uploadAsync(params: UploadParams): Promise<UploadResult> {
   );
 }
 
+export async function callUploadApiAsync(url: string | URL, init?: RequestInit): Promise<unknown> {
+  return await promiseRetry(async retry => {
+    let response: Response;
+    try {
+      response = await fetch(url, {
+        ...init,
+        agent: getAgent(),
+      });
+    } catch (error) {
+      return retry(error);
+    }
+    if (response.status >= 500 && response.status <= 599) {
+      retry(new Error(`Deployment failed: ${response.statusText}`));
+    }
+    try {
+      return await response.json();
+    } catch (error) {
+      retry(error);
+    }
+  });
+}
+
 export interface UploadPending {
   params: UploadParams;
 }
@@ -165,13 +187,13 @@ export async function* batchUploadAsync(
       }
       yield await Promise.race(queue);
     }
-  } catch (error: any) {
-    if (typeof error !== 'object' || error.name !== 'AbortError') {
-      throw error;
-    }
-  } finally {
+
     if (queue.size > 0) {
       controller.abort();
     }
+  } catch (error: any) {
+    if (error.name !== 'AbortError') {
+      throw error;
+    }
   }
 }

packages/eas-cli/src/worker/utils/logs.ts

@@ -22,7 +22,7 @@ type WorkerDeploymentData = {
   /** The actual deployment information */
   deployment: Pick<WorkerDeploymentFragment, 'deploymentIdentifier' | 'url'>;
   /** All modified aliases of the deployment, if any */
-  aliases?: WorkerDeploymentAliasFragment[];
+  aliases?: (WorkerDeploymentAliasFragment | null)[];
   /** The production promoting alias of the deployment, if any */
   production?: WorkerDeploymentAliasFragment | null;
 };
@@ -34,7 +34,10 @@ export function formatWorkerDeploymentTable(data: WorkerDeploymentData): string
   ];
 
   if (data.aliases?.length) {
-    fields.push({ label: 'Alias URL', value: data.aliases[0].url });
+    const alias = data.aliases.filter(Boolean)[0];
+    if (alias) {
+      fields.push({ label: 'Alias URL', value: alias.url });
+    }
   }
   if (data.production) {
     fields.push({ label: 'Production URL', value: data.production.url });
@@ -49,34 +52,33 @@ export function formatWorkerDeploymentTable(data: WorkerDeploymentData): string
 type WorkerDeploymentOutput = {
   /** The absolute URL to the dashboard on `expo.dev` */
   dashboardUrl: string;
-  /** The deployment information */
-  deployment: {
-    identifier: string;
-    url: string;
-    aliases?: { id: string; name: string; url: string }[];
-    production?: { id: string; url: string };
-  };
+  /** The deployment identifier */
+  identifier: string;
+  /** The deployment URL */
+  url: string;
+  /** Custom aliases, if assigned */
+  aliases?: { id: string; url: string; name: string }[];
+  /** The production alias, if assigned */
+  production?: { id: string; url: string };
 };
 
 export function formatWorkerDeploymentJson(data: WorkerDeploymentData): WorkerDeploymentOutput {
+  const aliases = !data.aliases
+    ? []
+    : (data.aliases.filter(Boolean) as WorkerDeploymentAliasFragment[]);
+
   return {
     dashboardUrl: getDashboardUrl(data.projectId),
-    deployment: {
-      identifier: data.deployment.deploymentIdentifier,
-      url: data.deployment.url,
-      aliases: !data.aliases?.length
-        ? undefined
-        : data.aliases.map(alias => ({
-            id: alias.id,
-            name: alias.aliasName,
-            url: alias.url,
-          })),
-      production: !data.production
-        ? undefined
-        : {
-            id: data.production.id,
-            url: data.production.url,
-          },
-    },
+    identifier: data.deployment.deploymentIdentifier,
+    url: data.deployment.url,
+    aliases: !aliases.length
+      ? undefined
+      : aliases.map(alias => ({ id: alias.id, url: alias.url, name: alias.aliasName })),
+    production: !data.production
+      ? undefined
+      : {
+          id: data.production.id,
+          url: data.production.url,
+        },
   };
 }

packages/eas-json/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@expo/eas-json",
   "description": "A library for interacting with eas.json",
-  "version": "12.0.0",
+  "version": "12.5.2",
   "author": "Expo <[email protected]>",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
     "@babel/code-frame": "7.23.5",
-    "@expo/eas-build-job": "1.0.133",
+    "@expo/eas-build-job": "1.0.136",
     "chalk": "4.1.2",
     "env-string": "1.0.1",
     "fs-extra": "11.2.0",

packages/eas-json/schema/eas.schema.json

@@ -378,6 +378,7 @@
                 "sdk-51",
                 "sdk-50",
                 "sdk-49",
+                "macos-sonoma-14.6-xcode-16.0",
                 "macos-sonoma-14.5-xcode-15.4",
                 "macos-sonoma-14.4-xcode-15.3",
                 "macos-ventura-13.6-xcode-15.2",
@@ -386,7 +387,7 @@
               ],
               "markdownEnumDescriptions": [
                 "When using this option the build image is selected automatically based on the project configuration, detected Expo SDK and React Native versions.",
-                "The latest iOS image currently available. It is resolved to `macos-sonoma-14.5-xcode-15.4`. The `latest` to image mapping will be updated as new images are released.",
+                "The latest iOS image currently available. It is resolved to `macos-sonoma-14.6-xcode-16.0`. The `latest` to image mapping will be updated as new images are released.",
                 "The recommended image for SDK 51 builds",
                 "The recommended image for SDK 50 builds",
                 "The recommended image for SDK 49 builds"