v16.23.0

Co-authored-by: Kadi Kraman <[email protected]>

.github/codemention.yml

@@ -3,7 +3,7 @@ commentConfiguration:
   epilogue: 'Generated by [CodeMention](https://github.com/expo/expo/actions/workflows/codemention.yaml)'
 rules:
   - patterns: ['**/*']
-    mentions: ['sjchmiela']
+    mentions: ['douglowder']
   - patterns: ['packages/eas-cli/src/update/**']
     mentions: ['wschurman', 'quinlanj']
   - patterns: ['packages/eas-cli/src/commands/update/**']
@@ -22,3 +22,9 @@ rules:
     mentions: ['kitten', 'kadikraman']
   - patterns: ['packages/eas-cli/src/commands/deploy/**']
     mentions: ['kitten', 'kadikraman']
+  - patterns: ['packages/eas-cli/src/commands/build/**']
+    mentions: ['sjchmiela']
+  - patterns: ['packages/eas-cli/src/build/**']
+    mentions: ['sjchmiela']
+  - patterns: ['packages/eas-cli/src/commands/workflow/**']
+    mentions: ['sjchmiela']

.github/workflows/release.yml

@@ -18,6 +18,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
           draft: true
   build-linux:
     name: Build for Linux
@@ -27,9 +28,13 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 22
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
+      - name: Ensure GraphQL schema and generated code is up-to-date
+        working-directory: ${{ github.workspace }}/packages/eas-cli
+        run: |
+          yarn verify-graphql-code
       - name: Build tarballs
         working-directory: ${{ github.workspace }}/packages/eas-cli
         run: |
@@ -68,7 +73,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 22
       - run: brew install python-setuptools
         env:
           HOMEBREW_NO_AUTO_UPDATE: 1
@@ -111,7 +116,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 22
       - run: yarn install --frozen-lockfile --check-files
       - run: sudo apt-get install nsis
       - run: yarn build
@@ -153,7 +158,7 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org/'
           scope: 'expo'
-          node-version: 20
+          node-version: 22
       - name: Install dependencies
         run: yarn install --frozen-lockfile --check-files
       - name: Build
@@ -186,7 +191,7 @@ jobs:
           token: ${{ secrets.EXPO_BOT_PAT }}
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 22
       - name: Install dependencies
         working-directory: ./scripts
         run: yarn install --frozen-lockfile --check-files
@@ -206,7 +211,7 @@ jobs:
           git config --global user.email "[email protected]"
           git config --global user.name "Expo CI"
           git add CHANGELOG.md
-          git commit -m "update CHANGELOG.md"
+          git commit --allow-empty -m "update CHANGELOG.md"
           git push
       - name: Prepare changelog for Slack
         run: |

.github/workflows/test-graphql.yml

@@ -0,0 +1,27 @@
+name: Ensure GraphQL schema and generated code is up-to-date
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  schedule:
+    - cron: '0 8 * * *' # 8:00 AM UTC time every day
+
+concurrency:
+  group: test-graphql-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: Ensure GraphQL schema and generated code is up-to-date
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 22
+      - run: yarn install --frozen-lockfile
+      - run: yarn verify-graphql-code
+        working-directory: packages/eas-cli

.github/workflows/trigger-release.yml

@@ -0,0 +1,48 @@
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        type: string
+        required: false
+        description: 'Version number for the release'
+      dry_run:
+        type: boolean
+        required: true
+        default: true
+        description: 'Run the release in dry run mode, without pushing any changes'
+
+name: Manually trigger a release
+
+jobs:
+  release:
+    name: Trigger a release
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.EXPO_BOT_PAT }}
+      INPUT_VERSION: ${{ github.event.inputs.version }}
+      INPUT_DRY_RUN: ${{ github.event.inputs.dry_run }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: 0
+          token: ${{ secrets.EXPO_BOT_PAT }}
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - run: |
+          # Lerna will not detect changes correctly without having all tags
+          git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+          # Checkout the main branch
+          git checkout main
+          git config --global user.email "[email protected]"
+          git config --global user.name "Expo CI"
+          yarn install --frozen-lockfile --check-files
+          yarn build
+          if [[ "$INPUT_VERSION" == "" ]]; then
+            echo "Releasing with default version"
+            yarn release
+          else
+            echo "Releasing with version $INPUT_VERSION"
+            yarn release $INPUT_VERSION
+          fi

CHANGELOG.md

@@ -7,11 +7,164 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🛠 Breaking changes
 
 ### 🎉 New features
+- Support custom environment variable environments ([#3220](https://github.com/expo/eas-cli/pull/3220) by [@kadikraman](https://github.com/kadikraman))
+
+- Add --force flag to eas env:push command to bypass confirmation prompts. ([#3135](https://github.com/expo/eas-cli/pull/3135) by [@giorgiofellipe](https://github.com/giorgiofellipe))
 
 ### 🐛 Bug fixes
 
 ### 🧹 Chores
 
+## [16.22.0](https://github.com/expo/eas-cli/releases/tag/v16.22.0) - 2025-10-13
+
+### 🎉 New features
+
+- Improvements to workflow:create. ([#3194](https://github.com/expo/eas-cli/pull/3194) by [@douglowder](https://github.com/douglowder))
+
+## [16.21.0](https://github.com/expo/eas-cli/releases/tag/v16.21.0) - 2025-10-13
+
+### 🎉 New features
+
+- Support `_expo/.routes.json` metadata file exported by `@expo/cli` for headers configuration on static deployments ([#3211](https://github.com/expo/eas-cli/pull/3211) by [@kitten](https://github.com/kitten))
+
+### 🧹 Chores
+
+- Add thorough tests for the env commands ([#3217](https://github.com/expo/eas-cli/pull/3217) by [@kadikraman](https://github.com/kadikraman))
+
+## [16.20.4](https://github.com/expo/eas-cli/releases/tag/v16.20.4) - 2025-10-08
+
+### 🎉 New features
+
+- Allow workflow:run to run a workflow from a GitHub ref. ([#3203](https://github.com/expo/eas-cli/pull/3203) by [@douglowder](https://github.com/douglowder))
+
+### 🐛 Bug fixes
+
+- Fix --environment flag in eas exec and pull ([#3216](https://github.com/expo/eas-cli/pull/3216) by [@kadikraman](https://github.com/kadikraman))
+
+## [16.20.3](https://github.com/expo/eas-cli/releases/tag/v16.20.3) - 2025-10-07
+
+### 🐛 Bug fixes
+
+- Fix --environment flag in eas env commands ([#3213](https://github.com/expo/eas-cli/pull/3213) by [@kadikraman](https://github.com/kadikraman))
+
+## [16.20.2](https://github.com/expo/eas-cli/releases/tag/v16.20.2) - 2025-10-07
+
+### 🧹 Chores
+
+- Create an `EnvironmentVariableEnvironment` enum and use it instead of the graphQL Enum ([#3208](https://github.com/expo/eas-cli/pull/3208) by [@kadikraman](https://github.com/kadikraman))
+
+## [16.20.1](https://github.com/expo/eas-cli/releases/tag/v16.20.1) - 2025-10-03
+
+### 🐛 Bug fixes
+
+- skip syncing capabilities with settings if they don't contain the `enabled` attribute ([#3201](https://github.com/expo/eas-cli/pull/3201) by [@vonovak](https://github.com/vonovak))
+
+## [16.20.0](https://github.com/expo/eas-cli/releases/tag/v16.20.0) - 2025-09-30
+
+### 🎉 New features
+
+- Improvements to workflow:validate. ([#3165](https://github.com/expo/eas-cli/pull/3165) by [@douglowder](https://github.com/douglowder))
+- Add `eas:new` command behind `hidden` flag. ([#3196](https://github.com/expo/eas-cli/pull/3196) by [@mackenco](https://github.com/mackenco))
+
+## [16.19.3](https://github.com/expo/eas-cli/releases/tag/v16.19.3) - 2025-09-17
+
+### 🧹 Chores
+
+- Temporarily remove warnings when no compatible build found, need to refine the message. ([#3182](https://github.com/expo/eas-cli/pull/3182) by [@brentvatne](https://github.com/brentvatne))
+
+## [16.19.2](https://github.com/expo/eas-cli/releases/tag/v16.19.2) - 2025-09-15
+
+### 🎉 New features
+
+- Add artifact URLs to workflow:view. ([#3175](https://github.com/expo/eas-cli/pull/3175) by [@douglowder](https://github.com/douglowder))
+
+## [16.19.1](https://github.com/expo/eas-cli/releases/tag/v16.19.1) - 2025-09-12
+
+## [16.19.0](https://github.com/expo/eas-cli/releases/tag/v16.19.0) - 2025-09-12
+
+### 🎉 New features
+
+- Allow any string as Android release `track`, not just the `production`, `internal`, `alpha`, `beta`. ([#3163](https://github.com/expo/eas-cli/pull/3163) by [@sjchmiela](https://github.com/sjchmiela))
+
+## [16.18.1](https://github.com/expo/eas-cli/releases/tag/v16.18.1) - 2025-09-10
+
+### 🎉 New features
+
+- CLI debug log should respect DEBUG=`eas:*`. ([#3162](https://github.com/expo/eas-cli/pull/3162) by [@douglowder](https://github.com/douglowder))
+- Better description for update:rollback. ([#3154](https://github.com/expo/eas-cli/pull/3154) by [@douglowder](https://github.com/douglowder))
+
+## [16.18.0](https://github.com/expo/eas-cli/releases/tag/v16.18.0) - 2025-08-27
+
+### 🎉 New features
+
+- Show fingerprints in build:view and build:list commands. ([#3137](https://github.com/expo/eas-cli/pull/3137) by [@douglowder](https://github.com/douglowder))
+
+### 🐛 Bug fixes
+
+- Make `EXPO_PUBLIC_` env vars plain text, rest sensitive ([#3121](https://github.com/expo/eas-cli/pull/3121) by [@kadikraman](https://github.com/kadikraman))
+
+## [16.17.4](https://github.com/expo/eas-cli/releases/tag/v16.17.4) - 2025-07-31
+
+### 🧹 Chores
+
+- Introduce new release process and workflow. ([#3119](https://github.com/expo/eas-cli/pull/3119) by [@douglowder](https://github.com/douglowder))
+- SSO Login: print browser url ([#3113](https://github.com/expo/eas-cli/pull/3113) by [@BackSlasher](https://github.com/BackSlasher))
+
+## [16.17.2](https://github.com/expo/eas-cli/releases/tag/v16.17.2) - 2025-07-23
+
+## [16.17.1](https://github.com/expo/eas-cli/releases/tag/v16.17.1) - 2025-07-23
+
+## [16.17.0](https://github.com/expo/eas-cli/releases/tag/v16.17.0) - 2025-07-18
+
+### 🎉 New features
+
+- Add `deploy:delete` for deleting worker deployments ([#3106](https://github.com/expo/eas-cli/pull/3106) by [@kadikraman](https://github.com/kadikraman))
+- Add `deploy:alias:delete` for deleting worker deployment aliases ([#3107](https://github.com/expo/eas-cli/pull/3107) by [@kadikraman](https://github.com/kadikraman))
+
+## [16.16.0](https://github.com/expo/eas-cli/releases/tag/v16.16.0) - 2025-07-16
+
+### 🎉 New features
+
+- Add workflow:view and workflow:logs commands. ([#3090](https://github.com/expo/eas-cli/pull/3090) by [@douglowder](https://github.com/douglowder))
+- Add support for providing inputs to new workflow runs ([#3095](https://github.com/expo/eas-cli/pull/3095) by [@sjchmiela](https://github.com/sjchmiela))
+
+### 🐛 Bug fixes
+
+- Refactor capabilities syncing to avoid provisioning profiles becoming invalid. ([#3088](https://github.com/expo/eas-cli/pull/3088) by [@vonovak](https://github.com/vonovak))
+- Avoid corrupted EAS Hosting batch upload bodies and double-check length and checksums while uploading. ([#3103](https://github.com/expo/eas-cli/pull/3103) by [@kitten](https://github.com/kitten))
+
+## [16.15.0](https://github.com/expo/eas-cli/releases/tag/v16.15.0) - 2025-07-10
+
+### 🎉 New features
+
+- Implement new EAS Hosting asset upload protocol, which improves performance by grouping files into batched upload API calls ([#3085](https://github.com/expo/eas-cli/pull/3085) by [@kitten](https://github.com/kitten))
+
+### 🧹 Chores
+
+- Update the EAS Hosting worker deployment progress indicator to use a progress bar for asset uploads instead ([#3099](https://github.com/expo/eas-cli/pull/3099) by [@kitten](https://github.com/kitten))
+
+## [16.14.1](https://github.com/expo/eas-cli/releases/tag/v16.14.1) - 2025-07-08
+
+### 🧹 Chores
+
+- Update apple team info as needed. ([#3096](https://github.com/expo/eas-cli/pull/3096) by [@quinlanj](https://github.com/quinlanj))
+
+## [16.14.0](https://github.com/expo/eas-cli/releases/tag/v16.14.0) - 2025-07-07
+
+### 🎉 New features
+
+- Add update:revert-update-rollout command. ([#3068](https://github.com/expo/eas-cli/pull/3068) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Remove unreleased `link` and `unlink` commands from `eas env`. ([#3092](https://github.com/expo/eas-cli/pull/3092) by [@kadikraman](https://github.com/kadikraman))
+- Add new CI to verify GraphQL generation. ([#3093](https://github.com/expo/eas-cli/pull/3093) by [@douglowder](https://github.com/douglowder))
+- Update GraphQL generation to look in all src directories. ([#3097](https://github.com/expo/eas-cli/pull/3097) by [@wschurman](https://github.com/wschurman))
+
+## [16.13.4](https://github.com/expo/eas-cli/releases/tag/v16.13.4) - 2025-07-04
+
+### 🧹 Chores
+
 - Remove hidden flag from `eas upload`. ([#3014](https://github.com/expo/eas-cli/pull/3014) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 
 ## [16.13.3](https://github.com/expo/eas-cli/releases/tag/v16.13.3) - 2025-07-01

CONTRIBUTING.md

@@ -1,12 +1,21 @@
 # Development
 
-Set up an alias for the EAS CLI so you can try it in projects all around your computer. The project is compiled on the fly so you don't need to run a build (watch) command.
+## Getting Started
 
-> The only exception is when you just cloned the repository or there have been changes in `packages/eas-json`. In that case, you'll have to run `yarn build` in the root.
+If this is your first time running `eas-cli` locally, make sure you install and build the packages. In the project root, run:
+
+```sh
+yarn install
+yarn build
+```
+
+From there, set up an alias for the EAS CLI so you can try it in projects all around your computer. The project is compiled on the fly so you don't need to run a build (watch) command.
+
+> The only exception is if there have been changes in `packages/eas-json`. In that case, you'll have to run `yarn build` in the root.
 
 Open your `.zshrc` or other config file and add:
 
-```
+```sh
 alias easd="/PATH/TO/eas-cli/bin/run"
 ```
 
@@ -14,7 +23,7 @@ Then use it with `easd` like `easd build`.
 
 If you're making changes to `packages/eas-json` or prefer/need to work with production code, start the build command in watch mode with:
 
-```
+```sh
 yarn start
 ```
 
@@ -33,7 +42,7 @@ If it is easier for you to work with the code locally with compiler options set
 
 you can consider using:
 
-```
+```sh
 yarn start-allow-unused
 ```
 

RELEASING.md

@@ -1,6 +1,6 @@
 # Releasing EAS CLI
 
-1. Run `yarn release` in the repository root folder. The next version is chosen automatically based on the changelog entries. If you want to use different version, pass the version string as a positional argument to the command, e.g. `yarn release 1.2.3`.
+1. Invoke the GitHub workflow ["Manually trigger a release"](https://github.com/expo/eas-cli/actions/workflows/trigger-release.yml). The next version is chosen automatically based on the changelog entries. If you want to use different version, pass the version string as an input to the workflow, in semver format, e.g. "1.2.3"
 2. That's it! GitHub Actions is going to take care of the rest. Watch the #eas-cli Slack channel for a successful release notification.
 
 ## Choosing the next version

lerna.json

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

package.json

@@ -28,7 +28,7 @@
     "eslint-plugin-node": "11.1.0",
     "jest": "29.7.0",
     "jest-watch-typeahead": "2.2.2",
-    "lerna": "7.4.2",
+    "lerna": "8.2.3",
     "oclif": "^3.9.0",
     "prettier": "3.1.1",
     "ts-jest": "29.1.1",

packages/eas-cli/graphql-codegen.yml

@@ -1,13 +1,7 @@
 overwrite: true
 schema: 'https://staging-api.expo.dev/graphql'
 documents:
-  - 'src/graphql/**/!(*.d).{ts,tsx}'
-  - 'src/credentials/ios/api/graphql/**/!(*.d).{ts,tsx}'
-  - 'src/credentials/android/api/graphql/**/!(*.d).{ts,tsx}'
-  - 'src/commands/**/*.ts'
-  - 'src/branch/**/*.ts'
-  - 'src/channel/**/*.ts'
-  - 'src/worker/**/*.ts'
+  - 'src/**/!(*.d).ts'
 generates:
   src/graphql/generated.ts:
     plugins:

packages/eas-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "16.13.4",
+  "version": "16.23.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
@@ -12,11 +12,11 @@
     "@expo/code-signing-certificates": "0.0.5",
     "@expo/config": "10.0.6",
     "@expo/config-plugins": "9.0.12",
-    "@expo/eas-build-job": "1.0.173",
-    "@expo/eas-json": "16.13.2",
+    "@expo/eas-build-job": "1.0.237",
+    "@expo/eas-json": "16.23.0",
     "@expo/env": "^1.0.0",
     "@expo/json-file": "8.3.3",
-    "@expo/logger": "1.0.117",
+    "@expo/logger": "1.0.221",
     "@expo/multipart-body-parser": "2.0.0",
     "@expo/osascript": "2.1.4",
     "@expo/package-manager": "1.7.0",
@@ -28,7 +28,7 @@
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "1.0.173",
+    "@expo/steps": "1.0.231",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "^1.26.2",
     "@oclif/plugin-autocomplete": "^2.3.10",
@@ -49,7 +49,7 @@
     "fast-deep-equal": "3.1.3",
     "fast-glob": "3.3.2",
     "figures": "3.2.0",
-    "form-data": "4.0.0",
+    "form-data": "^4.0.4",
     "fs-extra": "11.2.0",
     "getenv": "1.0.0",
     "gradle-to-js": "2.0.1",
@@ -85,13 +85,14 @@
     "tar": "6.2.1",
     "tar-stream": "3.1.7",
     "terminal-link": "2.1.1",
+    "ts-deepmerge": "6.2.0",
     "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"
+    "zod": "^4.1.3"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.0",
@@ -108,7 +109,7 @@
     "@types/getenv": "^1.0.0",
     "@types/jsonwebtoken": "8.5.1",
     "@types/mime": "3.0.1",
-    "@types/node-fetch": "2.6.2",
+    "@types/node-fetch": "2.6.12",
     "@types/node-forge": "1.3.1",
     "@types/pngjs": "6.0.4",
     "@types/promise-retry": "1.1.3",
@@ -119,14 +120,13 @@
     "@types/tough-cookie": "4.0.2",
     "@types/uuid": "9.0.7",
     "@types/wrap-ansi": "3.0.0",
-    "axios": "0.28.1",
+    "axios": "1.11.0",
     "eslint-plugin-graphql": "4.0.0",
     "express": "4.20.0",
     "memfs": "3.4.13",
     "mockdate": "3.0.5",
     "nock": "13.4.0",
     "rimraf": "3.0.2",
-    "ts-deepmerge": "6.2.0",
     "ts-mockito": "2.6.1",
     "ts-node": "10.9.2",
     "typescript": "5.3.3"
@@ -234,6 +234,7 @@
     "test": "jest",
     "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
     "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
+    "verify-graphql-code": "./scripts/verify-graphql.sh",
     "clean": "rimraf dist build tmp node_modules yarn-error.log"
   },
   "volta": {

packages/eas-cli/scripts/verify-graphql.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+function cleanup()
+{
+  echo 'Cleaning up...'
+  rm -f graphql.schema.json.bak src/graphql/generated.ts.bak
+}
+
+# Fail if anything errors
+set -eox pipefail
+# If this script exits, trap it first and clean up
+trap cleanup EXIT
+
+cp graphql.schema.json graphql.schema.json.bak
+cp src/graphql/generated.ts src/graphql/generated.ts.bak
+
+yarn generate-graphql-code
+if cmp -s graphql.schema.json graphql.schema.json.bak; then
+    echo "GraphQL schema is up-to-date"
+    if cmp -s src/graphql/generated.ts src/graphql/generated.ts.bak; then
+        echo "GraphQL generated code is up-to-date"
+        exit 0
+    else
+        echo "GraphQL code has changed but has not been regenerated. Run `yarn generate-graphql-code` and commit the changes."
+        exit 1
+    fi
+else
+    echo "GraphQL schema has changed on the server."
+    echo "Building eas-json"
+    cd ../eas-json
+    yarn build
+    cd ../eas-cli
+    echo "Running `yarn tsc` to check for breaking changes..."
+    yarn tsc
+    # If there are no errors, then the schema is backwards compatible
+    exit 0
+fi

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

@@ -7,7 +7,16 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { ContextInput, ContextOutput } from '../../commandUtils/EasCommand';
 import { DynamicConfigContextFn } from '../../commandUtils/context/DynamicProjectConfigContextField';
-import { AppFragment, Role, WorkflowRunFragment, WorkflowRunStatus } from '../../graphql/generated';
+import {
+  AppFragment,
+  Role,
+  WorkflowJobStatus,
+  WorkflowJobType,
+  WorkflowRunByIdWithJobsQuery,
+  WorkflowRunFragment,
+  WorkflowRunStatus,
+  WorkflowRunTriggerEventType,
+} from '../../graphql/generated';
 
 export function getMockEasJson(): EasJson {
   return {
@@ -182,14 +191,16 @@ export function getMockWorkflowRunsFragment(
         successes?: number;
         failures?: number;
         pending?: number;
+        withJobs?: number;
       }
 ): WorkflowRunFragment[] {
-  const { successes = 0, failures = 0, pending = 0 } = params ?? {};
+  const { successes = 0, failures = 0, pending = 0, withJobs = 0 } = params ?? {};
   const runs: any[] = [];
   for (let i = 0; i < successes; i++) {
     runs.push({
       id: `success-${i}`,
       status: WorkflowRunStatus.Success,
+      errors: [],
       createdAt: '2022-01-01T00:00:00.000Z',
       updatedAt: '2022-01-01T00:00:00.000Z',
       gitCommitHash: '1234567890',
@@ -204,6 +215,7 @@ export function getMockWorkflowRunsFragment(
   for (let i = 0; i < failures; i++) {
     runs.push({
       id: `failure-${i}`,
+      errors: ['Failed'],
       status: WorkflowRunStatus.Failure,
       createdAt: '2022-01-01T00:00:00.000Z',
       updatedAt: '2022-01-01T00:00:00.000Z',
@@ -219,6 +231,7 @@ export function getMockWorkflowRunsFragment(
   for (let i = 0; i < pending; i++) {
     runs.push({
       id: `pending-${i}`,
+      errors: [],
       status: WorkflowRunStatus.InProgress,
       createdAt: '2022-01-01T00:00:00.000Z',
       updatedAt: '2022-01-01T00:00:00.000Z',
@@ -231,5 +244,65 @@ export function getMockWorkflowRunsFragment(
       },
     });
   }
+  for (let i = 0; i < withJobs; i++) {
+    runs.push(getMockWorkflowRunWithJobsFragment());
+  }
   return runs;
 }
+
+export function getMockWorkflowJobFragment(
+  runId?: string
+): WorkflowRunByIdWithJobsQuery['workflowRuns']['byId']['jobs'][number] {
+  return {
+    id: 'job1',
+    key: 'job1',
+    name: 'job1',
+    status: WorkflowJobStatus.Success,
+    type: WorkflowJobType.Build,
+    createdAt: '2022-01-01T00:00:00.000Z',
+    updatedAt: '2022-01-01T00:00:00.000Z',
+    outputs: {},
+    errors: [],
+    workflowRun: {
+      id: runId ?? 'build1',
+    },
+    turtleJobRun: {
+      id: 'job1',
+      logFileUrls: ['https://example.com/log1'],
+      errors: [],
+      artifacts: [],
+    },
+  };
+}
+
+export function getMockWorkflowRunWithJobsFragment(
+  runID?: string
+): WorkflowRunByIdWithJobsQuery['workflowRuns']['byId'] {
+  const id = runID ?? 'build1';
+  return {
+    id,
+    status: WorkflowRunStatus.Failure,
+    triggerEventType: WorkflowRunTriggerEventType.Manual,
+    createdAt: '2022-01-01T00:00:00.000Z',
+    updatedAt: '2022-01-01T00:00:00.000Z',
+    gitCommitHash: '1234567890',
+    gitCommitMessage: 'commit message',
+    errors: [],
+    workflow: {
+      id: 'build',
+      name: 'build',
+      fileName: 'build.yml',
+      app: {
+        id: mockProjectId,
+        __typename: 'App',
+        name: 'App',
+        ownerAccount: {
+          id: 'account-id',
+          name: 'account-name',
+          __typename: 'Account',
+        },
+      },
+    },
+    jobs: [getMockWorkflowJobFragment(id)],
+  };
+}

packages/eas-cli/src/__tests__/commands/workflow-logs-test.ts

@@ -0,0 +1,188 @@
+import {
+  getMockEmptyWorkflowRunsFragment,
+  getMockWorkflowJobFragment,
+  getMockWorkflowRunWithJobsFragment,
+  getMockWorkflowRunsFragment,
+  mockCommandContext,
+  mockProjectId,
+  mockTestCommand,
+} from './utils';
+import { fetchRawLogsForJobAsync } from '../../commandUtils/workflow/fetchLogs';
+import WorkflowLogView from '../../commands/workflow/logs';
+import { AppQuery } from '../../graphql/queries/AppQuery';
+import { WorkflowJobQuery } from '../../graphql/queries/WorkflowJobQuery';
+import { WorkflowRunQuery } from '../../graphql/queries/WorkflowRunQuery';
+import Log from '../../log';
+import { promptAsync } from '../../prompts';
+
+jest.mock('../../build/android/version');
+jest.mock('../../build/ios/version');
+jest.mock('../../project/applicationIdentifier');
+jest.mock('../../graphql/queries/AppVersionQuery');
+jest.mock('../../graphql/queries/AppQuery');
+jest.mock('../../graphql/queries/WorkflowJobQuery');
+jest.mock('../../graphql/queries/WorkflowRunQuery');
+jest.mock('../../graphql/mutations/AppVersionMutation');
+jest.mock('../../project/workflow');
+jest.mock('../../project/android/gradleUtils');
+jest.mock('../../project/ios/target');
+jest.mock('../../project/ios/scheme');
+jest.mock('fs');
+jest.mock('../../log');
+jest.mock('../../prompts');
+jest.mock('../../utils/json');
+jest.mock('../../commandUtils/workflow/fetchLogs');
+
+describe(WorkflowLogView, () => {
+  beforeEach(() => {
+    jest.mocked(WorkflowJobQuery.byIdAsync).mockResolvedValue(getMockWorkflowJobFragment());
+    jest
+      .mocked(WorkflowRunQuery.withJobsByIdAsync)
+      .mockResolvedValue(getMockWorkflowRunWithJobsFragment());
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  test('view logs, passing in no parameters, no runs found', async () => {
+    const ctx = mockCommandContext(WorkflowLogView, {
+      projectId: mockProjectId,
+    });
+    const cmd = mockTestCommand(WorkflowLogView, [], ctx);
+    jest
+      .mocked(AppQuery.byIdWorkflowRunsFilteredByStatusAsync)
+      .mockResolvedValue(getMockEmptyWorkflowRunsFragment());
+    await cmd.run();
+    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      undefined,
+      20
+    );
+    expect(Log.error).toHaveBeenCalledWith('No workflow runs found');
+  });
+  test('view logs, passing in no parameters, runs found, no jobs', async () => {
+    const ctx = mockCommandContext(WorkflowLogView, {
+      projectId: mockProjectId,
+    });
+    const cmd = mockTestCommand(WorkflowLogView, [], ctx);
+    jest
+      .mocked(AppQuery.byIdWorkflowRunsFilteredByStatusAsync)
+      .mockResolvedValue(getMockWorkflowRunsFragment({ successes: 1 }));
+    jest.mocked(promptAsync).mockResolvedValue({ selectedRun: 'build1' });
+    await cmd.run();
+    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      undefined,
+      20
+    );
+    expect(Log.error).toHaveBeenCalledWith('No job found');
+  });
+  test('view logs, passing in no parameters, runs found, jobs found, step selected, no logs', async () => {
+    const ctx = mockCommandContext(WorkflowLogView, {
+      projectId: mockProjectId,
+    });
+    const cmd = mockTestCommand(WorkflowLogView, [], ctx);
+    jest
+      .mocked(AppQuery.byIdWorkflowRunsFilteredByStatusAsync)
+      .mockResolvedValue(getMockWorkflowRunsFragment({ withJobs: 1 }));
+    let promptCalls = 0;
+    jest.mocked(promptAsync).mockImplementation(async () => {
+      if (promptCalls === 0) {
+        promptCalls++;
+        return { selectedRun: 'build1' };
+      } else if (promptCalls === 1) {
+        promptCalls++;
+        return { selectedJob: 0 };
+      } else {
+        return { selectedStep: 'step1' };
+      }
+    });
+    jest.mocked(fetchRawLogsForJobAsync).mockResolvedValue(null);
+    await cmd.run();
+    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      undefined,
+      20
+    );
+    expect(promptAsync).toHaveBeenCalledTimes(2);
+    expect(Log.error).toHaveBeenCalledWith('No logs found');
+  });
+  test('view logs, passing in no parameters, runs found, jobs found, step selected, logs found', async () => {
+    const ctx = mockCommandContext(WorkflowLogView, {
+      projectId: mockProjectId,
+    });
+    const cmd = mockTestCommand(WorkflowLogView, [], ctx);
+    jest
+      .mocked(AppQuery.byIdWorkflowRunsFilteredByStatusAsync)
+      .mockResolvedValue(getMockWorkflowRunsFragment({ withJobs: 1 }));
+    let promptCalls = 0;
+    jest.mocked(promptAsync).mockImplementation(async () => {
+      if (promptCalls === 0) {
+        promptCalls++;
+        return { selectedRun: 'build1' };
+      } else if (promptCalls === 1) {
+        promptCalls++;
+        return { selectedJob: 0 };
+      } else {
+        return { selectedStep: 'step1' };
+      }
+    });
+    jest
+      .mocked(fetchRawLogsForJobAsync)
+      .mockResolvedValue(
+        '{"result":"test","marker":"test","buildStepDisplayName":"step1","buildStepInternalId":"step1","time":"2022-01-01T00:00:00.000Z","msg":"test"}'
+      );
+    await cmd.run();
+    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      mockProjectId,
+      undefined,
+      20
+    );
+    expect(promptAsync).toHaveBeenCalledTimes(3);
+    expect(Log.error).not.toHaveBeenCalled();
+    expect(Log.log).toHaveBeenCalledWith('  2022-01-01T00:00:00.000Z test');
+  });
+  test('view logs for a workflow job, passing in a job ID, all steps', async () => {
+    const ctx = mockCommandContext(WorkflowLogView, {
+      projectId: mockProjectId,
+    });
+    const cmd = mockTestCommand(WorkflowLogView, ['job1', '--all-steps'], ctx);
+    await cmd.run();
+    expect(WorkflowJobQuery.byIdAsync).toHaveBeenCalledWith(ctx.loggedIn.graphqlClient, 'job1', {
+      useCache: false,
+    });
+  });
+  test('view logs for a workflow job, passing in a run ID', async () => {
+    const ctx = mockCommandContext(WorkflowLogView, {
+      projectId: mockProjectId,
+    });
+    jest.mocked(promptAsync).mockResolvedValue({ selectedJob: 'job1' });
+    jest.mocked(WorkflowJobQuery.byIdAsync).mockRejectedValue(new Error('Job not found'));
+    const cmd = mockTestCommand(WorkflowLogView, ['build1', '--all-steps'], ctx);
+    await cmd.run();
+    expect(WorkflowRunQuery.withJobsByIdAsync).toHaveBeenCalledWith(
+      ctx.loggedIn.graphqlClient,
+      'build1',
+      {
+        useCache: false,
+      }
+    );
+  });
+  test('view logs for a workflow job, passing in a run ID, non-interactive', async () => {
+    const ctx = mockCommandContext(WorkflowLogView, {
+      projectId: mockProjectId,
+    });
+    jest.mocked(promptAsync).mockResolvedValue({ selectedJob: 'job1' });
+    jest.mocked(WorkflowJobQuery.byIdAsync).mockRejectedValue(new Error('Job not found'));
+    const cmd = mockTestCommand(WorkflowLogView, ['build1', '--non-interactive'], ctx);
+    try {
+      await cmd.run();
+    } catch (e) {
+      expect(e).toBeInstanceOf(Error);
+      expect((e as Error).message).toEqual('No workflow job found that matched the provided ID');
+    }
+  });
+});

packages/eas-cli/src/__tests__/commands/workflow-runs-test.ts

@@ -6,7 +6,7 @@ import {
   mockTestCommand,
 } from './utils';
 import WorkflowRunList from '../../commands/workflow/runs';
-import { WorkflowRunStatus } from '../../graphql/generated';
+import { WorkflowRunStatus, WorkflowRunTriggerEventType } from '../../graphql/generated';
 import { AppQuery } from '../../graphql/queries/AppQuery';
 import { WorkflowRunQuery } from '../../graphql/queries/WorkflowRunQuery';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -75,8 +75,10 @@ describe(WorkflowRunList, () => {
       {
         id: 'build',
         status: WorkflowRunStatus.Success,
+        triggerEventType: WorkflowRunTriggerEventType.Manual,
         createdAt: '2022-01-01T00:00:00.000Z',
         updatedAt: '2022-01-01T00:00:00.000Z',
+        errors: [],
         gitCommitHash: '1234567890',
         gitCommitMessage: 'commit message',
         workflow: {
@@ -119,6 +121,8 @@ describe(WorkflowRunList, () => {
         status: 'FAILURE',
         gitCommitHash: '1234567890',
         gitCommitMessage: 'commit message',
+        trigger: '',
+        triggerType: 'Other',
         startedAt: '2022-01-01T00:00:00.000Z',
         finishedAt: '2022-01-01T00:00:00.000Z',
         workflowId: 'build',
@@ -135,10 +139,12 @@ describe(WorkflowRunList, () => {
       {
         id: 'build1',
         status: WorkflowRunStatus.Failure,
+        triggerEventType: WorkflowRunTriggerEventType.Manual,
         createdAt: '2022-01-01T00:00:00.000Z',
         updatedAt: '2022-01-01T00:00:00.000Z',
         gitCommitHash: '1234567890',
         gitCommitMessage: 'commit message',
+        errors: [],
         workflow: {
           id: 'build',
           name: 'build',
@@ -165,6 +171,8 @@ describe(WorkflowRunList, () => {
         status: 'FAILURE',
         gitCommitHash: '1234567890',
         gitCommitMessage: 'commit message',
+        trigger: '',
+        triggerType: 'Manual',
         startedAt: '2022-01-01T00:00:00.000Z',
         finishedAt: '2022-01-01T00:00:00.000Z',
         workflowId: 'build',

packages/eas-cli/src/api.ts

@@ -108,3 +108,7 @@ export function getEASUpdateURL(projectId: string, manifestHostOverride: string
     return new URL(projectId, `https://u.expo.dev`).href;
   }
 }
+
+export function getExpoApiWorkflowSchemaURL(): string {
+  return getExpoApiBaseUrl() + '/v2/workflows/schema';
+}

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

@@ -1,4 +1,4 @@
-import { Android, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import { Android, Platform, Workflow } from '@expo/eas-build-job';
 import { AppVersionSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import getenv from 'getenv';
@@ -11,7 +11,7 @@ import { resolveRemoteVersionCodeAsync } from './version';
 import AndroidCredentialsProvider, {
   AndroidCredentials,
 } from '../../credentials/android/AndroidCredentialsProvider';
-import { BuildParamsInput } from '../../graphql/generated';
+import { BuildMetadataInput, BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import Log, { learnMore } from '../../log';
 import {
@@ -27,7 +27,6 @@ import {
   prepareBuildRequestForPlatformAsync,
 } from '../build';
 import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
-import { transformMetadata } from '../graphql';
 import { logCredentialsSource } from '../utils/credentials';
 import {
   checkGoogleServicesFileAsync,
@@ -124,10 +123,9 @@ export async function prepareAndroidBuildAsync(
     sendBuildRequestAsync: async (
       appId: string,
       job: Android.Job,
-      metadata: Metadata,
+      graphqlMetadata: BuildMetadataInput,
       buildParams: BuildParamsInput
     ): Promise<BuildResult> => {
-      const graphqlMetadata = transformMetadata(metadata);
       const graphqlJob = transformJob(job);
       return await BuildMutation.createAndroidBuildAsync(ctx.graphqlClient, {
         appId,

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

@@ -8,7 +8,6 @@ import {
   transformProjectArchive,
   transformWorkflow,
 } from '../graphql';
-import { buildProfileEnvironmentToEnvironment } from '../utils/environment';
 
 export function transformJob(job: Android.Job): AndroidJobInput {
   return {
@@ -30,7 +29,7 @@ export function transformJob(job: Android.Job): AndroidJobInput {
     experimental: job.experimental,
     mode: transformBuildMode(job.mode),
     customBuildConfig: job.customBuildConfig,
-    environment: buildProfileEnvironmentToEnvironment(job.environment),
+    environment: job.environment,
     loggerLevel: job.loggerLevel
       ? loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
       : undefined,

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

@@ -2,7 +2,6 @@ import {
   ArchiveSource,
   ArchiveSourceType,
   BuildJob,
-  FingerprintSource,
   Metadata,
   Platform,
 } from '@expo/eas-build-job';
@@ -50,9 +49,11 @@ import { createFingerprintAsync } from '../fingerprint/cli';
 import {
   AppPlatform,
   BuildFragment,
+  BuildMetadataInput,
   BuildParamsInput,
   BuildPriority,
   BuildStatus,
+  FingerprintSourceInput,
   UploadSessionType,
 } from '../graphql/generated';
 import { BuildMutation, BuildResult } from '../graphql/mutations/BuildMutation';
@@ -94,7 +95,7 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends BuildJob
   sendBuildRequestAsync(
     appId: string,
     job: TJob,
-    metadata: Metadata,
+    metadata: BuildMetadataInput,
     buildParams: BuildParamsInput
   ): Promise<BuildResult>;
 }
@@ -193,13 +194,20 @@ export async function prepareBuildRequestForPlatformAsync<
     } else if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
       await BuildMutation.updateBuildMetadataAsync(ctx.graphqlClient, {
         buildId: nullthrows(process.env.EAS_BUILD_ID),
-        metadata: transformMetadata(metadata),
+        metadata: transformMetadata({
+          metadata,
+          fingerprintSource: runtimeAndFingerprintMetadata.fingerprintSource ?? undefined,
+        }),
       });
       printJsonOnlyOutput({ job, metadata });
       return undefined;
     } else if (!ctx.localBuildOptions.localBuildMode) {
       try {
-        return await sendBuildRequestAsync(builder, job, metadata, buildParams);
+        const graphqlMetadata = transformMetadata({
+          metadata,
+          fingerprintSource: runtimeAndFingerprintMetadata.fingerprintSource ?? undefined,
+        });
+        return await sendBuildRequestAsync(builder, job, graphqlMetadata, buildParams);
       } catch (error: any) {
         handleBuildRequestError(error, job.platform);
       }
@@ -362,7 +370,7 @@ async function sendBuildRequestAsync<
 >(
   builder: Builder<TPlatform, Credentials, TJob>,
   job: TJob,
-  metadata: Metadata,
+  graphqlMetadata: BuildMetadataInput,
   buildParams: BuildParamsInput
 ): Promise<BuildFragment> {
   const { ctx } = builder;
@@ -376,7 +384,7 @@ async function sendBuildRequestAsync<
       const { build, deprecationInfo } = await builder.sendBuildRequestAsync(
         ctx.projectId,
         job,
-        metadata,
+        graphqlMetadata,
         buildParams
       );
 
@@ -654,7 +662,7 @@ async function computeAndMaybeUploadRuntimeAndFingerprintMetadataAsync<T extends
 ): Promise<{
   runtimeVersion?: string | undefined;
   fingerprintHash?: string | undefined;
-  fingerprintSource?: FingerprintSource | undefined;
+  fingerprintSource?: FingerprintSourceInput | undefined;
 }> {
   const runtimeAndFingerprintMetadata =
     await computeAndMaybeUploadFingerprintFromExpoUpdatesAsync(ctx);
@@ -676,7 +684,7 @@ async function computeAndMaybeUploadFingerprintFromExpoUpdatesAsync<T extends Pl
   ctx: BuildContext<T>
 ): Promise<{
   runtimeVersion?: string;
-  fingerprintSource?: FingerprintSource;
+  fingerprintSource?: FingerprintSourceInput;
   fingerprintHash?: string;
 }> {
   const resolvedRuntimeVersion = await resolveRuntimeVersionAsync({
@@ -723,7 +731,7 @@ async function computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync<T extends
   { debug }: { debug?: boolean } = {}
 ): Promise<{
   fingerprintHash?: string;
-  fingerprintSource?: FingerprintSource;
+  fingerprintSource?: FingerprintSourceInput;
 }> {
   const fingerprint = await createFingerprintAsync(ctx.projectDir, {
     workflow: ctx.workflow,

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

@@ -1,9 +1,8 @@
 import { Env } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 
-import { isEnvironment } from './utils/environment';
+import { DefaultEnvironment } from './utils/environment';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { EnvironmentVariableEnvironment } from '../graphql/generated';
 import { EnvironmentVariablesQuery } from '../graphql/queries/EnvironmentVariablesQuery';
 import Log, { learnMore } from '../log';
 
@@ -49,20 +48,9 @@ async function resolveEnvVarsAsync({
   projectId: string;
 }): Promise<Env> {
   const environment =
-    buildProfile.environment?.toUpperCase() ??
+    buildProfile.environment ??
     resolveSuggestedEnvironmentForBuildProfileConfiguration(buildProfile);
 
-  if (!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,
@@ -129,16 +117,16 @@ async function resolveEnvVarsAsync({
 
 function resolveSuggestedEnvironmentForBuildProfileConfiguration(
   buildProfile: BuildProfile
-): EnvironmentVariableEnvironment {
+): DefaultEnvironment {
   const environment =
     buildProfile.distribution === 'store'
-      ? EnvironmentVariableEnvironment.Production
+      ? DefaultEnvironment.Production
       : buildProfile.developmentClient
-        ? EnvironmentVariableEnvironment.Development
-        : EnvironmentVariableEnvironment.Preview;
+        ? DefaultEnvironment.Development
+        : DefaultEnvironment.Preview;
 
   Log.log(
-    `Resolved "${environment.toLowerCase()}" environment for the build. ${learnMore(
+    `Resolved "${environment}" environment for the build. ${learnMore(
       'https://docs.expo.dev/eas/environment-variables/#setting-the-environment-for-your-builds'
     )}`
   );

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

@@ -3,7 +3,6 @@ import {
   ArchiveSourceType,
   BuildMode,
   BuildTrigger,
-  FingerprintSourceType,
   Metadata,
   Workflow,
 } from '@expo/eas-build-job';
@@ -19,7 +18,6 @@ import {
   FingerprintSourceInput,
   BuildMode as GraphQLBuildMode,
   BuildTrigger as GraphQLBuildTrigger,
-  FingerprintSourceType as GraphQLFingeprintSourceType,
   ProjectArchiveSourceInput,
   ProjectArchiveSourceType,
   WorkerLoggerLevel,
@@ -42,11 +40,16 @@ export function transformProjectArchive(archiveSource: ArchiveSource): ProjectAr
   }
 }
 
-export function transformMetadata(metadata: Metadata): BuildMetadataInput {
+export function transformMetadata({
+  metadata,
+  fingerprintSource,
+}: {
+  metadata: Metadata;
+  fingerprintSource: FingerprintSourceInput | undefined;
+}): BuildMetadataInput {
   return {
     ...metadata,
-    fingerprintSource:
-      metadata.fingerprintSource && transformFingerprintSource(metadata.fingerprintSource),
+    fingerprintSource,
     credentialsSource:
       metadata.credentialsSource && transformCredentialsSource(metadata.credentialsSource),
     distribution: metadata.distribution && transformDistribution(metadata.distribution),
@@ -57,20 +60,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 {

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

@@ -1,4 +1,4 @@
-import { Ios, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import { Ios, Platform, Workflow } from '@expo/eas-build-job';
 import { AppVersionSource } from '@expo/eas-json';
 
 import { ensureIosCredentialsAsync } from './credentials';
@@ -7,7 +7,7 @@ import { prepareJobAsync } from './prepareJob';
 import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
 import { resolveRemoteBuildNumberAsync } from './version';
 import { IosCredentials } from '../../credentials/ios/types';
-import { BuildParamsInput } from '../../graphql/generated';
+import { BuildMetadataInput, BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
 import { ensureNonExemptEncryptionIsDefinedForManagedProjectAsync } from '../../project/ios/exemptEncryption';
@@ -15,7 +15,6 @@ import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
 import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target';
 import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
 import { BuildContext, CommonContext, IosBuildContext } from '../context';
-import { transformMetadata } from '../graphql';
 import {
   checkGoogleServicesFileAsync,
   checkNodeEnvVariable,
@@ -106,10 +105,9 @@ export async function prepareIosBuildAsync(
     sendBuildRequestAsync: async (
       appId: string,
       job: Ios.Job,
-      metadata: Metadata,
+      graphqlMetadata: BuildMetadataInput,
       buildParams: BuildParamsInput
     ): Promise<BuildResult> => {
-      const graphqlMetadata = transformMetadata(metadata);
       const graphqlJob = transformJob(job);
       return await BuildMutation.createIosBuildAsync(ctx.graphqlClient, {
         appId,

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

@@ -9,7 +9,6 @@ import {
   transformProjectArchive,
   transformWorkflow,
 } from '../graphql';
-import { buildProfileEnvironmentToEnvironment } from '../utils/environment';
 
 export function transformJob(job: Ios.Job): IosJobInput {
   return {
@@ -32,7 +31,7 @@ export function transformJob(job: Ios.Job): IosJobInput {
     experimental: job.experimental,
     mode: transformBuildMode(job.mode),
     customBuildConfig: job.customBuildConfig,
-    environment: buildProfileEnvironmentToEnvironment(job.environment),
+    environment: job.environment,
     loggerLevel: job.loggerLevel
       ? loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
       : undefined,

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

@@ -1,4 +1,4 @@
-import { FingerprintSource, Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
+import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
 import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';
@@ -22,7 +22,6 @@ export async function collectMetadataAsync<T extends Platform>(
   runtimeAndFingerprintMetadata: {
     runtimeVersion?: string | undefined;
     fingerprintHash?: string | undefined;
-    fingerprintSource?: FingerprintSource | undefined;
   }
 ): Promise<Metadata> {
   const channelObject = await resolveChannelAsync(ctx);
@@ -36,7 +35,6 @@ export async function collectMetadataAsync<T extends Platform>(
     sdkVersion: ctx.exp.sdkVersion,
     runtimeVersion: runtimeAndFingerprintMetadata?.runtimeVersion,
     fingerprintHash: runtimeAndFingerprintMetadata?.fingerprintHash,
-    fingerprintSource: runtimeAndFingerprintMetadata?.fingerprintSource,
     reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
     ...channelObject,
     distribution,

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

@@ -1,26 +1,5 @@
-import { BuildProfile } from '@expo/eas-json';
-
-import { EnvironmentVariableEnvironment } from '../../graphql/generated';
-
-type Environment = NonNullable<BuildProfile['environment']>;
-
-const BuildProfileEnvironmentToEnvironment: Record<Environment, EnvironmentVariableEnvironment> = {
-  production: EnvironmentVariableEnvironment.Production,
-  preview: EnvironmentVariableEnvironment.Preview,
-  development: EnvironmentVariableEnvironment.Development,
-};
-
-export function isEnvironment(env: string): env is EnvironmentVariableEnvironment {
-  return Object.values(EnvironmentVariableEnvironment).includes(
-    env as EnvironmentVariableEnvironment
-  );
-}
-
-export function buildProfileEnvironmentToEnvironment(
-  environment: BuildProfile['environment']
-): EnvironmentVariableEnvironment | null {
-  if (!environment) {
-    return null;
-  }
-  return BuildProfileEnvironmentToEnvironment[environment];
+export enum DefaultEnvironment {
+  Development = 'development',
+  Preview = 'preview',
+  Production = 'production',
 }

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

@@ -6,8 +6,44 @@ import {
   BuildFragment,
   BuildStatus as GraphQLBuildStatus,
 } from '../../graphql/generated';
+import { link } from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
-import formatFields from '../../utils/formatFields';
+import formatFields, { FormatFieldsItem } from '../../utils/formatFields';
+
+export function formatGraphQLBuildArtifacts(build: BuildFragment): FormatFieldsItem[] {
+  const fields = [
+    {
+      label: 'Application Archive URL',
+      get value() {
+        switch (build.status) {
+          case GraphQLBuildStatus.InProgress:
+            return '<in progress>';
+          default: {
+            const url = build.artifacts?.buildUrl;
+            return url ? link(url) : 'null';
+          }
+        }
+      },
+    },
+    {
+      label: 'Build Artifacts URL',
+      get value() {
+        switch (build.status) {
+          case GraphQLBuildStatus.InProgress:
+            return '<in progress>';
+          default: {
+            const url = build.artifacts?.buildArtifactsUrl;
+            return url ? link(url) : 'null';
+          }
+        }
+      },
+    },
+  ];
+  return fields.filter(({ value }) => value !== undefined && value !== null) as {
+    label: string;
+    value: string;
+  }[];
+}
 
 export function formatGraphQLBuild(build: BuildFragment): string {
   const actor = getActorName(build);
@@ -81,10 +117,11 @@ export function formatGraphQLBuild(build: BuildFragment): string {
     },
     {
       label: 'Logs',
-      value: getBuildLogsUrl(build),
+      value: link(getBuildLogsUrl(build)),
     },
+    ...formatGraphQLBuildArtifacts(build),
     {
-      label: 'Artifact',
+      label: 'Fingerprint',
       get value() {
         switch (build.status) {
           case GraphQLBuildStatus.New:
@@ -96,8 +133,8 @@ export function formatGraphQLBuild(build: BuildFragment): string {
           case GraphQLBuildStatus.Errored:
             return null;
           case GraphQLBuildStatus.Finished: {
-            const url = build.artifacts?.buildUrl;
-            return url ? url : chalk.red('not found');
+            const hash = build.fingerprint?.hash;
+            return hash ? chalk.green(hash) : chalk.red('not found');
           }
           default:
             return null;

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

@@ -26,7 +26,6 @@ import {
   CommandEvent,
   createAnalyticsAsync,
 } from '../analytics/AnalyticsManager';
-import { EnvironmentVariableEnvironment } from '../graphql/generated';
 import Log, { link } from '../log';
 import SessionManager from '../user/SessionManager';
 import { Client } from '../vcs/vcs';
@@ -60,7 +59,7 @@ interface BaseGetContextAsyncArgs {
 
 interface GetContextAsyncArgsWithRequiredServerSideEnvironmentArgument
   extends BaseGetContextAsyncArgs {
-  withServerSideEnvironment: EnvironmentVariableEnvironment | null;
+  withServerSideEnvironment: string | null;
 }
 
 interface GetContextAsyncArgsWithoutServerSideEnvironmentArgument extends BaseGetContextAsyncArgs {

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

@@ -1,5 +1,4 @@
 import { Analytics } from '../../analytics/AnalyticsManager';
-import { EnvironmentVariableEnvironment } from '../../graphql/generated';
 import SessionManager from '../../user/SessionManager';
 import { Client } from '../../vcs/vcs';
 
@@ -11,7 +10,7 @@ export interface ContextOptions {
   /**
    * If specified, env variables from the selected environment will be fetched from the server and used to evaluate the dynamic config.
    */
-  withServerSideEnvironment?: EnvironmentVariableEnvironment | null;
+  withServerSideEnvironment?: string | null;
 }
 
 export default abstract class ContextField<T> {

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

@@ -1,23 +1,15 @@
 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,
-};
+const cachedServerSideEnvironmentVariables: Record<string, Record<string, string> | undefined> = {};
 
 export async function loadServerSideEnvironmentVariablesAsync({
   environment,
   projectId,
   graphqlClient,
 }: {
-  environment: EnvironmentVariableEnvironment;
+  environment: string;
   projectId: string;
   graphqlClient: ExpoGraphqlClient;
 }): Promise<Record<string, string>> {
@@ -42,13 +34,13 @@ export async function loadServerSideEnvironmentVariablesAsync({
 
   if (Object.keys(serverEnvVars).length > 0) {
     Log.log(
-      `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${Object.keys(
+      `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment}" environment on EAS: ${Object.keys(
         serverEnvVars
       ).join(', ')}.`
     );
   } else {
     Log.log(
-      `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`
+      `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment}" environment on EAS.`
     );
   }
   Log.newLine();

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

@@ -1,17 +1,5 @@
 import { Flags } from '@oclif/core';
 
-import { EnvironmentVariableEnvironment } from '../graphql/generated';
-
-// NOTE: not exactly true, but, provided mapToLowercase and upperCaseAsync
-// are used in tandem, it saves on unnecessary typying in commands
-async function upperCaseAsync<T>(input: string): Promise<T> {
-  return input.toUpperCase() as T;
-}
-
-function mapToLowercase<T extends string>(options: T[]): T[] {
-  return options.map(option => option.toLowerCase()) as T[];
-}
-
 export const EasNonInteractiveAndJsonFlags = {
   json: Flags.boolean({
     description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
@@ -23,21 +11,17 @@ export const EasNonInteractiveAndJsonFlags = {
 };
 
 export const EasEnvironmentFlagParameters = {
-  description: "Environment variable's environment",
-  parse: upperCaseAsync,
-  options: mapToLowercase([
-    EnvironmentVariableEnvironment.Development,
-    EnvironmentVariableEnvironment.Preview,
-    EnvironmentVariableEnvironment.Production,
-  ]),
+  description: "Environment variable's environment, e.g. 'production', 'preview', 'development'",
 };
 
 export const EASEnvironmentFlag = {
-  environment: Flags.enum<EnvironmentVariableEnvironment>(EasEnvironmentFlagParameters),
+  environment: Flags.string({
+    description: "Environment variable's environment, e.g. 'production', 'preview', 'development'",
+  }),
 };
 
 export const EASMultiEnvironmentFlag = {
-  environment: Flags.enum<EnvironmentVariableEnvironment>({
+  environment: Flags.string({
     ...EasEnvironmentFlagParameters,
     multiple: true,
   }),
@@ -81,12 +65,10 @@ export const EasJsonOnlyFlag = {
 };
 
 export const EasUpdateEnvironmentFlag = {
-  environment: Flags.enum<EnvironmentVariableEnvironment | null>({
+  environment: Flags.string({
     description:
-      'Environment to use for the server-side defined EAS environment variables during command execution.',
-    options: mapToLowercase(Object.values(EnvironmentVariableEnvironment)),
-    parse: upperCaseAsync,
+      'Environment to use for the server-side defined EAS environment variables during command execution, e.g. "production", "preview", "development"',
     required: false,
-    default: null,
+    default: undefined,
   }),
 };

packages/eas-cli/src/commandUtils/workflow/buildProfileUtils.ts

@@ -0,0 +1,269 @@
+import { ExpoConfig } from '@expo/config';
+import { BuildProfile, EasJsonAccessor, EasJsonUtils, Platform } from '@expo/eas-json';
+import { AndroidBuildProfile, IosBuildProfile } from '@expo/eas-json/build/build/types';
+
+import BuildConfigure from '../../commands/build/configure';
+import UpdateConfigure from '../../commands/update/configure';
+import Log from '../../log';
+import { promptAsync } from '../../prompts';
+
+export async function buildProfileNamesFromProjectAsync(projectDir: string): Promise<Set<string>> {
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
+
+  const buildProfileNames = new Set(
+    easJsonAccessor && (await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor))
+  );
+  return buildProfileNames;
+}
+export async function getBuildProfileAsync(
+  projectDir: string,
+  platform: Platform,
+  profileName: string
+): Promise<BuildProfile<Platform>> {
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
+  const buildProfile = await EasJsonUtils.getBuildProfileAsync(
+    easJsonAccessor,
+    platform,
+    profileName
+  );
+  return buildProfile;
+}
+export async function buildProfilesFromProjectAsync(
+  projectDir: string
+): Promise<Map<string, { android: AndroidBuildProfile; ios: IosBuildProfile }>> {
+  const buildProfileNames = await buildProfileNamesFromProjectAsync(projectDir);
+  const buildProfiles: Map<string, { android: AndroidBuildProfile; ios: IosBuildProfile }> =
+    new Map();
+  for (const profileName of buildProfileNames) {
+    const iosBuildProfile = (await getBuildProfileAsync(
+      projectDir,
+      Platform.IOS,
+      profileName
+    )) as IosBuildProfile;
+    const androidBuildProfile = (await getBuildProfileAsync(
+      projectDir,
+      Platform.ANDROID,
+      profileName
+    )) as AndroidBuildProfile;
+    buildProfiles.set(profileName, { android: androidBuildProfile, ios: iosBuildProfile });
+  }
+  return buildProfiles;
+}
+export function isBuildProfileForDevelopment(
+  buildProfile: BuildProfile<Platform>,
+  platform: Platform
+): boolean {
+  if (buildProfile.developmentClient) {
+    return true;
+  }
+  if (platform === Platform.ANDROID) {
+    return (buildProfile as BuildProfile<Platform.ANDROID>).gradleCommand === ':app:assembleDebug';
+  }
+  if (platform === Platform.IOS) {
+    return (buildProfile as BuildProfile<Platform.IOS>).buildConfiguration === 'Debug';
+  }
+  return false;
+}
+export function isIosBuildProfileForSimulator(buildProfile: BuildProfile<Platform.IOS>): boolean {
+  return buildProfile.simulator ?? false;
+}
+export async function addAndroidDevelopmentBuildProfileToEasJsonAsync(
+  projectDir: string,
+  buildProfileName: string
+): Promise<void> {
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
+  await easJsonAccessor.readRawJsonAsync();
+  easJsonAccessor.patch(easJsonRawObject => {
+    easJsonRawObject.build = {
+      ...easJsonRawObject.build,
+      [buildProfileName]: {
+        developmentClient: true,
+        distribution: 'internal',
+        android: {
+          gradleCommand: ':app:assembleDebug',
+        },
+      },
+    };
+    return easJsonRawObject;
+  });
+  await easJsonAccessor.writeAsync();
+}
+export async function addIosDevelopmentBuildProfileToEasJsonAsync(
+  projectDir: string,
+  buildProfileName: string,
+  simulator: boolean
+): Promise<void> {
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
+  await easJsonAccessor.readRawJsonAsync();
+  easJsonAccessor.patch(easJsonRawObject => {
+    easJsonRawObject.build = {
+      ...easJsonRawObject.build,
+      [buildProfileName]: {
+        developmentClient: true,
+        distribution: 'internal',
+        ios: {
+          buildConfiguration: 'Debug',
+          simulator,
+        },
+      },
+    };
+    return easJsonRawObject;
+  });
+  await easJsonAccessor.writeAsync();
+}
+
+export async function addProductionBuildProfileToEasJsonIfNeededAsync(
+  projectDir: string
+): Promise<boolean> {
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
+  await easJsonAccessor.readRawJsonAsync();
+  let profileAdded = false;
+  easJsonAccessor.patch(easJsonRawObject => {
+    if (!easJsonRawObject.build?.production) {
+      profileAdded = true;
+      easJsonRawObject.build = {
+        ...(easJsonRawObject.build ?? {}),
+        production: {},
+      };
+      // Also add the profile to submit
+      easJsonRawObject.submit = {
+        ...(easJsonRawObject.submit ?? {}),
+        production: {},
+      };
+    }
+    return easJsonRawObject;
+  });
+  if (profileAdded) {
+    Log.log('Added missing production build profile to eas.json');
+  }
+  await easJsonAccessor.writeAsync();
+  return profileAdded;
+}
+
+export async function hasBuildConfigureBeenRunAsync({
+  projectDir,
+  expoConfig,
+}: {
+  projectDir: string;
+  expoConfig: ExpoConfig;
+}): Promise<boolean> {
+  // Is there a project ID in the Expo config?
+  if (!expoConfig.extra?.eas?.projectId) {
+    return false;
+  }
+  // Is there an eas.json?
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
+  try {
+    await easJsonAccessor.readAsync();
+  } catch {
+    return false;
+  }
+  return true;
+}
+
+export async function hasUpdateConfigureBeenRunAsync({
+  projectDir,
+  expoConfig,
+}: {
+  projectDir: string;
+  expoConfig: ExpoConfig;
+}): Promise<boolean> {
+  // Does the Expo config have an updates URL?
+  if (!expoConfig.updates?.url) {
+    return false;
+  }
+  // Does at least one build profile have a channel?
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
+  try {
+    const easJson = await easJsonAccessor.readAsync();
+    return Object.values(easJson.build ?? {}).some(buildProfile => !!buildProfile.channel);
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Runs update:configure if needed. Returns a boolean (proceed with workflow creation, or not)
+ */
+
+export async function runUpdateConfigureIfNeededAsync({
+  projectDir,
+  expoConfig,
+}: {
+  projectDir: string;
+  expoConfig: ExpoConfig;
+}): Promise<boolean> {
+  if (
+    await hasUpdateConfigureBeenRunAsync({
+      projectDir,
+      expoConfig,
+    })
+  ) {
+    return true;
+  }
+  const nextStep = (
+    await promptAsync({
+      type: 'select',
+      name: 'nextStep',
+      message:
+        'You have chosen to create a workflow that requires EAS Update configuration. What would you like to do?',
+      choices: [
+        { title: 'Configure EAS Update and then proceed', value: 'configure' },
+        { title: 'EAS Update is already configured, proceed', value: 'proceed' },
+        { title: 'Choose a different workflow template', value: 'repeat' },
+      ],
+    })
+  ).nextStep;
+  switch (nextStep) {
+    case 'configure':
+      Log.newLine();
+      await UpdateConfigure.run([]);
+      return true;
+    case 'proceed':
+      return true;
+    default:
+      return false;
+  }
+}
+/**
+ * Runs build:configure if needed. Returns a boolean (proceed with workflow creation, or not)
+ */
+export async function runBuildConfigureIfNeededAsync({
+  projectDir,
+  expoConfig,
+}: {
+  projectDir: string;
+  expoConfig: ExpoConfig;
+}): Promise<boolean> {
+  if (
+    await hasBuildConfigureBeenRunAsync({
+      projectDir,
+      expoConfig,
+    })
+  ) {
+    return true;
+  }
+  const nextStep = (
+    await promptAsync({
+      type: 'select',
+      name: 'nextStep',
+      message:
+        'You have chosen to create a workflow that requires EAS Build configuration. What would you like to do?',
+      choices: [
+        { title: 'Configure EAS Build and then proceed', value: 'configure' },
+        { title: 'EAS Build is already configured, proceed', value: 'proceed' },
+        { title: 'Choose a different workflow template', value: 'repeat' },
+      ],
+    })
+  ).nextStep;
+  switch (nextStep) {
+    case 'configure':
+      Log.newLine();
+      await BuildConfigure.run(['-p', 'all']);
+      return true;
+    case 'proceed':
+      return true;
+    default:
+      return false;
+  }
+}

packages/eas-cli/src/commandUtils/workflow/creation.ts

@@ -0,0 +1,536 @@
+import { ExpoConfig } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
+
+import {
+  addAndroidDevelopmentBuildProfileToEasJsonAsync,
+  addIosDevelopmentBuildProfileToEasJsonAsync,
+  addProductionBuildProfileToEasJsonIfNeededAsync,
+  buildProfilesFromProjectAsync,
+  hasBuildConfigureBeenRunAsync,
+  hasUpdateConfigureBeenRunAsync,
+  isBuildProfileForDevelopment,
+  isIosBuildProfileForSimulator,
+} from './buildProfileUtils';
+import Log, { link } from '../../log';
+import { confirmAsync } from '../../prompts';
+import { easCliVersion } from '../../utils/easCli';
+
+export enum WorkflowStarterName {
+  BUILD = 'build',
+  UPDATE = 'update',
+  CUSTOM = 'custom',
+  DEPLOY = 'deploy',
+}
+
+export type WorkflowStarter = {
+  name: WorkflowStarterName;
+  displayName: string;
+  defaultFileName: string;
+  template: any;
+  header: string;
+  nextSteps?: string[];
+};
+
+const createdByEASCLI = `# Created by EAS CLI v${easCliVersion}`;
+
+const CUSTOM_TEMPLATE = {
+  name: 'Custom workflow',
+  on: {
+    push: {
+      branches: ['main'],
+    },
+  },
+  jobs: {
+    custom_build: {
+      name: 'Custom job',
+      steps: [
+        {
+          uses: 'eas/checkout',
+        },
+        {
+          name: 'Hello World',
+          id: 'hello_world',
+          run: '# Custom script\necho "Hello, World"\n',
+        },
+      ],
+    },
+  },
+};
+
+const CUSTOM_TEMPLATE_HEADER = `
+# Custom job
+#
+# This workflow shows how to write custom jobs.
+# It contains a predefined workflow step and a shell command to print "Hello, World!".
+#
+# Key features:
+# - Triggers on pushes to the main branch.
+#    (Requires linked GitHub account: https://expo.dev/accounts/[account]/settings/github)
+# - Can be triggered manually with eas workflow:run custom.yml
+# - Runs eas/checkout then a custom "echo" command
+#
+# For detailed documentation on workflow syntax and available step types, visit:
+# https://docs.expo.dev/eas/workflows/syntax/#jobsjob_idstepsstepuses
+#
+${createdByEASCLI}
+#
+`;
+
+const BUILD_TEMPLATE = {
+  name: 'Create development builds',
+  on: {
+    push: {
+      branches: ['main'],
+    },
+  },
+  jobs: {},
+};
+
+const BUILD_TEMPLATE_HEADER = `
+# Create development builds
+#
+# This workflow shows how to create development builds.
+#
+# Key features:
+# - Can be triggered manually with eas workflow:run create-development-builds.yml
+# - Runs the pre-packaged build job to create Android and iOS development builds
+#     for Android emulators, Android and iOS devices, and iOS simulators
+#
+# For a detailed guide on using this workflow, visit:
+# https://docs.expo.dev/develop/development-builds/introduction/
+#
+${createdByEASCLI}
+#
+`;
+
+const PUBLISH_UPDATE_TEMPLATE = {
+  name: 'Publish preview update',
+  on: {
+    push: {
+      branches: ['*'],
+    },
+  },
+  jobs: {
+    publish_preview_update: {
+      name: 'Publish preview update',
+      type: 'update',
+      params: {
+        branch: '${{ github.ref_name || "test" }}',
+      },
+    },
+  },
+};
+
+const PUBLISH_UPDATE_TEMPLATE_HEADER = `
+# Publish preview update
+#
+# This workflow shows how to publish preview updates.
+# Learn more: https://docs.expo.dev/review/share-previews-with-your-team/
+#
+# Key features:
+# - Triggers on pushes to all branches
+#    (Requires linked GitHub account: https://expo.dev/accounts/[account]/settings/github)
+# - Can be triggered manually with eas workflow:run publish-preview-update.yml
+# - Runs the pre-packaged update job
+#
+# For a detailed guide on using this workflow, visit:
+# https://docs.expo.dev/eas/workflows/examples/publish-preview-update/
+#
+${createdByEASCLI}
+#
+`;
+
+const DEPLOY_TEMPLATE = {
+  name: 'Deploy to production',
+  on: {
+    push: {
+      branches: ['main'],
+    },
+  },
+  jobs: {
+    fingerprint: {
+      name: 'Fingerprint',
+      type: 'fingerprint',
+    },
+    get_android_build: {
+      name: 'Check for existing android build',
+      needs: ['fingerprint'],
+      type: 'get-build',
+      params: {
+        fingerprint_hash: '${{ needs.fingerprint.outputs.android_fingerprint_hash }}',
+        profile: 'production',
+      },
+    },
+    get_ios_build: {
+      name: 'Check for existing ios build',
+      needs: ['fingerprint'],
+      type: 'get-build',
+      params: {
+        fingerprint_hash: '${{ needs.fingerprint.outputs.ios_fingerprint_hash }}',
+        profile: 'production',
+      },
+    },
+    build_android: {
+      name: 'Build Android',
+      needs: ['get_android_build'],
+      if: '${{ !needs.get_android_build.outputs.build_id }}',
+      type: 'build',
+      params: {
+        platform: 'android',
+        profile: 'production',
+      },
+    },
+    build_ios: {
+      name: 'Build iOS',
+      needs: ['get_ios_build'],
+      if: '${{ !needs.get_ios_build.outputs.build_id }}',
+      type: 'build',
+      params: {
+        platform: 'ios',
+        profile: 'production',
+      },
+    },
+    submit_android_build: {
+      name: 'Submit Android Build',
+      needs: ['build_android'],
+      type: 'submit',
+      params: {
+        build_id: '${{ needs.build_android.outputs.build_id }}',
+      },
+    },
+    submit_ios_build: {
+      name: 'Submit iOS Build',
+      needs: ['build_ios'],
+      type: 'submit',
+      params: {
+        build_id: '${{ needs.build_ios.outputs.build_id }}',
+      },
+    },
+    publish_android_update: {
+      name: 'Publish Android update',
+      needs: ['get_android_build'],
+      if: '${{ needs.get_android_build.outputs.build_id }}',
+      type: 'update',
+      params: {
+        branch: 'production',
+        platform: 'android',
+      },
+    },
+    publish_ios_update: {
+      name: 'Publish iOS update',
+      needs: ['get_ios_build'],
+      if: '${{ needs.get_ios_build.outputs.build_id }}',
+      type: 'update',
+      params: {
+        branch: 'production',
+        platform: 'ios',
+      },
+    },
+  },
+};
+
+const DEPLOY_TEMPLATE_HEADER = `
+# Deploy to production
+#
+# This workflow shows how to build and submit to app stores.
+#
+# Key features:
+# - Triggers on pushes to "main" (Requires linked GitHub account: https://expo.dev/accounts/[account]/settings/github)
+# - Can be triggered manually with eas workflow:run deploy-to-production.yml
+# - Creates builds and submits them to app stores when native changes are detected, otherwise sends an over-the-air update.
+#
+# For a detailed guide on using this workflow, visit:
+# https://docs.expo.dev/eas/workflows/examples/deploy-to-production/
+`;
+
+function nextStepForDeviceBuildProfile(buildProfileName: string): string {
+  return `A build job in this workflow uses the build profile "${buildProfileName}"
+    to build your app for real devices, and may require credentials.
+    You can configure your credentials with the command "eas credentials".
+    For more information, please see ${link('https://docs.expo.dev/app-signing/app-credentials/')}.
+`
+    .trim()
+    .trimStart();
+}
+
+function nextStepForAppSubmission(): string {
+  return `This workflow includes a job to submit your app to app stores.
+    You will need to configure your App Store/Play Store credentials 
+    before you can run this workflow.
+    Please see ${link('https://docs.expo.dev/deploy/submit-to-app-stores/')}.
+  `
+    .trim()
+    .trimStart();
+}
+
+export function howToRunWorkflow(
+  workflowFileName: string,
+  workflowStarter: WorkflowStarter
+): string {
+  const lines = [
+    `To run this workflow manually, use the command "eas workflow:run .eas/workflows/${workflowFileName}".`,
+  ];
+  if (workflowStarter.template?.on?.push?.branches?.length > 0) {
+    const branches = workflowStarter.template.on.push.branches;
+    if (branches.length === 1 && branches[0] === '*') {
+      lines.push(
+        'This workflow is also configured to run automatically when code is pushed to any branch.'
+      );
+    } else if (branches.length === 1) {
+      lines.push(
+        `This workflow is also configured to run automatically when code is pushed to the "${branches[0]}" branch.`
+      );
+    } else {
+      lines.push(
+        `This workflow is also configured to run automatically when code is pushed to the following branches: ${branches.join(
+          ', '
+        )}.`
+      );
+    }
+  }
+  return lines.join('\n');
+}
+
+export const workflowStarters: WorkflowStarter[] = [
+  {
+    displayName: 'Custom',
+    name: WorkflowStarterName.CUSTOM,
+    defaultFileName: 'custom.yml',
+    template: CUSTOM_TEMPLATE,
+    header: CUSTOM_TEMPLATE_HEADER,
+  },
+  {
+    displayName: 'Create development builds',
+    name: WorkflowStarterName.BUILD,
+    defaultFileName: 'create-development-builds.yml',
+    template: BUILD_TEMPLATE,
+    header: BUILD_TEMPLATE_HEADER,
+  },
+  {
+    displayName: 'Publish updates',
+    name: WorkflowStarterName.UPDATE,
+    defaultFileName: 'publish-updates.yml',
+    template: PUBLISH_UPDATE_TEMPLATE,
+    header: PUBLISH_UPDATE_TEMPLATE_HEADER,
+  },
+  {
+    displayName: 'Deploy to production',
+    name: WorkflowStarterName.DEPLOY,
+    defaultFileName: 'deploy-to-production.yml',
+    template: DEPLOY_TEMPLATE,
+    header: DEPLOY_TEMPLATE_HEADER,
+  },
+];
+
+export async function addBuildJobsToDevelopmentBuildTemplateAsync(
+  projectDir: string,
+  workflowStarter: WorkflowStarter
+): Promise<WorkflowStarter> {
+  const buildProfiles = await buildProfilesFromProjectAsync(projectDir);
+  // android_development_build
+
+  const nextSteps: Set<string> = new Set();
+
+  let androidDevelopmentBuildProfileName: string | null = null;
+  for (const profileName of buildProfiles.keys()) {
+    const profile = buildProfiles.get(profileName)?.android;
+    if (!profile) {
+      continue;
+    }
+    if (isBuildProfileForDevelopment(profile, Platform.ANDROID)) {
+      androidDevelopmentBuildProfileName = profileName;
+      break;
+    }
+  }
+  if (!androidDevelopmentBuildProfileName) {
+    Log.warn(
+      'This workflow requires an Android development build profile in your eas.json, but none were found.'
+    );
+    const add = await confirmAsync({
+      message: 'Do you want to add an Android development build profile?',
+      initial: false,
+    });
+    if (add) {
+      let androidDevelopmentBuildProfileName = 'android_development';
+      while (buildProfiles.has(androidDevelopmentBuildProfileName)) {
+        androidDevelopmentBuildProfileName = `${androidDevelopmentBuildProfileName}_1`;
+      }
+      await addAndroidDevelopmentBuildProfileToEasJsonAsync(
+        projectDir,
+        androidDevelopmentBuildProfileName
+      );
+    } else {
+      Log.log('Skipping Android development build job...');
+    }
+  }
+  if (androidDevelopmentBuildProfileName) {
+    Log.log(`Using Android development build profile: ${androidDevelopmentBuildProfileName}`);
+    workflowStarter.template.jobs.android_development_build = {
+      name: `Build ${androidDevelopmentBuildProfileName} for android`,
+      type: 'build',
+      params: {
+        profile: androidDevelopmentBuildProfileName,
+        platform: 'android',
+      },
+    };
+    nextSteps.add(nextStepForDeviceBuildProfile(androidDevelopmentBuildProfileName));
+  }
+
+  // ios_simulator_development_build
+  let iosSimulatorDevelopmentBuildProfileName: string | null = null;
+  for (const profileName of buildProfiles.keys()) {
+    const profile = buildProfiles.get(profileName)?.ios;
+    if (!profile) {
+      continue;
+    }
+    if (
+      isBuildProfileForDevelopment(profile, Platform.IOS) &&
+      isIosBuildProfileForSimulator(profile)
+    ) {
+      iosSimulatorDevelopmentBuildProfileName = profileName;
+      break;
+    }
+  }
+  if (!iosSimulatorDevelopmentBuildProfileName) {
+    Log.warn(
+      'This workflow requires an iOS simulator development build profile in your eas.json, but none were found.'
+    );
+    const add = await confirmAsync({
+      message: 'Do you want to add an iOS simulator development build profile?',
+      initial: false,
+    });
+    if (add) {
+      let iosSimulatorDevelopmentBuildProfileName = 'ios_simulator_development';
+      while (buildProfiles.has(iosSimulatorDevelopmentBuildProfileName)) {
+        iosSimulatorDevelopmentBuildProfileName = `${iosSimulatorDevelopmentBuildProfileName}_1`;
+      }
+      await addIosDevelopmentBuildProfileToEasJsonAsync(
+        projectDir,
+        iosSimulatorDevelopmentBuildProfileName,
+        true
+      );
+    } else {
+      Log.log('Skipping iOS simulator development build job...');
+    }
+  }
+  if (iosSimulatorDevelopmentBuildProfileName) {
+    Log.log(
+      `Using iOS simulator development build profile: ${iosSimulatorDevelopmentBuildProfileName}`
+    );
+    workflowStarter.template.jobs.ios_simulator_development_build = {
+      name: `Build ${iosSimulatorDevelopmentBuildProfileName} for iOS simulator`,
+      type: 'build',
+      params: {
+        profile: iosSimulatorDevelopmentBuildProfileName,
+        platform: 'ios',
+      },
+    };
+  }
+  // ios_device_development_build
+  let iosDeviceDevelopmentBuildProfileName: string | null = null;
+  for (const profileName of buildProfiles.keys()) {
+    const profile = buildProfiles.get(profileName)?.ios;
+    if (!profile) {
+      continue;
+    }
+    if (
+      isBuildProfileForDevelopment(profile, Platform.IOS) &&
+      !isIosBuildProfileForSimulator(profile)
+    ) {
+      iosDeviceDevelopmentBuildProfileName = profileName;
+      break;
+    }
+  }
+  if (!iosDeviceDevelopmentBuildProfileName) {
+    Log.warn(
+      'This workflow requires an iOS device development build profile in your eas.json, but none were found.'
+    );
+    const add = await confirmAsync({
+      message: 'Do you want to add an iOS device development build profile?',
+      initial: false,
+    });
+    if (add) {
+      let iosDeviceDevelopmentBuildProfileName = 'ios_device_development';
+      while (buildProfiles.has(iosDeviceDevelopmentBuildProfileName)) {
+        iosDeviceDevelopmentBuildProfileName = `${iosDeviceDevelopmentBuildProfileName}_1`;
+      }
+      await addIosDevelopmentBuildProfileToEasJsonAsync(
+        projectDir,
+        iosDeviceDevelopmentBuildProfileName,
+        false
+      );
+    } else {
+      Log.log('Skipping iOS device development build job...');
+    }
+  }
+  if (iosDeviceDevelopmentBuildProfileName) {
+    Log.log(`Using iOS device development build profile: ${iosDeviceDevelopmentBuildProfileName}`);
+    workflowStarter.template.jobs.ios_development_build = {
+      name: `Build ${iosDeviceDevelopmentBuildProfileName} for iOS simulator`,
+      type: 'build',
+      params: {
+        profile: iosDeviceDevelopmentBuildProfileName,
+        platform: 'ios',
+      },
+    };
+    nextSteps.add(nextStepForDeviceBuildProfile(iosDeviceDevelopmentBuildProfileName));
+  }
+  workflowStarter.nextSteps = [...nextSteps];
+  return workflowStarter;
+}
+
+export async function ensureProductionBuildProfileExistsAsync(
+  projectDir: string,
+  workflowStarter: WorkflowStarter
+): Promise<WorkflowStarter> {
+  await addProductionBuildProfileToEasJsonIfNeededAsync(projectDir);
+  workflowStarter.nextSteps = [
+    nextStepForDeviceBuildProfile('production'),
+    nextStepForAppSubmission(),
+  ];
+  return workflowStarter;
+}
+
+export async function customizeTemplateIfNeededAsync(
+  workflowStarter: WorkflowStarter,
+  projectDir: string,
+  expoConfig: ExpoConfig
+): Promise<any> {
+  // Ensure EAS Build is configured
+  switch (workflowStarter.name) {
+    case WorkflowStarterName.BUILD:
+    case WorkflowStarterName.DEPLOY:
+    case WorkflowStarterName.UPDATE:
+      if (!(await hasBuildConfigureBeenRunAsync({ projectDir, expoConfig }))) {
+        throw new Error(
+          'EAS Build is not configured for this project. Please run "eas build:configure" to configure it.'
+        );
+      }
+      break;
+    default:
+      break;
+  }
+  // Ensure EAS Update is configured
+  switch (workflowStarter.name) {
+    case WorkflowStarterName.DEPLOY:
+    case WorkflowStarterName.UPDATE:
+      if (!(await hasUpdateConfigureBeenRunAsync({ projectDir, expoConfig }))) {
+        throw new Error(
+          'EAS Update is not configured for this project. Please run "eas update:configure" to configure it.'
+        );
+      }
+      break;
+    default:
+      break;
+  }
+  // Customize template
+  switch (workflowStarter.name) {
+    case WorkflowStarterName.BUILD:
+      Log.debug('Adding build jobs to template...');
+      return await addBuildJobsToDevelopmentBuildTemplateAsync(projectDir, workflowStarter);
+    case WorkflowStarterName.DEPLOY:
+      return await ensureProductionBuildProfileExistsAsync(projectDir, workflowStarter);
+    default:
+      return workflowStarter;
+  }
+}

packages/eas-cli/src/commandUtils/workflow/fetchLogs.ts

@@ -0,0 +1,15 @@
+import { WorkflowJobResult } from './types';
+
+// This function is in a separate module for testing purposes
+
+export async function fetchRawLogsForJobAsync(job: WorkflowJobResult): Promise<string | null> {
+  const firstLogFileUrl = job.turtleJobRun?.logFileUrls?.[0];
+  if (!firstLogFileUrl) {
+    return null;
+  }
+  const response = await fetch(firstLogFileUrl, {
+    method: 'GET',
+  });
+  const rawLogs = await response.text();
+  return rawLogs;
+}

packages/eas-cli/src/commandUtils/workflow/stateMachine.ts

@@ -0,0 +1,324 @@
+import { Choice } from 'prompts';
+
+import { WorkflowJobResult, WorkflowLogs } from './types';
+import {
+  choiceFromWorkflowJob,
+  choiceFromWorkflowRun,
+  choicesFromWorkflowLogs,
+  processLogsFromJobAsync,
+  processWorkflowRuns,
+} from './utils';
+import { AppQuery } from '../../graphql/queries/AppQuery';
+import { WorkflowJobQuery } from '../../graphql/queries/WorkflowJobQuery';
+import { WorkflowRunQuery } from '../../graphql/queries/WorkflowRunQuery';
+import Log from '../../log';
+import { promptAsync } from '../../prompts';
+import { ExpoGraphqlClient } from '../context/contextUtils/createGraphqlClient';
+
+/*
+ * State machine types and functions for moving between different workflow command states
+ */
+
+export enum WorkflowCommandSelectionStateValue {
+  WORKFLOW_RUN_SELECTION = 'WORKFLOW_RUN_SELECTION',
+  WORKFLOW_JOB_SELECTION = 'WORKFLOW_JOB_SELECTION',
+  WORKFLOW_STEP_SELECTION = 'WORKFLOW_STEP_SELECTION',
+  FINISH = 'FINISH',
+  ERROR = 'ERROR',
+}
+const workflowCommandSelectionAllowedStateTransitions: {
+  [key in WorkflowCommandSelectionStateValue]: WorkflowCommandSelectionStateValue[];
+} = {
+  WORKFLOW_JOB_SELECTION: [
+    WorkflowCommandSelectionStateValue.WORKFLOW_STEP_SELECTION,
+    WorkflowCommandSelectionStateValue.WORKFLOW_RUN_SELECTION,
+    WorkflowCommandSelectionStateValue.ERROR,
+    WorkflowCommandSelectionStateValue.FINISH,
+  ],
+  WORKFLOW_RUN_SELECTION: [
+    WorkflowCommandSelectionStateValue.WORKFLOW_JOB_SELECTION,
+    WorkflowCommandSelectionStateValue.ERROR,
+  ],
+  WORKFLOW_STEP_SELECTION: [
+    WorkflowCommandSelectionStateValue.WORKFLOW_JOB_SELECTION,
+    WorkflowCommandSelectionStateValue.ERROR,
+    WorkflowCommandSelectionStateValue.FINISH,
+  ],
+  ERROR: [WorkflowCommandSelectionStateValue.WORKFLOW_RUN_SELECTION],
+  FINISH: [],
+};
+
+export type WorkflowCommandSelectionState = {
+  graphqlClient: ExpoGraphqlClient;
+  projectId: string;
+  nonInteractive: boolean;
+  allSteps: boolean;
+  state: WorkflowCommandSelectionStateValue;
+  runId?: string;
+  jobId?: string;
+  step?: string;
+  job?: WorkflowJobResult;
+  logs?: WorkflowLogs | null;
+  message?: string;
+};
+
+export type WorkflowCommandSelectionStateParameters = Omit<
+  WorkflowCommandSelectionState,
+  'graphqlClient' | 'projectId' | 'state' | 'nonInteractive' | 'allSteps'
+>;
+
+export type WorkflowCommandSelectionAction = (
+  prevState: WorkflowCommandSelectionState
+) => Promise<WorkflowCommandSelectionState>;
+
+export function moveToNewWorkflowCommandSelectionState(
+  previousState: WorkflowCommandSelectionState,
+  newStateValue: WorkflowCommandSelectionStateValue,
+  parameters: WorkflowCommandSelectionStateParameters
+): WorkflowCommandSelectionState {
+  if (
+    !workflowCommandSelectionAllowedStateTransitions[previousState.state].includes(newStateValue)
+  ) {
+    const errorMessage = `Invalid state transition from ${
+      previousState.state
+    } to ${newStateValue}. Allowed transitions from ${
+      previousState.state
+    }: ${workflowCommandSelectionAllowedStateTransitions[previousState.state].join(', ')}`;
+    throw new Error(errorMessage);
+  }
+  return {
+    ...previousState,
+    state: newStateValue,
+    ...parameters,
+  };
+}
+
+export function moveToWorkflowRunSelectionState(
+  previousState: WorkflowCommandSelectionState,
+  params?: {
+    runId?: string | undefined;
+  }
+): WorkflowCommandSelectionState {
+  return moveToNewWorkflowCommandSelectionState(
+    previousState,
+    WorkflowCommandSelectionStateValue.WORKFLOW_RUN_SELECTION,
+    {
+      runId: params?.runId,
+      jobId: undefined,
+    }
+  );
+}
+
+export function moveToWorkflowJobSelectionState(
+  previousState: WorkflowCommandSelectionState,
+  params: {
+    jobId?: string | undefined;
+    runId?: string | undefined;
+  }
+): WorkflowCommandSelectionState {
+  return moveToNewWorkflowCommandSelectionState(
+    previousState,
+    WorkflowCommandSelectionStateValue.WORKFLOW_JOB_SELECTION,
+    params
+  );
+}
+
+export function moveToWorkflowStepSelectionState(
+  previousState: WorkflowCommandSelectionState,
+  params: {
+    job: WorkflowJobResult;
+  }
+): WorkflowCommandSelectionState {
+  return moveToNewWorkflowCommandSelectionState(
+    previousState,
+    WorkflowCommandSelectionStateValue.WORKFLOW_STEP_SELECTION,
+    params
+  );
+}
+
+export function moveToWorkflowSelectionFinishedState(
+  previousState: WorkflowCommandSelectionState,
+  params: {
+    step: string;
+    logs: WorkflowLogs;
+  }
+): WorkflowCommandSelectionState {
+  return moveToNewWorkflowCommandSelectionState(
+    previousState,
+    WorkflowCommandSelectionStateValue.FINISH,
+    params
+  );
+}
+
+export function moveToWorkflowSelectionErrorState(
+  previousState: WorkflowCommandSelectionState,
+  message: string
+): WorkflowCommandSelectionState {
+  return moveToNewWorkflowCommandSelectionState(
+    previousState,
+    WorkflowCommandSelectionStateValue.ERROR,
+    {
+      message,
+    }
+  );
+}
+
+// eslint-disable-next-line async-protect/async-suffix
+export const workflowRunSelectionAction: WorkflowCommandSelectionAction = async prevState => {
+  const { graphqlClient, projectId, runId, jobId, allSteps } = prevState;
+  Log.debug(
+    `workflowRunSelectionAction: runId = ${runId}, jobId = ${jobId}, allSteps = ${allSteps}`
+  );
+
+  if (runId) {
+    return moveToWorkflowJobSelectionState(prevState, { runId });
+  }
+  const runs = await AppQuery.byIdWorkflowRunsFilteredByStatusAsync(
+    graphqlClient,
+    projectId,
+    undefined,
+    20
+  );
+  if (runs.length === 0) {
+    return moveToWorkflowSelectionErrorState(prevState, 'No workflow runs found');
+  }
+  const processedRuns = processWorkflowRuns(runs);
+  const choices = processedRuns.map(run => choiceFromWorkflowRun(run));
+  const selectedId = (
+    await promptAsync({
+      type: 'select',
+      name: 'selectedRun',
+      message: 'Select a workflow run:',
+      choices,
+    })
+  ).selectedRun;
+  return moveToWorkflowJobSelectionState(prevState, { runId: selectedId });
+};
+
+// eslint-disable-next-line async-protect/async-suffix
+export const workflowJobSelectionAction: WorkflowCommandSelectionAction = async prevState => {
+  const { graphqlClient, runId, jobId, nonInteractive, allSteps } = prevState;
+  Log.debug(
+    `workflowJobSelectionAction: runId = ${runId}, jobId = ${jobId}, allSteps = ${allSteps}`
+  );
+  if (jobId) {
+    let workflowJobResult = undefined;
+    try {
+      workflowJobResult = await WorkflowJobQuery.byIdAsync(graphqlClient, jobId, {
+        useCache: false,
+      });
+      return moveToWorkflowStepSelectionState(prevState, { job: workflowJobResult });
+    } catch {}
+    if (nonInteractive && !workflowJobResult) {
+      return moveToWorkflowSelectionErrorState(
+        prevState,
+        'No workflow job found that matched the provided ID'
+      );
+    } else {
+      // The passed in ID may be a run ID, pass it back to run selection action
+      return moveToWorkflowRunSelectionState(prevState, { runId: jobId });
+    }
+  } else {
+    // No job ID was passed in
+    if (nonInteractive) {
+      return moveToWorkflowSelectionErrorState(
+        prevState,
+        'No workflow job ID provided in non-interactive mode'
+      );
+    } else if (!runId) {
+      // If no jobId or runId, we should go back to run selection
+      return moveToWorkflowRunSelectionState(prevState);
+    }
+    const workflowRunResult = await WorkflowRunQuery.withJobsByIdAsync(graphqlClient, runId, {
+      useCache: false,
+    });
+    if (!workflowRunResult) {
+      return moveToWorkflowSelectionErrorState(
+        prevState,
+        'No workflow run found that matched the provided ID'
+      );
+    }
+    const choices: Choice[] = [
+      ...workflowRunResult.jobs.map((job, i) => choiceFromWorkflowJob(job, i)),
+      {
+        title: 'Go back and select a different workflow run',
+        value: -1,
+      },
+    ];
+    const selectedJobIndex = (
+      await promptAsync({
+        type: 'select',
+        name: 'selectedJob',
+        message: 'Select a job:',
+        choices,
+      })
+    ).selectedJob;
+    if (selectedJobIndex === -1) {
+      return moveToWorkflowRunSelectionState(prevState);
+    }
+    const selectedJob = workflowRunResult.jobs[selectedJobIndex] as WorkflowJobResult;
+    return moveToWorkflowStepSelectionState(prevState, { job: selectedJob });
+  }
+};
+
+// eslint-disable-next-line async-protect/async-suffix
+export const workflowStepSelectionAction: WorkflowCommandSelectionAction = async prevState => {
+  const { job, allSteps } = prevState;
+  Log.debug(`workflowStepSelectionAction: job = ${job?.id}, allSteps = ${allSteps}`);
+  if (!job) {
+    return moveToWorkflowSelectionErrorState(prevState, 'No job found');
+  }
+  const logs = await processLogsFromJobAsync(job);
+  if (!logs) {
+    return moveToWorkflowSelectionErrorState(prevState, 'No logs found');
+  }
+  if (allSteps) {
+    return moveToWorkflowSelectionFinishedState(prevState, { step: '', logs });
+  }
+  const choices: Choice[] = [
+    ...choicesFromWorkflowLogs(logs),
+    {
+      title: 'Go back and select a different workflow job',
+      value: 'go-back',
+    },
+  ];
+  const selectedStep: string =
+    (
+      await promptAsync({
+        type: 'select',
+        name: 'selectedStep',
+        message: 'Select a step:',
+        choices,
+      })
+    ).selectedStep ?? '';
+  if (selectedStep === 'go-back') {
+    return moveToWorkflowJobSelectionState(prevState, {
+      runId: job.workflowRun.id,
+      jobId: undefined,
+    });
+  }
+  return moveToWorkflowSelectionFinishedState(prevState, { step: selectedStep, logs });
+};
+
+export const executeWorkflowSelectionActionsAsync: WorkflowCommandSelectionAction =
+  async prevState => {
+    let currentState = prevState;
+    while (
+      currentState.state !== WorkflowCommandSelectionStateValue.FINISH &&
+      currentState.state !== WorkflowCommandSelectionStateValue.ERROR
+    ) {
+      Log.debug(`${currentState.state}`);
+      switch (currentState.state) {
+        case WorkflowCommandSelectionStateValue.WORKFLOW_JOB_SELECTION:
+          currentState = await workflowJobSelectionAction(currentState);
+          break;
+        case WorkflowCommandSelectionStateValue.WORKFLOW_RUN_SELECTION:
+          currentState = await workflowRunSelectionAction(currentState);
+          break;
+        case WorkflowCommandSelectionStateValue.WORKFLOW_STEP_SELECTION:
+          currentState = await workflowStepSelectionAction(currentState);
+          break;
+      }
+    }
+    return currentState;
+  };

packages/eas-cli/src/commandUtils/workflow/types.ts

@@ -0,0 +1,46 @@
+import { WorkflowJobByIdQuery, WorkflowRunByIdWithJobsQuery } from '../../graphql/generated';
+
+/*
+ * Utility types for workflow commands
+ */
+
+export enum WorkflowTriggerType {
+  MANUAL = 'Manual',
+  GITHUB = 'GitHub',
+  SCHEDULED = 'Scheduled',
+  OTHER = 'Other',
+}
+
+export type WorkflowRunResult = {
+  id: string;
+  status: string;
+  gitCommitMessage: string | null;
+  gitCommitHash: string | null;
+  triggerType: WorkflowTriggerType;
+  trigger: string | null;
+  startedAt: string;
+  finishedAt: string;
+  workflowId: string;
+  workflowName: string | null;
+  workflowFileName: string;
+};
+
+export type WorkflowResult = {
+  id: string;
+  name?: string | null | undefined;
+  fileName: string;
+  createdAt: string;
+  updatedAt: string;
+};
+
+export type WorkflowJobResult =
+  | WorkflowRunByIdWithJobsQuery['workflowRuns']['byId']['jobs'][number]
+  | WorkflowJobByIdQuery['workflowJobs']['byId'];
+
+export type WorkflowRunWithJobsResult = WorkflowRunResult & {
+  jobs: WorkflowJobResult[];
+  logs?: string;
+};
+
+export type WorkflowLogLine = { time: string; msg: string; result?: string; marker?: string };
+export type WorkflowLogs = Map<string, WorkflowLogLine[]>;

packages/eas-cli/src/commandUtils/workflow/utils.ts

@@ -0,0 +1,128 @@
+import { fetchRawLogsForJobAsync } from './fetchLogs';
+import {
+  WorkflowJobResult,
+  WorkflowLogLine,
+  WorkflowLogs,
+  WorkflowRunResult,
+  WorkflowTriggerType,
+} from './types';
+import {
+  WorkflowRunFragment,
+  WorkflowRunStatus,
+  WorkflowRunTriggerEventType,
+} from '../../graphql/generated';
+import { Choice } from '../../prompts';
+
+export function computeTriggerInfoForWorkflowRun(run: WorkflowRunFragment): {
+  triggerType: WorkflowTriggerType;
+  trigger: string | null;
+} {
+  let triggerType = WorkflowTriggerType.OTHER;
+  let trigger = '';
+  if (run.actor?.__typename === 'Robot') {
+    if (run.actor.firstName?.startsWith('GitHub App · ')) {
+      trigger = `${run.requestedGitRef ?? ''}@${run.gitCommitHash?.substring(0, 12) ?? ''}`;
+    }
+  } else if (run.actor?.__typename === 'User') {
+    trigger = run.actor.username;
+  }
+  switch (run.triggerEventType) {
+    case WorkflowRunTriggerEventType.Manual:
+      triggerType = WorkflowTriggerType.MANUAL;
+      break;
+    case WorkflowRunTriggerEventType.GithubPullRequestLabeled:
+    case WorkflowRunTriggerEventType.GithubPullRequestOpened:
+    case WorkflowRunTriggerEventType.GithubPullRequestReopened:
+    case WorkflowRunTriggerEventType.GithubPullRequestSynchronize:
+    case WorkflowRunTriggerEventType.GithubPush:
+      triggerType = WorkflowTriggerType.GITHUB;
+      break;
+    case WorkflowRunTriggerEventType.Schedule:
+      triggerType = WorkflowTriggerType.SCHEDULED;
+      trigger = run.triggeringSchedule ?? '';
+      break;
+  }
+  return { triggerType, trigger };
+}
+
+export function choiceFromWorkflowRun(run: WorkflowRunResult): Choice {
+  const titleArray = [
+    run.workflowFileName,
+    run.status,
+    run.startedAt,
+    run.triggerType,
+    run.trigger,
+  ];
+  return {
+    title: titleArray.join(' - '),
+    value: run.id,
+    description: `ID: ${run.id}, Message: ${run.gitCommitMessage?.split('\n')[0] ?? ''}`,
+  };
+}
+
+export function choiceFromWorkflowJob(job: WorkflowJobResult, index: number): Choice {
+  return {
+    title: `${job.name} - ${job.status}`,
+    value: index,
+    description: `ID: ${job.id}`,
+  };
+}
+
+export function choicesFromWorkflowLogs(logs: WorkflowLogs): Choice[] {
+  return Array.from(logs.keys()).map(step => {
+    const logLines = logs.get(step);
+    const stepStatus =
+      logLines?.filter((line: WorkflowLogLine) => line.marker === 'end-step')[0]?.result ?? '';
+    return {
+      title: `${step} - ${stepStatus}`,
+      value: step,
+    };
+  });
+}
+
+export function processWorkflowRuns(runs: WorkflowRunFragment[]): WorkflowRunResult[] {
+  return runs.map(run => {
+    const finishedAt = run.status === WorkflowRunStatus.InProgress ? null : run.updatedAt;
+    const { triggerType, trigger } = computeTriggerInfoForWorkflowRun(run);
+    return {
+      id: run.id,
+      status: run.status,
+      gitCommitMessage: run.gitCommitMessage?.split('\n')[0] ?? null,
+      gitCommitHash: run.gitCommitHash ?? null,
+      startedAt: run.createdAt,
+      finishedAt,
+      triggerType,
+      trigger,
+      workflowId: run.workflow.id,
+      workflowName: run.workflow.name ?? null,
+      workflowFileName: run.workflow.fileName,
+    };
+  });
+}
+
+export async function processLogsFromJobAsync(
+  job: WorkflowJobResult
+): Promise<WorkflowLogs | null> {
+  const rawLogs = await fetchRawLogsForJobAsync(job);
+  if (!rawLogs) {
+    return null;
+  }
+  const logs: WorkflowLogs = new Map();
+  const logKeys = new Set<string>();
+  rawLogs.split('\n').forEach(line => {
+    try {
+      const parsedLine = JSON.parse(line);
+      const { result, marker } = parsedLine;
+      const { buildStepDisplayName, buildStepInternalId, time, msg } = parsedLine;
+      const stepId = buildStepDisplayName ?? buildStepInternalId;
+      if (stepId) {
+        if (!logKeys.has(stepId)) {
+          logKeys.add(stepId);
+          logs.set(stepId, []);
+        }
+        logs.get(stepId)?.push({ time, msg, result, marker });
+      }
+    } catch {}
+  });
+  return logs;
+}

packages/eas-cli/src/commandUtils/workflow/validation.ts

@@ -0,0 +1,208 @@
+import { InvalidEasJsonError, MissingEasJsonError } from '@expo/eas-json/build/errors';
+import { CombinedError } from '@urql/core';
+import { promises as fs } from 'fs';
+import path from 'path';
+import * as YAML from 'yaml';
+
+import { buildProfileNamesFromProjectAsync } from './buildProfileUtils';
+import { getExpoApiWorkflowSchemaURL } from '../../api';
+import { WorkflowRevisionMutation } from '../../graphql/mutations/WorkflowRevisionMutation';
+import Log from '../../log';
+import { createValidator, getReadableErrors } from '../../metadata/utils/ajv';
+import { WorkflowFile } from '../../utils/workflowFile';
+import { ExpoGraphqlClient } from '../context/contextUtils/createGraphqlClient';
+
+const jobTypesWithBuildProfile = new Set(['build', 'repack']);
+
+const buildProfileIsInterpolated = (profileName: string): boolean => {
+  return profileName.includes('${{') && profileName.includes('}}');
+};
+
+export async function validateWorkflowFileAsync(
+  workflowFileContents: { yamlConfig: string; filePath: string },
+  projectDir: string,
+  graphqlClient: ExpoGraphqlClient,
+  projectId: string
+): Promise<void> {
+  const parsedYaml = parsedYamlFromWorkflowContents(workflowFileContents);
+  Log.debug(`Parsed workflow: ${JSON.stringify(parsedYaml, null, 2)}`);
+
+  // Check if the parsed result is empty or null
+  Log.debug(`Validating workflow is not empty...`);
+  validateWorkflowIsNotEmpty(parsedYaml);
+
+  const workflowSchema = await fetchWorkflowSchemaAsync();
+
+  // Check that all job types are valid
+  Log.debug(`Validating workflow job types...`);
+  validateWorkflowJobTypes(parsedYaml, workflowSchema);
+
+  // Check for build jobs that do not match any EAS build profiles
+  Log.debug(`Validating workflow build jobs...`);
+  await validateWorkflowBuildJobsAsync(parsedYaml, projectDir);
+
+  // Check that result passes validation against workflow schema
+  Log.debug(`Validating workflow structure...`);
+  validateWorkflowStructure(parsedYaml, workflowSchema);
+
+  // Check for other errors using the server-side validation
+  Log.debug(`Validating workflow on server...`);
+  await validateWorkflowOnServerAsync(graphqlClient, projectId, workflowFileContents);
+}
+
+export function logWorkflowValidationErrors(error: unknown): void {
+  if (error instanceof MissingEasJsonError) {
+    throw new Error(
+      'Workflows require a valid eas.json. Please run "eas build:configure" to create it.'
+    );
+  } else if (error instanceof InvalidEasJsonError) {
+    throw new Error(
+      'Workflows require a valid eas.json. Please fix the errors in your eas.json and try again.\n\n' +
+        error.message
+    );
+  } else if (error instanceof YAML.YAMLParseError) {
+    Log.error(`YAML syntax error: ${error.message}`);
+  } else if (error instanceof CombinedError) {
+    WorkflowFile.maybePrintWorkflowFileValidationErrors({
+      error,
+    });
+
+    throw error;
+  } else if (error instanceof Error) {
+    Log.error(`Error: ${error.message}`);
+  } else {
+    Log.error(`Unexpected error: ${String(error)}`);
+  }
+}
+
+function validateWorkflowIsNotEmpty(parsedYaml: any): void {
+  if (
+    parsedYaml === null ||
+    parsedYaml === undefined ||
+    (typeof parsedYaml === 'object' && Object.keys(parsedYaml).length === 0)
+  ) {
+    throw new Error('YAML file is empty or contains only comments.');
+  }
+}
+
+async function validateWorkflowOnServerAsync(
+  graphqlClient: ExpoGraphqlClient,
+  projectId: string,
+  workflowFileContents: { yamlConfig: string }
+): Promise<void> {
+  await WorkflowRevisionMutation.validateWorkflowYamlConfigAsync(graphqlClient, {
+    appId: projectId,
+    yamlConfig: workflowFileContents.yamlConfig,
+  });
+}
+
+async function validateWorkflowBuildJobsAsync(parsedYaml: any, projectDir: string): Promise<void> {
+  const jobs = jobsFromWorkflow(parsedYaml);
+  const buildJobs = jobs.filter(job => jobTypesWithBuildProfile.has(job.value.type));
+  if (buildJobs.length === 0) {
+    return;
+  }
+  const buildProfileNames = await buildProfileNamesFromProjectAsync(projectDir);
+
+  const invalidBuildJobs = buildJobs.filter(
+    job =>
+      !buildProfileNames.has(job.value.params.profile) &&
+      // If a profile name is interpolated, we can't check if it's valid until the workflow actually runs
+      !buildProfileIsInterpolated(job.value.params.profile)
+  );
+
+  if (invalidBuildJobs.length > 0) {
+    const invalidBuildProfiles = new Set(invalidBuildJobs.map(job => job.value.params.profile));
+    throw new Error(
+      `The build jobs in this workflow refer to the following build profiles that are not present in your eas.json file: ${[
+        ...invalidBuildProfiles,
+      ].join(', ')}`
+    );
+  }
+}
+
+function validateWorkflowJobTypes(parsedYaml: any, workflowJsonSchema: any): void {
+  const jobs = jobsFromWorkflow(parsedYaml);
+  const jobTypes = jobTypesFromWorkflowSchema(workflowJsonSchema);
+  const invalidJobs = jobs.filter(job => job.value.type && !jobTypes.includes(job.value.type));
+  if (invalidJobs.length > 0) {
+    throw new Error(
+      `The following jobs have invalid types: ${invalidJobs
+        .map(job => job.key)
+        .join(', ')}. Valid types are: ${jobTypes.join(', ')}`
+    );
+  }
+}
+
+function validateWorkflowStructure(parsedYaml: any, workflowJsonSchema: any): void {
+  delete workflowJsonSchema['$schema'];
+
+  const ajv = createValidator();
+  const validate = ajv.compile(workflowJsonSchema);
+  const result = validate(parsedYaml);
+
+  if (!result) {
+    Log.debug(
+      JSON.stringify(
+        {
+          errors: validate.errors,
+        },
+        null,
+        2
+      )
+    );
+    const readableErrors = getReadableErrors(validate.errors ?? []);
+    const processedErrors = new Set<string>();
+    for (const err of readableErrors) {
+      if (err.message) {
+        processedErrors.add(err.message);
+      }
+    }
+    throw new Error([...processedErrors].join('\n'));
+  }
+}
+
+export function parsedYamlFromWorkflowContents(workflowFileContents: { yamlConfig: string }): any {
+  const parsedYaml = YAML.parse(workflowFileContents.yamlConfig);
+  return parsedYaml;
+}
+
+export function workflowContentsFromParsedYaml(parsedYaml: any): string {
+  return YAML.stringify(parsedYaml);
+}
+
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+async function fetchWorkflowSchemaAsync(): Promise<any> {
+  // EXPO_TESTING_WORKFLOW_SCHEMA_PATH is used only for testing against a different schema
+  if (process.env.EXPO_TESTING_WORKFLOW_SCHEMA_PATH) {
+    const schemaPath = path.resolve(process.env.EXPO_TESTING_WORKFLOW_SCHEMA_PATH);
+    Log.debug(`Loading workflow schema from ${schemaPath}`);
+    const jsonString = await fs.readFile(schemaPath, 'utf-8');
+    const jsonFromFile = JSON.parse(jsonString);
+    return jsonFromFile.data;
+  }
+  // Otherwise, we fetch from <ApiBaseUrl>/v2/workflows/schema
+  const schemaUrl = getExpoApiWorkflowSchemaURL();
+  Log.debug(`Fetching workflow schema from ${schemaUrl}`);
+  const response = await fetch(schemaUrl);
+  if (!response.ok) {
+    throw new Error(`Unable to fetch EAS Workflow schema, received status: ${response.status}`);
+  }
+  const jsonResponse: any = (await response.json()) as any;
+  return jsonResponse.data;
+}
+
+function jobsFromWorkflow(parsedYaml: any): any[] {
+  return Object.entries(parsedYaml?.jobs).flatMap(([key, value]: [string, any]) => {
+    return {
+      key,
+      value,
+    };
+  });
+}
+
+function jobTypesFromWorkflowSchema(workflowJsonSchema: any): string[] {
+  return workflowJsonSchema?.properties?.jobs?.additionalProperties?.anyOf.map(
+    (props: any) => props.properties.type.const
+  );
+}

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

@@ -1,37 +0,0 @@
-import { WorkflowRunFragment, WorkflowRunStatus } from '../graphql/generated';
-
-export type WorkflowRunResult = {
-  id: string;
-  status: string;
-  gitCommitMessage: string | null;
-  gitCommitHash: string | null;
-  startedAt: string;
-  finishedAt: string;
-  workflowId: string;
-  workflowName: string | null;
-  workflowFileName: string;
-};
-
-export function processWorkflowRuns(runs: WorkflowRunFragment[]): WorkflowRunResult[] {
-  return runs.map(run => {
-    const finishedAt = run.status === WorkflowRunStatus.InProgress ? null : run.updatedAt;
-    return {
-      id: run.id,
-      status: run.status,
-      gitCommitMessage: run.gitCommitMessage?.split('\n')[0] ?? null,
-      gitCommitHash: run.gitCommitHash ?? null,
-      startedAt: run.createdAt,
-      finishedAt,
-      workflowId: run.workflow.id,
-      workflowName: run.workflow.name ?? null,
-      workflowFileName: run.workflow.fileName,
-    };
-  });
-}
-export type WorkflowResult = {
-  id: string;
-  name?: string | null | undefined;
-  fileName: string;
-  createdAt: string;
-  updatedAt: string;
-};

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

@@ -10,10 +10,10 @@ import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
 import { isExpoUpdatesInstalled, isUsingEASUpdate } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import { promptAsync } from '../../prompts';
 import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
 import { ensureEASUpdateIsConfiguredInEasJsonAsync } from '../../update/configure';
 import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
+import { promptPlatformAsync } from '../../utils/prompts';
 
 export default class BuildConfigure extends EasCommand {
   static override description = 'configure the project to support EAS Build';
@@ -113,24 +113,7 @@ export default class BuildConfigure extends EasCommand {
 
 async function promptForPlatformAsync(): Promise<RequestedPlatform> {
   Log.addNewLineIfNone();
-  const { platform } = await promptAsync({
-    type: 'select',
+  return await promptPlatformAsync({
     message: 'Which platforms would you like to configure for EAS Build?',
-    name: 'platform',
-    choices: [
-      {
-        title: 'All',
-        value: RequestedPlatform.All,
-      },
-      {
-        title: 'iOS',
-        value: RequestedPlatform.Ios,
-      },
-      {
-        title: 'Android',
-        value: RequestedPlatform.Android,
-      },
-    ],
   });
-  return platform;
 }

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

@@ -22,7 +22,6 @@ import {
   BuildStatus,
   BuildWorkflow,
   DistributionType,
-  EnvironmentVariableEnvironment,
   IosJobOverridesInput,
   ProjectArchiveSourceType,
   StatuspageServiceName,
@@ -48,7 +47,7 @@ interface BuildResignFlags {
   sourceProfile?: string;
   maybeBuildId?: string;
   wait: boolean;
-  environment?: EnvironmentVariableEnvironment;
+  environment?: string;
 }
 interface RawBuildResignFlags {
   json: boolean;
@@ -60,7 +59,7 @@ interface RawBuildResignFlags {
   'source-profile': string | undefined;
   wait: boolean;
   id: string | undefined;
-  environment: EnvironmentVariableEnvironment | undefined;
+  environment: string | undefined;
 }
 
 export default class BuildResign extends EasCommand {

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

@@ -16,7 +16,6 @@ import { toggleConfirmAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 export default class ChannelDelete extends EasCommand {
-  static override hidden = true;
   static override description = 'Delete a channel';
 
   static override args = [

packages/eas-cli/src/commands/deploy/alias/delete.ts

@@ -0,0 +1,142 @@
+import chalk from 'chalk';
+
+import EasCommand from '../../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { EasNonInteractiveAndJsonFlags } from '../../../commandUtils/flags';
+import Log from '../../../log';
+import { Ora, ora } from '../../../ora';
+import { toggleConfirmAsync } from '../../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../../utils/json';
+import {
+  deleteWorkerDeploymentAliasAsync,
+  selectWorkerDeploymentAliasOnAppAsync,
+} from '../../../worker/deployment';
+
+interface DeployAliasDeleteFlags {
+  nonInteractive: boolean;
+  json: boolean;
+}
+
+export default class WorkerAliasDelete extends EasCommand {
+  static override description = 'Delete deployment aliases.';
+  static override aliases = ['worker:alias:delete'];
+  static override state = 'preview';
+
+  static override args = [{ name: 'ALIAS_NAME' }];
+  static override flags = {
+    ...EasNonInteractiveAndJsonFlags,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.DynamicProjectConfig,
+    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  override async runAsync(): Promise<void> {
+    const {
+      args: { ALIAS_NAME: aliasNameFromArg },
+      flags: rawFlags,
+    } = await this.parse(WorkerAliasDelete);
+    const flags = this.sanitizeFlags(rawFlags);
+
+    if (flags.json) {
+      enableJsonOutput();
+    }
+
+    Log.warn('EAS Hosting is still in preview and subject to changes.');
+
+    const {
+      getDynamicPrivateProjectConfigAsync,
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(WorkerAliasDelete, {
+      nonInteractive: true,
+      withServerSideEnvironment: null,
+    });
+
+    const { projectId } = await getDynamicPrivateProjectConfigAsync();
+    const aliasName = await resolveDeploymentAliasAsync(
+      flags,
+      graphqlClient,
+      projectId,
+      aliasNameFromArg
+    );
+
+    const isProduction = !aliasName;
+
+    if (!flags.nonInteractive) {
+      Log.addNewLineIfNone();
+      Log.warn(
+        isProduction
+          ? `You are about to delete your production alias`
+          : `You are about to delete alias: "${aliasName}"`
+      );
+      Log.newLine();
+      const confirmed = await toggleConfirmAsync({ message: 'Are you sure you wish to proceed?' });
+
+      if (!confirmed) {
+        Log.log('Aborted.');
+        return;
+      }
+    }
+
+    let progress: null | Ora = null;
+    let deleteResult: null | Awaited<ReturnType<typeof deleteWorkerDeploymentAliasAsync>> = null;
+
+    try {
+      progress = ora(chalk`Deleting alias {bold ${aliasName ?? 'production'}}`).start();
+      deleteResult = await deleteWorkerDeploymentAliasAsync({
+        graphqlClient,
+        appId: projectId,
+        aliasName,
+      });
+      progress.text = chalk`Deleted alias {bold ${aliasName ?? 'production'}}`;
+    } catch (error: any) {
+      progress?.fail(chalk`Failed to delete alias {bold ${aliasName ?? 'production'}}`);
+      throw error;
+    }
+
+    progress?.succeed(chalk`Deleted alias {bold ${aliasName ?? 'production'}}`);
+
+    if (flags.json) {
+      printJsonOnlyOutput({
+        aliasName: deleteResult.aliasName,
+        id: deleteResult.id,
+      });
+    }
+  }
+
+  private sanitizeFlags(flags: any): DeployAliasDeleteFlags {
+    return {
+      nonInteractive: flags['non-interactive'],
+      json: flags['json'],
+    };
+  }
+}
+
+async function resolveDeploymentAliasAsync(
+  flags: DeployAliasDeleteFlags,
+  graphqlClient: ExpoGraphqlClient,
+  projectId: string,
+  aliasNameFromArg?: string
+): Promise<string> {
+  if (aliasNameFromArg?.trim()) {
+    return aliasNameFromArg.trim().toLowerCase();
+  }
+
+  if (flags.nonInteractive) {
+    throw new Error('Alias name must be provided in non-interactive mode');
+  }
+
+  const alias = await selectWorkerDeploymentAliasOnAppAsync({
+    graphqlClient,
+    appId: projectId,
+    selectTitle: 'alias to delete',
+  });
+
+  if (!alias) {
+    throw new Error('No aliases found for this project, create aliases with "eas deploy:alias"');
+  }
+
+  return alias.aliasName;
+}

packages/eas-cli/src/commands/deploy/alias/index.ts

@@ -1,20 +1,23 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { WorkerDeploymentAliasFragment } from '../../graphql/generated';
-import Log from '../../log';
-import { Ora, ora } from '../../ora';
-import { promptAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import EasCommand from '../../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { EasNonInteractiveAndJsonFlags } from '../../../commandUtils/flags';
+import { WorkerDeploymentAliasFragment } from '../../../graphql/generated';
+import Log from '../../../log';
+import { Ora, ora } from '../../../ora';
+import { promptAsync } from '../../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../../utils/json';
 import {
   assignWorkerDeploymentAliasAsync,
   assignWorkerDeploymentProductionAsync,
   selectWorkerDeploymentOnAppAsync,
-} from '../../worker/deployment';
-import { formatWorkerDeploymentJson, formatWorkerDeploymentTable } from '../../worker/utils/logs';
+} from '../../../worker/deployment';
+import {
+  formatWorkerDeploymentJson,
+  formatWorkerDeploymentTable,
+} from '../../../worker/utils/logs';
 
 interface DeployAliasFlags {
   nonInteractive: boolean;

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

@@ -0,0 +1,114 @@
+import chalk from 'chalk';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import Log from '../../log';
+import { Ora, ora } from '../../ora';
+import { toggleConfirmAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { deleteWorkerDeploymentAsync } from '../../worker/deployment';
+
+interface DeployDeleteFlags {
+  nonInteractive: boolean;
+  json: boolean;
+}
+
+interface RawDeployDeleteFlags {
+  'non-interactive': boolean;
+  json: boolean;
+}
+
+export default class WorkerDelete extends EasCommand {
+  static override description = 'Delete a deployment.';
+  static override aliases = ['worker:delete'];
+  static override state = 'preview';
+
+  static override args = [{ name: 'DEPLOYMENT_ID' }];
+  static override flags = {
+    ...EasNonInteractiveAndJsonFlags,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.DynamicProjectConfig,
+    ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  override async runAsync(): Promise<void> {
+    const {
+      args: { DEPLOYMENT_ID: deploymentIdFromArg },
+      flags: rawFlags,
+    } = await this.parse(WorkerDelete);
+    const flags = this.sanitizeFlags(rawFlags);
+
+    if (flags.json) {
+      enableJsonOutput();
+    }
+
+    Log.warn('EAS Hosting is still in preview and subject to changes.');
+
+    const {
+      getDynamicPrivateProjectConfigAsync,
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(WorkerDelete, {
+      nonInteractive: true,
+      withServerSideEnvironment: null,
+    });
+
+    const { projectId } = await getDynamicPrivateProjectConfigAsync();
+
+    if (!deploymentIdFromArg) {
+      if (flags.nonInteractive) {
+        throw new Error('Deployment ID must be provided in non-interactive mode');
+      }
+      throw new Error('Deployment ID is required');
+    }
+
+    if (!flags.nonInteractive) {
+      Log.addNewLineIfNone();
+      Log.warn(
+        `You are about to permanently delete deployment with ID: "${deploymentIdFromArg}"` +
+          `\nThis action is irreversible.`
+      );
+      Log.newLine();
+      const confirmed = await toggleConfirmAsync({ message: 'Are you sure you wish to proceed?' });
+
+      if (!confirmed) {
+        Log.log('Aborted.');
+        return;
+      }
+    }
+
+    let progress: Ora | null = null;
+    let deleteResult: null | Awaited<ReturnType<typeof deleteWorkerDeploymentAsync>> = null;
+
+    try {
+      progress = ora(chalk`Deleting deployment {bold ${deploymentIdFromArg}}`).start();
+      deleteResult = await deleteWorkerDeploymentAsync({
+        graphqlClient,
+        appId: projectId,
+        deploymentIdentifier: deploymentIdFromArg,
+      });
+      progress.text = chalk`Deleted deployment {bold ${deploymentIdFromArg}}`;
+    } catch (error: any) {
+      progress?.fail(chalk`Failed to delete deployment {bold ${deploymentIdFromArg}}`);
+      throw error;
+    }
+
+    progress?.succeed(chalk`Deleted deployment {bold ${deploymentIdFromArg}}`);
+
+    if (flags.json) {
+      printJsonOnlyOutput({
+        deploymentId: deleteResult.deploymentIdentifier,
+        id: deleteResult.id,
+      });
+    }
+  }
+
+  private sanitizeFlags(flags: RawDeployDeleteFlags): DeployDeleteFlags {
+    return {
+      nonInteractive: flags['non-interactive'],
+      json: flags['json'],
+    };
+  }
+}

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

@@ -8,12 +8,10 @@ import * as path from 'node:path';
 import { getHostingDeploymentsUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASEnvironmentFlag, EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { EnvironmentVariableEnvironment } from '../../graphql/generated';
 import Log, { link } from '../../log';
 import { ora } from '../../ora';
 import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { createProgressTracker } from '../../utils/progress';
 import * as WorkerAssets from '../../worker/assets';
 import {
   assignWorkerDeploymentAliasAsync,
@@ -21,9 +19,10 @@ import {
   getSignedDeploymentUrlAsync,
 } from '../../worker/deployment';
 import {
-  UploadParams,
+  UploadPayload,
   batchUploadAsync,
   callUploadApiAsync,
+  createProgressBar,
   uploadAsync,
 } from '../../worker/upload';
 import {
@@ -32,6 +31,8 @@ import {
   getDeploymentUrlFromFullName,
 } from '../../worker/utils/logs';
 
+const MAX_UPLOAD_SIZE = 5e8; // 500MB
+
 const isDirectory = (directoryPath: string): Promise<boolean> =>
   fs.promises
     .stat(directoryPath)
@@ -43,7 +44,7 @@ interface DeployFlags {
   json: boolean;
   isProduction: boolean;
   aliasName?: string;
-  environment?: EnvironmentVariableEnvironment;
+  environment?: string;
   deploymentIdentifier?: string;
   exportDir: string;
   dryRun: boolean;
@@ -51,7 +52,7 @@ interface DeployFlags {
 
 interface RawDeployFlags {
   'non-interactive': boolean;
-  environment?: EnvironmentVariableEnvironment;
+  environment?: string;
   json: boolean;
   prod: boolean;
   alias?: string;
@@ -60,11 +61,16 @@ interface RawDeployFlags {
   'dry-run': boolean;
 }
 
+interface UploadAssetBatchInstruction {
+  sha512: string[];
+}
+
 interface DeployInProgressParams {
   id: string;
   fullName: string;
   baseURL: string;
   token: string;
+  upload?: UploadAssetBatchInstruction[];
 }
 
 export default class WorkerDeploy extends EasCommand {
@@ -131,6 +137,7 @@ export default class WorkerDeploy extends EasCommand {
     logExportedProjectInfo(projectDist);
 
     async function* emitWorkerTarballAsync(params: {
+      routesConfig: WorkerAssets.RoutesConfigEntry | null;
       assetMap: WorkerAssets.AssetMap;
       manifest: WorkerAssets.Manifest;
     }): AsyncGenerator<WorkerAssets.FileEntry> {
@@ -141,6 +148,8 @@ export default class WorkerDeploy extends EasCommand {
         for await (const workerFile of workerFiles) {
           yield [`server/${workerFile.normalizedPath}`, workerFile.data];
         }
+      } else if (projectDist.type === 'static' && params.routesConfig) {
+        yield ['routes.json', JSON.stringify(params.routesConfig)];
       }
     }
 
@@ -162,14 +171,14 @@ export default class WorkerDeploy extends EasCommand {
       tarPath: string,
       uploadUrl: string
     ): Promise<DeployInProgressParams> {
-      const { response } = await uploadAsync({
-        url: uploadUrl,
-        filePath: tarPath,
-        compress: false,
-        headers: {
-          accept: 'application/json',
+      const payload = { filePath: tarPath };
+      const { response } = await uploadAsync(
+        {
+          baseURL: uploadUrl,
+          method: 'POST',
         },
-      });
+        payload
+      );
       if (response.status === 413) {
         throw new Error(
           'Upload failed! (Payload too large)\n' +
@@ -185,73 +194,79 @@ export default class WorkerDeploy extends EasCommand {
         if (!json.success || !json.result || typeof json.result !== 'object') {
           throw new Error(json.message ? `Upload failed: ${json.message}` : 'Upload failed!');
         }
-        const { id, fullName, token } = json.result;
+        const { id, fullName, token, upload } = json.result;
         if (typeof token !== 'string') {
           throw new Error('Upload failed: API failed to return a deployment token');
         } else if (typeof id !== 'string') {
           throw new Error('Upload failed: API failed to return a deployment identifier');
         } else if (typeof fullName !== 'string') {
           throw new Error('Upload failed: API failed to return a script name');
+        } else if (!Array.isArray(upload) && upload !== undefined) {
+          throw new Error('Upload failed: API returned invalid asset upload instructions');
         }
         const baseURL = new URL('/', uploadUrl).toString();
-        return { id, fullName, baseURL, token };
+        return { id, fullName, baseURL, token, upload };
       }
     }
 
     async function uploadAssetsAsync(
-      assetMap: WorkerAssets.AssetMap,
+      assetFiles: WorkerAssets.AssetFileEntry[],
       deployParams: DeployInProgressParams
     ): Promise<void> {
-      const uploadParams: UploadParams[] = [];
-      const assetPath = projectDist.type === 'server' ? projectDist.clientPath : projectDist.path;
-      if (!assetPath) {
-        return;
+      const baseURL = new URL('/asset/', deployParams.baseURL);
+      const uploadInit = { baseURL, method: 'POST' };
+      uploadInit.baseURL.searchParams.set('token', deployParams.token);
+
+      const uploadPayloads: UploadPayload[] = [];
+      if (deployParams.upload) {
+        const assetsBySHA512 = assetFiles.reduce((map, asset) => {
+          map.set(asset.sha512, asset);
+          return map;
+        }, new Map<string, WorkerAssets.AssetFileEntry>());
+        const payloads = deployParams.upload
+          .map(instruction =>
+            instruction.sha512.map(sha512 => {
+              const asset = assetsBySHA512.get(sha512);
+              if (!asset) {
+                // NOTE(@kitten): This should never happen
+                throw new Error(
+                  `Uploading assets failed: API instructed us to upload an asset that does not exist`
+                );
+              }
+              return asset;
+            })
+          )
+          .filter(assets => assets && assets.length > 0)
+          .map(assets => (assets.length > 1 ? { multipart: assets } : { asset: assets[0] }));
+        uploadPayloads.push(...payloads);
+      } else {
+        // NOTE(@kitten): Legacy format which uploads assets one-by-one
+        uploadPayloads.push(...assetFiles.map(asset => ({ asset })));
       }
 
-      for await (const asset of WorkerAssets.listAssetMapFilesAsync(assetPath, assetMap)) {
-        const uploadURL = new URL(`/asset/${asset.sha512}`, deployParams.baseURL);
-        uploadURL.searchParams.set('token', deployParams.token);
-        uploadParams.push({ url: uploadURL.toString(), filePath: asset.path });
-      }
-
-      const progress = {
-        total: uploadParams.length,
-        pending: 0,
-        percent: 0,
-        transferred: 0,
-      };
-
-      const updateProgress = createProgressTracker({
-        total: progress.total,
-        message(ratio) {
-          const percent = `${Math.floor(ratio * 100)}`;
-          const details = chalk.dim(
-            `(${progress.pending} Pending, ${progress.transferred} Completed, ${progress.total} Total)`
-          );
-          return `Uploading assets: ${percent.padStart(3)}% ${details}`;
-        },
-        completedMessage: 'Uploaded assets',
-      });
-
+      const progressTotal = uploadPayloads.reduce(
+        (acc, payload) => acc + ('multipart' in payload ? payload.multipart.length : 1),
+        0
+      );
+      const progressTracker = createProgressBar(`Uploading ${progressTotal} assets`);
       try {
-        for await (const signal of batchUploadAsync(uploadParams)) {
-          if ('response' in signal) {
-            progress.pending--;
-            progress.percent = ++progress.transferred / progress.total;
-          } else {
-            progress.pending++;
-          }
-          updateProgress({ progress });
+        for await (const signal of batchUploadAsync(
+          uploadInit,
+          uploadPayloads,
+          progressTracker.update
+        )) {
+          progressTracker.update(signal.progress);
         }
       } catch (error: any) {
-        updateProgress({ isComplete: true, error });
+        progressTracker.stop();
         throw error;
+      } finally {
+        progressTracker.stop();
       }
-      updateProgress({ isComplete: true });
     }
 
-    let assetMap: WorkerAssets.AssetMap;
     let tarPath: string;
+    let assetFiles: WorkerAssets.AssetFileEntry[];
     let deployResult: DeployInProgressParams;
     let progress = ora('Preparing project').start();
 
@@ -271,12 +286,14 @@ export default class WorkerDeploy extends EasCommand {
             manifestResult.conflictingVariableNames.join(' ')
         );
       }
-      assetMap = await WorkerAssets.createAssetMapAsync(
-        projectDist.type === 'server' ? projectDist.clientPath : projectDist.path
-      );
+      const assetPath = projectDist.type === 'server' ? projectDist.clientPath : projectDist.path;
+      assetFiles = await WorkerAssets.collectAssetsAsync(assetPath, {
+        maxFileSize: MAX_UPLOAD_SIZE,
+      });
       tarPath = await WorkerAssets.packFilesIterableAsync(
         emitWorkerTarballAsync({
-          assetMap,
+          routesConfig: await WorkerAssets.getRoutesConfigAsync(assetPath),
+          assetMap: WorkerAssets.assetsToAssetsMap(assetFiles),
           manifest: manifestResult.manifest,
         })
       );
@@ -334,7 +351,7 @@ export default class WorkerDeploy extends EasCommand {
       throw error;
     }
 
-    await uploadAssetsAsync(assetMap, deployResult);
+    await uploadAssetsAsync(assetFiles, deployResult);
     await finalizeDeployAsync(deployResult);
 
     let deploymentAlias: null | Awaited<ReturnType<typeof assignWorkerDeploymentAliasAsync>> = null;

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

@@ -1,11 +1,11 @@
 import { Config } from '@oclif/core';
 
 import { getMockAppFragment } from '../../../__tests__/commands/utils';
+import { DefaultEnvironment } from '../../../build/utils/environment';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { testProjectId } from '../../../credentials/__tests__/fixtures-constants';
 import {
   EnvironmentSecretType,
-  EnvironmentVariableEnvironment,
   EnvironmentVariableScope,
   EnvironmentVariableVisibility,
 } from '../../../graphql/generated';
@@ -47,6 +47,7 @@ describe(EnvCreate, () => {
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
         scope: EnvironmentVariableScope.Project,
+        type: EnvironmentSecretType.String,
       }));
     jest
       .mocked(EnvironmentVariableMutation.createSharedVariableAsync)
@@ -56,6 +57,7 @@ describe(EnvCreate, () => {
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
         scope: EnvironmentVariableScope.Shared,
+        type: EnvironmentSecretType.String,
       }));
     jest
       .mocked(EnvironmentVariableMutation.updateAsync)
@@ -101,7 +103,7 @@ describe(EnvCreate, () => {
         {
           name: 'VarName',
           value: 'VarValue',
-          environments: [EnvironmentVariableEnvironment.Production],
+          environments: [DefaultEnvironment.Production],
           visibility: EnvironmentVariableVisibility.Secret,
           type: EnvironmentSecretType.String,
         },
@@ -138,7 +140,7 @@ describe(EnvCreate, () => {
         .mockImplementation(async () => [
           {
             id: otherVariableId,
-            environments: [EnvironmentVariableEnvironment.Production],
+            environments: [DefaultEnvironment.Production],
             scope: EnvironmentVariableScope.Project,
           },
         ]);
@@ -166,7 +168,7 @@ describe(EnvCreate, () => {
         id: otherVariableId,
         name: 'VarName',
         value: 'VarValue',
-        environments: [EnvironmentVariableEnvironment.Production],
+        environments: [DefaultEnvironment.Production],
         visibility: EnvironmentVariableVisibility.Secret,
       });
     });
@@ -199,8 +201,7 @@ describe(EnvCreate, () => {
         {
           name: 'VarName',
           value: 'VarValue',
-          isGlobal: true,
-          environments: [EnvironmentVariableEnvironment.Production],
+          environments: [DefaultEnvironment.Production],
           visibility: EnvironmentVariableVisibility.Public,
           type: EnvironmentSecretType.String,
         },
@@ -235,7 +236,7 @@ describe(EnvCreate, () => {
         .mockImplementation(async () => [
           {
             id: 'otherId',
-            environments: [EnvironmentVariableEnvironment.Production],
+            environments: [DefaultEnvironment.Production],
             scope: EnvironmentVariableScope.Shared,
           },
         ]);
@@ -273,7 +274,7 @@ describe(EnvCreate, () => {
         .mockImplementation(async () => [
           {
             id: otherVariableId,
-            environments: [EnvironmentVariableEnvironment.Production],
+            environments: [DefaultEnvironment.Production],
             scope: EnvironmentVariableScope.Shared,
           },
         ]);
@@ -284,12 +285,12 @@ describe(EnvCreate, () => {
         id: otherVariableId,
         name: 'VarName',
         value: 'VarValue',
-        environments: [EnvironmentVariableEnvironment.Production],
+        environments: [DefaultEnvironment.Production],
         visibility: EnvironmentVariableVisibility.Public,
       });
     });
 
-    it('creates an account-wide variable and links it', async () => {
+    it('creates an account-wide variable', async () => {
       const command = new EnvCreate(
         [
           '--name',
@@ -302,7 +303,6 @@ describe(EnvCreate, () => {
           'development',
           '--scope',
           'account',
-          '--link',
         ],
         mockConfig
       );
@@ -320,28 +320,12 @@ describe(EnvCreate, () => {
         {
           name: 'VarName',
           value: 'VarValue',
-          environments: [
-            EnvironmentVariableEnvironment.Production,
-            EnvironmentVariableEnvironment.Development,
-          ],
+          environments: [DefaultEnvironment.Production, DefaultEnvironment.Development],
           visibility: EnvironmentVariableVisibility.Public,
-          isGlobal: true,
           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 () => {
@@ -356,7 +340,7 @@ describe(EnvCreate, () => {
       jest
         .mocked(promptVariableEnvironmentAsync)
         // @ts-expect-error
-        .mockImplementation(async () => [EnvironmentVariableEnvironment.Production]);
+        .mockImplementation(async () => [DefaultEnvironment.Production]);
 
       // @ts-expect-error
       jest.spyOn(command, 'getContextAsync').mockReturnValue({
@@ -374,7 +358,7 @@ describe(EnvCreate, () => {
         {
           name: 'VarName',
           value: 'VarValue',
-          environments: [EnvironmentVariableEnvironment.Production],
+          environments: [DefaultEnvironment.Production],
           visibility: EnvironmentVariableVisibility.Public,
           type: EnvironmentSecretType.String,
         },
@@ -382,4 +366,42 @@ describe(EnvCreate, () => {
       );
     });
   });
+
+  it('accepts development environment when using positional argument', async () => {
+    const command = new EnvCreate(
+      [
+        'development',
+        '--name',
+        'TEST_VAR',
+        '--value',
+        'test-value',
+        '--visibility',
+        'plaintext',
+        '--scope',
+        'project',
+        '--non-interactive',
+      ],
+      mockConfig
+    );
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      projectId: testProjectId,
+    });
+
+    await command.runAsync();
+
+    expect(EnvironmentVariableMutation.createForAppAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      {
+        name: 'TEST_VAR',
+        value: 'test-value',
+        environments: [DefaultEnvironment.Development],
+        visibility: EnvironmentVariableVisibility.Public,
+        type: EnvironmentSecretType.String,
+      },
+      testProjectId
+    );
+  });
 });

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

@@ -1,8 +1,10 @@
 import { Config } from '@oclif/core';
 
+import { DefaultEnvironment } from '../../../build/utils/environment';
 import {
-  EnvironmentVariableEnvironment,
+  EnvironmentSecretType,
   EnvironmentVariableScope,
+  EnvironmentVariableVisibility,
 } from '../../../graphql/generated';
 import { EnvironmentVariableMutation } from '../../../graphql/mutations/EnvironmentVariableMutation';
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
@@ -35,7 +37,7 @@ describe(EnvDelete, () => {
         id: variableId,
         name: 'TEST_VARIABLE',
         scope: EnvironmentVariableScope.Project,
-        environments: [EnvironmentVariableEnvironment.Production],
+        environments: [DefaultEnvironment.Production],
       },
     ];
     (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
@@ -121,4 +123,40 @@ describe(EnvDelete, () => {
 
     expect(EnvironmentVariableMutation.deleteAsync).not.toHaveBeenCalled();
   });
+
+  it('accepts development environment when using positional argument', async () => {
+    const mockVariable = {
+      id: 'var1',
+      name: 'TEST_VAR_1',
+      value: 'value1',
+      environments: [DefaultEnvironment.Development],
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      scope: EnvironmentVariableScope.Project,
+      visibility: EnvironmentVariableVisibility.Public,
+      type: EnvironmentSecretType.String,
+    };
+
+    jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValueOnce([mockVariable]);
+    jest.mocked(EnvironmentVariableMutation.deleteAsync).mockResolvedValueOnce({ id: 'var1' });
+    jest.spyOn(Log, 'log').mockImplementation(() => {});
+
+    const command = new EnvDelete(
+      ['development', '--variable-name', 'TEST_VAR_1', '--scope', 'project', '--non-interactive'],
+      mockConfig
+    );
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      projectId,
+    });
+
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.byAppIdAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: projectId,
+      environment: DefaultEnvironment.Development,
+    });
+  });
 });

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

@@ -0,0 +1,85 @@
+import { Config } from '@oclif/core';
+
+import { DefaultEnvironment } from '../../../build/utils/environment';
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { testProjectId } from '../../../credentials/__tests__/fixtures-constants';
+import {
+  EnvironmentSecretType,
+  EnvironmentVariableScope,
+  EnvironmentVariableVisibility,
+} from '../../../graphql/generated';
+import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
+import Log from '../../../log';
+import EnvExec from '../exec';
+
+jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
+jest.mock('../../../log');
+
+describe(EnvExec, () => {
+  const graphqlClient = {} as any as ExpoGraphqlClient;
+  const mockConfig = {} as unknown as Config;
+
+  const mockEnvironmentVariables = [
+    {
+      id: 'var1',
+      name: 'EXPO_PUBLIC_API_URL',
+      value: 'https://api.example.com',
+      environments: [DefaultEnvironment.Development],
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      scope: EnvironmentVariableScope.Project,
+      visibility: EnvironmentVariableVisibility.Public,
+      type: EnvironmentSecretType.String,
+    },
+  ];
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.spyOn(Log, 'log').mockImplementation(() => {});
+
+    // Mock GraphQL query
+    jest
+      .mocked(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync)
+      .mockResolvedValue(mockEnvironmentVariables);
+  });
+
+  it('accepts development environment when using positional argument', async () => {
+    const command = new EnvExec(['development', 'echo $EXPO_PUBLIC_API_URL'], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      projectId: testProjectId,
+    });
+
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      {
+        appId: testProjectId,
+        environment: DefaultEnvironment.Development,
+      }
+    );
+  });
+
+  it('accepts custom environment when using positional argument', async () => {
+    const command = new EnvExec(['custom-environment', 'echo $EXPO_PUBLIC_API_URL'], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      projectId: testProjectId,
+    });
+
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      {
+        appId: testProjectId,
+        environment: 'custom-environment',
+      }
+    );
+  });
+});

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

@@ -1,10 +1,10 @@
 import { Config } from '@oclif/core';
 
+import { DefaultEnvironment } from '../../../build/utils/environment';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { testProjectId } from '../../../credentials/__tests__/fixtures-constants';
 import {
   EnvironmentSecretType,
-  EnvironmentVariableEnvironment,
   EnvironmentVariableFragment,
   EnvironmentVariableScope,
   EnvironmentVariableVisibility,
@@ -27,7 +27,7 @@ describe(EnvGet, () => {
       id: 'var1',
       name: 'TEST_VAR_1',
       value: 'value1',
-      environments: [EnvironmentVariableEnvironment.Production],
+      environments: [DefaultEnvironment.Production],
       createdAt: new Date().toISOString(),
       updatedAt: new Date().toISOString(),
       scope: EnvironmentVariableScope.Project,
@@ -82,7 +82,7 @@ describe(EnvGet, () => {
   it('prompts for variable name and environment if the name is ambigous', async () => {
     jest
       .mocked(promptVariableEnvironmentAsync)
-      .mockResolvedValueOnce(EnvironmentVariableEnvironment.Production);
+      .mockResolvedValueOnce(DefaultEnvironment.Production);
     jest.mocked(promptVariableNameAsync).mockResolvedValueOnce('TEST_VAR_1');
 
     const command = new EnvGet([], mockConfig);
@@ -98,7 +98,7 @@ describe(EnvGet, () => {
         id: 'var2',
         name: 'TEST_VAR_1',
         value: 'value1',
-        environments: [EnvironmentVariableEnvironment.Development],
+        environments: [DefaultEnvironment.Development],
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),
         scope: EnvironmentVariableScope.Project,
@@ -111,4 +111,34 @@ describe(EnvGet, () => {
     expect(promptVariableEnvironmentAsync).toHaveBeenCalled();
     expect(promptVariableNameAsync).toHaveBeenCalled();
   });
+
+  it('accepts development environment when using positional argument', async () => {
+    jest
+      .mocked(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync)
+      .mockResolvedValueOnce(mockVariables);
+    jest.spyOn(Log, 'log').mockImplementation(() => {});
+
+    const command = new EnvGet(
+      ['development', '--variable-name', 'TEST_VAR_1', '--scope', 'project'],
+      mockConfig
+    );
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      projectId: testProjectId,
+    });
+
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      {
+        appId: testProjectId,
+        environment: DefaultEnvironment.Development,
+        filterNames: ['TEST_VAR_1'],
+        includeFileContent: true,
+      }
+    );
+  });
 });

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

@@ -1,271 +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 EnvLink from '../link';
-
-jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
-jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
-jest.mock('../../../prompts');
-jest.mock('../../../graphql/queries/AppQuery');
-jest.mock('../../../log');
-
-describe(EnvLink, () => {
-  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 an account-wide 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 EnvLink(
-      ['--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 an account-wide 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 EnvLink(
-      ['--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 EnvLink(
-      [
-        '--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 EnvLink([], 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 EnvLink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
-
-    // @ts-expect-error
-    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
-    await expect(command.runAsync()).rejects.toThrow(
-      "Account-wide 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 EnvLink([], 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 EnvLink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
-
-    // @ts-expect-error
-    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
-    await expect(command.runAsync()).rejects.toThrow(
-      "Account-wide variable NON_EXISTENT_VARIABLE doesn't exist"
-    );
-  });
-});

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

@@ -1,11 +1,11 @@
 import { Config } from '@oclif/core';
 
 import { getMockAppFragment } from '../../../__tests__/commands/utils';
+import { DefaultEnvironment } from '../../../build/utils/environment';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { testProjectId } from '../../../credentials/__tests__/fixtures-constants';
 import {
   EnvironmentSecretType,
-  EnvironmentVariableEnvironment,
   EnvironmentVariableFragment,
   EnvironmentVariableScope,
   EnvironmentVariableVisibility,
@@ -13,10 +13,12 @@ import {
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../../log';
+import { promptVariableEnvironmentAsync } from '../../../utils/prompts';
 import EnvList from '../list';
 
 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../graphql/queries/AppQuery');
+jest.mock('../../../utils/prompts');
 jest.mock('../../../log');
 
 const mockVariables: EnvironmentVariableFragment[] = [
@@ -24,7 +26,7 @@ const mockVariables: EnvironmentVariableFragment[] = [
     id: 'var1',
     name: 'TEST_VAR_1',
     value: 'value1',
-    environments: [EnvironmentVariableEnvironment.Production],
+    environments: [DefaultEnvironment.Production],
     scope: EnvironmentVariableScope.Project,
     visibility: EnvironmentVariableVisibility.Public,
     createdAt: undefined,
@@ -35,7 +37,7 @@ const mockVariables: EnvironmentVariableFragment[] = [
     id: 'var2',
     name: 'TEST_VAR_2',
     value: 'value2',
-    environments: [EnvironmentVariableEnvironment.Development],
+    environments: [DefaultEnvironment.Development],
     scope: EnvironmentVariableScope.Project,
     visibility: EnvironmentVariableVisibility.Public,
     createdAt: undefined,
@@ -51,27 +53,19 @@ describe(EnvList, () => {
   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 EnvList([], 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'));
+    (jest.mocked(promptVariableEnvironmentAsync) as jest.MockedFunction<any>).mockImplementation(
+      async (args: any) => {
+        if (args.nonInteractive) {
+          throw new Error(
+            'The `--environment` flag must be set when running in `--non-interactive` mode.'
+          );
+        }
+        if (args.multiple) {
+          return [DefaultEnvironment.Production];
+        }
+        return DefaultEnvironment.Production;
+      }
+    );
   });
 
   it('lists project environment variables in specified environments', async () => {
@@ -88,13 +82,33 @@ describe(EnvList, () => {
 
     expect(EnvironmentVariablesQuery.byAppIdAsync).toHaveBeenCalledWith(graphqlClient, {
       appId: testProjectId,
-      environment: EnvironmentVariableEnvironment.Production,
+      environment: DefaultEnvironment.Production,
       includeFileContent: false,
     });
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
   });
 
+  it('accepts development environment when using positional argument', async () => {
+    jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValueOnce(mockVariables);
+
+    const command = new EnvList(['development'], mockConfig); // Using positional argument
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      projectId: testProjectId,
+    });
+
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.byAppIdAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: testProjectId,
+      environment: DefaultEnvironment.Development,
+      includeFileContent: false,
+    });
+  });
+
   it('lists project environment variables including sensitive values', async () => {
     jest
       .mocked(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync)
@@ -113,7 +127,7 @@ describe(EnvList, () => {
       graphqlClient,
       {
         appId: testProjectId,
-        environment: undefined,
+        environment: DefaultEnvironment.Production,
         includeFileContent: false,
       }
     );
@@ -135,7 +149,7 @@ describe(EnvList, () => {
 
     expect(EnvironmentVariablesQuery.sharedAsync).toHaveBeenCalledWith(graphqlClient, {
       appId: testProjectId,
-      environment: undefined,
+      environment: DefaultEnvironment.Production,
       includeFileContent: false,
     });
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));
@@ -158,7 +172,7 @@ describe(EnvList, () => {
 
     expect(EnvironmentVariablesQuery.sharedWithSensitiveAsync).toHaveBeenCalledWith(graphqlClient, {
       appId: testProjectId,
-      environment: undefined,
+      environment: DefaultEnvironment.Production,
       includeFileContent: false,
     });
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_1'));

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

@@ -0,0 +1,388 @@
+import { Config } from '@oclif/core';
+import * as fs from 'fs-extra';
+import path from 'path';
+
+import { DefaultEnvironment } from '../../../build/utils/environment';
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { testProjectId } from '../../../credentials/__tests__/fixtures-constants';
+import {
+  EnvironmentSecretType,
+  EnvironmentVariableScope,
+  EnvironmentVariableVisibility,
+} from '../../../graphql/generated';
+import {
+  EnvironmentVariableWithFileContent,
+  EnvironmentVariablesQuery,
+} from '../../../graphql/queries/EnvironmentVariablesQuery';
+import Log from '../../../log';
+import { confirmAsync } from '../../../prompts';
+import EnvPull from '../pull';
+
+jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
+jest.mock('../../../prompts');
+jest.mock('fs-extra');
+jest.mock('../../../log');
+
+describe(EnvPull, () => {
+  const graphqlClient = {} as any as ExpoGraphqlClient;
+  const mockConfig = {} as unknown as Config;
+  const testProjectDir = '/test/project';
+  const testTargetPath = '.env.local';
+
+  const mockEnvironmentVariables: EnvironmentVariableWithFileContent[] = [
+    {
+      id: 'var1',
+      name: 'EXPO_PUBLIC_API_URL',
+      value: 'https://api.example.com',
+      environments: [DefaultEnvironment.Development],
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      scope: EnvironmentVariableScope.Project,
+      visibility: EnvironmentVariableVisibility.Public,
+      type: EnvironmentSecretType.String,
+    },
+    {
+      id: 'var2',
+      name: 'DATABASE_URL',
+      value: 'postgres://localhost:5432/mydb',
+      environments: [DefaultEnvironment.Development],
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      scope: EnvironmentVariableScope.Project,
+      visibility: EnvironmentVariableVisibility.Sensitive,
+      type: EnvironmentSecretType.String,
+    },
+    {
+      id: 'var3',
+      name: 'SECRET_KEY',
+      value: 'super-secret-key',
+      environments: [DefaultEnvironment.Development],
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      scope: EnvironmentVariableScope.Project,
+      visibility: EnvironmentVariableVisibility.Secret,
+      type: EnvironmentSecretType.String,
+    },
+    {
+      id: 'var4',
+      name: 'CONFIG_FILE',
+      value: 'base64-encoded-file-content',
+      environments: [DefaultEnvironment.Development],
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      scope: EnvironmentVariableScope.Project,
+      visibility: EnvironmentVariableVisibility.Public,
+      type: EnvironmentSecretType.FileBase64,
+      valueWithFileContent: Buffer.from('{"key": "value"}').toString('base64'),
+    },
+  ];
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.spyOn(Log, 'log').mockImplementation(() => {});
+    jest.spyOn(Log, 'addNewLineIfNone').mockImplementation(() => {});
+
+    // Mock fs-extra methods
+    jest.mocked(fs.exists).mockImplementation(() => Promise.resolve(false));
+    jest.mocked(fs.writeFile).mockImplementation(() => Promise.resolve());
+    jest.mocked(fs.mkdir).mockImplementation(() => Promise.resolve());
+    jest.mocked(fs.readFile).mockImplementation(() => Promise.resolve(''));
+
+    // Mock GraphQL query
+    jest
+      .mocked(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync)
+      .mockResolvedValue(mockEnvironmentVariables);
+  });
+
+  describe('environment validation', () => {
+    it('accepts development environment', async () => {
+      const command = new EnvPull(['development'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      expect(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync).toHaveBeenCalledWith(
+        graphqlClient,
+        {
+          appId: testProjectId,
+          environment: 'development',
+          includeFileContent: true,
+        }
+      );
+    });
+
+    it('accepts custom environment', async () => {
+      const command = new EnvPull(['custom-environment'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      expect(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync).toHaveBeenCalledWith(
+        graphqlClient,
+        {
+          appId: testProjectId,
+          environment: 'custom-environment',
+          includeFileContent: true,
+        }
+      );
+    });
+  });
+
+  describe('file operations', () => {
+    it('writes environment variables to .env.local file', async () => {
+      const command = new EnvPull(['development'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      expect(fs.writeFile).toHaveBeenCalledWith(
+        testTargetPath,
+        expect.stringContaining('# Environment: development')
+      );
+    });
+
+    it('writes correct environment variable content', async () => {
+      const command = new EnvPull(['development'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      // Find the call that writes to .env.local (not the file variable)
+      const writeFileCalls = jest.mocked(fs.writeFile).mock.calls;
+      const envFileCall = writeFileCalls.find(call => call[0] === testTargetPath);
+      expect(envFileCall).toBeDefined();
+      const fileContent = envFileCall![1] as string;
+
+      // Check that the file contains the expected content
+      expect(fileContent).toContain('# Environment: development');
+      expect(fileContent).toContain('EXPO_PUBLIC_API_URL=https://api.example.com');
+      expect(fileContent).toContain('DATABASE_URL=postgres://localhost:5432/mydb');
+      expect(fileContent).toContain('# SECRET_KEY=***** (secret)');
+    });
+
+    it('handles file variables correctly', async () => {
+      const command = new EnvPull(['development'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      // Should create .eas/.env directory for file variables
+      expect(fs.mkdir).toHaveBeenCalledWith(path.join(testProjectDir, '.eas', '.env'), {
+        recursive: true,
+      });
+
+      // Should write the file content (base64 encoded)
+      expect(fs.writeFile).toHaveBeenCalledWith(
+        path.join(testProjectDir, '.eas', '.env', 'CONFIG_FILE'),
+        Buffer.from('{"key": "value"}').toString('base64'),
+        'base64'
+      );
+
+      // Should include file path in env file
+      const writeFileCalls = jest.mocked(fs.writeFile).mock.calls;
+      const envFileCall = writeFileCalls.find(call => call[0] === testTargetPath);
+      expect(envFileCall).toBeDefined();
+      const fileContent = envFileCall![1] as string;
+      expect(fileContent).toContain('CONFIG_FILE=');
+      expect(fileContent).toContain(path.join(testProjectDir, '.eas', '.env', 'CONFIG_FILE'));
+    });
+
+    it('prompts for overwrite when file exists in interactive mode', async () => {
+      jest.mocked(fs.exists).mockImplementation(() => Promise.resolve(true));
+      jest.mocked(confirmAsync).mockResolvedValue(true);
+
+      const command = new EnvPull(['development'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      expect(confirmAsync).toHaveBeenCalledWith({
+        message: `File ${testTargetPath} already exists. Do you want to overwrite it?`,
+      });
+    });
+
+    it('aborts when user declines overwrite', async () => {
+      jest.mocked(fs.exists).mockImplementation(() => Promise.resolve(true));
+      jest.mocked(confirmAsync).mockResolvedValue(false);
+
+      const command = new EnvPull(['development'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await expect(command.runAsync()).rejects.toThrow(`File ${testTargetPath} already exists.`);
+    });
+  });
+
+  describe('non-interactive mode', () => {
+    it('works in non-interactive mode', async () => {
+      const command = new EnvPull(['development', '--non-interactive'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      expect(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync).toHaveBeenCalledWith(
+        graphqlClient,
+        {
+          appId: testProjectId,
+          environment: 'development',
+          includeFileContent: true,
+        }
+      );
+    });
+
+    it('requires environment in non-interactive mode', async () => {
+      const command = new EnvPull(['--non-interactive'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await expect(command.runAsync()).rejects.toThrow(
+        'The `--environment` flag must be set when running in `--non-interactive` mode.'
+      );
+    });
+  });
+
+  describe('custom target path', () => {
+    it('writes to custom path when specified', async () => {
+      const customPath = '.env.custom';
+      const command = new EnvPull(['development', '--path', customPath], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      expect(fs.writeFile).toHaveBeenCalledWith(
+        customPath,
+        expect.stringContaining('# Environment: development')
+      );
+    });
+  });
+
+  describe('logging', () => {
+    it('logs success message with correct environment', async () => {
+      const command = new EnvPull(['development'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      expect(Log.log).toHaveBeenCalledWith(
+        `Pulled plain text and sensitive environment variables from "development" environment to ${testTargetPath}.`
+      );
+    });
+
+    it('logs secret variables that were skipped', async () => {
+      const command = new EnvPull(['development'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      expect(Log.log).toHaveBeenCalledWith(
+        expect.stringContaining('The following variables have the secret visibility')
+      );
+      expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('SECRET_KEY'));
+    });
+  });
+
+  describe('existing .env.local file handling', () => {
+    it('preserves existing secret values when they exist', async () => {
+      const existingEnvContent = 'SECRET_KEY=existing-secret-value\nOTHER_VAR=other-value';
+      jest.mocked(fs.exists).mockImplementation(() => Promise.resolve(true));
+      jest.mocked(fs.readFile).mockImplementation(() => Promise.resolve(existingEnvContent));
+      jest.mocked(confirmAsync).mockResolvedValue(true);
+
+      const command = new EnvPull(['development'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      // Find the call that writes to .env.local (not the file variable)
+      const writeFileCalls = jest.mocked(fs.writeFile).mock.calls;
+      const envFileCall = writeFileCalls.find(call => call[0] === testTargetPath);
+      expect(envFileCall).toBeDefined();
+      const fileContent = envFileCall![1] as string;
+
+      // Should use existing secret value instead of placeholder
+      expect(fileContent).toContain('SECRET_KEY=existing-secret-value');
+      expect(fileContent).not.toContain('# SECRET_KEY=***** (secret)');
+
+      // Should log that it reused the local value
+      expect(Log.log).toHaveBeenCalledWith(
+        expect.stringContaining('Reused local values for following secrets: SECRET_KEY')
+      );
+    });
+  });
+});

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

@@ -0,0 +1,279 @@
+import { Config } from '@oclif/core';
+import * as fs from 'fs-extra';
+
+import { DefaultEnvironment } from '../../../build/utils/environment';
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { testProjectId } from '../../../credentials/__tests__/fixtures-constants';
+import {
+  EnvironmentSecretType,
+  EnvironmentVariableScope,
+  EnvironmentVariableVisibility,
+} from '../../../graphql/generated';
+import { EnvironmentVariableMutation } from '../../../graphql/mutations/EnvironmentVariableMutation';
+import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
+import Log from '../../../log';
+import { confirmAsync } from '../../../prompts';
+import EnvPush from '../push';
+
+jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
+jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
+jest.mock('fs-extra');
+jest.mock('../../../log');
+jest.mock('../../../prompts');
+
+describe(EnvPush, () => {
+  const graphqlClient = {} as any as ExpoGraphqlClient;
+  const mockConfig = {} as unknown as Config;
+  const testProjectDir = '/test/project';
+  const testEnvPath = '.env.test';
+
+  const mockEnvContent = `EXPO_PUBLIC_API_URL=https://api.example.com
+VARIABLE_NAME=variable value
+SECRET_KEY=super-secret-key`;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.spyOn(Log, 'log').mockImplementation(() => {});
+    jest.spyOn(Log, 'warn').mockImplementation(() => {});
+    jest.spyOn(Log, 'error').mockImplementation(() => {});
+
+    // Mock fs-extra methods
+    jest.mocked(fs.exists).mockImplementation(() => Promise.resolve(true));
+    jest.mocked(fs.readFile).mockImplementation(() => Promise.resolve(mockEnvContent));
+
+    // Mock GraphQL queries and mutations
+    jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValue([]); // No existing variables
+    jest
+      .mocked(EnvironmentVariableMutation.createBulkEnvironmentVariablesForAppAsync)
+      .mockResolvedValue(true);
+    jest.mocked(confirmAsync).mockResolvedValue(true);
+  });
+
+  it('accepts development environment when using positional argument', async () => {
+    jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValueOnce([]);
+
+    const command = new EnvPush(['development', '--path', testEnvPath], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      projectId: testProjectId,
+      projectDir: testProjectDir,
+    });
+
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.byAppIdAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: testProjectId,
+      environment: DefaultEnvironment.Development,
+      filterNames: ['EXPO_PUBLIC_API_URL', 'VARIABLE_NAME', 'SECRET_KEY'],
+    });
+  });
+
+  it('accepts custom environment', async () => {
+    const command = new EnvPush(['custom-environment', '--path', testEnvPath], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      projectId: testProjectId,
+      projectDir: testProjectDir,
+    });
+
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.byAppIdAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: testProjectId,
+      environment: 'custom-environment',
+      filterNames: ['EXPO_PUBLIC_API_URL', 'VARIABLE_NAME', 'SECRET_KEY'],
+    });
+  });
+
+  describe('--force option', () => {
+    it('automatically overrides existing variables without confirmation when --force is used', async () => {
+      const existingVariable = {
+        id: 'var1',
+        name: 'VARIABLE_NAME',
+        value: 'old variable value',
+        environments: [DefaultEnvironment.Development],
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+        scope: EnvironmentVariableScope.Project,
+        visibility: EnvironmentVariableVisibility.Sensitive,
+        type: EnvironmentSecretType.String,
+      };
+
+      jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValue([existingVariable]);
+
+      const command = new EnvPush(['development', '--path', testEnvPath, '--force'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      // Should not call confirmAsync for existing variables
+      expect(confirmAsync).not.toHaveBeenCalled();
+
+      // Should log that force flag is being used
+      expect(Log.log).toHaveBeenCalledWith(
+        'Using --force flag: automatically overriding existing variables.'
+      );
+
+      // Should call the mutation with overwrite flag
+      expect(
+        EnvironmentVariableMutation.createBulkEnvironmentVariablesForAppAsync
+      ).toHaveBeenCalledWith(
+        graphqlClient,
+        expect.arrayContaining([
+          expect.objectContaining({
+            name: 'VARIABLE_NAME',
+            value: 'variable value',
+            environments: [DefaultEnvironment.Development],
+            overwrite: true,
+          }),
+        ]),
+        testProjectId
+      );
+    });
+
+    it('automatically overrides sensitive variables without confirmation when --force is used', async () => {
+      const existingSensitiveVariable = {
+        id: 'var1',
+        name: 'SECRET_KEY',
+        value: 'old-secret-key',
+        environments: [DefaultEnvironment.Development],
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+        scope: EnvironmentVariableScope.Project,
+        visibility: EnvironmentVariableVisibility.Sensitive,
+        type: EnvironmentSecretType.String,
+      };
+
+      jest
+        .mocked(EnvironmentVariablesQuery.byAppIdAsync)
+        .mockResolvedValue([existingSensitiveVariable]);
+
+      const command = new EnvPush(['development', '--path', testEnvPath, '--force'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      // Should not call confirmAsync for sensitive variables
+      expect(confirmAsync).not.toHaveBeenCalled();
+
+      // Should log that force flag is being used for sensitive variables
+      expect(Log.log).toHaveBeenCalledWith(
+        'Using --force flag: automatically overriding sensitive variables.'
+      );
+
+      // Should call the mutation with overwrite flag
+      expect(
+        EnvironmentVariableMutation.createBulkEnvironmentVariablesForAppAsync
+      ).toHaveBeenCalledWith(
+        graphqlClient,
+        expect.arrayContaining([
+          expect.objectContaining({
+            name: 'SECRET_KEY',
+            value: 'super-secret-key',
+            environments: [DefaultEnvironment.Development],
+            overwrite: true,
+          }),
+        ]),
+        testProjectId
+      );
+    });
+
+    it('logs appropriate messages when using --force flag', async () => {
+      const existingVariable = {
+        id: 'var1',
+        name: 'VARIABLE_NAME',
+        value: 'old variable value',
+        environments: [DefaultEnvironment.Development],
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+        scope: EnvironmentVariableScope.Project,
+        visibility: EnvironmentVariableVisibility.Sensitive,
+        type: EnvironmentSecretType.String,
+      };
+
+      jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValue([existingVariable]);
+
+      const command = new EnvPush(['development', '--path', testEnvPath, '--force'], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      // Should log both force messages
+      expect(Log.log).toHaveBeenCalledWith(
+        'Using --force flag: automatically overriding existing variables.'
+      );
+      expect(Log.log).toHaveBeenCalledWith(
+        'Using --force flag: automatically overriding sensitive variables.'
+      );
+    });
+
+    it('still prompts for confirmation when --force is not used', async () => {
+      const existingVariable = {
+        id: 'var1',
+        name: 'VARIABLE_NAME',
+        value: 'old variable value',
+        environments: [DefaultEnvironment.Development],
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+        scope: EnvironmentVariableScope.Project,
+        visibility: EnvironmentVariableVisibility.Sensitive,
+        type: EnvironmentSecretType.String,
+      };
+
+      jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValue([existingVariable]);
+      jest.mocked(confirmAsync).mockResolvedValue(true);
+
+      const command = new EnvPush(['development', '--path', testEnvPath], mockConfig);
+
+      // @ts-expect-error
+      jest.spyOn(command, 'getContextAsync').mockReturnValue({
+        loggedIn: { graphqlClient },
+        projectId: testProjectId,
+        projectDir: testProjectDir,
+      });
+
+      await command.runAsync();
+
+      // Should call confirmAsync for both existing variables and sensitive variables
+      expect(confirmAsync).toHaveBeenCalledTimes(2);
+      expect(confirmAsync).toHaveBeenCalledWith({
+        message:
+          'The VARIABLE_NAME environment variable already exists in development environment. Do you want to override it?',
+      });
+      expect(confirmAsync).toHaveBeenCalledWith({
+        message:
+          'You are about to overwrite sensitive variables.\n- VARIABLE_NAME\n Do you want to continue?',
+      });
+
+      // Should not log force messages
+      expect(Log.log).not.toHaveBeenCalledWith(
+        'Using --force flag: automatically overriding existing variables.'
+      );
+      expect(Log.log).not.toHaveBeenCalledWith(
+        'Using --force flag: automatically overriding sensitive variables.'
+      );
+    });
+  });
+});

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

@@ -1,226 +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 EnvUnlink from '../unlink';
-
-jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
-jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
-jest.mock('../../../prompts');
-jest.mock('../../../graphql/queries/AppQuery');
-jest.mock('../../../log');
-
-describe(EnvUnlink, () => {
-  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 an account-wide 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 EnvUnlink(
-      ['--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 an account-wide 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 EnvUnlink(
-      ['--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 EnvUnlink([], 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 EnvUnlink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
-
-    // @ts-expect-error
-    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
-    await expect(command.runAsync()).rejects.toThrow(
-      "Account-wide 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 EnvUnlink([], 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 EnvUnlink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
-
-    // @ts-expect-error
-    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
-    await expect(command.runAsync()).rejects.toThrow(
-      "Account-wide variable NON_EXISTENT_VARIABLE doesn't exist"
-    );
-  });
-});

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

@@ -2,8 +2,9 @@ import { Config } from '@oclif/core';
 import chalk from 'chalk';
 
 import { getMockAppFragment } from '../../../__tests__/commands/utils';
+import { DefaultEnvironment } from '../../../build/utils/environment';
 import {
-  EnvironmentVariableEnvironment,
+  EnvironmentSecretType,
   EnvironmentVariableScope,
   EnvironmentVariableVisibility,
 } from '../../../graphql/generated';
@@ -11,12 +12,18 @@ import { EnvironmentVariableMutation } from '../../../graphql/mutations/Environm
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../../log';
-import { promptAsync, toggleConfirmAsync } from '../../../prompts';
+import { promptAsync, selectAsync, toggleConfirmAsync } from '../../../prompts';
+import {
+  parseVisibility,
+  promptVariableEnvironmentAsync,
+  promptVariableVisibilityAsync,
+} from '../../../utils/prompts';
 import EnvUpdate from '../update';
 
 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
 jest.mock('../../../prompts');
+jest.mock('../../../utils/prompts');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../log');
 
@@ -33,6 +40,41 @@ describe(EnvUpdate, () => {
   beforeEach(() => {
     jest.resetAllMocks();
     jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+    (jest.mocked(promptVariableEnvironmentAsync) as jest.MockedFunction<any>).mockImplementation(
+      async (args: any) => {
+        if (args.nonInteractive) {
+          throw new Error(
+            'The `--environment` flag must be set when running in `--non-interactive` mode.'
+          );
+        }
+        if (args.multiple) {
+          return ['production'];
+        }
+        return 'production';
+      }
+    );
+    (jest.mocked(promptVariableVisibilityAsync) as jest.MockedFunction<any>).mockResolvedValue(
+      EnvironmentVariableVisibility.Public
+    );
+    (jest.mocked(parseVisibility) as jest.MockedFunction<any>).mockImplementation(
+      (visibility: string) => {
+        switch (visibility) {
+          case 'plaintext':
+            return EnvironmentVariableVisibility.Public;
+          case 'sensitive':
+            return EnvironmentVariableVisibility.Sensitive;
+          case 'secret':
+            return EnvironmentVariableVisibility.Secret;
+          default:
+            throw new Error(`Invalid visibility: ${visibility}`);
+        }
+      }
+    );
+    (jest.mocked(selectAsync) as jest.MockedFunction<any>).mockResolvedValue({
+      id: variableId,
+      name: 'TEST_VARIABLE',
+      scope: EnvironmentVariableScope.Project,
+    });
   });
 
   it('updates a project variable by selected name in non-interactive mode', async () => {
@@ -41,7 +83,7 @@ describe(EnvUpdate, () => {
         id: variableId,
         name: 'TEST_VARIABLE',
         scope: EnvironmentVariableScope.Project,
-        environments: [EnvironmentVariableEnvironment.Development],
+        environments: [DefaultEnvironment.Development],
       },
     ];
     (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
@@ -73,7 +115,7 @@ describe(EnvUpdate, () => {
       id: variableId,
       name: 'NEW_VARIABLE',
       value: 'new-value',
-      environments: [EnvironmentVariableEnvironment.Production],
+      environments: [DefaultEnvironment.Production],
       visibility: EnvironmentVariableVisibility.Public,
     });
     expect(Log.withTick).toHaveBeenCalledWith(
@@ -87,7 +129,7 @@ describe(EnvUpdate, () => {
         id: variableId,
         name: 'TEST_VARIABLE',
         scope: EnvironmentVariableScope.Shared,
-        environments: [EnvironmentVariableEnvironment.Development],
+        environments: [DefaultEnvironment.Development],
       },
     ];
     (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
@@ -119,7 +161,7 @@ describe(EnvUpdate, () => {
       id: variableId,
       name: 'NEW_VARIABLE',
       value: 'new-value',
-      environments: [EnvironmentVariableEnvironment.Production],
+      environments: [DefaultEnvironment.Production],
     });
     expect(Log.withTick).toHaveBeenCalledWith(
       `Updated variable ${chalk.bold('TEST_VARIABLE')} on account testuser.`
@@ -129,6 +171,7 @@ describe(EnvUpdate, () => {
   it('prompts for variable selection when selected name is not provided', async () => {
     const mockVariables = [
       { id: variableId, name: 'TEST_VARIABLE', scope: EnvironmentVariableScope.Project },
+      { id: '2', name: 'ANOTHER_VARIABLE', scope: EnvironmentVariableScope.Project },
     ];
     (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
     (EnvironmentVariableMutation.updateAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
@@ -140,7 +183,7 @@ describe(EnvUpdate, () => {
     jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
     await command.runAsync();
 
-    expect(promptAsync).toHaveBeenCalled();
+    expect(selectAsync).toHaveBeenCalled();
     expect(EnvironmentVariableMutation.updateAsync).toHaveBeenCalledWith(
       graphqlClient,
       expect.objectContaining({ id: variableId })
@@ -162,4 +205,50 @@ describe(EnvUpdate, () => {
       'Variable with name NON_EXISTENT_VARIABLE  does not exist on project @testuser/testpp.'
     );
   });
+
+  it('accepts development environment when using positional argument', async () => {
+    const mockVariable = {
+      id: 'var1',
+      name: 'TEST_VAR_1',
+      value: 'value1',
+      environments: [DefaultEnvironment.Development],
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      scope: EnvironmentVariableScope.Project,
+      visibility: EnvironmentVariableVisibility.Public,
+      type: EnvironmentSecretType.String,
+    };
+
+    jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValueOnce([mockVariable]);
+    jest.mocked(EnvironmentVariableMutation.updateAsync).mockResolvedValueOnce(mockVariable);
+    jest.spyOn(Log, 'log').mockImplementation(() => {});
+
+    const command = new EnvUpdate(
+      [
+        'development',
+        '--variable-name',
+        'TEST_VAR_1',
+        '--value',
+        'new-value',
+        '--scope',
+        'project',
+        '--non-interactive',
+      ],
+      mockConfig
+    );
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue({
+      loggedIn: { graphqlClient },
+      projectId,
+    });
+
+    await command.runAsync();
+
+    expect(EnvironmentVariablesQuery.byAppIdAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: projectId,
+      environment: DefaultEnvironment.Development,
+      filterNames: ['TEST_VAR_1'],
+    });
+  });
 });

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

@@ -4,6 +4,7 @@ import fs from 'fs-extra';
 import path from 'path';
 
 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import {
   EASEnvironmentVariableScopeFlag,
   EASEnvironmentVariableScopeFlagValue,
@@ -13,7 +14,6 @@ import {
 } from '../../commandUtils/flags';
 import {
   EnvironmentSecretType,
-  EnvironmentVariableEnvironment,
   EnvironmentVariableScope,
   EnvironmentVariableVisibility,
 } from '../../graphql/generated';
@@ -33,29 +33,26 @@ import {
   promptVariableValueAsync,
   promptVariableVisibilityAsync,
 } from '../../utils/prompts';
-import { isEnvironment, performForEnvironmentsAsync } from '../../utils/variableUtils';
 
 interface RawCreateFlags {
   name?: string;
   value?: string;
-  link?: boolean;
   force?: boolean;
   type?: 'string' | 'file';
   visibility?: 'plaintext' | 'sensitive' | 'secret';
   scope: EASEnvironmentVariableScopeFlagValue;
-  environment?: EnvironmentVariableEnvironment[];
+  environment?: string[];
   'non-interactive': boolean;
 }
 
 interface CreateFlags {
   name?: string;
   value?: string;
-  link?: boolean;
   force?: boolean;
   type?: 'string' | 'file';
   visibility?: 'plaintext' | 'sensitive' | 'secret';
   scope: EnvironmentVariableScope;
-  environment?: EnvironmentVariableEnvironment[];
+  environment?: string[];
   'non-interactive': boolean;
 }
 
@@ -66,7 +63,7 @@ export default class EnvCreate extends EasCommand {
     {
       name: 'environment',
       description:
-        "Environment to create the variable in. One of 'production', 'preview', or 'development'.",
+        "Environment to create the variable in. Default environments are 'production', 'preview', and 'development'.",
       required: false,
     },
   ];
@@ -78,10 +75,6 @@ export default class EnvCreate extends EasCommand {
     value: Flags.string({
       description: 'Text value or the variable',
     }),
-    link: Flags.boolean({
-      description: 'Link account-wide variable to the current project',
-      hidden: true, // every account-wide variable is global for now so it's not user facing
-    }),
     force: Flags.boolean({
       description: 'Overwrite existing variable',
       default: false,
@@ -107,6 +100,13 @@ export default class EnvCreate extends EasCommand {
 
     const validatedFlags = this.sanitizeFlags(flags);
 
+    const {
+      projectId,
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(EnvCreate, {
+      nonInteractive: validatedFlags['non-interactive'],
+    });
+
     const {
       name,
       value,
@@ -114,18 +114,10 @@ export default class EnvCreate extends EasCommand {
       'non-interactive': nonInteractive,
       environment: environments,
       visibility,
-      link,
       force,
       type,
       fileName,
-    } = await this.promptForMissingFlagsAsync(validatedFlags, args);
-
-    const {
-      projectId,
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvCreate, {
-      nonInteractive,
-    });
+    } = await this.promptForMissingFlagsAsync(validatedFlags, args, { graphqlClient, projectId });
 
     const [projectDisplayName, ownerAccount] = await Promise.all([
       getDisplayNameForProjectIdAsync(graphqlClient, projectId),
@@ -154,29 +146,6 @@ export default class EnvCreate extends EasCommand {
           });
           overwrite = true;
         }
-        if (existingVariable.scope === EnvironmentVariableScope.Shared) {
-          await this.promptForOverwriteAsync({
-            nonInteractive,
-            force,
-            message: `Account-wide variable with ${name} name already exists on this account.`,
-            suggestion: 'Do you want to unlink it first?',
-          });
-
-          Log.withTick(
-            `Unlinking account-wide variable ${chalk.bold(name)} on project ${chalk.bold(
-              projectDisplayName
-            )}.`
-          );
-
-          await performForEnvironmentsAsync(environments, async environment => {
-            await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
-              graphqlClient,
-              existingVariable.id,
-              projectId,
-              environment
-            );
-          });
-        }
       }
 
       const variable =
@@ -250,7 +219,6 @@ export default class EnvCreate extends EasCommand {
                 value,
                 visibility,
                 environments,
-                isGlobal: true, // TODO: every account-wide variable is global for now so it's not user facing
                 type: type ?? EnvironmentSecretType.String,
               },
               ownerAccount.id
@@ -265,29 +233,6 @@ export default class EnvCreate extends EasCommand {
       Log.withTick(
         `Created a new variable ${chalk.bold(name)} on account ${chalk.bold(ownerAccount.name)}.`
       );
-
-      if (link) {
-        Log.withTick(
-          `Linking account-wide variable ${chalk.bold(name)} to project ${chalk.bold(
-            projectDisplayName
-          )}.`
-        );
-
-        await performForEnvironmentsAsync(environments, async environment => {
-          await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
-            graphqlClient,
-            variable.id,
-            projectId,
-            environment
-          );
-        });
-
-        Log.withTick(
-          `Linked account-wide variable ${chalk.bold(name)} to project ${chalk.bold(
-            projectDisplayName
-          )}.`
-        );
-      }
     }
   }
 
@@ -326,7 +271,8 @@ export default class EnvCreate extends EasCommand {
       type,
       ...rest
     }: CreateFlags,
-    { environment }: { environment?: string }
+    { environment }: { environment?: string },
+    { graphqlClient, projectId }: { graphqlClient: ExpoGraphqlClient; projectId: string }
   ): Promise<
     Required<
       Omit<CreateFlags, 'type' | 'visibility'> & {
@@ -377,18 +323,16 @@ export default class EnvCreate extends EasCommand {
 
     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;
+    let newEnvironments = environments ? environments : environment ? [environment] : undefined;
 
     if (!newEnvironments) {
-      newEnvironments = await promptVariableEnvironmentAsync({ nonInteractive, multiple: true });
+      newEnvironments = await promptVariableEnvironmentAsync({
+        nonInteractive,
+        multiple: true,
+        canEnterCustomEnvironment: true,
+        graphqlClient,
+        projectId,
+      });
 
       if (!newEnvironments || newEnvironments.length === 0) {
         throw new Error('No environments selected');
@@ -402,7 +346,6 @@ export default class EnvCreate extends EasCommand {
       value,
       environment: newEnvironments,
       visibility: newVisibility,
-      link: rest.link ?? false,
       force: rest.force ?? false,
       'non-interactive': nonInteractive,
       type: newType,
@@ -412,12 +355,6 @@ export default class EnvCreate extends EasCommand {
   }
 
   private sanitizeFlags(flags: RawCreateFlags): CreateFlags {
-    if (flags.scope !== 'account' && flags.link) {
-      throw new Error(
-        `Unexpected argument: --link can only be used when creating account-wide variables`
-      );
-    }
-
     return {
       ...flags,
       scope:

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

@@ -9,23 +9,23 @@ import {
   EASNonInteractiveFlag,
   EasEnvironmentFlagParameters,
 } from '../../commandUtils/flags';
-import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../../graphql/generated';
+import { 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 { formatVariableName } from '../../utils/variableUtils';
 
 interface DeleteFlags {
   'variable-name'?: string;
-  'variable-environment'?: EnvironmentVariableEnvironment;
+  'variable-environment'?: string;
   'non-interactive': boolean;
   scope: EnvironmentVariableScope;
 }
 
 interface RawDeleteFlags {
   'variable-name'?: string;
-  'variable-environment'?: EnvironmentVariableEnvironment;
+  'variable-environment'?: string;
   'non-interactive': boolean;
   scope: EASEnvironmentVariableScopeFlagValue;
 }
@@ -37,7 +37,7 @@ export default class EnvDelete extends EasCommand {
     'variable-name': Flags.string({
       description: 'Name of the variable to delete',
     }),
-    'variable-environment': Flags.enum<EnvironmentVariableEnvironment>({
+    'variable-environment': Flags.string({
       ...EasEnvironmentFlagParameters,
       description: 'Current environment of the variable to delete',
     }),
@@ -49,7 +49,7 @@ export default class EnvDelete extends EasCommand {
     {
       name: 'environment',
       description:
-        "Current environment of the variable to delete. One of 'production', 'preview', or 'development'.",
+        "Current environment of the variable to delete. Default environments are 'production', 'preview', and 'development'.",
       required: false,
     },
   ];
@@ -165,13 +165,6 @@ export default class EnvDelete extends EasCommand {
         : EnvironmentVariableScope.Project;
 
     if (environment) {
-      environment = environment.toUpperCase();
-
-      if (!isEnvironment(environment)) {
-        throw new Error(
-          "Invalid environment. Use one of 'production', 'preview', or 'development'."
-        );
-      }
       return { ...flags, 'variable-environment': environment, scope };
     }
 

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

@@ -4,21 +4,19 @@ 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;
+      environment: string;
       command: string;
     }
   | {
       nonInteractive: false;
-      environment?: EnvironmentVariableEnvironment;
+      environment?: string;
       command: string;
     };
 
@@ -44,7 +42,7 @@ export default class EnvExec extends EasCommand {
       name: 'environment',
       required: true,
       description:
-        "Environment to execute the command in. One of 'production', 'preview', or 'development'.",
+        "Environment to execute the command in. Default environments are 'production', 'preview', and 'development'.",
     },
     {
       name: 'bash_command',
@@ -70,7 +68,11 @@ export default class EnvExec extends EasCommand {
 
     const environment =
       parsedFlags.environment ??
-      (await promptVariableEnvironmentAsync({ nonInteractive: parsedFlags.nonInteractive }));
+      (await promptVariableEnvironmentAsync({
+        nonInteractive: parsedFlags.nonInteractive,
+        graphqlClient,
+        projectId,
+      }));
     const environmentVariables = await this.loadEnvironmentVariablesAsync({
       graphqlClient,
       projectId,
@@ -101,12 +103,6 @@ export default class EnvExec extends EasCommand {
       );
     }
 
-    environment = environment?.toUpperCase();
-
-    if (!isEnvironment(environment)) {
-      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-    }
-
     const firstChar = bash_command[0];
     const lastChar = bash_command[bash_command.length - 1];
     const cleanCommand =
@@ -198,7 +194,7 @@ export default class EnvExec extends EasCommand {
   }: {
     graphqlClient: ExpoGraphqlClient;
     projectId: string;
-    environment: EnvironmentVariableEnvironment;
+    environment: string;
     nonInteractive: boolean;
   }): Promise<Record<string, string>> {
     const environmentVariablesQueryResult =

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

@@ -11,7 +11,6 @@ import {
   EasEnvironmentFlagParameters,
 } from '../../commandUtils/flags';
 import {
-  EnvironmentVariableEnvironment,
   EnvironmentVariableFragment,
   EnvironmentVariableScope,
   EnvironmentVariableVisibility,
@@ -19,11 +18,11 @@ import {
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
 import { promptVariableEnvironmentAsync, promptVariableNameAsync } from '../../utils/prompts';
-import { formatVariable, formatVariableValue, isEnvironment } from '../../utils/variableUtils';
+import { formatVariable, formatVariableValue } from '../../utils/variableUtils';
 
 interface RawGetFlags {
   'variable-name'?: string;
-  'variable-environment'?: EnvironmentVariableEnvironment;
+  'variable-environment'?: string;
   'non-interactive': boolean;
   format?: string;
   scope: EASEnvironmentVariableScopeFlagValue;
@@ -31,7 +30,7 @@ interface RawGetFlags {
 
 interface GetFlags {
   'variable-name'?: string;
-  'variable-environment'?: EnvironmentVariableEnvironment;
+  'variable-environment'?: string;
   'non-interactive': boolean;
   format?: string;
   scope: EnvironmentVariableScope;
@@ -49,7 +48,7 @@ export default class EnvGet extends EasCommand {
     {
       name: 'environment',
       description:
-        "Current environment of the variable. One of 'production', 'preview', or 'development'.",
+        "Current environment of the variable. Default environments are 'production', 'preview', and 'development'.",
       required: false,
     },
   ];
@@ -58,7 +57,7 @@ export default class EnvGet extends EasCommand {
     'variable-name': Flags.string({
       description: 'Name of the variable',
     }),
-    'variable-environment': Flags.enum<EnvironmentVariableEnvironment>({
+    'variable-environment': Flags.string({
       ...EasEnvironmentFlagParameters,
       description: 'Current environment of the variable',
     }),
@@ -93,6 +92,8 @@ export default class EnvGet extends EasCommand {
       environment = await promptVariableEnvironmentAsync({
         nonInteractive,
         multiple: false,
+        graphqlClient,
+        projectId,
       });
     }
 
@@ -156,12 +157,6 @@ export default class EnvGet extends EasCommand {
         ? EnvironmentVariableScope.Shared
         : EnvironmentVariableScope.Project;
     if (environment) {
-      environment = environment.toUpperCase();
-      if (!isEnvironment(environment)) {
-        throw new Error(
-          "Invalid environment. Use one of 'production', 'preview', or 'development'."
-        );
-      }
       return {
         ...flags,
         'variable-environment': environment,
@@ -177,7 +172,7 @@ async function getVariablesAsync(
   scope: string,
   projectId: string,
   name: string | undefined,
-  environment: EnvironmentVariableEnvironment | undefined
+  environment: string | undefined
 ): Promise<EnvironmentVariableFragment[]> {
   if (!name) {
     throw new Error(

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

@@ -1,204 +0,0 @@
-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 { 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 EnvLink extends EasCommand {
-  static override description = 'link an account-wide environment variable to the current project';
-
-  // for now we only roll out global account-wide env variables so this should stay hidden
-  static override hidden = true;
-
-  static override flags = {
-    'variable-name': Flags.string({
-      description: 'Name of the variable',
-    }),
-    'variable-environment': Flags.enum<EnvironmentVariableEnvironment>({
-      ...EasEnvironmentFlagParameters,
-      description: 'Current environment of the variable to link',
-    }),
-    ...EASMultiEnvironmentFlag,
-    ...EASNonInteractiveFlag,
-  };
-
-  static override args = [
-    {
-      name: 'environment',
-      description:
-        "Environment to pull variables from. One of 'production', 'preview', or 'development'.",
-      required: false,
-    },
-  ];
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
-    ...this.ContextOptions.LoggedIn,
-  };
-
-  async runAsync(): Promise<void> {
-    const { args, flags } = await this.parse(EnvLink);
-
-    let {
-      'variable-name': name,
-      'variable-environment': currentEnvironment,
-      'non-interactive': nonInteractive,
-      environment: environments,
-    } = this.validateInputs(flags, args);
-
-    const {
-      projectId,
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvLink, {
-      nonInteractive,
-    });
-
-    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
-    const variables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
-      appId: projectId,
-      environment: currentEnvironment,
-      filterNames: name ? [name] : undefined,
-    });
-
-    let selectedVariable = variables[0];
-
-    if (variables.length > 1) {
-      if (nonInteractive) {
-        throw new Error(
-          'Multiple variables found, run command with --variable-name and --variable-environment arguments.'
-        );
-      }
-      selectedVariable = await selectAsync(
-        'Select account-wide variable',
-        variables.map(variable => ({
-          title: formatVariableName(variable),
-          value: variable,
-        }))
-      );
-    }
-
-    if (!selectedVariable) {
-      throw new Error(`Account-wide 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 (!environments) {
-      await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
-        graphqlClient,
-        selectedVariable.id,
-        projectId
-      );
-      Log.withTick(
-        `Linked variable ${chalk.bold(selectedVariable.name)} to project ${chalk.bold(
-          projectDisplayName
-        )} in ${selectedVariable.environments?.join(', ').toLocaleLowerCase()}.`
-      );
-      return;
-    }
-
-    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 }: { environment?: string }): LinkFlags {
-    environment = environment?.toUpperCase();
-
-    if (environment && !isEnvironment(environment)) {
-      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-    }
-
-    const environments = flags.environment
-      ? flags.environment
-      : environment
-        ? [environment as EnvironmentVariableEnvironment]
-        : undefined;
-
-    if (flags['non-interactive']) {
-      if (!flags['variable-name']) {
-        throw new Error(
-          `Environment variable needs 'name' to be specified when running in non-interactive mode. Run the command with ${chalk.bold(
-            '--variable-name VARIABLE_NAME'
-          )} flag to fix the issue`
-        );
-      }
-    }
-
-    return {
-      ...flags,
-      environment: environments,
-    };
-  }
-}

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

@@ -9,7 +9,7 @@ import {
   EASMultiEnvironmentFlag,
   EASVariableFormatFlag,
 } from '../../commandUtils/flags';
-import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../../graphql/generated';
+import { EnvironmentVariableScope } from '../../graphql/generated';
 import {
   EnvironmentVariableWithFileContent,
   EnvironmentVariablesQuery,
@@ -19,7 +19,6 @@ import { promptVariableEnvironmentAsync } from '../../utils/prompts';
 import {
   formatVariable,
   formatVariableValue,
-  isEnvironment,
   performForEnvironmentsAsync,
 } from '../../utils/variableUtils';
 
@@ -35,7 +34,7 @@ async function getVariablesForScopeAsync(
     scope: EnvironmentVariableScope;
     includingSensitive: boolean;
     includeFileContent: boolean;
-    environment?: EnvironmentVariableEnvironment;
+    environment?: string;
     projectId: string;
   }
 ): Promise<EnvironmentVariableWithFileContent[]> {
@@ -70,7 +69,7 @@ async function getVariablesForScopeAsync(
 interface RawListFlags {
   scope: EASEnvironmentVariableScopeFlagValue;
   format: string;
-  environment: EnvironmentVariableEnvironment[] | undefined;
+  environment: string[] | undefined;
   'include-sensitive': boolean;
   'include-file-content': boolean;
   'non-interactive'?: boolean;
@@ -79,7 +78,7 @@ interface RawListFlags {
 interface ListFlags {
   scope: EnvironmentVariableScope;
   format: string;
-  environment: EnvironmentVariableEnvironment[] | undefined;
+  environment: string[] | undefined;
   'include-sensitive': boolean;
   'include-file-content': boolean;
   'non-interactive': boolean;
@@ -111,7 +110,7 @@ export default class EnvList extends EasCommand {
     {
       name: 'environment',
       description:
-        "Environment to list the variables from. One of 'production', 'preview', or 'development'.",
+        "Environment to list the variables from. Default environments are 'production', 'preview', and 'development'.",
       required: false,
     },
   ];
@@ -136,7 +135,12 @@ export default class EnvList extends EasCommand {
     });
 
     if (!environments) {
-      environments = await promptVariableEnvironmentAsync({ nonInteractive, multiple: true });
+      environments = await promptVariableEnvironmentAsync({
+        nonInteractive,
+        multiple: true,
+        graphqlClient,
+        projectId,
+      });
     }
 
     await performForEnvironmentsAsync(environments, async environment => {
@@ -179,14 +183,10 @@ export default class EnvList extends EasCommand {
     flags: RawListFlags,
     { environment }: { environment?: string }
   ): ListFlags {
-    if (environment && !isEnvironment(environment.toUpperCase())) {
-      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-    }
-
     const environments = flags.environment
       ? flags.environment
       : environment
-        ? [environment.toUpperCase() as EnvironmentVariableEnvironment]
+        ? [environment]
         : undefined;
 
     return {

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

@@ -13,7 +13,6 @@ import {
 import Log from '../../log';
 import { confirmAsync } from '../../prompts';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
-import { isEnvironment } from '../../utils/variableUtils';
 
 export default class EnvPull extends EasCommand {
   static override description =
@@ -29,7 +28,7 @@ export default class EnvPull extends EasCommand {
     {
       name: 'environment',
       description:
-        "Environment to pull variables from. One of 'production', 'preview', or 'development'.",
+        "Environment to pull variables from. Default environments are 'production', 'preview', and 'development'.",
       required: false,
     },
   ];
@@ -49,15 +48,7 @@ export default class EnvPull extends EasCommand {
       flags: { environment: flagEnvironment, path: targetPath, 'non-interactive': nonInteractive },
     } = await this.parse(EnvPull);
 
-    let environment = flagEnvironment?.toUpperCase() ?? argEnvironment?.toUpperCase();
-
-    if (!environment) {
-      environment = await promptVariableEnvironmentAsync({ nonInteractive });
-    }
-
-    if (!isEnvironment(environment)) {
-      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-    }
+    let environment = flagEnvironment?.toLowerCase() ?? argEnvironment?.toLowerCase();
 
     const {
       projectId,
@@ -67,6 +58,14 @@ export default class EnvPull extends EasCommand {
       nonInteractive,
     });
 
+    if (!environment) {
+      environment = await promptVariableEnvironmentAsync({
+        nonInteractive,
+        graphqlClient,
+        projectId,
+      });
+    }
+
     targetPath = targetPath ?? '.env.local';
 
     const environmentVariables = await EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(

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

@@ -6,20 +6,16 @@ import path from 'path';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASMultiEnvironmentFlag } from '../../commandUtils/flags';
 import {
-  EnvironmentVariableEnvironment,
+  CreateEnvironmentVariableInput,
   EnvironmentVariableFragment,
   EnvironmentVariableScope,
   EnvironmentVariableVisibility,
 } from '../../graphql/generated';
-import {
-  EnvironmentVariableMutation,
-  EnvironmentVariablePushInput,
-} from '../../graphql/mutations/EnvironmentVariableMutation';
+import { EnvironmentVariableMutation } from '../../graphql/mutations/EnvironmentVariableMutation';
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
 import { confirmAsync, promptAsync } from '../../prompts';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
-import { isEnvironment } from '../../utils/variableUtils';
 
 export default class EnvPush extends EasCommand {
   static override description =
@@ -36,13 +32,17 @@ export default class EnvPush extends EasCommand {
       description: 'Path to the input `.env` file',
       default: '.env.local',
     }),
+    force: Flags.boolean({
+      description: 'Skip confirmation and automatically override existing variables',
+      default: false,
+    }),
   };
 
   static override args = [
     {
       name: 'environment',
       description:
-        "Environment to push variables to. One of 'production', 'preview', or 'development'.",
+        "Environment to push variables to. Default environments are 'production', 'preview', and 'development'.",
       required: false,
     },
   ];
@@ -50,7 +50,7 @@ export default class EnvPush extends EasCommand {
   async runAsync(): Promise<void> {
     const { args, flags } = await this.parse(EnvPush);
 
-    let { environment: environments, path: envPath } = this.parseFlagsAndArgs(flags, args);
+    let { environment: environments, path: envPath, force } = this.parseFlagsAndArgs(flags, args);
 
     const {
       projectId,
@@ -63,11 +63,13 @@ export default class EnvPush extends EasCommand {
       environments = await promptVariableEnvironmentAsync({
         nonInteractive: false,
         multiple: true,
+        canEnterCustomEnvironment: true,
+        graphqlClient,
+        projectId,
       });
     }
 
-    const updateVariables: Record<string, EnvironmentVariablePushInput> =
-      await this.parseEnvFileAsync(envPath, environments);
+    const updateVariables = await this.parseEnvFileAsync(envPath, environments);
 
     const variableNames = Object.keys(updateVariables);
 
@@ -117,40 +119,46 @@ export default class EnvPush extends EasCommand {
         Log.warn(`Some variables already exist in the ${displayedEnvironment} environment.`);
         const variableNames = existingDifferentVariables.map(variable => variable.name);
 
-        const confirmationMessage =
-          variableNames.length > 1
-            ? `The ${variableNames.join(
-                ', '
-              )} environment variables already exist in ${displayedEnvironment} environment. Do you want to override them all?`
-            : `The ${variableNames[0]} environment variable already exists in ${displayedEnvironment} environment. Do you want to override it?`;
-
-        const confirm = await confirmAsync({
-          message: confirmationMessage,
-        });
-
         let variablesToOverwrite: string[] = [];
 
-        if (!confirm && existingDifferentVariables.length === 0) {
-          throw new Error('No new variables to push.');
-        }
-
-        if (confirm) {
+        if (force) {
+          // When --force is used, automatically override all existing variables
+          Log.log('Using --force flag: automatically overriding existing variables.');
           variablesToOverwrite = existingDifferentVariables.map(variable => variable.name);
         } else {
-          const promptResult = await promptAsync({
-            type: 'multiselect',
-            name: 'variablesToOverwrite',
-            message: 'Select variables to overwrite:',
-            // @ts-expect-error property missing from `@types/prompts`
-            optionsPerPage: 20,
-            choices: existingDifferentVariables.map(variable => ({
-              title: `${variable.name}: ${updateVariables[variable.name].value} (was ${
-                variable.value ?? '(secret)'
-              })`,
-              value: variable.name,
-            })),
+          const confirmationMessage =
+            variableNames.length > 1
+              ? `The ${variableNames.join(
+                  ', '
+                )} environment variables already exist in ${displayedEnvironment} environment. Do you want to override them all?`
+              : `The ${variableNames[0]} environment variable already exists in ${displayedEnvironment} environment. Do you want to override it?`;
+
+          const confirm = await confirmAsync({
+            message: confirmationMessage,
           });
-          variablesToOverwrite = promptResult.variablesToOverwrite;
+
+          if (!confirm && existingDifferentVariables.length === 0) {
+            throw new Error('No new variables to push.');
+          }
+
+          if (confirm) {
+            variablesToOverwrite = existingDifferentVariables.map(variable => variable.name);
+          } else {
+            const promptResult = await promptAsync({
+              type: 'multiselect',
+              name: 'variablesToOverwrite',
+              message: 'Select variables to overwrite:',
+              // @ts-expect-error property missing from `@types/prompts`
+              optionsPerPage: 20,
+              choices: existingDifferentVariables.map(variable => ({
+                title: `${variable.name}: ${updateVariables[variable.name].value} (was ${
+                  variable.value ?? '(secret)'
+                })`,
+                value: variable.name,
+              })),
+            });
+            variablesToOverwrite = promptResult.variablesToOverwrite;
+          }
         }
 
         for (const existingVariable of existingVariables) {
@@ -168,7 +176,7 @@ export default class EnvPush extends EasCommand {
         variable => variable.visibility !== EnvironmentVariableVisibility.Public
       );
 
-      if (existingSensitiveVariables.length > 0) {
+      if (existingSensitiveVariables.length > 0 && !force) {
         const existingSensitiveVariablesNames = existingSensitiveVariables.map(
           variable => `- ${variable.name}`
         );
@@ -180,6 +188,8 @@ export default class EnvPush extends EasCommand {
         if (!confirm) {
           throw new Error('Aborting...');
         }
+      } else if (existingSensitiveVariables.length > 0 && force) {
+        Log.log('Using --force flag: automatically overriding sensitive variables.');
       }
     }
 
@@ -199,16 +209,14 @@ export default class EnvPush extends EasCommand {
   }
 
   parseFlagsAndArgs(
-    flags: { path: string; environment: EnvironmentVariableEnvironment[] | undefined },
+    flags: {
+      path: string;
+      environment: string[] | undefined;
+      force: boolean;
+    },
     { environment }: Record<string, string>
-  ): { environment?: EnvironmentVariableEnvironment[]; path: string } {
-    if (environment && !isEnvironment(environment.toUpperCase())) {
-      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-    }
-
-    const environments =
-      flags.environment ??
-      (environment ? [environment.toUpperCase() as EnvironmentVariableEnvironment] : undefined);
+  ): { environment?: string[]; path: string; force: boolean } {
+    const environments = flags.environment ?? (environment ? [environment] : undefined);
 
     return {
       ...flags,
@@ -218,12 +226,12 @@ export default class EnvPush extends EasCommand {
 
   private async parseEnvFileAsync(
     envPath: string,
-    environments: EnvironmentVariableEnvironment[]
-  ): Promise<Record<string, EnvironmentVariablePushInput>> {
+    environments: string[]
+  ): Promise<Record<string, CreateEnvironmentVariableInput & { environments: string[] }>> {
     if (!(await fs.exists(envPath))) {
       throw new Error(`File ${envPath} does not exist.`);
     }
-    const pushInput: Record<string, EnvironmentVariablePushInput> = {};
+    const pushInput: Awaited<ReturnType<typeof this.parseEnvFileAsync>> = {};
 
     const variables: Record<string, string> = dotenv.parse(await fs.readFile(envPath, 'utf8'));
 
@@ -246,9 +254,9 @@ export default class EnvPush extends EasCommand {
         name,
         value,
         environments,
-        visibility: name.startsWith('EXPO_SENSITIVE')
-          ? EnvironmentVariableVisibility.Sensitive
-          : EnvironmentVariableVisibility.Public,
+        visibility: name.startsWith('EXPO_PUBLIC_')
+          ? EnvironmentVariableVisibility.Public
+          : EnvironmentVariableVisibility.Sensitive,
       };
     }
 

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

@@ -1,192 +0,0 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { EASMultiEnvironmentFlag, EASNonInteractiveFlag } from '../../commandUtils/flags';
-import { EnvironmentVariableEnvironment } from '../../graphql/generated';
-import { EnvironmentVariableMutation } from '../../graphql/mutations/EnvironmentVariableMutation';
-import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
-import Log from '../../log';
-import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
-import { selectAsync } from '../../prompts';
-import { promptVariableEnvironmentAsync } from '../../utils/prompts';
-import { formatVariableName, isEnvironment } from '../../utils/variableUtils';
-
-type UnlinkFlags = {
-  'variable-name'?: string;
-  'non-interactive': boolean;
-  environment?: EnvironmentVariableEnvironment[];
-};
-
-export default class EnvUnlink extends EasCommand {
-  static override description =
-    'unlink an account-wide environment variable from the current project';
-
-  // for now we only roll out global account-wide env variables so this should stay hidden
-  static override hidden = true;
-
-  static override flags = {
-    'variable-name': Flags.string({
-      description: 'Name of the variable',
-    }),
-    ...EASMultiEnvironmentFlag,
-    ...EASNonInteractiveFlag,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
-    ...this.ContextOptions.LoggedIn,
-  };
-
-  static override args = [
-    {
-      name: 'environment',
-      description:
-        "Environment to unlink the variable from. One of 'production', 'preview', or 'development'.",
-      required: false,
-    },
-  ];
-
-  async runAsync(): Promise<void> {
-    const { args, flags } = await this.parse(EnvUnlink);
-
-    let {
-      'variable-name': name,
-      'non-interactive': nonInteractive,
-      environment: unlinkEnvironments,
-    } = this.validateInputs(flags, args);
-
-    const {
-      projectId,
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvUnlink, {
-      nonInteractive,
-    });
-
-    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
-    const variables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
-      appId: projectId,
-      filterNames: name ? [name] : undefined,
-    });
-
-    let selectedVariable = variables[0];
-
-    if (variables.length > 1) {
-      if (nonInteractive) {
-        throw new Error("Multiple variables found, please select one using '--variable-name'");
-      }
-      selectedVariable = await selectAsync(
-        'Select account-wide variable',
-        variables.map(variable => ({
-          title: formatVariableName(variable),
-          value: variable,
-        }))
-      );
-    }
-
-    if (!selectedVariable) {
-      throw new Error(`Account-wide variable ${name} doesn't exist`);
-    }
-
-    let explicitSelect = false;
-
-    if (!nonInteractive && !unlinkEnvironments) {
-      const selectedEnvironments =
-        (selectedVariable.linkedEnvironments ?? []).length > 0
-          ? selectedVariable.linkedEnvironments
-          : selectedVariable.environments;
-      const environments = await promptVariableEnvironmentAsync({
-        nonInteractive,
-        multiple: true,
-        selectedEnvironments: selectedEnvironments ?? [],
-      });
-      explicitSelect = true;
-      unlinkEnvironments = Object.values(EnvironmentVariableEnvironment).filter(
-        env => !environments.includes(env)
-      );
-    }
-
-    if (!unlinkEnvironments) {
-      await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
-        graphqlClient,
-        selectedVariable.id,
-        projectId
-      );
-      Log.withTick(
-        `Unlinked variable ${chalk.bold(selectedVariable.name)} from project ${chalk.bold(
-          projectDisplayName
-        )} in ${selectedVariable.environments?.join(', ').toLocaleLowerCase()}.`
-      );
-      return;
-    }
-
-    for (const environment of Object.values(EnvironmentVariableEnvironment)) {
-      if (
-        selectedVariable.linkedEnvironments?.includes(environment) !==
-        unlinkEnvironments.includes(environment)
-      ) {
-        if (!explicitSelect && unlinkEnvironments.includes(environment)) {
-          Log.withTick(
-            `Variable ${chalk.bold(
-              selectedVariable.name
-            )} is already unlinked from ${environment.toLocaleLowerCase()}.`
-          );
-        }
-        continue;
-      }
-      if (unlinkEnvironments.includes(environment)) {
-        await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
-          graphqlClient,
-          selectedVariable.id,
-          projectId,
-          environment
-        );
-        Log.withTick(
-          `Unlinked variable ${chalk.bold(selectedVariable.name)} from project ${chalk.bold(
-            projectDisplayName
-          )} in ${environment.toLocaleLowerCase()}.`
-        );
-      } else if (explicitSelect) {
-        await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
-          graphqlClient,
-          selectedVariable.id,
-          projectId,
-          environment
-        );
-        Log.withTick(
-          `Linked variable ${chalk.bold(selectedVariable.name)} to project ${chalk.bold(
-            projectDisplayName
-          )} in ${environment.toLocaleLowerCase()}.`
-        );
-      }
-    }
-  }
-
-  private validateInputs(
-    flags: UnlinkFlags,
-    { environment }: { environment?: string }
-  ): UnlinkFlags {
-    if (flags['non-interactive']) {
-      if (!flags['variable-name']) {
-        throw new Error(
-          'Current name is required in non-interactive mode. Run the command with --variable-name flag.'
-        );
-      }
-    }
-
-    if (environment) {
-      environment = environment.toUpperCase();
-      if (!isEnvironment(environment)) {
-        throw new Error(
-          "Invalid environment. Use one of 'production', 'preview', or 'development'."
-        );
-      }
-      return {
-        environment: [environment],
-        ...flags,
-      };
-    }
-
-    return flags;
-  }
-}

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

@@ -5,6 +5,7 @@ import fs from 'fs-extra';
 import path from 'path';
 
 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import {
   EASEnvironmentVariableScopeFlag,
   EASEnvironmentVariableScopeFlagValue,
@@ -15,7 +16,6 @@ import {
 } from '../../commandUtils/flags';
 import {
   EnvironmentSecretType,
-  EnvironmentVariableEnvironment,
   EnvironmentVariableFragment,
   EnvironmentVariableScope,
   EnvironmentVariableVisibility,
@@ -36,17 +36,17 @@ import {
   promptVariableValueAsync,
   promptVariableVisibilityAsync,
 } from '../../utils/prompts';
-import { formatVariableName, isEnvironment } from '../../utils/variableUtils';
+import { formatVariableName } from '../../utils/variableUtils';
 
 interface RawUpdateFlags {
   name?: string;
   value?: string;
   scope: EASEnvironmentVariableScopeFlagValue;
-  environment?: EnvironmentVariableEnvironment[];
+  environment?: string[];
   visibility?: 'plaintext' | 'sensitive' | 'secret';
   type?: 'string' | 'file';
   'variable-name'?: string;
-  'variable-environment'?: EnvironmentVariableEnvironment;
+  'variable-environment'?: string;
   'non-interactive': boolean;
 }
 
@@ -54,11 +54,11 @@ interface UpdateFlags {
   name?: string;
   value?: string;
   scope: EnvironmentVariableScope;
-  environment?: EnvironmentVariableEnvironment[];
+  environment?: string[];
   visibility?: 'plaintext' | 'sensitive' | 'secret';
   type?: 'string' | 'file';
   'variable-name'?: string;
-  'variable-environment'?: EnvironmentVariableEnvironment;
+  'variable-environment'?: string;
   'non-interactive': boolean;
 }
 
@@ -69,7 +69,7 @@ export default class EnvUpdate extends EasCommand {
     'variable-name': Flags.string({
       description: 'Current name of the variable',
     }),
-    'variable-environment': Flags.enum<EnvironmentVariableEnvironment>({
+    'variable-environment': Flags.string({
       ...EasEnvironmentFlagParameters,
       description: 'Current environment of the variable to update',
     }),
@@ -93,7 +93,7 @@ export default class EnvUpdate extends EasCommand {
     {
       name: 'environment',
       description:
-        "Current environment of the variable to update. One of 'production', 'preview', or 'development'.",
+        "Current environment of the variable to update. Default environments are 'production', 'preview', and 'development'.",
       required: false,
     },
   ];
@@ -180,15 +180,19 @@ export default class EnvUpdate extends EasCommand {
       visibility: newVisibility,
       type: newType,
       fileName,
-    } = await this.promptForMissingFlagsAsync(selectedVariable, {
-      name,
-      value: rawValue,
-      environment: environments,
-      visibility,
-      'non-interactive': nonInteractive,
-      type,
-      scope,
-    });
+    } = await this.promptForMissingFlagsAsync(
+      selectedVariable,
+      {
+        name,
+        value: rawValue,
+        environment: environments,
+        visibility,
+        'non-interactive': nonInteractive,
+        type,
+        scope,
+      },
+      { graphqlClient, projectId }
+    );
 
     const variable = await EnvironmentVariableMutation.updateAsync(graphqlClient, {
       id: selectedVariable.id,
@@ -226,12 +230,6 @@ export default class EnvUpdate extends EasCommand {
         : EnvironmentVariableScope.Project;
 
     if (environment) {
-      environment = environment.toUpperCase();
-      if (!isEnvironment(environment)) {
-        throw new Error(
-          "Invalid environment. Use one of 'production', 'preview', or 'development'."
-        );
-      }
       return {
         ...flags,
         'variable-environment': environment,
@@ -252,7 +250,8 @@ export default class EnvUpdate extends EasCommand {
       'non-interactive': nonInteractive,
       type,
       ...rest
-    }: UpdateFlags
+    }: UpdateFlags,
+    { graphqlClient, projectId }: { graphqlClient: ExpoGraphqlClient; projectId: string }
   ): Promise<
     Omit<UpdateFlags, 'type' | 'visibility'> & {
       type?: EnvironmentSecretType;
@@ -316,7 +315,10 @@ export default class EnvUpdate extends EasCommand {
         environments = await promptVariableEnvironmentAsync({
           nonInteractive,
           multiple: true,
+          canEnterCustomEnvironment: true,
           selectedEnvironments: selectedVariable.environments ?? [],
+          graphqlClient,
+          projectId,
         });
 
         if (

packages/eas-cli/src/commands/fingerprint/compare.ts

@@ -23,7 +23,6 @@ import {
   AppPlatform,
   BuildFragment,
   BuildStatus,
-  EnvironmentVariableEnvironment,
   FingerprintFragment,
   UpdateFragment,
 } from '../../graphql/generated';
@@ -97,7 +96,7 @@ export default class FingerprintCompare extends EasCommand {
     open: Flags.boolean({
       description: 'Open the fingerprint comparison in the browser',
     }),
-    environment: Flags.enum<EnvironmentVariableEnvironment>({
+    environment: Flags.string({
       ...EasEnvironmentFlagParameters,
       description:
         'If generating a fingerprint from the local directory, use the specified environment.',

packages/eas-cli/src/commands/fingerprint/generate.ts

@@ -15,7 +15,7 @@ import {
   getFingerprintInfoFromLocalProjectForPlatformsAsync,
   stringToAppPlatform,
 } from '../../fingerprint/utils';
-import { AppPlatform, EnvironmentVariableEnvironment } from '../../graphql/generated';
+import { AppPlatform } from '../../graphql/generated';
 import { AppQuery } from '../../graphql/queries/AppQuery';
 import Log, { link } from '../../log';
 import { promptAsync } from '../../prompts';
@@ -39,7 +39,7 @@ export default class FingerprintGenerate extends EasCommand {
       options: ['android', 'ios'],
     }),
     ...EASEnvironmentFlag,
-    environment: Flags.enum<EnvironmentVariableEnvironment>({
+    environment: Flags.string({
       ...EasEnvironmentFlagParameters,
       exclusive: ['build-profile'],
     }),

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

@@ -86,7 +86,7 @@ export default class MetadataPull extends EasCommand {
 - Update the ${chalk.bold(relativePath)} file to prepare the app information.
 - Run ${chalk.bold('eas submit')} or manually upload a new app version to the app stores.
 - Once the app is uploaded, run ${chalk.bold('eas metadata:push')} to sync the store config.
-- ${learnMore('https://docs.expo.dev/eas-metadata/introduction/')}`);
+- ${learnMore('https://docs.expo.dev/eas/metadata/')}`);
     } catch (error: any) {
       handleMetadataError(error);
     }

packages/eas-cli/src/commands/project/__tests__/new.test.ts

@@ -0,0 +1,714 @@
+import { ExpoConfig } from '@expo/config';
+import fs from 'fs-extra';
+import merge from 'ts-deepmerge';
+
+import { getEASUpdateURL } from '../../../api';
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import { jester, jester2 } from '../../../credentials/__tests__/fixtures-constants';
+import { AppFragment, Role } from '../../../graphql/generated';
+import { AppMutation } from '../../../graphql/mutations/AppMutation';
+import { canAccessRepositoryUsingSshAsync, runGitCloneAsync } from '../../../onboarding/git';
+import {
+  installDependenciesAsync,
+  promptForPackageManagerAsync,
+} from '../../../onboarding/installDependencies';
+import { runCommandAsync } from '../../../onboarding/runCommand';
+import { Ora, ora } from '../../../ora';
+import {
+  createOrModifyExpoConfigAsync,
+  getPrivateExpoConfigAsync,
+} from '../../../project/expoConfig';
+import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
+import { promptAsync } from '../../../prompts';
+import { Actor, getActorUsername } from '../../../user/User';
+import New, {
+  cloneTemplateAsync,
+  copyProjectTemplatesAsync,
+  createProjectAsync,
+  formatScriptCommand,
+  generateAppConfigAsync,
+  generateEasConfigAsync,
+  getAccountChoices,
+  initializeGitRepositoryAsync,
+  installProjectDependenciesAsync,
+  mergeReadmeAsync,
+  promptForTargetDirectoryAsync,
+  updatePackageJsonAsync,
+} from '../new';
+
+jest.mock('../../../prompts');
+jest.mock('../../../onboarding/git');
+jest.mock('../../../onboarding/runCommand');
+jest.mock('../../../graphql/mutations/AppMutation');
+jest.mock('../../../project/expoConfig');
+jest.mock('../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync');
+jest.mock('../../../user/User', () => ({
+  getActorUsername: jest.fn(),
+}));
+jest.mock('../../../ora');
+jest.mock('fs-extra');
+jest.mock('../../../onboarding/installDependencies');
+jest.mock('../../../api');
+jest.mock('../../../build/utils/url');
+jest.mock('../../../utils/easCli', () => ({
+  easCliVersion: '5.0.0',
+}));
+// Remove Log module mocking entirely - use the actual module
+
+describe(New.name, () => {
+  let consoleLogSpy: jest.SpyInstance;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    // Capture console.log calls
+    consoleLogSpy = jest.spyOn(console, 'log');
+
+    jest.mocked(fs.writeFile).mockImplementation(() => Promise.resolve());
+    jest.mocked(fs.readJson).mockImplementation(() => Promise.resolve({}));
+    jest.mocked(fs.writeJson).mockImplementation(() => Promise.resolve());
+    jest.mocked(fs.copy).mockImplementation(() => Promise.resolve());
+    jest.mocked(fs.remove).mockImplementation(() => Promise.resolve());
+    jest.mocked(fs.readFile).mockImplementation(() => Promise.resolve(''));
+  });
+
+  afterEach(() => {
+    consoleLogSpy.mockRestore();
+  });
+
+  // Helper function to get all console output as strings
+  const getConsoleOutput = (): string[] => {
+    return consoleLogSpy.mock.calls.map(call => (call.length === 0 ? '' : call.join(' ')));
+  };
+
+  // Helper function to check if a specific message was logged
+  const expectConsoleToContain = (message: string): void => {
+    const output = getConsoleOutput();
+    // strip out ANSI codes and special characters like the tick
+    const outputWithoutAnsi = output.map(line =>
+      line.replace(/\x1b\[[0-9;]*m/g, '').replace(/✔\s*/, '')
+    );
+    // throw new Error(message + '\n' + outputWithoutAnsi.join('\n'));
+    expect(outputWithoutAnsi.some(line => line.includes(message))).toBeTruthy();
+  };
+
+  // Helper function to verify prompt was called with expected message
+  const expectPromptToHaveMessage = (expectedMessage: string): void => {
+    expect(promptAsync).toHaveBeenCalledWith(
+      expect.objectContaining({
+        message: expectedMessage,
+      })
+    );
+  };
+
+  // Helper function to simulate user input via prompt
+  const mockUserInput = (inputValue: any): void => {
+    jest.mocked(promptAsync).mockResolvedValue(inputValue);
+  };
+
+  describe('helper functions', () => {
+    describe('promptForTargetDirectoryAsync', () => {
+      it('should prompt for target directory', async () => {
+        const promptedDirectory = '/test/prompted-project';
+        mockUserInput({ targetProjectDir: promptedDirectory });
+
+        const result = await promptForTargetDirectoryAsync();
+
+        expectConsoleToContain(
+          `🚚 Let's start by cloning the default Expo template project from GitHub and installing dependencies.`
+        );
+        expectPromptToHaveMessage('Where would you like to create your new project directory?');
+        expect(result).toBe(promptedDirectory);
+      });
+
+      it('should handle the target directory from args', async () => {
+        const providedDirectory = '/test/provided-project';
+        const result = await promptForTargetDirectoryAsync(providedDirectory);
+
+        expectConsoleToContain(
+          `🚚 Let's start by cloning the default Expo template project from GitHub and installing dependencies.`
+        );
+
+        expect(promptAsync).not.toHaveBeenCalled();
+
+        expect(result).toBe(providedDirectory);
+      });
+    });
+
+    describe('cloneTemplateAsync', () => {
+      it('should clone the template project with ssh', async () => {
+        const targetProjectDir = '/test/target-project';
+        const finalTargetProjectDir = '/test/final-target-project';
+
+        jest.mocked(canAccessRepositoryUsingSshAsync).mockResolvedValue(true);
+        jest.mocked(runGitCloneAsync).mockResolvedValue({
+          targetProjectDir: finalTargetProjectDir,
+        });
+
+        const result = await cloneTemplateAsync(targetProjectDir);
+
+        expectConsoleToContain(`📂 Cloning the project to ${targetProjectDir}`);
+        expectConsoleToContain('We detected that ssh is your preferred git clone method');
+
+        expect(runGitCloneAsync).toHaveBeenCalledWith({
+          githubUsername: 'expo',
+          githubRepositoryName: 'expo-template-default',
+          targetProjectDir,
+          cloneMethod: 'ssh',
+        });
+
+        expect(result).toBe(finalTargetProjectDir);
+      });
+
+      it('should clone the template project with https', async () => {
+        const targetProjectDir = '/test/target-project';
+        const finalTargetProjectDir = '/test/final-target-project';
+
+        jest.mocked(canAccessRepositoryUsingSshAsync).mockResolvedValue(false);
+        jest.mocked(runGitCloneAsync).mockResolvedValue({
+          targetProjectDir: finalTargetProjectDir,
+        });
+
+        const result = await cloneTemplateAsync(targetProjectDir);
+
+        expectConsoleToContain(`📂 Cloning the project to ${targetProjectDir}`);
+        expectConsoleToContain('We detected that https is your preferred git clone method');
+
+        expect(runGitCloneAsync).toHaveBeenCalledWith({
+          githubUsername: 'expo',
+          githubRepositoryName: 'expo-template-default',
+          targetProjectDir,
+          cloneMethod: 'https',
+        });
+
+        expect(result).toBe(finalTargetProjectDir);
+      });
+    });
+
+    describe('installProjectDependenciesAsync', () => {
+      it('should install the project dependencies', async () => {
+        const projectDir = '/test/project-directory';
+
+        jest.mocked(promptForPackageManagerAsync).mockResolvedValue('npm');
+        jest.mocked(installDependenciesAsync).mockResolvedValue();
+        jest.mocked(runCommandAsync).mockResolvedValue();
+
+        const packageManager = await installProjectDependenciesAsync(projectDir);
+        expect(packageManager).toBe('npm');
+
+        expect(promptForPackageManagerAsync).toHaveBeenCalled();
+        expect(installDependenciesAsync).toHaveBeenCalledWith({
+          projectDir,
+          packageManager: 'npm',
+        });
+
+        expect(runCommandAsync).toHaveBeenCalledWith({
+          cwd: projectDir,
+          command: 'npx',
+          args: ['expo', 'install', 'expo-updates'],
+        });
+
+        expect(runCommandAsync).toHaveBeenCalledWith({
+          cwd: projectDir,
+          command: 'npx',
+          args: ['expo', 'install', '@expo/metro-runtime'],
+        });
+      });
+    });
+
+    describe('getAccountChoices', () => {
+      it('should return mapped account choices', () => {
+        // Use jester fixture which has multiple accounts with different permissions
+        const namesWithSufficientPermissions = new Set(['jester']); // Only personal account has permissions
+
+        const result = getAccountChoices(jester, namesWithSufficientPermissions);
+
+        expect(result).toEqual([
+          {
+            title: 'jester (personal account)',
+            value: { name: 'jester' },
+          },
+          {
+            title: 'other',
+            value: { name: 'other' },
+            disabled: true,
+            description:
+              'You do not have the required permissions to create projects on this account.',
+          },
+        ]);
+      });
+    });
+
+    describe('createProjectAsync', () => {
+      const mockGraphqlClient = {} as ExpoGraphqlClient;
+      const projectDir = '/test/project-dir';
+      const mockProjectId = 'test-project-id';
+
+      beforeEach(() => {
+        // use single-account jester for most of the tests
+        jest.mocked(getActorUsername).mockReturnValue('jester2');
+
+        jest.mocked(getPrivateExpoConfigAsync).mockResolvedValue({
+          name: 'test-app',
+          slug: 'test-app',
+          extra: {},
+        } as ExpoConfig);
+
+        jest.mocked(createOrModifyExpoConfigAsync).mockResolvedValue({
+          type: 'success' as const,
+          message: 'Config updated',
+          config: {
+            name: 'test-app',
+            slug: 'test-app',
+            extra: { eas: { projectId: 'test-project-id' } },
+          } as ExpoConfig,
+        });
+
+        const mockSpinner: Partial<Ora> = {
+          start: jest.fn().mockReturnThis(),
+          succeed: jest.fn().mockReturnThis(),
+          fail: jest.fn().mockReturnThis(),
+        };
+        jest.mocked(ora).mockReturnValue(mockSpinner as Ora);
+      });
+
+      it('should create a project', async () => {
+        const mockActor = jester2 as Actor;
+
+        jest.mocked(findProjectIdByAccountNameAndSlugNullableAsync).mockResolvedValue(null);
+        jest.mocked(AppMutation.createAppAsync).mockResolvedValue(mockProjectId);
+
+        const result = await createProjectAsync(mockGraphqlClient, mockActor, projectDir);
+
+        expect(findProjectIdByAccountNameAndSlugNullableAsync).toHaveBeenCalledWith(
+          mockGraphqlClient,
+          'jester2',
+          'jester2-app'
+        );
+
+        expect(AppMutation.createAppAsync).toHaveBeenCalledWith(mockGraphqlClient, {
+          accountId: 'jester2-account-id',
+          projectName: 'jester2-app',
+        });
+
+        expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith(
+          projectDir,
+          {
+            extra: { eas: { projectId: mockProjectId } },
+          },
+          { skipSDKVersionRequirement: true }
+        );
+
+        expect(result).toBe(mockProjectId);
+      });
+
+      it('should create a project when there are multiple accounts', async () => {
+        // Use jester fixture which has multiple accounts
+        const mockActor = jester;
+
+        jest.mocked(getActorUsername).mockReturnValue('jester');
+        jest.mocked(promptAsync).mockResolvedValue({
+          account: { name: 'jester' },
+        });
+
+        jest.mocked(findProjectIdByAccountNameAndSlugNullableAsync).mockResolvedValue(null);
+
+        jest.mocked(AppMutation.createAppAsync).mockResolvedValue(mockProjectId);
+
+        const result = await createProjectAsync(mockGraphqlClient, mockActor, projectDir);
+
+        expect(promptAsync).toHaveBeenCalledWith({
+          type: 'select',
+          name: 'account',
+          message: 'Which account should own this project?',
+          choices: expect.any(Array),
+        });
+
+        expect(findProjectIdByAccountNameAndSlugNullableAsync).toHaveBeenCalledWith(
+          mockGraphqlClient,
+          'jester',
+          'jester-app'
+        );
+
+        expect(AppMutation.createAppAsync).toHaveBeenCalledWith(mockGraphqlClient, {
+          accountId: 'jester-account-id',
+          projectName: 'jester-app',
+        });
+
+        expect(result).toBe(mockProjectId);
+      });
+
+      it('should throw when the project already exists', async () => {
+        const mockActor = jester2 as Actor;
+
+        const existingProjectId = 'existing-project-id';
+        jest
+          .mocked(findProjectIdByAccountNameAndSlugNullableAsync)
+          .mockResolvedValue(existingProjectId);
+
+        await expect(createProjectAsync(mockGraphqlClient, mockActor, projectDir)).rejects.toThrow(
+          `Existing project found: @jester2/jester2-app (ID: ${existingProjectId}). Project ID configuration canceled. Re-run the command to select a different account/project.`
+        );
+
+        expect(AppMutation.createAppAsync).not.toHaveBeenCalled();
+      });
+
+      it('should throw when the user does not have permission to create projects on account', async () => {
+        // Create a custom actor with ViewOnly permissions for this test
+        const mockActor = merge(jester2, {
+          accounts: [{ users: [{ actor: { id: 'view-only-jester' }, role: Role.ViewOnly }] }],
+        }) as Actor;
+
+        jest.mocked(getActorUsername).mockReturnValue('view-only-jester');
+        jest.mocked(findProjectIdByAccountNameAndSlugNullableAsync).mockResolvedValue(null);
+
+        await expect(createProjectAsync(mockGraphqlClient, mockActor, projectDir)).rejects.toThrow(
+          `You don't have permission to create a new project on the jester account and no matching project already exists on the account.`
+        );
+
+        expect(AppMutation.createAppAsync).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('generateAppConfigAsync', () => {
+      const projectDir = '/test/project-dir';
+      const mockUpdateUrl = 'https://u.expo.dev/test-project-id';
+
+      const createMockApp = (overrides: Partial<AppFragment> = {}): AppFragment => ({
+        id: 'test-project-id',
+        name: 'Test App',
+        fullName: '@testowner/test-app',
+        slug: 'test-app',
+        ownerAccount: {
+          id: 'testowner-account-id',
+          name: 'testowner',
+          users: [],
+        },
+        ...overrides,
+      });
+
+      beforeEach(() => {
+        jest.mocked(getEASUpdateURL).mockReturnValue(mockUpdateUrl);
+
+        jest.mocked(fs.readJson).mockResolvedValue({
+          expo: {} as ExpoConfig,
+        });
+      });
+
+      it('should generate the app config', async () => {
+        const mockApp = createMockApp();
+        jest.mocked(fs.readJson).mockResolvedValue({
+          expo: {
+            name: 'value-to-override',
+            slug: 'value-to-override',
+            icon: 'value-to-keep',
+          } as ExpoConfig,
+        });
+
+        await generateAppConfigAsync(projectDir, mockApp);
+
+        expect(getEASUpdateURL).toHaveBeenCalledWith('test-project-id', null);
+
+        const expectedConfig = {
+          expo: {
+            name: 'Test App',
+            slug: 'test-app',
+            scheme: 'TestApp',
+            icon: 'value-to-keep',
+            extra: {
+              eas: {
+                projectId: 'test-project-id',
+              },
+            },
+            owner: 'testowner',
+            updates: {
+              url: mockUpdateUrl,
+            },
+            runtimeVersion: {
+              policy: 'appVersion',
+            },
+            ios: {
+              bundleIdentifier: 'com.testowner.testapp',
+            },
+            android: {
+              package: 'com.testowner.testapp',
+            },
+          },
+        };
+
+        expect(fs.writeJson).toHaveBeenCalledWith(`${projectDir}/app.json`, expectedConfig, {
+          spaces: 2,
+        });
+
+        expectConsoleToContain('Generated app.json');
+      });
+
+      it('should handle invalid characters in the bundle identifier', async () => {
+        const mockApp = createMockApp({
+          slug: 'test-app-with-dashes',
+          ownerAccount: {
+            id: 'test-owner-account-id',
+            name: 'test-owner',
+            users: [],
+          },
+        });
+
+        await generateAppConfigAsync(projectDir, mockApp);
+
+        expect(fs.writeJson).toHaveBeenCalledWith(
+          `${projectDir}/app.json`,
+          expect.objectContaining({
+            expo: expect.objectContaining({
+              ios: expect.objectContaining({
+                bundleIdentifier: 'com.testowner.testappwithdashes',
+              }),
+            }),
+          }),
+          { spaces: 2 }
+        );
+      });
+
+      it('should handle invalid characters in the owner account name', async () => {
+        const mockApp = createMockApp({
+          slug: 'testapp',
+          ownerAccount: {
+            id: 'test-owner-123-account-id',
+            name: 'test-owner-123',
+            users: [],
+          },
+        });
+
+        await generateAppConfigAsync(projectDir, mockApp);
+
+        expect(fs.writeJson).toHaveBeenCalledWith(
+          `${projectDir}/app.json`,
+          expect.objectContaining({
+            expo: expect.objectContaining({
+              ios: expect.objectContaining({
+                bundleIdentifier: 'com.testowner123.testapp',
+              }),
+            }),
+          }),
+          { spaces: 2 }
+        );
+      });
+
+      it('should handle invalid characters in the slug', async () => {
+        const mockApp = createMockApp({
+          slug: 'test@app#with$symbols',
+          fullName: '@testowner/test@app#with$symbols',
+        });
+
+        await generateAppConfigAsync(projectDir, mockApp);
+
+        expect(fs.writeJson).toHaveBeenCalledWith(
+          `${projectDir}/app.json`,
+          expect.objectContaining({
+            expo: expect.objectContaining({
+              ios: expect.objectContaining({
+                bundleIdentifier: 'com.testowner.testappwithsymbols',
+              }),
+            }),
+          }),
+          { spaces: 2 }
+        );
+      });
+    });
+
+    describe('generateEasConfigAsync', () => {
+      const projectDir = '/test/project-dir';
+
+      it('should generate the eas config', async () => {
+        const expectedEasConfig = {
+          cli: {
+            version: '>= 5.0.0',
+            appVersionSource: 'remote',
+          },
+          build: {
+            development: {
+              developmentClient: true,
+              distribution: 'internal',
+              android: { image: 'latest' },
+              ios: { image: 'latest' },
+            },
+            'development-simulator': {
+              extends: 'development',
+              ios: { simulator: true },
+            },
+            preview: {
+              distribution: 'internal',
+              channel: 'main',
+              android: { image: 'latest' },
+              ios: { image: 'latest' },
+            },
+            production: {
+              channel: 'production',
+              autoIncrement: true,
+              android: { image: 'latest' },
+              ios: { image: 'latest' },
+            },
+          },
+          submit: {
+            production: {},
+          },
+        };
+
+        await generateEasConfigAsync(projectDir);
+
+        expect(fs.writeJson).toHaveBeenCalledWith(`${projectDir}/eas.json`, expectedEasConfig, {
+          spaces: 2,
+        });
+
+        expectConsoleToContain('Generated eas.json');
+      });
+    });
+
+    describe('updatePackageJsonAsync', () => {
+      it('should update the package.json', async () => {
+        jest.mocked(fs.readJson).mockResolvedValue({
+          name: 'test-app',
+          version: '1.0.0',
+        });
+        const projectDir = '/test/project-dir';
+        await updatePackageJsonAsync(projectDir);
+
+        const expectedPackageJson = {
+          name: 'test-app',
+          version: '1.0.0',
+          scripts: {
+            preview: 'npx eas-cli@latest workflow:run publish-preview-update.yml',
+            'development-builds': 'npx eas-cli@latest workflow:run create-development-builds.yml',
+            deploy: 'npx eas-cli@latest workflow:run deploy-to-production.yml',
+          },
+        };
+
+        expect(fs.writeJson).toHaveBeenCalledWith(
+          `${projectDir}/package.json`,
+          expectedPackageJson,
+          { spaces: 2 }
+        );
+
+        expectConsoleToContain('Updated package.json with scripts');
+      });
+    });
+
+    describe('copyProjectTemplatesAsync', () => {
+      it('should copy the project templates', async () => {
+        const projectDir = '/test/project-dir';
+
+        await copyProjectTemplatesAsync(projectDir);
+
+        expect(fs.copy).toHaveBeenCalledWith(
+          expect.stringContaining('templates/.eas/workflows'),
+          expect.stringContaining('.eas/workflows'),
+          { errorOnExist: false, overwrite: true }
+        );
+
+        expectConsoleToContain('Created EAS workflow files');
+      });
+    });
+
+    describe('mergeReadmeAsync', () => {
+      const projectDir = '/test/project-dir';
+
+      it('should merge readme when target section is found', async () => {
+        const existingReadme = `# My App
+
+This is my app.
+
+## Get a fresh project
+
+Some content here.`;
+
+        const readmeAdditions = `## Workflows
+
+This project uses EAS Workflows.`;
+
+        (jest.mocked(fs.readFile) as jest.Mock).mockResolvedValueOnce(readmeAdditions);
+        (jest.mocked(fs.readFile) as jest.Mock).mockResolvedValueOnce(existingReadme);
+
+        await mergeReadmeAsync(projectDir);
+
+        const expectedMergedReadme = `# My App
+
+This is my app.
+
+## Workflows
+
+This project uses EAS Workflows.
+
+## Get a fresh project
+
+Some content here.`;
+
+        expect(fs.writeFile).toHaveBeenCalledWith(`${projectDir}/README.md`, expectedMergedReadme);
+
+        expectConsoleToContain('Updated README.md with EAS configuration details');
+      });
+
+      it('should append readme when target section is not found', async () => {
+        const existingReadme = `# My App
+
+This is my app.`;
+
+        const readmeAdditions = `## Workflows
+
+This project uses EAS Workflows.`;
+
+        (jest.mocked(fs.readFile) as jest.Mock).mockResolvedValueOnce(readmeAdditions);
+        (jest.mocked(fs.readFile) as jest.Mock).mockResolvedValueOnce(existingReadme);
+
+        await mergeReadmeAsync(projectDir);
+
+        const expectedMergedReadme = `# My App
+
+This is my app.
+
+## Workflows
+
+This project uses EAS Workflows.
+`;
+
+        expect(fs.writeFile).toHaveBeenCalledWith(`${projectDir}/README.md`, expectedMergedReadme);
+
+        expectConsoleToContain('Updated README.md with EAS configuration details');
+      });
+    });
+
+    describe('initializeGitRepositoryAsync', () => {
+      it('should initialize git repository', async () => {
+        const projectDir = '/test/project-dir';
+
+        await initializeGitRepositoryAsync(projectDir);
+
+        expect(fs.remove).toHaveBeenCalledWith(`${projectDir}/.git`);
+
+        expect(runCommandAsync).toHaveBeenCalledWith({
+          command: 'git',
+          args: ['init'],
+          cwd: projectDir,
+        });
+
+        expect(runCommandAsync).toHaveBeenCalledWith({
+          command: 'git',
+          args: ['add', '.'],
+          cwd: projectDir,
+        });
+
+        expect(runCommandAsync).toHaveBeenCalledWith({
+          command: 'git',
+          args: ['commit', '-m', 'Initial commit'],
+          cwd: projectDir,
+        });
+      });
+    });
+
+    describe('formatScriptCommand', () => {
+      it('should format script commands for package managers', () => {
+        expect(formatScriptCommand('start', 'npm')).toBe('npm run start');
+        expect(formatScriptCommand('start', 'yarn')).toBe('yarn start');
+        expect(formatScriptCommand('start', 'pnpm')).toBe('pnpm start');
+      });
+    });
+  });
+});

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

@@ -0,0 +1,472 @@
+import { ExpoConfig } from '@expo/config';
+import { AppVersionSource, EasJson } from '@expo/eas-json';
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import nullthrows from 'nullthrows';
+import path from 'path';
+import merge from 'ts-deepmerge';
+
+import { getEASUpdateURL } from '../../api';
+import { getProjectDashboardUrl } from '../../build/utils/url';
+import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { AppFragment, Role } from '../../graphql/generated';
+import { AppMutation } from '../../graphql/mutations/AppMutation';
+import { AppQuery } from '../../graphql/queries/AppQuery';
+import Log, { learnMore, link } from '../../log';
+import { canAccessRepositoryUsingSshAsync, runGitCloneAsync } from '../../onboarding/git';
+import {
+  PackageManager,
+  installDependenciesAsync,
+  promptForPackageManagerAsync,
+} from '../../onboarding/installDependencies';
+import { runCommandAsync } from '../../onboarding/runCommand';
+import { ora } from '../../ora';
+import { createOrModifyExpoConfigAsync, getPrivateExpoConfigAsync } from '../../project/expoConfig';
+import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
+import { Choice, promptAsync } from '../../prompts';
+import { Actor, getActorUsername } from '../../user/User';
+import { easCliVersion } from '../../utils/easCli';
+
+export async function promptForTargetDirectoryAsync(
+  targetProjectDirFromArgs?: string
+): Promise<string> {
+  Log.log(
+    `🚚 Let's start by cloning the default Expo template project from GitHub and installing dependencies.`
+  );
+  Log.newLine();
+
+  if (targetProjectDirFromArgs) {
+    return targetProjectDirFromArgs;
+  }
+
+  const result = await promptAsync({
+    type: 'text',
+    name: 'targetProjectDir',
+    message: 'Where would you like to create your new project directory?',
+    initial: path.join(process.cwd(), 'new-expo-project'),
+  });
+
+  return result.targetProjectDir;
+}
+
+export async function cloneTemplateAsync(targetProjectDir: string): Promise<string> {
+  const githubUsername = 'expo';
+  const githubRepositoryName = 'expo-template-default';
+
+  Log.log(`📂 Cloning the project to ${targetProjectDir}`);
+  Log.newLine();
+
+  const cloneMethod = (await canAccessRepositoryUsingSshAsync({
+    githubUsername,
+    githubRepositoryName,
+  }))
+    ? 'ssh'
+    : 'https';
+  Log.log(chalk.dim(`We detected that ${cloneMethod} is your preferred git clone method`));
+  Log.newLine();
+
+  const { targetProjectDir: finalTargetProjectDirectory } = await runGitCloneAsync({
+    githubUsername,
+    githubRepositoryName,
+    targetProjectDir,
+    cloneMethod,
+  });
+
+  return finalTargetProjectDirectory;
+}
+
+export async function installProjectDependenciesAsync(projectDir: string): Promise<PackageManager> {
+  const packageManager = await promptForPackageManagerAsync();
+  await installDependenciesAsync({
+    projectDir,
+    packageManager,
+  });
+
+  const dependencies = ['expo-updates', '@expo/metro-runtime'];
+  for (const dependency of dependencies) {
+    await runCommandAsync({
+      cwd: projectDir,
+      command: 'npx',
+      args: ['expo', 'install', dependency],
+    });
+  }
+  return packageManager;
+}
+
+export function getAccountChoices(
+  actor: Actor,
+  namesWithSufficientPermissions: Set<string>
+): Choice[] {
+  const sortedAccounts = actor.accounts.sort((a, _b) =>
+    actor.__typename === 'User' ? (a.name === actor.username ? -1 : 1) : 0
+  );
+
+  return sortedAccounts.map(account => {
+    const isPersonalAccount = actor.__typename === 'User' && account.name === actor.username;
+    const accountDisplayName = isPersonalAccount
+      ? `${account.name} (personal account)`
+      : account.name;
+    const disabled = !namesWithSufficientPermissions.has(account.name);
+
+    return {
+      title: accountDisplayName,
+      value: { name: account.name },
+      ...(disabled && {
+        disabled: true,
+        description: 'You do not have the required permissions to create projects on this account.',
+      }),
+    };
+  });
+}
+
+export async function createProjectAsync(
+  graphqlClient: ExpoGraphqlClient,
+  actor: Actor,
+  projectDir: string
+): Promise<string> {
+  const allAccounts = actor.accounts;
+  const accountNamesWhereUserHasSufficientPermissionsToCreateApp = new Set(
+    allAccounts
+      .filter(a => a.users.find(it => it.actor.id === actor.id)?.role !== Role.ViewOnly)
+      .map(it => it.name)
+  );
+
+  let accountName = allAccounts[0].name;
+  if (allAccounts.length > 1) {
+    const choices = getAccountChoices(
+      actor,
+      accountNamesWhereUserHasSufficientPermissionsToCreateApp
+    );
+
+    accountName = (
+      await promptAsync({
+        type: 'select',
+        name: 'account',
+        message: 'Which account should own this project?',
+        choices,
+      })
+    ).account.name;
+  }
+
+  const projectName = getActorUsername(actor) + '-app';
+  const projectFullName = `@${accountName}/${projectName}`;
+  const existingProjectIdOnServer = await findProjectIdByAccountNameAndSlugNullableAsync(
+    graphqlClient,
+    accountName,
+    projectName
+  );
+
+  if (existingProjectIdOnServer) {
+    throw new Error(
+      `Existing project found: ${projectFullName} (ID: ${existingProjectIdOnServer}). Project ID configuration canceled. Re-run the command to select a different account/project.`
+    );
+  }
+
+  if (!accountNamesWhereUserHasSufficientPermissionsToCreateApp.has(accountName)) {
+    throw new Error(
+      `You don't have permission to create a new project on the ${accountName} account and no matching project already exists on the account.`
+    );
+  }
+
+  const projectDashboardUrl = getProjectDashboardUrl(accountName, projectName);
+  const projectLink = link(projectDashboardUrl, { text: projectFullName });
+
+  const account = nullthrows(allAccounts.find(a => a.name === accountName));
+
+  const spinner = ora(`Creating ${chalk.bold(projectFullName)}`).start();
+  let projectId: string;
+  try {
+    projectId = await AppMutation.createAppAsync(graphqlClient, {
+      accountId: account.id,
+      projectName,
+    });
+    spinner.succeed(`Created ${chalk.bold(projectLink)}`);
+  } catch (err) {
+    spinner.fail();
+    throw err;
+  }
+
+  const exp = await getPrivateExpoConfigAsync(projectDir, { skipPlugins: true });
+  await createOrModifyExpoConfigAsync(
+    projectDir,
+    {
+      extra: { ...exp.extra, eas: { ...exp.extra?.eas, projectId } },
+    },
+    { skipSDKVersionRequirement: true }
+  );
+  Log.withTick(`Project successfully linked (ID: ${chalk.bold(projectId)}) (modified app.json)`);
+
+  return projectId;
+}
+
+export function stripInvalidCharactersForBundleIdentifier(string: string): string {
+  return string.replaceAll(/[^A-Za-z0-9]/g, '');
+}
+
+export async function generateConfigFilesAsync(
+  projectDir: string,
+  app: AppFragment
+): Promise<void> {
+  await generateAppConfigAsync(projectDir, app);
+
+  await generateEasConfigAsync(projectDir);
+
+  await updatePackageJsonAsync(projectDir);
+
+  await copyProjectTemplatesAsync(projectDir);
+
+  await mergeReadmeAsync(projectDir);
+}
+
+export async function generateAppConfigAsync(projectDir: string, app: AppFragment): Promise<void> {
+  // Android package name requires each component to start with a lowercase letter.
+  const isUsernameValidSegment = /^[^a-z]/.test(app.ownerAccount.name);
+  const userPrefix = isUsernameValidSegment ? 'user' : '';
+  const isSlugValidSegment = /^[^a-z]/.test(app.slug);
+  const slugPrefix = isSlugValidSegment ? 'app' : '';
+
+  const bundleIdentifier = `com.${userPrefix}${stripInvalidCharactersForBundleIdentifier(
+    app.ownerAccount.name
+  )}.${slugPrefix}${stripInvalidCharactersForBundleIdentifier(app.slug)}`;
+  const updateUrl = getEASUpdateURL(app.id, /* manifestHostOverride */ null);
+
+  const { expo: baseExpoConfig } = await fs.readJson(path.join(projectDir, 'app.json'));
+  const expoConfig: ExpoConfig = {
+    name: app.name ?? app.slug,
+    slug: app.slug,
+    scheme: stripInvalidCharactersForBundleIdentifier(app.name ?? app.slug),
+    extra: {
+      eas: {
+        projectId: app.id,
+      },
+    },
+    owner: app.ownerAccount.name,
+    updates: {
+      url: updateUrl,
+    },
+    runtimeVersion: {
+      policy: 'appVersion',
+    },
+    ios: {
+      bundleIdentifier,
+    },
+    android: {
+      package: bundleIdentifier,
+    },
+  };
+  const mergedConfig = merge(baseExpoConfig, expoConfig);
+
+  const appJsonPath = path.join(projectDir, 'app.json');
+  await fs.writeJson(appJsonPath, { expo: mergedConfig }, { spaces: 2 });
+  Log.withTick(
+    `Generated ${chalk.bold('app.json')}. ${learnMore(
+      'https://docs.expo.dev/versions/latest/config/app/'
+    )}`
+  );
+  Log.log();
+}
+
+export async function generateEasConfigAsync(projectDir: string): Promise<void> {
+  const easBuildGitHubConfig = {
+    android: {
+      image: 'latest',
+    },
+    ios: {
+      image: 'latest',
+    },
+  };
+
+  const easJson: EasJson = {
+    cli: {
+      version: `>= ${easCliVersion}`,
+      appVersionSource: AppVersionSource.REMOTE,
+    },
+    build: {
+      development: {
+        developmentClient: true,
+        distribution: 'internal',
+        ...easBuildGitHubConfig,
+      },
+      'development-simulator': {
+        extends: 'development',
+        ios: {
+          simulator: true,
+        },
+      },
+      preview: {
+        distribution: 'internal',
+        channel: 'main',
+        ...easBuildGitHubConfig,
+      },
+      production: {
+        channel: 'production',
+        autoIncrement: true,
+        ...easBuildGitHubConfig,
+      },
+    },
+    submit: {
+      production: {},
+    },
+  };
+
+  const easJsonPath = path.join(projectDir, 'eas.json');
+  await fs.writeJson(easJsonPath, easJson, { spaces: 2 });
+  Log.withTick(
+    `Generated ${chalk.bold('eas.json')}. ${learnMore(
+      'https://docs.expo.dev/build-reference/eas-json/'
+    )}`
+  );
+  Log.log();
+}
+
+export async function updatePackageJsonAsync(projectDir: string): Promise<void> {
+  const packageJsonPath = path.join(projectDir, 'package.json');
+  const packageJson = await fs.readJson(packageJsonPath);
+
+  if (!packageJson.scripts) {
+    packageJson.scripts = {};
+  }
+  packageJson.scripts.preview = 'npx eas-cli@latest workflow:run publish-preview-update.yml';
+  packageJson.scripts['development-builds'] =
+    'npx eas-cli@latest workflow:run create-development-builds.yml';
+  packageJson.scripts.deploy = 'npx eas-cli@latest workflow:run deploy-to-production.yml';
+
+  await fs.writeJson(packageJsonPath, packageJson, { spaces: 2 });
+  Log.withTick('Updated package.json with scripts');
+  Log.log();
+}
+
+export async function copyProjectTemplatesAsync(projectDir: string): Promise<void> {
+  const templatesSourceDir = path.join(__dirname, 'templates', '.eas', 'workflows');
+  const easWorkflowsTargetDir = path.join(projectDir, '.eas', 'workflows');
+
+  await fs.copy(templatesSourceDir, easWorkflowsTargetDir, {
+    overwrite: true,
+    errorOnExist: false,
+  });
+
+  Log.withTick('Created EAS workflow files');
+  Log.log();
+}
+
+export async function mergeReadmeAsync(projectDir: string): Promise<void> {
+  const readmeTemplatePath = path.join(__dirname, 'templates', 'readme-additions.md');
+  const projectReadmePath = path.join(projectDir, 'README.md');
+
+  const readmeAdditions = await fs.readFile(readmeTemplatePath, 'utf8');
+  const existingReadme = await fs.readFile(projectReadmePath, 'utf8');
+
+  const targetSection = '## Get a fresh project';
+  const sectionIndex = existingReadme.indexOf(targetSection);
+
+  let mergedReadme: string;
+  if (sectionIndex !== -1) {
+    // Insert before "## Get a fresh project" section
+    const beforeSection = existingReadme.substring(0, sectionIndex).trim();
+    const afterSection = existingReadme.substring(sectionIndex);
+    mergedReadme = beforeSection + '\n\n' + readmeAdditions.trim() + '\n\n' + afterSection;
+  } else {
+    // Append to the end if section doesn't exist
+    mergedReadme = existingReadme.trim() + '\n\n' + readmeAdditions.trim() + '\n';
+  }
+
+  await fs.writeFile(projectReadmePath, mergedReadme);
+
+  Log.withTick('Updated README.md with EAS configuration details');
+  Log.log();
+}
+
+export async function initializeGitRepositoryAsync(projectDir: string): Promise<void> {
+  await fs.remove(path.join(projectDir, '.git'));
+
+  const commands = [['init'], ['add', '.'], ['commit', '-m', 'Initial commit']];
+
+  for (const args of commands) {
+    await runCommandAsync({
+      cwd: projectDir,
+      command: 'git',
+      args,
+    });
+    Log.log();
+  }
+}
+
+export const formatScriptCommand = (script: string, packageManager: PackageManager): string => {
+  if (packageManager === 'npm') {
+    return `npm run ${script}`;
+  }
+  return `${packageManager} ${script}`;
+};
+
+export default class New extends EasCommand {
+  static override aliases = ['new'];
+
+  static override description = "create a new project set up with Expo's services.";
+
+  static override flags = {};
+
+  static override hidden = true;
+
+  static override args = [{ name: 'TARGET_PROJECT_DIRECTORY' }];
+
+  static override contextDefinition = {
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  async runAsync(): Promise<void> {
+    const { args } = await this.parse(New);
+
+    const {
+      loggedIn: { actor, graphqlClient },
+    } = await this.getContextAsync(New, { nonInteractive: false });
+
+    if (actor.__typename === 'Robot') {
+      throw new Error(
+        'This command is not available for robot users. Make sure you are not using a robot token and try again.'
+      );
+    }
+
+    Log.warn(
+      'This command is not yet implemented. It will create a new project, but it will not be fully configured.'
+    );
+    Log.log(`👋 Welcome to Expo, ${actor.username}!`);
+    Log.newLine();
+
+    const targetProjectDirectory = await promptForTargetDirectoryAsync(
+      args.TARGET_PROJECT_DIRECTORY
+    );
+    const projectDirectory = await cloneTemplateAsync(targetProjectDirectory);
+
+    const packageManager = await installProjectDependenciesAsync(projectDirectory);
+
+    const projectId = await createProjectAsync(graphqlClient, actor, projectDirectory);
+
+    const app = await AppQuery.byIdAsync(graphqlClient, projectId);
+    await generateConfigFilesAsync(projectDirectory, app);
+
+    await initializeGitRepositoryAsync(projectDirectory);
+
+    Log.log('🎉 We finished creating your new project.');
+    Log.log('Next steps:');
+    Log.withInfo(`Run \`cd ${projectDirectory}\` to navigate to your project.`);
+    Log.withInfo(
+      `Run \`${formatScriptCommand(
+        'preview',
+        packageManager
+      )}\` to create a preview build on EAS. ${learnMore(
+        'https://docs.expo.dev/eas/workflows/examples/publish-preview-update/'
+      )}`
+    );
+    Log.withInfo(
+      `Run \`${formatScriptCommand(
+        'start',
+        packageManager
+      )}\` to start developing locally. ${learnMore(
+        'https://docs.expo.dev/get-started/start-developing/'
+      )}`
+    );
+    Log.withInfo(`See the README.md for more information about your project.`);
+    Log.newLine();
+  }
+}

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

@@ -152,7 +152,7 @@ export default class Onboarding extends EasCommand {
     }))
       ? 'ssh'
       : 'https';
-    Log.log(chalk.dim(`We detected that ${cloneMethod} is your preffered git clone method`));
+    Log.log(chalk.dim(`We detected that ${cloneMethod} is your preferred git clone method`));
     Log.log();
 
     const { targetProjectDir: finalTargetProjectDirectory } = await runGitCloneAsync({

packages/eas-cli/src/commands/project/templates/.eas/workflows/create-development-builds.yml

@@ -0,0 +1,21 @@
+name: Create development builds
+
+jobs:
+  android_development_build:
+    name: Build Android
+    type: build
+    params:
+      platform: android
+      profile: development
+  ios_device_development_build:
+    name: Build iOS device
+    type: build
+    params:
+      platform: ios
+      profile: development
+  ios_simulator_development_build:
+    name: Build iOS simulator
+    type: build
+    params:
+      platform: ios
+      profile: development-simulator

packages/eas-cli/src/commands/project/templates/.eas/workflows/deploy-to-production.yml

@@ -0,0 +1,68 @@
+name: Deploy to production
+
+on:
+  push:
+    branches: ['main']
+
+jobs:
+  fingerprint:
+    name: Fingerprint
+    type: fingerprint
+  get_android_build:
+    name: Check for existing android build
+    needs: [fingerprint]
+    type: get-build
+    params:
+      fingerprint_hash: ${{ needs.fingerprint.outputs.android_fingerprint_hash }}
+      profile: production
+  get_ios_build:
+    name: Check for existing ios build
+    needs: [fingerprint]
+    type: get-build
+    params:
+      fingerprint_hash: ${{ needs.fingerprint.outputs.ios_fingerprint_hash }}
+      profile: production
+  build_android:
+    name: Build Android
+    needs: [get_android_build]
+    if: ${{ !needs.get_android_build.outputs.build_id }}
+    type: build
+    params:
+      platform: android
+      profile: production
+  build_ios:
+    name: Build iOS
+    needs: [get_ios_build]
+    if: ${{ !needs.get_ios_build.outputs.build_id }}
+    type: build
+    params:
+      platform: ios
+      profile: production
+  submit_android_build:
+    name: Submit Android Build
+    needs: [build_android]
+    type: submit
+    params:
+      build_id: ${{ needs.build_android.outputs.build_id }}
+  submit_ios_build:
+    name: Submit iOS Build
+    needs: [build_ios]
+    type: submit
+    params:
+      build_id: ${{ needs.build_ios.outputs.build_id }}
+  publish_android_update:
+    name: Publish Android update
+    needs: [get_android_build]
+    if: ${{ needs.get_android_build.outputs.build_id }}
+    type: update
+    params:
+      branch: production
+      platform: android
+  publish_ios_update:
+    name: Publish iOS update
+    needs: [get_ios_build]
+    if: ${{ needs.get_ios_build.outputs.build_id }}
+    type: update
+    params:
+      branch: production
+      platform: ios

packages/eas-cli/src/commands/project/templates/.eas/workflows/publish-preview-update.yml

@@ -0,0 +1,12 @@
+name: Publish preview update
+
+on:
+  push:
+    branches: ['*']
+
+jobs:
+  publish_preview_update:
+    name: Publish preview update
+    type: update
+    params:
+      branch: ${{ github.ref_name || 'test' }}

packages/eas-cli/src/commands/project/templates/readme-additions.md

@@ -0,0 +1,19 @@
+## Workflows
+
+This project is configured to use [EAS Workflows](https://docs.expo.dev/eas/workflows/get-started/) to automate some development and release processes. These commands are set up in [`package.json`](./package.json) and can be run using NPM scripts in your terminal.
+
+### Previews
+
+Run `npm run preview` to [publish a preview update](https://docs.expo.dev/eas/workflows/examples/publish-preview-update/) of your project, which can be viewed in Expo Go or in a development build.
+
+### Development Builds
+
+Run `npm run development-builds` to [create a development build](https://docs.expo.dev/eas/workflows/examples/create-development-builds/). Note - you'll need to follow the [Prerequisites](https://docs.expo.dev/eas/workflows/examples/create-development-builds/#prerequisites) to ensure you have the correct emulator setup on your machine.
+
+### Production Deployments
+
+Run `npm run deploy` to [deploy to production](https://docs.expo.dev/eas/workflows/examples/deploy-to-production/). Note - you'll need to follow the [Prerequisites](https://docs.expo.dev/eas/workflows/examples/deploy-to-production/#prerequisites) to ensure you're set up to submit to the Apple and Google stores.
+
+## Hosting
+
+Expo offers hosting for websites and API functions via EAS Hosting. See the [Getting Started](https://docs.expo.dev/eas/hosting/get-started/) guide to learn more.

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

@@ -10,7 +10,6 @@ import {
   AndroidSubmissionConfigInput,
   IosSubmissionConfigInput,
   SubmissionAndroidReleaseStatus,
-  SubmissionAndroidTrack,
 } from '../../graphql/generated';
 import { AppStoreConnectApiKeyQuery } from '../../graphql/queries/AppStoreConnectApiKeyQuery';
 import { GoogleServiceAccountKeyQuery } from '../../graphql/queries/GoogleServiceAccountKeyQuery';
@@ -141,12 +140,11 @@ export default class SubmitInternal extends EasCommand {
           graphqlClient,
         })
       );
-      const track = graphQlTrackToConfigTrack[androidConfig.track];
 
       const configInput: z.input<typeof SubmissionConfig.Android.SchemaZ> = {
         changesNotSentForReview,
         googleServiceAccountKeyJson,
-        track,
+        track: androidConfig.track,
         ...(releaseStatus === SubmissionConfig.Android.ReleaseStatus.IN_PROGRESS
           ? {
               releaseStatus: SubmissionConfig.Android.ReleaseStatus.IN_PROGRESS,
@@ -217,10 +215,3 @@ const graphQlReleaseStatusToConfigReleaseStatus = {
   [SubmissionAndroidReleaseStatus.Completed]: SubmissionConfig.Android.ReleaseStatus.COMPLETED,
   [SubmissionAndroidReleaseStatus.Halted]: SubmissionConfig.Android.ReleaseStatus.HALTED,
 };
-
-const graphQlTrackToConfigTrack = {
-  [SubmissionAndroidTrack.Production]: SubmissionConfig.Android.ReleaseTrack.PRODUCTION,
-  [SubmissionAndroidTrack.Beta]: SubmissionConfig.Android.ReleaseTrack.BETA,
-  [SubmissionAndroidTrack.Alpha]: SubmissionConfig.Android.ReleaseTrack.ALPHA,
-  [SubmissionAndroidTrack.Internal]: SubmissionConfig.Android.ReleaseTrack.INTERNAL,
-};

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

@@ -39,7 +39,7 @@ export default class UpdateConfigure extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(UpdateConfigure, {
       nonInteractive: flags['non-interactive'],
-      withServerSideEnvironment: flags['environment'],
+      withServerSideEnvironment: flags['environment'] ?? null,
     });
 
     Log.log(

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

@@ -1,50 +1,13 @@
 import chalk from 'chalk';
-import gql from 'graphql-tag';
 
 import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { withErrorHandlingAsync } from '../../graphql/client';
-import {
-  BackgroundJobReceiptDataFragment,
-  ScheduleUpdateGroupDeletionMutation,
-  ScheduleUpdateGroupDeletionMutationVariables,
-} from '../../graphql/generated';
-import { BackgroundJobReceiptNode } from '../../graphql/types/BackgroundJobReceipt';
 import Log from '../../log';
 import { confirmAsync } from '../../prompts';
+import { scheduleUpdateGroupDeletionAsync } from '../../update/delete';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { pollForBackgroundJobReceiptAsync } from '../../utils/pollForBackgroundJobReceiptAsync';
 
-async function scheduleUpdateGroupDeletionAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    group,
-  }: {
-    group: string;
-  }
-): Promise<BackgroundJobReceiptDataFragment> {
-  const result = await withErrorHandlingAsync(
-    graphqlClient
-      .mutation<ScheduleUpdateGroupDeletionMutation, ScheduleUpdateGroupDeletionMutationVariables>(
-        gql`
-          mutation ScheduleUpdateGroupDeletion($group: ID!) {
-            update {
-              scheduleUpdateGroupDeletion(group: $group) {
-                id
-                ...BackgroundJobReceiptData
-              }
-            }
-          }
-          ${BackgroundJobReceiptNode}
-        `,
-        { group }
-      )
-      .toPromise()
-  );
-  return result.update.scheduleUpdateGroupDeletion;
-}
-
 export default class UpdateDelete extends EasCommand {
   static override description = 'delete all the updates in an update group';
 

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

@@ -4,9 +4,8 @@ import { Errors, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
-import { getExpoWebsiteBaseUrl } from '../../api';
+// import { getExpoWebsiteBaseUrl } from '../../api';
 import { ensureBranchExistsAsync } from '../../branch/queries';
-import { transformFingerprintSource } from '../../build/graphql';
 import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
 import { getUpdateGroupUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
@@ -15,7 +14,6 @@ import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import fetch from '../../fetch';
 import {
   AssetMapSourceInput,
-  EnvironmentVariableEnvironment,
   FingerprintInfoGroup as GraphqlFingerprintInfoGroup,
   PublishUpdateGroupInput,
   StatuspageServiceName,
@@ -24,7 +22,7 @@ import {
   UpdateRolloutInfoGroup,
 } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
-import { AppQuery } from '../../graphql/queries/AppQuery';
+// import { AppQuery } from '../../graphql/queries/AppQuery';
 import Log, { learnMore, link } from '../../log';
 import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
@@ -38,7 +36,7 @@ import {
   buildUnsortedUpdateInfoGroupAsync,
   collectAssetsAsync,
   filterCollectedAssetsByRequestedPlatforms,
-  findCompatibleBuildsAsync,
+  // findCompatibleBuildsAsync,
   generateEasMetadataAsync,
   getBranchNameForCommandAsync,
   getRuntimeToPlatformsAndFingerprintInfoMappingFromRuntimeVersionInfoObjects,
@@ -80,7 +78,7 @@ type RawUpdateFlags = {
   'rollout-percentage'?: number;
   'non-interactive': boolean;
   json: boolean;
-  environment: EnvironmentVariableEnvironment | null;
+  environment?: string;
 };
 
 type UpdateFlags = {
@@ -97,7 +95,7 @@ type UpdateFlags = {
   rolloutPercentage?: number;
   json: boolean;
   nonInteractive: boolean;
-  environment: EnvironmentVariableEnvironment | null;
+  environment?: string;
 };
 
 export default class UpdatePublish extends EasCommand {
@@ -194,7 +192,7 @@ export default class UpdatePublish extends EasCommand {
       getServerSideEnvironmentVariablesAsync,
     } = await this.getContextAsync(UpdatePublish, {
       nonInteractive,
-      withServerSideEnvironment: environment,
+      withServerSideEnvironment: environment ?? null,
     });
 
     if (jsonFlag) {
@@ -488,10 +486,7 @@ export default class UpdatePublish extends EasCommand {
             (prev, [platform, fingerprintInfo]) => {
               return {
                 ...prev,
-                [platform]: {
-                  ...fingerprintInfo,
-                  fingerprintSource: transformFingerprintSource(fingerprintInfo.fingerprintSource),
-                },
+                [platform]: fingerprintInfo,
               };
             },
             {} as GraphqlFingerprintInfoGroup
@@ -594,11 +589,11 @@ export default class UpdatePublish extends EasCommand {
 
     Log.addNewLineIfNone();
 
-    const runtimeToCompatibleBuilds = await Promise.all(
-      runtimeToPlatformsAndFingerprintInfoAndFingerprintSourceMapping.map(obj =>
-        findCompatibleBuildsAsync(graphqlClient, projectId, obj)
-      )
-    );
+    // const runtimeToCompatibleBuilds = await Promise.all(
+    //   runtimeToPlatformsAndFingerprintInfoAndFingerprintSourceMapping.map(obj =>
+    //     findCompatibleBuildsAsync(graphqlClient, projectId, obj)
+    //   )
+    // );
 
     for (const runtime of uniqBy(
       runtimeToPlatformsAndFingerprintInfoMapping,
@@ -672,52 +667,56 @@ export default class UpdatePublish extends EasCommand {
         Log.addNewLineIfNone();
       }
 
-      const fingerprintsWithoutCompatibleBuilds = runtimeToCompatibleBuilds.find(
-        ({ runtimeVersion }) => runtimeVersion === runtime.runtimeVersion
-      )?.fingerprintInfoGroupWithCompatibleBuilds;
-      if (fingerprintsWithoutCompatibleBuilds) {
-        const missingBuilds = Object.entries(fingerprintsWithoutCompatibleBuilds).filter(
-          ([_platform, fingerprintInfo]) => !fingerprintInfo.build
-        );
-        if (missingBuilds.length > 0) {
-          const project = await AppQuery.byIdAsync(graphqlClient, projectId);
-          Log.warn('No compatible builds found for the following fingerprints:');
-          for (const [platform, fingerprintInfo] of missingBuilds) {
-            const fingerprintUrl = new URL(
-              `/accounts/${project.ownerAccount.name}/projects/${project.slug}/fingerprints/${fingerprintInfo.fingerprintHash}`,
-              getExpoWebsiteBaseUrl()
-            );
-            Log.warn(
-              formatFields(
-                [
-                  {
-                    label: `${this.prettyPlatform(platform)} fingerprint`,
-                    value: fingerprintInfo.fingerprintHash,
-                  },
-                  { label: 'URL', value: fingerprintUrl.toString() },
-                ],
-                {
-                  labelFormat: label => `    ${chalk.dim(label)}:`,
-                }
-              )
-            );
-            Log.addNewLineIfNone();
-          }
-        }
-      }
+      // NOTE(brentvatne): temporarily disable logging this until we can revisit the formatting
+      // and the logic for it - it's a bit too aggressive right now, and warns even if you're
+      // not using EAS Build
+      //
+      // const fingerprintsWithoutCompatibleBuilds = runtimeToCompatibleBuilds.find(
+      //   ({ runtimeVersion }) => runtimeVersion === runtime.runtimeVersion
+      // )?.fingerprintInfoGroupWithCompatibleBuilds;
+      // if (fingerprintsWithoutCompatibleBuilds) {
+      //   const missingBuilds = Object.entries(fingerprintsWithoutCompatibleBuilds).filter(
+      //     ([_platform, fingerprintInfo]) => !fingerprintInfo.build
+      //   );
+      //   if (missingBuilds.length > 0) {
+      //     const project = await AppQuery.byIdAsync(graphqlClient, projectId);
+      //     Log.warn('No compatible builds found for the following fingerprints:');
+      //     for (const [platform, fingerprintInfo] of missingBuilds) {
+      //       const fingerprintUrl = new URL(
+      //         `/accounts/${project.ownerAccount.name}/projects/${project.slug}/fingerprints/${fingerprintInfo.fingerprintHash}`,
+      //         getExpoWebsiteBaseUrl()
+      //       );
+      //       Log.warn(
+      //         formatFields(
+      //           [
+      //             {
+      //               label: `${this.prettyPlatform(platform)} fingerprint`,
+      //               value: fingerprintInfo.fingerprintHash,
+      //             },
+      //             { label: 'URL', value: fingerprintUrl.toString() },
+      //           ],
+      //           {
+      //             labelFormat: label => `    ${chalk.dim(label)}:`,
+      //           }
+      //         )
+      //       );
+      //       Log.addNewLineIfNone();
+      //     }
+      //   }
+      // }
     }
   }
 
-  private prettyPlatform(updatePlatform: string): string {
-    switch (updatePlatform) {
-      case 'android':
-        return 'Android';
-      case 'ios':
-        return 'iOS';
-      default:
-        return updatePlatform;
-    }
-  }
+  // private prettyPlatform(updatePlatform: string): string {
+  //   switch (updatePlatform) {
+  //     case 'android':
+  //       return 'Android';
+  //     case 'ios':
+  //       return 'iOS';
+  //     default:
+  //       return updatePlatform;
+  //   }
+  // }
 
   private sanitizeFlags(flags: RawUpdateFlags): UpdateFlags {
     const nonInteractive = flags['non-interactive'] ?? false;

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

@@ -1,20 +1,18 @@
 import { Platform } from '@expo/config';
 import { Flags } from '@oclif/core';
 
-import { selectBranchOnAppAsync } from '../../branch/queries';
-import { selectChannelOnAppAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
-import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
-import { promptAsync } from '../../prompts';
 import { getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync } from '../../update/getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync';
-import { selectUpdateGroupOnBranchAsync } from '../../update/queries';
-import { UpdateToRepublish, republishAsync } from '../../update/republish';
-import { truncateString as truncateUpdateMessage } from '../../update/utils';
+import {
+  UpdateToRepublish,
+  getOrAskUpdateMessageAsync,
+  getUpdateGroupOrAskForUpdateGroupAsync,
+  republishAsync,
+} from '../../update/republish';
 import { getCodeSigningInfoAsync } from '../../utils/code-signing';
 import { enableJsonOutput } from '../../utils/json';
 
@@ -120,7 +118,11 @@ export default class UpdateRepublish extends EasCommand {
 
     const codeSigningInfo = await getCodeSigningInfoAsync(exp, flags.privateKeyPath);
 
-    const existingUpdates = await getOrAskUpdatesAsync(graphqlClient, projectId, flags);
+    const existingUpdates = await getUpdateGroupOrAskForUpdateGroupAsync(
+      graphqlClient,
+      projectId,
+      flags
+    );
     const updatesToPublish = existingUpdates.filter(update =>
       flags.platform.includes(update.platform as Platform)
     );
@@ -234,177 +236,3 @@ async function getOrAskTargetBranchAsync(
   // if neither provided, assume republish on same branch
   return { branchId: arbitraryUpdate.branchId, branchName: arbitraryUpdate.branchName };
 }
-
-/** Retrieve the update group from either the update group id, or select from branch name. */
-async function getOrAskUpdatesAsync(
-  graphqlClient: ExpoGraphqlClient,
-  projectId: string,
-  flags: UpdateRepublishFlags
-): Promise<UpdateToRepublish[]> {
-  if (flags.groupId) {
-    const updateGroup = await UpdateQuery.viewUpdateGroupAsync(graphqlClient, {
-      groupId: flags.groupId,
-    });
-
-    return updateGroup.map(update => ({
-      ...update,
-      groupId: update.group,
-      branchId: update.branch.id,
-      branchName: update.branch.name,
-    }));
-  }
-
-  if (flags.nonInteractive) {
-    throw new Error('Must supply --group when in non-interactive mode');
-  }
-
-  if (flags.branchName) {
-    return await askUpdatesFromBranchNameAsync(graphqlClient, {
-      ...flags,
-      branchName: flags.branchName,
-      projectId,
-    });
-  }
-
-  if (flags.channelName) {
-    return await askUpdatesFromChannelNameAsync(graphqlClient, {
-      ...flags,
-      channelName: flags.channelName,
-      projectId,
-    });
-  }
-
-  const { choice } = await promptAsync({
-    type: 'select',
-    message: 'Find update by branch or channel?',
-    name: 'choice',
-    choices: [
-      { title: 'Branch', value: 'branch' },
-      { title: 'Channel', value: 'channel' },
-    ],
-  });
-
-  if (choice === 'channel') {
-    const { name } = await selectChannelOnAppAsync(graphqlClient, {
-      projectId,
-      selectionPromptTitle: 'Select a channel to view',
-      paginatedQueryOptions: {
-        json: flags.json,
-        nonInteractive: flags.nonInteractive,
-        offset: 0,
-      },
-    });
-
-    return await askUpdatesFromChannelNameAsync(graphqlClient, {
-      ...flags,
-      channelName: name,
-      projectId,
-    });
-  } else if (choice === 'branch') {
-    const { name } = await selectBranchOnAppAsync(graphqlClient, {
-      projectId,
-      promptTitle: 'Select branch from which to choose update',
-      displayTextForListItem: updateBranch => ({
-        title: updateBranch.name,
-      }),
-      // discard limit and offset because this query is not their intended target
-      paginatedQueryOptions: {
-        json: flags.json,
-        nonInteractive: flags.nonInteractive,
-        offset: 0,
-      },
-    });
-
-    return await askUpdatesFromBranchNameAsync(graphqlClient, {
-      ...flags,
-      branchName: name,
-      projectId,
-    });
-  } else {
-    throw new Error('Must choose update via channel or branch');
-  }
-}
-
-/** Ask the user which update needs to be republished by branch name, this requires interactive mode */
-async function askUpdatesFromBranchNameAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId,
-    branchName,
-    json,
-    nonInteractive,
-  }: { projectId: string; branchName: string; json: boolean; nonInteractive: boolean }
-): Promise<UpdateToRepublish[]> {
-  const updateGroup = await selectUpdateGroupOnBranchAsync(graphqlClient, {
-    projectId,
-    branchName,
-    paginatedQueryOptions: getPaginatedQueryOptions({ json, 'non-interactive': nonInteractive }),
-  });
-
-  return updateGroup.map(update => ({
-    ...update,
-    groupId: update.group,
-    branchId: update.branch.id,
-    branchName: update.branch.name,
-  }));
-}
-/** Ask the user which update needs to be republished by channel name, this requires interactive mode */
-async function askUpdatesFromChannelNameAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId,
-    channelName,
-    json,
-    nonInteractive,
-  }: { projectId: string; channelName: string; json: boolean; nonInteractive: boolean }
-): Promise<UpdateToRepublish[]> {
-  const { branchName } = await getBranchFromChannelNameAndCreateAndLinkIfNotExistsAsync(
-    graphqlClient,
-    projectId,
-    channelName
-  );
-
-  return await askUpdatesFromBranchNameAsync(graphqlClient, {
-    projectId,
-    branchName,
-    json,
-    nonInteractive,
-  });
-}
-
-/** Get or ask the user for the update (group) message for the republish */
-async function getOrAskUpdateMessageAsync(
-  updates: UpdateToRepublish[],
-  flags: UpdateRepublishFlags
-): Promise<string> {
-  if (flags.updateMessage) {
-    return sanitizeUpdateMessage(flags.updateMessage);
-  }
-
-  if (flags.nonInteractive || flags.json) {
-    throw new Error('Must supply --message when in non-interactive mode');
-  }
-
-  // This command only uses a single update group to republish, meaning these values are always identical
-  const oldGroupId = updates[0].groupId;
-  const oldUpdateMessage = updates[0].message;
-
-  const { updateMessage } = await promptAsync({
-    type: 'text',
-    name: 'updateMessage',
-    message: 'Provide an update message.',
-    initial: `Republish "${oldUpdateMessage!}" - group: ${oldGroupId}`,
-    validate: (value: any) => (value ? true : 'Update message may not be empty.'),
-  });
-
-  return sanitizeUpdateMessage(updateMessage);
-}
-
-function sanitizeUpdateMessage(updateMessage: string): string {
-  if (updateMessage !== truncateUpdateMessage(updateMessage, 1024)) {
-    Log.warn('Update message exceeds the allowed 1024 character limit, truncated update message.');
-    return truncateUpdateMessage(updateMessage, 1024);
-  }
-
-  return updateMessage;
-}

packages/eas-cli/src/commands/update/revert-update-rollout.ts

@@ -0,0 +1,416 @@
+import { ExpoConfig } from '@expo/config';
+import { Flags } from '@oclif/core';
+import assert from 'assert';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import Log, { learnMore } from '../../log';
+import { enforceRollBackToEmbeddedUpdateSupportAsync } from '../../project/projectUtils';
+import { UpdatePublishPlatform, getUpdateMessageForCommandAsync } from '../../project/publish';
+import { confirmAsync, promptAsync } from '../../prompts';
+import { scheduleUpdateGroupDeletionAsync } from '../../update/delete';
+import {
+  UpdateToRepublish,
+  askUpdateGroupForEachPublishPlatformFilteringByRuntimeVersionAsync,
+  getOrAskUpdateMessageAsync,
+  getUpdateGroupAsync,
+  republishAsync,
+} from '../../update/republish';
+import { publishRollBackToEmbeddedUpdateAsync } from '../../update/roll-back-to-embedded';
+import { CodeSigningInfo, getCodeSigningInfoAsync } from '../../utils/code-signing';
+import { enableJsonOutput } from '../../utils/json';
+import { pollForBackgroundJobReceiptAsync } from '../../utils/pollForBackgroundJobReceiptAsync';
+import { Client } from '../../vcs/vcs';
+
+type RolloutUpdate = UpdateToRepublish & {
+  rolloutPercentage: NonNullable<UpdateToRepublish['rolloutPercentage']>;
+};
+
+type RolloutUpdateWithControlUpdate = RolloutUpdate & {
+  rolloutControlUpdate: NonNullable<UpdateToRepublish['rolloutControlUpdate']>;
+};
+
+type UpdateRevertUpdateRolloutRawFlags = {
+  branch?: string;
+  channel?: string;
+  group?: string;
+  message?: string;
+  'private-key-path'?: string;
+  'non-interactive': boolean;
+  json?: boolean;
+};
+
+type UpdateRevertUpdateRolloutFlags = {
+  branchName?: string;
+  channelName?: string;
+  groupId?: string;
+  updateMessage?: string;
+  privateKeyPath?: string;
+  nonInteractive: boolean;
+  json: boolean;
+};
+
+export function nonNullish<TValue>(value: TValue | null | undefined): value is NonNullable<TValue> {
+  return value !== null && value !== undefined;
+}
+
+export default class UpdateRevertUpdateRollout extends EasCommand {
+  static override description = 'revert a rollout update for a project';
+
+  static override flags = {
+    channel: Flags.string({
+      description: 'Channel name to select an update group to revert the rollout update from',
+      exclusive: ['branch', 'group'],
+    }),
+    branch: Flags.string({
+      description: 'Branch name to select an update group to revert the rollout update from',
+      exclusive: ['channel', 'group'],
+    }),
+    group: Flags.string({
+      description: 'Rollout update group ID to revert',
+      exclusive: ['branch', 'channel'],
+    }),
+    message: Flags.string({
+      char: 'm',
+      description: 'Short message describing the revert',
+      required: false,
+    }),
+    'private-key-path': Flags.string({
+      description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory. Only relevant if you are using code signing: https://docs.expo.dev/eas-update/code-signing/`,
+      required: false,
+    }),
+    ...EasNonInteractiveAndJsonFlags,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.Vcs,
+  };
+
+  async runAsync(): Promise<void> {
+    const { flags: rawFlags } = await this.parse(UpdateRevertUpdateRollout);
+    const flags = this.sanitizeFlags(rawFlags);
+
+    const {
+      privateProjectConfig: { exp, projectId, projectDir },
+      loggedIn: { graphqlClient },
+      vcsClient,
+    } = await this.getContextAsync(UpdateRevertUpdateRollout, {
+      nonInteractive: flags.nonInteractive,
+      withServerSideEnvironment: null,
+    });
+
+    if (flags.json) {
+      enableJsonOutput();
+    }
+
+    const codeSigningInfo = await getCodeSigningInfoAsync(exp, flags.privateKeyPath);
+
+    let updateGroupToRepublish: RolloutUpdate[];
+    if (flags.groupId) {
+      const updateGroup = await getUpdateGroupAsync(graphqlClient, flags.groupId);
+      if (!updateGroupIsRolloutUpdateGroup(updateGroup)) {
+        throw new Error(
+          `The update group with ID "${flags.groupId}" is not a rollout update group.`
+        );
+      }
+      updateGroupToRepublish = updateGroup;
+    } else {
+      const latestUpdateGroupForEachPublishPlatform =
+        await askUpdateGroupForEachPublishPlatformFilteringByRuntimeVersionAsync(
+          graphqlClient,
+          projectId,
+          flags
+        );
+
+      const uniqueUpdateGroups = getUniqueUpdateGroups(
+        Object.values(latestUpdateGroupForEachPublishPlatform).filter(nonNullish)
+      );
+
+      const rolloutUpdateGroups = uniqueUpdateGroups.filter(updateGroupIsRolloutUpdateGroup);
+
+      if (rolloutUpdateGroups.length === 0) {
+        throw new Error(`No rollout update groups found.`);
+      }
+
+      if (rolloutUpdateGroups.length === 1) {
+        updateGroupToRepublish = rolloutUpdateGroups[0];
+      } else {
+        const { choice: chosenId } = await promptAsync({
+          type: 'select',
+          message: 'Which rollout update group would you like to revert?',
+          name: 'choice',
+          choices: rolloutUpdateGroups.map(ug => ({
+            title: `Rollout update group ID: ${ug[0].groupId}, Platform: ${ug[0].platform}, Rollout Percentage: ${ug[0].rolloutPercentage}`,
+            value: ug[0].groupId,
+          })),
+        });
+
+        if (!chosenId) {
+          throw new Error('No rollout update group selected.');
+        }
+
+        const chosenUpdateGroup = rolloutUpdateGroups.find(ug => ug[0].groupId === chosenId);
+
+        if (!chosenUpdateGroup) {
+          throw new Error('No rollout update group selected.');
+        }
+
+        updateGroupToRepublish = chosenUpdateGroup;
+      }
+    }
+
+    const rolloutUpdateGroupWithControlUpdates: RolloutUpdateWithControlUpdate[] | null =
+      updateGroupIsUpdateGroupWithControlUpdate(updateGroupToRepublish)
+        ? updateGroupToRepublish
+        : null;
+    if (rolloutUpdateGroupWithControlUpdates) {
+      await this.deleteRolloutUpdateGroupAndRepublishControlUpdatesAsync({
+        graphqlClient,
+        exp,
+        projectId,
+        rolloutUpdateGroupWithControlUpdates,
+        codeSigningInfo,
+        flags,
+      });
+    } else {
+      await this.deleteRolloutUpdateGroupAndPublishRollBackToEmbeddedAsync({
+        graphqlClient,
+        vcsClient,
+        exp,
+        projectDir,
+        projectId,
+        rolloutUpdateGroup: updateGroupToRepublish,
+        codeSigningInfo,
+        flags,
+      });
+    }
+  }
+
+  private async deleteRolloutUpdateGroupAndRepublishControlUpdatesAsync({
+    graphqlClient,
+    exp,
+    projectId,
+    rolloutUpdateGroupWithControlUpdates,
+    codeSigningInfo,
+    flags,
+  }: {
+    graphqlClient: ExpoGraphqlClient;
+    exp: ExpoConfig;
+    projectId: string;
+    rolloutUpdateGroupWithControlUpdates: RolloutUpdateWithControlUpdate[];
+    codeSigningInfo: CodeSigningInfo | undefined;
+    flags: UpdateRevertUpdateRolloutFlags;
+  }): Promise<void> {
+    const controlUpdateGroupIdsToRepublish = Array.from(
+      new Set(rolloutUpdateGroupWithControlUpdates.map(update => update.rolloutControlUpdate.group))
+    );
+
+    const updateGroupsToRepublish = await Promise.all(
+      controlUpdateGroupIdsToRepublish.map(controlUpdateGroupIdToRepublish =>
+        getUpdateGroupAsync(graphqlClient, controlUpdateGroupIdToRepublish)
+      )
+    );
+
+    const updateGroupOrGroupsClause =
+      controlUpdateGroupIdsToRepublish.length > 1
+        ? `control update groups (IDs: ${controlUpdateGroupIdsToRepublish
+            .map(id => `"${id}"`)
+            .join(', ')})`
+        : `control update group (ID: "${controlUpdateGroupIdsToRepublish[0]}")`;
+
+    if (!flags.nonInteractive) {
+      const confirmMessage = `Are you sure you want to revert the rollout update group with ID "${rolloutUpdateGroupWithControlUpdates[0].groupId}"? This will delete the rollout update group and republish the ${updateGroupOrGroupsClause}.`;
+      const didConfirm = await confirmAsync({ message: confirmMessage });
+      if (!didConfirm) {
+        throw new Error('Aborting...');
+      }
+    }
+
+    const updateMessages: string[] = [];
+    for (const updateGroup of updateGroupsToRepublish) {
+      updateMessages.push(await getOrAskUpdateMessageAsync(updateGroup, flags));
+    }
+
+    // assert all updateGroupsToRepublish have the same branch name and id
+    const branchNames = updateGroupsToRepublish.flatMap(updateGroup => updateGroup[0].branchName);
+    const branchIds = updateGroupsToRepublish.map(updateGroup => updateGroup[0].branchId);
+    assert(
+      branchNames.every(name => name === branchNames[0]),
+      'All update groups being republished must belong to the same branch.'
+    );
+    assert(
+      branchIds.every(id => id === branchIds[0]),
+      'All update groups being republished must belong to the same branch.'
+    );
+    const targetBranch = {
+      branchName: branchNames[0],
+      branchId: branchIds[0],
+    };
+
+    await this.deleteRolloutUpdateGroupAsync({
+      graphqlClient,
+      rolloutUpdateGroup: rolloutUpdateGroupWithControlUpdates,
+    });
+
+    for (let i = 0; i < updateGroupsToRepublish.length; i++) {
+      const updateGroupToRepublish = updateGroupsToRepublish[i];
+      const updateMessage = updateMessages[i];
+
+      await republishAsync({
+        graphqlClient,
+        app: { exp, projectId },
+        updatesToPublish: updateGroupToRepublish,
+        targetBranch,
+        updateMessage,
+        codeSigningInfo,
+        json: flags.json,
+      });
+    }
+  }
+
+  private async deleteRolloutUpdateGroupAndPublishRollBackToEmbeddedAsync({
+    graphqlClient,
+    vcsClient,
+    exp,
+    projectDir,
+    projectId,
+    rolloutUpdateGroup,
+    codeSigningInfo,
+    flags,
+  }: {
+    graphqlClient: ExpoGraphqlClient;
+    vcsClient: Client;
+    exp: ExpoConfig;
+    projectDir: string;
+    projectId: string;
+    rolloutUpdateGroup: RolloutUpdate[];
+    codeSigningInfo: CodeSigningInfo | undefined;
+    flags: UpdateRevertUpdateRolloutFlags;
+  }): Promise<void> {
+    const rolloutUpdateGroupId = rolloutUpdateGroup[0].groupId;
+
+    if (!flags.nonInteractive) {
+      const confirmMessage = `Are you sure you want to revert the rollout update group with ID "${rolloutUpdateGroupId}"? This will delete the rollout update group and publish a new roll-back-to-embedded update (no control update to roll back to), whose behavior may not be a true revert depending on the previous state of the branch. ${learnMore(
+        'https://expo.fyi/eas-update-update-rollouts',
+        { learnMoreMessage: 'More info' }
+      )})`;
+      const didConfirm = await confirmAsync({ message: confirmMessage });
+      if (!didConfirm) {
+        throw new Error('Aborting...');
+      }
+    }
+
+    // check that the expo-updates package version supports roll back to embedded
+    await enforceRollBackToEmbeddedUpdateSupportAsync(projectDir);
+    const updateMessage = await getUpdateMessageForCommandAsync(vcsClient, {
+      updateMessageArg: flags.updateMessage,
+      autoFlag: false,
+      nonInteractive: flags.nonInteractive,
+      jsonFlag: flags.json,
+    });
+
+    await this.deleteRolloutUpdateGroupAsync({
+      graphqlClient,
+      rolloutUpdateGroup,
+    });
+
+    const platforms = rolloutUpdateGroup.map(update => update.platform) as UpdatePublishPlatform[];
+    const runtimeVersion = rolloutUpdateGroup[0].runtimeVersion;
+    const targetBranch = {
+      name: rolloutUpdateGroup[0].branchName,
+      id: rolloutUpdateGroup[0].branchId,
+    };
+
+    await publishRollBackToEmbeddedUpdateAsync({
+      graphqlClient,
+      projectId,
+      exp,
+      updateMessage,
+      branch: targetBranch,
+      codeSigningInfo,
+      platforms,
+      runtimeVersion,
+      json: flags.json,
+    });
+  }
+
+  private async deleteRolloutUpdateGroupAsync({
+    graphqlClient,
+    rolloutUpdateGroup,
+  }: {
+    graphqlClient: ExpoGraphqlClient;
+    rolloutUpdateGroup: RolloutUpdate[];
+  }): Promise<void> {
+    const rolloutUpdateGroupId = rolloutUpdateGroup[0].groupId;
+
+    const updateGroupDeletionReceipt = await scheduleUpdateGroupDeletionAsync(graphqlClient, {
+      group: rolloutUpdateGroupId,
+    });
+    const successfulReceipt = await pollForBackgroundJobReceiptAsync(
+      graphqlClient,
+      updateGroupDeletionReceipt
+    );
+    Log.debug('Rollout update group deletion result', { successfulReceipt });
+  }
+
+  private sanitizeFlags(
+    rawFlags: UpdateRevertUpdateRolloutRawFlags
+  ): UpdateRevertUpdateRolloutFlags {
+    const branchName = rawFlags.branch;
+    const channelName = rawFlags.channel;
+    const groupId = rawFlags.group;
+    const nonInteractive = rawFlags['non-interactive'];
+    const privateKeyPath = rawFlags['private-key-path'];
+
+    if (nonInteractive && !groupId) {
+      throw new Error('Only --group can be used in non-interactive mode');
+    }
+
+    return {
+      branchName,
+      channelName,
+      groupId,
+
+      updateMessage: rawFlags.message,
+      privateKeyPath,
+      json: rawFlags.json ?? false,
+      nonInteractive,
+    };
+  }
+}
+
+function getUniqueUpdateGroups(updateGroups: UpdateToRepublish[][]): UpdateToRepublish[][] {
+  const uniqueUpdateGroups = new Map<string, UpdateToRepublish[]>();
+  for (const updateGroup of updateGroups) {
+    const groupId = updateGroup[0].groupId;
+    if (!uniqueUpdateGroups.has(groupId)) {
+      uniqueUpdateGroups.set(groupId, updateGroup);
+    }
+  }
+  return Array.from(uniqueUpdateGroups.values());
+}
+
+function updateGroupIsRolloutUpdateGroup(
+  updateGroup: UpdateToRepublish[]
+): updateGroup is RolloutUpdate[] {
+  return updateGroup.every(updateIsRolloutUpdate);
+}
+
+function updateIsRolloutUpdate(updateGroup: UpdateToRepublish): updateGroup is RolloutUpdate {
+  return updateGroup.rolloutPercentage !== undefined && updateGroup.rolloutPercentage !== null;
+}
+
+function updateGroupIsUpdateGroupWithControlUpdate(
+  updateGroup: RolloutUpdate[]
+): updateGroup is RolloutUpdateWithControlUpdate[] {
+  return updateGroup.every(updateIsRolloutWithControlUpdate);
+}
+
+function updateIsRolloutWithControlUpdate(
+  updateGroup: RolloutUpdate
+): updateGroup is RolloutUpdateWithControlUpdate {
+  return !!updateGroup.rolloutControlUpdate;
+}

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

@@ -1,51 +1,24 @@
-import { Platform as PublishPlatform } from '@expo/config';
 import { EasJson, EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
 import { Errors, Flags } from '@oclif/core';
-import nullthrows from 'nullthrows';
 
 import { ensureBranchExistsAsync } from '../../branch/queries';
-import { getUpdateGroupUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
-import fetch from '../../fetch';
-import {
-  PublishUpdateGroupInput,
-  RuntimeFragment,
-  StatuspageServiceName,
-  UpdatePublishMutation,
-} from '../../graphql/generated';
-import { PublishMutation } from '../../graphql/mutations/PublishMutation';
-import { RuntimeQuery } from '../../graphql/queries/RuntimeQuery';
-import Log, { link } from '../../log';
-import { ora } from '../../ora';
+import { StatuspageServiceName } from '../../graphql/generated';
 import { RequestedPlatform } from '../../platform';
+import { enforceRollBackToEmbeddedUpdateSupportAsync } from '../../project/projectUtils';
 import {
-  enforceRollBackToEmbeddedUpdateSupportAsync,
-  getOwnerAccountForProjectIdAsync,
-} from '../../project/projectUtils';
-import {
-  RuntimeVersionInfo,
   UpdatePublishPlatform,
   defaultPublishPlatforms,
   getBranchNameForCommandAsync,
-  getRuntimeToPlatformsAndFingerprintInfoMappingFromRuntimeVersionInfoObjects,
   getUpdateMessageForCommandAsync,
 } from '../../project/publish';
 import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
-import { getUpdateJsonInfosForUpdates } from '../../update/utils';
-import {
-  CodeSigningInfo,
-  checkDirectiveBodyAgainstUpdateInfoGroup,
-  getCodeSigningInfoAsync,
-  getDirectiveBodyAsync,
-  signBody,
-} from '../../utils/code-signing';
-import uniqBy from '../../utils/expodash/uniqBy';
-import formatFields from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { Connection, QueryParams, selectPaginatedAsync } from '../../utils/relay';
+import { selectRuntimeOnBranchAsync } from '../../update/queries';
+import { publishRollBackToEmbeddedUpdateAsync } from '../../update/roll-back-to-embedded';
+import { getCodeSigningInfoAsync } from '../../utils/code-signing';
+import { enableJsonOutput } from '../../utils/json';
 import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
 
 type RawUpdateFlags = {
@@ -199,7 +172,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
     const selectedRuntime =
       runtimeVersionArg ??
       (
-        await UpdateRollBackToEmbedded.selectRuntimeAsync(graphqlClient, {
+        await selectRuntimeOnBranchAsync(graphqlClient, {
           appId: projectId,
           branchName,
         })
@@ -208,196 +181,16 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
       Errors.error('Must select a runtime or provide the --runtimeVersion flag', { exit: 1 });
     }
 
-    const runtimeToPlatformsAndFingerprintInfoMapping =
-      getRuntimeToPlatformsAndFingerprintInfoMappingFromRuntimeVersionInfoObjects(
-        realizedPlatforms.map(platform => ({
-          platform,
-          runtimeVersionInfo: {
-            runtimeVersion: selectedRuntime,
-            expoUpdatesRuntimeFingerprint: null,
-            expoUpdatesRuntimeFingerprintHash: null,
-          },
-        }))
-      );
-
-    let newUpdates: UpdatePublishMutation['updateBranch']['publishUpdateGroups'];
-    const publishSpinner = ora('Publishing...').start();
-    try {
-      newUpdates = await this.publishRollbacksAsync({
-        graphqlClient,
-        updateMessage,
-        branchId: branch.id,
-        codeSigningInfo,
-        runtimeToPlatformsAndFingerprintInfoMapping,
-        realizedPlatforms,
-      });
-      publishSpinner.succeed('Published!');
-    } catch (e) {
-      publishSpinner.fail('Failed to publish updates');
-      throw e;
-    }
-
-    if (jsonFlag) {
-      printJsonOnlyOutput(getUpdateJsonInfosForUpdates(newUpdates));
-    } else {
-      Log.addNewLineIfNone();
-
-      for (const runtime of uniqBy(
-        runtimeToPlatformsAndFingerprintInfoMapping,
-        version => version.runtimeVersion
-      )) {
-        const newUpdatesForRuntimeVersion = newUpdates.filter(
-          update => update.runtimeVersion === runtime.runtimeVersion
-        );
-        if (newUpdatesForRuntimeVersion.length === 0) {
-          throw new Error(
-            `Publish response is missing updates with runtime ${runtime.runtimeVersion}.`
-          );
-        }
-        const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
-        const newAndroidUpdate = newUpdatesForRuntimeVersion.find(
-          update => update.platform === 'android'
-        );
-        const newIosUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'ios');
-        const updateGroupId = newUpdatesForRuntimeVersion[0].group;
-
-        const projectName = exp.slug;
-        const accountName = (await getOwnerAccountForProjectIdAsync(graphqlClient, projectId)).name;
-        const updateGroupUrl = getUpdateGroupUrl(accountName, projectName, updateGroupId);
-        const updateGroupLink = link(updateGroupUrl, { dim: false });
-
-        Log.log(
-          formatFields([
-            { label: 'Branch', value: branchName },
-            { label: 'Runtime version', value: runtime.runtimeVersion },
-            { label: 'Platform', value: platforms.join(', ') },
-            { label: 'Update group ID', value: updateGroupId },
-            ...(newAndroidUpdate
-              ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
-              : []),
-            ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
-            { label: 'Message', value: updateMessage ?? '' },
-            { label: 'EAS Dashboard', value: updateGroupLink },
-          ])
-        );
-        Log.addNewLineIfNone();
-      }
-    }
-  }
-
-  private async publishRollbacksAsync({
-    graphqlClient,
-    updateMessage,
-    branchId,
-    codeSigningInfo,
-    runtimeToPlatformsAndFingerprintInfoMapping,
-    realizedPlatforms,
-  }: {
-    graphqlClient: ExpoGraphqlClient;
-    updateMessage: string | undefined;
-    branchId: string;
-    codeSigningInfo: CodeSigningInfo | undefined;
-    runtimeToPlatformsAndFingerprintInfoMapping: (RuntimeVersionInfo & {
-      platforms: UpdatePublishPlatform[];
-    })[];
-    realizedPlatforms: PublishPlatform[];
-  }): Promise<UpdatePublishMutation['updateBranch']['publishUpdateGroups']> {
-    const rollbackInfoGroups = Object.fromEntries(
-      realizedPlatforms.map(platform => [platform, true])
-    );
-
-    // Sort the updates into different groups based on their platform specific runtime versions
-    const updateGroups: PublishUpdateGroupInput[] = runtimeToPlatformsAndFingerprintInfoMapping.map(
-      ({ runtimeVersion, platforms }) => {
-        const localRollbackInfoGroup = Object.fromEntries(
-          platforms.map(platform => [platform, rollbackInfoGroups[platform]])
-        );
-
-        return {
-          branchId,
-          rollBackToEmbeddedInfoGroup: localRollbackInfoGroup,
-          runtimeVersion,
-          message: updateMessage,
-          awaitingCodeSigningInfo: !!codeSigningInfo,
-        };
-      }
-    );
-
-    const newUpdates = await PublishMutation.publishUpdateGroupAsync(graphqlClient, updateGroups);
-
-    if (codeSigningInfo) {
-      Log.log('🔒 Signing roll back');
-
-      const updatesTemp = [...newUpdates];
-      const updateGroupsAndTheirUpdates = updateGroups.map(updateGroup => {
-        const newUpdates = updatesTemp.splice(
-          0,
-          Object.keys(nullthrows(updateGroup.rollBackToEmbeddedInfoGroup)).length
-        );
-        return {
-          updateGroup,
-          newUpdates,
-        };
-      });
-
-      await Promise.all(
-        updateGroupsAndTheirUpdates.map(async ({ newUpdates }) => {
-          await Promise.all(
-            newUpdates.map(async newUpdate => {
-              const response = await fetch(newUpdate.manifestPermalink, {
-                method: 'GET',
-                headers: { accept: 'multipart/mixed' },
-              });
-              const directiveBody = nullthrows(await getDirectiveBodyAsync(response));
-
-              checkDirectiveBodyAgainstUpdateInfoGroup(directiveBody);
-
-              const directiveSignature = signBody(directiveBody, codeSigningInfo);
-
-              await PublishMutation.setCodeSigningInfoAsync(graphqlClient, newUpdate.id, {
-                alg: codeSigningInfo.codeSigningMetadata.alg,
-                keyid: codeSigningInfo.codeSigningMetadata.keyid,
-                sig: directiveSignature,
-              });
-            })
-          );
-        })
-      );
-    }
-
-    return newUpdates;
-  }
-
-  private static async selectRuntimeAsync(
-    graphqlClient: ExpoGraphqlClient,
-    {
-      appId,
-      branchName,
-      batchSize = 5,
-    }: {
-      appId: string;
-      branchName: string;
-      batchSize?: number;
-    }
-  ): Promise<RuntimeFragment | null> {
-    const queryAsync = async (queryParams: QueryParams): Promise<Connection<RuntimeFragment>> => {
-      return await RuntimeQuery.getRuntimesOnBranchAsync(graphqlClient, {
-        appId,
-        name: branchName,
-        first: queryParams.first,
-        after: queryParams.after,
-        last: queryParams.last,
-        before: queryParams.before,
-      });
-    };
-    const getTitleAsync = async (runtime: RuntimeFragment): Promise<string> => {
-      return runtime.version;
-    };
-    return await selectPaginatedAsync({
-      queryAsync,
-      getTitleAsync,
-      printedType: 'target runtime',
-      pageSize: batchSize,
+    await publishRollBackToEmbeddedUpdateAsync({
+      graphqlClient,
+      projectId,
+      exp,
+      updateMessage,
+      branch,
+      codeSigningInfo,
+      platforms: realizedPlatforms,
+      runtimeVersion: selectedRuntime,
+      json: jsonFlag,
     });
   }
 

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

@@ -6,7 +6,8 @@ import EasCommand from '../../commandUtils/EasCommand';
 import { promptAsync } from '../../prompts';
 
 export default class UpdateRollback extends EasCommand {
-  static override description = 'roll back to an embedded update or an existing update';
+  static override description =
+    'Roll back to an embedded update or an existing update. Users wishing to run this command non-interactively should instead execute "eas update:republish" or "eas update:roll-back-to-embedded".';
 
   static override flags = {
     'private-key-path': Flags.string({

packages/eas-cli/src/commands/workflow/__tests__/run.test.ts

@@ -0,0 +1,243 @@
+import { parseInputs, parseJsonInputs, parseWorkflowInputsFromYaml } from '../run';
+
+describe('parseInputs', () => {
+  it('should parse single key=value pair', () => {
+    const inputs = parseInputs(['key=value']);
+    expect(inputs).toEqual({ key: 'value' });
+  });
+
+  it('should parse multiple key=value pairs', () => {
+    const inputs = parseInputs(['key1=value1', 'key2=value2', 'key3=value3']);
+    expect(inputs).toEqual({
+      key1: 'value1',
+      key2: 'value2',
+      key3: 'value3',
+    });
+  });
+
+  it('should handle empty value', () => {
+    const inputs = parseInputs(['key=']);
+    expect(inputs).toEqual({ key: '' });
+  });
+
+  it('should handle values with equals signs', () => {
+    const inputs = parseInputs(['key=value=with=equals']);
+    expect(inputs).toEqual({ key: 'value=with=equals' });
+  });
+
+  it('should handle values with spaces', () => {
+    const inputs = parseInputs(['key=value with spaces']);
+    expect(inputs).toEqual({ key: 'value with spaces' });
+  });
+
+  it('should handle special characters in values', () => {
+    const inputs = parseInputs(['key=value!@#$%^&*()']);
+    expect(inputs).toEqual({ key: 'value!@#$%^&*()' });
+  });
+
+  it('should throw error for invalid format without equals', () => {
+    expect(() => parseInputs(['invalid_format'])).toThrow(
+      'Invalid input format: invalid_format. Expected key=value format.'
+    );
+  });
+
+  it('should throw error for empty key', () => {
+    expect(() => parseInputs(['=value'])).toThrow(
+      'Invalid input format: =value. Key cannot be empty.'
+    );
+  });
+
+  it('should handle empty array', () => {
+    const inputs = parseInputs([]);
+    expect(inputs).toEqual({});
+  });
+
+  it('should handle mix of valid and complex inputs', () => {
+    const inputs = parseInputs([
+      'simple=value',
+      'complex=key=value=with=multiple=equals',
+      'empty=',
+      'spaces=value with spaces',
+    ]);
+    expect(inputs).toEqual({
+      simple: 'value',
+      complex: 'key=value=with=multiple=equals',
+      empty: '',
+      spaces: 'value with spaces',
+    });
+  });
+});
+
+describe('parseJsonInputs', () => {
+  it('should parse simple JSON object', () => {
+    const json = '{"key": "value", "number": 42, "bool": true}';
+    const inputs = parseJsonInputs(json);
+    expect(inputs).toEqual({
+      key: 'value',
+      number: 42,
+      bool: true,
+    });
+  });
+
+  it('should handle complex objects', () => {
+    const json = '{"obj": {"nested": "value"}, "arr": [1, 2, 3]}';
+    const inputs = parseJsonInputs(json);
+    expect(inputs).toEqual({
+      obj: { nested: 'value' },
+      arr: [1, 2, 3],
+    });
+  });
+
+  it('should handle empty object', () => {
+    const json = '{}';
+    const inputs = parseJsonInputs(json);
+    expect(inputs).toEqual({});
+  });
+
+  it('should handle string values with special characters', () => {
+    const json =
+      '{"special": "value with spaces", "equals": "key=value", "quotes": "value\\"with\\"quotes"}';
+    const inputs = parseJsonInputs(json);
+    expect(inputs).toEqual({
+      special: 'value with spaces',
+      equals: 'key=value',
+      quotes: 'value"with"quotes',
+    });
+  });
+
+  it('should throw error for invalid JSON', () => {
+    const invalidJson = '{"invalid": json}';
+    expect(() => parseJsonInputs(invalidJson)).toThrow('Invalid JSON input.');
+  });
+
+  it('should throw error for non-object JSON', () => {
+    expect(() => parseJsonInputs('["array"]')).toThrow('Invalid JSON input.');
+
+    expect(() => parseJsonInputs('"string"')).toThrow('Invalid JSON input.');
+
+    expect(() => parseJsonInputs('42')).toThrow('Invalid JSON input.');
+
+    expect(() => parseJsonInputs('null')).toThrow('Invalid JSON input.');
+  });
+});
+
+describe('parseWorkflowInputsFromYaml', () => {
+  it('should parse workflow inputs from YAML', () => {
+    const yamlConfig = `
+on:
+  workflow_dispatch:
+    inputs:
+      environment:
+        type: string
+        required: true
+        description: "Environment to deploy to"
+      debug:
+        type: boolean
+        default: false
+        description: "Enable debug mode"
+      version:
+        type: number
+        required: true
+        description: "Version number"
+      deployment_type:
+        type: choice
+        options: ["staging", "production"]
+        default: "staging"
+        description: "Type of deployment"
+      target_env:
+        type: environment
+        default: "preview"
+        description: "Target environment"
+jobs:
+  test:
+    steps:
+      - run: echo "test"
+`;
+
+    const inputs = parseWorkflowInputsFromYaml(yamlConfig);
+
+    expect(inputs).toEqual({
+      environment: {
+        type: 'string',
+        required: true,
+        description: 'Environment to deploy to',
+      },
+      debug: {
+        type: 'boolean',
+        required: false,
+        default: false,
+        description: 'Enable debug mode',
+      },
+      version: {
+        type: 'number',
+        required: true,
+        description: 'Version number',
+      },
+      deployment_type: {
+        type: 'choice',
+        required: false,
+        default: 'staging',
+        options: ['staging', 'production'],
+        description: 'Type of deployment',
+      },
+      target_env: {
+        type: 'environment',
+        required: false,
+        default: 'preview',
+        description: 'Target environment',
+      },
+    });
+  });
+
+  it('should handle YAML without workflow_dispatch inputs', () => {
+    const yamlConfig = `
+on:
+  push:
+    branches: [main]
+jobs:
+  test:
+    steps:
+      - run: echo "test"
+`;
+
+    const inputs = parseWorkflowInputsFromYaml(yamlConfig);
+
+    expect(inputs).toEqual({});
+  });
+
+  it('should handle empty YAML', () => {
+    const yamlConfig = '';
+
+    const inputs = parseWorkflowInputsFromYaml(yamlConfig);
+
+    expect(inputs).toEqual({});
+  });
+
+  it('should handle invalid YAML gracefully', () => {
+    const yamlConfig = 'invalid: yaml: content:';
+
+    const { parseWorkflowInputsFromYaml } = require('../run');
+    const inputs = parseWorkflowInputsFromYaml(yamlConfig);
+
+    expect(inputs).toEqual({});
+  });
+
+  it('should default type to string when not specified', () => {
+    const yamlConfig = `
+on:
+  workflow_dispatch:
+    inputs:
+      simple_input:
+        description: "A simple input"
+        required: true
+`;
+
+    const inputs = parseWorkflowInputsFromYaml(yamlConfig);
+
+    expect(inputs.simple_input).toEqual({
+      type: 'string',
+      description: 'A simple input',
+      required: true,
+    });
+  });
+});

packages/eas-cli/src/commands/workflow/cancel.ts

@@ -1,6 +1,6 @@
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
-import { processWorkflowRuns } from '../../commandUtils/workflows';
+import { choiceFromWorkflowRun, processWorkflowRuns } from '../../commandUtils/workflow/utils';
 import { WorkflowRunStatus } from '../../graphql/generated';
 import { WorkflowRunMutation } from '../../graphql/mutations/WorkflowRunMutation';
 import { AppQuery } from '../../graphql/queries/AppQuery';
@@ -65,12 +65,7 @@ export default class WorkflowRunCancel extends EasCommand {
         type: 'multiselect',
         name: 'selectedRuns',
         message: 'Select IN_PROGRESS workflow runs to cancel',
-        choices: runs.map(run => ({
-          title: `${run.id} - ${run.workflowFileName}, ${run.gitCommitMessage ?? ''}, ${
-            run.startedAt
-          }`,
-          value: run.id,
-        })),
+        choices: runs.map(run => choiceFromWorkflowRun(run)),
       });
       answers.selectedRuns.forEach((id: string) => {
         workflowRunIds.add(id);

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

@@ -1,28 +1,31 @@
+import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import fs from 'fs/promises';
 import fsExtra from 'fs-extra';
 import path from 'path';
-import prompts from 'prompts';
 
 import EasCommand from '../../commandUtils/EasCommand';
-import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import {
+  runBuildConfigureIfNeededAsync,
+  runUpdateConfigureIfNeededAsync,
+} from '../../commandUtils/workflow/buildProfileUtils';
+import {
+  WorkflowStarter,
+  WorkflowStarterName,
+  customizeTemplateIfNeededAsync,
+  howToRunWorkflow,
+  workflowStarters,
+} from '../../commandUtils/workflow/creation';
+import {
+  logWorkflowValidationErrors,
+  validateWorkflowFileAsync,
+  workflowContentsFromParsedYaml,
+} from '../../commandUtils/workflow/validation';
 import Log from '../../log';
+import { promptAsync } from '../../prompts';
+import formatFields from '../../utils/formatFields';
 import { WorkflowFile } from '../../utils/workflowFile';
 
-const DEFAULT_WORKFLOW_NAME = 'workflow.yml';
-const HELLO_WORLD_TEMPLATE = `name: Hello World
-
-on:
-  push:
-    branches: ['*']
-
-jobs:
-  hello_world:
-    steps:
-      - uses: eas/checkout
-      - run: echo "Hello, World"
-`;
-
 export class WorkflowCreate extends EasCommand {
   static override description = 'create a new workflow configuration YAML file';
 
@@ -35,11 +38,16 @@ export class WorkflowCreate extends EasCommand {
   ];
 
   static override flags = {
-    ...EASNonInteractiveFlag,
+    'skip-validation': Flags.boolean({
+      description: 'If set, the workflow file will not be validated before being created',
+      default: false,
+    }),
   };
 
   static override contextDefinition = {
+    ...this.ContextOptions.DynamicProjectConfig,
     ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.LoggedIn,
   };
 
   async runAsync(): Promise<void> {
@@ -48,74 +56,175 @@ export class WorkflowCreate extends EasCommand {
       flags,
     } = await this.parse(WorkflowCreate);
 
-    const { projectDir } = await this.getContextAsync(WorkflowCreate, {
-      nonInteractive: flags['non-interactive'],
-    });
+    try {
+      const {
+        getDynamicPrivateProjectConfigAsync,
+        loggedIn: { graphqlClient },
+        projectDir,
+      } = await this.getContextAsync(WorkflowCreate, {
+        nonInteractive: false,
+        withServerSideEnvironment: null,
+      });
 
-    let fileName = argFileName;
+      const { exp: originalExpoConfig, projectId } = await getDynamicPrivateProjectConfigAsync();
+      let expoConfig = originalExpoConfig;
 
-    if (!fileName) {
-      const response = await prompts({
+      let workflowStarter;
+      while (!workflowStarter) {
+        workflowStarter = await chooseTemplateAsync();
+        switch (workflowStarter.name) {
+          case WorkflowStarterName.BUILD:
+          case WorkflowStarterName.DEPLOY:
+          case WorkflowStarterName.UPDATE: {
+            const shouldProceed = await runBuildConfigureIfNeededAsync({
+              projectDir,
+              expoConfig,
+            });
+            if (!shouldProceed) {
+              workflowStarter = undefined;
+              continue;
+            }
+            break;
+          }
+          default:
+            break;
+        }
+        switch (workflowStarter.name) {
+          case WorkflowStarterName.DEPLOY:
+          case WorkflowStarterName.UPDATE: {
+            const shouldProceed = await runUpdateConfigureIfNeededAsync({
+              projectDir,
+              expoConfig,
+            });
+            if (!shouldProceed) {
+              workflowStarter = undefined;
+              continue;
+            }
+            // Need to refetch the Expo config because it may have changed
+            expoConfig = (await getDynamicPrivateProjectConfigAsync()).exp;
+            break;
+          }
+          default:
+            break;
+        }
+      }
+
+      const { fileName, filePath } = await chooseFileNameAsync(
+        argFileName,
+        projectDir,
+        workflowStarter
+      );
+
+      // Customize the template if needed
+      workflowStarter = await customizeTemplateIfNeededAsync(
+        workflowStarter,
+        projectDir,
+        expoConfig
+      );
+
+      Log.debug(`Creating workflow file ${fileName} from template ${workflowStarter.name}`);
+      const yamlString = [
+        workflowStarter.header,
+        workflowContentsFromParsedYaml(workflowStarter.template),
+      ].join('\n');
+
+      if (!flags['skip-validation']) {
+        await validateWorkflowFileAsync(
+          { yamlConfig: yamlString, filePath: fileName },
+          projectDir,
+          graphqlClient,
+          projectId
+        );
+      }
+      await ensureWorkflowsDirectoryExistsAsync({ projectDir });
+      filePath && (await fs.writeFile(filePath, yamlString));
+      Log.withTick(`Created ${chalk.bold(filePath)}`);
+      Log.addNewLineIfNone();
+      Log.log(howToRunWorkflow(fileName, workflowStarter));
+
+      // Next steps
+      if (workflowStarter.nextSteps && workflowStarter.nextSteps.length > 0) {
+        Log.addNewLineIfNone();
+        Log.log('Next steps:');
+        Log.addNewLineIfNone();
+        Log.log(
+          formatFields(
+            workflowStarter.nextSteps.map((step: string, index: number) => ({
+              label: `${index + 1}.`,
+              value: step,
+            }))
+          )
+        );
+      }
+    } catch (error) {
+      logWorkflowValidationErrors(error);
+      Log.error('Failed to create workflow file.');
+    }
+  }
+}
+
+async function ensureWorkflowsDirectoryExistsAsync({
+  projectDir,
+}: {
+  projectDir: string;
+}): Promise<void> {
+  try {
+    await fs.access(path.join(projectDir, '.eas', 'workflows'));
+  } catch {
+    await fs.mkdir(path.join(projectDir, '.eas', 'workflows'), { recursive: true });
+    Log.withTick(`Created directory ${chalk.bold(path.join(projectDir, '.eas', 'workflows'))}`);
+  }
+}
+
+async function chooseTemplateAsync(): Promise<WorkflowStarter> {
+  const workflowStarter = (
+    await promptAsync({
+      type: 'select',
+      name: 'starter',
+      message: 'Select a workflow template:',
+      choices: workflowStarters.map(starter => ({
+        title: starter.displayName,
+        value: starter,
+      })),
+    })
+  ).starter;
+  return workflowStarter;
+}
+
+async function chooseFileNameAsync(
+  initialValue: string | undefined,
+  projectDir: string,
+  workflowStarter: WorkflowStarter
+): Promise<{ fileName: string; filePath: string }> {
+  let fileName = initialValue;
+  let filePath = '';
+  while ((fileName?.length ?? 0) === 0) {
+    fileName = (
+      await promptAsync({
         type: 'text',
         name: 'fileName',
         message: 'What would you like to name your workflow file?',
-        initial: DEFAULT_WORKFLOW_NAME,
-        validate: value => {
-          try {
-            WorkflowFile.validateYamlExtension(value);
-            return true;
-          } catch (error) {
-            return error instanceof Error ? error.message : 'Invalid file name';
-          }
-        },
-      });
-
-      if (!response.fileName) {
-        Log.warn('Workflow creation cancelled.');
-        process.exit(0);
-      }
-
-      fileName = response.fileName;
+        initial: workflowStarter.defaultFileName,
+      })
+    ).fileName;
+    if (!fileName) {
+      fileName = undefined;
+      continue;
     }
-
     try {
-      await this.ensureWorkflowsDirectoryExistsAsync({ projectDir });
-      await this.createWorkflowFileAsync({ fileName, projectDir });
+      WorkflowFile.validateYamlExtension(fileName);
     } catch (error) {
-      Log.error('Failed to create workflow file.');
-      throw error;
+      Log.error(error instanceof Error ? error.message : 'Invalid YAML file name extension');
+      fileName = undefined;
+      continue;
     }
-  }
-
-  private async ensureWorkflowsDirectoryExistsAsync({
-    projectDir,
-  }: {
-    projectDir: string;
-  }): Promise<void> {
-    try {
-      await fs.access(path.join(projectDir, '.eas', 'workflows'));
-    } catch {
-      await fs.mkdir(path.join(projectDir, '.eas', 'workflows'), { recursive: true });
-      Log.withTick(`Created directory ${chalk.bold(path.join(projectDir, '.eas', 'workflows'))}`);
-    }
-  }
-
-  private async createWorkflowFileAsync({
-    fileName,
-    projectDir,
-  }: {
-    fileName: string;
-    projectDir: string;
-  }): Promise<void> {
-    WorkflowFile.validateYamlExtension(fileName);
-
-    const filePath = path.join(projectDir, '.eas', 'workflows', fileName);
-
+    filePath = path.join(projectDir, '.eas', 'workflows', fileName);
     if (await fsExtra.pathExists(filePath)) {
-      throw new Error(`Workflow file already exists: ${filePath}`);
+      Log.error(`Workflow file already exists: ${filePath}`);
+      Log.error('Please choose a different file name.');
+      Log.newLine();
+      fileName = undefined;
     }
-
-    await fs.writeFile(filePath, HELLO_WORLD_TEMPLATE);
-    Log.withTick(`Created ${chalk.bold(filePath)}`);
   }
+  return { fileName: fileName ?? '', filePath };
 }

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

@@ -1,6 +1,6 @@
 import EasCommand from '../../commandUtils/EasCommand';
 import { EasJsonOnlyFlag } from '../../commandUtils/flags';
-import { WorkflowResult } from '../../commandUtils/workflows';
+import { WorkflowResult } from '../../commandUtils/workflow/types';
 import { AppQuery } from '../../graphql/queries/AppQuery';
 import Log from '../../log';
 import formatFields from '../../utils/formatFields';

packages/eas-cli/src/commands/workflow/logs.ts

@@ -0,0 +1,111 @@
+import { Flags } from '@oclif/core';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { EASNonInteractiveFlag, EasJsonOnlyFlag } from '../../commandUtils/flags';
+import {
+  WorkflowCommandSelectionState,
+  WorkflowCommandSelectionStateValue,
+  executeWorkflowSelectionActionsAsync,
+} from '../../commandUtils/workflow/stateMachine';
+import { WorkflowLogLine, WorkflowLogs } from '../../commandUtils/workflow/types';
+import Log from '../../log';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+
+function printLogsForAllSteps(logs: WorkflowLogs): void {
+  [...logs.keys()].forEach(step => {
+    const logLines = logs.get(step);
+    if (logLines) {
+      Log.log(`Step: ${step}`);
+      logLines.forEach(line => {
+        Log.log(`  ${line.time} ${line.msg}`);
+      });
+    }
+    Log.addNewLineIfNone();
+  });
+}
+
+export default class WorkflowLogView extends EasCommand {
+  static override description =
+    'view logs for a workflow run, selecting a job and step to view. You can pass in either a workflow run ID or a job ID. If no ID is passed in, you will be prompted to select from recent workflow runs for the current project.';
+
+  static override flags = {
+    ...EasJsonOnlyFlag,
+    ...EASNonInteractiveFlag,
+    'all-steps': Flags.boolean({
+      description:
+        'Print all logs, rather than prompting for a specific step. This will be automatically set when in non-interactive mode.',
+      default: false,
+    }),
+  };
+
+  static override args = [
+    { name: 'id', description: 'ID of the workflow run or workflow job to view logs for' },
+  ];
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  async runAsync(): Promise<void> {
+    const { args, flags } = await this.parse(WorkflowLogView);
+
+    const nonInteractive = flags['non-interactive'];
+    const allSteps = nonInteractive ? true : flags['all-steps'];
+    Log.debug(`allSteps = ${allSteps}`);
+    Log.debug(`nonInteractive = ${nonInteractive}`);
+    Log.debug(`flags.json = ${flags.json}`);
+    Log.debug(`args.id = ${args.id}`);
+
+    const {
+      loggedIn: { graphqlClient },
+      projectId,
+    } = await this.getContextAsync(WorkflowLogView, {
+      nonInteractive,
+    });
+
+    if (flags.json) {
+      enableJsonOutput();
+    }
+
+    const finalSelectionState: WorkflowCommandSelectionState =
+      await executeWorkflowSelectionActionsAsync({
+        graphqlClient,
+        projectId,
+        nonInteractive,
+        allSteps,
+        state: WorkflowCommandSelectionStateValue.WORKFLOW_JOB_SELECTION,
+        jobId: args.id,
+      });
+
+    if (finalSelectionState.state === WorkflowCommandSelectionStateValue.ERROR) {
+      Log.error(finalSelectionState.message);
+      return;
+    }
+
+    const logs = finalSelectionState?.logs as unknown as WorkflowLogs | null;
+    if (allSteps) {
+      if (logs) {
+        if (flags.json) {
+          printJsonOnlyOutput(Object.fromEntries(logs));
+        } else {
+          printLogsForAllSteps(logs);
+        }
+      }
+    } else {
+      const selectedStep = finalSelectionState?.step as unknown as string;
+      const logLines = logs?.get(selectedStep);
+      if (logLines) {
+        if (flags.json) {
+          const output: { [key: string]: WorkflowLogLine[] | null } = {};
+          output[selectedStep] = logLines ?? null;
+          printJsonOnlyOutput(output);
+        } else {
+          logLines.forEach(line => {
+            Log.log(`  ${line.time} ${line.msg}`);
+          });
+        }
+      }
+    }
+  }
+}

packages/eas-cli/src/commands/workflow/run.ts

@@ -1,9 +1,54 @@
+/**
+ * EAS Workflow Run Command
+ *
+ * This command runs an EAS workflow with support for interactive input prompting.
+ *
+ * Input Sources (in order of precedence):
+ * 1. Command line flags (-F key=value)
+ * 2. STDIN JSON input (echo '{"key": "value"}' | eas workflow:run)
+ * 3. Interactive prompts (when required inputs are missing and not in non-interactive mode)
+ *
+ * Interactive Prompting:
+ * - When running in interactive mode (default), the command will automatically prompt
+ *   for any required inputs that are not provided via flags or STDIN
+ * - Input types supported: string, boolean, number, choice, environment
+ * - Each input type has appropriate validation and default values
+ * - Use --non-interactive flag to disable prompting and require all inputs via flags
+ *
+ * Example workflow with inputs:
+ * ```yaml
+ * on:
+ *   workflow_dispatch:
+ *     inputs:
+ *       environment:
+ *         type: string
+ *         required: true
+ *         description: "Environment to deploy to"
+ *       debug:
+ *         type: boolean
+ *         default: false
+ *         description: "Enable debug mode"
+ *       version:
+ *         type: number
+ *         required: true
+ *         description: "Version number"
+ *       deployment_type:
+ *         type: choice
+ *         options: ["staging", "production"]
+ *         default: "staging"
+ *         description: "Type of deployment"
+ * ```
+ */
+
+import spawnAsync from '@expo/spawn-async';
 import { Flags } from '@oclif/core';
 import { CombinedError } from '@urql/core';
 import chalk from 'chalk';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import slash from 'slash';
+import * as YAML from 'yaml';
+import { z } from 'zod';
 
 import { getWorkflowRunUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
@@ -11,6 +56,7 @@ import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/creat
 import { EASNonInteractiveFlag, EasJsonOnlyFlag } from '../../commandUtils/flags';
 import {
   WorkflowProjectSourceType,
+  WorkflowRevision,
   WorkflowRunByIdQuery,
   WorkflowRunStatus,
 } from '../../graphql/generated';
@@ -22,6 +68,7 @@ import { ora } from '../../ora';
 import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
 import { uploadAccountScopedFileAsync } from '../../project/uploadAccountScopedFileAsync';
 import { uploadAccountScopedProjectSourceAsync } from '../../project/uploadAccountScopedProjectSourceAsync';
+import { promptAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { sleepAsync } from '../../utils/promise';
 import { WorkflowFile } from '../../utils/workflowFile';
@@ -33,7 +80,8 @@ const EXIT_CODES = {
 };
 
 export default class WorkflowRun extends EasCommand {
-  static override description = 'run an EAS workflow';
+  static override description =
+    'run an EAS workflow. The entire local project directory will be packaged and uploaded to EAS servers for the workflow run, unless the --ref flag is used.';
 
   static override args = [{ name: 'file', description: 'Path to the workflow file to run' }];
 
@@ -45,6 +93,19 @@ export default class WorkflowRun extends EasCommand {
       description: 'Exit codes: 0 = success, 11 = failure, 12 = canceled, 13 = wait aborted.',
       summary: 'Wait for workflow run to complete',
     }),
+    input: Flags.string({
+      char: 'F',
+      aliases: ['f', 'field'],
+      multiple: true,
+      description:
+        'Add a parameter in key=value format. Use multiple instances of this flag to set multiple inputs.',
+      summary: 'Set workflow inputs',
+    }),
+    ref: Flags.string({
+      description:
+        "The git reference must exist in the project's git repository, and the workflow file must exist at that reference. When this flag is used, the local project is not uploaded; instead, the workflow is run from the exact state of the project at the chosen reference.",
+      summary: 'Git reference to run the workflow on',
+    }),
     ...EasJsonOnlyFlag,
   };
 
@@ -72,26 +133,70 @@ export default class WorkflowRun extends EasCommand {
       withServerSideEnvironment: null,
     });
 
-    let yamlConfig: string;
-    try {
-      const workflowFileContents = await WorkflowFile.readWorkflowFileContentsAsync({
-        projectDir,
-        filePath: args.file,
-      });
-      Log.log(`Using workflow file from ${workflowFileContents.filePath}`);
-      yamlConfig = workflowFileContents.yamlConfig;
-    } catch (err) {
-      Log.error('Failed to read workflow file.');
-
-      throw err;
-    }
-
     const {
       projectId,
       exp: { slug: projectName },
     } = await getDynamicPrivateProjectConfigAsync();
     const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
 
+    let yamlConfig: string;
+    let workflowRunId: string;
+    let workflowRevisionId: string | undefined;
+    let gitRef: string | undefined;
+
+    if (flags.ref) {
+      // Run from git ref
+      const fileName = path.basename(args.file);
+      // Find the real commit, make sure the ref is valid
+      gitRef = (
+        await spawnAsync('git', ['rev-parse', flags.ref], {
+          cwd: projectDir,
+        })
+      ).output[0].trim();
+      if (!gitRef) {
+        throw new Error('Failed to resolve git reference');
+      }
+      Log.log(`Using workflow file ${fileName} at ${gitRef}`);
+      let revisionResult: WorkflowRevision | undefined;
+      try {
+        revisionResult = await WorkflowRevisionMutation.getOrCreateWorkflowRevisionFromGitRefAsync(
+          graphqlClient,
+          {
+            appId: projectId,
+            fileName,
+            gitRef,
+          }
+        );
+      } catch (err) {
+        throw new Error(
+          `Failed to find or create workflow revision for ${fileName} at ${flags.ref}: ${err}`
+        );
+      }
+      Log.debug(`Workflow revision: ${JSON.stringify(revisionResult, null, 2)}`);
+      if (!revisionResult) {
+        throw new Error(
+          `Failed to find or create workflow revision for ${fileName} at ${flags.ref}`
+        );
+      }
+      yamlConfig = revisionResult.yamlConfig;
+      workflowRevisionId = revisionResult.id;
+    } else {
+      // Run from local file
+      try {
+        const workflowFileContents = await WorkflowFile.readWorkflowFileContentsAsync({
+          projectDir,
+          filePath: args.file,
+        });
+        Log.log(`Using workflow file from ${workflowFileContents.filePath}`);
+        yamlConfig = workflowFileContents.yamlConfig;
+      } catch (err) {
+        Log.error('Failed to read workflow file.');
+
+        throw err;
+      }
+    }
+
+    // Validate workflow YAML
     try {
       await WorkflowRevisionMutation.validateWorkflowYamlConfigAsync(graphqlClient, {
         appId: projectId,
@@ -101,14 +206,47 @@ export default class WorkflowRun extends EasCommand {
       if (error instanceof CombinedError) {
         WorkflowFile.maybePrintWorkflowFileValidationErrors({
           error,
-          accountName: account.name,
-          projectName,
         });
 
         throw error;
       }
     }
 
+    let inputs: Record<string, unknown> | undefined;
+
+    // Check for stdin input
+    const stdinData = await maybeReadStdinAsync();
+
+    const inputsFromFlags = [...(flags.input ?? [])];
+
+    // Validate that both stdin and -F flags are not provided simultaneously
+    if (stdinData && inputsFromFlags.length > 0) {
+      throw new Error(
+        'Cannot use both stdin JSON input and -F flags simultaneously. Please use only one input method.'
+      );
+    }
+
+    if (stdinData) {
+      inputs = parseJsonInputs(stdinData);
+    } else if (inputsFromFlags.length > 0) {
+      inputs = parseInputs(inputsFromFlags);
+    }
+
+    // Parse workflow inputs from YAML and prompt for missing required inputs
+    const inputSpecs = parseWorkflowInputsFromYaml(yamlConfig);
+    if (!flags['non-interactive']) {
+      inputs = await maybePromptForMissingInputsAsync({ inputSpecs, inputs: inputs ?? {} });
+    }
+
+    if (inputs && Object.keys(inputs).length > 0) {
+      Log.addNewLineIfNone();
+      Log.newLine();
+      Log.log('Running with inputs:');
+      for (const [key, value] of Object.entries(inputs)) {
+        Log.log(`- ${chalk.bold(key)}: ${JSON.stringify(value)}`);
+      }
+    }
+
     let projectArchiveBucketKey: string;
     let easJsonBucketKey: string | null = null;
     let packageJsonBucketKey: string | null = null;
@@ -120,80 +258,95 @@ export default class WorkflowRun extends EasCommand {
       path.relative(await vcsClient.getRootPathAsync(), projectDir) || '.'
     );
 
-    try {
-      ({ projectArchiveBucketKey } = await uploadAccountScopedProjectSourceAsync({
-        graphqlClient,
-        vcsClient,
-        accountId: account.id,
-      }));
-
-      if (await fileExistsAsync(easJsonPath)) {
-        ({ fileBucketKey: easJsonBucketKey } = await uploadAccountScopedFileAsync({
+    if (gitRef) {
+      // Run from git ref
+      let runResult: { id: string };
+      try {
+        runResult = await WorkflowRunMutation.createWorkflowRunFromGitRefAsync(graphqlClient, {
+          workflowRevisionId: workflowRevisionId ?? '',
+          gitRef,
+          inputs,
+        });
+      } catch (err) {
+        throw new Error(`Failed to create workflow run: ${err}`);
+      }
+      workflowRunId = runResult.id;
+    } else {
+      // Run from local file
+      try {
+        ({ projectArchiveBucketKey } = await uploadAccountScopedProjectSourceAsync({
           graphqlClient,
+          vcsClient,
           accountId: account.id,
-          filePath: easJsonPath,
-          maxSizeBytes: 1024 * 1024,
         }));
-      } else {
-        Log.warn(
-          `⚠ No ${chalk.bold('eas.json')} found in the project directory. Running ${chalk.bold(
-            'type: build'
-          )} jobs will not work. Run ${chalk.bold(
-            'eas build:configure'
-          )} to configure your project for builds.`
-        );
+
+        if (await fileExistsAsync(easJsonPath)) {
+          ({ fileBucketKey: easJsonBucketKey } = await uploadAccountScopedFileAsync({
+            graphqlClient,
+            accountId: account.id,
+            filePath: easJsonPath,
+            maxSizeBytes: 1024 * 1024,
+          }));
+        } else {
+          Log.warn(
+            `⚠ No ${chalk.bold('eas.json')} found in the project directory. Running ${chalk.bold(
+              'type: build'
+            )} jobs will not work. Run ${chalk.bold(
+              'eas build:configure'
+            )} to configure your project for builds.`
+          );
+        }
+
+        if (await fileExistsAsync(packageJsonPath)) {
+          ({ fileBucketKey: packageJsonBucketKey } = await uploadAccountScopedFileAsync({
+            graphqlClient,
+            accountId: account.id,
+            filePath: packageJsonPath,
+            maxSizeBytes: 1024 * 1024,
+          }));
+        } else {
+          Log.warn(
+            `⚠ No ${chalk.bold(
+              'package.json'
+            )} found in the project directory. It is used to automatically infer best job configuration for your project. You may want to define ${chalk.bold(
+              'image'
+            )} property in your workflow to specify the image to use.`
+          );
+        }
+      } catch (err) {
+        Log.error('Failed to upload project sources.');
+
+        throw err;
       }
 
-      if (await fileExistsAsync(packageJsonPath)) {
-        ({ fileBucketKey: packageJsonBucketKey } = await uploadAccountScopedFileAsync({
-          graphqlClient,
-          accountId: account.id,
-          filePath: packageJsonPath,
-          maxSizeBytes: 1024 * 1024,
-        }));
-      } else {
-        Log.warn(
-          `⚠ No ${chalk.bold(
-            'package.json'
-          )} found in the project directory. It is used to automatically infer best job configuration for your project. You may want to define ${chalk.bold(
-            'image'
-          )} property in your workflow to specify the image to use.`
-        );
-      }
-    } catch (err) {
-      Log.error('Failed to upload project sources.');
-
-      throw err;
-    }
-
-    let workflowRunId: string;
-
-    try {
-      ({ id: workflowRunId } = await WorkflowRunMutation.createWorkflowRunAsync(graphqlClient, {
-        appId: projectId,
-        workflowRevisionInput: {
-          fileName: path.basename(args.file),
-          yamlConfig,
-        },
-        workflowRunInput: {
-          projectSource: {
-            type: WorkflowProjectSourceType.Gcs,
-            projectArchiveBucketKey,
-            easJsonBucketKey,
-            packageJsonBucketKey,
-            projectRootDirectory,
+      try {
+        ({ id: workflowRunId } = await WorkflowRunMutation.createWorkflowRunAsync(graphqlClient, {
+          appId: projectId,
+          workflowRevisionInput: {
+            fileName: path.basename(args.file),
+            yamlConfig,
           },
-        },
-      }));
+          workflowRunInput: {
+            inputs,
+            projectSource: {
+              type: WorkflowProjectSourceType.Gcs,
+              projectArchiveBucketKey,
+              easJsonBucketKey,
+              packageJsonBucketKey,
+              projectRootDirectory,
+            },
+          },
+        }));
+      } catch (err) {
+        Log.error('Failed to start the workflow with the API.');
 
-      Log.newLine();
-      Log.log(`See logs: ${link(getWorkflowRunUrl(account.name, projectName, workflowRunId))}`);
-    } catch (err) {
-      Log.error('Failed to start the workflow with the API.');
-
-      throw err;
+        throw err;
+      }
     }
 
+    Log.newLine();
+    Log.log(`See logs: ${link(getWorkflowRunUrl(account.name, projectName, workflowRunId))}`);
+
     if (!flags.wait) {
       if (flags.json) {
         printJsonOnlyOutput({
@@ -288,3 +441,250 @@ async function fileExistsAsync(filePath: string): Promise<boolean> {
     .then(() => true)
     .catch(() => false);
 }
+
+export function parseInputs(inputFlags: string[]): Record<string, string> {
+  const inputs: Record<string, string> = {};
+
+  for (const inputFlag of inputFlags) {
+    const equalIndex = inputFlag.indexOf('=');
+    if (equalIndex === -1) {
+      throw new Error(`Invalid input format: ${inputFlag}. Expected key=value format.`);
+    }
+
+    const key = inputFlag.substring(0, equalIndex);
+    const value = inputFlag.substring(equalIndex + 1);
+
+    if (!key) {
+      throw new Error(`Invalid input format: ${inputFlag}. Key cannot be empty.`);
+    }
+
+    inputs[key] = value;
+  }
+
+  return inputs;
+}
+
+export async function maybeReadStdinAsync(): Promise<string | null> {
+  // Check if there's data on stdin
+  if (process.stdin.isTTY) {
+    return null;
+  }
+
+  return await new Promise((resolve, reject) => {
+    let data = '';
+
+    process.stdin.setEncoding('utf8');
+
+    process.stdin.on('readable', () => {
+      let chunk;
+      while ((chunk = process.stdin.read()) !== null) {
+        data += chunk;
+      }
+    });
+
+    process.stdin.on('end', () => {
+      const trimmedData = data.trim();
+      resolve(trimmedData || null);
+    });
+
+    process.stdin.on('error', err => {
+      reject(err);
+    });
+  });
+}
+
+export function parseJsonInputs(jsonString: string): Record<string, string> {
+  try {
+    const parsed = JSON.parse(jsonString);
+
+    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+      throw new Error('JSON input must be an object.');
+    }
+
+    return parsed;
+  } catch (error) {
+    throw new Error(`Invalid JSON input.`, { cause: error });
+  }
+}
+
+// `z.coerce.boolean()` does `Boolean(val)` under the hood,
+// which is not what we want. See:
+// https://github.com/colinhacks/zod/issues/2985#issuecomment-2230692578
+const booleanLike = z.union([
+  z.boolean(),
+  z.codec(z.number(), z.boolean(), {
+    decode: n => !!n,
+    encode: b => (b ? 1 : 0),
+  }),
+  z.stringbool({ truthy: ['true', 'True'], falsy: ['false', 'False'] }),
+]);
+
+const stringLike = z.codec(
+  z.union([
+    // We're going to coerce numbers and strings into strings.
+    z.number(),
+    z.string(),
+    // We do not allow other primitives, like:
+    // - bigints, symbols - because YAML does not support them,
+    // - booleans - because YAML accepts `True` and `true` as boolean input
+    //   and parses both as JS `true` -- if we stringified that,
+    //   we would lose the capital "T" which may not be what the user expects,
+    // - nulls - user should do `"null"` or not pass the property at all.
+  ]),
+  z.string(),
+  {
+    decode: value => {
+      if (typeof value === 'string') {
+        return value;
+      }
+      if (typeof value === 'number') {
+        return String(value);
+      }
+      throw new Error(`Cannot convert ${typeof value} to string: ${value}`);
+    },
+    encode: value => value,
+  }
+);
+
+export const WorkflowDispatchInputZ = z
+  .object({
+    description: stringLike.optional().describe('Description of the input'),
+    required: booleanLike.default(false).describe('Whether the input is required.'),
+  })
+  .and(
+    z.union([
+      z.object({
+        type: z.literal('string').default('string'),
+        default: stringLike.optional().describe('Default value for the input'),
+      }),
+      z.object({
+        type: z.literal('boolean'),
+        default: booleanLike.optional().describe('Default value for the input'),
+      }),
+      z.object({
+        type: z.literal('number'),
+        default: z.number().optional().describe('Default value for the input'),
+      }),
+      z.object({
+        type: z.literal('choice'),
+        default: stringLike.optional().describe('Default value for the input'),
+        options: z.array(stringLike).min(1).describe('Options for choice type inputs'),
+      }),
+      z.object({
+        type: z.literal('environment'),
+        default: z.string().optional().describe('Default value for the input'),
+      }),
+    ])
+  );
+
+export function parseWorkflowInputsFromYaml(
+  yamlConfig: string
+): Record<string, z.infer<typeof WorkflowDispatchInputZ>> {
+  try {
+    const parsed = YAML.parse(yamlConfig);
+    return z
+      .record(z.string(), WorkflowDispatchInputZ)
+      .default({})
+      .parse(parsed?.on?.workflow_dispatch?.inputs);
+  } catch (error) {
+    Log.warn('Failed to parse workflow inputs from YAML:', error);
+    return {};
+  }
+}
+
+async function maybePromptForMissingInputsAsync({
+  inputSpecs,
+  inputs,
+}: {
+  inputSpecs: Record<string, z.infer<typeof WorkflowDispatchInputZ>>;
+  inputs: Record<string, unknown>;
+}): Promise<Record<string, unknown>> {
+  const requiredInputs = Object.entries(inputSpecs).filter(([_, spec]) => spec.required);
+
+  const missingRequiredInputs = requiredInputs.filter(([key]) => inputs[key] === undefined);
+
+  if (missingRequiredInputs.length === 0) {
+    return inputs;
+  }
+
+  Log.addNewLineIfNone();
+  Log.log('Some required inputs are missing. Please provide them:');
+
+  const nextInputs = { ...inputs };
+
+  for (const [key, spec] of missingRequiredInputs) {
+    const value = await promptForMissingInputAsync({ key, spec });
+    nextInputs[key] = value;
+  }
+
+  return nextInputs;
+}
+
+async function promptForMissingInputAsync({
+  key,
+  spec,
+}: {
+  key: string;
+  spec: z.infer<typeof WorkflowDispatchInputZ>;
+}): Promise<unknown> {
+  const message = spec.description ? `${key} (${spec.description})` : key;
+
+  switch (spec.type) {
+    case 'boolean': {
+      const { value } = await promptAsync({
+        type: 'confirm',
+        name: 'value',
+        message,
+        initial: spec.default,
+      });
+      return value;
+    }
+
+    case 'number': {
+      const { value } = await promptAsync({
+        type: 'number',
+        name: 'value',
+        message,
+        initial: spec.default,
+        validate: (val: number) => {
+          if (isNaN(val)) {
+            return 'Please enter a valid number';
+          }
+          return true;
+        },
+      });
+      return value;
+    }
+
+    case 'choice': {
+      const { value } = await promptAsync({
+        type: 'select',
+        name: 'value',
+        message,
+        choices: spec.options.map(option => ({
+          title: option,
+          value: option,
+        })),
+        initial: spec.default,
+      });
+      return value;
+    }
+
+    case 'string':
+    case 'environment': {
+      const { value } = await promptAsync({
+        type: 'text',
+        name: 'value',
+        message,
+        initial: spec.default,
+        validate: (val: string) => {
+          if (spec.required && (!val || val.trim() === '')) {
+            return 'This field is required';
+          }
+          return true;
+        },
+      });
+      return value;
+    }
+  }
+}

packages/eas-cli/src/commands/workflow/runs.ts

@@ -3,7 +3,7 @@ import { Flags } from '@oclif/core';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EasJsonOnlyFlag } from '../../commandUtils/flags';
 import { getLimitFlagWithCustomValues } from '../../commandUtils/pagination';
-import { processWorkflowRuns } from '../../commandUtils/workflows';
+import { processWorkflowRuns } from '../../commandUtils/workflow/utils';
 import { WorkflowRunFragment, WorkflowRunStatus } from '../../graphql/generated';
 import { AppQuery } from '../../graphql/queries/AppQuery';
 import { WorkflowRunQuery } from '../../graphql/queries/WorkflowRunQuery';
@@ -85,8 +85,9 @@ export default class WorkflowRunList extends EasCommand {
           { label: 'Status', value: run.status },
           { label: 'Started At', value: run.startedAt },
           { label: 'Finished At', value: run.finishedAt },
+          { label: 'Trigger Type', value: run.triggerType },
+          { label: 'Trigger', value: run.trigger ?? 'null' },
           { label: 'Git Commit Message', value: run.gitCommitMessage ?? 'null' },
-          { label: 'Git Commit Hash', value: run.gitCommitHash ?? 'null' },
         ])
       );
       Log.addNewLineIfNone();

packages/eas-cli/src/commands/workflow/validate.ts

@@ -1,12 +1,11 @@
-import { CombinedError } from '@urql/core';
-import * as YAML from 'yaml';
-
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
-import { WorkflowRevisionMutation } from '../../graphql/mutations/WorkflowRevisionMutation';
+import {
+  logWorkflowValidationErrors,
+  validateWorkflowFileAsync,
+} from '../../commandUtils/workflow/validation';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
 import { WorkflowFile } from '../../utils/workflowFile';
 
 export class WorkflowValidate extends EasCommand {
@@ -27,6 +26,7 @@ export class WorkflowValidate extends EasCommand {
   static override contextDefinition = {
     ...this.ContextOptions.DynamicProjectConfig,
     ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.ProjectId,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -36,67 +36,30 @@ export class WorkflowValidate extends EasCommand {
       flags,
     } = await this.parse(WorkflowValidate);
 
-    const {
-      getDynamicPrivateProjectConfigAsync,
-      loggedIn: { graphqlClient },
-      projectDir,
-    } = await this.getContextAsync(WorkflowValidate, {
-      nonInteractive: flags['non-interactive'],
-      withServerSideEnvironment: null,
-    });
-
-    const {
-      projectId,
-      exp: { slug: projectName },
-    } = await getDynamicPrivateProjectConfigAsync();
-    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-
     const spinner = ora().start('Validating the workflow YAML file…');
-
     try {
+      const {
+        loggedIn: { graphqlClient },
+        projectDir,
+        projectId,
+      } = await this.getContextAsync(WorkflowValidate, {
+        nonInteractive: flags['non-interactive'],
+        withServerSideEnvironment: null,
+      });
+
       const workflowFileContents = await WorkflowFile.readWorkflowFileContentsAsync({
         projectDir,
         filePath,
       });
       Log.log(`Using workflow file from ${workflowFileContents.filePath}`);
 
-      const parsedYaml = YAML.parse(workflowFileContents.yamlConfig);
-
-      // Check if the parsed result is empty or null
-      if (
-        parsedYaml === null ||
-        parsedYaml === undefined ||
-        (typeof parsedYaml === 'object' && Object.keys(parsedYaml).length === 0)
-      ) {
-        throw new Error('YAML file is empty or contains only comments.');
-      }
-
-      await WorkflowRevisionMutation.validateWorkflowYamlConfigAsync(graphqlClient, {
-        appId: projectId,
-        yamlConfig: workflowFileContents.yamlConfig,
-      });
+      await validateWorkflowFileAsync(workflowFileContents, projectDir, graphqlClient, projectId);
 
       spinner.succeed('Workflow configuration YAML is valid.');
     } catch (error) {
       spinner.fail('Workflow configuration YAML is not valid.');
 
-      if (error instanceof YAML.YAMLParseError) {
-        Log.error(`YAML syntax error: ${error.message}`);
-      } else if (error instanceof CombinedError) {
-        WorkflowFile.maybePrintWorkflowFileValidationErrors({
-          error,
-          accountName: account.name,
-          projectName,
-        });
-
-        throw error;
-      } else if (error instanceof Error) {
-        Log.error(error.message);
-      } else {
-        Log.error(`Unexpected error: ${String(error)}`);
-      }
-
-      throw error;
+      logWorkflowValidationErrors(error);
     }
   }
 }

packages/eas-cli/src/commands/workflow/view.ts

@@ -0,0 +1,224 @@
+import chalk from 'chalk';
+
+import { formatGraphQLBuildArtifacts } from '../../build/utils/formatBuild';
+import { getWorkflowRunUrl } from '../../build/utils/url';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EASNonInteractiveFlag, EasJsonOnlyFlag } from '../../commandUtils/flags';
+import {
+  WorkflowCommandSelectionStateValue,
+  workflowRunSelectionAction,
+} from '../../commandUtils/workflow/stateMachine';
+import { WorkflowTriggerType } from '../../commandUtils/workflow/types';
+import { computeTriggerInfoForWorkflowRun } from '../../commandUtils/workflow/utils';
+import {
+  BuildArtifacts,
+  WorkflowArtifact,
+  WorkflowJobType,
+  WorkflowRunByIdWithJobsQuery,
+} from '../../graphql/generated';
+import { WorkflowRunQuery } from '../../graphql/queries/WorkflowRunQuery';
+import Log, { link } from '../../log';
+import formatFields, { FormatFieldsItem } from '../../utils/formatFields';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+
+type ReducedWorkflowArtifact = Omit<
+  WorkflowArtifact,
+  'createdAt' | 'jobRun' | 'storageType' | 'updatedAt'
+>;
+
+type WorkflowJobOutput =
+  WorkflowRunByIdWithJobsQuery['workflowRuns']['byId']['jobs'][number]['outputs'];
+
+type WorkflowJobResult = WorkflowRunByIdWithJobsQuery['workflowRuns']['byId']['jobs'][number] & {
+  artifacts?: ReducedWorkflowArtifact[] | BuildArtifacts | undefined;
+  output?: WorkflowJobOutput | undefined;
+};
+
+type WorkflowRunResult = WorkflowRunByIdWithJobsQuery['workflowRuns']['byId'] & {
+  logURL?: string | undefined;
+  triggerType?: WorkflowTriggerType | undefined;
+  trigger?: string | null;
+  jobs: WorkflowJobResult[];
+};
+
+const processedOutputs: (job: WorkflowJobResult) => FormatFieldsItem[] = job => {
+  const result: FormatFieldsItem[] = [];
+  const keys = job.outputs ? Object.keys(job.outputs) : [];
+  keys.forEach(key => {
+    result.push({
+      label: `    ${key}`,
+      get value(): string {
+        const value = job.outputs[key];
+        return typeof value === 'string' ? value : JSON.stringify(value, null, 2);
+      },
+    });
+  });
+  return result;
+};
+
+export default class WorkflowView extends EasCommand {
+  static override description =
+    'view details for a workflow run, including jobs. If no run ID is provided, you will be prompted to select from recent workflow runs for the current project.';
+
+  static override flags = {
+    ...EasJsonOnlyFlag,
+    ...EASNonInteractiveFlag,
+  };
+
+  static override args = [{ name: 'id', description: 'ID of the workflow run to view' }];
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  async runAsync(): Promise<void> {
+    const { args, flags } = await this.parse(WorkflowView);
+    const nonInteractive = flags['non-interactive'];
+    const {
+      loggedIn: { graphqlClient },
+      projectId,
+    } = await this.getContextAsync(WorkflowView, {
+      nonInteractive,
+    });
+    if (flags.json) {
+      enableJsonOutput();
+    }
+
+    if (nonInteractive && !args.id) {
+      throw new Error('If non-interactive, this command requires a workflow run ID as argument');
+    }
+
+    const actionResult = await workflowRunSelectionAction({
+      graphqlClient,
+      projectId,
+      nonInteractive,
+      allSteps: false,
+      state: WorkflowCommandSelectionStateValue.WORKFLOW_RUN_SELECTION,
+      runId: args.id,
+    });
+    if (actionResult.state === WorkflowCommandSelectionStateValue.ERROR) {
+      Log.error(actionResult.message);
+      return;
+    }
+    const idToQuery = actionResult.runId ?? '';
+
+    const result: WorkflowRunResult = await WorkflowRunQuery.withJobsByIdAsync(
+      graphqlClient,
+      idToQuery,
+      {
+        useCache: false,
+      }
+    );
+    const { triggerType, trigger } = computeTriggerInfoForWorkflowRun(result);
+    result.triggerType = triggerType;
+    result.trigger = trigger;
+
+    const processedJobs: WorkflowJobResult[] = result.jobs.map(job => {
+      const processedJob = job as WorkflowJobResult;
+      if (job.type === WorkflowJobType.Build) {
+        processedJob.artifacts = job.turtleBuild?.artifacts ?? undefined;
+      } else {
+        processedJob.artifacts = job.turtleJobRun?.artifacts;
+      }
+      delete processedJob.turtleJobRun;
+      return processedJob;
+    });
+    result.jobs = processedJobs;
+
+    result.logURL = getWorkflowRunUrl(
+      result.workflow.app.ownerAccount.name,
+      result.workflow.app.name,
+      result.id
+    );
+
+    if (flags.json) {
+      printJsonOnlyOutput(result);
+      return;
+    }
+
+    Log.log(
+      formatFields([
+        { label: 'Run ID', value: result.id },
+        { label: 'Workflow', value: result.workflow.fileName },
+        { label: 'Trigger Type', value: result.triggerType },
+        { label: 'Trigger', value: result.trigger ?? 'null' },
+        {
+          label: 'Git Commit Message',
+          value: result.gitCommitMessage?.split('\n')[0] ?? 'null',
+        },
+        { label: 'Status', value: result.status },
+        { label: 'Errors', value: result.errors.map(error => error.title).join('\n') },
+        { label: 'Created At', value: result.createdAt },
+        { label: 'Updated At', value: result.updatedAt },
+        { label: 'Log URL', value: link(result.logURL) },
+      ])
+    );
+    Log.addNewLineIfNone();
+    result.jobs.forEach((job: WorkflowJobResult) => {
+      Log.log(
+        formatFields([
+          { label: 'Job ID', value: job.id },
+          { label: '  Key', value: job.key },
+          { label: '  Name', value: job.name },
+          { label: '  Status', value: job.status },
+          { label: '  Type', value: job.type },
+          { label: '  Created At', value: job.createdAt },
+          { label: '  Updated At', value: job.updatedAt },
+        ])
+      );
+      if (job.errors.length > 0) {
+        Log.gray(chalk.dim('  Errors:'));
+        job.errors.forEach(error => {
+          Log.log(formatFields([{ label: `    ${error.title}`, value: `${error.message}` }]));
+        });
+      }
+      if (job.outputs) {
+        const outputs = processedOutputs(job);
+        if (outputs.length > 0) {
+          Log.gray(chalk.dim('  Outputs:'));
+          Log.log(formatFields(outputs));
+        }
+      }
+      if (job.type === WorkflowJobType.Build) {
+        if (job.turtleBuild?.artifacts) {
+          Log.gray(chalk.dim('  Artifacts:'));
+          Log.log(
+            formatFields(
+              formatGraphQLBuildArtifacts(job.turtleBuild).map(item => {
+                item.label = `    ${item.label}`;
+                return item;
+              })
+            )
+          );
+        }
+      } else {
+        const jobArtifacts = job.artifacts as ReducedWorkflowArtifact[];
+        if (jobArtifacts?.length) {
+          Log.gray(chalk.dim('  Artifacts:'));
+          jobArtifacts.forEach(artifact => {
+            Log.log(
+              formatFields([
+                { label: '    ID', value: artifact.id },
+                { label: '    Name', value: artifact.name },
+                { label: '    Content Type', value: artifact?.contentType ?? 'null' },
+                {
+                  label: '    File Size Bytes',
+                  value: artifact?.fileSizeBytes ? `${artifact.fileSizeBytes}` : 'null',
+                },
+                { label: '    Filename', value: artifact.filename },
+                {
+                  label: '    Download URL',
+                  value: artifact?.downloadUrl ? link(artifact.downloadUrl) : 'null',
+                },
+              ])
+            );
+            Log.addNewLineIfNone();
+          });
+        }
+      }
+
+      Log.addNewLineIfNone();
+    });
+  }
+}

packages/eas-cli/src/credentials/__tests__/fixtures-constants.ts

@@ -44,6 +44,21 @@ export const jester2 = {
   featureGates: {},
 };
 
+export const robot: Actor = {
+  __typename: 'Robot',
+  id: 'robot-id',
+  firstName: 'Test Robot',
+  accounts: [
+    {
+      id: 'robot-account-id',
+      name: 'robot-account',
+      users: [],
+    },
+  ],
+  isExpoAdmin: false,
+  featureGates: {},
+};
+
 assert(jester.__typename === 'User');
 export const testUsername = jester.username;
 export const testSlug = 'testApp';

packages/eas-cli/src/credentials/__tests__/fixtures-ios.ts

@@ -176,7 +176,7 @@ export function getNewIosApiMock(): { [key in keyof typeof IosGraphqlClient]?: a
     updateIosAppCredentialsAsync: jest.fn(),
     createOrUpdateIosAppBuildCredentialsAsync: jest.fn(),
     getIosAppCredentialsWithBuildCredentialsAsync: jest.fn(),
-    createOrGetExistingAppleTeamAsync: () => testAppleTeam,
+    createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync: () => testAppleTeam,
     createOrGetExistingAppleAppIdentifierAsync: jest.fn(),
     getDevicesForAppleTeamAsync: jest.fn(),
     createProvisioningProfileAsync: jest.fn(),

packages/eas-cli/src/credentials/ios/IosCredentialsProvider.ts

@@ -98,9 +98,7 @@ export default class IosCredentialsProvider {
     const setupPushKeyAction = new SetUpPushKey(appLookupParams);
     const isPushKeySetup = await setupPushKeyAction.isPushKeySetupAsync(ctx);
     if (isPushKeySetup) {
-      Log.succeed(
-        `Push Notifications setup for ${app.projectName}: ${applicationTarget.bundleIdentifier}`
-      );
+      Log.succeed(`Push Notifications are set up`);
       return null;
     }
 

packages/eas-cli/src/credentials/ios/actions/AppleTeamUtils.ts

@@ -9,8 +9,12 @@ export async function resolveAppleTeamIfAuthenticatedAsync(
   if (!ctx.appStore.authCtx) {
     return null;
   }
-  return await ctx.ios.createOrGetExistingAppleTeamAsync(ctx.graphqlClient, app.account, {
-    appleTeamIdentifier: ctx.appStore.authCtx.team.id,
-    appleTeamName: ctx.appStore.authCtx.team.name,
-  });
+  return await ctx.ios.createOrGetExistingAppleTeamAndUpdateNameIfChangedAsync(
+    ctx.graphqlClient,
+    app.account.id,
+    {
+      appleTeamIdentifier: ctx.appStore.authCtx.team.id,
+      appleTeamName: ctx.appStore.authCtx.team.name,
+    }
+  );
 }

packages/eas-cli/src/credentials/ios/actions/DistributionCertificateUtils.ts

@@ -227,7 +227,7 @@ async function generateDistributionCertificateAsync(
           `✅  Distribution Certificates can be revoked with no side effects for App Store builds.`
         )
       );
-      Log.log(learnMore('https://docs.expo.dev/distribution/app-signing/#summary'));
+      Log.log(learnMore('https://docs.expo.dev/app-signing/app-credentials/#summary'));
       Log.newLine();
 
       const { distCertsToRevoke } = await promptAsync({

packages/eas-cli/src/credentials/ios/actions/PushKeyUtils.ts

@@ -76,7 +76,9 @@ async function generatePushKeyAsync(ctx: CredentialsContext): Promise<PushKey> {
       }
 
       Log.log(chalk.grey(`⚠️  Revoking a Push Key will affect other apps that rely on it`));
-      Log.log(learnMore('https://docs.expo.dev/distribution/app-signing/#push-notification-keys'));
+      Log.log(
+        learnMore('https://docs.expo.dev/app-signing/app-credentials/#push-notification-keys')
+      );
       Log.log();
 
       const { pushKeysToRevoke } = await promptAsync({