Revert "Add eas env:push and env:pull commands (#2495 )"

This reverts commit 56510f0925.
2026-11-14 10:08:06 -10:00 · 2024-08-27 14:40:12 +02:00
216 changed files with 2359 additions and 20204 deletions
@@ -1,26 +0,0 @@
-commentConfiguration:
-  preamble: 'Subscribed to pull request'
-  epilogue: 'Generated by [CodeMention](https://github.com/expo/expo/actions/workflows/codemention.yaml)'
-rules:
-  - patterns: ['**/*']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
-  - patterns: ['packages/eas-cli/src/build/**']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
-  - patterns: ['packages/eas-cli/src/commands/build/**']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
-  - patterns: ['packages/eas-cli/src/submit/**']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
-  - patterns: ['packages/eas-cli/src/commands/submit.ts']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela', 'radoslawkrzemien']
-  - patterns: ['packages/eas-cli/src/update/**']
-    mentions: ['EvanBacon', 'byCedric', 'wschurman']
-  - 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']
@@ -0,0 +1,48 @@
+name: Changelog bot
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  pr-commented:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.EXPO_BOT_PAT }}
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 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
@@ -36,5 +36,6 @@ 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. Add it manually to CHANGELOG.md.
+            ❌ It looks like a changelog entry is missing for this PR. You have two options: you can add it manually, or you can use the changelog bot to do it for you.
+            🤖 To use the bot, simply comment on this PR with the command `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]`.
            ⏩ If this PR doesn't require a changelog entry, such as if it's an internal change that doesn't affect the user experience, you can add the "no changelog" label to the PR.
@@ -1,14 +0,0 @@
-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 }}
@@ -12,176 +12,6 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🧹 Chores

-## [13.2.0](https://github.com/expo/eas-cli/releases/tag/v13.2.0) - 2024-11-13
-
-### 🎉 New features
-
- Add EAS_SKIP_AUTO_FINGERPRINT to skip fingerprint computation on build ([#2675](https://github.com/expo/eas-cli/pull/2675) by [@quinlanj](https://github.com/quinlanj))
- Default build-logger-level to debug when EXPO_DEBUG is set. ([#2676](https://github.com/expo/eas-cli/pull/2676) by [@wschurman](https://github.com/wschurman))
-
-## [13.1.1](https://github.com/expo/eas-cli/releases/tag/v13.1.1) - 2024-11-08
-
-## [13.1.0](https://github.com/expo/eas-cli/releases/tag/v13.1.0) - 2024-11-07
-
-### 🎉 New features
-
- Compute fingerprint for builds with SDK 52 and higher ([#2663](https://github.com/expo/eas-cli/pull/2663) by [@quinlanj](https://github.com/quinlanj))
-
-## [13.0.1](https://github.com/expo/eas-cli/releases/tag/v13.0.1) - 2024-11-05
-
-### 🧹 Chores
-
- Upgrade EAS Metadata with new properties from App Store. ([#2671](https://github.com/expo/eas-cli/pull/2671) by [@byCedric](https://github.com/byCedric))
-
-## [13.0.0](https://github.com/expo/eas-cli/releases/tag/v13.0.0) - 2024-11-05
-
-### 🛠 Breaking changes
-
- Resolve versioned expo config using `npx expo config` command instead of using fixed `@expo/config` version shipped with EAS CLI, if available. ([#2529](https://github.com/expo/eas-cli/pull/2529) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
- Add `macos-sonoma-14.6-xcode-16.1` image and `sdk-52` image tag to `eas.schema.json`. ([#2666](https://github.com/expo/eas-cli/pull/2666) by [@szdziedzic](https://github.com/szdziedzic))
- Update `@expo` packages versions. ([#2530](https://github.com/expo/eas-cli/pull/2530) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [12.6.2](https://github.com/expo/eas-cli/releases/tag/v12.6.2) - 2024-10-29
-
-### 🐛 Bug fixes
-
- Make email case insensitive during Apple authentication. ([#2659](https://github.com/expo/eas-cli/pull/2659) by [@byCedric](https://github.com/byCedric))
-
-## [12.6.1](https://github.com/expo/eas-cli/releases/tag/v12.6.1) - 2024-10-25
-
-### 🧹 Chores
-
- Create dynamic logged in context field and clean up erroneous SessionManager context field uses. ([#2648](https://github.com/expo/eas-cli/pull/2648) by [@wschurman](https://github.com/wschurman))
-
-## [12.6.0](https://github.com/expo/eas-cli/releases/tag/v12.6.0) - 2024-10-21
-
-### 🎉 New features
-
- Add `eas channel:pause` and `eas channel:resume` commands to pause/resume update delivery to builds using specific update channels and display paused status in channel details output. ([#2614](https://github.com/expo/eas-cli/pull/2614) by [@fiberjw](https://github.com/fiberjw))
- Add interactivity to eas update:edit command. ([#2638](https://github.com/expo/eas-cli/pull/2638) by [@wschurman](https://github.com/wschurman))
-
-## [12.5.4](https://github.com/expo/eas-cli/releases/tag/v12.5.4) - 2024-10-19
-
-## [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
-
- Add `worker:alias` command to assign aliases from the CLI. ([#2548](https://github.com/expo/eas-cli/pull/2548) by [@byCedric](https://github.com/byCedric))
- Add `worker --prod` flag to deploy to production from the CLI. ([#2550](https://github.com/expo/eas-cli/pull/2550) by [@byCedric](https://github.com/byCedric))
- Add `worker --alias` flag to assign custom aliases when deploying. ([#2551](https://github.com/expo/eas-cli/pull/2551) by [@byCedric](https://github.com/byCedric)))
- Add `worker --id` flag to use a custom deployment identifier. ([#2552](https://github.com/expo/eas-cli/pull/2552) by [@byCedric](https://github.com/byCedric)))
- Add `worker --environment` flag to deploy with EAS environment variables. ([#2557](https://github.com/expo/eas-cli/pull/2557) by [@kitten](https://github.com/kitten)))
- Add `worker --export-dir` flag to select exported directory. ([#2560](https://github.com/expo/eas-cli/pull/2560) by [@byCedric](https://github.com/byCedric)))
- Add `worker --json` flag to allow integrating with 3rd parties and custom tooling. ([#2561](https://github.com/expo/eas-cli/pull/2561) by [@byCedric](https://github.com/byCedric)))
- Add `worker:alias --json` flag to allow integrating with 3rd parties and custom tooling. ([#2562](https://github.com/expo/eas-cli/pull/2562) by [@byCedric](https://github.com/byCedric)))
-
-### 🐛 Bug fixes
-
- 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
-
- Make error message for invalid CFBundleShortVersionString more descriptive and actionable. Improve CFBundleShortVersionString validation regex. ([#2542](https://github.com/expo/eas-cli/pull/2542) by [@szdziedzic](https://github.com/szdziedzic))
- Add missing `--non-interactive` argument to `worker:deploy` command. ([#2544](https://github.com/expo/eas-cli/pull/2544) by [@kitten](https://github.com/kitten))
- Source `@expo/env` dotenv files for worker deployments. ([#2545](https://github.com/expo/eas-cli/pull/2545) by [@kitten](https://github.com/kitten))
- Support `worker --production` and clean up command output. ([#2555](https://github.com/expo/eas-cli/pull/2555) by [@byCedric](https://github.com/byCedric)))
- Unify both `worker` and `worker:alias` command output. ([#2558](https://github.com/expo/eas-cli/pull/2558) by [@byCedric](https://github.com/byCedric)))
- Share similar table/json output in both `worker` and `worker:alias` command outputs. ([#2563](https://github.com/expo/eas-cli/pull/2563) by [@byCedric](https://github.com/byCedric)))
- Polish the project URL prompt when setting up new projects. ([#2564](https://github.com/expo/eas-cli/pull/2564) by [@byCedric](https://github.com/byCedric)))
- 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
-
-### 🎉 New features
-
- Add `--non-interactive` and `--force` support when `--id` is not passed to the `eas init` command. ([#1983](https://github.com/expo/eas-cli/pull/1983) by [@mymattcarroll](https://github.com/mymattcarroll))
-
-## [12.1.1](https://github.com/expo/eas-cli/releases/tag/v12.1.1) - 2024-09-09
-
-### 🐛 Bug fixes
-
- Fixed an issue where extensions retrieved the main app's entitlements instead of their own. ([#2532](https://github.com/expo/eas-cli/pull/2532) by [@HarrisHan](https://github.com/HarrisHan))
-
-## [12.1.0](https://github.com/expo/eas-cli/releases/tag/v12.1.0) - 2024-09-06
-
-### 🎉 New features
-
- **Internal/Experimental:** Add EAS Worker command ([#2447](https://github.com/expo/eas-cli/pull/2447) by [@kitten](https://github.com/kitten))
- Upload fingeprint source as part of eas update command. ([#2533](https://github.com/expo/eas-cli/pull/2533) by [@wschurman](https://github.com/wschurman))
-
-## [12.0.0](https://github.com/expo/eas-cli/releases/tag/v12.0.0) - 2024-09-04
-
-### 🛠 Breaking changes
-
- Prompt the users to set `appVersionSource`, while mentioning that `remote` is the default. ([#2411](https://github.com/expo/eas-cli/pull/2411) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-### 🎉 New features
-
- Add support for syncing Journaling Suggestions, Managed App Installation UI, and 5G Network Slicing capabilities. ([#2525](https://github.com/expo/eas-cli/pull/2525) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [11.0.3](https://github.com/expo/eas-cli/releases/tag/v11.0.3) - 2024-08-31
-
-### 🐛 Bug fixes
-
- Revert config-related packages to SDK 50 version from SDK 51 version to fix broken entitlements behavior for older SDKs. ([#2524](https://github.com/expo/eas-cli/pull/2524) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [11.0.2](https://github.com/expo/eas-cli/releases/tag/v11.0.2) - 2024-08-27
-
-### 🐛 Bug fixes
-
- Remove unncessary static project config context definition from `eas build` command context, to fix resolving dynamic projest ID and slug for dynamic app configs. ([#2521](https://github.com/expo/eas-cli/pull/2521) by [@szdziedzic](https://github.com/szdziedzic))
-
 ## [11.0.1](https://github.com/expo/eas-cli/releases/tag/v11.0.1) - 2024-08-26

 ### 🐛 Bug fixes
@@ -0,0 +1,16 @@
+* @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
@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
-  "version": "13.2.1",
+  "version": "11.0.1",
  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
@@ -81,8 +81,6 @@ eas --help COMMAND
 * [`eas channel:create [NAME]`](#eas-channelcreate-name)
 * [`eas channel:edit [NAME]`](#eas-channeledit-name)
 * [`eas channel:list`](#eas-channellist)
-* [`eas channel:pause [NAME]`](#eas-channelpause-name)
-* [`eas channel:resume [NAME]`](#eas-channelresume-name)
 * [`eas channel:rollout [CHANNEL]`](#eas-channelrollout-channel)
 * [`eas channel:view [NAME]`](#eas-channelview-name)
 * [`eas config`](#eas-config)
@@ -115,7 +113,6 @@ eas --help COMMAND
 * [`eas update`](#eas-update)
 * [`eas update:configure`](#eas-updateconfigure)
 * [`eas update:delete GROUPID`](#eas-updatedelete-groupid)
-* [`eas update:edit [GROUPID]`](#eas-updateedit-groupid)
 * [`eas update:list`](#eas-updatelist)
 * [`eas update:republish`](#eas-updaterepublish)
 * [`eas update:roll-back-to-embedded`](#eas-updateroll-back-to-embedded)
@@ -146,7 +143,7 @@ ALIASES
  $ eas login
 ```

-_See code: [packages/eas-cli/src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/account/login.ts)_

 ## `eas account:logout`

@@ -163,7 +160,7 @@ ALIASES
  $ eas logout
 ```

-_See code: [packages/eas-cli/src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/account/logout.ts)_

 ## `eas account:view`

@@ -180,7 +177,7 @@ ALIASES
  $ eas whoami
 ```

-_See code: [packages/eas-cli/src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/account/view.ts)_

 ## `eas analytics [STATUS]`

@@ -194,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/v13.2.1/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [packages/eas-cli/src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v11.0.1/packages/eas-cli/src/commands/analytics.ts)_

 ## `eas autocomplete [SHELL]`

@@ -246,7 +243,7 @@ DESCRIPTION
  create a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/branch/create.ts)_

 ## `eas branch:delete [NAME]`

@@ -267,7 +264,7 @@ DESCRIPTION
  delete a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/branch/delete.ts)_

 ## `eas branch:list`

@@ -287,7 +284,7 @@ DESCRIPTION
  list all branches
 ```

-_See code: [packages/eas-cli/src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/branch/list.ts)_

 ## `eas branch:rename`

@@ -307,7 +304,7 @@ DESCRIPTION
  rename a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/branch/rename.ts)_

 ## `eas branch:view [NAME]`

@@ -330,7 +327,7 @@ DESCRIPTION
  view a branch
 ```

-_See code: [packages/eas-cli/src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/branch/view.ts)_

 ## `eas build`

@@ -367,7 +364,7 @@ DESCRIPTION
  start a build
 ```

-_See code: [packages/eas-cli/src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/build/index.ts)_

 ## `eas build:cancel [BUILD_ID]`

@@ -386,7 +383,7 @@ DESCRIPTION
  cancel a build
 ```

-_See code: [packages/eas-cli/src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/build/cancel.ts)_

 ## `eas build:configure`

@@ -403,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/build/configure.ts)_

 ## `eas build:delete [BUILD_ID]`

@@ -422,7 +419,7 @@ DESCRIPTION
  delete a build
 ```

-_See code: [packages/eas-cli/src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/build/delete.ts)_

 ## `eas build:inspect`

@@ -457,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/build/inspect.ts)_

 ## `eas build:list`

@@ -507,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/build/list.ts)_

 ## `eas build:resign`

@@ -536,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/build/resign.ts)_

 ## `eas build:run`

@@ -562,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/build/run.ts)_

 ## `eas build:submit`

@@ -612,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/build/version/get.ts)_

 ## `eas build:version:set`

@@ -631,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/build/version/set.ts)_

 ## `eas build:version:sync`

@@ -650,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/build/version/sync.ts)_

 ## `eas build:view [BUILD_ID]`

@@ -667,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/build/view.ts)_

 ## `eas channel:create [NAME]`

@@ -688,7 +685,7 @@ DESCRIPTION
  create a channel
 ```

-_See code: [packages/eas-cli/src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/channel/create.ts)_

 ## `eas channel:edit [NAME]`

@@ -710,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/channel/edit.ts)_

 ## `eas channel:list`

@@ -730,51 +727,7 @@ DESCRIPTION
  list all channels
 ```

-_See code: [packages/eas-cli/src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v13.2.1/packages/eas-cli/src/commands/channel/list.ts)_
-
-## `eas channel:pause [NAME]`
-
-pause a channel to stop it from sending updates
-
-```
-USAGE
-  $ eas channel:pause [NAME] [--branch <value>] [--json --non-interactive]
-
-ARGUMENTS
-  NAME  Name of the channel to edit
-
-FLAGS
-  --branch=<value>   Name of the branch to point to
-  --json             Enable JSON output, non-JSON messages will be printed to stderr.
-  --non-interactive  Run the command in non-interactive mode.
-
-DESCRIPTION
-  pause a channel to stop it from sending updates
-```
-
-_See code: [packages/eas-cli/src/commands/channel/pause.ts](https://github.com/expo/eas-cli/blob/v13.2.1/packages/eas-cli/src/commands/channel/pause.ts)_
-
-## `eas channel:resume [NAME]`
-
-resume a channel to start sending updates
-
-```
-USAGE
-  $ eas channel:resume [NAME] [--branch <value>] [--json --non-interactive]
-
-ARGUMENTS
-  NAME  Name of the channel to edit
-
-FLAGS
-  --branch=<value>   Name of the branch to point to
-  --json             Enable JSON output, non-JSON messages will be printed to stderr.
-  --non-interactive  Run the command in non-interactive mode.
-
-DESCRIPTION
-  resume a channel to start sending updates
-```
-
-_See code: [packages/eas-cli/src/commands/channel/resume.ts](https://github.com/expo/eas-cli/blob/v13.2.1/packages/eas-cli/src/commands/channel/resume.ts)_
+_See code: [packages/eas-cli/src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v11.0.1/packages/eas-cli/src/commands/channel/list.ts)_

 ## `eas channel:rollout [CHANNEL]`

@@ -807,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/channel/rollout.ts)_

 ## `eas channel:view [NAME]`

@@ -830,7 +783,7 @@ DESCRIPTION
  view a channel
 ```

-_See code: [packages/eas-cli/src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/channel/view.ts)_

 ## `eas config`

@@ -851,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/v13.2.1/packages/eas-cli/src/commands/config.ts)_
+_See code: [packages/eas-cli/src/commands/config.ts](https://github.com/expo/eas-cli/blob/v11.0.1/packages/eas-cli/src/commands/config.ts)_

 ## `eas credentials`

@@ -868,7 +821,7 @@ DESCRIPTION
  manage credentials
 ```

-_See code: [packages/eas-cli/src/commands/credentials/index.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/credentials/index.ts)_

 ## `eas credentials:configure-build`

@@ -886,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/credentials/configure-build.ts)_

 ## `eas device:create`

@@ -900,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/device/create.ts)_

 ## `eas device:delete`

@@ -920,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/device/delete.ts)_

 ## `eas device:list`

@@ -941,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/device/list.ts)_

 ## `eas device:rename`

@@ -962,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/device/rename.ts)_

 ## `eas device:view [UDID]`

@@ -976,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/device/view.ts)_

 ## `eas diagnostics`

@@ -990,7 +943,7 @@ DESCRIPTION
  display environment info
 ```

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

 ## `eas help [COMMAND]`

@@ -1018,11 +971,10 @@ create or link an EAS project

 ```
 USAGE
-  $ eas init [--id <value>] [--force] [--non-interactive]
+  $ eas init [--force --id <value>] [--non-interactive ]

 FLAGS
-  --force            Whether to create a new project/link an existing project without additional prompts or overwrite
-                     any existing project ID when running with --id flag
+  --force            Whether to overwrite any existing project ID
  --id=<value>       ID of the EAS project to link
  --non-interactive  Run the command in non-interactive mode.

@@ -1098,7 +1050,7 @@ DESCRIPTION
  validate the local store configuration
 ```

-_See code: [packages/eas-cli/src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/metadata/lint.ts)_

 ## `eas metadata:pull`

@@ -1115,7 +1067,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/metadata/pull.ts)_

 ## `eas metadata:push`

@@ -1132,7 +1084,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/metadata/push.ts)_

 ## `eas onboarding [TARGET_PROJECT_DIRECTORY]`

@@ -1162,7 +1114,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/v13.2.1/packages/eas-cli/src/commands/open.ts)_
+_See code: [packages/eas-cli/src/commands/open.ts](https://github.com/expo/eas-cli/blob/v11.0.1/packages/eas-cli/src/commands/open.ts)_

 ## `eas project:info`

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

-_See code: [packages/eas-cli/src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/project/info.ts)_

 ## `eas project:init`

@@ -1184,11 +1136,10 @@ create or link an EAS project

 ```
 USAGE
-  $ eas project:init [--id <value>] [--force] [--non-interactive]
+  $ eas project:init [--force --id <value>] [--non-interactive ]

 FLAGS
-  --force            Whether to create a new project/link an existing project without additional prompts or overwrite
-                     any existing project ID when running with --id flag
+  --force            Whether to overwrite any existing project ID
  --id=<value>       ID of the EAS project to link
  --non-interactive  Run the command in non-interactive mode.

@@ -1199,7 +1150,7 @@ ALIASES
  $ eas init
 ```

-_See code: [packages/eas-cli/src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/project/init.ts)_

 ## `eas project:onboarding [TARGET_PROJECT_DIRECTORY]`

@@ -1217,7 +1168,7 @@ ALIASES
  $ eas onboarding
 ```

-_See code: [packages/eas-cli/src/commands/project/onboarding.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/project/onboarding.ts)_

 ## `eas secret:create`

@@ -1240,7 +1191,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/secret/create.ts)_

 ## `eas secret:delete`

@@ -1258,7 +1209,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/secret/delete.ts)_

 ## `eas secret:list`

@@ -1272,7 +1223,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/secret/list.ts)_

 ## `eas secret:push`

@@ -1292,7 +1243,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/secret/push.ts)_

 ## `eas submit`

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

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

 ## `eas update`

@@ -1332,8 +1283,8 @@ publish an update group
 ```
 USAGE
  $ eas update [--branch <value>] [--channel <value>] [-m <value>] [--input-dir <value>] [--skip-bundler]
-    [--clear-cache] [--emit-metadata] [--rollout-percentage <value>] [-p android|ios|all] [--auto] [--private-key-path
-    <value>] [--json --non-interactive]
+    [--clear-cache] [--emit-metadata] [-p android|ios|all] [--auto] [--private-key-path <value>] [--json
+    --non-interactive]

 FLAGS
  -m, --message=<value>             A short message describing the update
@@ -1351,17 +1302,13 @@ 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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/update/index.ts)_

 ## `eas update:configure`

@@ -1379,7 +1326,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/update/configure.ts)_

 ## `eas update:delete GROUPID`

@@ -1400,31 +1347,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/v13.2.1/packages/eas-cli/src/commands/update/delete.ts)_
-
-## `eas update:edit [GROUPID]`
-
-edit all the updates in an update group
-
-```
-USAGE
-  $ eas update:edit [GROUPID] [--rollout-percentage <value>] [--branch <value>] [--json --non-interactive]
-
-ARGUMENTS
-  GROUPID  The ID of an update group to edit.
-
-FLAGS
-  --branch=<value>              Branch for which to list updates to select from
-  --json                        Enable JSON output, non-JSON messages will be printed to stderr.
-  --non-interactive             Run the command in non-interactive mode.
-  --rollout-percentage=<value>  Rollout percentage to set for a rollout update. The specified number must be an integer
-                                between 1 and 100.
-
-DESCRIPTION
-  edit all the updates in an update group
-```
-
-_See code: [packages/eas-cli/src/commands/update/edit.ts](https://github.com/expo/eas-cli/blob/v13.2.1/packages/eas-cli/src/commands/update/edit.ts)_
+_See code: [packages/eas-cli/src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v11.0.1/packages/eas-cli/src/commands/update/delete.ts)_

 ## `eas update:list`

@@ -1446,7 +1369,7 @@ DESCRIPTION
  view the recent updates
 ```

-_See code: [packages/eas-cli/src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/update/list.ts)_

 ## `eas update:republish`

@@ -1454,18 +1377,14 @@ roll back to an existing update

 ```
 USAGE
-  $ 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]
+  $ eas update:republish [--channel <value> | --branch <value> | --group <value>] [-m <value>] [-p android|ios|all]
+    [--private-key-path <value>] [--json --non-interactive]

 FLAGS
  -m, --message=<value>             Short message describing the republished update group
  -p, --platform=(android|ios|all)  [default: all]
  --branch=<value>                  Branch name to select an update 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.
@@ -1478,7 +1397,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/update/republish.ts)_

 ## `eas update:roll-back-to-embedded`

@@ -1506,7 +1425,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/update/roll-back-to-embedded.ts)_

 ## `eas update:rollback`

@@ -1526,7 +1445,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/v13.2.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/v11.0.1/packages/eas-cli/src/commands/update/rollback.ts)_

 ## `eas update:view GROUPID`

@@ -1546,7 +1465,7 @@ DESCRIPTION
  update group details
 ```

-_See code: [packages/eas-cli/src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/update/view.ts)_

 ## `eas webhook:create`

@@ -1567,7 +1486,7 @@ DESCRIPTION
  create a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/webhook/create.ts)_

 ## `eas webhook:delete [ID]`

@@ -1587,7 +1506,7 @@ DESCRIPTION
  delete a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/webhook/delete.ts)_

 ## `eas webhook:list`

@@ -1605,7 +1524,7 @@ DESCRIPTION
  list webhooks
 ```

-_See code: [packages/eas-cli/src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/webhook/list.ts)_

 ## `eas webhook:update`

@@ -1627,7 +1546,7 @@ DESCRIPTION
  update a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/webhook/update.ts)_

 ## `eas webhook:view ID`

@@ -1644,7 +1563,7 @@ DESCRIPTION
  view a webhook
 ```

-_See code: [packages/eas-cli/src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v13.2.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/v11.0.1/packages/eas-cli/src/commands/webhook/view.ts)_

 ## `eas whoami`

@@ -7,7 +7,6 @@ documents:
  - 'src/commands/**/*.ts'
  - 'src/branch/**/*.ts'
  - 'src/channel/**/*.ts'
-  - 'src/worker/**/*.ts'
 generates:
  src/graphql/generated.ts:
    plugins:
@@ -1,20 +1,20 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "13.2.1",
+  "version": "11.0.1",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
  },
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
-    "@expo/apple-utils": "2.1.0",
+    "@expo/apple-utils": "1.7.1",
    "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "9.0.4",
-    "@expo/config-plugins": "8.0.10",
-    "@expo/eas-build-job": "1.0.144",
-    "@expo/eas-json": "13.0.0",
-    "@expo/env": "^0.3.0",
+    "@expo/config": "9.0.3",
+    "@expo/config-plugins": "8.0.8",
+    "@expo/config-types": "51.0.2",
+    "@expo/eas-build-job": "1.0.133",
+    "@expo/eas-json": "11.0.0",
    "@expo/json-file": "8.3.3",
    "@expo/logger": "1.0.117",
    "@expo/multipart-body-parser": "1.1.0",
@@ -24,11 +24,11 @@
    "@expo/plist": "0.1.3",
    "@expo/plugin-help": "5.1.23",
    "@expo/plugin-warn-if-update-available": "2.5.1",
-    "@expo/prebuild-config": "7.0.9",
+    "@expo/prebuild-config": "7.0.8",
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.1",
    "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "1.0.144",
+    "@expo/steps": "1.0.130",
    "@expo/timeago.js": "1.0.0",
    "@oclif/core": "^1.26.2",
    "@oclif/plugin-autocomplete": "^2.3.10",
@@ -63,7 +63,6 @@
    "log-symbols": "4.1.0",
    "mime": "3.0.0",
    "minimatch": "5.1.2",
-    "minizlib": "3.0.1",
    "nanoid": "3.3.4",
    "node-fetch": "2.6.7",
    "node-forge": "1.3.1",
@@ -79,15 +78,12 @@
    "semver": "7.5.4",
    "slash": "3.0.0",
    "tar": "6.2.1",
-    "tar-stream": "3.1.7",
    "terminal-link": "2.1.1",
    "tslib": "2.6.2",
    "turndown": "7.1.2",
    "untildify": "4.0.0",
    "uuid": "9.0.1",
-    "wrap-ansi": "7.0.0",
-    "yaml": "2.6.0",
-    "zod": "^3.23.8"
+    "wrap-ansi": "7.0.0"
  },
  "devDependencies": {
    "@graphql-codegen/cli": "5.0.0",
@@ -109,13 +105,12 @@
    "@types/prompts": "2.4.2",
    "@types/semver": "7.5.6",
    "@types/tar": "6.1.10",
-    "@types/tar-stream": "3.1.3",
    "@types/tough-cookie": "4.0.2",
    "@types/uuid": "9.0.7",
    "@types/wrap-ansi": "3.0.0",
    "axios": "0.28.1",
    "eslint-plugin-graphql": "4.0.0",
-    "express": "4.20.0",
+    "express": "4.19.2",
    "memfs": "3.4.13",
    "mockdate": "3.0.5",
    "nock": "13.4.0",
@@ -1,20 +1,6 @@
 {
  "$schema": "http://json-schema.org/draft-06/schema",
  "type": "object",
-  "properties": {
-    "configVersion": {
-      "enum": [0],
-      "description": "The EAS metadata store configuration version"
-    },
-    "apple": {
-      "$ref": "#/definitions/AppleConfig"
-    }
-  },
-  "additionalProperties": false,
-  "required": [
-    "configVersion",
-    "apple"
-  ],
  "definitions": {
    "apple": {
      "AppleKidsAge": {
@@ -337,8 +323,7 @@
          "gambling",
          "unrestrictedWebAccess",
          "kidsAgeBand",
-          "ageRatingOverride",
-          "koreaAgeRatingOverride"
+          "seventeenPlus"
        ],
        "defaultSnippets": [
          {
@@ -360,9 +345,7 @@
              "gambling": false,
              "unrestrictedWebAccess": false,
              "kidsAgeBand": null,
-              "ageRatingOverride": "NONE",
-              "koreaAgeRatingOverride": "NONE",
-              "lootBox": false
+              "seventeenPlus": false
            }
          },
          {
@@ -384,9 +367,7 @@
              "unrestrictedWebAccess": false,
              "gambling": false,
              "kidsAgeBand": null,
-              "ageRatingOverride": "${13|NONE,SEVENTEEN_PLUS,UNRATED|}",
-              "koreaAgeRatingOverride": "${14|NONE,FIFTEEN_PLUS,NINETEEN_PLUS|}",
-              "lootBox": false
+              "seventeenPlus": false
            }
          }
        ],
@@ -461,24 +442,8 @@
          },
          "seventeenPlus": {
            "type": "boolean",
-            "deprecated": true,
-            "deprecationMessage": "This property is deprecated, use `ageRatingOverride` instead.",
            "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n@see https://help.apple.com/app-store-connect/#/dev599d50efb",
            "markdownDescription": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
-          },
-          "ageRatingOverride": {
-            "$ref": "#/definitions/apple/AppleAgeRatingOverride",
-            "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n@see https://help.apple.com/app-store-connect/#/dev599d50efb",
-            "markdownDescription": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
-          },
-          "koreaAgeRatingOverride": {
-            "$ref": "#/definitions/apple/AppleKoreaAgeRatingOverride",
-            "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 15 or 19, you can manually set the age rating to 15+ or 19+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n@see https://help.apple.com/app-store-connect/#/dev599d50efb",
-            "markdownDescription": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 15 or 19, you can manually set the age rating to 15+ or 19+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
-          },
-          "lootBox": {
-            "type": "boolean",
-            "description": "Does your app contain purchasable loot boxes? These virtual containers provide players with in-game items, including functional cards or cosmetic modifications, based on random chance."
          }
        }
      },
@@ -600,20 +565,6 @@
            "maxLength": 4000
          }
        }
-      },
-      "AppleAgeRatingOverride": {
-        "enum": [
-          "NONE",
-          "SEVENTEEN_PLUS",
-          "UNRATED"
-        ]
-      },
-      "AppleKoreaAgeRatingOverride": {
-        "enum": [
-          "NONE",
-          "FIFTEEN_PLUS",
-          "NINETEEN_PLUS"
-        ]
      }
    },
    "AppleConfig": {
@@ -824,5 +775,19 @@
        }
      }
    }
-  }
+  },
+  "properties": {
+    "configVersion": {
+      "enum": [0],
+      "description": "The EAS metadata store configuration version"
+    },
+    "apple": {
+      "$ref": "#/definitions/AppleConfig"
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "configVersion",
+    "apple"
+  ]
 }
@@ -1,5 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`BuildVersionGetView reading version aborts when the appVersionSource is not specified and the user chooses to set it to LOCAL 1`] = `"Aborting..."`;
-
 exports[`BuildVersionGetView reading version when appVersionSource is set to local  1`] = `"This project is not configured for using remote version source. Add [1m{"cli": { "appVersionSource": "remote" }}[22m in eas.json or re-run this command without "--non-interactive" flag."`;
@@ -1,18 +1,10 @@
+import { AppVersionSource, EasJson } from '@expo/eas-json';
 import chalk from 'chalk';

-import {
-  getMockEasJson,
-  mockCommandContext,
-  mockProjectId,
-  mockTestCommand,
-  withLocalVersionSource,
-  withRemoteVersionSource,
-} from './utils';
+import { getMockEasJson, mockCommandContext, mockProjectId, mockTestCommand } from './utils';
 import BuildVersionGetView from '../../commands/build/version/get';
 import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
 import Log from '../../log';
-import { AppVersionSourceUpdateOption } from '../../project/remoteVersionSource';
-import * as prompts from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 jest.mock('../../project/applicationIdentifier');
@@ -20,7 +12,16 @@ jest.mock('fs');
 jest.mock('../../log');
 jest.mock('../../utils/json');
 jest.mock('../../graphql/queries/AppVersionQuery');
-jest.mock('../../prompts');
+
+function withRemoteVersionSource(easJson: EasJson): EasJson {
+  return {
+    ...easJson,
+    cli: {
+      ...easJson.cli,
+      appVersionSource: AppVersionSource.REMOTE,
+    },
+  };
+}

 describe(BuildVersionGetView, () => {
  afterEach(() => {
@@ -48,29 +49,6 @@ describe(BuildVersionGetView, () => {
    expect(printJsonOnlyOutput).not.toHaveBeenCalled();
  });

-  test('reading version for platform android when the appVersionSource is not specified and the user chooses to set it to REMOTE', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-    const cmd = mockTestCommand(BuildVersionGetView, ['--platform=android'], ctx);
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_REMOTE);
-
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(Log.log).toHaveBeenCalledWith(`Android versionCode - ${chalk.bold('100')}`);
-    expect(enableJsonOutput).not.toHaveBeenCalled();
-    expect(printJsonOnlyOutput).not.toHaveBeenCalled();
-  });
-
  test('reading version for platform android when no remote version is set', async () => {
    const ctx = mockCommandContext(BuildVersionGetView, {
      easJson: withRemoteVersionSource(getMockEasJson()),
@@ -167,51 +145,6 @@ describe(BuildVersionGetView, () => {
  });

  test('reading version when appVersionSource is set to local ', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {
-      easJson: withLocalVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-
-    const cmd = mockTestCommand(
-      BuildVersionGetView,
-      ['--non-interactive', '--json', '--platform=android'],
-      ctx
-    );
-    await expect(cmd.run()).rejects.toThrowErrorMatchingSnapshot();
-  });
-
-  test('reading version aborts when the appVersionSource is not specified and the user chooses to set it to LOCAL', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_LOCAL);
-
-    const cmd = mockTestCommand(BuildVersionGetView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowErrorMatchingSnapshot();
-  });
-
-  test('reading version aborts when the appVersionSource is not specified and the user chooses to configure it manually', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.ABORT);
-
-    const cmd = mockTestCommand(BuildVersionGetView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborted.');
-  });
-
-  test('reading version sets appVersionSource to LOCAL and aborts when the appVersionSource is not specified and is run in non-interactive mode', async () => {
    const ctx = mockCommandContext(BuildVersionGetView, {});
    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
      buildVersion: '100',
@@ -223,10 +156,6 @@ describe(BuildVersionGetView, () => {
      ['--non-interactive', '--json', '--platform=android'],
      ctx
    );
-    await expect(cmd.run()).rejects.toThrowError(
-      `This project is not configured for using remote version source. Add ${chalk.bold(
-        '{"cli": { "appVersionSource": "remote" }}'
-      )} in eas.json or re-run this command without "--non-interactive" flag.`
-    );
+    await expect(cmd.run()).rejects.toThrowErrorMatchingSnapshot();
  });
 });
@@ -1,3 +1,4 @@
+import { AppVersionSource, EasJson } from '@expo/eas-json';
 import fs from 'fs-extra';
 import path from 'path';

@@ -7,15 +8,12 @@ import {
  mockCommandContext,
  mockProjectId,
  mockTestCommand,
-  withLocalVersionSource,
-  withRemoteVersionSource,
 } from './utils';
 import BuildVersionSetView from '../../commands/build/version/set';
 import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
 import { AppQuery } from '../../graphql/queries/AppQuery';
 import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
 import Log from '../../log';
-import { AppVersionSourceUpdateOption } from '../../project/remoteVersionSource';
 import * as prompts from '../../prompts';

 jest.mock('../../project/applicationIdentifier');
@@ -27,6 +25,16 @@ jest.mock('../../log');
 jest.mock('../../prompts');
 jest.mock('../../utils/json');

+function withRemoteVersionSource(easJson: EasJson): EasJson {
+  return {
+    ...easJson,
+    cli: {
+      ...easJson.cli,
+      appVersionSource: AppVersionSource.REMOTE,
+    },
+  };
+}
+
 describe(BuildVersionSetView, () => {
  afterEach(() => {
    jest.clearAllMocks();
@@ -59,34 +67,6 @@ describe(BuildVersionSetView, () => {
    );
  });

-  test('setting version for platform android when the appVersionSource is not specified and the user chooses to set it to REMOTE', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {});
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(prompts.promptAsync).mockImplementationOnce(async () => ({
-      version: '1000',
-    }));
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_REMOTE);
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(AppVersionMutation.createAppVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      expect.objectContaining({
-        buildVersion: '1000',
-        storeVersion: '1.0.0',
-      })
-    );
-  });
-
  test('printing current remote version before prompting for a new one', async () => {
    const ctx = mockCommandContext(BuildVersionSetView, {
      easJson: withRemoteVersionSource(getMockEasJson()),
@@ -135,9 +115,7 @@ describe(BuildVersionSetView, () => {
  });

  test('setting version aborts when appVersionSource is set to local and users refuse auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {
-      easJson: withLocalVersionSource(getMockEasJson()),
-    });
+    const ctx = mockCommandContext(BuildVersionSetView, {});
    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
    jest.mocked(prompts.confirmAsync).mockImplementation(async () => false);
@@ -147,24 +125,8 @@ describe(BuildVersionSetView, () => {
    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
  });

-  test('setting version aborts when the appVersionSource is not specified and the user chooses to set it to LOCAL, and they refuse auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_LOCAL);
-    jest.mocked(prompts.confirmAsync).mockImplementationOnce(async () => false);
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborting...');
-    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
-  });
-
  test('setting version when appVersionSource is set to local and user allows auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {
-      easJson: withLocalVersionSource(getMockEasJson()),
-    });
+    const ctx = mockCommandContext(BuildVersionSetView, {});
    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
    jest.mocked(prompts.confirmAsync).mockImplementation(async () => true);
@@ -175,33 +137,4 @@ describe(BuildVersionSetView, () => {
    const easJsonAfterCmd = await fs.readJson(path.join(ctx.projectDir, 'eas.json'));
    expect(easJsonAfterCmd.cli.appVersionSource).toBe('remote');
  });
-
-  test('setting version when the appVersionSource is not specified and the user chooses to set it to LOCAL, and they allow auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_LOCAL);
-    jest.mocked(prompts.confirmAsync).mockImplementationOnce(async () => true);
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await cmd.run();
-
-    const easJsonAfterCmd = await fs.readJson(path.join(ctx.projectDir, 'eas.json'));
-    expect(easJsonAfterCmd.cli.appVersionSource).toBe('remote');
-  });
-
-  test('setting version aborts when the appVersionSource is not specified and the user chooses to configure manually', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.ABORT);
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborted.');
-    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
-  });
 });
@@ -1,4 +1,5 @@
 import { Workflow } from '@expo/eas-build-job';
+import { AppVersionSource, EasJson } from '@expo/eas-json';
 import fs from 'fs-extra';
 import path from 'path';

@@ -8,8 +9,6 @@ import {
  mockCommandContext,
  mockProjectId,
  mockTestCommand,
-  withLocalVersionSource,
-  withRemoteVersionSource,
 } from './utils';
 import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../build/android/version';
 import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../build/ios/version';
@@ -20,7 +19,6 @@ import { AppQuery } from '../../graphql/queries/AppQuery';
 import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
 import { getAppBuildGradleAsync } from '../../project/android/gradleUtils';
 import { resolveTargetsAsync } from '../../project/ios/target';
-import { AppVersionSourceUpdateOption } from '../../project/remoteVersionSource';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import * as prompts from '../../prompts';

@@ -39,6 +37,16 @@ jest.mock('../../log');
 jest.mock('../../prompts');
 jest.mock('../../utils/json');

+function withRemoteVersionSource(easJson: EasJson): EasJson {
+  return {
+    ...easJson,
+    cli: {
+      ...easJson.cli,
+      appVersionSource: AppVersionSource.REMOTE,
+    },
+  };
+}
+
 describe(BuildVersionSyncView, () => {
  afterEach(() => {
    jest.clearAllMocks();
@@ -71,34 +79,6 @@ describe(BuildVersionSyncView, () => {
    expect(syncAndroidAsync).not.toHaveBeenCalled();
  });

-  test('syncing version for managed project on platform android when appVersionSource is not set and the user chooses to set it to REMOTE', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {});
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '1000',
-      storeVersion: '0.0.1',
-    }));
-    jest.mocked(prompts.promptAsync).mockImplementationOnce(async () => ({
-      version: '1000',
-    }));
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_REMOTE);
-    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.MANAGED);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    const syncAndroidAsync = jest.spyOn(cmd, 'syncAndroidAsync' as any);
-
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(syncAndroidAsync).not.toHaveBeenCalled();
-  });
-
  test('syncing version for bare project on platform android', async () => {
    const ctx = mockCommandContext(BuildVersionSyncView, {
      easJson: withRemoteVersionSource(getMockEasJson()),
@@ -199,25 +179,9 @@ describe(BuildVersionSyncView, () => {
  });

  test('syncing version aborts when appVersionSource is set to local and users refuse auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {
-      easJson: withLocalVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(prompts.confirmAsync).mockImplementation(async () => false);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborting...');
-    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
-  });
-
-  test('syncing version aborts when appVersionSource is not set and the user chooses to set it to LOCAL, and they refuse auto configuration', async () => {
    const ctx = mockCommandContext(BuildVersionSyncView, {});
    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_LOCAL);
    jest.mocked(prompts.confirmAsync).mockImplementation(async () => false);

    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
@@ -226,9 +190,7 @@ describe(BuildVersionSyncView, () => {
  });

  test('syncing version when appVersionSource is set to local and user allows auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {
-      easJson: withLocalVersionSource(getMockEasJson()),
-    });
+    const ctx = mockCommandContext(BuildVersionSyncView, {});
    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
    jest.mocked(prompts.confirmAsync).mockImplementation(async () => true);
@@ -239,33 +201,4 @@ describe(BuildVersionSyncView, () => {
    const easJsonAfterCmd = await fs.readJson(path.join(ctx.projectDir, 'eas.json'));
    expect(easJsonAfterCmd.cli.appVersionSource).toBe('remote');
  });
-
-  test('syncing version when appVersionSource is not set and the user chooses to set it to LOCAL and they allow auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_LOCAL);
-    jest.mocked(prompts.confirmAsync).mockImplementation(async () => true);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    await cmd.run();
-
-    const easJsonAfterCmd = await fs.readJson(path.join(ctx.projectDir, 'eas.json'));
-    expect(easJsonAfterCmd.cli.appVersionSource).toBe('remote');
-  });
-
-  test('syncing version aborts when appVersionSource is not set and the user chooses to configure manually', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.ABORT);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborted.');
-    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
-  });
 });
@@ -1,5 +1,5 @@
-import { ExpoConfig } from '@expo/config';
-import { AppVersionSource, EasJson } from '@expo/eas-json';
+import { ExpoConfig } from '@expo/config-types';
+import { EasJson } from '@expo/eas-json';
 import { Command, Config } from '@oclif/core';
 import { vol } from 'memfs';
 import path from 'path';
@@ -148,23 +148,3 @@ export const getError = <TError = any>(call: () => unknown): TError | NoErrorThr
    return error as TError;
  }
 };
-
-export function withRemoteVersionSource(easJson: EasJson): EasJson {
-  return {
-    ...easJson,
-    cli: {
-      ...easJson.cli,
-      appVersionSource: AppVersionSource.REMOTE,
-    },
-  };
-}
-
-export function withLocalVersionSource(easJson: EasJson): EasJson {
-  return {
-    ...easJson,
-    cli: {
-      ...easJson.cli,
-      appVersionSource: AppVersionSource.LOCAL,
-    },
-  };
-}
@@ -1,77 +0,0 @@
-import { AppVersionSource, EasJsonAccessor } from '@expo/eas-json';
-import fs from 'fs-extra';
-import { vol } from 'memfs';
-
-import { easCliVersion } from '../../utils/easCli';
-import GitClient from '../../vcs/clients/git';
-import { Client } from '../../vcs/vcs';
-import { ensureProjectConfiguredAsync } from '../configure';
-
-jest.mock('fs');
-jest.mock('../../vcs/vcs');
-jest.mock('../../vcs/clients/git');
-
-beforeEach(async () => {
-  vol.reset();
-});
-
-describe(ensureProjectConfiguredAsync, () => {
-  it('returns false and does not configure if eas.json exists', async () => {
-    vol.fromJSON({
-      './eas.json': JSON.stringify({
-        cli: {
-          version: `>= ${easCliVersion}`,
-        },
-        build: {
-          development: {
-            developmentClient: true,
-            distribution: 'internal',
-          },
-          preview: {
-            distribution: 'internal',
-          },
-          production: {},
-        },
-        submit: {
-          production: {},
-        },
-      }),
-    });
-    await expect(fs.pathExists(EasJsonAccessor.formatEasJsonPath('.'))).resolves.toBeTruthy();
-    const vcsClientMock = jest.mocked(new GitClient());
-    vcsClientMock.showChangedFilesAsync.mockImplementation(async () => {});
-    vcsClientMock.isCommitRequiredAsync.mockImplementation(async () => false);
-    vcsClientMock.trackFileAsync.mockImplementation(async () => {});
-    const result = await ensureProjectConfiguredAsync({
-      projectDir: '.',
-      nonInteractive: false,
-      vcsClient: vcsClientMock as unknown as Client,
-    });
-    expect(result).toBeFalsy();
-    await expect(fs.pathExists(EasJsonAccessor.formatEasJsonPath('.'))).resolves.toBeTruthy();
-  });
-  it('returns true and configures if eas.json does not exist', async () => {
-    const writeFileMock = jest.spyOn(fs, 'writeFile');
-    writeFileMock.mockImplementation(async (...args) => {
-      const easJsonPath = args[0] as string;
-      const easJsonData = args[1] as string;
-      vol.fromJSON({
-        [easJsonPath]: easJsonData,
-      });
-    });
-    await expect(fs.pathExists(EasJsonAccessor.formatEasJsonPath('.'))).resolves.toBeFalsy();
-    const vcsClientMock = jest.mocked(new GitClient());
-    vcsClientMock.showChangedFilesAsync.mockImplementation(async () => {});
-    vcsClientMock.isCommitRequiredAsync.mockImplementation(async () => false);
-    vcsClientMock.trackFileAsync.mockImplementation(async () => {});
-    const result = await ensureProjectConfiguredAsync({
-      projectDir: '.',
-      nonInteractive: false,
-      vcsClient: vcsClientMock as unknown as Client,
-    });
-    expect(result).toBeTruthy();
-    await expect(fs.pathExists(EasJsonAccessor.formatEasJsonPath('.'))).resolves.toBeTruthy();
-    const easJson = await EasJsonAccessor.fromProjectPath('.').readAsync();
-    expect(easJson.cli?.appVersionSource).toEqual(AppVersionSource.REMOTE);
-  });
-});
@@ -107,7 +107,7 @@ export async function prepareAndroidBuildAsync(
            ? false
            : ctx.buildProfile.autoIncrement,
        vcsClient: ctx.vcsClient,
-        env: ctx.env,
+        env: ctx.buildProfile.env,
      });
    },
    prepareJobAsync: async (
@@ -115,10 +115,6 @@ export async function prepareJobAsync(
      },
    }),
    loggerLevel: ctx.loggerLevel,
-    // Technically, these are unused, but let's include them here for type consistency.
-    // See: https://github.com/expo/eas-build/pull/454
-    appId: ctx.projectId,
-    initiatingUserId: ctx.user.id,
  };

  return sanitizeBuildJob(job) as Android.Job;
@@ -2,7 +2,7 @@ import {
  ArchiveSource,
  ArchiveSourceType,
  BuildJob,
-  FingerprintSource,
+  FingerprintSourceType,
  Metadata,
  Platform,
 } from '@expo/eas-build-job';
@@ -13,6 +13,8 @@ import cliProgress from 'cli-progress';
 import fs from 'fs-extra';
 import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';
+import path from 'path';
+import { v4 as uuidv4 } from 'uuid';

 import { BuildContext } from './context';
 import {
@@ -62,12 +64,11 @@ import {
  appPlatformEmojis,
  requestedPlatformDisplayNames,
 } from '../platform';
-import { maybeUploadFingerprintAsync } from '../project/maybeUploadFingerprintAsync';
 import { resolveRuntimeVersionAsync } from '../project/resolveRuntimeVersionAsync';
 import { uploadFileAtPathToGCSAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
-import { createFingerprintAsync } from '../utils/fingerprintCli';
 import { printJsonOnlyOutput } from '../utils/json';
+import { getTmpDirectory } from '../utils/paths';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';

@@ -175,9 +176,8 @@ export async function prepareBuildRequestForPlatformAsync<
  }
  assert(projectArchive);

-  const runtimeAndFingerprintMetadata =
-    await computeAndMaybeUploadRuntimeAndFingerprintMetadataAsync(ctx);
-  const metadata = await collectMetadataAsync(ctx, runtimeAndFingerprintMetadata);
+  const runtimeMetadata = await createAndMaybeUploadFingerprintAsync(ctx);
+  const metadata = await collectMetadataAsync(ctx, runtimeMetadata);
  const buildParams = resolveBuildParamsInput(ctx, metadata);
  const job = await builder.prepareJobAsync(ctx, {
    projectArchive,
@@ -186,7 +186,7 @@ export async function prepareBuildRequestForPlatformAsync<

  return async () => {
    if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
-      await runLocalBuildAsync(job, metadata, ctx.localBuildOptions, ctx.env);
+      await runLocalBuildAsync(job, metadata, ctx.localBuildOptions);
      return undefined;
    } else if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
      await BuildMutation.updateBuildMetadataAsync(ctx.graphqlClient, {
@@ -488,8 +488,8 @@ async function handleSingleBuildProgressAsync(
      spinner.succeed('Build finished');
      return { refetch: false };
    case BuildStatus.New:
-      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)
+      spinner.text = `Build is waiting to enter the queue. Check your concurrency limit at ${link(
+        formatAccountSubscriptionsUrl(accountName)
      )}.`;
      break;
    case BuildStatus.InQueue: {
@@ -511,7 +511,7 @@ async function handleSingleBuildProgressAsync(
          Log.log('Start builds sooner in the priority queue.');
          Log.log(
            `Sign up for EAS Production or Enterprise at ${link(
-              formatAccountBillingUrl(accountName)
+              formatAccountSubscriptionsUrl(accountName)
            )}`
          );
        }
@@ -658,49 +658,25 @@ function formatEstimatedWaitTime(estimatedWaitTimeLeftSeconds: number): string {
  }
 }

-function formatAccountBillingUrl(accountName: string): string {
-  return new URL(`/accounts/${accountName}/settings/billing`, getExpoWebsiteBaseUrl()).toString();
+function formatAccountSubscriptionsUrl(accountName: string): string {
+  return new URL(
+    `/accounts/${accountName}/settings/subscriptions`,
+    getExpoWebsiteBaseUrl()
+  ).toString();
 }

-async function computeAndMaybeUploadRuntimeAndFingerprintMetadataAsync<T extends Platform>(
-  ctx: BuildContext<T>
-): Promise<{
-  runtimeVersion?: string | undefined;
-  fingerprintHash?: string | undefined;
-  fingerprintSource?: FingerprintSource | undefined;
-}> {
-  const runtimeAndFingerprintMetadata =
-    await computeAndMaybeUploadFingerprintFromExpoUpdatesAsync(ctx);
-  if (!runtimeAndFingerprintMetadata?.fingerprint) {
-    const fingerprint = await computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync(ctx);
-    return {
-      ...runtimeAndFingerprintMetadata,
-      ...fingerprint,
-    };
-  } else {
-    return {
-      ...runtimeAndFingerprintMetadata,
-      fingerprintHash: runtimeAndFingerprintMetadata.runtimeVersion,
-    };
-  }
-}
-
-async function computeAndMaybeUploadFingerprintFromExpoUpdatesAsync<T extends Platform>(
+async function createAndMaybeUploadFingerprintAsync<T extends Platform>(
  ctx: BuildContext<T>
 ): Promise<{
  runtimeVersion?: string;
-  fingerprintSource?: FingerprintSource;
-  fingerprint?: {
-    fingerprintSources: object[];
-    isDebugFingerprintSource: boolean;
-  };
+  fingerprintSource?: Metadata['fingerprintSource'];
 }> {
  const resolvedRuntimeVersion = await resolveRuntimeVersionAsync({
    exp: ctx.exp,
    platform: ctx.platform,
    workflow: ctx.workflow,
    projectDir: ctx.projectDir,
-    env: ctx.env,
+    env: ctx.buildProfile.env,
    cwd: ctx.projectDir,
  });

@@ -709,54 +685,62 @@ async function computeAndMaybeUploadFingerprintFromExpoUpdatesAsync<T extends Pl
  }

  /**
-   * It's ok for fingerprintSources or runtimeVersion to be empty
+   * It's ok for fingerprintSources to be empty
   * fingerprintSources only exist if the project is using runtimeVersion.policy: fingerprint
   */
-  if (!resolvedRuntimeVersion.fingerprint || !resolvedRuntimeVersion.runtimeVersion) {
+  if (!resolvedRuntimeVersion.fingerprint) {
    return {
      runtimeVersion: resolvedRuntimeVersion.runtimeVersion ?? undefined,
    };
  }

-  const uploadedFingerprint = await maybeUploadFingerprintAsync({
-    hash: resolvedRuntimeVersion.runtimeVersion,
-    fingerprint: resolvedRuntimeVersion.fingerprint,
-    graphqlClient: ctx.graphqlClient,
-    localBuildMode: ctx.localBuildOptions.localBuildMode,
-  });
-  return {
-    runtimeVersion: uploadedFingerprint.hash,
-    fingerprintSource: uploadedFingerprint.fingerprintSource,
-    fingerprint: resolvedRuntimeVersion.fingerprint,
-  };
-}
+  await fs.mkdirp(getTmpDirectory());
+  const fingerprintLocation = path.join(getTmpDirectory(), `${uuidv4()}-runtime-fingerprint.json`);

-async function computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync<T extends Platform>(
-  ctx: BuildContext<T>,
-  { debug }: { debug?: boolean } = {}
-): Promise<{
-  fingerprintHash?: string;
-  fingerprintSource?: FingerprintSource;
-}> {
-  const fingerprint = await createFingerprintAsync(ctx.projectDir, {
-    workflow: ctx.workflow,
-    platform: ctx.platform,
-    env: ctx.env,
+  await fs.writeJSON(fingerprintLocation, {
+    hash: resolvedRuntimeVersion.runtimeVersion,
+    sources: resolvedRuntimeVersion.fingerprint.fingerprintSources,
  });
-  if (!fingerprint) {
-    return {};
+
+  if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
+    return {
+      runtimeVersion: resolvedRuntimeVersion.runtimeVersion ?? undefined,
+      fingerprintSource: {
+        type: FingerprintSourceType.PATH,
+        path: fingerprintLocation,
+        isDebugFingerprint: resolvedRuntimeVersion.fingerprint.isDebugFingerprintSource,
+      },
+    };
  }
-  const uploadedFingerprint = await maybeUploadFingerprintAsync({
-    hash: fingerprint.hash,
-    fingerprint: {
-      fingerprintSources: fingerprint.sources,
-      isDebugFingerprintSource: debug ?? false,
-    },
-    graphqlClient: ctx.graphqlClient,
-    localBuildMode: ctx.localBuildOptions.localBuildMode,
-  });
+
+  let fingerprintGCSBucketKey = undefined;
+  try {
+    fingerprintGCSBucketKey = await uploadFileAtPathToGCSAsync(
+      ctx.graphqlClient,
+      UploadSessionType.EasUpdateFingerprint,
+      fingerprintLocation
+    );
+  } catch (err: any) {
+    let errMessage = 'Failed to upload fingerprint to EAS';
+
+    if (err.message) {
+      errMessage += `\n\nReason: ${err.message}`;
+    }
+
+    Log.warn(errMessage);
+    return {
+      runtimeVersion: resolvedRuntimeVersion.runtimeVersion ?? undefined,
+    };
+  } finally {
+    await fs.remove(fingerprintLocation);
+  }
+
  return {
-    fingerprintHash: uploadedFingerprint.hash,
-    fingerprintSource: uploadedFingerprint.fingerprintSource,
+    runtimeVersion: resolvedRuntimeVersion.runtimeVersion ?? undefined,
+    fingerprintSource: {
+      type: FingerprintSourceType.GCS,
+      bucketKey: fingerprintGCSBucketKey,
+      isDebugFingerprint: resolvedRuntimeVersion.fingerprint.isDebugFingerprintSource,
+    },
  };
 }
@@ -1,4 +1,4 @@
-import { AppVersionSource, EasJson, EasJsonAccessor } from '@expo/eas-json';
+import { EasJson, EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';

@@ -55,7 +55,6 @@ async function configureAsync({
 const EAS_JSON_DEFAULT: EasJson = {
  cli: {
    version: `>= ${easCliVersion}`,
-    appVersionSource: AppVersionSource.REMOTE,
  },
  build: {
    development: {
@@ -65,9 +64,7 @@ const EAS_JSON_DEFAULT: EasJson = {
    preview: {
      distribution: 'internal',
    },
-    production: {
-      autoIncrement: true,
-    },
+    production: {},
  },
  submit: {
    production: {},
@@ -63,5 +63,4 @@ export interface BuildContext<T extends Platform> {
  vcsClient: Client;
  loggerLevel?: LoggerLevel;
  repack: boolean;
-  env: Record<string, string>;
 }
@@ -43,7 +43,6 @@ export async function createBuildContextAsync<T extends Platform>({
  buildLoggerLevel,
  freezeCredentials,
  repack,
-  env,
 }: {
  buildProfileName: string;
  buildProfile: BuildProfile<T>;
@@ -65,11 +64,8 @@ export async function createBuildContextAsync<T extends Platform>({
  buildLoggerLevel?: LoggerLevel;
  freezeCredentials: boolean;
  repack: boolean;
-  env: Record<string, string>;
 }): Promise<BuildContext<T>> {
-  const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
-    env,
-  });
+  const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
  const projectName = exp.slug;
  const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
  const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient);
@@ -91,7 +87,7 @@ export async function createBuildContextAsync<T extends Platform>({
    user: actor,
    graphqlClient,
    analytics,
-    env,
+    env: buildProfile.env,
    easJsonCliConfig,
    vcsClient,
    freezeCredentials,
@@ -151,7 +147,6 @@ export async function createBuildContextAsync<T extends Platform>({
    requiredPackageManager,
    loggerLevel: buildLoggerLevel,
    repack,
-    env,
  };
  if (platform === Platform.ANDROID) {
    const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -1,147 +0,0 @@
-import { Env } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { EnvironmentVariableEnvironment } from '../graphql/generated';
-import { EnvironmentVariablesQuery } from '../graphql/queries/EnvironmentVariablesQuery';
-import Log, { learnMore } from '../log';
-
-function isEnvironment(env: string): env is EnvironmentVariableEnvironment {
-  return Object.values(EnvironmentVariableEnvironment).includes(
-    env as EnvironmentVariableEnvironment
-  );
-}
-
-export async function evaluateConfigWithEnvVarsAsync<Config extends { projectId: string }, Opts>({
-  buildProfile,
-  buildProfileName,
-  graphqlClient,
-  getProjectConfig,
-  opts,
-}: {
-  buildProfile: BuildProfile;
-  buildProfileName: string;
-  graphqlClient: ExpoGraphqlClient | null;
-  opts: Opts;
-  getProjectConfig(opts: Opts): Promise<Config>;
-}): Promise<Config & { env: Env }> {
-  if (!graphqlClient) {
-    Log.warn('An Expo user account is required to fetch environment variables.');
-    const config = await getProjectConfig(opts);
-    return { env: buildProfile.env ?? {}, ...config };
-  }
-  const { projectId } = await getProjectConfig({ env: buildProfile.env, ...opts });
-  const env = await resolveEnvVarsAsync({
-    buildProfile,
-    buildProfileName,
-    graphqlClient,
-    projectId,
-  });
-  const config = await getProjectConfig({ ...opts, env });
-
-  return { env, ...config };
-}
-
-async function resolveEnvVarsAsync({
-  buildProfile,
-  buildProfileName,
-  graphqlClient,
-  projectId,
-}: {
-  buildProfile: BuildProfile;
-  buildProfileName: string;
-  graphqlClient: ExpoGraphqlClient;
-  projectId: string;
-}): Promise<Env> {
-  const environment =
-    buildProfile.environment?.toUpperCase() ?? process.env.EAS_CURRENT_ENVIRONMENT;
-
-  if (!environment || !isEnvironment(environment)) {
-    Log.log(
-      `Loaded "env" configuration for the "${buildProfileName}" profile: ${
-        buildProfile.env && Object.keys(buildProfile.env).length > 0
-          ? Object.keys(buildProfile.env).join(', ')
-          : 'no environment variables specified'
-      }. ${learnMore('https://docs.expo.dev/build-reference/variables/')}`
-    );
-    return { ...buildProfile.env };
-  }
-
-  try {
-    const environmentVariables = await EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(
-      graphqlClient,
-      {
-        appId: projectId,
-        environment,
-      }
-    );
-    const serverEnvVars = Object.fromEntries(
-      environmentVariables
-        .filter(({ name, value }) => name && value)
-        .map(({ name, value }) => [name, value])
-    ) as Record<string, string>;
-
-    if (Object.keys(serverEnvVars).length > 0) {
-      Log.log(
-        `Environment variables loaded from the "${environment.toLowerCase()}" environment on EAS servers: ${Object.keys(
-          serverEnvVars
-        ).join(', ')}.`
-      );
-    } else {
-      Log.log(
-        `No environment variables found for the "${environment.toLowerCase()}" environment on EAS servers.`
-      );
-    }
-
-    const encryptedEnvVars = environmentVariables.filter(({ name, value }) => name && !value);
-    if (encryptedEnvVars.length > 0) {
-      Log.warn(
-        `Some environment variables defined in the "${environment.toLowerCase()}" environment on EAS servers are of "encrypted" type and cannot be read outside of the EAS servers (including EAS CLI): ${encryptedEnvVars
-          .map(({ name }) => name)
-          .join(
-            ', '
-          )}. However, they will be available during the build process happening on the EAS servers. This can lead to potential configuration mismatches between the local development environment and the build environment if the encrypted environment variables are used to resolve the app config.`
-      );
-    }
-
-    if (buildProfile.env && Object.keys(buildProfile.env).length > 0) {
-      Log.log(
-        `Environment variables loaded from the "${buildProfileName}" build profile "env" configuration: ${
-          buildProfile.env && Object.keys(buildProfile.env).join(', ')
-        }.`
-      );
-    } else {
-      Log.log(
-        `No environment variables specified in the "${buildProfileName}" build profile "env" configuration.`
-      );
-    }
-
-    if (
-      buildProfile.env &&
-      Object.keys(buildProfile.env).length > 0 &&
-      Object.keys(serverEnvVars).length > 0
-    ) {
-      const overlappingKeys = Object.keys(serverEnvVars).filter(
-        key => buildProfile.env && Object.keys(buildProfile.env).includes(key)
-      );
-      if (overlappingKeys.length > 0) {
-        Log.warn(
-          `The following environment variables are defined in both the "${buildProfileName}" build profile "env" configuration and the "${environment.toLowerCase()}" environment on EAS servers: ${overlappingKeys.join(
-            ', '
-          )}. The values from the build profile configuration will be used.`
-        );
-      }
-    }
-
-    Log.newLine();
-
-    return { ...serverEnvVars, ...buildProfile.env };
-  } catch (e) {
-    Log.error(`Failed to pull env variables for environment ${environment} from EAS servers`);
-    Log.error(e);
-    Log.error(
-      'This can possibly be a bug in EAS/EAS CLI. Report it here: https://github.com/expo/eas-cli/issues'
-    );
-    return { ...buildProfile.env };
-  }
-}
@@ -3,7 +3,6 @@ import {
  ArchiveSourceType,
  BuildMode,
  BuildTrigger,
-  FingerprintSourceType,
  Metadata,
  Workflow,
 } from '@expo/eas-build-job';
@@ -16,10 +15,8 @@ import {
  BuildMetadataInput,
  BuildWorkflow,
  DistributionType,
-  FingerprintSourceInput,
  BuildMode as GraphQLBuildMode,
  BuildTrigger as GraphQLBuildTrigger,
-  FingerprintSourceType as GraphQLFingeprintSourceType,
  ProjectArchiveSourceInput,
  ProjectArchiveSourceType,
  WorkerLoggerLevel,
@@ -45,8 +42,7 @@ export function transformProjectArchive(archiveSource: ArchiveSource): ProjectAr
 export function transformMetadata(metadata: Metadata): BuildMetadataInput {
  return {
    ...metadata,
-    fingerprintSource:
-      metadata.fingerprintSource && transformFingerprintSource(metadata.fingerprintSource),
+    fingerprintSource: metadata.fingerprintSource as BuildMetadataInput['fingerprintSource'],
    credentialsSource:
      metadata.credentialsSource && transformCredentialsSource(metadata.credentialsSource),
    distribution: metadata.distribution && transformDistribution(metadata.distribution),
@@ -57,20 +53,6 @@ export function transformMetadata(metadata: Metadata): BuildMetadataInput {
  };
 }

-export function transformFingerprintSource(
-  fingerprintSource: NonNullable<Metadata['fingerprintSource']>
-): FingerprintSourceInput | null {
-  if (fingerprintSource.type !== FingerprintSourceType.GCS) {
-    return null;
-  }
-
-  return {
-    type: GraphQLFingeprintSourceType.Gcs,
-    bucketKey: fingerprintSource.bucketKey,
-    isDebugFingerprint: fingerprintSource.isDebugFingerprint,
-  };
-}
-
 function transformCredentialsSource(
  credentialsSource: Metadata['credentialsSource']
 ): BuildCredentialsSource {
@@ -5,7 +5,6 @@ import { vol } from 'memfs';
 import os from 'os';
 import type { XCBuildConfiguration } from 'xcode';

-import { learnMore } from '../../../log';
 import { readPlistAsync } from '../../../utils/plist';
 import { resolveVcsClient } from '../../../vcs';
 import {
@@ -317,9 +316,7 @@ describe(readShortVersionAsync, () => {
          vcsClient
        )
      ).rejects.toThrowError(
-        `The required format for "CFBundleShortVersionString" in Info.plist is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: 0.0.7.1.028. Edit the "CFBundleShortVersionString" in your Info.plist to match the required format. ${learnMore(
-          'https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring'
-        )}`
+        'CFBundleShortVersionString (version field in app.json/app.config.js) must be a period-separated list of three non-negative integers. Current value: 0.0.7.1.028'
      );
    });
  });
@@ -24,7 +24,7 @@ import {
 export async function createIosContextAsync(
  ctx: CommonContext<Platform.IOS>
 ): Promise<IosBuildContext> {
-  const { buildProfile, env } = ctx;
+  const { buildProfile } = ctx;

  if (ctx.workflow === Workflow.MANAGED) {
    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx);
@@ -47,7 +47,7 @@ export async function createIosContextAsync(
    projectDir: ctx.projectDir,
    exp: ctx.exp,
    xcodeBuildContext,
-    env,
+    env: buildProfile.env,
    vcsClient: ctx.vcsClient,
  });
  const applicationTarget = findApplicationTarget(targets);
@@ -89,7 +89,7 @@ export async function prepareIosBuildAsync(
            ? false
            : ctx.buildProfile.autoIncrement,
        vcsClient: ctx.vcsClient,
-        env: ctx.env,
+        env: ctx.buildProfile.env,
      });
    },
    prepareJobAsync: async (
@@ -110,10 +110,6 @@ export async function prepareJobAsync(
      },
    }),
    loggerLevel: ctx.loggerLevel,
-    // Technically, these are unused, but let's include them here for type consistency.
-    // See: https://github.com/expo/eas-build/pull/454
-    appId: ctx.projectId,
-    initiatingUserId: ctx.user.id,
  };
  return sanitizeBuildJob(job) as Ios.Job;
 }
@@ -11,7 +11,7 @@ import { Target } from '../../credentials/ios/types';
 import { AppPlatform } from '../../graphql/generated';
 import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
 import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
-import Log, { learnMore } from '../../log';
+import Log from '../../log';
 import { ora } from '../../ora';
 import { findApplicationTarget } from '../../project/ios/target';
 import { getNextBuildNumber, isValidBuildNumber } from '../../project/ios/versions';
@@ -23,7 +23,7 @@ import { Client } from '../../vcs/vcs';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';

-const SHORT_VERSION_REGEX = /^\d+(\.\d+){0,2}$/;
+const SHORT_VERSION_REGEX = /^\d+.\d+.\d+$/;

 export enum BumpStrategy {
  APP_VERSION,
@@ -100,27 +100,11 @@ export async function bumpVersionInAppJsonAsync({
  }
 }

-function validateShortVersion({
-  shortVersion,
-  workflow,
-}: {
-  shortVersion: string | undefined;
-  workflow: Workflow;
-}): void {
+function validateShortVersion(shortVersion: string | undefined): void {
  if (shortVersion && !SHORT_VERSION_REGEX.test(shortVersion)) {
-    if (workflow === Workflow.MANAGED) {
-      throw new Error(
-        `The required format for "version" field from app.json/app.config.ts is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: ${shortVersion}. Edit the "version" field in your app.json/app.config.ts to match the required format. ${learnMore(
-          'https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring'
-        )}`
-      );
-    } else {
-      throw new Error(
-        `The required format for "CFBundleShortVersionString" in Info.plist is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: ${shortVersion}. Edit the "CFBundleShortVersionString" in your Info.plist to match the required format. ${learnMore(
-          'https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring'
-        )}`
-      );
-    }
+    throw new Error(
+      `CFBundleShortVersionString (version field in app.json/app.config.js) must be a period-separated list of three non-negative integers. Current value: ${shortVersion}`
+    );
  }
 }

@@ -138,10 +122,10 @@ export async function readShortVersionAsync(
      infoPlist.CFBundleShortVersionString &&
      evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings);

-    validateShortVersion({ shortVersion, workflow });
+    validateShortVersion(shortVersion);
    return shortVersion;
  } else {
-    validateShortVersion({ shortVersion: exp.version, workflow });
+    validateShortVersion(exp.version);
    return exp.version;
  }
 }
@@ -3,11 +3,10 @@ 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';
-const PLUGIN_PACKAGE_VERSION = '1.0.144';
+const PLUGIN_PACKAGE_VERSION = '1.0.131';

 export enum LocalBuildMode {
  /**
@@ -40,8 +39,7 @@ export interface LocalBuildOptions {
 export async function runLocalBuildAsync(
  job: Job,
  metadata: Metadata,
-  options: LocalBuildOptions,
-  env: Record<string, string>
+  options: LocalBuildOptions
 ): Promise<void> {
  const { command, args } = await getCommandAndArgsAsync(job, metadata);
  let spinner;
@@ -56,26 +54,18 @@ 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: 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 } : {}),
+      },
    });
    childProcess = spawnPromise.child;
    await spawnPromise;
@@ -16,9 +16,8 @@ import { easCliVersion } from '../utils/easCli';

 export async function collectMetadataAsync<T extends Platform>(
  ctx: BuildContext<T>,
-  runtimeAndFingerprintMetadata: {
+  runtimeMetadata: {
    runtimeVersion?: string | undefined;
-    fingerprintHash?: string | undefined;
    fingerprintSource?: FingerprintSource | undefined;
  }
 ): Promise<Metadata> {
@@ -31,9 +30,8 @@ export async function collectMetadataAsync<T extends Platform>(
    workflow: ctx.workflow,
    credentialsSource: ctx.buildProfile.credentialsSource,
    sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: runtimeAndFingerprintMetadata?.runtimeVersion,
-    fingerprintHash: runtimeAndFingerprintMetadata?.fingerprintHash,
-    fingerprintSource: runtimeAndFingerprintMetadata?.fingerprintSource,
+    runtimeVersion: runtimeMetadata?.runtimeVersion,
+    fingerprintSource: runtimeMetadata?.fingerprintSource,
    reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
    ...channelObject,
    distribution,
@@ -1,7 +1,8 @@
-import { ExpoConfig } from '@expo/config';
+import { ExpoConfig } from '@expo/config-types';
 import { Env, Platform, Workflow } from '@expo/eas-build-job';
 import {
  AppVersionSource,
+  BuildProfile,
  EasJson,
  EasJsonAccessor,
  EasJsonUtils,
@@ -18,7 +19,6 @@ import { BuildRequestSender, MaybeBuildFragment, waitForBuildEndAsync } from './
 import { ensureProjectConfiguredAsync } from './configure';
 import { BuildContext } from './context';
 import { createBuildContextAsync } from './createContext';
-import { evaluateConfigWithEnvVarsAsync } from './evaluateConfigWithEnvVarsAsync';
 import { prepareIosBuildAsync } from './ios/build';
 import { LocalBuildMode, LocalBuildOptions } from './local';
 import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
@@ -57,9 +57,8 @@ import {
  validateAppVersionRuntimePolicySupportAsync,
 } from '../project/projectUtils';
 import {
-  ensureAppVersionSourceIsSetAsync,
  validateAppConfigForRemoteVersionSource,
-  validateBuildProfileVersionSettingsAsync,
+  validateBuildProfileVersionSettings,
 } from '../project/remoteVersionSource';
 import { confirmAsync } from '../prompts';
 import { runAsync } from '../run/run';
@@ -130,6 +129,13 @@ export async function runBuildAndSubmitAsync(
    profileName: flags.profile ?? undefined,
    projectDir,
  });
+  Log.log(
+    `Loaded "env" configuration for the "${buildProfiles[0].profileName}" profile: ${
+      buildProfiles[0].profile.env
+        ? Object.keys(buildProfiles[0].profile.env).join(', ')
+        : 'no environment variables specified'
+    }. ${learnMore('https://docs.expo.dev/build-reference/variables/')}`
+  );

  for (const buildProfile of buildProfiles) {
    if (buildProfile.profile.image && ['default', 'stable'].includes(buildProfile.profile.image)) {
@@ -167,12 +173,7 @@ export async function runBuildAndSubmitAsync(
  const customBuildConfigMetadataByPlatform: { [p in AppPlatform]?: CustomBuildConfigMetadata } =
    {};
  for (const buildProfile of buildProfiles) {
-    await validateBuildProfileVersionSettingsAsync(
-      buildProfile,
-      easJsonCliConfig,
-      projectDir,
-      flags
-    );
+    validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
    const maybeMetadata = await validateCustomBuildConfigAsync({
      projectDir,
      profile: buildProfile.profile,
@@ -191,15 +192,6 @@ export async function runBuildAndSubmitAsync(

  for (const buildProfile of buildProfiles) {
    const platform = toAppPlatform(buildProfile.platform);
-
-    const { env } = await evaluateConfigWithEnvVarsAsync({
-      buildProfile: buildProfile.profile,
-      buildProfileName: buildProfile.profileName,
-      graphqlClient,
-      getProjectConfig: getDynamicPrivateProjectConfigAsync,
-      opts: { env: buildProfile.profile.env },
-    });
-
    const { build: maybeBuild, buildCtx } = await prepareAndStartBuildAsync({
      projectDir,
      flags,
@@ -212,7 +204,6 @@ export async function runBuildAndSubmitAsync(
      vcsClient,
      getDynamicPrivateProjectConfigAsync,
      customBuildConfigMetadata: customBuildConfigMetadataByPlatform[platform],
-      env,
    });
    if (maybeBuild) {
      startedBuilds.push({ build: maybeBuild, buildProfile });
@@ -260,6 +251,7 @@ export async function runBuildAndSubmitAsync(
        buildCtx: nullthrows(buildCtxByPlatform[startedBuild.build.platform]),
        moreBuilds: startedBuilds.length > 1,
        projectDir,
+        buildProfile: startedBuild.buildProfile.profile,
        submitProfile,
        nonInteractive: flags.nonInteractive,
        selectedSubmitProfileName: flags.submitProfile,
@@ -348,7 +340,6 @@ async function prepareAndStartBuildAsync({
  vcsClient,
  getDynamicPrivateProjectConfigAsync,
  customBuildConfigMetadata,
-  env,
 }: {
  projectDir: string;
  flags: BuildFlags;
@@ -361,7 +352,6 @@ async function prepareAndStartBuildAsync({
  vcsClient: Client;
  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
  customBuildConfigMetadata?: CustomBuildConfigMetadata;
-  env: Env;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
  const buildCtx = await createBuildContextAsync({
    buildProfileName: buildProfile.profileName,
@@ -381,10 +371,9 @@ async function prepareAndStartBuildAsync({
    vcsClient,
    getDynamicPrivateProjectConfigAsync,
    customBuildConfigMetadata,
-    buildLoggerLevel: flags.buildLoggerLevel ?? (Log.isDebug ? LoggerLevel.DEBUG : undefined),
+    buildLoggerLevel: flags.buildLoggerLevel,
    freezeCredentials: flags.freezeCredentials,
    repack: flags.repack,
-    env,
  });

  if (moreBuilds) {
@@ -423,25 +412,6 @@ async function prepareAndStartBuildAsync({
  }

  await validateAppVersionRuntimePolicySupportAsync(buildCtx.projectDir, buildCtx.exp);
-  if (
-    easJsonCliConfig?.appVersionSource === undefined &&
-    buildProfile.profile.autoIncrement !== 'version'
-  ) {
-    if (buildProfile.profile.autoIncrement !== true) {
-      Log.warn(
-        `The field "cli.appVersionSource" is not set, but it will be required in the future. ${learnMore(
-          'https://docs.expo.dev/build-reference/app-versions/'
-        )}`
-      );
-    } else {
-      const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-      easJsonCliConfig = await ensureAppVersionSourceIsSetAsync(
-        easJsonAccessor,
-        easJsonCliConfig,
-        flags.nonInteractive
-      );
-    }
-  }
  if (easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE) {
    validateAppConfigForRemoteVersionSource(buildCtx.exp, buildProfile.platform);
  }
@@ -478,6 +448,7 @@ async function prepareAndStartSubmissionAsync({
  buildCtx,
  moreBuilds,
  projectDir,
+  buildProfile,
  submitProfile,
  selectedSubmitProfileName,
  nonInteractive,
@@ -486,6 +457,7 @@ async function prepareAndStartSubmissionAsync({
  buildCtx: BuildContext<Platform>;
  moreBuilds: boolean;
  projectDir: string;
+  buildProfile: BuildProfile;
  submitProfile: SubmitProfile;
  selectedSubmitProfileName?: string;
  nonInteractive: boolean;
@@ -497,7 +469,7 @@ async function prepareAndStartSubmissionAsync({
    profile: submitProfile,
    archiveFlags: { id: build.id },
    nonInteractive,
-    env: buildCtx.env,
+    env: buildProfile.env,
    credentialsCtx: buildCtx.credentialsCtx,
    applicationIdentifier: buildCtx.android?.applicationId ?? buildCtx.ios?.bundleIdentifier,
    actor: buildCtx.user,
@@ -1,9 +1,3 @@
-import { ResourceClass } from '@expo/eas-json';
-import { LoggerLevel } from '@expo/logger';
-
-import { LocalBuildOptions } from './local';
-import { RequestedPlatform } from '../platform';
-
 export enum BuildStatus {
  NEW = 'new',
  IN_QUEUE = 'in-queue',
@@ -20,20 +14,3 @@ export enum BuildDistributionType {
  /** @deprecated Use simulator flag instead */
  SIMULATOR = 'simulator',
 }
-
-export interface BuildFlags {
-  requestedPlatform: RequestedPlatform;
-  profile?: string;
-  nonInteractive: boolean;
-  wait: boolean;
-  clearCache: boolean;
-  json: boolean;
-  autoSubmit: boolean;
-  submitProfile?: string;
-  localBuildOptions: LocalBuildOptions;
-  resourceClass?: ResourceClass;
-  message?: string;
-  buildLoggerLevel?: LoggerLevel;
-  freezeCredentials: boolean;
-  repack: boolean;
-}
@@ -50,16 +50,3 @@ export function getUpdateGroupUrl(
    getExpoWebsiteBaseUrl()
  ).toString();
 }
-
-export function getWorkflowRunUrl(
-  accountName: string,
-  projectName: string,
-  workflowRunId: string
-): string {
-  return new URL(
-    `/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
-      projectName
-    )}/workflows/${workflowRunId}`,
-    getExpoWebsiteBaseUrl()
-  ).toString();
-}
@@ -9,9 +9,9 @@ import Log, { learnMore } from '../log';
 import { isPNGAsync } from '../utils/image';

 export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
-  if (ctx.env?.NODE_ENV === 'production') {
+  if (ctx.buildProfile.env?.NODE_ENV === 'production') {
    Log.warn(
-      'You set NODE_ENV=production in the build profile or environment variables. Remember that it will be available during the entire build process. In particular, it will make yarn/npm install only production packages.'
+      'You set NODE_ENV=production in the build profile. Remember that it will be available during the entire build process. In particular, it will make yarn/npm install only production packages.'
    );
    Log.newLine();
  }
@@ -128,7 +128,6 @@ export const testChannelObject: UpdateChannelObject = {
  branchMapping:
    '{"data":[{"branchId":"754bf17f-efc0-46ab-8a59-a03f20e53e9b","branchMappingLogic":{"operand":0.15,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"6941a8dd-5c0a-48bc-8876-f49c88ed419f","branchMappingLogic":"true"}],"version":0}',
  updateBranches: [testUpdateBranch1, testUpdateBranch2],
-  isPaused: false,
  __typename: 'UpdateChannel',
 };

@@ -110,11 +110,7 @@ export async function listAndRenderBranchesAndUpdatesOnChannelAsync(
  }
 ): Promise<void> {
  const channel = await ChannelQuery.viewUpdateChannelAsync(graphqlClient, { appId, channelName });
-  renderChannelHeaderContent({
-    channelName: channel.name,
-    channelId: channel.id,
-    isPaused: channel.isPaused,
-  });
+  renderChannelHeaderContent({ channelName: channel.name, channelId: channel.id });

  if (paginatedQueryOptions.nonInteractive) {
    const branches = await queryBranchesAndUpdateGroupsOnChannelAsync(graphqlClient, {
@@ -171,11 +167,7 @@ function renderPageOfChannels(
    printJsonOnlyOutput({ currentPage });
  } else {
    for (const channel of currentPage) {
-      renderChannelHeaderContent({
-        channelName: channel.name,
-        channelId: channel.id,
-        isPaused: channel.isPaused,
-      });
+      renderChannelHeaderContent({ channelName: channel.name, channelId: channel.id });
      Log.addNewLineIfNone();
      logChannelDetails(channel);

@@ -204,11 +196,9 @@ function renderPageOfBranchesOnChannel(
 function renderChannelHeaderContent({
  channelName,
  channelId,
-  isPaused,
 }: {
  channelName: string;
  channelId: string;
-  isPaused: boolean;
 }): void {
  Log.addNewLineIfNone();
  Log.log(chalk.bold('Channel:'));
@@ -216,7 +206,6 @@ function renderChannelHeaderContent({
    formatFields([
      { label: 'Name', value: channelName },
      { label: 'ID', value: channelId },
-      { label: 'Status', value: isPaused ? 'Paused' : 'Active' },
    ])
  );
  Log.addNewLineIfNone();
@@ -6,7 +6,6 @@ import nullthrows from 'nullthrows';

 import AnalyticsContextField from './context/AnalyticsContextField';
 import ContextField from './context/ContextField';
-import DynamicLoggedInContextField from './context/DynamicLoggedInContextField';
 import {
  DynamicPrivateProjectConfigContextField,
  DynamicPublicProjectConfigContextField,
@@ -16,8 +15,6 @@ import MaybeLoggedInContextField from './context/MaybeLoggedInContextField';
 import { OptionalPrivateProjectConfigContextField } from './context/OptionalPrivateProjectConfigContextField';
 import { PrivateProjectConfigContextField } from './context/PrivateProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
-import { ProjectIdContextField } from './context/ProjectIdContextField';
-import { ServerSideEnvironmentVariablesContextField } from './context/ServerSideEnvironmentVariablesContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
 import VcsClientContextField from './context/VcsClientContextField';
 import { EasCommandError } from './errors';
@@ -26,7 +23,6 @@ import {
  CommandEvent,
  createAnalyticsAsync,
 } from '../analytics/AnalyticsManager';
-import { EnvironmentVariableEnvironment } from '../graphql/generated';
 import Log from '../log';
 import SessionManager from '../user/SessionManager';
 import { Client } from '../vcs/vcs';
@@ -47,26 +43,8 @@ export type ContextOutput<
  [P in keyof T]: T[P];
 };

-type GetContextType<Type> = {
-  [Property in keyof Type]: any;
-};
-
 const BASE_GRAPHQL_ERROR_MESSAGE: string = 'GraphQL request failed.';

-interface BaseGetContextAsyncArgs {
-  nonInteractive: boolean;
-  vcsClientOverride?: Client;
-}
-
-interface GetContextAsyncArgsWithRequiredServerSideEnvironmentArgument
-  extends BaseGetContextAsyncArgs {
-  withServerSideEnvironment: EnvironmentVariableEnvironment | null;
-}
-
-interface GetContextAsyncArgsWithoutServerSideEnvironmentArgument extends BaseGetContextAsyncArgs {
-  withServerSideEnvironment?: never;
-}
-
 export default abstract class EasCommand extends Command {
  protected static readonly ContextOptions = {
    /**
@@ -83,16 +61,8 @@ export default abstract class EasCommand extends Command {
    MaybeLoggedIn: {
      maybeLoggedIn: new MaybeLoggedInContextField(),
    },
-    /**
-     * Specify this context if the logged-in requirement is only necessary in a particular execution of the command.
-     */
-    DynamicLoggedIn: {
-      // eslint-disable-next-line async-protect/async-suffix
-      getDynamicLoggedInAsync: new DynamicLoggedInContextField(),
-    },
    /**
     * Specify this context requirement if the command needs to mutate the user session.
-     * @deprecated Should not be used outside of session management commands, which currently only includes `login` and `logout`.
     */
    SessionManagment: {
      sessionManager: new SessionManagementContextField(),
@@ -102,7 +72,7 @@ export default abstract class EasCommand extends Command {
     * run within a project directory, null otherwise.
     */
    OptionalProjectConfig: {
-      optionalPrivateProjectConfig: new OptionalPrivateProjectConfigContextField(),
+      privateProjectConfig: new OptionalPrivateProjectConfigContextField(),
    },
    /**
     * Require this command to be run in a project directory. Return the project directory in the context.
@@ -137,16 +107,6 @@ export default abstract class EasCommand extends Command {
    Vcs: {
      vcsClient: new VcsClientContextField(),
    },
-    ServerSideEnvironmentVariables: {
-      // eslint-disable-next-line async-protect/async-suffix
-      getServerSideEnvironmentVariablesAsync: new ServerSideEnvironmentVariablesContextField(),
-    },
-    /**
-     * Require the project to be identified and registered on server. Returns the project ID evaluated from the app config.
-     */
-    ProjectId: {
-      projectId: new ProjectIdContextField(),
-    },
  };

  /**
@@ -181,19 +141,7 @@ export default abstract class EasCommand extends Command {
    } = object,
  >(
    commandClass: { contextDefinition: ContextInput<C> },
-    {
-      nonInteractive,
-      vcsClientOverride,
-      // if specified and not null, the env vars from the selected environment will be fetched from the server
-      // to resolve dynamic config (if dynamic config context is used) and enable getServerSideEnvironmentVariablesAsync function (if server side environment variables context is used)
-      withServerSideEnvironment,
-    }: C extends
-      | GetContextType<typeof EasCommand.ContextOptions.ProjectConfig>
-      | GetContextType<typeof EasCommand.ContextOptions.DynamicProjectConfig>
-      | GetContextType<typeof EasCommand.ContextOptions.OptionalProjectConfig>
-      | GetContextType<typeof EasCommand.ContextOptions.ServerSideEnvironmentVariables>
-      ? GetContextAsyncArgsWithRequiredServerSideEnvironmentArgument
-      : GetContextAsyncArgsWithoutServerSideEnvironmentArgument
+    { nonInteractive, vcsClientOverride }: { nonInteractive: boolean; vcsClientOverride?: Client }
  ): Promise<ContextOutput<C>> {
    const contextDefinition = commandClass.contextDefinition;

@@ -207,7 +155,6 @@ export default abstract class EasCommand extends Command {
          sessionManager: this.sessionManager,
          analytics: this.analytics,
          vcsClientOverride,
-          withServerSideEnvironment,
        }),
      ]);
    }
@@ -1,5 +1,4 @@
 import { Analytics } from '../../analytics/AnalyticsManager';
-import { EnvironmentVariableEnvironment } from '../../graphql/generated';
 import SessionManager from '../../user/SessionManager';
 import { Client } from '../../vcs/vcs';

@@ -8,10 +7,6 @@ export interface ContextOptions {
  analytics: Analytics;
  nonInteractive: boolean;
  vcsClientOverride?: Client;
-  /**
-   * If specified, env variables from the selected environment will be fetched from the server and used to evaluate the dynamic config.
-   */
-  withServerSideEnvironment?: EnvironmentVariableEnvironment | null;
 }

 export default abstract class ContextField<T> {
@@ -1,36 +0,0 @@
-import ContextField, { ContextOptions } from './ContextField';
-import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
-import { LoggedInAuthenticationInfo } from '../../user/SessionManager';
-import { Actor } from '../../user/User';
-import FeatureGateEnvOverrides from '../gating/FeatureGateEnvOverrides';
-import FeatureGating from '../gating/FeatureGating';
-
-export type DynamicLoggedInContextFn = () => Promise<{
-  actor: Actor;
-  featureGating: FeatureGating;
-  graphqlClient: ExpoGraphqlClient;
-  authenticationInfo: LoggedInAuthenticationInfo;
-}>;
-
-export default class DynamicLoggedInContextField extends ContextField<DynamicLoggedInContextFn> {
-  async getValueAsync({
-    nonInteractive,
-    sessionManager,
-  }: ContextOptions): Promise<DynamicLoggedInContextFn> {
-    return async () => {
-      const { actor, authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-        nonInteractive,
-      });
-      const featureGateServerValues: { [key: string]: boolean } = actor?.featureGates ?? {};
-
-      const graphqlClient = createGraphqlClient(authenticationInfo);
-
-      return {
-        actor,
-        featureGating: new FeatureGating(featureGateServerValues, new FeatureGateEnvOverrides()),
-        graphqlClient,
-        authenticationInfo,
-      };
-    };
-  }
-}
@@ -1,14 +1,12 @@
-import { ExpoConfig } from '@expo/config';
+import { ExpoConfig } from '@expo/config-types';

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

 export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
@@ -21,34 +19,15 @@ export class DynamicPublicProjectConfigContextField extends ContextField<Dynamic
  async getValueAsync({
    nonInteractive,
    sessionManager,
-    withServerSideEnvironment,
  }: ContextOptions): Promise<DynamicConfigContextFn> {
    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
    return async (options?: ExpoConfigOptions) => {
-      const expBefore = await getPublicExpoConfigAsync(projectDir, options);
+      const expBefore = getPublicExpoConfig(projectDir, options);
      const projectId = await getProjectIdAsync(sessionManager, expBefore, {
        nonInteractive,
        env: options?.env,
      });
-      if (withServerSideEnvironment) {
-        const { authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-          nonInteractive,
-        });
-        const graphqlClient = createGraphqlClient(authenticationInfo);
-        const serverSideEnvironmentVariables = await loadServerSideEnvironmentVariablesAsync({
-          environment: withServerSideEnvironment,
-          projectId,
-          graphqlClient,
-        });
-        options = {
-          ...options,
-          env: {
-            ...options?.env,
-            ...serverSideEnvironmentVariables,
-          },
-        };
-      }
-      const exp = await getPublicExpoConfigAsync(projectDir, options);
+      const exp = getPublicExpoConfig(projectDir, options);
      return {
        exp,
        projectDir,
@@ -62,34 +41,15 @@ export class DynamicPrivateProjectConfigContextField extends ContextField<Dynami
  async getValueAsync({
    nonInteractive,
    sessionManager,
-    withServerSideEnvironment,
  }: ContextOptions): Promise<DynamicConfigContextFn> {
    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
    return async (options?: ExpoConfigOptions) => {
-      const expBefore = await getPrivateExpoConfigAsync(projectDir, options);
+      const expBefore = getPrivateExpoConfig(projectDir, options);
      const projectId = await getProjectIdAsync(sessionManager, expBefore, {
        nonInteractive,
        env: options?.env,
      });
-      if (withServerSideEnvironment) {
-        const { authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-          nonInteractive,
-        });
-        const graphqlClient = createGraphqlClient(authenticationInfo);
-        const serverSideEnvironmentVariables = await loadServerSideEnvironmentVariablesAsync({
-          environment: withServerSideEnvironment,
-          projectId,
-          graphqlClient,
-        });
-        options = {
-          ...options,
-          env: {
-            ...options?.env,
-            ...serverSideEnvironmentVariables,
-          },
-        };
-      }
-      const exp = await getPrivateExpoConfigAsync(projectDir, options);
+      const exp = getPrivateExpoConfig(projectDir, options);
      return {
        exp,
        projectDir,
@@ -1,22 +1,19 @@
 import ContextField, { ContextOptions } from './ContextField';
 import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
-import { LoggedInAuthenticationInfo } from '../../user/SessionManager';
 import { Actor } from '../../user/User';
 import FeatureGateEnvOverrides from '../gating/FeatureGateEnvOverrides';
 import FeatureGating from '../gating/FeatureGating';

-type LoggedInContextType = {
+export default class LoggedInContextField extends ContextField<{
  actor: Actor;
  featureGating: FeatureGating;
  graphqlClient: ExpoGraphqlClient;
-  authenticationInfo: LoggedInAuthenticationInfo;
-};
-
-export default class LoggedInContextField extends ContextField<LoggedInContextType> {
-  async getValueAsync({
-    nonInteractive,
-    sessionManager,
-  }: ContextOptions): Promise<LoggedInContextType> {
+}> {
+  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<{
+    actor: Actor;
+    featureGating: FeatureGating;
+    graphqlClient: ExpoGraphqlClient;
+  }> {
    const { actor, authenticationInfo } = await sessionManager.ensureLoggedInAsync({
      nonInteractive,
    });
@@ -28,7 +25,6 @@ export default class LoggedInContextField extends ContextField<LoggedInContextTy
      actor,
      featureGating: new FeatureGating(featureGateServerValues, new FeatureGateEnvOverrides()),
      graphqlClient,
-      authenticationInfo,
    };
  }
 }
@@ -4,18 +4,16 @@ import { Actor } from '../../user/User';
 import FeatureGateEnvOverrides from '../gating/FeatureGateEnvOverrides';
 import FeatureGating from '../gating/FeatureGating';

-type MaybeLoggedInContextType = {
+export default class MaybeLoggedInContextField extends ContextField<{
  actor: Actor | null;
  featureGating: FeatureGating;
  graphqlClient: ExpoGraphqlClient;
-  authenticationInfo: {
-    accessToken: string | null;
-    sessionSecret: string | null;
-  };
-};
-
-export default class MaybeLoggedInContextField extends ContextField<MaybeLoggedInContextType> {
-  async getValueAsync({ sessionManager }: ContextOptions): Promise<MaybeLoggedInContextType> {
+}> {
+  async getValueAsync({ sessionManager }: ContextOptions): Promise<{
+    actor: Actor | null;
+    featureGating: FeatureGating;
+    graphqlClient: ExpoGraphqlClient;
+  }> {
    const authenticationInfo = {
      accessToken: sessionManager.getAccessToken(),
      sessionSecret: sessionManager.getSessionSecret(),
@@ -29,7 +27,6 @@ export default class MaybeLoggedInContextField extends ContextField<MaybeLoggedI
      actor: actor ?? null,
      featureGating: new FeatureGating(featureGateServerValues, new FeatureGateEnvOverrides()),
      graphqlClient,
-      authenticationInfo,
    };
  }
 }
@@ -1,12 +1,10 @@
-import { ExpoConfig } from '@expo/config';
+import { ExpoConfig } from '@expo/config-types';
 import { InvalidEasJsonError } from '@expo/eas-json/build/errors';

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

 export class OptionalPrivateProjectConfigContextField extends ContextField<
  | {
@@ -16,11 +14,7 @@ export class OptionalPrivateProjectConfigContextField extends ContextField<
    }
  | undefined
 > {
-  async getValueAsync({
-    nonInteractive,
-    sessionManager,
-    withServerSideEnvironment,
-  }: ContextOptions): Promise<
+  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<
    | {
        projectId: string;
        exp: ExpoConfig;
@@ -41,24 +35,11 @@ export class OptionalPrivateProjectConfigContextField extends ContextField<
      return undefined;
    }

-    const expBefore = await getPrivateExpoConfigAsync(projectDir);
+    const expBefore = getPrivateExpoConfig(projectDir);
    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
      nonInteractive,
    });
-    let serverSideEnvVars: Record<string, string> | undefined;
-    if (withServerSideEnvironment) {
-      const { authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-        nonInteractive,
-      });
-      const graphqlClient = createGraphqlClient(authenticationInfo);
-      const serverSideEnvironmentVariables = await loadServerSideEnvironmentVariablesAsync({
-        environment: withServerSideEnvironment,
-        projectId,
-        graphqlClient,
-      });
-      serverSideEnvVars = serverSideEnvironmentVariables;
-    }
-    const exp = await getPrivateExpoConfigAsync(projectDir, { env: serverSideEnvVars });
+    const exp = getPrivateExpoConfig(projectDir);
    return {
      exp,
      projectDir,
@@ -1,45 +1,26 @@
-import { ExpoConfig } from '@expo/config';
+import { ExpoConfig } from '@expo/config-types';

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

 export class PrivateProjectConfigContextField extends ContextField<{
  projectId: string;
  exp: ExpoConfig;
  projectDir: string;
 }> {
-  async getValueAsync({
-    nonInteractive,
-    sessionManager,
-    withServerSideEnvironment,
-  }: ContextOptions): Promise<{
+  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<{
    projectId: string;
    exp: ExpoConfig;
    projectDir: string;
  }> {
    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    const expBefore = await getPrivateExpoConfigAsync(projectDir);
+    const expBefore = getPrivateExpoConfig(projectDir);
    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
      nonInteractive,
    });
-    let serverSideEnvVars: Record<string, string> | undefined;
-    if (withServerSideEnvironment) {
-      const { authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-        nonInteractive,
-      });
-      const graphqlClient = createGraphqlClient(authenticationInfo);
-      const serverSideEnvironmentVariables = await loadServerSideEnvironmentVariablesAsync({
-        environment: withServerSideEnvironment,
-        projectId,
-        graphqlClient,
-      });
-      serverSideEnvVars = serverSideEnvironmentVariables;
-    }
-    const exp = await getPrivateExpoConfigAsync(projectDir, { env: serverSideEnvVars });
+    const exp = getPrivateExpoConfig(projectDir);

    return {
      projectId,
@@ -1,15 +0,0 @@
-import ContextField, { ContextOptions } from './ContextField';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-import { getPrivateExpoConfigAsync } from '../../project/expoConfig';
-
-export class ProjectIdContextField extends ContextField<string> {
-  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<string> {
-    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    const expBefore = await getPrivateExpoConfigAsync(projectDir);
-    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
-      nonInteractive,
-    });
-    return projectId;
-  }
-}
@@ -1,42 +0,0 @@
-import ContextField, { ContextOptions } from './ContextField';
-import { createGraphqlClient } from './contextUtils/createGraphqlClient';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-import { loadServerSideEnvironmentVariablesAsync } from './contextUtils/loadServerSideEnvironmentVariablesAsync';
-import { getPublicExpoConfigAsync } from '../../project/expoConfig';
-
-type GetServerSideEnvironmentVariablesFn = (
-  maybeEnv?: Record<string, string>
-) => Promise<Record<string, string>>;
-
-export class ServerSideEnvironmentVariablesContextField extends ContextField<GetServerSideEnvironmentVariablesFn> {
-  async getValueAsync({
-    nonInteractive,
-    sessionManager,
-    withServerSideEnvironment,
-  }: ContextOptions): Promise<GetServerSideEnvironmentVariablesFn> {
-    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    return async (maybeEnv?: Record<string, string>) => {
-      if (!withServerSideEnvironment) {
-        throw new Error(
-          'withServerSideEnvironment parameter is required to evaluate ServerSideEnvironmentVariablesContextField'
-        );
-      }
-      const exp = await getPublicExpoConfigAsync(projectDir, { env: maybeEnv });
-      const projectId = await getProjectIdAsync(sessionManager, exp, {
-        nonInteractive,
-        env: maybeEnv,
-      });
-      const { authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-        nonInteractive,
-      });
-      const graphqlClient = createGraphqlClient(authenticationInfo);
-      const serverSideEnvironmentVariables = await loadServerSideEnvironmentVariablesAsync({
-        environment: withServerSideEnvironment,
-        projectId,
-        graphqlClient,
-      });
-      return serverSideEnvironmentVariables;
-    };
-  }
-}
@@ -6,7 +6,6 @@ import { Role } from '../../../../graphql/generated';
 import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { learnMore } from '../../../../log';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
-import { isExpoInstalled } from '../../../../project/projectUtils';
 import SessionManager from '../../../../user/SessionManager';
 import { findProjectRootAsync } from '../findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from '../getProjectIdAsync';
@@ -22,7 +21,6 @@ jest.mock('../../../../ora', () => ({
  }),
 }));
 jest.mock('../../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync');
-jest.mock('../../../../project/projectUtils');

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

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

  it('gets the project ID from app config if exists', async () => {
@@ -1,4 +1,5 @@
-import { ExpoConfig, getProjectConfigDescription } from '@expo/config';
+import { getProjectConfigDescription } from '@expo/config';
+import { ExpoConfig } from '@expo/config-types';
 import { Env } from '@expo/eas-build-job';
 import chalk from 'chalk';

@@ -7,10 +8,7 @@ import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import Log, { learnMore } from '../../../log';
 import { ora } from '../../../ora';
-import {
-  createOrModifyExpoConfigAsync,
-  getPrivateExpoConfigAsync,
-} from '../../../project/expoConfig';
+import { createOrModifyExpoConfigAsync, getPrivateExpoConfig } from '../../../project/expoConfig';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { toAppPrivacy } from '../../../project/projectUtils';
 import SessionManager from '../../../user/SessionManager';
@@ -20,15 +18,13 @@ import { Actor, getActorUsername } from '../../../user/User';
 * Save an EAS project ID to the appropriate field in the app config.
 *
 * @deprecated Should not be used outside of context functions except in the init command.
- * @deprecated Starting from `@expo/config` from SDK 52, the `modifyConfigAsync` function is merging existing data. Once this is released, we can use that instead of manually merging.
 */
 export async function saveProjectIdToAppConfigAsync(
  projectDir: string,
  projectId: string,
  options: { env?: Env } = {}
 ): Promise<void> {
-  // NOTE(cedric): we disable plugins to avoid writing plugin-generated content to `expo.extra`
-  const exp = await getPrivateExpoConfigAsync(projectDir, { skipPlugins: true, ...options });
+  const exp = getPrivateExpoConfig(projectDir, options);
  const result = await createOrModifyExpoConfigAsync(
    projectDir,
    {
@@ -1,68 +0,0 @@
-import { ExpoGraphqlClient } from './createGraphqlClient';
-import { EnvironmentVariableEnvironment } from '../../../graphql/generated';
-import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
-import Log from '../../../log';
-
-const cachedServerSideEnvironmentVariables: Record<
-  EnvironmentVariableEnvironment,
-  Record<string, string> | null
-> = {
-  [EnvironmentVariableEnvironment.Development]: null,
-  [EnvironmentVariableEnvironment.Preview]: null,
-  [EnvironmentVariableEnvironment.Production]: null,
-};
-
-export async function loadServerSideEnvironmentVariablesAsync({
-  environment,
-  projectId,
-  graphqlClient,
-}: {
-  environment: EnvironmentVariableEnvironment;
-  projectId: string;
-  graphqlClient: ExpoGraphqlClient;
-}): Promise<Record<string, string>> {
-  // don't load environment variables if they were already loaded while executing a command
-  const cachedEnvVarsForEnvironment = cachedServerSideEnvironmentVariables[environment];
-  if (cachedEnvVarsForEnvironment) {
-    return cachedEnvVarsForEnvironment;
-  }
-
-  const environmentVariables = await EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(
-    graphqlClient,
-    {
-      appId: projectId,
-      environment,
-    }
-  );
-  const serverEnvVars = Object.fromEntries(
-    environmentVariables
-      .filter(({ name, value }) => name && value)
-      .map(({ name, value }) => [name, value])
-  ) as Record<string, string>;
-
-  if (Object.keys(serverEnvVars).length > 0) {
-    Log.log(
-      `Environment variables loaded from the "${environment.toLowerCase()}" environment on EAS servers: ${Object.keys(
-        serverEnvVars
-      ).join(', ')}.`
-    );
-  } else {
-    Log.log(
-      `No readable environment variables found for the "${environment.toLowerCase()}" environment on EAS servers.`
-    );
-  }
-
-  const encryptedEnvVars = environmentVariables.filter(({ name, value }) => name && !value);
-  if (encryptedEnvVars.length > 0) {
-    Log.warn(
-      `Some environment variables defined in the "${environment.toLowerCase()}" environment on EAS servers are of "encrypted" type and cannot be read outside of the EAS servers (including EAS CLI): ${encryptedEnvVars
-        .map(({ name }) => name)
-        .join(', ')}. `
-    );
-  }
-  Log.newLine();
-
-  cachedServerSideEnvironmentVariables[environment] = serverEnvVars;
-
-  return serverEnvVars;
-}
@@ -1,6 +1,10 @@
 import { Flags } from '@oclif/core';

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

 // NOTE: not exactly true, but, provided mapToLowercase and upperCaseAsync
 // are used in tandem, it saves on unnecessary typying in commands
@@ -22,24 +26,15 @@ export const EasNonInteractiveAndJsonFlags = {
  }),
 };

-export const EasEnvironmentFlagParameters = {
-  description: "Environment variable's environment",
-  parse: upperCaseAsync,
-  options: mapToLowercase([
-    EnvironmentVariableEnvironment.Development,
-    EnvironmentVariableEnvironment.Preview,
-    EnvironmentVariableEnvironment.Production,
-  ]),
-};
-
 export const EASEnvironmentFlag = {
-  environment: Flags.enum<EnvironmentVariableEnvironment>(EasEnvironmentFlagParameters),
-};
-
-export const EASMultiEnvironmentFlag = {
  environment: Flags.enum<EnvironmentVariableEnvironment>({
-    ...EasEnvironmentFlagParameters,
-    multiple: true,
+    description: "Environment variable's environment",
+    parse: upperCaseAsync,
+    options: mapToLowercase([
+      EnvironmentVariableEnvironment.Development,
+      EnvironmentVariableEnvironment.Preview,
+      EnvironmentVariableEnvironment.Production,
+    ]),
  }),
 };

@@ -52,9 +47,14 @@ export const EASVariableFormatFlag = {
 };

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

@@ -78,15 +78,3 @@ export const EasJsonOnlyFlag = {
    description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
  }),
 };
-
-export const WithEasEnvironmentVariablesSetFlag = {
-  'with-eas-environment-variables-set': Flags.enum<EnvironmentVariableEnvironment | null>({
-    description:
-      'Environment to use the server-side defined EAS environment variables for during command execution.',
-    options: mapToLowercase(Object.values(EnvironmentVariableEnvironment)),
-    parse: upperCaseAsync,
-    required: false,
-    hidden: true,
-    default: null,
-  }),
-};
@@ -12,14 +12,16 @@ export default class AccountView extends EasCommand {

  static override contextDefinition = {
    ...this.ContextOptions.MaybeLoggedIn,
+    ...this.ContextOptions.SessionManagment,
  };

  async runAsync(): Promise<void> {
    const {
-      maybeLoggedIn: { actor, authenticationInfo },
+      maybeLoggedIn: { actor },
+      sessionManager,
    } = await this.getContextAsync(AccountView, { nonInteractive: true });
    if (actor) {
-      const loggedInAs = authenticationInfo.accessToken
+      const loggedInAs = sessionManager.getAccessToken()
        ? `${getActorDisplayName(actor)} (authenticated using EXPO_TOKEN)`
        : getActorDisplayName(actor);
      Log.log(chalk.green(loggedInAs));
@@ -25,7 +25,7 @@ export default class BranchCreate extends EasCommand {
  };

  static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.Vcs,
  };
@@ -36,7 +36,7 @@ export default class BranchCreate extends EasCommand {
      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(BranchCreate);
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
      vcsClient,
    } = await this.getContextAsync(BranchCreate, {
@@ -79,7 +79,7 @@ export default class BranchDelete extends EasCommand {
  static override description = 'delete a branch';

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

@@ -108,7 +108,7 @@ export default class BranchDelete extends EasCommand {
    }

    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchDelete, { nonInteractive });
    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
@@ -13,14 +13,14 @@ export default class BranchList extends EasCommand {
  };

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

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

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

@@ -72,7 +72,7 @@ export default class BranchRename extends EasCommand {
      flags: { json: jsonFlag, from: currentName, to: newName, 'non-interactive': nonInteractive },
    } = await this.parse(BranchRename);
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchRename, {
      nonInteractive,
@@ -27,7 +27,7 @@ export default class BranchView extends EasCommand {
  };

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

@@ -38,7 +38,7 @@ export default class BranchView extends EasCommand {
    } = await this.parse(BranchView);
    const { 'non-interactive': nonInteractive } = flags;
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BranchView, {
      nonInteractive,
@@ -110,7 +110,7 @@ export default class BuildCancel extends EasCommand {
  };

  static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.Vcs,
  };
@@ -128,7 +128,7 @@ export default class BuildCancel extends EasCommand {
    }

    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildCancel, {
      nonInteractive,
@@ -38,7 +38,6 @@ export default class BuildConfigure extends EasCommand {
      vcsClient,
    } = await this.getContextAsync(BuildConfigure, {
      nonInteractive: false,
-      withServerSideEnvironment: null,
    });

    Log.log(
@@ -94,7 +94,7 @@ export default class BuildDelete extends EasCommand {
    }),
  };
  static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.Vcs,
  };
@@ -112,7 +112,7 @@ export default class BuildDelete extends EasCommand {
    }

    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildDelete, { nonInteractive });
    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
@@ -142,7 +142,6 @@ export default class Build extends EasCommand {
      vcsClient,
    } = await this.getContextAsync(Build, {
      nonInteractive: flags.nonInteractive,
-      withServerSideEnvironment: null,
    });

    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
@@ -79,7 +79,6 @@ export default class BuildInspect extends EasCommand {
      vcsClient,
    } = await this.getContextAsync(BuildInspect, {
      nonInteractive: false,
-      withServerSideEnvironment: null,
    });

    const outputDirectory = path.resolve(process.cwd(), flags.output);
@@ -7,7 +7,6 @@ import EasCommand from '../../commandUtils/EasCommand';
 import { RequestedPlatform } from '../../platform';
 import { enableJsonOutput } from '../../utils/json';
 import GitNoCommitClient from '../../vcs/clients/gitNoCommit';
-import NoVcsClient from '../../vcs/clients/noVcs';

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

    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
@@ -72,7 +72,7 @@ export default class BuildList extends EasCommand {
  };

  static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.Vcs,
  };
@@ -99,7 +99,7 @@ export default class BuildList extends EasCommand {
      process.exit(1);
    }
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildList, {
      nonInteractive,
@@ -6,7 +6,6 @@ import chalk from 'chalk';

 import { handleDeprecatedEasJsonAsync } from '.';
 import { waitForBuildEndAsync } from '../../build/build';
-import { evaluateConfigWithEnvVarsAsync } from '../../build/evaluateConfigWithEnvVarsAsync';
 import { ensureIosCredentialsForBuildResignAsync } from '../../build/ios/credentials';
 import { prepareCredentialsToResign } from '../../build/ios/prepareJob';
 import { listAndSelectBuildOnAppAsync } from '../../build/queries';
@@ -22,7 +21,6 @@ import {
  BuildStatus,
  BuildWorkflow,
  DistributionType,
-  EnvironmentVariableEnvironment,
  IosJobOverridesInput,
  ProjectArchiveSourceType,
  StatuspageServiceName,
@@ -48,7 +46,6 @@ interface BuildResignFlags {
  sourceProfile?: string;
  maybeBuildId?: string;
  wait: boolean;
-  environment?: EnvironmentVariableEnvironment;
 }
 interface RawBuildResignFlags {
  json: boolean;
@@ -60,7 +57,6 @@ interface RawBuildResignFlags {
  'source-profile': string | undefined;
  wait: boolean;
  id: string | undefined;
-  environment: EnvironmentVariableEnvironment | undefined;
 }

 export default class BuildResign extends EasCommand {
@@ -120,7 +116,6 @@ export default class BuildResign extends EasCommand {
      vcsClient,
    } = await this.getContextAsync(BuildResign, {
      nonInteractive: flags.nonInteractive,
-      withServerSideEnvironment: null,
    });

    const maybeBuild = flags.maybeBuildId
@@ -145,15 +140,7 @@ export default class BuildResign extends EasCommand {
      platform,
      flags.targetProfile ?? 'production'
    );
-
-    const { exp, projectId, env } = await evaluateConfigWithEnvVarsAsync({
-      buildProfile,
-      buildProfileName: flags.targetProfile ?? 'production',
-      graphqlClient,
-      getProjectConfig: getDynamicPrivateProjectConfigAsync,
-      opts: { env: buildProfile.env },
-    });
-
+    const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
    const build = await this.ensureBuildSelectedAsync(
      {
@@ -174,7 +161,7 @@ export default class BuildResign extends EasCommand {
      user: actor,
      graphqlClient,
      analytics,
-      env,
+      env: buildProfile.env,
      easJsonCliConfig,
      vcsClient,
    });
@@ -194,7 +181,7 @@ export default class BuildResign extends EasCommand {
      projectDir,
      exp,
      xcodeBuildContext,
-      env,
+      env: buildProfile.env,
      vcsClient,
    });
    const credentialsResult = await ensureIosCredentialsForBuildResignAsync(
@@ -261,7 +248,6 @@ export default class BuildResign extends EasCommand {
      targetProfile: flags['target-profile'],
      maybeBuildId: flags.id,
      wait: flags.wait,
-      environment: flags.environment,
    };
  }

@@ -79,7 +79,8 @@ export default class Run extends EasCommand {

  static override contextDefinition = {
    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectDir,
    ...this.ContextOptions.Vcs,
  };

@@ -89,7 +90,7 @@ export default class Run extends EasCommand {
    const queryOptions = getPaginatedQueryOptions(flags);
    const {
      loggedIn: { graphqlClient },
-      projectId,
+      privateProjectConfig: { projectId },
    } = await this.getContextAsync(Run, {
      nonInteractive: false,
    });
@@ -3,7 +3,6 @@ import { EasJsonAccessor } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';

-import { evaluateConfigWithEnvVarsAsync } from '../../../build/evaluateConfigWithEnvVarsAsync';
 import EasCommand from '../../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../../commandUtils/flags';
 import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
@@ -54,7 +53,6 @@ export default class BuildVersionGetView extends EasCommand {
      vcsClient,
    } = await this.getContextAsync(BuildVersionGetView, {
      nonInteractive: true,
-      withServerSideEnvironment: null,
    });

    if (!flags.platform && flags['non-interactive']) {
@@ -76,12 +74,8 @@ export default class BuildVersionGetView extends EasCommand {
    });
    const results: { [key in Platform]?: string } = {};
    for (const { profile, platform } of buildProfiles) {
-      const { exp, projectId, env } = await evaluateConfigWithEnvVarsAsync({
-        buildProfile: profile,
-        buildProfileName: flags.profile ?? 'production',
-        graphqlClient,
-        getProjectConfig: getDynamicPrivateProjectConfigAsync,
-        opts: { env: profile.env },
+      const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
+        env: profile.env,
      });

      validateAppConfigForRemoteVersionSource(exp, platform);
@@ -95,7 +89,6 @@ export default class BuildVersionGetView extends EasCommand {
        platform,
        vcsClient,
        nonInteractive: flags['non-interactive'],
-        env,
      });
      const remoteVersions = await AppVersionQuery.latestVersionAsync(
        graphqlClient,
@@ -4,7 +4,6 @@ import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';

-import { evaluateConfigWithEnvVarsAsync } from '../../../build/evaluateConfigWithEnvVarsAsync';
 import EasCommand from '../../../commandUtils/EasCommand';
 import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
 import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
@@ -54,7 +53,6 @@ export default class BuildVersionSetView extends EasCommand {
      vcsClient,
    } = await this.getContextAsync(BuildVersionSetView, {
      nonInteractive: false,
-      withServerSideEnvironment: null,
    });

    const platform = await selectPlatformAsync(flags.platform);
@@ -66,13 +64,7 @@ export default class BuildVersionSetView extends EasCommand {
      flags.profile ?? undefined
    );

-    const { exp, projectId, env } = await evaluateConfigWithEnvVarsAsync({
-      buildProfile: profile,
-      buildProfileName: flags.profile ?? 'production',
-      graphqlClient,
-      getProjectConfig: getDynamicPrivateProjectConfigAsync,
-      opts: { env: profile.env },
-    });
+    const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: profile.env });
    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

    validateAppConfigForRemoteVersionSource(exp, platform);
@@ -86,7 +78,6 @@ export default class BuildVersionSetView extends EasCommand {
      platform,
      vcsClient,
      nonInteractive: false,
-      env,
    });
    const remoteVersions = await AppVersionQuery.latestVersionAsync(
      graphqlClient,
@@ -5,7 +5,6 @@ import { Flags } from '@oclif/core';
 import chalk from 'chalk';

 import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../../build/android/version';
-import { evaluateConfigWithEnvVarsAsync } from '../../../build/evaluateConfigWithEnvVarsAsync';
 import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../../build/ios/version';
 import EasCommand from '../../../commandUtils/EasCommand';
 import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
@@ -73,7 +72,6 @@ export default class BuildVersionSyncView extends EasCommand {
      vcsClient,
    } = await this.getContextAsync(BuildVersionSyncView, {
      nonInteractive: true,
-      withServerSideEnvironment: null,
    });

    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
@@ -89,12 +87,8 @@ export default class BuildVersionSyncView extends EasCommand {
      projectDir,
    });
    for (const profileInfo of buildProfiles) {
-      const { exp, projectId, env } = await evaluateConfigWithEnvVarsAsync({
-        buildProfile: profileInfo.profile,
-        buildProfileName: profileInfo.profileName,
-        graphqlClient,
-        getProjectConfig: getDynamicPrivateProjectConfigAsync,
-        opts: { env: profileInfo.profile.env },
+      const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
+        env: profileInfo.profile.env,
      });

      validateAppConfigForRemoteVersionSource(exp, profileInfo.platform);
@@ -109,7 +103,6 @@ export default class BuildVersionSyncView extends EasCommand {
        platform: profileInfo.platform,
        vcsClient,
        nonInteractive: false,
-        env,
      });
      const remoteVersions = await AppVersionQuery.latestVersionAsync(
        graphqlClient,
@@ -18,7 +18,7 @@ export default class BuildView extends EasCommand {
  };

  static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
    ...this.ContextOptions.LoggedIn,
    ...this.ContextOptions.Vcs,
  };
@@ -29,7 +29,7 @@ export default class BuildView extends EasCommand {
      flags,
    } = await this.parse(BuildView);
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildView, {
      nonInteractive: true,
@@ -23,7 +23,7 @@ export default class ChannelCreate extends EasCommand {
  };

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

@@ -33,7 +33,7 @@ export default class ChannelCreate extends EasCommand {
      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(ChannelCreate);
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelCreate, {
      nonInteractive,
@@ -31,7 +31,7 @@ export default class ChannelDelete extends EasCommand {
  };

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

@@ -41,7 +41,7 @@ export default class ChannelDelete extends EasCommand {
      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(ChannelDelete);
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelDelete, {
      nonInteractive,
@@ -74,7 +74,7 @@ export default class ChannelEdit extends EasCommand {
  };

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

@@ -84,7 +84,7 @@ export default class ChannelEdit extends EasCommand {
      flags: { branch: branchFlag, json, 'non-interactive': nonInteractive },
    } = await this.parse(ChannelEdit);
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelEdit, {
      nonInteractive,
@@ -18,7 +18,7 @@ export default class ChannelList extends EasCommand {
  };

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

@@ -27,7 +27,7 @@ export default class ChannelList extends EasCommand {
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelList, {
      nonInteractive,
@@ -1,113 +0,0 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-import { print } from 'graphql';
-import gql from 'graphql-tag';
-
-import { selectChannelOnAppAsync } from '../../channel/queries';
-import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { withErrorHandlingAsync } from '../../graphql/client';
-import {
-  PauseUpdateChannelMutation,
-  PauseUpdateChannelMutationVariables,
-  UpdateChannelBasicInfoFragment,
-} from '../../graphql/generated';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
-import { UpdateChannelBasicInfoFragmentNode } from '../../graphql/types/UpdateChannelBasicInfo';
-import Log from '../../log';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-
-export async function pauseUpdateChannelAsync(
-  graphqlClient: ExpoGraphqlClient,
-  { channelId }: PauseUpdateChannelMutationVariables
-): Promise<UpdateChannelBasicInfoFragment> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .mutation<PauseUpdateChannelMutation, PauseUpdateChannelMutationVariables>(
-        gql`
-          mutation PauseUpdateChannel($channelId: ID!) {
-            updateChannel {
-              pauseUpdateChannel(channelId: $channelId) {
-                id
-                ...UpdateChannelBasicInfoFragment
-              }
-            }
-          }
-          ${print(UpdateChannelBasicInfoFragmentNode)}
-        `,
-        { channelId }
-      )
-      .toPromise()
-  );
-  const channel = data.updateChannel.pauseUpdateChannel;
-  if (!channel) {
-    throw new Error(`Could not find a channel with id: ${channelId}`);
-  }
-  return channel;
-}
-
-export default class ChannelPause extends EasCommand {
-  static override description = 'pause a channel to stop it from sending updates';
-
-  static override args = [
-    {
-      name: 'name',
-      required: false,
-      description: 'Name of the channel to edit',
-    },
-  ];
-
-  static override flags = {
-    branch: Flags.string({
-      description: 'Name of the branch to point to',
-    }),
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
-    ...this.ContextOptions.LoggedIn,
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      args,
-      flags: { json, 'non-interactive': nonInteractive },
-    } = await this.parse(ChannelPause);
-    const {
-      projectId,
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(ChannelPause, {
-      nonInteractive,
-    });
-    if (json) {
-      enableJsonOutput();
-    }
-
-    const existingChannel = args.name
-      ? await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
-          appId: projectId,
-          channelName: args.name,
-        })
-      : await selectChannelOnAppAsync(graphqlClient, {
-          projectId,
-          selectionPromptTitle: 'Select a channel to edit',
-          paginatedQueryOptions: { json, nonInteractive, offset: 0 },
-        });
-
-    const channel = await pauseUpdateChannelAsync(graphqlClient, {
-      channelId: existingChannel.id,
-    });
-
-    if (json) {
-      printJsonOnlyOutput(channel);
-    } else {
-      Log.withTick(chalk`Channel {bold ${channel.name}} is now paused.\n`);
-      Log.addNewLineIfNone();
-      Log.log(
-        chalk`Users with builds on channel {bold ${channel.name}} will no longer receive updates.`
-      );
-    }
-  }
-}
@@ -1,111 +0,0 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-import { print } from 'graphql';
-import gql from 'graphql-tag';
-
-import { selectChannelOnAppAsync } from '../../channel/queries';
-import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { withErrorHandlingAsync } from '../../graphql/client';
-import {
-  ResumeUpdateChannelMutation,
-  ResumeUpdateChannelMutationVariables,
-  UpdateChannelBasicInfoFragment,
-} from '../../graphql/generated';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
-import { UpdateChannelBasicInfoFragmentNode } from '../../graphql/types/UpdateChannelBasicInfo';
-import Log from '../../log';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-
-export async function resumeUpdateChannelAsync(
-  graphqlClient: ExpoGraphqlClient,
-  { channelId }: ResumeUpdateChannelMutationVariables
-): Promise<UpdateChannelBasicInfoFragment> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .mutation<ResumeUpdateChannelMutation, ResumeUpdateChannelMutationVariables>(
-        gql`
-          mutation ResumeUpdateChannel($channelId: ID!) {
-            updateChannel {
-              resumeUpdateChannel(channelId: $channelId) {
-                id
-                ...UpdateChannelBasicInfoFragment
-              }
-            }
-          }
-          ${print(UpdateChannelBasicInfoFragmentNode)}
-        `,
-        { channelId }
-      )
-      .toPromise()
-  );
-  const channel = data.updateChannel.resumeUpdateChannel;
-  if (!channel) {
-    throw new Error(`Could not find a channel with id: ${channelId}`);
-  }
-  return channel;
-}
-
-export default class ChannelResume extends EasCommand {
-  static override description = 'resume a channel to start sending updates';
-
-  static override args = [
-    {
-      name: 'name',
-      required: false,
-      description: 'Name of the channel to edit',
-    },
-  ];
-
-  static override flags = {
-    branch: Flags.string({
-      description: 'Name of the branch to point to',
-    }),
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
-    ...this.ContextOptions.LoggedIn,
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      args,
-      flags: { json, 'non-interactive': nonInteractive },
-    } = await this.parse(ChannelResume);
-    const {
-      projectId,
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(ChannelResume, {
-      nonInteractive,
-    });
-    if (json) {
-      enableJsonOutput();
-    }
-
-    const existingChannel = args.name
-      ? await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
-          appId: projectId,
-          channelName: args.name,
-        })
-      : await selectChannelOnAppAsync(graphqlClient, {
-          projectId,
-          selectionPromptTitle: 'Select a channel to edit',
-          paginatedQueryOptions: { json, nonInteractive, offset: 0 },
-        });
-
-    const channel = await resumeUpdateChannelAsync(graphqlClient, {
-      channelId: existingChannel.id,
-    });
-
-    if (json) {
-      printJsonOnlyOutput(channel);
-    } else {
-      Log.withTick(chalk`Channel {bold ${channel.name}} is now active.\n`);
-      Log.addNewLineIfNone();
-      Log.log(chalk`Users with builds on channel {bold ${channel.name}} will now receive updates.`);
-    }
-  }
-}
@@ -138,7 +138,6 @@ export default class ChannelRollout extends EasCommand {
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelRollout, {
      nonInteractive: argsAndFlags.nonInteractive,
-      withServerSideEnvironment: null,
    });
    if (argsAndFlags.json) {
      enableJsonOutput();
@@ -26,7 +26,7 @@ export default class ChannelView extends EasCommand {
  };

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

@@ -38,7 +38,7 @@ export default class ChannelView extends EasCommand {
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(ChannelView, {
      nonInteractive,
@@ -4,7 +4,6 @@ import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';

-import { evaluateConfigWithEnvVarsAsync } from '../build/evaluateConfigWithEnvVarsAsync';
 import EasCommand from '../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../commandUtils/flags';
 import { toAppPlatform } from '../graphql/types/AppPlatform';
@@ -34,7 +33,6 @@ export default class Config extends EasCommand {
  static override contextDefinition = {
    ...this.ContextOptions.DynamicProjectConfig,
    ...this.ContextOptions.ProjectDir,
-    ...this.ContextOptions.DynamicLoggedIn,
  };

  async runAsync(): Promise<void> {
@@ -42,16 +40,10 @@ export default class Config extends EasCommand {
    if (flags.json) {
      enableJsonOutput();
    }
-    const {
-      platform: maybePlatform,
-      profile: maybeProfile,
-      'non-interactive': nonInteractive,
-    } = flags;
-    const { getDynamicPublicProjectConfigAsync, projectDir, getDynamicLoggedInAsync } =
-      await this.getContextAsync(Config, {
-        nonInteractive,
-        withServerSideEnvironment: null,
-      });
+    const { platform: maybePlatform, profile: maybeProfile } = flags;
+    const { getDynamicPublicProjectConfigAsync, projectDir } = await this.getContextAsync(Config, {
+      nonInteractive: false,
+    });

    const accessor = EasJsonAccessor.fromProjectPath(projectDir);
    const profileName =
@@ -88,13 +80,8 @@ export default class Config extends EasCommand {
        Log.log(JSON.stringify(profile, null, 2));
      }
    } else {
-      const { graphqlClient } = await getDynamicLoggedInAsync();
-      const { exp: appConfig } = await evaluateConfigWithEnvVarsAsync({
-        buildProfile: profile,
-        buildProfileName: profileName,
-        graphqlClient,
-        getProjectConfig: getDynamicPublicProjectConfigAsync,
-        opts: { env: profile.env },
+      const { exp: appConfig } = await getDynamicPublicProjectConfigAsync({
+        env: profile.env,
      });

      if (flags.json) {
@@ -39,7 +39,6 @@ export default class InitializeBuildCredentials extends EasCommand {
      vcsClient,
    } = await this.getContextAsync(InitializeBuildCredentials, {
      nonInteractive: false,
-      withServerSideEnvironment: null,
    });

    const platform = await selectPlatformAsync(flags.platform);
@@ -22,13 +22,12 @@ export default class Credentials extends EasCommand {
    const { flags } = await this.parse(Credentials);
    const {
      loggedIn: { actor, graphqlClient },
-      optionalPrivateProjectConfig: privateProjectConfig,
+      privateProjectConfig,
      getDynamicPrivateProjectConfigAsync,
      analytics,
      vcsClient,
    } = await this.getContextAsync(Credentials, {
      nonInteractive: false,
-      withServerSideEnvironment: null,
    });

    await new SelectPlatform(
@@ -15,10 +15,9 @@ export default class DeviceCreate extends EasCommand {
    // this command is interactive by design
    const {
      loggedIn: { actor, graphqlClient },
-      optionalPrivateProjectConfig: privateProjectConfig,
+      privateProjectConfig,
    } = await this.getContextAsync(DeviceCreate, {
      nonInteractive: false,
-      withServerSideEnvironment: null,
    });

    const ctx = await createContextAsync({
@@ -34,7 +34,7 @@ export default class DeviceDelete extends EasCommand {
  };

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

@@ -43,7 +43,7 @@ export default class DeviceDelete extends EasCommand {
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    let { 'apple-team-id': appleTeamIdentifier, udid } = flags;
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(DeviceDelete, {
      nonInteractive: paginatedQueryOptions.nonInteractive,
@@ -21,7 +21,7 @@ export default class BuildList extends EasCommand {
  };

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

@@ -29,7 +29,7 @@ export default class BuildList extends EasCommand {
    const { flags } = await this.parse(BuildList);
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(BuildList, {
      nonInteractive: paginatedQueryOptions.nonInteractive,
@@ -35,7 +35,7 @@ export default class DeviceRename extends EasCommand {
  };

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

@@ -44,7 +44,7 @@ export default class DeviceRename extends EasCommand {
    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    let { 'apple-team-id': appleTeamIdentifier, udid, name } = flags;
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(DeviceRename, {
      nonInteractive: paginatedQueryOptions.nonInteractive,
@@ -11,7 +11,7 @@ export default class DeviceView extends EasCommand {
  static override args = [{ name: 'UDID' }];

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

@@ -32,7 +32,7 @@ If you are not sure what is the UDID of the device you are looking for, run:
      throw new Error('Device UDID is missing');
    }
    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(DeviceView, {
      nonInteractive: true,
@@ -1,383 +0,0 @@
-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 },
-        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 },
-        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 },
-        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 },
-        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
-      );
-    });
-  });
-});
@@ -1,127 +0,0 @@
-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();
-  });
-});
@@ -1,114 +0,0 @@
-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 },
-      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();
-  });
-});
@@ -1,277 +0,0 @@
-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 = {
-    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"
-    );
-  });
-});
@@ -1,170 +0,0 @@
-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 },
-      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 },
-      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 },
-      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 },
-      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 },
-      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'));
-  });
-});
@@ -1,232 +0,0 @@
-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 = {
-    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"
-    );
-  });
-});
@@ -1,168 +0,0 @@
-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.'
-    );
-  });
-});
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`EnvironmentVariableDelete cancels deletion when user does not confirm 1`] = `"Environment variable needs 'name' to be specified when running in non-interactive mode. Run the command with [1m--variable-name VARIABLE_NAME[22m flag to fix the issue"`;
@@ -1,17 +1,14 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';

 import EasCommand from '../../commandUtils/EasCommand';
 import {
-  EASMultiEnvironmentFlag,
+  EASEnvironmentFlag,
  EASNonInteractiveFlag,
  EASVariableScopeFlag,
  EASVariableVisibilityFlag,
 } from '../../commandUtils/flags';
 import {
-  EnvironmentSecretType,
  EnvironmentVariableEnvironment,
  EnvironmentVariableScope,
  EnvironmentVariableVisibility,
@@ -25,24 +22,19 @@ import {
 } from '../../project/projectUtils';
 import { confirmAsync } from '../../prompts';
 import {
-  parseVisibility,
  promptVariableEnvironmentAsync,
  promptVariableNameAsync,
-  promptVariableTypeAsync,
  promptVariableValueAsync,
-  promptVariableVisibilityAsync,
 } from '../../utils/prompts';
-import { isEnvironment, performForEnvironmentsAsync } from '../../utils/variableUtils';

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

@@ -52,15 +44,6 @@ export default class EnvironmentVariableCreate extends EasCommand {

  static override hidden = true;

-  static override args = [
-    {
-      name: 'environment',
-      description:
-        "Environment to create the variable in. One of 'production', 'preview', or 'development'.",
-      required: false,
-    },
-  ];
-
  static override flags = {
    name: Flags.string({
      description: 'Name of the variable',
@@ -75,42 +58,34 @@ 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,
-    ...EASMultiEnvironmentFlag,
+    ...EASEnvironmentFlag,
    ...EASNonInteractiveFlag,
  };

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

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

-    const validatedFlags = this.validateFlags(flags);
-
-    const {
+    let {
      name,
      value,
      scope,
      'non-interactive': nonInteractive,
-      environment: environments,
+      environment,
      visibility,
      link,
      force,
-      type,
-      fileName,
-    } = await this.promptForMissingFlagsAsync(validatedFlags, args);
+    } = this.validateFlags(flags);

    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentVariableCreate, {
      nonInteractive,
@@ -121,77 +96,91 @@ 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) {
-      const existingVariables = await EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
-        appId: projectId,
-        filterNames: [name],
-      });
-
-      const existingVariable = existingVariables.find(
-        variable => !environments || variable.environments?.some(env => environments?.includes(env))
+      if (!environment) {
+        environment = await promptVariableEnvironmentAsync(nonInteractive);
+      }
+      const existingVariables = await EnvironmentVariablesQuery.byAppIdAsync(
+        graphqlClient,
+        projectId,
+        environment
      );
+      const existingVariable = existingVariables.find(variable => variable.name === name);

      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) {
-          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 (!nonInteractive) {
+            const confirmation = await confirmAsync({
+              message: `Shared variable ${name} already exists on this project. 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?`,
+            });

-          await performForEnvironmentsAsync(environments, async environment => {
-            await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
-              graphqlClient,
-              existingVariable.id,
-              projectId,
-              environment
+            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.`
            );
-          });
+          }
+          overwrite = true;
        }
      }

-      const variable =
-        overwrite && existingVariable
-          ? await EnvironmentVariableMutation.updateAsync(graphqlClient, {
-              id: existingVariable.id,
-              name,
-              value,
-              visibility,
-              environments,
-              type,
-              fileName,
-            })
-          : await EnvironmentVariableMutation.createForAppAsync(
-              graphqlClient,
-              {
-                name,
-                value,
-                environments,
-                visibility,
-                type: type ?? EnvironmentSecretType.String,
-                fileName,
-              },
-              projectId
-            );
-
+      const variable = await EnvironmentVariableMutation.createForAppAsync(
+        graphqlClient,
+        {
+          name,
+          value,
+          environment,
+          visibility,
+          overwrite,
+        },
+        projectId
+      );
      if (!variable) {
        throw new Error(
          `Could not create variable with name ${name} on project ${projectDisplayName}`
@@ -202,47 +191,39 @@ export default class EnvironmentVariableCreate extends EasCommand {
        `Created a new variable ${chalk.bold(name)} on project ${chalk.bold(projectDisplayName)}.`
      );
    } else if (scope === EnvironmentVariableScope.Shared) {
-      const existingVariables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
-        appId: projectId,
-        filterNames: [name],
-      });
-
-      const existingVariable = existingVariables.find(
-        variable => !environments || variable.environments?.some(env => environments?.includes(env))
-      );
-
+      const sharedVariables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, projectId);
+      const existingVariable = sharedVariables.find(variable => variable.name === name);
      if (existingVariable) {
-        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.`
-          );
+        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.');
        }
      }

-      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 (!environment && link) {
+        environment = await promptVariableEnvironmentAsync(nonInteractive);
+      }
+
+      const variable = await EnvironmentVariableMutation.createSharedVariableAsync(
+        graphqlClient,
+        {
+          name,
+          value,
+          visibility,
+        },
+        ownerAccount.id
+      );

      if (!variable) {
        throw new Error(
@@ -254,22 +235,18 @@ export default class EnvironmentVariableCreate extends EasCommand {
        `Created a new variable ${chalk.bold(name)} on account ${chalk.bold(ownerAccount.name)}.`
      );

-      if (link) {
+      if (link && environment) {
        Log.withTick(
          `Linking shared variable ${chalk.bold(name)} to project ${chalk.bold(
            projectDisplayName
          )}.`
        );
-
-        await performForEnvironmentsAsync(environments, async environment => {
-          await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
-            graphqlClient,
-            variable.id,
-            projectId,
-            environment
-          );
-        });
-
+        await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
+          graphqlClient,
+          variable.id,
+          projectId,
+          environment
+        );
        Log.withTick(
          `Linked shared variable ${chalk.bold(name)} to project ${chalk.bold(projectDisplayName)}.`
        );
@@ -277,134 +254,12 @@ export default class EnvironmentVariableCreate extends EasCommand {
    }
  }

-  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: environments,
-      visibility,
-      'non-interactive': nonInteractive,
-      type,
-      ...rest
-    }: CreateFlags,
-    { environment }: { environment?: string }
-  ): Promise<
-    Required<
-      Omit<CreateFlags, 'type' | 'visibility'> & {
-        type: EnvironmentSecretType | undefined;
-        visibility: EnvironmentVariableVisibility;
-      }
-    > & { fileName?: string }
-  > {
-    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;
-    let fileName: string | undefined;
-
-    if (newType === EnvironmentSecretType.FileBase64) {
-      environmentFilePath = path.resolve(value);
-      if (!(await fs.pathExists(environmentFilePath))) {
-        throw new Error(`File "${value}" does not exist`);
-      }
-      fileName = path.basename(environmentFilePath);
-    }
-
-    value = environmentFilePath ? await fs.readFile(environmentFilePath, 'base64') : value;
-
-    if (environment && !isEnvironment(environment.toUpperCase())) {
-      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-    }
-
-    let newEnvironments = environments
-      ? environments
-      : environment
-        ? [environment.toUpperCase() as EnvironmentVariableEnvironment]
-        : undefined;
-
-    if (!newEnvironments) {
-      newEnvironments = await promptVariableEnvironmentAsync({ nonInteractive, multiple: true });
-
-      if (!newEnvironments || newEnvironments.length === 0) {
-        throw new Error('No environments selected');
-      }
-    }
-
-    newVisibility = newVisibility ?? EnvironmentVariableVisibility.Public;
-
-    return {
-      name,
-      value,
-      environment: newEnvironments,
-      visibility: newVisibility,
-      link: rest.link ?? false,
-      force: rest.force ?? false,
-      scope: rest.scope ?? EnvironmentVariableScope.Project,
-      'non-interactive': nonInteractive,
-      type: newType,
-      fileName,
-      ...rest,
-    };
-  }
-
-  private validateFlags(flags: CreateFlags & { type?: string; visibility?: string }): CreateFlags {
+  private validateFlags(flags: CreateFlags): 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 &&
@@ -415,7 +270,6 @@ export default class EnvironmentVariableCreate extends EasCommand {
        'Unexpected argument: --environment in non-interactive mode can only be used with --link flag.'
      );
    }
-
    return flags;
  }
 }
@@ -1,23 +1,22 @@
 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 { formatVariableName, isEnvironment } from '../../utils/variableUtils';
+import { promptVariableEnvironmentAsync } from '../../utils/prompts';

 type DeleteFlags = {
-  'variable-name'?: string;
-  'variable-environment'?: EnvironmentVariableEnvironment;
+  name?: string;
+  environment?: EnvironmentVariableEnvironment;
  'non-interactive': boolean;
  scope?: EnvironmentVariableScope;
 };
@@ -28,93 +27,67 @@ export default class EnvironmentVariableDelete extends EasCommand {
  static override hidden = true;

  static override flags = {
-    'variable-name': Flags.string({
+    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,
  };

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

  async runAsync(): Promise<void> {
-    const { args, flags } = await this.parse(EnvironmentVariableDelete);
+    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.validateInputs(flags, args);
-    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentVariableDelete, {
      nonInteractive,
    });

-    const variables =
-      scope === EnvironmentVariableScope.Project
-        ? await EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
-            appId: projectId,
-            environment,
-          })
-        : await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
-            appId: projectId,
-            environment,
-          });
+    if (scope === EnvironmentVariableScope.Project) {
+      if (!environment) {
+        environment = await promptVariableEnvironmentAsync(nonInteractive);
+      }
+    }

-    let selectedVariable;
+    const variables =
+      scope === EnvironmentVariableScope.Project && environment
+        ? await EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, projectId, environment)
+        : await EnvironmentVariablesQuery.sharedAsync(graphqlClient, projectId);

    if (!name) {
-      ({ variable: selectedVariable } = await promptAsync({
+      ({ name } = await promptAsync({
        type: 'select',
-        name: 'variable',
+        name: 'name',
        message: 'Pick the variable to be deleted:',
        choices: variables
          .filter(({ scope: variableScope }) => scope === variableScope)
-          .map(variable => {
-            return {
-              title: formatVariableName(variable),
-              value: variable,
-            };
-          }),
+          .map(variable => ({
+            title: variable.name,
+            value: variable.name,
+          })),
      }));
-    } else {
-      const selectedVariables = variables.filter(
-        variable =>
-          variable.name === name && (!environment || variable.environments?.includes(environment))
-      );

-      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.`
-          );
-        }
+      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.`
+        );
      }
-
-      selectedVariable = selectedVariables[0];
    }

-    assert(selectedVariable, `Variable "${name}" not found.`);
+    const selectedVariable = variables.find(variable => variable.name === name);
+
+    if (!selectedVariable) {
+      throw new Error(`Variable "${name}" not found.`);
+    }

    if (!nonInteractive) {
      Log.addNewLineIfNone();
@@ -130,7 +103,7 @@ export default class EnvironmentVariableDelete extends EasCommand {
      });
      if (!confirmed) {
        Log.error(`Canceled deletion of variable ${selectedVariable.name}.`);
-        throw new Error(`Variable "${selectedVariable.name}" not deleted.`);
+        throw new Error(`Variable "${name}" not deleted.`);
      }
    }

@@ -139,31 +112,17 @@ export default class EnvironmentVariableDelete extends EasCommand {
    Log.withTick(`️Deleted variable ${selectedVariable.name}".`);
  }

-  private validateInputs(
-    flags: DeleteFlags,
-    { environment }: { environment?: string }
-  ): DeleteFlags {
+  private validateFlags(flags: DeleteFlags): DeleteFlags {
    if (flags['non-interactive']) {
-      if (!flags['variable-name']) {
+      if (!flags.name) {
        throw new Error(
          `Environment variable needs 'name' to be specified when running in non-interactive mode. Run the command with ${chalk.bold(
-            '--variable-name VARIABLE_NAME'
+            '--name VARIABLE_NAME'
          )} flag to fix the issue`
        );
      }
    }

-    if (environment) {
-      environment = environment.toUpperCase();
-
-      if (!isEnvironment(environment)) {
-        throw new Error(
-          "Invalid environment. Use one of 'production', 'preview', or 'development'."
-        );
-      }
-      return { ...flags, 'variable-environment': environment };
-    }
-
    return flags;
  }
 }
@@ -1,197 +0,0 @@
-import spawnAsync from '@expo/spawn-async';
-import chalk from 'chalk';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { EASNonInteractiveFlag } from '../../commandUtils/flags';
-import { EnvironmentVariableEnvironment } from '../../graphql/generated';
-import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
-import Log from '../../log';
-import { promptVariableEnvironmentAsync } from '../../utils/prompts';
-import { isEnvironment } from '../../utils/variableUtils';
-
-type ParsedFlags =
-  | {
-      nonInteractive: true;
-      environment: EnvironmentVariableEnvironment;
-      command: string;
-    }
-  | {
-      nonInteractive: false;
-      environment?: EnvironmentVariableEnvironment;
-      command: string;
-    };
-
-interface RawFlags {
-  '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.ProjectId,
-    ...this.ContextOptions.LoggedIn,
-  };
-
-  static override flags = {
-    ...EASNonInteractiveFlag,
-  };
-
-  static override args = [
-    {
-      name: 'environment',
-      required: true,
-      description:
-        "Environment to execute the command in. One of 'production', 'preview', or 'development'.",
-    },
-    {
-      name: 'bash_command',
-      required: true,
-      description: 'bash command to execute with the environment variables from the environment',
-    },
-  ];
-
-  async runAsync(): Promise<void> {
-    const { flags, args } = await this.parse(EnvExec);
-
-    const parsedFlags = this.sanitizeFlagsAndArgs(flags, args);
-
-    const {
-      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: parsedFlags.command,
-      environmentVariables,
-    });
-  }
-
-  private sanitizeFlagsAndArgs(
-    rawFlags: RawFlags,
-    { bash_command, environment }: Record<string, string>
-  ): ParsedFlags {
-    if (rawFlags['non-interactive'] && (!bash_command || !environment)) {
-      throw new Error(
-        "You must specify both environment and bash command when running in non-interactive mode. Run command as `eas env:exec ENVIRONMENT 'bash command'`."
-      );
-    }
-
-    environment = environment?.toUpperCase();
-
-    if (!isEnvironment(environment)) {
-      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-    }
-
-    return {
-      nonInteractive: rawFlags['non-interactive'],
-      environment,
-      command: bash_command,
-    };
-  }
-
-  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;
-  }
-}
@@ -4,25 +4,24 @@ 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, isEnvironment } from '../../utils/variableUtils';

 type GetFlags = {
-  'variable-name'?: string;
-  'variable-environment'?: EnvironmentVariableEnvironment;
+  name?: string;
+  environment?: EnvironmentVariableEnvironment;
  'non-interactive': boolean;
  format?: string;
  scope: EnvironmentVariableScope;
@@ -34,45 +33,33 @@ export default class EnvironmentVariableGet extends EasCommand {
  static override hidden = true;

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

-  static override args = [
-    {
-      name: 'environment',
-      description:
-        "Current environment of the variable. One of 'production', 'preview', or 'development'.",
-      required: false,
-    },
-  ];
-
  static override flags = {
-    'variable-name': Flags.string({
+    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 { args, flags } = await this.parse(EnvironmentVariableGet);
+    const { flags } = await this.parse(EnvironmentVariableGet);

    let {
-      'variable-environment': environment,
-      'variable-name': name,
+      environment,
+      name,
      'non-interactive': nonInteractive,
      format,
      scope,
-    } = this.validateInputs(flags, args);
+    } = this.validateFlags(flags);

    const {
-      projectId,
+      privateProjectConfig: { projectId },
      loggedIn: { graphqlClient },
    } = await this.getContextAsync(EnvironmentVariableGet, {
      nonInteractive,
@@ -82,36 +69,17 @@ export default class EnvironmentVariableGet extends EasCommand {
      name = await promptVariableNameAsync(nonInteractive);
    }

-    if (!environment) {
-      environment = await promptVariableEnvironmentAsync({
-        nonInteractive,
-        multiple: false,
-      });
+    if (!environment && scope === EnvironmentVariableScope.Project) {
+      environment = await promptVariableEnvironmentAsync(nonInteractive);
    }

-    const variables = await getVariablesAsync(graphqlClient, scope, projectId, name, environment);
+    const variable = await getVariableAsync(graphqlClient, scope, projectId, name, environment);

-    if (variables.length === 0) {
+    if (!variable) {
      Log.error(`Variable with name "${name}" not found`);
      return;
    }
-
-    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) {
+    if (!variable.value) {
      throw new Error(
        `${chalk.bold(
          variable.name
@@ -120,75 +88,57 @@ export default class EnvironmentVariableGet extends EasCommand {
    }

    if (format === 'short') {
-      Log.log(`${chalk.bold(variable.name)}=${formatVariableValue(variable)}`);
+      Log.log(`${chalk.bold(variable.name)}=${variable.value}`);
    } else {
      Log.log(formatVariable(variable));
    }
  }

-  private validateInputs(flags: GetFlags, { environment }: { environment?: string }): GetFlags {
+  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['variable-name']) {
-        throw new Error('Variable name is required. Run the command with --variable-name flag.');
+      if (!flags.name) {
+        throw new Error('Variable name is required. Run the command with --name flag.');
      }
      if (!flags.scope) {
        throw new Error('Scope is required. Run the command with --scope flag.');
      }
-      if (!(flags['variable-environment'] ?? environment)) {
+      if (!flags.environment && flags.scope === EnvironmentVariableScope.Project) {
        throw new Error('Environment is required.');
      }
    }
-    if (environment && flags['variable-environment']) {
-      throw new Error(
-        "You can't use both --variable-environment flag when environment is passed as an argument. Run `eas env:get --help` for more information."
-      );
-    }
-
-    if (environment) {
-      environment = environment.toUpperCase();
-      if (!isEnvironment(environment)) {
-        throw new Error(
-          "Invalid environment. Use one of 'production', 'preview', or 'development'."
-        );
-      }
-      return {
-        'variable-environment': environment,
-        ...flags,
-      };
-    }
    return flags;
  }
 }

-async function getVariablesAsync(
+async function getVariableAsync(
  graphqlClient: ExpoGraphqlClient,
  scope: string,
  projectId: string,
-  name: string | undefined,
-  environment: EnvironmentVariableEnvironment | undefined
-): Promise<EnvironmentVariableFragment[]> {
-  if (!name) {
-    throw new Error(
-      "Variable name is required. Run the command with '--variable-name VARIABLE_NAME' flag."
-    );
+  name: string,
+  environment: string | undefined
+): Promise<EnvironmentVariableFragment | null> {
+  if (!environment && scope === EnvironmentVariableScope.Project) {
+    throw new Error('Environment is required.');
  }
-  if (scope === EnvironmentVariableScope.Project) {
-    const appVariables = await EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(graphqlClient, {
-      appId: projectId,
-      environment,
-      filterNames: [name],
-      includeFileContent: true,
-    });
-    return appVariables;
-  } else {
-    const sharedVariables = await EnvironmentVariablesQuery.sharedWithSensitiveAsync(
+  if (environment && scope === EnvironmentVariableScope.Project) {
+    const appVariables = await EnvironmentVariablesQuery.byAppIdAsync(
      graphqlClient,
-      {
-        appId: projectId,
-        filterNames: [name],
-        includeFileContent: true,
-      }
+      projectId,
+      environment,
+      [name]
    );
-    return sharedVariables;
+    return appVariables[0];
  }
+
+  if (scope === EnvironmentVariableScope.Shared) {
+    const sharedVariables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, projectId, [
+      name,
+    ]);
+    return sharedVariables[0];
+  }
+
+  return null;
 }
@@ -2,26 +2,13 @@ import { Flags } from '@oclif/core';
 import chalk from 'chalk';

 import EasCommand from '../../commandUtils/EasCommand';
-import {
-  EASMultiEnvironmentFlag,
-  EASNonInteractiveFlag,
-  EasEnvironmentFlagParameters,
-} from '../../commandUtils/flags';
-import { EnvironmentVariableEnvironment } from '../../graphql/generated';
+import { EASEnvironmentFlag, EASNonInteractiveFlag } from '../../commandUtils/flags';
 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, isEnvironment } from '../../utils/variableUtils';
-
-type LinkFlags = {
-  'variable-name'?: string;
-  'variable-environment'?: EnvironmentVariableEnvironment;
-  'non-interactive': boolean;
-  environment?: EnvironmentVariableEnvironment[];
-};

 export default class EnvironmentVariableLink extends EasCommand {
  static override description = 'link a shared environment variable to the current project';
@@ -29,177 +16,68 @@ export default class EnvironmentVariableLink extends EasCommand {
  static override hidden = true;

  static override flags = {
-    'variable-name': Flags.string({
+    name: Flags.string({
      description: 'Name of the variable',
    }),
-    'variable-environment': Flags.enum<EnvironmentVariableEnvironment>({
-      ...EasEnvironmentFlagParameters,
-      description: 'Current environment of the variable to link',
-    }),
-    ...EASMultiEnvironmentFlag,
+    ...EASEnvironmentFlag,
    ...EASNonInteractiveFlag,
  };

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

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

    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
-    const variables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
-      appId: projectId,
-      environment: currentEnvironment,
-      filterNames: name ? [name] : undefined,
-    });
+    const variables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, projectId);

-    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(
+    if (!name) {
+      name = await selectAsync(
        'Select shared variable',
        variables.map(variable => ({
-          title: formatVariableName(variable),
-          value: variable,
+          title: variable.name,
+          value: variable.name,
        }))
      );
    }

+    const selectedVariable = variables.find(variable => variable.name === name);
+
    if (!selectedVariable) {
      throw new Error(`Shared variable ${name} doesn't exist`);
    }

-    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;
+    if (!environment) {
+      environment = await promptVariableEnvironmentAsync(nonInteractive);
    }

-    if (!environments) {
-      await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
-        graphqlClient,
-        selectedVariable.id,
-        projectId
+    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}`
      );
-      Log.withTick(
-        `Linked variable ${chalk.bold(selectedVariable.name)} to project ${chalk.bold(
-          projectDisplayName
-        )} in ${selectedVariable.environments?.join(', ').toLocaleLowerCase()}.`
-      );
-      return;
    }

-    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);
-      }
-    }
-  }
-  private validateInputs(flags: LinkFlags, { environment }: Record<string, string>): LinkFlags {
-    environment = environment?.toUpperCase();
-
-    if (environment && !isEnvironment(environment)) {
-      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-    }
-
-    const environments = flags.environment
-      ? flags.environment
-      : environment
-        ? [environment as EnvironmentVariableEnvironment]
-        : undefined;
-
-    if (flags['non-interactive']) {
-      if (!flags['variable-name']) {
-        throw new Error(
-          `Environment variable needs 'name' to be specified when running in non-interactive mode. Run the command with ${chalk.bold(
-            '--variable-name VARIABLE_NAME'
-          )} flag to fix the issue`
-        );
-      }
-    }
-
-    return {
-      'variable-name': flags['variable-name'],
-      'variable-environment': flags['variable-environment'],
-      'non-interactive': flags['non-interactive'],
-      environment: environments,
-    };
+    Log.withTick(
+      `Linked variable ${chalk.bold(linkedVariable.name)} to project ${chalk.bold(
+        projectDisplayName
+      )}.`
+    );
  }
 }