[3/n][eas-cli] getUsername -> getUsernameForActor

[6/n][eas-cli] Clean up some remaining project utils methods (#1373 )
[5/n][eas-cli] Remove getProjectFullNameAsync (#1372 )
2026-11-13 20:28:08 -10:00 · 2022-09-19 15:32:16 -07:00 · 2022-09-19 15:31:07 -07:00 · 2022-09-19 15:28:34 -07:00 · 2022-09-19 15:26:41 -07:00 · 2022-09-19 15:24:13 -07:00
148 changed files with 3842 additions and 2533 deletions
@@ -6,15 +6,24 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🛠 Breaking changes

+- Prompt before configuring EAS project. ([#1356](https://github.com/expo/eas-cli/pull/1356) by [@wschurman](https://github.com/wschurman))
+
 ### 🎉 New features

 - Add `-e` as a shortcut for `--profile` flag. ([#1342](https://github.com/expo/eas-cli/pull/1342) by [@szdziedzic](https://github.com/szdziedzic))
 - Support JSON5 in **eas.json**. ([#1350](https://github.com/expo/eas-cli/pull/1350) by [@dsokal](https://github.com/dsokal))
+- Add pagination and interactivity to update commands. ([#1323](https://github.com/expo/eas-cli/pull/1323) by [@kgc00](https://github.com/kgc00))
+- Add support for uploading files to EAS Secret. ([#1354](https://github.com/expo/eas-cli/pull/1354) by [@dsokal](https://github.com/dsokal))
+- Add pagination to channel commands. ([#1352](https://github.com/expo/eas-cli/pull/1352) by [@kgc00](https://github.com/kgc00))
+- Add pagination to build commands. ([#1353](https://github.com/expo/eas-cli/pull/1353) by [@kgc00](https://github.com/kgc00))
+- Provide suggestions for developers when archive size is large. ([#1363](https://github.com/expo/eas-cli/pull/1363) by [@szdziedzic](https://github.com/szdziedzic))

 ### 🐛 Bug fixes

 ### 🧹 Chores

+- Standardize the GQL 'Update' schema using UpdateFragmentNode. ([#1348](https://github.com/expo/eas-cli/pull/1348) by [@kgc00](https://github.com/kgc00))
+
 ## [2.1.0](https://github.com/expo/eas-cli/releases/tag/v2.1.0) - 2022-09-05

 ### 🎉 New features
@@ -6746,6 +6746,18 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
+          {
+            "name": "githubRepository",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "OBJECT",
+              "name": "GitHubRepository",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
          {
            "name": "githubUrl",
            "description": "githubUrl field from most recent classic update manifest",
@@ -11758,8 +11770,8 @@
              "name": "PaymentDetails",
              "ofType": null
            },
-            "isDeprecated": false,
-            "deprecationReason": null
+            "isDeprecated": true,
+            "deprecationReason": "No longer used"
          },
          {
            "name": "subscription",
@@ -15430,6 +15442,18 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
+          {
+            "name": "type",
+            "description": "",
+            "type": {
+              "kind": "ENUM",
+              "name": "EnvironmentSecretType",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
          {
            "name": "value",
            "description": "",
@@ -15494,6 +15518,65 @@
        "enumValues": null,
        "possibleTypes": null
      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "CreateGitHubRepositoryInput",
+        "description": "",
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "appId",
+            "description": "",
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "githubAppInstallationId",
+            "description": "",
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "githubRepositoryIdentifier",
+            "description": "",
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
      {
        "kind": "INPUT_OBJECT",
        "name": "CreateIosSubmissionInput",
@@ -16482,6 +16565,22 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
+          {
+            "name": "type",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "EnvironmentSecretType",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
          {
            "name": "updatedAt",
            "description": "",
@@ -16646,6 +16745,29 @@
        "enumValues": null,
        "possibleTypes": null
      },
+      {
+        "kind": "ENUM",
+        "name": "EnvironmentSecretType",
+        "description": "",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "FILE_BASE64",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "STRING",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
      {
        "kind": "OBJECT",
        "name": "ExperimentationQuery",
@@ -17016,6 +17138,55 @@
        "name": "GitHubAppInstallation",
        "description": "",
        "fields": [
+          {
+            "name": "accessibleRepositories",
+            "description": "",
+            "args": [
+              {
+                "name": "page",
+                "description": "",
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "1",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "perPage",
+                "description": "",
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "50",
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "GitHubAppInstallationAccessibleRepository",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
          {
            "name": "account",
            "description": "",
@@ -17075,6 +17246,192 @@
            },
            "isDeprecated": false,
            "deprecationReason": null
+          },
+          {
+            "name": "metadata",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "GitHubAppInstallationMetadata",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "GitHubAppInstallationAccessibleRepository",
+        "description": "",
+        "fields": [
+          {
+            "name": "defaultBranch",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "description",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "id",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "name",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "owner",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "GitHubRepositoryOwner",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "private",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "url",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "GitHubAppInstallationMetadata",
+        "description": "",
+        "fields": [
+          {
+            "name": "githubAccountAvatarUrl",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "githubAccountName",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "installationStatus",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "GitHubAppInstallationStatus",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
          }
        ],
        "inputFields": null,
@@ -17159,6 +17516,35 @@
        "enumValues": null,
        "possibleTypes": null
      },
+      {
+        "kind": "ENUM",
+        "name": "GitHubAppInstallationStatus",
+        "description": "",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "ACTIVE",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "NOT_INSTALLED",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "SUSPENDED",
+            "description": "",
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
      {
        "kind": "OBJECT",
        "name": "GitHubAppQuery",
@@ -17202,6 +17588,364 @@
        "enumValues": null,
        "possibleTypes": null
      },
+      {
+        "kind": "OBJECT",
+        "name": "GitHubRepository",
+        "description": "",
+        "fields": [
+          {
+            "name": "app",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "App",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "githubAppInstallation",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "GitHubAppInstallation",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "githubRepositoryIdentifier",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "id",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "metadata",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "OBJECT",
+              "name": "GitHubRepositoryMetadata",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "GitHubRepositoryMetadata",
+        "description": "",
+        "fields": [
+          {
+            "name": "githubRepoDescription",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "githubRepoName",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "githubRepoOwnerName",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "githubRepoUrl",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "lastPushed",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "lastUpdated",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "private",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "GitHubRepositoryMutation",
+        "description": "",
+        "fields": [
+          {
+            "name": "createGitHubRepository",
+            "description": "Create a GitHub repository for an App",
+            "args": [
+              {
+                "name": "githubRepositoryData",
+                "description": "",
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CreateGitHubRepositoryInput",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "GitHubRepository",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "deleteGitHubRepository",
+            "description": "Delete a GitHub repository by ID",
+            "args": [
+              {
+                "name": "githubRepositoryId",
+                "description": "",
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "GitHubRepository",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "GitHubRepositoryOwner",
+        "description": "",
+        "fields": [
+          {
+            "name": "avatarUrl",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "id",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "login",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "url",
+            "description": "",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
      {
        "kind": "OBJECT",
        "name": "GoogleServiceAccountKey",
@@ -22629,6 +23373,22 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
+          {
+            "name": "githubRepository",
+            "description": "Mutations for GitHub repositories",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "GitHubRepositoryMutation",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
          {
            "name": "googleServiceAccountKey",
            "description": "Mutations that modify a Google Service Account Key",
@@ -1,60 +0,0 @@
-import { Actor } from '../user/User';
-
-interface MockProject {
-  projectRoot: string;
-  projectTree: Record<string, string>;
-  appJSON: AppJSON;
-  packageJSON: PackageJSON;
-}
-
-interface PackageJSON {
-  name: string;
-  version: string;
-  description: string;
-  main: string;
-}
-
-interface AppJSON {
-  expo: {
-    name: string;
-    version: string;
-    slug: string;
-    sdkVersion: string;
-    owner?: string;
-    [key: string]: any;
-  };
-}
-
-export function createTestProject(
-  user: Actor,
-  appJSONExtraData?: Record<string, object | string>
-): MockProject {
-  const projectRoot = '/test-project';
-  const packageJSON: PackageJSON = {
-    name: 'testing123',
-    version: '0.1.0',
-    description: 'fake description',
-    main: 'index.js',
-  };
-
-  const owner = appJSONExtraData?.owner as string | undefined;
-  const appJSON: AppJSON = {
-    expo: {
-      name: 'testing 123',
-      version: '0.1.0',
-      slug: 'testing-123',
-      sdkVersion: '33.0.0',
-      owner: owner ?? (user.__typename === 'User' ? user.username : undefined),
-      ...appJSONExtraData,
-    },
-  };
-  return {
-    appJSON,
-    packageJSON,
-    projectRoot,
-    projectTree: {
-      [projectRoot + '/package.json']: JSON.stringify(packageJSON, null, 2),
-      [projectRoot + '/app.json']: JSON.stringify(appJSON, null, 2),
-    },
-  };
-}
@@ -5,7 +5,7 @@ import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { UpdateBranchFragment } from '../graphql/generated';
 import { BranchQuery } from '../graphql/queries/BranchQuery';
 import Log from '../log';
-import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../update/utils';
+import { UPDATE_COLUMNS, formatUpdateMessage, getPlatformsForGroup } from '../update/utils';
 import { printJsonOnlyOutput } from '../utils/json';
 import {
  paginatedQueryWithConfirmPromptAsync,
@@ -14,24 +14,29 @@ import {

 export const BRANCHES_LIMIT = 50;

-export async function selectBranchFromPaginatedQueryAsync(
-  projectId: string,
-  promptTitle: string,
-  options: PaginatedQueryOptions
-): Promise<UpdateBranchFragment> {
-  if (options.nonInteractive) {
+export async function selectBranchOnAppAsync({
+  projectId,
+  promptTitle,
+  displayTextForListItem,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  displayTextForListItem: (queryItem: UpdateBranchFragment) => string;
+  promptTitle: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<UpdateBranchFragment> {
+  if (paginatedQueryOptions.nonInteractive) {
    throw new Error('Unable to select a branch in non-interactive mode.');
  }

  const selectedBranch = await paginatedQueryWithSelectPromptAsync({
-    limit: options.limit ?? BRANCHES_LIMIT,
-    offset: options.offset,
-    queryToPerform: (limit, offset) => queryBranchesForProjectAsync(limit, offset, projectId),
+    limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
+    offset: paginatedQueryOptions.offset,
+    queryToPerform: (limit, offset) => queryBranchesOnProjectAsync(limit, offset, projectId),
    promptOptions: {
      title: promptTitle,
      getIdentifierForQueryItem: updateBranchFragment => updateBranchFragment.id,
-      createDisplayTextForSelectionPromptListItem: updateBranchFragment =>
-        updateBranchFragment.name,
+      createDisplayTextForSelectionPromptListItem: displayTextForListItem,
    },
  });
  if (!selectedBranch) {
@@ -40,36 +45,39 @@ export async function selectBranchFromPaginatedQueryAsync(
  return selectedBranch;
 }

-export async function listAndRenderPaginatedBranchesAsync(
-  projectId: string,
-  options: PaginatedQueryOptions
-): Promise<void> {
-  if (options.nonInteractive) {
-    const branches = await queryBranchesForProjectAsync(
-      options.limit ?? BRANCHES_LIMIT,
-      options.offset,
+export async function listAndRenderBranchesOnAppAsync({
+  projectId,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  if (paginatedQueryOptions.nonInteractive) {
+    const branches = await queryBranchesOnProjectAsync(
+      paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
+      paginatedQueryOptions.offset,
      projectId
    );
-    renderPageOfBranches(branches, options);
+    renderPageOfBranches(branches, paginatedQueryOptions);
  } else {
    await paginatedQueryWithConfirmPromptAsync({
-      limit: options.limit ?? BRANCHES_LIMIT,
-      offset: options.offset,
-      queryToPerform: (limit, offset) => queryBranchesForProjectAsync(limit, offset, projectId),
+      limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      queryToPerform: (limit, offset) => queryBranchesOnProjectAsync(limit, offset, projectId),
      promptOptions: {
        title: 'Load more branches?',
-        renderListItems: branches => renderPageOfBranches(branches, options),
+        renderListItems: branches => renderPageOfBranches(branches, paginatedQueryOptions),
      },
    });
  }
 }

-async function queryBranchesForProjectAsync(
+async function queryBranchesOnProjectAsync(
  limit: number,
  offset: number,
  projectId: string
 ): Promise<UpdateBranchFragment[]> {
-  return await BranchQuery.listBranchesAsync({
+  return await BranchQuery.listBranchesOnAppAsync({
    appId: projectId,
    limit,
    offset,
@@ -90,18 +98,20 @@ function renderPageOfBranches(

    table.push(
      ...currentPage.map(branch => {
-        const update: UpdateBranchFragment['updates'][0] | undefined = branch.updates[0];
+        if (branch.updates.length === 0) {
+          return [branch.name, 'N/A', 'N/A', 'N/A', 'N/A'];
+        }
+
+        const latestUpdateOnBranch = branch.updates[0];
        return [
          branch.name,
-          formatUpdate(update),
-          update?.runtimeVersion ?? 'N/A',
-          update?.group ?? 'N/A',
-          update?.group
-            ? getPlatformsForGroup({
-                updates: branch.updates,
-                group: update.group,
-              })
-            : 'N/A',
+          formatUpdateMessage(latestUpdateOnBranch),
+          latestUpdateOnBranch.runtimeVersion,
+          latestUpdateOnBranch.group,
+          getPlatformsForGroup({
+            group: latestUpdateOnBranch.group,
+            updates: branch.updates,
+          }),
        ];
      })
    );
@@ -0,0 +1,14 @@
+import { getVcsClient } from '../vcs';
+
+export async function getDefaultBranchNameAsync(): Promise<string> {
+  return (
+    (await getVcsClient().getBranchNameAsync()) ||
+    `branch-${Math.random().toString(36).substring(2, 4)}`
+  );
+}
+
+export class BranchNotFoundError extends Error {
+  constructor(message?: string) {
+    super(message ?? 'Branch not found.');
+  }
+}
@@ -0,0 +1,83 @@
+import { v4 as uuid } from 'uuid';
+
+import { selectBuildToCancelAsync } from '../../commands/build/cancel';
+import { AppPlatform, BuildFragment, BuildPriority, BuildStatus } from '../../graphql/generated';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
+import { confirmAsync, selectAsync } from '../../prompts';
+
+jest.mock('../../ora', () => ({
+  ora: jest.fn().mockImplementation(() => ({
+    start: jest.fn().mockImplementation(() => ({
+      stop: jest.fn(),
+      fail: jest.fn(),
+    })),
+  })),
+}));
+jest.mock('../../prompts', () => {
+  return {
+    selectAsync: jest.fn(),
+    confirmAsync: jest.fn(),
+  };
+});
+
+jest.mock('../../graphql/queries/BuildQuery', () => {
+  const actual = jest.requireActual('../../graphql/queries/BuildQuery');
+  return {
+    BuildQuery: {
+      ...actual.BuildQuery,
+      viewBuildsOnAppAsync: jest.fn(),
+    },
+  };
+});
+
+describe(selectBuildToCancelAsync.name, () => {
+  const selectedBuildId = uuid();
+  const projectId = uuid();
+
+  beforeEach(() => {
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockImplementation(async () => [
+        createMockBuildFragment({ projectId, buildId: selectedBuildId }),
+      ]);
+  });
+
+  it('does not return build id when confirmation is rejected', async () => {
+    jest.mocked(confirmAsync).mockResolvedValueOnce(false);
+    expect(selectBuildToCancelAsync(projectId, 'blah')).resolves.toEqual(null);
+  });
+
+  it('returns build id when confirmation is confirmed', async () => {
+    jest.mocked(selectAsync).mockResolvedValueOnce(selectedBuildId);
+    jest.mocked(confirmAsync).mockResolvedValueOnce(true);
+    expect(selectBuildToCancelAsync(projectId, 'blah')).resolves.toEqual(selectedBuildId);
+  });
+});
+
+function createMockBuildFragment({
+  projectId,
+  buildId,
+}: {
+  projectId: string;
+  buildId?: string;
+}): BuildFragment {
+  return {
+    createdAt: new Date().toISOString(),
+    updatedAt: new Date().toISOString(),
+    platform: AppPlatform.Android,
+    id: buildId ?? uuid(),
+    priority: BuildPriority.Normal,
+    project: {
+      __typename: 'App',
+      slug: 'test-project',
+      id: projectId,
+      name: 'test-project',
+      ownerAccount: {
+        __typename: 'Account',
+        id: uuid(),
+        name: 'test-account',
+      },
+    },
+    status: BuildStatus.InQueue,
+  };
+}
@@ -92,6 +92,7 @@ export async function prepareAndroidBuildAsync(
          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
            ? false
            : ctx.buildProfile.autoIncrement,
+        nonInteractive: ctx.nonInteractive,
      });
    },
    prepareJobAsync: async (
@@ -4,7 +4,7 @@ import path from 'path';
 import slash from 'slash';

 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
-import { getUsername } from '../../project/projectUtils';
+import { getUsernameForActor } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
 import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
@@ -24,7 +24,9 @@ export async function prepareJobAsync(
  ctx: BuildContext<Platform.ANDROID>,
  jobData: JobData
 ): Promise<Job> {
-  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
+  const username = getUsernameForActor(
+    await ensureLoggedInAsync({ nonInteractive: ctx.nonInteractive })
+  );
  const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
  const projectRootDirectory =
    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
@@ -16,10 +16,12 @@ export async function syncProjectConfigurationAsync({
  projectDir,
  exp,
  localAutoIncrement,
+  nonInteractive,
 }: {
  projectDir: string;
  exp: ExpoConfig;
  localAutoIncrement?: AndroidVersionAutoIncrement;
+  nonInteractive: boolean;
 }): Promise<void> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
@@ -27,7 +29,7 @@ export async function syncProjectConfigurationAsync({
  if (workflow === Workflow.GENERIC) {
    await cleanUpOldEasBuildGradleScriptAsync(projectDir);
    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(projectDir, exp);
+      await syncUpdatesConfigurationAsync(projectDir, exp, { nonInteractive });
    }
    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
  } else {
@@ -177,6 +177,17 @@ async function uploadProjectAsync<TPlatform extends Platform>(
          )}`
        );
        const projectTarball = await makeProjectTarballAsync();
+
+        if (projectTarball.size > 1024 * 1024 * 100) {
+          Log.warn(
+            `Your project archive is ${formatBytes(
+              projectTarball.size
+            )}. You can reduce its size and the time it takes to upload by excluding files that are unnecessary for the build process in ${chalk.bold(
+              '.easignore'
+            )} file. ${learnMore('https://expo.fyi/eas-build-archive')}`
+          );
+        }
+
        projectTarballPath = projectTarball.path;

        const { bucketKey } = await uploadFileAtPathToS3Async(
@@ -10,9 +10,8 @@ import { Analytics, BuildEvent } from '../analytics/events';
 import { CredentialsContext } from '../credentials/context';
 import { BuildResourceClass } from '../graphql/generated';
 import { getExpoConfig } from '../project/expoConfig';
-import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
+import { getOwnerAccountForProjectIdAsync, getProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
-import { findAccountByName } from '../user/Account';
 import { ensureLoggedInAsync } from '../user/actions';
 import { createAndroidContextAsync } from './android/build';
 import { BuildContext, CommonContext } from './context';
@@ -46,12 +45,15 @@ export async function createBuildContextAsync<T extends Platform>({
 }): Promise<BuildContext<T>> {
  const exp = getExpoConfig(projectDir, { env: buildProfile.env });

-  const user = await ensureLoggedInAsync();
-  const accountName = getProjectAccountName(exp, user);
+  const user = await ensureLoggedInAsync({ nonInteractive });
  const projectName = exp.slug;
-  const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
+  const projectId = await getProjectIdAsync(exp, {
+    env: buildProfile.env,
+    nonInteractive,
+  });
+  const account = await getOwnerAccountForProjectIdAsync(projectId);
  const workflow = await resolveWorkflowAsync(projectDir, platform);
-  const accountId = findAccountByName(user.accounts, accountName)?.id;
+  const accountId = account.id;
  const runFromCI = getenv.boolish('CI', false);

  const credentialsCtx = new CredentialsContext({
@@ -81,7 +83,7 @@ export async function createBuildContextAsync<T extends Platform>({
  Analytics.logEvent(BuildEvent.BUILD_COMMAND, trackingCtx);

  const commonContext: CommonContext<T> = {
-    accountName,
+    accountName: account.name,
    buildProfile,
    buildProfileName,
    resourceClass,
@@ -80,6 +80,7 @@ export async function prepareIosBuildAsync(
          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
            ? false
            : ctx.buildProfile.autoIncrement,
+        nonInteractive: ctx.nonInteractive,
      });
    },
    prepareJobAsync: async (
@@ -1,7 +1,7 @@
 import { Platform } from '@expo/eas-build-job';

 import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
-import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils';
+import { getAppFromContextAsync } from '../../credentials/ios/actions/BuildCredentialsUtils';
 import { IosCredentials, Target } from '../../credentials/ios/types';
 import { CredentialsResult } from '../build';
 import { BuildContext } from '../context';
@@ -16,7 +16,7 @@ export async function ensureIosCredentialsAsync(
  }

  const provider = new IosCredentialsProvider(buildCtx.credentialsCtx, {
-    app: getAppFromContext(buildCtx.credentialsCtx),
+    app: await getAppFromContextAsync(buildCtx.credentialsCtx),
    targets,
    distribution: buildCtx.buildProfile.distribution ?? 'store',
    enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
@@ -3,7 +3,7 @@ import path from 'path';
 import slash from 'slash';

 import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
-import { getUsername } from '../../project/projectUtils';
+import { getUsernameForActor } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
 import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
@@ -26,7 +26,9 @@ export async function prepareJobAsync(
 ): Promise<Job> {
  const projectRootDirectory =
    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
-  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
+  const username = getUsernameForActor(
+    await ensureLoggedInAsync({ nonInteractive: ctx.nonInteractive })
+  );
  const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
  if (jobData.credentials) {
    const targetNames = Object.keys(jobData.credentials);
@@ -13,18 +13,20 @@ export async function syncProjectConfigurationAsync({
  exp,
  targets,
  localAutoIncrement,
+  nonInteractive,
 }: {
  projectDir: string;
  exp: ExpoConfig;
  targets: Target[];
  localAutoIncrement?: IosVersionAutoIncrement;
+  nonInteractive: boolean;
 }): Promise<void> {
  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);

  if (workflow === Workflow.GENERIC) {
    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(projectDir, exp);
+      await syncUpdatesConfigurationAsync(projectDir, exp, { nonInteractive });
    }
    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
  } else {
@@ -5,7 +5,7 @@ import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';

 import Log from '../log';
-import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
+import { getUsernameForActor, isExpoUpdatesInstalled } from '../project/projectUtils';
 import {
  readChannelSafelyAsync as readAndroidChannelSafelyAsync,
  readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
@@ -49,7 +49,9 @@ export async function collectMetadataAsync<T extends Platform>(
      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
    ),
    isGitWorkingTreeDirty: await vcsClient.hasUncommittedChangesAsync(),
-    username: getUsername(ctx.exp, await ensureLoggedInAsync()),
+    username: getUsernameForActor(
+      await ensureLoggedInAsync({ nonInteractive: ctx.nonInteractive })
+    ),
    message: ctx.message,
    ...(ctx.platform === Platform.IOS && {
      iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
@@ -0,0 +1,70 @@
+import chalk from 'chalk';
+
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
+import { BuildFilter, BuildFragment } from '../graphql/generated';
+import { BuildQuery } from '../graphql/queries/BuildQuery';
+import Log from '../log';
+import { printJsonOnlyOutput } from '../utils/json';
+import { paginatedQueryWithConfirmPromptAsync } from '../utils/queries';
+import { formatGraphQLBuild } from './utils/formatBuild';
+
+export const BUILDS_LIMIT = 50;
+
+export async function listAndRenderBuildsOnAppAsync({
+  projectId,
+  projectDisplayName,
+  filter,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  projectDisplayName: string;
+  filter?: BuildFilter;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  if (paginatedQueryOptions.nonInteractive) {
+    const builds = await BuildQuery.viewBuildsOnAppAsync({
+      appId: projectId,
+      limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      filter,
+    });
+    renderPageOfBuilds({ builds, projectDisplayName, paginatedQueryOptions });
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      queryToPerform: (limit, offset) =>
+        BuildQuery.viewBuildsOnAppAsync({
+          appId: projectId,
+          limit,
+          offset,
+          filter,
+        }),
+      promptOptions: {
+        title: 'Load more builds?',
+        renderListItems: builds =>
+          renderPageOfBuilds({ builds, projectDisplayName, paginatedQueryOptions }),
+      },
+    });
+  }
+}
+
+function renderPageOfBuilds({
+  builds,
+  projectDisplayName,
+  paginatedQueryOptions,
+}: {
+  builds: BuildFragment[];
+  projectDisplayName: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): void {
+  if (paginatedQueryOptions.json) {
+    printJsonOnlyOutput(builds);
+  } else {
+    const list = builds.map(build => formatGraphQLBuild(build)).join(`\n\n${chalk.dim('———')}\n\n`);
+
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold(`Builds for ${projectDisplayName}:`));
+    Log.log(`\n${list}`);
+  }
+}
@@ -70,7 +70,11 @@ export async function commitPromptAsync({
    initial: initialCommitMessage,
    validate: (input: string) => input !== '',
  });
-  await getVcsClient().commitAsync({ commitAllFiles, commitMessage: message });
+  await getVcsClient().commitAsync({
+    commitAllFiles,
+    commitMessage: message,
+    nonInteractive: false,
+  });
 }

 export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
@@ -0,0 +1,194 @@
+import chalk from 'chalk';
+
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
+import {
+  ViewBranchesOnUpdateChannelQueryVariables,
+  ViewUpdateChannelsOnAppQueryVariables,
+} from '../graphql/generated';
+import { BranchQuery, UpdateBranchOnChannelObject } from '../graphql/queries/BranchQuery';
+import { ChannelQuery, UpdateChannelObject } from '../graphql/queries/ChannelQuery';
+import Log from '../log';
+import formatFields from '../utils/formatFields';
+import { printJsonOnlyOutput } from '../utils/json';
+import {
+  paginatedQueryWithConfirmPromptAsync,
+  paginatedQueryWithSelectPromptAsync,
+} from '../utils/queries';
+import { logChannelDetails } from './utils';
+
+export const CHANNELS_LIMIT = 25;
+
+export async function selectChannelOnAppAsync({
+  projectId,
+  selectionPromptTitle,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  selectionPromptTitle: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<UpdateChannelObject> {
+  if (paginatedQueryOptions.nonInteractive) {
+    throw new Error('Unable to select a channel in non-interactive mode.');
+  }
+
+  const updateChannel = await paginatedQueryWithSelectPromptAsync({
+    limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+    offset: paginatedQueryOptions.offset,
+    queryToPerform: (limit, offset) => queryChannelsOnAppAsync({ appId: projectId, limit, offset }),
+    promptOptions: {
+      title: selectionPromptTitle,
+      createDisplayTextForSelectionPromptListItem: updateChannel => updateChannel.name,
+      getIdentifierForQueryItem: updateChannel => updateChannel.id,
+    },
+  });
+
+  if (!updateChannel) {
+    throw new Error(`Could not find any channels for app "${projectId}"`);
+  }
+  return updateChannel;
+}
+
+export async function listAndRenderChannelsOnAppAsync({
+  projectId,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  if (paginatedQueryOptions.nonInteractive) {
+    const channels = await queryChannelsOnAppAsync({
+      appId: projectId,
+      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+    });
+    renderPageOfChannels(channels, paginatedQueryOptions);
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      queryToPerform: (limit, offset) =>
+        queryChannelsOnAppAsync({ limit, offset, appId: projectId }),
+      promptOptions: {
+        title: 'Load more channels?',
+        renderListItems: channels => renderPageOfChannels(channels, paginatedQueryOptions),
+      },
+    });
+  }
+}
+
+export async function listAndRenderBranchesAndUpdatesOnChannelAsync({
+  projectId: appId,
+  channelName,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  channelName: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  const channel = await ChannelQuery.viewUpdateChannelAsync({ appId, channelName });
+  renderChannelHeaderContent({ channelName: channel.name, channelId: channel.id });
+
+  if (paginatedQueryOptions.nonInteractive) {
+    const branches = await queryBranchesAndUpdateGroupsOnChannelAsync({
+      appId,
+      channelName,
+      offset: paginatedQueryOptions.offset,
+      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+    });
+    renderPageOfBranchesOnChannel(channel, branches, paginatedQueryOptions);
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      queryToPerform: (limit, offset) =>
+        queryBranchesAndUpdateGroupsOnChannelAsync({
+          channelName,
+          appId,
+          offset,
+          limit,
+        }),
+      promptOptions: {
+        title: 'Load more channels?',
+        renderListItems: branches =>
+          renderPageOfBranchesOnChannel(channel, branches, paginatedQueryOptions),
+      },
+    });
+  }
+}
+
+async function queryChannelsOnAppAsync({
+  appId,
+  offset,
+  limit,
+}: ViewUpdateChannelsOnAppQueryVariables): Promise<UpdateChannelObject[]> {
+  return await ChannelQuery.viewUpdateChannelsOnAppAsync({
+    appId,
+    offset,
+    limit,
+  });
+}
+
+async function queryBranchesAndUpdateGroupsOnChannelAsync(
+  args: ViewBranchesOnUpdateChannelQueryVariables
+): Promise<UpdateBranchOnChannelObject[]> {
+  return await BranchQuery.listBranchesOnChannelAsync(args);
+}
+
+function renderPageOfChannels(
+  currentPage: UpdateChannelObject[],
+  { json }: PaginatedQueryOptions
+): void {
+  if (json) {
+    printJsonOnlyOutput({ currentPage });
+  } else {
+    for (const channel of currentPage) {
+      Log.addNewLineIfNone();
+      Log.log(
+        formatFields([
+          { label: 'Name', value: channel.name },
+          { label: 'ID', value: channel.id },
+        ])
+      );
+      logChannelDetails(channel);
+    }
+  }
+}
+
+function renderPageOfBranchesOnChannel(
+  channel: UpdateChannelObject,
+  currentPage: UpdateBranchOnChannelObject[],
+  { json }: PaginatedQueryOptions
+): void {
+  const channelWithNewBranches = { ...channel, updateBranches: currentPage };
+  if (json) {
+    printJsonOnlyOutput({ currentPage: channelWithNewBranches });
+  } else {
+    Log.addNewLineIfNone();
+    Log.log(
+      formatFields([
+        { label: 'Name', value: channel.name },
+        { label: 'ID', value: channel.id },
+      ])
+    );
+    logChannelDetails(channelWithNewBranches);
+  }
+}
+
+function renderChannelHeaderContent({
+  channelName,
+  channelId,
+}: {
+  channelName: string;
+  channelId: string;
+}): void {
+  Log.addNewLineIfNone();
+  Log.log(chalk.bold('Channel:'));
+  Log.log(
+    formatFields([
+      { label: 'Name', value: channelName },
+      { label: 'ID', value: channelId },
+    ])
+  );
+  Log.addNewLineIfNone();
+  Log.log(chalk`{bold Branches pointed at this channel and their most recent update group:}`);
+}
@@ -0,0 +1,112 @@
+import assert from 'assert';
+import CliTable from 'cli-table3';
+
+import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
+import Log from '../log';
+import { UPDATE_COLUMNS, getUpdateGroupDescriptionsWithBranch } from '../update/utils';
+
+export type BranchMapping = {
+  version: number;
+  data: {
+    branchId: string;
+    branchMappingLogic: {
+      operand: number;
+      clientKey: string;
+      branchMappingOperator: string;
+    } & string;
+  }[];
+};
+
+/**
+ * Get the branch mapping and determine whether it is a rollout.
+ * Ensure that the branch mapping is properly formatted.
+ */
+export function getBranchMapping(branchMappingString?: string): {
+  branchMapping: BranchMapping;
+  isRollout: boolean;
+  rolloutPercent?: number;
+} {
+  if (!branchMappingString) {
+    throw new Error('Missing branch mapping.');
+  }
+  let branchMapping: BranchMapping;
+  try {
+    branchMapping = JSON.parse(branchMappingString);
+  } catch {
+    throw new Error(`Could not parse branchMapping string into a JSON: "${branchMappingString}"`);
+  }
+  assert(branchMapping, 'Branch Mapping must be defined.');
+
+  if (branchMapping.version !== 0) {
+    throw new Error('Branch mapping must be version 0.');
+  }
+
+  const isRollout = branchMapping.data.length === 2;
+  const rolloutPercent = branchMapping.data[0].branchMappingLogic.operand;
+
+  switch (branchMapping.data.length) {
+    case 0:
+      break;
+    case 1:
+      if (branchMapping.data[0].branchMappingLogic !== 'true') {
+        throw new Error('Branch mapping logic for a single branch must be "true"');
+      }
+      break;
+    case 2:
+      if (branchMapping.data[0].branchMappingLogic.clientKey !== 'rolloutToken') {
+        throw new Error('Client key of initial branch mapping must be "rolloutToken"');
+      }
+      if (branchMapping.data[0].branchMappingLogic.branchMappingOperator !== 'hash_lt') {
+        throw new Error('Branch mapping operator of initial branch mapping must be "hash_lt"');
+      }
+      if (rolloutPercent == null) {
+        throw new Error('Branch mapping is missing a "rolloutPercent"');
+      }
+      if (branchMapping.data[1].branchMappingLogic !== 'true') {
+        throw new Error('Branch mapping logic for a the second branch of a rollout must be "true"');
+      }
+      break;
+    default:
+      throw new Error('Branch mapping data must have length less than or equal to 2.');
+  }
+
+  return { branchMapping, isRollout, rolloutPercent };
+}
+
+export function logChannelDetails(channel: UpdateChannelObject): void {
+  const { branchMapping, isRollout, rolloutPercent } = getBranchMapping(channel.branchMapping);
+
+  const updateChannelsTable = new CliTable({
+    head: ['branch', ...(isRollout ? ['rollout percent'] : []), ...UPDATE_COLUMNS],
+    wordWrap: true,
+  });
+
+  if (branchMapping.data.length > 2) {
+    throw new Error('Branch Mapping data must have length less than or equal to 2.');
+  }
+
+  const rolloutBranchIds = branchMapping.data.map(data => data.branchId);
+
+  for (const currentBranch of channel.updateBranches) {
+    const updateGroupDescriptions = getUpdateGroupDescriptionsWithBranch(
+      currentBranch.updateGroups
+    );
+
+    const isRolloutBranch = isRollout && rolloutBranchIds.includes(currentBranch.id);
+    const isBaseBranch = rolloutBranchIds.length > 0 && rolloutBranchIds[0] === currentBranch.id;
+
+    updateGroupDescriptions.forEach(({ branch, message, runtimeVersion, group, platforms }) => {
+      updateChannelsTable.push([
+        branch,
+        ...(isRolloutBranch
+          ? [isBaseBranch ? `${rolloutPercent! * 100}%` : `${(1 - rolloutPercent!) * 100}%`]
+          : []),
+        message,
+        runtimeVersion,
+        group,
+        platforms,
+      ]);
+    });
+  }
+  Log.log(updateChannelsTable.toString());
+}
@@ -0,0 +1,23 @@
+import { Flags } from '@oclif/core';
+
+export const EasNonInteractiveAndJsonFlags = {
+  json: Flags.boolean({
+    description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
+    dependsOn: ['non-interactive'],
+  }),
+  'non-interactive': Flags.boolean({
+    description: 'Run the command in non-interactive mode.',
+  }),
+};
+
+export const EASNonInteractiveFlag = {
+  'non-interactive': Flags.boolean({
+    description: 'Run the command in non-interactive mode.',
+  }),
+};
+
+export const EasJsonOnlyFlag = {
+  json: Flags.boolean({
+    description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
+  }),
+};
@@ -1,13 +1,17 @@
 import { Flags } from '@oclif/core';

+import { EasNonInteractiveAndJsonFlags } from './flags';
+
 export const getPaginatedQueryOptions = (
-  flags: Record<keyof typeof EasPaginatedQueryFlags, any>
+  flags: Partial<
+    Record<keyof typeof EasPaginatedQueryFlags | keyof typeof EasNonInteractiveAndJsonFlags, any>
+  >
 ): PaginatedQueryOptions => {
  return {
-    json: flags.json ?? false,
+    ...('limit' in flags && { limit: flags.limit }),
    offset: flags.offset ?? 0,
    nonInteractive: flags['non-interactive'] ?? false,
-    ...('limit' in flags && { limit: flags.limit }),
+    json: flags.json ?? false,
  };
 };

@@ -27,6 +31,19 @@ const parseFlagInputStringAsInteger = (
  return inputAsNumber;
 };

+export const getLimitFlagWithCustomValues = ({
+  defaultTo,
+  limit,
+}: {
+  defaultTo: number;
+  limit: number;
+}): any =>
+  Flags.integer({
+    description: `The number of items to fetch each query. Defaults to ${defaultTo} and is capped at ${limit}.`,
+    // eslint-disable-next-line async-protect/async-suffix
+    parse: async input => parseFlagInputStringAsInteger(input, 'limit', 1, limit),
+  });
+
 export const EasPaginatedQueryFlags = {
  offset: Flags.integer({
    description: 'Start queries from specified index. Use for paginating results. Defaults to 0.',
@@ -34,18 +51,7 @@ export const EasPaginatedQueryFlags = {
    parse: async input =>
      parseFlagInputStringAsInteger(input, 'offset', 0, Number.MAX_SAFE_INTEGER),
  }),
-  limit: Flags.integer({
-    description:
-      'The number of query items to list at once. The default value is 50 (the maximum is 100). Using a lower value may help increase command speed.',
-    // eslint-disable-next-line async-protect/async-suffix
-    parse: async input => parseFlagInputStringAsInteger(input, 'limit', 1, 100),
-  }),
-  json: Flags.boolean({
-    description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
-  }),
-  'non-interactive': Flags.boolean({
-    description: 'Run the command in non-interactive mode.',
-  }),
+  limit: getLimitFlagWithCustomValues({ defaultTo: 50, limit: 100 }),
 };

 // options required to control a paginated query
@@ -1,8 +1,9 @@
-import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

+import { getDefaultBranchNameAsync } from '../../branch/utils';
 import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  CreateUpdateBranchForAppMutation,
@@ -13,12 +14,11 @@ import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
-  getProjectFullNameAsync,
+  getDisplayNameForProjectIdAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { getVcsClient } from '../../vcs';

 export async function createUpdateBranchOnAppAsync({
  appId,
@@ -63,49 +63,46 @@ export default class BranchCreate extends EasCommand {
  ];

  static override flags = {
-    json: Flags.boolean({
-      description: 'return a json with the new branch ID and name.',
-      default: false,
-    }),
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
    let {
      args: { name },
-      flags,
+      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(BranchCreate);
-    if (flags.json) {
+    if (jsonFlag) {
      enableJsonOutput();
    }

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const fullName = await getProjectFullNameAsync(exp);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);

    if (!name) {
      const validationMessage = 'Branch name may not be empty.';
-      if (flags.json) {
+      if (nonInteractive) {
        throw new Error(validationMessage);
      }
      ({ name } = await promptAsync({
        type: 'text',
        name: 'name',
        message: 'Provide a branch name:',
-        initial:
-          (await getVcsClient().getBranchNameAsync()) ||
-          `branch-${Math.random().toString(36).substr(2, 4)}`,
+        initial: await getDefaultBranchNameAsync(),
        validate: value => (value ? true : validationMessage),
      }));
    }

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

-    if (flags.json) {
+    if (jsonFlag) {
      printJsonOnlyOutput(newBranch);
    } else {
      Log.withTick(
-        `️Created a new branch: ${chalk.bold(newBranch.name)} on project ${chalk.bold(fullName)}.`
+        `️Created a new branch: ${chalk.bold(newBranch.name)} on project ${chalk.bold(
+          projectDisplayName
+        )}.`
      );
    }
  }
@@ -1,8 +1,10 @@
-import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

+import { selectBranchOnAppAsync } from '../../branch/queries';
 import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  DeleteUpdateBranchMutation,
@@ -15,10 +17,10 @@ import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
-  getProjectFullNameAsync,
+  getDisplayNameForProjectIdAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
-import { promptAsync, toggleConfirmAsync } from '../../prompts';
+import { toggleConfirmAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 async function getBranchInfoAsync({
@@ -86,56 +88,56 @@ export default class BranchDelete extends EasCommand {
      description: 'Name of the branch to delete',
    },
  ];
+
  static override flags = {
-    json: Flags.boolean({
-      description: `return JSON with the edited branch's ID and name.`,
-      default: false,
-    }),
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
    let {
-      args: { name },
-      flags: { json: jsonFlag },
+      args: { name: branchName },
+      flags,
    } = await this.parse(BranchDelete);
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
+    const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    if (jsonFlag) {
      enableJsonOutput();
    }

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const fullName = await getProjectFullNameAsync(exp);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);

-    if (!name) {
+    if (!branchName) {
      const validationMessage = 'branch name may not be empty.';
-      if (jsonFlag) {
+      if (nonInteractive) {
        throw new Error(validationMessage);
      }
-      ({ name } = await promptAsync({
-        type: 'text',
-        name: 'name',
-        message: 'Provide the name of the branch to delete:',
-        validate: value => (value ? true : validationMessage),
+      ({ name: branchName } = await selectBranchOnAppAsync({
+        projectId,
+        displayTextForListItem: updateBranch => updateBranch.name,
+        promptTitle: 'Which branch would you like to delete?',
+        paginatedQueryOptions,
      }));
    }

-    const data = await getBranchInfoAsync({ appId: projectId, name });
+    const data = await getBranchInfoAsync({ appId: projectId, name: branchName });
    const branchId = data.app?.byId.updateBranchByName?.id;
    if (!branchId) {
-      throw new Error(`Could not find branch ${name} on ${fullName}`);
+      throw new Error(`Could not find branch ${branchName} on ${projectDisplayName}`);
    }

-    if (!jsonFlag) {
+    if (!nonInteractive) {
      Log.addNewLineIfNone();
      Log.warn(
-        `You are about to permanently delete branch: "${name}" and all of the updates published on it.` +
+        `You are about to permanently delete branch: "${branchName}" and all of the updates published on it.` +
          `\nThis action is irreversible.`
      );
      Log.newLine();
      const confirmed = await toggleConfirmAsync({ message: 'Are you sure you wish to proceed?' });
      if (!confirmed) {
-        Log.error(`Cancelled deletion of branch: "${name}".`);
+        Log.error(`Cancelled deletion of branch: "${branchName}".`);
        process.exit(1);
      }
    }
@@ -148,7 +150,9 @@ export default class BranchDelete extends EasCommand {
      printJsonOnlyOutput(deletionResult);
    } else {
      Log.withTick(
-        `️Deleted branch "${name}" and all of its updates on project ${chalk.bold(fullName)}.`
+        `️Deleted branch "${branchName}" and all of its updates on project ${chalk.bold(
+          projectDisplayName
+        )}.`
      );
    }
  }
@@ -1,5 +1,6 @@
-import { listAndRenderPaginatedBranchesAsync } from '../../branch/queries';
+import { listAndRenderBranchesOnAppAsync } from '../../branch/queries';
 import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
@@ -10,19 +11,22 @@ export default class BranchList extends EasCommand {

  static override flags = {
    ...EasPaginatedQueryFlags,
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BranchList);
-    const options = getPaginatedQueryOptions(flags);
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);

-    if (options.json) {
+    if (paginatedQueryOptions.json) {
      enableJsonOutput();
    }

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
-    await listAndRenderPaginatedBranchesAsync(projectId, options);
+    const projectId = await getProjectIdAsync(exp, {
+      nonInteractive: flags['non-interactive'],
+    });
+    await listAndRenderBranchesOnAppAsync({ projectId, paginatedQueryOptions });
  }
 }
@@ -3,6 +3,7 @@ import chalk from 'chalk';
 import gql from 'graphql-tag';

 import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  EditUpdateBranchInput,
@@ -14,7 +15,7 @@ import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
-  getProjectFullNameAsync,
+  getDisplayNameForProjectIdAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
@@ -63,15 +64,12 @@ export default class BranchRename extends EasCommand {
      description: 'new name of the branch.',
      required: false,
    }),
-    json: Flags.boolean({
-      description: `return a json with the edited branch's ID and name.`,
-      default: false,
-    }),
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
    let {
-      flags: { json: jsonFlag, from: currentName, to: newName },
+      flags: { json: jsonFlag, from: currentName, to: newName, 'non-interactive': nonInteractive },
    } = await this.parse(BranchRename);
    if (jsonFlag) {
      enableJsonOutput();
@@ -79,12 +77,12 @@ export default class BranchRename extends EasCommand {

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const fullName = await getProjectFullNameAsync(exp);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);

    if (!currentName) {
      const validationMessage = 'current name may not be empty.';
-      if (jsonFlag) {
+      if (nonInteractive) {
        throw new Error(validationMessage);
      }
      ({ currentName } = await promptAsync({
@@ -97,7 +95,7 @@ export default class BranchRename extends EasCommand {

    if (!newName) {
      const validationMessage = 'new name may not be empty.';
-      if (jsonFlag) {
+      if (nonInteractive) {
        throw new Error(validationMessage);
      }
      ({ newName } = await promptAsync({
@@ -120,7 +118,7 @@ export default class BranchRename extends EasCommand {
      Log.withTick(
        `️Renamed branch from ${currentName} to ${chalk.bold(
          editedBranch.name
-        )} on project ${chalk.bold(fullName)}.`
+        )} on project ${chalk.bold(projectDisplayName)}.`
      );
    }
  }
@@ -1,9 +1,14 @@
-import { selectBranchFromPaginatedQueryAsync } from '../../branch/queries';
+import { selectBranchOnAppAsync } from '../../branch/queries';
 import EasCommand from '../../commandUtils/EasCommand';
-import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import {
+  EasPaginatedQueryFlags,
+  getLimitFlagWithCustomValues,
+  getPaginatedQueryOptions,
+} from '../../commandUtils/pagination';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { listAndRenderUpdatesOnBranchByNameAsync } from '../../update/queries';
+import { listAndRenderUpdateGroupsOnBranchAsync } from '../../update/queries';
 import { enableJsonOutput } from '../../utils/json';

 export default class BranchView extends EasCommand {
@@ -19,6 +24,8 @@ export default class BranchView extends EasCommand {

  static override flags = {
    ...EasPaginatedQueryFlags,
+    ...EasNonInteractiveAndJsonFlags,
+    limit: getLimitFlagWithCustomValues({ defaultTo: 25, limit: 50 }),
  };

  async runAsync(): Promise<void> {
@@ -26,30 +33,39 @@ export default class BranchView extends EasCommand {
      args: { name: branchName },
      flags,
    } = await this.parse(BranchView);
-    const options = getPaginatedQueryOptions(flags);
+    const { 'non-interactive': nonInteractive } = flags;
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);

-    if (options.json) {
+    if (paginatedQueryOptions.json) {
      enableJsonOutput();
    }

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });

-    // provide help to a user if they ran the command with missing args
    if (!branchName) {
-      if (options.nonInteractive) {
+      if (nonInteractive) {
        throw new Error('Branch name may not be empty.');
      }

-      ({ name: branchName } = await selectBranchFromPaginatedQueryAsync(
+      ({ name: branchName } = await selectBranchOnAppAsync({
        projectId,
-        'Which branch would you like to view?',
-        // discard limit and offset because this query is not those flag's intended target
-        { json: options.json, nonInteractive: options.nonInteractive, offset: 0 }
-      ));
+        promptTitle: 'Which branch would you like to view?',
+        displayTextForListItem: updateBranch => updateBranch.name,
+        // discard limit and offset because this query is not their intended target
+        paginatedQueryOptions: {
+          json: paginatedQueryOptions.json,
+          nonInteractive,
+          offset: 0,
+        },
+      }));
    }

-    await listAndRenderUpdatesOnBranchByNameAsync(projectId, branchName, options);
+    await listAndRenderUpdateGroupsOnBranchAsync({
+      projectId,
+      branchName,
+      paginatedQueryOptions,
+    });
  }
 }
@@ -2,6 +2,7 @@ import chalk from 'chalk';
 import gql from 'graphql-tag';

 import EasCommand from '../../commandUtils/EasCommand';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  Build,
@@ -16,7 +17,7 @@ import { appPlatformEmojis } from '../../platform';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
-  getProjectFullNameAsync,
+  getDisplayNameForProjectIdAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { confirmAsync, selectAsync } from '../../prompts';
@@ -59,36 +60,45 @@ function formatUnfinishedBuild(
  return `${platform} Started at: ${startTime}, Status: ${status}, Id: ${build.id}`;
 }

-async function selectBuildToCancelAsync(
+export async function selectBuildToCancelAsync(
  projectId: string,
-  projectFullName: string
+  projectDisplayName: string
 ): Promise<string | null> {
  const spinner = ora().start('Fetching the uncompleted builds…');
+
  let builds;
  try {
    const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
-      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.New } }),
-      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.InQueue } }),
-      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.InProgress } }),
+      BuildQuery.viewBuildsOnAppAsync({
+        appId: projectId,
+        offset: 0,
+        limit: 10,
+        filter: { status: BuildStatus.New },
+      }),
+      BuildQuery.viewBuildsOnAppAsync({
+        appId: projectId,
+        offset: 0,
+        limit: 10,
+        filter: { status: BuildStatus.InQueue },
+      }),
+      BuildQuery.viewBuildsOnAppAsync({
+        appId: projectId,
+        offset: 0,
+        limit: 10,
+        filter: { status: BuildStatus.InProgress },
+      }),
    ]);
    spinner.stop();
    builds = [...newBuilds, ...inQueueBuilds, ...inProgressBuilds];
  } catch (error) {
    spinner.fail(
-      `Something went wrong and we couldn't fetch the builds for the project ${projectFullName}.`
+      `Something went wrong and we couldn't fetch the builds for the project ${projectDisplayName}.`
    );
    throw error;
  }
  if (builds.length === 0) {
-    Log.warn(`There aren't any uncompleted builds for the project ${projectFullName}.`);
+    Log.warn(`There aren't any uncompleted builds for the project ${projectDisplayName}.`);
    return null;
-  } else if (builds.length === 1) {
-    Log.log('Found one build');
-    Log.log(formatUnfinishedBuild(builds[0]));
-    await confirmAsync({
-      message: 'Do you want to cancel it?',
-    });
-    return builds[0].id;
  } else {
    const buildId = await selectAsync<string>(
      'Which build do you want to cancel?',
@@ -97,7 +107,12 @@ async function selectBuildToCancelAsync(
        value: build.id,
      }))
    );
-    return buildId;
+
+    return (await confirmAsync({
+      message: 'Are you sure you want to cancel it?',
+    }))
+      ? buildId
+      : null;
  }
 }

@@ -114,21 +129,35 @@ export default class BuildCancel extends EasCommand {

  static override args = [{ name: 'BUILD_ID' }];

+  static override flags = {
+    ...EASNonInteractiveFlag,
+  };
+
  async runAsync(): Promise<void> {
-    const { BUILD_ID: buildIdFromArg } = (await this.parse(BuildCancel)).args;
+    const {
+      args: { BUILD_ID: buildIdFromArg },
+      flags: { 'non-interactive': nonInteractive },
+    } = await this.parse(BuildCancel);

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
-    const projectFullName = await getProjectFullNameAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });
+    const displayName = await getDisplayNameForProjectIdAsync(projectId);

    if (buildIdFromArg) {
      await ensureBuildExistsAsync(buildIdFromArg);
    }

-    const buildId = buildIdFromArg || (await selectBuildToCancelAsync(projectId, projectFullName));
+    let buildId: string | null = buildIdFromArg;
    if (!buildId) {
-      return;
+      if (nonInteractive) {
+        throw new Error('BUILD_ID must not be empty in non-interactive mode');
+      }
+
+      buildId = await selectBuildToCancelAsync(projectId, displayName);
+      if (!buildId) {
+        return;
+      }
    }

    const spinner = ora().start('Canceling the build…');
@@ -60,14 +60,14 @@ export default class BuildConfigure extends EasCommand {
      if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
        if (workflow === Workflow.GENERIC) {
-          await syncAndroidUpdatesConfigurationAsync(projectDir, exp);
+          await syncAndroidUpdatesConfigurationAsync(projectDir, exp, { nonInteractive: false });
        }
      }

      if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
        if (workflow === Workflow.GENERIC) {
-          await syncIosUpdatesConfigurationAsync(projectDir, exp);
+          await syncIosUpdatesConfigurationAsync(projectDir, exp, { nonInteractive: false });
        }
      }
    }
@@ -8,6 +8,7 @@ import path from 'path';
 import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
 import { UserInputResourceClass } from '../../build/types';
 import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { StatuspageServiceName } from '../../graphql/generated';
 import Log, { link } from '../../log';
 import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform';
@@ -46,10 +47,6 @@ export default class Build extends EasCommand {
      default: false,
      hidden: true,
    }),
-    json: Flags.boolean({
-      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
-      default: false,
-    }),
    'skip-project-configuration': Flags.boolean({
      default: false,
      hidden: true,
@@ -60,10 +57,6 @@ export default class Build extends EasCommand {
        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
      helpValue: 'PROFILE_NAME',
    }),
-    'non-interactive': Flags.boolean({
-      default: false,
-      description: 'Run command in non-interactive mode',
-    }),
    local: Flags.boolean({
      default: false,
      description: 'Run build locally [experimental]',
@@ -100,6 +93,7 @@ export default class Build extends EasCommand {
      char: 'm',
      description: 'A short message describing the build',
    }),
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
@@ -1,25 +1,27 @@
 import { Flags } from '@oclif/core';
-import chalk from 'chalk';

+import { BUILDS_LIMIT, listAndRenderBuildsOnAppAsync } from '../../build/queries';
 import { BuildDistributionType, BuildStatus } from '../../build/types';
-import { formatGraphQLBuild } from '../../build/utils/formatBuild';
 import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import {
+  EasPaginatedQueryFlags,
+  getLimitFlagWithCustomValues,
+  getPaginatedQueryOptions,
+} from '../../commandUtils/pagination';
 import {
  AppPlatform,
  DistributionType,
  BuildStatus as GraphQLBuildStatus,
 } from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
-import Log from '../../log';
-import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
-  getProjectFullNameAsync,
+  getDisplayNameForProjectIdAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { enableJsonOutput } from '../../utils/json';

 export default class BuildList extends EasCommand {
  static override description = 'list all builds for your project';
@@ -28,9 +30,6 @@ export default class BuildList extends EasCommand {
    platform: Flags.enum({
      options: [RequestedPlatform.All, RequestedPlatform.Android, RequestedPlatform.Ios],
    }),
-    json: Flags.boolean({
-      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
-    }),
    status: Flags.enum({
      options: [
        BuildStatus.NEW,
@@ -56,19 +55,22 @@ export default class BuildList extends EasCommand {
    appIdentifier: Flags.string(),
    buildProfile: Flags.string(),
    gitCommitHash: Flags.string(),
-    limit: Flags.integer(),
+    ...EasPaginatedQueryFlags,
+    limit: getLimitFlagWithCustomValues({ defaultTo: 10, limit: BUILDS_LIMIT }),
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
    const { flags } = await this.parse(BuildList);
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    const {
-      json,
+      json: jsonFlag,
      platform: requestedPlatform,
      status: buildStatus,
      distribution: buildDistribution,
-      limit = 10,
+      'non-interactive': nonInteractive,
    } = flags;
-    if (json) {
+    if (jsonFlag) {
      enableJsonOutput();
    }

@@ -78,54 +80,27 @@ export default class BuildList extends EasCommand {

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
-    const projectName = await getProjectFullNameAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });
+    const displayName = await getDisplayNameForProjectIdAsync(projectId);

-    const spinner = ora().start('Fetching the build list for the project…');
-
-    try {
-      const builds = await BuildQuery.allForAppAsync(projectId, {
-        limit,
-        filter: {
-          platform,
-          status: graphqlBuildStatus,
-          distribution: graphqlBuildDistribution,
-          channel: flags.channel,
-          appVersion: flags.appVersion,
-          appBuildVersion: flags.appBuildVersion,
-          sdkVersion: flags.sdkVersion,
-          runtimeVersion: flags.runtimeVersion,
-          appIdentifier: flags.appIdentifier,
-          buildProfile: flags.buildProfile,
-          gitCommitHash: flags.gitCommitHash,
-        },
-      });
-
-      if (builds.length) {
-        if (platform || graphqlBuildStatus) {
-          spinner.succeed(
-            `Showing ${builds.length} matching builds for the project ${projectName}`
-          );
-        } else {
-          spinner.succeed(`Showing last ${builds.length} builds for the project ${projectName}`);
-        }
-
-        if (json) {
-          printJsonOnlyOutput(builds);
-        } else {
-          const list = builds
-            .map(build => formatGraphQLBuild(build))
-            .join(`\n\n${chalk.dim('———')}\n\n`);
-
-          Log.log(`\n${list}`);
-        }
-      } else {
-        spinner.fail(`Couldn't find any builds for the project ${projectName}`);
-      }
-    } catch (e) {
-      spinner.fail(`Something went wrong and we couldn't fetch the build list ${projectName}`);
-      throw e;
-    }
+    await listAndRenderBuildsOnAppAsync({
+      projectId,
+      projectDisplayName: displayName,
+      filter: {
+        platform,
+        status: graphqlBuildStatus,
+        distribution: graphqlBuildDistribution,
+        channel: flags.channel,
+        appVersion: flags.appVersion,
+        appBuildVersion: flags.appBuildVersion,
+        sdkVersion: flags.sdkVersion,
+        runtimeVersion: flags.runtimeVersion,
+        appIdentifier: flags.appIdentifier,
+        buildProfile: flags.buildProfile,
+        gitCommitHash: flags.gitCommitHash,
+      },
+      paginatedQueryOptions,
+    });
  }
 }

@@ -16,7 +16,7 @@ import { getExpoConfig } from '../../../project/expoConfig';
 import { BUILD_NUMBER_REQUIREMENTS, isValidBuildNumber } from '../../../project/ios/versions';
 import {
  findProjectRootAsync,
-  getProjectFullNameAsync,
+  getDisplayNameForProjectIdAsync,
  getProjectIdAsync,
 } from '../../../project/projectUtils';
 import {
@@ -57,8 +57,11 @@ export default class BuildVersionSetView extends EasCommand {
    );

    const exp = getExpoConfig(projectDir, { env: profile.env });
-    const projectId = await getProjectIdAsync(exp);
-    const projectFullName = await getProjectFullNameAsync(exp);
+
+    // this command is always interactive (see prompt below)
+    const projectId = await getProjectIdAsync(exp, { nonInteractive: false });
+    const displayName = await getDisplayNameForProjectIdAsync(projectId);
+
    validateAppConfigForRemoteVersionSource(exp, platform);

    const applicationIdentifier = await getApplicationIdentifierAsync(
@@ -73,12 +76,12 @@ export default class BuildVersionSetView extends EasCommand {
      applicationIdentifier
    );
    const currentStateMessage = remoteVersions?.buildVersion
-      ? `Project ${chalk.bold(projectFullName)} with ${getApplicationIdentifierName(
+      ? `Project ${chalk.bold(displayName)} with ${getApplicationIdentifierName(
          platform
        )} "${applicationIdentifier}" is configured with ${getBuildVersionName(platform)} ${
          remoteVersions.buildVersion
        }.`
-      : `Project ${chalk.bold(projectFullName)} with ${getApplicationIdentifierName(
+      : `Project ${chalk.bold(displayName)} with ${getApplicationIdentifierName(
          platform
        )} "${applicationIdentifier}" does not have any ${getBuildVersionName(
          platform
@@ -73,7 +73,10 @@ export default class BuildVersionSyncView extends EasCommand {
    });
    for (const profileInfo of buildProfiles) {
      const exp = getExpoConfig(projectDir, { env: profileInfo.profile.env });
-      const projectId = await getProjectIdAsync(exp);
+
+      // this command is always non-interactive
+      const projectId = await getProjectIdAsync(exp, { nonInteractive: true });
+
      validateAppConfigForRemoteVersionSource(exp, profileInfo.platform);
      const platformDisplayName = appPlatformDisplayNames[toAppPlatform(profileInfo.platform)];

@@ -1,7 +1,6 @@
-import { Flags } from '@oclif/core';
-
 import { formatGraphQLBuild } from '../../build/utils/formatBuild';
 import EasCommand from '../../commandUtils/EasCommand';
+import { EasJsonOnlyFlag } from '../../commandUtils/flags';
 import { BuildFragment } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
@@ -9,7 +8,7 @@ import { ora } from '../../ora';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
-  getProjectFullNameAsync,
+  getDisplayNameForProjectIdAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -20,9 +19,7 @@ export default class BuildView extends EasCommand {
  static override args = [{ name: 'BUILD_ID' }];

  static override flags = {
-    json: Flags.boolean({
-      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
-    }),
+    ...EasJsonOnlyFlag,
  };

  async runAsync(): Promise<void> {
@@ -36,8 +33,10 @@ export default class BuildView extends EasCommand {

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
-    const projectName = await getProjectFullNameAsync(exp);
+
+    // this command is always non-interactive
+    const projectId = await getProjectIdAsync(exp, { nonInteractive: true });
+    const displayName = await getDisplayNameForProjectIdAsync(projectId);

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

@@ -47,18 +46,22 @@ export default class BuildView extends EasCommand {
      if (buildId) {
        build = await BuildQuery.byIdAsync(buildId);
      } else {
-        const builds = await BuildQuery.allForAppAsync(projectId, { limit: 1 });
+        const builds = await BuildQuery.viewBuildsOnAppAsync({
+          appId: projectId,
+          offset: 0,
+          limit: 1,
+        });
        if (builds.length === 0) {
-          spinner.fail(`Couldn't find any builds for the project ${projectName}`);
+          spinner.fail(`Couldn't find any builds for the project ${displayName}`);
          return;
        }
        build = builds[0];
      }

      if (buildId) {
-        spinner.succeed(`Found a matching build for the project ${projectName}`);
+        spinner.succeed(`Found a matching build for the project ${displayName}`);
      } else {
-        spinner.succeed(`Showing the last build for the project ${projectName}`);
+        spinner.succeed(`Showing the last build for the project ${displayName}`);
      }

      if (flags.json) {
@@ -71,7 +74,7 @@ export default class BuildView extends EasCommand {
        spinner.fail(`Something went wrong and we couldn't fetch the build with id ${buildId}`);
      } else {
        spinner.fail(
-          `Something went wrong and we couldn't fetch the last build for the project ${projectName}`
+          `Something went wrong and we couldn't fetch the last build for the project ${displayName}`
        );
      }

@@ -1,8 +1,9 @@
-import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

+import { BranchNotFoundError } from '../../branch/utils';
 import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  CreateUpdateChannelOnAppMutation,
@@ -13,7 +14,7 @@ import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
-  getProjectFullNameAsync,
+  getDisplayNameForProjectIdAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
@@ -71,17 +72,13 @@ export default class ChannelCreate extends EasCommand {
  ];

  static override flags = {
-    json: Flags.boolean({
-      description:
-        'print output as a JSON object with the new channel ID, name and branch mapping.',
-      default: false,
-    }),
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
    let {
      args: { name: channelName },
-      flags: { json: jsonFlag },
+      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(ChannelCreate);
    if (jsonFlag) {
      enableJsonOutput();
@@ -89,11 +86,11 @@ export default class ChannelCreate extends EasCommand {

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });

    if (!channelName) {
      const validationMessage = 'Channel name may not be empty.';
-      if (jsonFlag) {
+      if (nonInteractive) {
        throw new Error(validationMessage);
      }
      ({ name: channelName } = await promptAsync({
@@ -106,21 +103,25 @@ export default class ChannelCreate extends EasCommand {

    let branchId: string;
    let branchMessage: string;
-    const existingBranch = await BranchQuery.getBranchByNameAsync({
-      appId: projectId,
-      name: channelName,
-    });

-    if (existingBranch) {
-      branchId = existingBranch.id;
-      branchMessage = `We found a branch with the same name`;
-    } else {
-      const newBranch = await createUpdateBranchOnAppAsync({
+    try {
+      const branch = await BranchQuery.getBranchByNameAsync({
        appId: projectId,
        name: channelName,
      });
-      branchId = newBranch.id;
-      branchMessage = `We also went ahead and made a branch with the same name`;
+      branchId = branch.id;
+      branchMessage = `We found a branch with the same name`;
+    } catch (error) {
+      if (error instanceof BranchNotFoundError) {
+        const newBranch = await createUpdateBranchOnAppAsync({
+          appId: projectId,
+          name: channelName,
+        });
+        branchId = newBranch.id;
+        branchMessage = `We also went ahead and made a branch with the same name`;
+      } else {
+        throw error;
+      }
    }

    const {
@@ -133,7 +134,7 @@ export default class ChannelCreate extends EasCommand {

    if (!newChannel) {
      throw new Error(
-        `Could not create channel with name ${channelName} on app with id ${projectId}`
+        `Could not create channel with name ${channelName} on project with id ${projectId}`
      );
    }

@@ -142,7 +143,9 @@ export default class ChannelCreate extends EasCommand {
    } else {
      Log.addNewLineIfNone();
      Log.withTick(
-        `Created a new channel on project ${chalk.bold(await getProjectFullNameAsync(exp))}`
+        `Created a new channel on project ${chalk.bold(
+          await getDisplayNameForProjectIdAsync(projectId)
+        )}`
      );
      Log.log(
        formatFields([
@@ -1,23 +1,19 @@
-import { Flags } from '@oclif/core';
 import gql from 'graphql-tag';

+import { selectChannelOnAppAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  DeleteUpdateChannelMutation,
  DeleteUpdateChannelMutationVariables,
  DeleteUpdateChannelResult,
-  GetChannelInfoQuery,
-  GetChannelInfoQueryVariables,
 } from '../../graphql/generated';
+import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
-import {
-  findProjectRootAsync,
-  getProjectFullNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils';
-import { promptAsync, toggleConfirmAsync } from '../../prompts';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { toggleConfirmAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export default class ChannelDelete extends EasCommand {
@@ -32,65 +28,56 @@ export default class ChannelDelete extends EasCommand {
    },
  ];
  static override flags = {
-    json: Flags.boolean({
-      description: 'print output as a JSON object',
-      default: false,
-    }),
-    'non-interactive': Flags.boolean({
-      default: false,
-      description: 'Run command in non-interactive mode',
-    }),
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
    const {
      args: { name: nameArg },
-      flags: { json: jsonFlag, 'non-interactive': nonInteractiveFlag },
+      flags: { json: jsonFlag, 'non-interactive': nonInteractive },
    } = await this.parse(ChannelDelete);
-    if (jsonFlag && !nonInteractiveFlag) {
-      throw new Error('--json is allowed only in non-interactive mode');
-    }
    if (jsonFlag) {
      enableJsonOutput();
    }

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const fullName = await getProjectFullNameAsync(exp);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });

-    let name;
+    let channelId, channelName;
    if (nameArg) {
-      name = nameArg;
+      const { id, name } = await ChannelQuery.viewUpdateChannelAsync({
+        appId: projectId,
+        channelName: nameArg,
+      });
+      channelId = id;
+      channelName = name;
    } else {
-      if (nonInteractiveFlag) {
+      if (nonInteractive) {
        throw new Error('Channel name must be set when running in non-interactive mode');
      }
-      name = (
-        await promptAsync({
-          type: 'text',
-          name: 'name',
-          message: 'Provide the name of the channel to delete:',
-          validate: (value: any) => (value ? true : 'Channel name may not be empty.'),
-        })
-      ).name;
+      const { id, name } = await selectChannelOnAppAsync({
+        projectId,
+        selectionPromptTitle: 'Select a channel to delete',
+        paginatedQueryOptions: {
+          json: jsonFlag,
+          nonInteractive,
+          offset: 0,
+        },
+      });
+      channelId = id;
+      channelName = name;
    }

-    const data = await getChannelInfoAsync({ appId: projectId, name });
-    const channelId = data.app?.byId.updateChannelByName?.id;
-    if (!channelId) {
-      throw new Error(`Could not find channel ${name} on ${fullName}`);
-    }
-
-    if (!nonInteractiveFlag) {
+    if (!nonInteractive) {
      Log.addNewLineIfNone();
      Log.warn(
-        `You are about to permanently delete channel: "${name}".\nThis action is irreversible.`
+        `You are about to permanently delete channel: "${channelName}".\nThis action is irreversible.`
      );
      Log.newLine();
      const confirmed = await toggleConfirmAsync({ message: 'Are you sure you wish to proceed?' });
      if (!confirmed) {
-        Log.error(`Canceled deletion of channel: "${name}".`);
+        Log.error(`Canceled deletion of channel: "${channelName}".`);
        process.exit(1);
      }
    }
@@ -102,42 +89,11 @@ export default class ChannelDelete extends EasCommand {
    if (jsonFlag) {
      printJsonOnlyOutput(deletionResult);
    } else {
-      Log.withTick(`️Deleted channel "${name}".`);
+      Log.withTick(`️Deleted channel "${channelName}".`);
    }
  }
 }

-async function getChannelInfoAsync({
-  appId,
-  name,
-}: GetChannelInfoQueryVariables): Promise<GetChannelInfoQuery> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .query<GetChannelInfoQuery, GetChannelInfoQueryVariables>(
-        gql`
-          query GetChannelInfo($appId: String!, $name: String!) {
-            app {
-              byId(appId: $appId) {
-                id
-                updateChannelByName(name: $name) {
-                  id
-                  name
-                }
-              }
-            }
-          }
-        `,
-        {
-          appId,
-          name,
-        },
-        { additionalTypenames: ['UpdateChannel'] }
-      )
-      .toPromise()
-  );
-  return data;
-}
-
 async function deleteChannelOnAppAsync({
  channelId,
 }: DeleteUpdateChannelMutationVariables): Promise<DeleteUpdateChannelResult> {
@@ -2,71 +2,28 @@ import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

+import { selectBranchOnAppAsync } from '../../branch/queries';
+import { selectChannelOnAppAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
-  GetChannelByNameToEditQuery,
-  GetChannelByNameToEditQueryVariables,
-  UpdateBranch,
-  UpdateChannel,
  UpdateChannelBranchMappingMutation,
  UpdateChannelBranchMappingMutationVariables,
 } from '../../graphql/generated';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
+import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

-async function getChannelByNameForAppAsync({
-  appId,
-  channelName,
-}: GetChannelByNameToEditQueryVariables): Promise<
-  Pick<UpdateChannel, 'id' | 'name'> & {
-    updateBranches: Pick<UpdateBranch, 'id' | 'name'>[];
-  }
-> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .query<GetChannelByNameToEditQuery, GetChannelByNameToEditQueryVariables>(
-        gql`
-          query GetChannelByNameToEdit($appId: String!, $channelName: String!) {
-            app {
-              byId(appId: $appId) {
-                id
-                updateChannelByName(name: $channelName) {
-                  id
-                  name
-                  updateBranches(offset: 0, limit: 1) {
-                    id
-                    name
-                  }
-                }
-              }
-            }
-          }
-        `,
-        { appId, channelName },
-        { additionalTypenames: ['UpdateChannel', 'UpdateBranch'] }
-      )
-      .toPromise()
-  );
-  const updateChannelByNameResult = data.app?.byId.updateChannelByName;
-  if (!updateChannelByNameResult) {
-    throw new Error(`Could not find a channel named ${channelName} on app with id ${appId}`);
-  }
-  return updateChannelByNameResult;
-}
-
 export async function updateChannelBranchMappingAsync({
  channelId,
  branchMapping,
-}: UpdateChannelBranchMappingMutationVariables): Promise<{
-  id: string;
-  name: string;
-  branchMapping: string;
-}> {
+}: UpdateChannelBranchMappingMutationVariables): Promise<
+  UpdateChannelBranchMappingMutation['updateChannel']['editUpdateChannel']
+> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .mutation<UpdateChannelBranchMappingMutation, UpdateChannelBranchMappingMutationVariables>(
@@ -89,7 +46,7 @@ export async function updateChannelBranchMappingAsync({
  if (!channel) {
    throw new Error(`Could not find a channel with id: ${channelId}`);
  }
-  return data.updateChannel.editUpdateChannel!;
+  return channel;
 }

 export default class ChannelEdit extends EasCommand {
@@ -107,42 +64,50 @@ export default class ChannelEdit extends EasCommand {
    branch: Flags.string({
      description: 'Name of the branch to point to',
    }),
-    json: Flags.boolean({
-      description: 'Print output as a JSON object with the channel ID, name and branch mapping',
-      default: false,
-    }),
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
-    const { args, flags } = await this.parse(ChannelEdit);
-    if (flags.json) {
+    const {
+      args,
+      flags: { branch: branchFlag, json, 'non-interactive': nonInteractive },
+    } = await this.parse(ChannelEdit);
+    if (json) {
      enableJsonOutput();
    }

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });

-    const channelName = args.name ?? (await promptForChannelAsync());
+    const existingChannel = args.name
+      ? await ChannelQuery.viewUpdateChannelAsync({ appId: projectId, channelName: args.name })
+      : await selectChannelOnAppAsync({
+          projectId,
+          selectionPromptTitle: 'Select a channel to edit',
+          paginatedQueryOptions: { json, nonInteractive, offset: 0 },
+        });

-    const existingChannel = await getChannelByNameForAppAsync({ appId: projectId, channelName });
    if (existingChannel.updateBranches.length > 1) {
      throw new Error('There is a rollout in progress. Manage it with "channel:rollout" instead.');
    }

-    const branchName = flags.branch ?? (await promptForBranchAsync());
+    const branch = branchFlag
+      ? await BranchQuery.getBranchByNameAsync({
+          appId: projectId,
+          name: branchFlag,
+        })
+      : await selectBranchOnAppAsync({
+          projectId,
+          promptTitle: `Which branch would you like ${existingChannel.name} to point at?`,
+          displayTextForListItem: updateBranch => updateBranch.name,
+          paginatedQueryOptions: {
+            json,
+            nonInteractive,
+            offset: 0,
+          },
+        });

-    const branch = await BranchQuery.getBranchByNameAsync({
-      appId: projectId,
-      name: branchName,
-    });
-    if (!branch) {
-      throw new Error(
-        `Could not find a branch named "${branchName}". Check what branches exist on this project with ${chalk.bold(
-          'eas branch:list'
-        )}.`
-      );
-    }
    const channel = await updateChannelBranchMappingAsync({
      channelId: existingChannel.id,
      // todo: move branch mapping logic to utility
@@ -152,7 +117,7 @@ export default class ChannelEdit extends EasCommand {
      }),
    });

-    if (flags.json) {
+    if (json) {
      printJsonOnlyOutput(channel);
    } else {
      Log.withTick(
@@ -165,25 +130,3 @@ export default class ChannelEdit extends EasCommand {
    }
  }
 }
-
-async function promptForChannelAsync(): Promise<string> {
-  Log.addNewLineIfNone();
-  const { name } = await promptAsync({
-    type: 'text',
-    name: 'name',
-    message: 'Provide the name of the channel to edit:',
-    validate: value => (value ? true : 'The channel name may not be empty.'),
-  });
-  return name;
-}
-
-async function promptForBranchAsync(): Promise<string> {
-  Log.addNewLineIfNone();
-  const { name } = await promptAsync({
-    type: 'text',
-    name: 'name',
-    message: `To which branch should the channel link?`,
-    validate: value => (value ? true : 'The branch name may not be empty.'),
-  });
-  return name;
-}
@@ -1,114 +1,39 @@
-import { Flags } from '@oclif/core';
-import gql from 'graphql-tag';
-
+import { CHANNELS_LIMIT, listAndRenderChannelsOnAppAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import {
-  GetAllChannelsForAppQuery,
-  GetAllChannelsForAppQueryVariables,
-} from '../../graphql/generated';
-import Log from '../../log';
+  EasPaginatedQueryFlags,
+  getLimitFlagWithCustomValues,
+  getPaginatedQueryOptions,
+} from '../../commandUtils/pagination';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import formatFields from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { logChannelDetails } from './view';
-
-const CHANNEL_LIMIT = 10_000;
-
-async function getAllUpdateChannelForAppAsync({
-  appId,
-}: {
-  appId: string;
-}): Promise<GetAllChannelsForAppQuery> {
-  return await withErrorHandlingAsync(
-    graphqlClient
-      .query<GetAllChannelsForAppQuery, GetAllChannelsForAppQueryVariables>(
-        gql`
-          query GetAllChannelsForApp($appId: String!, $offset: Int!, $limit: Int!) {
-            app {
-              byId(appId: $appId) {
-                id
-                updateChannels(offset: $offset, limit: $limit) {
-                  id
-                  name
-                  branchMapping
-                  updateBranches(offset: 0, limit: $limit) {
-                    id
-                    name
-                    updates(offset: 0, limit: 10) {
-                      id
-                      group
-                      message
-                      runtimeVersion
-                      createdAt
-                      platform
-                      actor {
-                        id
-                        ... on User {
-                          username
-                        }
-                        ... on Robot {
-                          firstName
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        `,
-        { appId, offset: 0, limit: CHANNEL_LIMIT },
-        { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
-      )
-      .toPromise()
-  );
-}
+import { enableJsonOutput } from '../../utils/json';

 export default class ChannelList extends EasCommand {
  static override description = 'list all channels';

  static override flags = {
-    json: Flags.boolean({
-      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
-      default: false,
-    }),
+    ...EasPaginatedQueryFlags,
+    limit: getLimitFlagWithCustomValues({ defaultTo: 10, limit: CHANNELS_LIMIT }),
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
-    const {
-      flags: { json: jsonFlag },
-    } = await this.parse(ChannelList);
+    const { flags } = await this.parse(ChannelList);
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
+    const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    if (jsonFlag) {
      enableJsonOutput();
    }

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });

-    const getAllUpdateChannelForAppResult = await getAllUpdateChannelForAppAsync({
-      appId: projectId,
+    await listAndRenderChannelsOnAppAsync({
+      projectId,
+      paginatedQueryOptions,
    });
-    const channels = getAllUpdateChannelForAppResult.app?.byId.updateChannels;
-    if (!channels) {
-      throw new Error(`Could not find channels on project with id ${projectId}`);
-    }
-
-    if (jsonFlag) {
-      printJsonOnlyOutput(channels);
-    } else {
-      for (const channel of channels) {
-        Log.addNewLineIfNone();
-        Log.log(
-          formatFields([
-            { label: 'Name', value: channel.name },
-            { label: 'ID', value: channel.id },
-          ])
-        );
-        logChannelDetails(channel);
-      }
-    }
  }
 }
@@ -1,21 +1,22 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';

+import { BranchMapping, getBranchMapping } from '../../channel/utils';
 import EasCommand from '../../commandUtils/EasCommand';
-import { GetChannelByNameForAppQuery, UpdateBranch } from '../../graphql/generated';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { UpdateBranch } from '../../graphql/generated';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
+import { ChannelQuery, UpdateChannelByNameObject } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
-  getProjectFullNameAsync,
+  getDisplayNameForProjectIdAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync, selectAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { updateChannelBranchMappingAsync } from './edit';
-import { BranchMapping, getBranchMapping } from './view';

 async function promptForRolloutPercentAsync({
  promptMessage,
@@ -40,9 +41,7 @@ async function promptForRolloutPercentAsync({
  return rolloutPercent;
 }

-function getRolloutInfo(
-  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>
-): {
+function getRolloutInfo(channel: UpdateChannelByNameObject): {
  newBranch: Pick<UpdateBranch, 'name' | 'id'>;
  oldBranch: Pick<UpdateBranch, 'name' | 'id'>;
  currentPercent: number;
@@ -64,20 +63,20 @@ async function startRolloutAsync({
  channelName,
  branchName,
  percent,
-  jsonFlag,
  projectId,
-  fullName,
+  displayName,
  currentBranchMapping,
  channel,
+  nonInteractive,
 }: {
  channelName?: string;
  branchName: string;
  percent?: number;
-  jsonFlag: boolean;
  projectId: string;
-  fullName: string;
+  displayName: string;
  currentBranchMapping: BranchMapping;
-  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
+  channel: UpdateChannelByNameObject;
+  nonInteractive: boolean;
 }): Promise<{
  newChannelInfo: {
    id: string;
@@ -90,13 +89,6 @@ async function startRolloutAsync({
    appId: projectId,
    name: branchName,
  });
-  if (!branch) {
-    throw new Error(
-      `Could not find a branch named "${branchName}". Check which branches exist on this project with ${chalk.bold(
-        'eas branch:list'
-      )}.`
-    );
-  }

  const oldBranchId = currentBranchMapping.data[0].branchId;
  if (branch.id === oldBranchId) {
@@ -106,9 +98,9 @@ async function startRolloutAsync({
  }

  if (percent == null) {
-    if (jsonFlag) {
+    if (nonInteractive) {
      throw new Error(
-        'You must specify a percent with the --percent flag when initiating a rollout with the --json flag.'
+        'You must specify a percent with the --percent flag when initiating a rollout with the --non-interactive flag.'
      );
    }
    const promptMessage = `What percent of users should be directed to the branch "${branchName}"?`;
@@ -137,7 +129,7 @@ async function startRolloutAsync({
  const oldBranch = channel.updateBranches.filter(branch => branch.id === oldBranchId)[0];
  if (!oldBranch) {
    throw new Error(
-      `Branch mapping is missing its only branch for channel "${channelName}" on app "${fullName}"`
+      `Branch mapping is missing its only branch for channel "${channelName}" on app "${displayName}"`
    );
  }

@@ -155,15 +147,15 @@ async function startRolloutAsync({
 async function editRolloutAsync({
  channelName,
  percent,
-  jsonFlag,
+  nonInteractive,
  currentBranchMapping,
  channel,
 }: {
  channelName?: string;
  percent?: number;
-  jsonFlag: boolean;
+  nonInteractive: boolean;
  currentBranchMapping: BranchMapping;
-  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
+  channel: UpdateChannelByNameObject;
 }): Promise<{
  newChannelInfo: {
    id: string;
@@ -175,7 +167,7 @@ async function editRolloutAsync({
  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(channel);

  if (percent == null) {
-    if (jsonFlag) {
+    if (nonInteractive) {
      throw new Error(
        'A rollout is already in progress. If you wish to modify it you must use specify the new rollout percentage with the --percent flag.'
      );
@@ -210,15 +202,15 @@ async function editRolloutAsync({
 async function endRolloutAsync({
  channelName,
  branchName,
-  jsonFlag,
+  nonInteractive,
  projectId,
  channel,
 }: {
  channelName?: string;
  branchName?: string;
-  jsonFlag: boolean;
+  nonInteractive: boolean;
  projectId: string;
-  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
+  channel: UpdateChannelByNameObject;
 }): Promise<{
  newChannelInfo: {
    id: string;
@@ -236,13 +228,6 @@ async function endRolloutAsync({
      appId: projectId,
      name: branchName,
    });
-    if (!branch) {
-      throw new Error(
-        `Could not find a branch named "${branchName}". Check which branches exist on this project with ${chalk.bold(
-          'eas branch:list'
-        )}.`
-      );
-    }

    switch (branch.id) {
      case newBranch.id:
@@ -257,9 +242,9 @@ async function endRolloutAsync({
        );
    }
  } else {
-    if (jsonFlag) {
+    if (nonInteractive) {
      throw new Error(
-        'Branch name must be specified with the --branch flag when both the --end and --json flag are true.'
+        'Branch name must be specified with the --branch flag when both the --end and --non-interactive flag are true.'
      );
    }
    endOnNewBranch = await selectAsync<boolean>(
@@ -328,16 +313,19 @@ export default class ChannelRollout extends EasCommand {
      description: 'end the rollout',
      default: false,
    }),
-    json: Flags.boolean({
-      description: 'print output as a JSON object with the new channel ID, name and branch mapping',
-      default: false,
-    }),
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
    const {
      args: { channel: channelName },
-      flags: { json: jsonFlag, end: endFlag, branch: branchName, percent },
+      flags: {
+        json: jsonFlag,
+        end: endFlag,
+        branch: branchName,
+        percent,
+        'non-interactive': nonInteractive,
+      },
    } = await this.parse(ChannelRollout);
    if (jsonFlag) {
      enableJsonOutput();
@@ -345,10 +333,10 @@ export default class ChannelRollout extends EasCommand {

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const fullName = await getProjectFullNameAsync(exp);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);

-    const channel = await ChannelQuery.getUpdateChannelByNameForAppAsync({
+    const channel = await ChannelQuery.viewUpdateChannelAsync({
      appId: projectId,
      channelName: channelName!,
    });
@@ -395,11 +383,11 @@ export default class ChannelRollout extends EasCommand {
    if (!isRollout) {
      rolloutMutationResult = await startRolloutAsync({
        channelName,
-        branchName: branchName ?? (await promptForBranchNameAsync(channelName)),
+        branchName: branchName ?? (await promptForBranchNameAsync(channelName, nonInteractive)),
        percent,
-        jsonFlag,
+        nonInteractive,
        projectId,
-        fullName,
+        displayName: projectDisplayName,
        currentBranchMapping,
        channel,
      });
@@ -407,7 +395,7 @@ export default class ChannelRollout extends EasCommand {
      rolloutMutationResult = await endRolloutAsync({
        channelName,
        branchName,
-        jsonFlag,
+        nonInteractive,
        projectId,
        channel,
      });
@@ -415,7 +403,7 @@ export default class ChannelRollout extends EasCommand {
      rolloutMutationResult = await editRolloutAsync({
        channelName,
        percent,
-        jsonFlag,
+        nonInteractive,
        currentBranchMapping,
        channel,
      });
@@ -432,7 +420,13 @@ export default class ChannelRollout extends EasCommand {
  }
 }

-async function promptForBranchNameAsync(channelName: string): Promise<string> {
+async function promptForBranchNameAsync(
+  channelName: string,
+  nonInteractive: boolean
+): Promise<string> {
+  if (nonInteractive) {
+    throw new Error('Must supply branch flag in non-interactive mode');
+  }
  const { name } = await promptAsync({
    type: 'text',
    name: 'name',
@@ -1,141 +1,15 @@
-import { Flags } from '@oclif/core';
 import assert from 'assert';
-import chalk from 'chalk';
-import Table from 'cli-table3';

+import {
+  listAndRenderBranchesAndUpdatesOnChannelAsync,
+  selectChannelOnAppAsync,
+} from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
-import Log from '../../log';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
-import {
-  FormatUpdateParameter,
-  UPDATE_COLUMNS,
-  formatUpdate,
-  getPlatformsForGroup,
-} from '../../update/utils';
-import formatFields from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-
-export type BranchMapping = {
-  version: number;
-  data: {
-    branchId: string;
-    branchMappingLogic: {
-      operand: number;
-      clientKey: string;
-      branchMappingOperator: string;
-    } & string;
-  }[];
-};
-
-/**
- * Get the branch mapping and determine whether it is a rollout.
- * Ensure that the branch mapping is properly formatted.
- */
-export function getBranchMapping(branchMappingString?: string): {
-  branchMapping: BranchMapping;
-  isRollout: boolean;
-  rolloutPercent?: number;
-} {
-  if (!branchMappingString) {
-    throw new Error('Missing branch mapping.');
-  }
-  let branchMapping: BranchMapping;
-  try {
-    branchMapping = JSON.parse(branchMappingString);
-  } catch {
-    throw new Error(`Could not parse branchMapping string into a JSON: "${branchMappingString}"`);
-  }
-  assert(branchMapping, 'Branch Mapping must be defined.');
-
-  if (branchMapping.version !== 0) {
-    throw new Error('Branch mapping must be version 0.');
-  }
-
-  const isRollout = branchMapping.data.length === 2;
-  const rolloutPercent = branchMapping.data[0].branchMappingLogic.operand;
-
-  switch (branchMapping.data.length) {
-    case 0:
-      break;
-    case 1:
-      if (branchMapping.data[0].branchMappingLogic !== 'true') {
-        throw new Error('Branch mapping logic for a single branch must be "true"');
-      }
-      break;
-    case 2:
-      if (branchMapping.data[0].branchMappingLogic.clientKey !== 'rolloutToken') {
-        throw new Error('Client key of initial branch mapping must be "rolloutToken"');
-      }
-      if (branchMapping.data[0].branchMappingLogic.branchMappingOperator !== 'hash_lt') {
-        throw new Error('Branch mapping operator of initial branch mapping must be "hash_lt"');
-      }
-      if (rolloutPercent == null) {
-        throw new Error('Branch mapping is missing a "rolloutPercent"');
-      }
-      if (branchMapping.data[1].branchMappingLogic !== 'true') {
-        throw new Error('Branch mapping logic for a the second branch of a rollout must be "true"');
-      }
-      break;
-    default:
-      throw new Error('Branch mapping data must have length less than or equal to 2.');
-  }
-
-  return { branchMapping, isRollout, rolloutPercent };
-}
-
-export function logChannelDetails(channel: {
-  branchMapping: string;
-  updateBranches: {
-    updates: (FormatUpdateParameter & {
-      runtimeVersion: string;
-      group: string;
-      platform: string;
-    })[];
-    name: string;
-    id: string;
-  }[];
-}): void {
-  const { branchMapping, isRollout, rolloutPercent } = getBranchMapping(channel.branchMapping);
-
-  const table = new Table({
-    head: ['branch', ...(isRollout ? ['rollout percent'] : []), ...UPDATE_COLUMNS],
-    wordWrap: true,
-  });
-
-  for (const index in branchMapping.data) {
-    if (parseInt(index, 10) > 1) {
-      throw new Error('Branch Mapping data must have length less than or equal to 2.');
-    }
-
-    const { branchId } = branchMapping.data[index];
-    const branch = channel.updateBranches.filter(branch => branch.id === branchId)[0];
-    if (!branch) {
-      throw new Error('Branch mapping is pointing at a missing branch.');
-    }
-    const update = branch.updates[0];
-    table.push([
-      branch.name,
-      ...(isRollout
-        ? [
-            parseInt(index, 10) === 0
-              ? `${rolloutPercent! * 100}%`
-              : `${(1 - rolloutPercent!) * 100}%`,
-          ]
-        : []),
-      formatUpdate(update),
-      update?.runtimeVersion ?? 'N/A',
-      update?.group ?? 'N/A',
-      getPlatformsForGroup({
-        updates: branch.updates,
-        group: branch.updates[0]?.group,
-      }),
-    ]);
-  }
-  Log.log(table.toString());
-}
+import { enableJsonOutput } from '../../utils/json';

 export default class ChannelView extends EasCommand {
  static override description = 'view a channel';
@@ -149,60 +23,47 @@ export default class ChannelView extends EasCommand {
  ];

  static override flags = {
-    json: Flags.boolean({
-      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
-      default: false,
-    }),
+    ...EasNonInteractiveAndJsonFlags,
+    ...EasPaginatedQueryFlags,
  };

  async runAsync(): Promise<void> {
    let {
      args: { name: channelName },
-      flags: { json: jsonFlag },
+      flags,
    } = await this.parse(ChannelView);
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
+    const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
    if (jsonFlag) {
      enableJsonOutput();
    }

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });

    if (!channelName) {
      const validationMessage = 'A channel name is required to view a specific channel.';
-      if (jsonFlag) {
+      if (nonInteractive) {
        throw new Error(validationMessage);
      }
-      ({ name: channelName } = await promptAsync({
-        type: 'text',
-        name: 'name',
-        message: 'Provide a channel name:',
-        validate: value => (value ? true : validationMessage),
-      }));
+      const selectedUpdateChannel = await selectChannelOnAppAsync({
+        projectId,
+        selectionPromptTitle: 'Select a channel to view',
+        paginatedQueryOptions: {
+          json: jsonFlag,
+          nonInteractive,
+          offset: 0,
+        },
+      });
+      channelName = selectedUpdateChannel.name;
+      assert(channelName, `A channel must be selected.`);
    }

-    const channel = await ChannelQuery.getUpdateChannelByNameForAppAsync({
-      appId: projectId,
+    await listAndRenderBranchesAndUpdatesOnChannelAsync({
+      projectId,
      channelName,
+      paginatedQueryOptions,
    });
-    if (!channel) {
-      throw new Error(`Could not find a channel with name: ${channelName}`);
-    }
-
-    if (jsonFlag) {
-      printJsonOnlyOutput(channel);
-    } else {
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Channel:'));
-      Log.log(
-        formatFields([
-          { label: 'Name', value: channel.name },
-          { label: 'ID', value: channel.id },
-        ])
-      );
-      Log.addNewLineIfNone();
-      Log.log(chalk`{bold Branches pointed at this channel and their most recent update group:}`);
-      logChannelDetails(channel);
-    }
  }
 }
@@ -8,7 +8,8 @@ export default class DeviceCreate extends EasCommand {
  static override description = 'register new Apple Devices to use for internal distribution';

  async runAsync(): Promise<void> {
-    const user = await ensureLoggedInAsync();
+    // this command is interactive by design
+    const user = await ensureLoggedInAsync({ nonInteractive: false });

    const ctx = await createContextAsync({ appStore: new AppStoreApi(), user });
    const manager = new DeviceManager(ctx);
@@ -17,7 +17,11 @@ import { AppleDevice, Maybe } from '../../graphql/generated';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { getExpoConfig } from '../../project/expoConfig';
-import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
+import {
+  findProjectRootAsync,
+  getOwnerAccountForProjectIdAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';

 export default class DeviceDelete extends EasCommand {
@@ -35,15 +39,17 @@ export default class DeviceDelete extends EasCommand {

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const accountName = await getProjectAccountNameAsync(exp);
+    // this command is interactive by design
+    const projectId = await getProjectIdAsync(exp, { nonInteractive: false });
+    const account = await getOwnerAccountForProjectIdAsync(projectId);

    if (!appleTeamIdentifier) {
-      appleTeamIdentifier = await this.askForAppleTeamAsync(accountName);
+      appleTeamIdentifier = await this.askForAppleTeamAsync(account.name);
    }

    assert(appleTeamIdentifier, 'No team identifier is specified');

-    const appleDevicesResult = await this.getDevicesForTeamAsync(accountName, appleTeamIdentifier);
+    const appleDevicesResult = await this.getDevicesForTeamAsync(account.name, appleTeamIdentifier);

    if (!appleDevicesResult) {
      return;
@@ -9,7 +9,11 @@ import formatDevice from '../../devices/utils/formatDevice';
 import Log from '../../log';
 import { Ora, ora } from '../../ora';
 import { getExpoConfig } from '../../project/expoConfig';
-import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
+import {
+  findProjectRootAsync,
+  getOwnerAccountForProjectIdAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';

 export default class BuildList extends EasCommand {
@@ -24,7 +28,10 @@ export default class BuildList extends EasCommand {

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const accountName = await getProjectAccountNameAsync(exp);
+
+    // this command is interactive by design
+    const projectId = await getProjectIdAsync(exp, { nonInteractive: false });
+    const account = await getOwnerAccountForProjectIdAsync(projectId);

    let spinner: Ora;

@@ -32,7 +39,7 @@ export default class BuildList extends EasCommand {
      spinner = ora().start('Fetching the list of teams for the project…');

      try {
-        const teams = await AppleTeamQuery.getAllForAccountAsync(accountName);
+        const teams = await AppleTeamQuery.getAllForAccountAsync(account.name);

        if (teams.length > 0) {
          spinner.succeed();
@@ -55,7 +62,7 @@ export default class BuildList extends EasCommand {
            appleTeamIdentifier = result.appleTeamIdentifier;
          }
        } else {
-          spinner.fail(`Couldn't find any teams for the account ${accountName}`);
+          spinner.fail(`Couldn't find any teams for the account ${account.name}`);
        }
      } catch (e) {
        spinner.fail(`Something went wrong and we couldn't fetch the list of teams`);
@@ -69,7 +76,7 @@ export default class BuildList extends EasCommand {

    try {
      const result = await AppleDeviceQuery.getAllForAppleTeamAsync(
-        accountName,
+        account.name,
        appleTeamIdentifier
      );

@@ -4,7 +4,11 @@ import formatDevice from '../../devices/utils/formatDevice';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { getExpoConfig } from '../../project/expoConfig';
-import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
+import {
+  findProjectRootAsync,
+  getOwnerAccountForProjectIdAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';

 export default class DeviceView extends EasCommand {
  static override description = 'view a device for your project';
@@ -30,12 +34,15 @@ If you are not sure what is the UDID of the device you are looking for, run:

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const accountName = await getProjectAccountNameAsync(exp);
+
+    // this command is non-interactive by design
+    const projectId = await getProjectIdAsync(exp, { nonInteractive: true });
+    const account = await getOwnerAccountForProjectIdAsync(projectId);

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

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

      if (device) {
        spinner.succeed('Fetched device details');
@@ -30,13 +30,15 @@ export default class MetadataPull extends EasCommand {
    const { flags } = await this.parse(MetadataPull);
    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    await getProjectIdAsync(exp);
+
+    // this command is interactive (all nonInteractive flags passed to utility functions are false)
+    await getProjectIdAsync(exp, { nonInteractive: false });
    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false });

    const credentialsCtx = new CredentialsContext({
      exp,
      projectDir,
-      user: await ensureLoggedInAsync(),
+      user: await ensureLoggedInAsync({ nonInteractive: false }),
      nonInteractive: false,
    });

@@ -28,13 +28,15 @@ export default class MetadataPush extends EasCommand {
    const { flags } = await this.parse(MetadataPush);
    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    await getProjectIdAsync(exp);
+
+    // this command is interactive (all nonInteractive flags passed to utility functions are false)
+    await getProjectIdAsync(exp, { nonInteractive: false });
    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false });

    const credentialsCtx = new CredentialsContext({
      exp,
      projectDir,
-      user: await ensureLoggedInAsync(),
+      user: await ensureLoggedInAsync({ nonInteractive: false }),
      nonInteractive: false,
    });

@@ -5,11 +5,10 @@ import EasCommand from '../commandUtils/EasCommand';
 import { ora } from '../ora';
 import { getExpoConfig } from '../project/expoConfig';
 import {
-  fetchProjectIdFromServerAsync,
  findProjectRootAsync,
-  getProjectAccountName,
+  getOwnerAccountForProjectIdAsync,
+  getProjectIdAsync,
 } from '../project/projectUtils';
-import { ensureLoggedInAsync } from '../user/actions';

 export default class Open extends EasCommand {
  static override description = 'open the project page in a web browser';
@@ -18,14 +17,14 @@ export default class Open extends EasCommand {
    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);

-    // this ensures the project exists
-    await fetchProjectIdFromServerAsync(exp);
+    // this command is interactive by nature (only really run by humans in a terminal)
+    // this ensures the project exists before opening the browser
+    const projectId = await getProjectIdAsync(exp, { nonInteractive: false });
+    const account = await getOwnerAccountForProjectIdAsync(projectId);

-    const user = await ensureLoggedInAsync();
-    const accountName = getProjectAccountName(exp, user);
    const projectName = exp.slug;

-    const projectDashboardUrl = getProjectDashboardUrl(accountName, projectName);
+    const projectDashboardUrl = getProjectDashboardUrl(account.name, projectName);
    const failedMessage = `Unable to open a web browser. Project page is available at: ${projectDashboardUrl}`;
    const spinner = ora(`Opening ${projectDashboardUrl}`).start();
    try {
@@ -37,10 +37,13 @@ export default class ProjectInfo extends EasCommand {
  async runAsync(): Promise<void> {
    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
+
+    // this command is non-interactive by design
+    const projectId = await getProjectIdAsync(exp, { nonInteractive: true });
+
    const { app } = await projectInfoByIdAsync(projectId);
    if (!app) {
-      throw new Error(`Could not find project with ID: ${projectId}`);
+      throw new Error(`Could not find project with id: ${projectId}`);
    }

    Log.addNewLineIfNone();
@@ -3,11 +3,7 @@ import chalk from 'chalk';
 import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
-import {
-  fetchProjectIdFromServerAsync,
-  findProjectRootAsync,
-  saveProjectIdToAppConfigAsync,
-} from '../../project/projectUtils';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';

 export default class ProjectInit extends EasCommand {
  static override description = 'create or link an EAS project';
@@ -19,14 +15,13 @@ export default class ProjectInit extends EasCommand {

    if (exp.extra?.eas?.projectId) {
      Log.error(
-        `app.json is already linked to project with ID: ${chalk.bold(exp.extra?.eas?.projectId)}`
+        `app.json is already linked to project with id: ${chalk.bold(exp.extra?.eas?.projectId)}`
      );
      return;
    }

-    const projectId = await fetchProjectIdFromServerAsync(exp);
-    await saveProjectIdToAppConfigAsync(projectDir, projectId);
-
-    Log.withTick(`Linked app.json to project with ID ${chalk.bold(projectId)}`);
+    // this command is interactive by nature
+    const projectId = await getProjectIdAsync(exp, { nonInteractive: false });
+    Log.withTick(`Linked app.json to project with id ${chalk.bold(projectId)}`);
  }
 }
@@ -1,23 +1,29 @@
 import { Flags } from '@oclif/core';
+import assert from 'assert';
 import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';

 import EasCommand from '../../commandUtils/EasCommand';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
 import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
 import {
  EnvironmentSecretScope,
  EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
+import {
+  SecretType,
+  SecretTypeToEnvironmentSecretType,
+} from '../../graphql/types/EnvironmentSecret';
 import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
-  getProjectAccountNameAsync,
+  getDisplayNameForProjectIdAsync,
+  getOwnerAccountForProjectIdAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
-import { findAccountByName } from '../../user/Account';
-import { getActorDisplayName } from '../../user/User';
-import { ensureLoggedInAsync } from '../../user/actions';
+import { promptAsync, selectAsync } from '../../prompts';

 export default class EnvironmentSecretCreate extends EasCommand {
  static override description =
@@ -33,29 +39,42 @@ export default class EnvironmentSecretCreate extends EasCommand {
      description: 'Name of the secret',
    }),
    value: Flags.string({
-      description: 'Value of the secret',
+      description: 'Text value or path to a file to store in the secret',
+    }),
+    type: Flags.enum({
+      description: 'The type of secret',
+      options: [SecretType.STRING, SecretType.FILE],
    }),
    force: Flags.boolean({
      description: 'Delete and recreate existing secrets',
      default: false,
    }),
+    ...EASNonInteractiveFlag,
  };

  async runAsync(): Promise<void> {
-    const actor = await ensureLoggedInAsync();
    let {
-      flags: { name, value: secretValue, scope, force },
+      flags: {
+        name,
+        value: secretValue,
+        scope,
+        force,
+        type: secretType,
+        'non-interactive': nonInteractive,
+      },
    } = await this.parse(EnvironmentSecretCreate);

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const accountName = await getProjectAccountNameAsync(exp);
-
-    const { slug } = exp;
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);
+    const ownerAccount = await getOwnerAccountForProjectIdAsync(projectId);

    if (!scope) {
      const validationMessage = 'Secret scope may not be empty.';
+      if (nonInteractive) {
+        throw new Error(validationMessage);
+      }

      ({ scope } = await promptAsync({
        type: 'select',
@@ -70,13 +89,18 @@ export default class EnvironmentSecretCreate extends EasCommand {
    }

    if (!name) {
+      const validationMessage = 'Secret name may not be empty.';
+      if (nonInteractive) {
+        throw new Error(validationMessage);
+      }
+
      ({ name } = await promptAsync({
        type: 'text',
        name: 'name',
        message: `Secret name:`,
        validate: value => {
          if (!value) {
-            return 'Secret name may not be empty.';
+            return validationMessage;
          }

          // this validation regex here is just to shorten the feedback loop
@@ -90,42 +114,82 @@ export default class EnvironmentSecretCreate extends EasCommand {
      }));

      if (!name) {
-        throw new Error('Secret name may not be empty.');
+        throw new Error(validationMessage);
      }
    }

+    if (!secretType) {
+      if (nonInteractive) {
+        throw new Error('Secret type may not be empty in non-interactive mode');
+      }
+
+      secretType = await selectAsync('Select secret type', [
+        {
+          title: 'string',
+          value: SecretType.STRING,
+        },
+        {
+          title: 'file',
+          value: SecretType.FILE,
+        },
+      ]);
+    }
+
    if (!secretValue) {
      const validationMessage = 'Secret value may not be empty.';
+      if (nonInteractive) {
+        throw new Error(validationMessage);
+      }

      ({ secretValue } = await promptAsync({
        type: 'text',
        name: 'secretValue',
-        message: 'Secret value:',
-        validate: value => (value ? true : validationMessage),
+        message: secretType === SecretType.STRING ? 'Secret value:' : 'Local file path:',
+        // eslint-disable-next-line async-protect/async-suffix
+        validate: async secretValue => {
+          if (!secretValue) {
+            return 'Secret value may not be empty.';
+          }
+          if (secretType === SecretType.FILE) {
+            const secretFilePath = path.resolve(secretValue);
+            if (!(await fs.pathExists(secretFilePath))) {
+              return `File "${secretValue}" does not exist.`;
+            }
+          }
+          return true;
+        },
      }));
+    }

-      if (!secretValue) {
-        throw new Error(validationMessage);
+    assert(secretValue);
+
+    let secretFilePath: string | undefined;
+    if (secretType === SecretType.FILE) {
+      secretFilePath = path.resolve(secretValue);
+      if (!(await fs.pathExists(secretFilePath))) {
+        throw new Error(`File "${secretValue}" does not exist`);
      }
    }

    if (scope === EnvironmentSecretScope.PROJECT) {
      if (force) {
-        const existingSecrets = await EnvironmentSecretsQuery.byAppIdAsync(projectId);
+        const { appSecrets: existingSecrets } = await EnvironmentSecretsQuery.byAppIdAsync(
+          projectId
+        );
        const existingSecret = existingSecrets.find(secret => secret.name === name);

        if (existingSecret) {
          await EnvironmentSecretMutation.deleteAsync(existingSecret.id);
          Log.withTick(
            `Deleting existing secret ${chalk.bold(name)} on project ${chalk.bold(
-              `@${accountName}/${slug}`
+              projectDisplayName
            )}.`
          );
        }
      }

      const secret = await EnvironmentSecretMutation.createForAppAsync(
-        { name, value: secretValue },
+        { name, value: secretValue, type: SecretTypeToEnvironmentSecretType[secretType] },
        projectId
      );
      if (!secret) {
@@ -134,25 +198,24 @@ export default class EnvironmentSecretCreate extends EasCommand {
        );
      }

-      Log.withTick(
-        `️Created a new secret ${chalk.bold(name)} on project ${chalk.bold(
-          `@${accountName}/${slug}`
-        )}.`
-      );
-    } else if (scope === EnvironmentSecretScope.ACCOUNT) {
-      const ownerAccount = findAccountByName(actor.accounts, accountName);
-
-      if (!ownerAccount) {
-        Log.warn(
-          `Your account (${getActorDisplayName(actor)}) doesn't have access to the ${chalk.bold(
-            accountName
-          )} account`
+      if (secretType === SecretType.STRING) {
+        Log.withTick(
+          `️Created a new secret ${chalk.bold(name)} with value ${chalk.bold(
+            secretValue
+          )} on project ${chalk.bold(projectDisplayName)}.`
+        );
+      } else {
+        Log.withTick(
+          `️Created a new secret ${chalk.bold(name)} from file ${chalk.bold(
+            secretFilePath
+          )} on project ${chalk.bold(projectDisplayName)}.`
        );
-        return;
      }
-
+    } else if (scope === EnvironmentSecretScope.ACCOUNT) {
      if (force) {
-        const existingSecrets = await EnvironmentSecretsQuery.byAccountNameAsync(ownerAccount.name);
+        const { accountSecrets: existingSecrets } = await EnvironmentSecretsQuery.byAppIdAsync(
+          projectId
+        );
        const existingSecret = existingSecrets.find(secret => secret.name === name);

        if (existingSecret) {
@@ -167,7 +230,7 @@ export default class EnvironmentSecretCreate extends EasCommand {
      }

      const secret = await EnvironmentSecretMutation.createForAccountAsync(
-        { name, value: secretValue },
+        { name, value: secretValue, type: SecretTypeToEnvironmentSecretType[secretType] },
        ownerAccount.id
      );

@@ -177,9 +240,19 @@ export default class EnvironmentSecretCreate extends EasCommand {
        );
      }

-      Log.withTick(
-        `️Created a new secret ${chalk.bold(name)} on account ${chalk.bold(ownerAccount.name)}.`
-      );
+      if (secretType === SecretType.STRING) {
+        Log.withTick(
+          `️Created a new secret ${chalk.bold(name)} with value ${chalk.bold(
+            secretValue
+          )} on account ${chalk.bold(ownerAccount.name)}.`
+        );
+      } else {
+        Log.withTick(
+          `️Created a new secret ${chalk.bold(name)} from file ${chalk.bold(
+            secretFilePath
+          )} on account ${chalk.bold(ownerAccount.name)}.`
+        );
+      }
    }
  }
 }
@@ -1,6 +1,7 @@
 import { Flags } from '@oclif/core';

 import EasCommand from '../../commandUtils/EasCommand';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
 import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
 import {
  EnvironmentSecretScope,
@@ -9,11 +10,7 @@ import {
 } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
-import {
-  findProjectRootAsync,
-  getProjectAccountNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';

 export default class EnvironmentSecretDelete extends EasCommand {
@@ -23,24 +20,26 @@ export default class EnvironmentSecretDelete extends EasCommand {
    id: Flags.string({
      description: 'ID of the secret to delete',
    }),
+    ...EASNonInteractiveFlag,
  };

  async runAsync(): Promise<void> {
-    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
-    const projectAccountName = await getProjectAccountNameAsync(exp);
-
    let {
-      flags: { id },
+      flags: { id, 'non-interactive': nonInteractive },
    } = await this.parse(EnvironmentSecretDelete);
    let secret: EnvironmentSecretWithScope | undefined;

+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });
+
    if (!id) {
      const validationMessage = 'You must select which secret to delete.';
+      if (nonInteractive) {
+        throw new Error(validationMessage);
+      }

-      const secrets = await EnvironmentSecretsQuery.allAsync(projectAccountName, projectId);
-
+      const secrets = await EnvironmentSecretsQuery.allAsync(projectId);
      ({ secret } = await promptAsync({
        type: 'autocomplete',
        name: 'secret',
@@ -58,25 +57,27 @@ export default class EnvironmentSecretDelete extends EasCommand {
      }
    }

-    Log.addNewLineIfNone();
-    Log.warn(
-      `You are about to permanently delete secret${
-        secret?.name ? ` "${secret?.name}"` : ''
-      } with id: "${id}".\nThis action is irreversible.`
-    );
-    Log.newLine();
-    const confirmed = await toggleConfirmAsync({
-      message: `Are you sure you wish to proceed?${
-        secret?.scope === EnvironmentSecretScope.ACCOUNT
-          ? ' This secret is applied across your whole account and may affect multiple apps.'
-          : ''
-      }`,
-    });
-    if (!confirmed) {
-      Log.error(
-        `Canceled deletion of secret${secret?.name ? ` "${secret?.name}"` : ''} with id: "${id}".`
+    if (!nonInteractive) {
+      Log.addNewLineIfNone();
+      Log.warn(
+        `You are about to permanently delete secret${
+          secret?.name ? ` "${secret?.name}"` : ''
+        } with id: "${id}".\nThis action is irreversible.`
      );
-      process.exit(1);
+      Log.newLine();
+      const confirmed = await toggleConfirmAsync({
+        message: `Are you sure you wish to proceed?${
+          secret?.scope === EnvironmentSecretScope.ACCOUNT
+            ? ' This secret is applied across your whole account and may affect multiple apps.'
+            : ''
+        }`,
+      });
+      if (!confirmed) {
+        Log.error(
+          `Canceled deletion of secret${secret?.name ? ` "${secret?.name}"` : ''} with id: "${id}".`
+        );
+        process.exit(1);
+      }
    }

    await EnvironmentSecretMutation.deleteAsync(id);
@@ -4,37 +4,40 @@ import dateFormat from 'dateformat';

 import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretsQuery } from '../../graphql/queries/EnvironmentSecretsQuery';
+import { EnvironmentSecretTypeToSecretType } from '../../graphql/types/EnvironmentSecret';
 import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
-import {
-  findProjectRootAsync,
-  getProjectAccountNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';

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

  async runAsync(): Promise<void> {
    const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
-    const projectAccountName = await getProjectAccountNameAsync(exp);
-
    if (!projectDir) {
      throw new Error("Run this command inside your project's directory");
    }

-    const secrets = await EnvironmentSecretsQuery.allAsync(projectAccountName, projectId);
+    const exp = getExpoConfig(projectDir);
+
+    // this command is non-interacive by design
+    const projectId = await getProjectIdAsync(exp, { nonInteractive: true });
+    const secrets = await EnvironmentSecretsQuery.allAsync(projectId);

    const table = new Table({
-      head: ['Name', 'Scope', 'ID', 'Updated at'],
+      head: ['Name', 'Type', 'Scope', 'ID', 'Updated at'],
      wordWrap: true,
    });

    for (const secret of secrets) {
-      const { name, createdAt: updatedAt, scope, id } = secret;
-      table.push([name, scope, id, dateFormat(updatedAt, 'mmm dd HH:MM:ss')]);
+      const { name, createdAt: updatedAt, scope, id, type } = secret;
+      table.push([
+        name,
+        EnvironmentSecretTypeToSecretType[type],
+        scope,
+        id,
+        dateFormat(updatedAt, 'mmm dd HH:MM:ss'),
+      ]);
    }

    Log.log(chalk`{bold Secrets for this account and project:}`);
@@ -98,7 +98,7 @@ export default class Submit extends EasCommand {

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive: flags.nonInteractive });

    await maybeWarnAboutEasOutagesAsync([StatuspageServiceName.EasSubmit]);

@@ -69,14 +69,14 @@ export default class UpdateConfigure extends EasCommand {
      [RequestedPlatform.Android, RequestedPlatform.All].includes(platform) &&
      androidWorkflow === Workflow.GENERIC
    ) {
-      await syncAndroidUpdatesConfigurationAsync(projectDir, updatedExp);
+      await syncAndroidUpdatesConfigurationAsync(projectDir, updatedExp, { nonInteractive: true });
      Log.withTick(`Configured ${chalk.bold('AndroidManifest.xml')} for EAS Update`);
    }
    if (
      [RequestedPlatform.Ios, RequestedPlatform.All].includes(platform) &&
      iosWorkflow === Workflow.GENERIC
    ) {
-      await syncIosUpdatesConfigurationAsync(projectDir, updatedExp);
+      await syncIosUpdatesConfigurationAsync(projectDir, updatedExp, { nonInteractive: true });
      Log.withTick(`Configured ${chalk.bold('Expo.plist')} for EAS Update`);
    }

@@ -98,7 +98,8 @@ async function configureAppJSONForEASUpdateAsync({
    [key in RequestedPlatform.Android | RequestedPlatform.Ios]: Workflow;
  };
 }): Promise<ExpoConfig> {
-  const projectId = await getProjectIdAsync(exp);
+  // this command is non-interactive in the way it was designed
+  const projectId = await getProjectIdAsync(exp, { nonInteractive: true });
  const easUpdateURL = getEASUpdateURL(projectId);
  const updates = { ...exp.updates, url: easUpdateURL };

@@ -1,8 +1,8 @@
-import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';

 import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
  DeleteUpdateGroupMutation,
@@ -47,21 +47,20 @@ export default class UpdateDelete extends EasCommand {
  ];

  static override flags = {
-    json: Flags.boolean({
-      description: `Return a json with the group ID of the deleted updates.`,
-      default: false,
-    }),
+    ...EasNonInteractiveAndJsonFlags,
  };

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

    if (jsonFlag) {
      enableJsonOutput();
-    } else {
+    }
+
+    if (!nonInteractive) {
      const shouldAbort = await confirmAsync({
        message:
          `🚨${chalk.red('CAUTION')}🚨\n\n` +
@@ -4,27 +4,23 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import { Errors, Flags } from '@oclif/core';
 import assert from 'assert';
 import chalk from 'chalk';
-import dateFormat from 'dateformat';
-import gql from 'graphql-tag';
 import nullthrows from 'nullthrows';

 import { getEASUpdateURL } from '../../api';
-import { BRANCHES_LIMIT } from '../../branch/queries';
+import { selectBranchOnAppAsync } from '../../branch/queries';
+import { BranchNotFoundError, getDefaultBranchNameAsync } from '../../branch/utils';
 import { getUpdateGroupUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import fetch from '../../fetch';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
-  GetUpdateGroupAsyncQuery,
  PublishUpdateGroupInput,
-  Robot,
-  RootQueryUpdatesByGroupArgs,
  StatuspageServiceName,
  Update,
  UpdateInfoGroup,
  UpdatePublishMutation,
-  User,
-  ViewBranchUpdatesQuery,
+  ViewBranchQueryVariables,
 } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
@@ -34,7 +30,7 @@ import { ora } from '../../ora';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
-  getProjectAccountName,
+  getOwnerAccountForProjectIdAsync,
  getProjectIdAsync,
  installExpoUpdatesAsync,
  isExpoUpdatesInstalledOrAvailable,
@@ -48,16 +44,15 @@ import {
  uploadAssetsAsync,
 } from '../../project/publish';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import { confirmAsync, promptAsync, selectAsync } from '../../prompts';
-import { formatUpdate } from '../../update/utils';
-import { ensureLoggedInAsync } from '../../user/actions';
+import { confirmAsync, promptAsync } from '../../prompts';
+import { selectUpdateGroupOnBranchAsync } from '../../update/queries';
+import { formatUpdateMessage } from '../../update/utils';
 import {
  checkManifestBodyAgainstUpdateInfoGroup,
  getCodeSigningInfoAsync,
  getManifestBodyAsync,
  signManifestBody,
 } from '../../utils/code-signing';
-import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
@@ -68,34 +63,6 @@ import { createUpdateChannelOnAppAsync } from '../channel/create';
 export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
 export type PublishPlatformFlag = PublishPlatform | 'all';

-async function getUpdateGroupAsync({
-  group,
-}: RootQueryUpdatesByGroupArgs): Promise<GetUpdateGroupAsyncQuery['updatesByGroup']> {
-  const { updatesByGroup } = await withErrorHandlingAsync(
-    graphqlClient
-      .query<GetUpdateGroupAsyncQuery, RootQueryUpdatesByGroupArgs>(
-        gql`
-          query getUpdateGroupAsync($group: ID!) {
-            updatesByGroup(group: $group) {
-              id
-              group
-              runtimeVersion
-              manifestFragment
-              platform
-              message
-            }
-          }
-        `,
-        {
-          group,
-        },
-        { additionalTypenames: ['Update'] }
-      )
-      .toPromise()
-  );
-  return updatesByGroup;
-}
-
 async function ensureChannelExistsAsync({
  appId,
  branchId,
@@ -127,37 +94,32 @@ async function ensureChannelExistsAsync({
 export async function ensureBranchExistsAsync({
  appId,
  name: branchName,
-  limit,
-  offset,
-}: {
-  appId: string;
-  name: string;
-  limit: number;
-  offset: number;
-}): Promise<{
-  id: string;
-  updates: Exclude<
-    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
-    null | undefined
-  >['updates'];
+}: ViewBranchQueryVariables): Promise<{
+  branchId: string;
 }> {
-  const { app } = await UpdateQuery.viewBranchAsync({
-    appId,
-    name: branchName,
-    limit,
-    offset,
-  });
-  const updateBranch = app?.byId.updateBranchByName;
-  if (updateBranch) {
-    const { id, updates } = updateBranch;
-    await ensureChannelExistsAsync({ appId, branchId: id, channelName: branchName });
-    return { id, updates };
-  }
+  try {
+    const updateBranch = await BranchQuery.getBranchByNameAsync({
+      appId,
+      name: branchName,
+    });

-  const newUpdateBranch = await createUpdateBranchOnAppAsync({ appId, name: branchName });
-  Log.withTick(`Created branch: ${chalk.bold(branchName)}`);
-  await ensureChannelExistsAsync({ appId, branchId: newUpdateBranch.id, channelName: branchName });
-  return { id: newUpdateBranch.id, updates: [] };
+    const { id } = updateBranch;
+    await ensureChannelExistsAsync({ appId, branchId: id, channelName: branchName });
+    return { branchId: id };
+  } catch (error) {
+    if (error instanceof BranchNotFoundError) {
+      const newUpdateBranch = await createUpdateBranchOnAppAsync({ appId, name: branchName });
+      Log.withTick(`Created branch: ${chalk.bold(branchName)}`);
+      await ensureChannelExistsAsync({
+        appId,
+        branchId: newUpdateBranch.id,
+        channelName: branchName,
+      });
+      return { branchId: newUpdateBranch.id };
+    } else {
+      throw error;
+    }
+  }
 }

 export default class UpdatePublish extends EasCommand {
@@ -195,10 +157,6 @@ export default class UpdatePublish extends EasCommand {
      default: 'all',
      required: false,
    }),
-    json: Flags.boolean({
-      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
-      default: false,
-    }),
    auto: Flags.boolean({
      description:
        'Use the current git branch and commit message for the EAS branch and update message',
@@ -208,28 +166,25 @@ export default class UpdatePublish extends EasCommand {
      description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,
      required: false,
    }),
-    'non-interactive': Flags.boolean({
-      default: false,
-      description: 'Run command in non-interactive mode',
-    }),
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
+    const { flags } = await this.parse(UpdatePublish);
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
    let {
-      flags: {
-        branch: branchName,
-        json: jsonFlag,
-        auto: autoFlag,
-        message,
-        republish,
-        group,
-        'input-dir': inputDir,
-        'skip-bundler': skipBundler,
-        platform,
-        'private-key-path': privateKeyPath,
-        'non-interactive': nonInteractive,
-      },
-    } = await this.parse(UpdatePublish);
+      branch: branchName,
+      auto: autoFlag,
+      message,
+      republish,
+      group,
+      'input-dir': inputDir,
+      'skip-bundler': skipBundler,
+      platform,
+      'private-key-path': privateKeyPath,
+      'non-interactive': nonInteractive,
+      json: jsonFlag,
+    } = flags;

    if (jsonFlag) {
      enableJsonOutput();
@@ -237,7 +192,7 @@ export default class UpdatePublish extends EasCommand {

    const platformFlag = platform as PublishPlatformFlag;
    // If a group was specified, that means we are republishing it.
-    republish = group ? true : republish;
+    republish = republish || !!group;

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir, {
@@ -279,54 +234,41 @@ export default class UpdatePublish extends EasCommand {
    }

    const runtimeVersions = await getRuntimeVersionObjectAsync(exp, platformFlag, projectDir);
-    const projectId = await getProjectIdAsync(exp);
-    await checkEASUpdateURLIsSetAsync(exp);
-
-    if (!branchName && autoFlag) {
-      branchName =
-        (await getVcsClient().getBranchNameAsync()) ||
-        `branch-${Math.random().toString(36).substr(2, 4)}`;
-    }
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });
+    await checkEASUpdateURLIsSetAsync(exp, projectId);

    if (!branchName) {
-      if (nonInteractive) {
+      if (autoFlag) {
+        branchName = await getDefaultBranchNameAsync();
+      } else if (nonInteractive) {
        throw new Error('Must supply --branch or use --auto when in non-interactive mode');
-      }
-
-      const validationMessage = 'Branch name may not be empty.';
-      if (jsonFlag) {
-        throw new Error(validationMessage);
-      }
-
-      const branches = await BranchQuery.listBranchesAsync({
-        appId: projectId,
-        limit: BRANCHES_LIMIT,
-        offset: 0,
-      });
-      if (branches.length === 0) {
-        ({ name: branchName } = await promptAsync({
-          type: 'text',
-          name: 'name',
-          message: 'No branches found. Provide a branch name:',
-          initial:
-            (await getVcsClient().getBranchNameAsync()) ||
-            `branch-${Math.random().toString(36).substr(2, 4)}`,
-          validate: value => (value ? true : validationMessage),
-        }));
      } else {
-        branchName = await selectAsync<string>(
-          'Which branch would you like to publish on?',
-          branches.map(branch => {
-            return {
-              title: `${branch.name} ${chalk.grey(
-                `- current update: ${formatUpdate(branch.updates[0])}`
+        try {
+          const branch = await selectBranchOnAppAsync({
+            projectId,
+            promptTitle: `Which branch would you like to ${
+              republish ? 'republish' : 'publish'
+            } on?`,
+            displayTextForListItem: updateBranch =>
+              `${updateBranch.name} ${chalk.grey(
+                `- current update: ${formatUpdateMessage(updateBranch.updates[0])}`
              )}`,
-              value: branch.name,
-            };
-          })
-        );
+            paginatedQueryOptions,
+          });
+          branchName = branch.name;
+        } catch {
+          // unable to select a branch (network error or no branches for project)
+          ({ name: branchName } = await promptAsync({
+            type: 'text',
+            name: 'name',
+            message: 'No branches found. Provide a branch name:',
+            initial: await getDefaultBranchNameAsync(),
+            validate: value => (value ? true : 'Branch name may not be empty.'),
+          }));
+        }
+
+        assert(branchName, 'Branch name must be specified.');
      }
-      assert(branchName, 'Branch name must be specified.');
    }

    let unsortedUpdateInfoGroups: UpdateInfoGroup = {};
@@ -342,23 +284,18 @@ export default class UpdatePublish extends EasCommand {
        'group' | 'message' | 'runtimeVersion' | 'manifestFragment' | 'platform'
      >[];
      if (group) {
-        updatesToRepublish = await getUpdateGroupAsync({ group });
+        const updatesByGroup = await UpdateQuery.viewUpdateGroupAsync({ groupId: group });
+        updatesToRepublish = updatesByGroup;
      } else {
        if (nonInteractive) {
          throw new Error('Must supply --group when in non-interactive mode');
        }

-        // Drop into interactive mode if the user has not specified an update group to republish.
-        if (jsonFlag) {
-          throw new Error('You must specify the update group to republish.');
-        }
-
-        updatesToRepublish = await getUpdatesToRepublishInteractiveAsync(
+        updatesToRepublish = await selectUpdateGroupOnBranchAsync({
          projectId,
          branchName,
-          platformFlag,
-          50
-        );
+          paginatedQueryOptions,
+        });
      }
      const updatesToRepublishFilteredByPlatform = updatesToRepublish.filter(
        // Only republish to the specified platforms
@@ -484,11 +421,9 @@ export default class UpdatePublish extends EasCommand {
        .map(pair => pair[0]);
    }

-    const { id: branchId } = await ensureBranchExistsAsync({
+    const { branchId } = await ensureBranchExistsAsync({
      appId: projectId,
      name: branchName,
-      limit: 0,
-      offset: 0,
    });

    // Sort the updates into different groups based on their platform specific runtime versions
@@ -594,7 +529,7 @@ export default class UpdatePublish extends EasCommand {
        const updateGroupId = newUpdatesForRuntimeVersion[0].group;

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

@@ -630,73 +565,6 @@ export default class UpdatePublish extends EasCommand {
  }
 }

-export async function getUpdatesToRepublishInteractiveAsync(
-  projectId: string,
-  branchName: string,
-  platformFlag: string,
-  pageSize: number,
-  offset: number = 0,
-  cumulativeUpdates: Exclude<
-    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
-    null | undefined
-  >['updates'] = []
-): Promise<
-  Exclude<
-    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
-    null | undefined
-  >['updates']
-> {
-  const fetchMoreValue = '_fetchMore';
-
-  const { updates } = await ensureBranchExistsAsync({
-    appId: projectId,
-    name: branchName,
-    limit: pageSize + 1, // fetch an extra item so we know if there are additional pages
-    offset,
-  });
-  cumulativeUpdates = [
-    ...cumulativeUpdates,
-    // drop that extra item used for pagination from our render logic
-    ...updates.slice(0, updates.length - 1),
-  ];
-  const cumulativeUpdatesForTargetPlatforms =
-    platformFlag === 'all'
-      ? cumulativeUpdates
-      : cumulativeUpdates.filter(update => {
-          // Only show groups that have updates on the specified platform(s).
-          return update.platform === platformFlag;
-        });
-  const updateGroups = uniqBy(cumulativeUpdatesForTargetPlatforms, u => u.group).map(update => ({
-    title: formatUpdateTitle(update),
-    value: update.group,
-  }));
-  if (updateGroups.length === 0) {
-    throw new Error(
-      `There are no updates on branch "${branchName}" published for the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
-    );
-  }
-
-  if (updates.length > pageSize) {
-    updateGroups.push({ title: 'Next page...', value: fetchMoreValue });
-  }
-
-  const selectedUpdateGroup = await selectAsync<string>(
-    'Which update would you like to republish?',
-    updateGroups
-  );
-  if (selectedUpdateGroup === fetchMoreValue) {
-    return await getUpdatesToRepublishInteractiveAsync(
-      projectId,
-      branchName,
-      platformFlag,
-      pageSize,
-      offset + pageSize,
-      cumulativeUpdates
-    );
-  }
-  return cumulativeUpdates.filter(update => update.group === selectedUpdateGroup);
-}
-
 async function getRuntimeVersionObjectAsync(
  exp: ExpoConfig,
  platformFlag: PublishPlatformFlag,
@@ -727,37 +595,8 @@ async function getRuntimeVersionObjectAsync(
  );
 }

-function formatUpdateTitle(
-  update: Exclude<
-    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
-    null | undefined
-  >['updates'][number]
-): string {
-  const { message, createdAt, actor, runtimeVersion } = update;
-
-  let actorName: string;
-  switch (actor?.__typename) {
-    case 'User': {
-      actorName = (actor as Pick<User, 'username' | 'id'>).username;
-      break;
-    }
-    case 'Robot': {
-      const { firstName, id } = actor as Pick<Robot, 'firstName' | 'id'>;
-      actorName = firstName ?? `robot: ${id.slice(0, 4)}...`;
-      break;
-    }
-    default:
-      actorName = 'unknown';
-  }
-  return `[${dateFormat(
-    createdAt,
-    'mmm dd HH:MM'
-  )} by ${actorName}, runtimeVersion: ${runtimeVersion}] ${message}`;
-}
-
-async function checkEASUpdateURLIsSetAsync(exp: ExpoConfig): Promise<void> {
+async function checkEASUpdateURLIsSetAsync(exp: ExpoConfig, projectId: string): Promise<void> {
  const configuredURL = exp.updates?.url;
-  const projectId = await getProjectIdAsync(exp);
  const expectedURL = getEASUpdateURL(projectId);

  if (configuredURL !== expectedURL) {
@@ -1,124 +1,85 @@
 import { Flags } from '@oclif/core';
-import assert from 'assert';
-import chalk from 'chalk';
-import CliTable from 'cli-table3';

+import { selectBranchOnAppAsync } from '../../branch/queries';
 import EasCommand from '../../commandUtils/EasCommand';
-import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
-import Log from '../../log';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import {
+  EasPaginatedQueryFlags,
+  getLimitFlagWithCustomValues,
+  getPaginatedQueryOptions,
+} from '../../commandUtils/pagination';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
-import { UPDATES_LIMIT } from '../../update/queries';
 import {
-  UPDATE_COLUMNS,
-  UpdateGroupDescription,
-  formatUpdate,
-  getUpdateGroupsWithPlatforms,
-} from '../../update/utils';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { getVcsClient } from '../../vcs';
+  listAndRenderUpdateGroupsOnAppAsync,
+  listAndRenderUpdateGroupsOnBranchAsync,
+} from '../../update/queries';
+import { enableJsonOutput } from '../../utils/json';

-export default class BranchView extends EasCommand {
-  static override description = 'view the recent updates for a branch';
+export default class UpdateList extends EasCommand {
+  static override description = 'view the recent updates';

  static override flags = {
    branch: Flags.string({
-      description: 'List all updates on this branch',
+      description: 'List updates only on this branch',
      exclusive: ['all'],
    }),
    all: Flags.boolean({
-      description: 'List all updates associated with this project',
+      description: 'List updates on all branches',
      exclusive: ['branch'],
      default: false,
    }),
-    json: Flags.boolean({
-      description: `Return a json with all of the recent update groups.`,
-      default: false,
-    }),
+    ...EasPaginatedQueryFlags,
+    limit: getLimitFlagWithCustomValues({ defaultTo: 25, limit: 50 }),
+    ...EasNonInteractiveAndJsonFlags,
  };

  async runAsync(): Promise<void> {
-    const {
-      flags: { branch: branchFlag, all, json: jsonFlag },
-    } = await this.parse(BranchView);
+    const { flags } = await this.parse(UpdateList);
+    const { branch: branchFlag, all, json: jsonFlag, 'non-interactive': nonInteractive } = flags;
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
+
    if (jsonFlag) {
      enableJsonOutput();
    }

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });

-    let updateGroupDescriptions: UpdateGroupDescription[];
    if (all) {
-      const branchesAndUpdates = await UpdateQuery.viewAllAsync({
-        appId: projectId,
-        limit: UPDATES_LIMIT,
-        offset: 0,
-      });
-      updateGroupDescriptions = getUpdateGroupsWithPlatforms(
-        branchesAndUpdates.app.byId.updates.map(update => ({
-          ...update,
-          branch: update.branch.name,
-        }))
-      ).sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
+      listAndRenderUpdateGroupsOnAppAsync({ projectId, paginatedQueryOptions });
    } else {
-      let branchInteractive: string | undefined;
-      if (!branchFlag) {
+      if (branchFlag) {
+        listAndRenderUpdateGroupsOnBranchAsync({
+          projectId,
+          branchName: branchFlag,
+          paginatedQueryOptions,
+        });
+      } else {
        const validationMessage = 'Branch name may not be empty.';
-        if (jsonFlag) {
+        if (nonInteractive) {
          throw new Error(validationMessage);
        }
-        ({ name: branchInteractive } = await promptAsync({
-          type: 'text',
-          name: 'name',
-          message: 'Provide the name of the branch whose updates you wish to view:',
-          initial: (await getVcsClient().getBranchNameAsync()) ?? undefined,
-          validate: (value: any) => (value ? true : validationMessage),
-        }));
-      }
-      const branch = branchFlag ?? branchInteractive;
-      assert(branch, 'Branch name may not be empty.');

-      const branchesAndUpdates = await UpdateQuery.viewBranchAsync({
-        appId: projectId,
-        name: branch,
-        limit: UPDATES_LIMIT,
-        offset: 0,
-      });
-      const UpdateBranch = branchesAndUpdates.app?.byId.updateBranchByName;
-      if (!UpdateBranch) {
-        throw new Error(`Could not find branch "${branch}"`);
+        const selectedBranch = await selectBranchOnAppAsync({
+          projectId,
+          promptTitle: 'Which branch would you like to view?',
+          displayTextForListItem: updateBranch => updateBranch.name,
+          paginatedQueryOptions:
+            // discard limit and offset because this query is not those flag's intended target
+            {
+              json: paginatedQueryOptions.json,
+              nonInteractive: paginatedQueryOptions.nonInteractive,
+              offset: 0,
+            },
+        });
+        listAndRenderUpdateGroupsOnBranchAsync({
+          projectId,
+          branchName: selectedBranch.name,
+          paginatedQueryOptions,
+        });
      }
-      updateGroupDescriptions = getUpdateGroupsWithPlatforms(
-        UpdateBranch.updates.map(update => ({ ...update, branch }))
-      ).sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
-    }
-
-    if (jsonFlag) {
-      printJsonOnlyOutput(updateGroupDescriptions);
-    } else {
-      logAsTable(updateGroupDescriptions);
    }
  }
 }
-
-function logAsTable(updateGroupDescriptions: UpdateGroupDescription[]): void {
-  const table = new CliTable({
-    head: ['Branch', ...UPDATE_COLUMNS],
-    wordWrap: true,
-  });
-  table.push(
-    ...updateGroupDescriptions.map(updateGroupDescription => [
-      updateGroupDescription.branch,
-      formatUpdate(updateGroupDescription),
-      updateGroupDescription.runtimeVersion,
-      updateGroupDescription.group,
-      updateGroupDescription.platforms,
-    ])
-  );
-  Log.addNewLineIfNone();
-  Log.log(chalk.bold('Recently published update groups:'));
-  Log.log(table.toString());
-}
@@ -1,55 +1,14 @@
-import { Flags } from '@oclif/core';
+import chalk from 'chalk';
 import Table from 'cli-table3';
-import gql from 'graphql-tag';

 import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import { UpdatesByGroupQuery, UpdatesByGroupQueryVariables } from '../../graphql/generated';
+import { EasJsonOnlyFlag } from '../../commandUtils/flags';
+import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
-import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
+import { UPDATE_COLUMNS, getUpdateGroupDescriptions } from '../../update/utils';
+import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

-export async function viewUpdateAsync({
-  groupId,
-}: {
-  groupId: string;
-}): Promise<UpdatesByGroupQuery> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .query<UpdatesByGroupQuery, UpdatesByGroupQueryVariables>(
-        gql`
-          query UpdatesByGroup($groupId: ID!) {
-            updatesByGroup(group: $groupId) {
-              id
-              group
-              runtimeVersion
-              platform
-              message
-              actor {
-                id
-                ... on User {
-                  username
-                }
-                ... on Robot {
-                  firstName
-                }
-              }
-              createdAt
-            }
-          }
-        `,
-        {
-          groupId,
-        },
-        { additionalTypenames: ['Update'] }
-      )
-      .toPromise()
-  );
-  if (data.updatesByGroup.length === 0) {
-    throw new Error(`Could not find any updates with group ID: "${groupId}"`);
-  }
-  return data;
-}
 export default class UpdateView extends EasCommand {
  static override description = 'update group details';

@@ -62,10 +21,7 @@ export default class UpdateView extends EasCommand {
  ];

  static override flags = {
-    json: Flags.boolean({
-      description: `Return a json with the updates belonging to the group.`,
-      default: false,
-    }),
+    ...EasJsonOnlyFlag,
  };

  async runAsync(): Promise<void> {
@@ -77,27 +33,25 @@ export default class UpdateView extends EasCommand {
      enableJsonOutput();
    }

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

    if (jsonFlag) {
-      printJsonOnlyOutput(updatesByGroup);
+      printJsonOnlyOutput(updateGroupDescription);
    } else {
      const groupTable = new Table({
        head: [...UPDATE_COLUMNS],
        wordWrap: true,
      });

-      const representativeUpdate = updatesByGroup[0];
+      Log.log(chalk.bold('Update group:'));
+      Log.log(formatFields([{ label: 'ID', value: updateGroupDescription.group }]));
      groupTable.push([
-        formatUpdate(representativeUpdate),
-        representativeUpdate.runtimeVersion,
-        representativeUpdate.group,
-        getPlatformsForGroup({
-          updates: updatesByGroup,
-          group: updatesByGroup[0]?.group,
-        }),
+        updateGroupDescription.message,
+        updateGroupDescription.runtimeVersion,
+        updateGroupDescription.group,
+        updateGroupDescription.platforms,
      ]);
-
      Log.log(groupTable.toString());
    }
  }
@@ -1,6 +1,7 @@
 import { Flags } from '@oclif/core';

 import EasCommand from '../../commandUtils/EasCommand';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
 import { WebhookType } from '../../graphql/generated';
 import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
 import { ora } from '../../ora';
@@ -23,6 +24,7 @@ export default class WebhookCreate extends EasCommand {
      description:
        "Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature' header.",
    }),
+    ...EASNonInteractiveFlag,
  };

  async runAsync(): Promise<void> {
@@ -31,7 +33,8 @@ export default class WebhookCreate extends EasCommand {

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
+
+    const projectId = await getProjectIdAsync(exp, { nonInteractive: flags['non-interactive'] });

    const spinner = ora('Creating a webhook').start();
    try {
@@ -3,6 +3,7 @@ import chalk from 'chalk';
 import nullthrows from 'nullthrows';

 import EasCommand from '../../commandUtils/EasCommand';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
 import { WebhookFragment } from '../../graphql/generated';
 import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
 import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
@@ -24,14 +25,19 @@ export default class WebhookDelete extends EasCommand {
    },
  ];

+  static override flags = {
+    ...EASNonInteractiveFlag,
+  };
+
  async runAsync(): Promise<void> {
    let {
      args: { ID: webhookId },
+      flags: { 'non-interactive': nonInteractive },
    } = await this.parse(WebhookDelete);

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
+    const projectId = await getProjectIdAsync(exp, { nonInteractive });

    let webhook: WebhookFragment | undefined =
      webhookId && (await WebhookQuery.byIdAsync(webhookId));
@@ -40,6 +46,11 @@ export default class WebhookDelete extends EasCommand {
      if (webhooks.length === 0) {
        process.exit(1);
      }
+
+      if (nonInteractive) {
+        throw new Error('Must supply ID argument in non-interactive mode');
+      }
+
      ({ webhook } = await promptAsync({
        type: 'autocomplete',
        name: 'webhook',
@@ -57,15 +68,17 @@ export default class WebhookDelete extends EasCommand {
    Log.addNewLineIfNone();
    Log.log(formatWebhook(webhook));
    Log.newLine();
-    Log.warn(`You are about to permanently delete this webhook.\nThis action is irreversible.`);
-    Log.newLine();
-    const confirmed = await toggleConfirmAsync({
-      message: 'Are you sure you wish to proceed?',
-    });

-    if (!confirmed) {
-      Log.error(`Canceled deletion of the webhook`);
-      process.exit(1);
+    if (!nonInteractive) {
+      Log.warn(`You are about to permanently delete this webhook.\nThis action is irreversible.`);
+      Log.newLine();
+      const confirmed = await toggleConfirmAsync({
+        message: 'Are you sure you wish to proceed?',
+      });
+      if (!confirmed) {
+        Log.error(`Canceled deletion of the webhook`);
+        process.exit(1);
+      }
    }

    const spinner = ora('Deleting the webhook').start();
@@ -9,7 +9,7 @@ import { ora } from '../../ora';
 import { getExpoConfig } from '../../project/expoConfig';
 import {
  findProjectRootAsync,
-  getProjectFullNameAsync,
+  getDisplayNameForProjectIdAsync,
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { formatWebhook } from '../../webhooks/formatWebhook';
@@ -31,16 +31,18 @@ export default class WebhookList extends EasCommand {

    const projectDir = await findProjectRootAsync();
    const exp = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(exp);
-    const projectFullName = await getProjectFullNameAsync(exp);

-    const spinner = ora(`Fetching the list of webhook on project ${projectFullName}`).start();
+    // this command is non-interactive by design
+    const projectId = await getProjectIdAsync(exp, { nonInteractive: true });
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);
+
+    const spinner = ora(`Fetching the list of webhook on project ${projectDisplayName}`).start();
    try {
      const webhooks = await WebhookQuery.byAppIdAsync(projectId, event && { event });
      if (webhooks.length === 0) {
-        spinner.fail(`There are no webhooks on project ${projectFullName}`);
+        spinner.fail(`There are no webhooks on project ${projectDisplayName}`);
      } else {
-        spinner.succeed(`Found ${webhooks.length} webhooks on project ${projectFullName}`);
+        spinner.succeed(`Found ${webhooks.length} webhooks on project ${projectDisplayName}`);
        const list = webhooks
          .map(webhook => formatWebhook(webhook))
          .join(`\n\n${chalk.dim('———')}\n\n`);
@@ -48,7 +50,7 @@ export default class WebhookList extends EasCommand {
      }
    } catch (err) {
      spinner.fail(
-        `Something went wrong and we couldn't fetch the webhook list for the project ${projectFullName}`
+        `Something went wrong and we couldn't fetch the webhook list for the project ${projectDisplayName}`
      );
      throw err;
    }
@@ -1,6 +1,7 @@
 import { Flags } from '@oclif/core';

 import EasCommand from '../../commandUtils/EasCommand';
+import { EASNonInteractiveFlag } from '../../commandUtils/flags';
 import { WebhookType } from '../../graphql/generated';
 import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
 import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
@@ -27,6 +28,7 @@ export default class WebhookUpdate extends EasCommand {
      description:
        "Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature' header.",
    }),
+    ...EASNonInteractiveFlag,
  };

  async runAsync(): Promise<void> {
@@ -36,7 +38,7 @@ export default class WebhookUpdate extends EasCommand {

    const webhook = await WebhookQuery.byIdAsync(webhookId);
    const webhookInputParams = await prepareInputParamsAsync(
-      pick(flags, ['event', 'url', 'secret']),
+      pick(flags, ['event', 'url', 'secret', 'non-interactive']),
      webhook
    );

@@ -55,6 +55,10 @@ export const testAppFragment: AppFragment = {
  id: 'test-app-id',
  fullName: '@testuser/testapp',
  slug: 'testapp',
+  ownerAccount: {
+    id: 'test-account-id',
+    name: 'testuser',
+  },
 };

 export const testLegacyAndroidFcmFragment: AndroidFcmFragment = {
@@ -1,3 +1,4 @@
+import { AppFragment } from '../../graphql/generated';
 import { Actor } from '../../user/User';

 export const jester: Actor = {
@@ -47,3 +48,10 @@ export const testAppJsonWithDifferentOwner = {
  ...testAppJson,
  owner: jester2.username,
 };
+
+export const testAppQueryByIdResponse: AppFragment = {
+  id: testProjectId,
+  slug: testSlug,
+  fullName: testExperienceName,
+  ownerAccount: jester.accounts[0],
+};
@@ -55,6 +55,10 @@ export const testAppFragment: AppFragment = {
  id: 'test-app-id',
  fullName: '@testuser/testapp',
  slug: 'testapp',
+  ownerAccount: {
+    id: 'test-account-id',
+    name: 'testuser',
+  },
 };

 export const testAscApiKeyFragment: AppStoreConnectApiKeyFragment = {
@@ -5,9 +5,12 @@ import { AndroidAppBuildCredentialsFragment } from '../../../graphql/generated';
 import { ora } from '../../../ora';
 import { getApplicationIdAsync } from '../../../project/android/applicationId';
 import { GradleBuildContext } from '../../../project/android/gradle';
-import { getProjectAccountName, getProjectConfigDescription } from '../../../project/projectUtils';
+import {
+  getOwnerAccountForProjectIdAsync,
+  getProjectConfigDescription,
+  getProjectIdAsync,
+} from '../../../project/projectUtils';
 import { promptAsync } from '../../../prompts';
-import { findAccountByName } from '../../../user/Account';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';

@@ -90,11 +93,8 @@ export async function getAppLookupParamsFromContextAsync(
 ): Promise<AppLookupParams> {
  ctx.ensureProjectContext();
  const projectName = ctx.exp.slug;
-  const accountName = getProjectAccountName(ctx.exp, ctx.user);
-  const account = findAccountByName(ctx.user.accounts, accountName);
-  if (!account) {
-    throw new Error(`You do not have access to account: ${accountName}`);
-  }
+  const projectId = await getProjectIdAsync(ctx.exp, { nonInteractive: ctx.nonInteractive });
+  const account = await getOwnerAccountForProjectIdAsync(projectId);

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

-    const projectId = await getProjectIdAsync(ctx.exp);
+    const projectId = await getProjectIdAsync(ctx.exp, { nonInteractive: ctx.nonInteractive });
    const keystore = await this.provideOrGenerateAsync(projectId);
    const keystoreFragment = await ctx.android.createKeystoreAsync(this.account, keystore);
    Log.succeed('Created keystore');
@@ -1,9 +1,16 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { testLegacyAndroidFcmFragment } from '../../../__tests__/fixtures-android';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { AssignFcm } from '../AssignFcm';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';

+jest.mock('../../../../graphql/queries/AppQuery');
+
 describe(AssignFcm, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('assigns an fcm api key in Interactive Mode', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -1,9 +1,16 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { testGoogleServiceAccountKeyFragment } from '../../../__tests__/fixtures-android';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { AssignGoogleServiceAccountKey } from '../AssignGoogleServiceAccountKey';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';

+jest.mock('../../../../graphql/queries/AppQuery');
+
 describe(AssignGoogleServiceAccountKey, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('assigns a Google Service Account key in Interactive Mode', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -1,3 +1,4 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { confirmAsync, promptAsync } from '../../../../prompts';
 import {
  getNewAndroidApiMock,
@@ -7,6 +8,7 @@ import {
  testLegacyAndroidBuildCredentialsFragment,
  testLegacyAndroidFcmFragment,
 } from '../../../__tests__/fixtures-android';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import {
  canCopyLegacyCredentialsAsync,
@@ -17,8 +19,12 @@ import {
 jest.mock('../../../../ora');
 jest.mock('../../../../prompts');
 jest.mocked(confirmAsync).mockImplementation(async () => true);
+jest.mock('../../../../graphql/queries/AppQuery');

 describe('BuildCredentialsUtils', () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  describe(canCopyLegacyCredentialsAsync, () => {
    it('returns true if the user has legacy credentials and no modern ones', async () => {
      const ctx = createCtxMock({
@@ -1,12 +1,19 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { promptAsync } from '../../../../prompts';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { CreateFcm } from '../CreateFcm';

 jest.mock('../../../../prompts');
 jest.mocked(promptAsync).mockImplementation(async () => ({ fcmApiKey: 'blah' }));
+jest.mock('../../../../graphql/queries/AppQuery');

 describe(CreateFcm, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
+
  it('creates an fcm api key in Interactive Mode', async () => {
    const ctx = createCtxMock({ nonInteractive: false });
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
@@ -1,6 +1,8 @@
 import { vol } from 'memfs';

+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { promptAsync } from '../../../../prompts';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { CreateGoogleServiceAccountKey } from '../CreateGoogleServiceAccountKey';
@@ -10,12 +12,17 @@ jest.mock('fs');
 jest.mocked(promptAsync).mockImplementation(async () => ({
  filePath: '/google-service-account-key.json',
 }));
+jest.mock('../../../../graphql/queries/AppQuery');

 beforeEach(() => {
  vol.reset();
 });

 describe(CreateGoogleServiceAccountKey, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
+
  it('creates a Google Service Account Key in Interactive Mode', async () => {
    vol.fromJSON({
      '/google-service-account-key.json': JSON.stringify({
@@ -1,4 +1,8 @@
-import { jester as mockJester } from '../../../../credentials/__tests__/fixtures-constants';
+import {
+  jester as mockJester,
+  testAppQueryByIdResponse,
+} from '../../../../credentials/__tests__/fixtures-constants';
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { testKeystore } from '../../../__tests__/fixtures-android';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { askForUserProvidedAsync } from '../../../utils/promptForCredentials';
@@ -6,15 +10,16 @@ import { generateRandomKeystoreAsync } from '../../utils/keystore';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { CreateKeystore } from '../CreateKeystore';

-jest.mock('../../../../project/ensureProjectExists');
 jest.mock('../../../../prompts', () => ({ confirmAsync: jest.fn(() => true) }));
 jest.mock('../../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
 jest.mock('../../../utils/promptForCredentials');
 jest.mock('../../utils/keystore', () => ({ generateRandomKeystoreAsync: jest.fn() }));
+jest.mock('../../../../graphql/queries/AppQuery');

 describe('CreateKeystore', () => {
  beforeEach(() => {
    jest.mocked(generateRandomKeystoreAsync).mockReset();
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
  });
  it('creates a keystore in Interactive Mode', async () => {
    const ctx = createCtxMock({ nonInteractive: false });
@@ -1,13 +1,19 @@
 import fs from 'fs-extra';

+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { testAndroidBuildCredentialsFragment } from '../../../__tests__/fixtures-android';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { DownloadKeystore } from '../DownloadKeystore';

 jest.mock('fs-extra');
+jest.mock('../../../../graphql/queries/AppQuery');

 describe(DownloadKeystore, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('downloads a keystore', async () => {
    const fsWriteFileSpy = jest.spyOn(fs, 'writeFile');
    const ctx = createCtxMock({
@@ -1,16 +1,22 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { confirmAsync } from '../../../../prompts';
 import {
  getNewAndroidApiMock,
  testAndroidAppCredentialsFragment,
 } from '../../../__tests__/fixtures-android';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { RemoveFcm } from '../RemoveFcm';

 jest.mock('../../../../prompts');
 jest.mocked(confirmAsync).mockImplementation(async () => true);
+jest.mock('../../../../graphql/queries/AppQuery');

 describe(RemoveFcm, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('removes an FCM API Key', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -1,5 +1,7 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { confirmAsync } from '../../../../prompts';
 import { testAndroidBuildCredentialsFragment } from '../../../__tests__/fixtures-android';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { RemoveKeystore } from '../RemoveKeystore';
@@ -7,8 +9,13 @@ import { RemoveKeystore } from '../RemoveKeystore';
 jest.mock('fs-extra');
 jest.mock('../../../../prompts');
 jest.mocked(confirmAsync).mockImplementation(async () => true);
+jest.mock('../../../../graphql/queries/AppQuery');

 describe(RemoveKeystore, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
+
  it('removes a keystore', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -1,9 +1,13 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import {
  getNewAndroidApiMock,
  testAndroidBuildCredentialsFragment,
  testJksAndroidKeystoreFragment,
 } from '../../../__tests__/fixtures-android';
-import { jester as mockJester } from '../../../__tests__/fixtures-constants';
+import {
+  jester as mockJester,
+  testAppQueryByIdResponse,
+} from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { MissingCredentialsNonInteractiveError } from '../../../errors';
 import { generateRandomKeystoreAsync } from '../../utils/keystore';
@@ -11,14 +15,15 @@ import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { SetUpBuildCredentials } from '../SetUpBuildCredentials';

 jest.mock('../../../../ora');
-jest.mock('../../../../project/ensureProjectExists');
 jest.mock('../../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
 jest.mock('../../../../prompts', () => ({ confirmAsync: jest.fn(() => true) }));
 jest.mock('../../utils/keystore', () => ({ generateRandomKeystoreAsync: jest.fn() }));
+jest.mock('../../../../graphql/queries/AppQuery');

 describe('SetUpBuildCredentials', () => {
  beforeEach(() => {
    jest.mocked(generateRandomKeystoreAsync).mockReset();
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
  });

  it('skips setup when there are prior credentials', async () => {
@@ -1,12 +1,14 @@
 import { vol } from 'memfs';

 import { AndroidKeystoreType } from '../../../../graphql/generated';
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { confirmAsync } from '../../../../prompts';
 import {
  getNewAndroidApiMock,
  testAndroidBuildCredentialsFragment,
  testJksAndroidKeystoreFragment,
 } from '../../../__tests__/fixtures-android';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import {
  SelectAndroidBuildCredentials,
@@ -21,12 +23,16 @@ jest.mock('fs');
 jest.mock('../../../../prompts');
 jest.mocked(confirmAsync).mockImplementation(async () => true);
 jest.mock('../../../manager/SelectAndroidBuildCredentials');
+jest.mock('../../../../graphql/queries/AppQuery');

 beforeEach(() => {
  vol.reset();
 });

 describe(SetUpBuildCredentialsFromCredentialsJson, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('sets up a new build configuration from credentials.json upon user request', async () => {
    jest.mocked(SelectAndroidBuildCredentials).mockImplementation((() => {
      return {
@@ -1,11 +1,13 @@
 import { vol } from 'memfs';

+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { promptAsync } from '../../../../prompts';
 import {
  getNewAndroidApiMock,
  testAndroidAppCredentialsFragment,
  testGoogleServiceAccountKeyFragment,
 } from '../../../__tests__/fixtures-android';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { MissingCredentialsNonInteractiveError } from '../../../errors';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
@@ -16,12 +18,16 @@ jest.mock('fs');
 jest.mocked(promptAsync).mockImplementation(async () => ({
  filePath: '/google-service-account-key.json',
 }));
+jest.mock('../../../../graphql/queries/AppQuery');

 beforeEach(() => {
  vol.reset();
 });

 describe(SetUpGoogleServiceAccountKey, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('skips setup when there is a Google Service Account Key already assigned to the project', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -1,8 +1,10 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { promptAsync } from '../../../../prompts';
 import {
  getNewAndroidApiMock,
  testGoogleServiceAccountKeyFragment,
 } from '../../../__tests__/fixtures-android';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { UseExistingGoogleServiceAccountKey } from '../UseExistingGoogleServiceAccountKey';
@@ -11,8 +13,12 @@ jest.mock('../../../../prompts');
 jest
  .mocked(promptAsync)
  .mockImplementation(async () => ({ chosenKey: testGoogleServiceAccountKeyFragment }));
+jest.mock('../../../../graphql/queries/AppQuery');

 describe(UseExistingGoogleServiceAccountKey, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('uses an existing Google Service Account Key in Interactive Mode', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -1,22 +1,28 @@
 import mockdate from 'mockdate';

+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import Log from '../../../../log';
 import {
  testAndroidAppCredentialsFragment,
  testGoogleServiceAccountKeyFragment,
  testLegacyAndroidFcmFragment,
 } from '../../../__tests__/fixtures-android';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../../actions/BuildCredentialsUtils';
 import { displayAndroidAppCredentials } from '../printCredentials';

 jest.mock('../../../../log');
 jest.mock('chalk', () => ({ bold: jest.fn(log => log), cyan: { bold: jest.fn(log => log) } }));
+jest.mock('../../../../graphql/queries/AppQuery');

 mockdate.set(testLegacyAndroidFcmFragment.updatedAt);
 mockdate.set(testGoogleServiceAccountKeyFragment.updatedAt);

 describe('print credentials', () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('prints the AndroidAppCredentials fragment', async () => {
    const ctx = createCtxMock();
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
@@ -5,9 +5,8 @@ import chalk from 'chalk';

 import Log from '../log';
 import { getExpoConfig } from '../project/expoConfig';
-import { getProjectAccountName } from '../project/projectUtils';
 import { confirmAsync } from '../prompts';
-import { Actor, getActorDisplayName } from '../user/User';
+import { Actor } from '../user/User';
 import * as AndroidGraphqlClient from './android/api/GraphqlClient';
 import * as IosGraphqlClient from './ios/api/GraphqlClient';
 import AppStoreApi from './ios/appstore/AppStoreApi';
@@ -29,7 +28,7 @@ export class CredentialsContext {
    private options: {
      exp?: ExpoConfig;
      easJsonCliConfig?: EasJson['cli'];
-      nonInteractive?: boolean;
+      nonInteractive: boolean;
      projectDir: string;
      user: Actor;
      env?: Env;
@@ -77,23 +76,6 @@ export class CredentialsContext {
    getExpoConfig(this.options.projectDir);
  }

-  public logOwnerAndProject(): void {
-    const { user } = this.options;
-    if (this.hasProjectContext) {
-      const owner = getProjectAccountName(this.exp, user);
-      // Figure out if User A is configuring credentials as admin for User B's project
-      const isProxyUser = user.__typename === 'Robot' || owner !== user.username;
-
-      Log.log(
-        `Accessing credentials ${isProxyUser ? 'on behalf of' : 'for'} ${owner} in project ${
-          this.exp.slug
-        }`
-      );
-    } else {
-      Log.log(`Accessing credentials for ${this.exp.owner ?? getActorDisplayName(user)}`);
-    }
-  }
-
  async bestEffortAppStoreAuthenticateAsync(): Promise<void> {
    if (this.appStore.authCtx || !this.shouldAskAuthenticateAppStore) {
      // skip prompts if already have apple ctx or already asked about it
@@ -3,10 +3,12 @@ import { vol } from 'memfs';
 import prompts from 'prompts';

 import { IosDistributionType } from '../../../graphql/generated';
+import { AppQuery } from '../../../graphql/queries/AppQuery';
 import {
  testKeystore,
  testLegacyAndroidBuildCredentialsFragment,
 } from '../../__tests__/fixtures-android';
+import { testAppQueryByIdResponse } from '../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../__tests__/fixtures-context';
 import {
  getNewIosApiMock,
@@ -14,12 +16,13 @@ import {
  testDistCertFragmentNoDependencies,
  testProvisioningProfileFragment,
 } from '../../__tests__/fixtures-ios';
-import { getAppFromContext } from '../../ios/actions/BuildCredentialsUtils';
+import { getAppFromContextAsync } from '../../ios/actions/BuildCredentialsUtils';
 import { Target } from '../../ios/types';
 import { updateAndroidCredentialsAsync, updateIosCredentialsAsync } from '../update';

 jest.mock('fs');
 jest.mock('prompts');
+jest.mock('../../../graphql/queries/AppQuery');

 describe('update credentials.json', () => {
  beforeEach(() => {
@@ -28,6 +31,7 @@ describe('update credentials.json', () => {
    jest.mocked(prompts).mockImplementation(() => {
      throw new Error(`unhandled prompts call - this shouldn't happen - fix tests!`);
    });
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
  });

  describe(updateAndroidCredentialsAsync, () => {
@@ -201,7 +205,7 @@ describe('update credentials.json', () => {
        './pprofile': 'somebinarycontent',
        './cert.p12': 'somebinarycontent2',
      });
-      const app = getAppFromContext(ctx);
+      const app = await getAppFromContextAsync(ctx);

      await updateIosCredentialsAsync(ctx, app, targets, IosDistributionType.AppStore);
      const certP12 = await fs.readFile('./cert.p12', 'base64');
@@ -234,7 +238,7 @@ describe('update credentials.json', () => {
          ),
        },
      });
-      const app = getAppFromContext(ctx);
+      const app = await getAppFromContextAsync(ctx);

      await updateIosCredentialsAsync(ctx, app, targets, IosDistributionType.AppStore);

@@ -274,7 +278,7 @@ describe('update credentials.json', () => {
        './pprofile': 'somebinarycontent',
        './cert.p12': 'somebinarycontent2',
      });
-      const app = getAppFromContext(ctx);
+      const app = await getAppFromContextAsync(ctx);
      try {
        await updateIosCredentialsAsync(ctx, app, targets, IosDistributionType.AppStore);
        throw new Error('updateIosCredentialsAsync should throw na error');
@@ -13,7 +13,7 @@ import { selectAsync } from '../../prompts';
 import { CredentialsContext } from '../context';
 import * as credentialsJsonReader from '../credentialsJson/read';
 import { ensureAllTargetsAreConfigured } from '../credentialsJson/utils';
-import { getAppFromContext } from './actions/BuildCredentialsUtils';
+import { getAppFromContextAsync } from './actions/BuildCredentialsUtils';
 import { SetUpBuildCredentials } from './actions/SetUpBuildCredentials';
 import { SetUpPushKey } from './actions/SetUpPushKey';
 import { App, IosCredentials, Target } from './types';
@@ -84,7 +84,7 @@ export default class IosCredentialsProvider {
    }

    const applicationTarget = findApplicationTarget(targets);
-    const app = getAppFromContext(ctx);
+    const app = await getAppFromContextAsync(ctx);
    const appLookupParams = {
      ...app,
      bundleIdentifier: applicationTarget.bundleIdentifier,
@@ -2,8 +2,10 @@ import { CredentialsSource } from '@expo/eas-json';
 import { vol } from 'memfs';

 import { IosAppBuildCredentialsFragment } from '../../../graphql/generated';
+import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../project/ios/target';
 import { getAppstoreMock } from '../../__tests__/fixtures-appstore';
+import { testAppQueryByIdResponse } from '../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../__tests__/fixtures-context';
 import {
  getNewIosApiMock,
@@ -11,7 +13,7 @@ import {
  testTargets,
 } from '../../__tests__/fixtures-ios';
 import IosCredentialsProvider from '../IosCredentialsProvider';
-import { getAppLookupParamsFromContext } from '../actions/BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../actions/BuildCredentialsUtils';

 jest.mock('fs');
 jest.mock('../validators/validateProvisioningProfile', () => ({
@@ -29,12 +31,16 @@ jest.mock('../validators/validateProvisioningProfile', () => ({
  },
 }));
 jest.mock('../../../project/ios/bundleIdentifier');
+jest.mock('../../../graphql/queries/AppQuery');

 beforeEach(() => {
  vol.reset();
 });

 describe(IosCredentialsProvider, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  describe('#getCredentialsAsync', () => {
    describe('remote credentials', () => {
      it('throws an error if credentials do not exist', async () => {
@@ -47,7 +53,7 @@ describe(IosCredentialsProvider, () => {
            getIosAppCredentialsWithBuildCredentialsAsync: jest.fn(() => null),
          },
        });
-        const appLookupParams = getAppLookupParamsFromContext(
+        const appLookupParams = await getAppLookupParamsFromContextAsync(
          ctx,
          findApplicationTarget(testTargets)
        );
@@ -90,7 +96,7 @@ describe(IosCredentialsProvider, () => {
            ),
          },
        });
-        const appLookupParams = getAppLookupParamsFromContext(
+        const appLookupParams = await getAppLookupParamsFromContextAsync(
          ctx,
          findApplicationTarget(testTargets)
        );
@@ -7,8 +7,7 @@ import {
  IosDistributionType as GraphQLIosDistributionType,
  IosAppBuildCredentialsFragment,
 } from '../../../graphql/generated';
-import { getProjectAccountName } from '../../../project/projectUtils';
-import { findAccountByName } from '../../../user/Account';
+import { getOwnerAccountForProjectIdAsync, getProjectIdAsync } from '../../../project/projectUtils';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { App, Target } from '../types';
@@ -82,24 +81,21 @@ export async function assignBuildCredentialsAsync(
  });
 }

-export function getAppFromContext(ctx: CredentialsContext): App {
+export async function getAppFromContextAsync(ctx: CredentialsContext): Promise<App> {
  ctx.ensureProjectContext();
  const projectName = ctx.exp.slug;
-  const accountName = getProjectAccountName(ctx.exp, ctx.user);
-  const account = findAccountByName(ctx.user.accounts, accountName);
-  if (!account) {
-    throw new Error(`You do not have access to account: ${accountName}`);
-  }
+  const projectId = await getProjectIdAsync(ctx.exp, { nonInteractive: ctx.nonInteractive });
+  const account = await getOwnerAccountForProjectIdAsync(projectId);
  return {
    account,
    projectName,
  };
 }

-export function getAppLookupParamsFromContext(
+export async function getAppLookupParamsFromContextAsync(
  ctx: CredentialsContext,
  target: Target
-): AppLookupParams {
-  const app = getAppFromContext(ctx);
+): Promise<AppLookupParams> {
+  const app = await getAppFromContextAsync(ctx);
  return { ...app, bundleIdentifier: target.bundleIdentifier };
 }
@@ -1,16 +1,25 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { testAscApiKeyFragment, testTargets } from '../../../__tests__/fixtures-ios';
 import { AppStoreApiKeyPurpose } from '../AscApiKeyUtils';
 import { AssignAscApiKey } from '../AssignAscApiKey';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
+jest.mock('../../../../graphql/queries/AppQuery');

 describe(AssignAscApiKey, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('assigns an App Store Connect API Key in Interactive Mode for EAS Submit', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const assignAscApiKeyAction = new AssignAscApiKey(appLookupParams);
    await assignAscApiKeyAction.runAsync(
      ctx,
@@ -26,7 +35,10 @@ describe(AssignAscApiKey, () => {
    const ctx = createCtxMock({
      nonInteractive: true,
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const assignAscApiKeyAction = new AssignAscApiKey(appLookupParams);
    await assignAscApiKeyAction.runAsync(
      ctx,
@@ -1,15 +1,25 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { testPushKey, testTargets } from '../../../__tests__/fixtures-ios';
 import { AssignPushKey } from '../AssignPushKey';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
+
+jest.mock('../../../../graphql/queries/AppQuery');

 describe(AssignPushKey, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('assigns a push key in Interactive Mode', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const assignPushKeyAction = new AssignPushKey(appLookupParams);
    await assignPushKeyAction.runAsync(ctx, testPushKey);

@@ -21,7 +31,10 @@ describe(AssignPushKey, () => {
    const ctx = createCtxMock({
      nonInteractive: true,
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const assignPushKeyAction = new AssignPushKey(appLookupParams);
    await assignPushKeyAction.runAsync(ctx, testPushKey);

@@ -1,6 +1,8 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import {
  testDistCertFragmentNoDependencies,
@@ -10,14 +12,18 @@ import {
  testTargets,
 } from '../../../__tests__/fixtures-ios';
 import { MissingCredentialsNonInteractiveError } from '../../../errors';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { ConfigureProvisioningProfile } from '../ConfigureProvisioningProfile';

 jest.mock('../../../../ora');
 jest.mock('../../../../prompts');
 jest.mocked(confirmAsync).mockImplementation(async () => true);
+jest.mock('../../../../graphql/queries/AppQuery');

 describe('ConfigureProvisioningProfile', () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('configures a Provisioning Profile in Interactive Mode', async () => {
    const mockProvisioningProfileFromApple = {
      provisioningProfileId: testProvisioningProfileFragment.developerPortalIdentifier,
@@ -34,7 +40,10 @@ describe('ConfigureProvisioningProfile', () => {
        useExistingProvisioningProfileAsync: jest.fn(() => mockProvisioningProfileFromApple),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const provProfConfigurator = new ConfigureProvisioningProfile(
      appLookupParams,
      testTarget,
@@ -52,7 +61,10 @@ describe('ConfigureProvisioningProfile', () => {
    const ctx = createCtxMock({
      nonInteractive: true,
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const provProfConfigurator = new ConfigureProvisioningProfile(
      appLookupParams,
      testTarget,
@@ -1,16 +1,22 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { testAscApiKey, testTargets } from '../../../__tests__/fixtures-ios';
 import { AppStoreApiKeyPurpose } from '../AscApiKeyUtils';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { CreateAscApiKey } from '../CreateAscApiKey';

 jest.mock('../../../../prompts');
 jest.mocked(confirmAsync).mockImplementation(async () => true);
+jest.mock('../../../../graphql/queries/AppQuery');

 describe(CreateAscApiKey, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('creates a App Store API Key in Interactive Mode', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -21,7 +27,10 @@ describe(CreateAscApiKey, () => {
        createAscApiKeyAsync: jest.fn(() => testAscApiKey),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const createAscApiKeyAction = new CreateAscApiKey(appLookupParams.account);
    await createAscApiKeyAction.runAsync(ctx, AppStoreApiKeyPurpose.SUBMISSION_SERVICE);

@@ -34,7 +43,10 @@ describe(CreateAscApiKey, () => {
    const ctx = createCtxMock({
      nonInteractive: true,
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const createAscApiKeyAction = new CreateAscApiKey(appLookupParams.account);
    await expect(
      createAscApiKeyAction.runAsync(ctx, AppStoreApiKeyPurpose.SUBMISSION_SERVICE)
@@ -1,6 +1,8 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import {
  testDistCertFragmentNoDependencies,
@@ -9,13 +11,17 @@ import {
  testTargets,
 } from '../../../__tests__/fixtures-ios';
 import { MissingCredentialsNonInteractiveError } from '../../../errors';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { CreateProvisioningProfile } from '../CreateProvisioningProfile';

 jest.mock('../../../../prompts');
 jest.mocked(confirmAsync).mockImplementation(async () => true);
+jest.mock('../../../../graphql/queries/AppQuery');

 describe('CreateProvisioningProfile', () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('creates a Provisioning Profile in Interactive Mode', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -26,7 +32,10 @@ describe('CreateProvisioningProfile', () => {
        createProvisioningProfileAsync: jest.fn(() => testProvisioningProfile),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const createProvProfAction = new CreateProvisioningProfile(
      appLookupParams,
      testTarget,
@@ -43,7 +52,10 @@ describe('CreateProvisioningProfile', () => {
    const ctx = createCtxMock({
      nonInteractive: true,
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const createProvProfAction = new CreateProvisioningProfile(
      appLookupParams,
      testTarget,
@@ -1,15 +1,21 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { testTargets } from '../../../__tests__/fixtures-ios';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { CreatePushKey } from '../CreatePushKey';

 jest.mock('../../../../prompts');
 jest.mocked(confirmAsync).mockImplementation(async () => true);
+jest.mock('../../../../graphql/queries/AppQuery');

 describe(CreatePushKey, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('creates a Push Key in Interactive Mode', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -19,7 +25,10 @@ describe(CreatePushKey, () => {
        authCtx: testAuthCtx,
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const createPushKeyAction = new CreatePushKey(appLookupParams.account);
    await createPushKeyAction.runAsync(ctx);

@@ -32,7 +41,10 @@ describe(CreatePushKey, () => {
    const ctx = createCtxMock({
      nonInteractive: true,
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const createPushKeyAction = new CreatePushKey(appLookupParams.account);
    await expect(createPushKeyAction.runAsync(ctx)).rejects.toThrowError();
  });
@@ -1,21 +1,30 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import {
  testDistCertFragmentNoDependencies,
  testDistCertFragmentOneDependency,
  testTargets,
 } from '../../../__tests__/fixtures-ios';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { RemoveDistributionCertificate } from '../RemoveDistributionCertificate';

 jest.mock('../../../../prompts');
 jest.mocked(confirmAsync).mockImplementation(async () => true);
+jest.mock('../../../../graphql/queries/AppQuery');

 describe('RemoveDistributionCertificate', () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('deletes the distribution certificate on Expo and Apple servers when there are no App Dependencies in Interactive Mode', async () => {
    const ctx = createCtxMock({ nonInteractive: false });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const removeDistCertAction = new RemoveDistributionCertificate(
      appLookupParams.account,
      testDistCertFragmentNoDependencies
@@ -31,7 +40,10 @@ describe('RemoveDistributionCertificate', () => {
  });
  it('deletes the distribution certificate on Expo servers when there are no App Dependencies in Non-Interactive Mode', async () => {
    const ctx = createCtxMock({ nonInteractive: true });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const removeDistCertAction = new RemoveDistributionCertificate(
      appLookupParams.account,
      testDistCertFragmentNoDependencies
@@ -47,7 +59,10 @@ describe('RemoveDistributionCertificate', () => {
  });
  it('deletes the distribution certificate and its provisioning profile on Expo and Apple servers when there are App Dependencies in Interactive Mode', async () => {
    const ctx = createCtxMock({ nonInteractive: false });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const removeDistCertAction = new RemoveDistributionCertificate(
      appLookupParams.account,
      testDistCertFragmentOneDependency
@@ -63,7 +78,10 @@ describe('RemoveDistributionCertificate', () => {
  });
  it('errors when the distribution certificate has App Dependencies in Non-Interactive Mode', async () => {
    const ctx = createCtxMock({ nonInteractive: true });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const removeDistCertAction = new RemoveDistributionCertificate(
      appLookupParams.account,
      testDistCertFragmentOneDependency
@@ -1,13 +1,23 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { testTargets } from '../../../__tests__/fixtures-ios';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { RemoveProvisioningProfiles } from '../RemoveProvisioningProfile';

+jest.mock('../../../../graphql/queries/AppQuery');
+
 describe('RemoveProvisioningProfile', () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('Basic Case', async () => {
    const ctx = createCtxMock();
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const testProvisioningProfile = {
      id: 'test-id',
      developerPortalIdentifier: 'test-developer-portal-identifier',
@@ -1,6 +1,8 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync, promptAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import {
  getNewIosApiMock,
@@ -10,13 +12,17 @@ import {
  testTargets,
 } from '../../../__tests__/fixtures-ios';
 import { AppStoreApiKeyPurpose } from '../AscApiKeyUtils';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { SetUpAscApiKey, SetupAscApiKeyChoice } from '../SetUpAscApiKey';

 jest.mock('../../../../prompts');
 jest.mocked(confirmAsync).mockImplementation(async () => true);
+jest.mock('../../../../graphql/queries/AppQuery');

 describe(SetUpAscApiKey, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('skips setting up a ASC API Key if it is already configured', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -27,7 +33,10 @@ describe(SetUpAscApiKey, () => {
        ),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupAscApiKeyAction = new SetUpAscApiKey(
      appLookupParams,
      AppStoreApiKeyPurpose.SUBMISSION_SERVICE
@@ -52,7 +61,10 @@ describe(SetUpAscApiKey, () => {
        createAscApiKeyAsync: jest.fn(() => testAscApiKeyFragment),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupAscApiKeyAction = new SetUpAscApiKey(
      appLookupParams,
      AppStoreApiKeyPurpose.SUBMISSION_SERVICE
@@ -78,7 +90,10 @@ describe(SetUpAscApiKey, () => {
        getAscApiKeysForAccountAsync: jest.fn(() => [testAscApiKeyFragment]),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupAscApiKeyAction = new SetUpAscApiKey(
      appLookupParams,
      AppStoreApiKeyPurpose.SUBMISSION_SERVICE
@@ -102,7 +117,10 @@ describe(SetUpAscApiKey, () => {
      choice: SetupAscApiKeyChoice.USE_EXISTING,
      chosenAscApiKey: testAscApiKeyFragment,
    }));
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupAscApiKeyAction = new SetUpAscApiKey(
      appLookupParams,
      AppStoreApiKeyPurpose.SUBMISSION_SERVICE
@@ -124,7 +142,10 @@ describe(SetUpAscApiKey, () => {
        ),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupAscApiKeyAction = new SetUpAscApiKey(
      appLookupParams,
      AppStoreApiKeyPurpose.SUBMISSION_SERVICE
@@ -135,7 +156,10 @@ describe(SetUpAscApiKey, () => {
    const ctx = createCtxMock({
      nonInteractive: true,
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const createAscApiKeyAction = new SetUpAscApiKey(
      appLookupParams,
      AppStoreApiKeyPurpose.SUBMISSION_SERVICE
@@ -1,9 +1,11 @@
 import nullthrows from 'nullthrows';

 import { IosDistributionType } from '../../../../graphql/generated';
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import {
  getNewIosApiMock,
@@ -15,7 +17,7 @@ import {
 } from '../../../__tests__/fixtures-ios';
 import { MissingCredentialsNonInteractiveError } from '../../../errors';
 import { validateProvisioningProfileAsync } from '../../validators/validateProvisioningProfile';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { SetUpProvisioningProfile } from '../SetUpProvisioningProfile';

 jest.mock('../../../../prompts');
@@ -24,8 +26,12 @@ jest.mock('../SetUpDistributionCertificate');
 jest.mock('../ConfigureProvisioningProfile');
 jest.mock('../CreateProvisioningProfile');
 jest.mock('../../validators/validateProvisioningProfile');
+jest.mock('../../../../graphql/queries/AppQuery');

 describe('SetUpProvisioningProfile', () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('repairs existing Provisioning Profile with bad build credentials in Interactive Mode', async () => {
    jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => false);
    const ctx = createCtxMock({
@@ -53,7 +59,10 @@ describe('SetUpProvisioningProfile', () => {
        ),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
      appLookupParams,
      testTarget,
@@ -86,7 +95,10 @@ describe('SetUpProvisioningProfile', () => {
        createOrGetExistingAppleAppIdentifierAsync: jest.fn(() => testAppleAppIdentifierFragment),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
      appLookupParams,
      testTarget,
@@ -119,7 +131,10 @@ describe('SetUpProvisioningProfile', () => {
        createOrGetExistingAppleAppIdentifierAsync: jest.fn(() => testAppleAppIdentifierFragment),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
      appLookupParams,
      testTarget,
@@ -148,7 +163,10 @@ describe('SetUpProvisioningProfile', () => {
        createOrGetExistingAppleAppIdentifierAsync: jest.fn(() => testAppleAppIdentifierFragment),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
      appLookupParams,
      testTarget,
@@ -168,7 +186,10 @@ describe('SetUpProvisioningProfile', () => {
    const ctx = createCtxMock({
      nonInteractive: true,
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupProvisioningProfileAction = new SetUpProvisioningProfile(
      appLookupParams,
      testTarget,
@@ -1,15 +1,21 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getNewIosApiMock, testPushKey, testTargets } from '../../../__tests__/fixtures-ios';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { SetUpPushKey } from '../SetUpPushKey';

 jest.mock('../../../../prompts');
 jest.mocked(confirmAsync).mockImplementation(async () => true);
+jest.mock('../../../../graphql/queries/AppQuery');

 describe(SetUpPushKey, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('skips setting up a Push Key if it is already configured', async () => {
    const ctx = createCtxMock({
      nonInteractive: false,
@@ -18,7 +24,10 @@ describe(SetUpPushKey, () => {
        getPushKeyForAppAsync: jest.fn(() => testPushKey),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupPushKeyAction = new SetUpPushKey(appLookupParams);
    await setupPushKeyAction.runAsync(ctx);

@@ -36,7 +45,10 @@ describe(SetUpPushKey, () => {
        getPushKeysForAccountAsync: jest.fn(() => []),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupPushKeyAction = new SetUpPushKey(appLookupParams);
    await setupPushKeyAction.runAsync(ctx);

@@ -60,7 +72,10 @@ describe(SetUpPushKey, () => {
        getPushKeysForAccountAsync: jest.fn(() => [testPushKey]),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupPushKeyAction = new SetUpPushKey(appLookupParams);
    await setupPushKeyAction.runAsync(ctx);

@@ -73,7 +88,10 @@ describe(SetUpPushKey, () => {
    const ctx = createCtxMock({
      nonInteractive: true,
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const createPushKeyAction = new SetUpPushKey(appLookupParams);
    await expect(createPushKeyAction.runAsync(ctx)).rejects.toThrowError();
  });
@@ -1,12 +1,14 @@
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync, promptAsync } from '../../../../prompts';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import {
  getNewIosApiMock,
  testCommonIosAppCredentialsFragment,
  testTargets,
 } from '../../../__tests__/fixtures-ios';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { SetUpAscApiKey } from '../SetUpAscApiKey';
 import {
  PROMPT_FOR_APP_SPECIFIC_PASSWORD,
@@ -15,8 +17,12 @@ import {

 jest.mock('../../../../prompts');
 jest.mocked(confirmAsync).mockImplementation(async () => true);
+jest.mock('../../../../graphql/queries/AppQuery');

 describe(SetUpSubmissionCredentials, () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  it('allows user to enter an App Specific Password', async () => {
    jest
      .mocked(promptAsync)
@@ -32,7 +38,10 @@ describe(SetUpSubmissionCredentials, () => {
        ...getNewIosApiMock(),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupAscApiKeyAction = new SetUpSubmissionCredentials(appLookupParams);
    const asp = await setupAscApiKeyAction.runAsync(ctx);

@@ -46,7 +55,7 @@ describe(SetUpSubmissionCredentials, () => {
        .spyOn(SetUpAscApiKey.prototype, 'runAsync')
        .mockImplementation(async _ctx => testCommonIosAppCredentialsFragment);
      const ctx = createCtxMock();
-      const appLookupParams = getAppLookupParamsFromContext(
+      const appLookupParams = await getAppLookupParamsFromContextAsync(
        ctx,
        findApplicationTarget(testTargets)
      );
@@ -1,6 +1,8 @@
 import { IosDistributionType } from '../../../../graphql/generated';
+import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
+import { testAppQueryByIdResponse } from '../../../__tests__/fixtures-constants';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import {
  getNewIosApiMock,
@@ -13,11 +15,12 @@ import {
  testTargets,
 } from '../../../__tests__/fixtures-ios';
 import { IosTargetCredentials } from '../../../credentialsJson/types';
-import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
+import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { SetUpTargetBuildCredentialsFromCredentialsJson } from '../SetUpTargetBuildCredentialsFromCredentialsJson';

 jest.mock('../../../../prompts');
 jest.mock('../../../credentialsJson/read');
+jest.mock('../../../../graphql/queries/AppQuery');

 beforeEach(() => {
  jest.mocked(confirmAsync).mockReset();
@@ -25,6 +28,9 @@ beforeEach(() => {
 });

 describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
+  beforeEach(() => {
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue(testAppQueryByIdResponse);
+  });
  const targetCredentials: IosTargetCredentials = {
    distributionCertificate: {
      certificateP12: testDistCert.certP12,
@@ -50,7 +56,10 @@ describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
        createOrUpdateIosAppBuildCredentialsAsync: jest.fn(() => testBuildCreds),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupBuildCredentialsFromCredentialsJsonAction =
      new SetUpTargetBuildCredentialsFromCredentialsJson(
        appLookupParams,
@@ -81,7 +90,10 @@ describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
        ),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupBuildCredentialsFromCredentialsJsonAction =
      new SetUpTargetBuildCredentialsFromCredentialsJson(
        appLookupParams,
@@ -116,7 +128,10 @@ describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
        createOrUpdateIosAppBuildCredentialsAsync: jest.fn(() => testBuildCreds),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupBuildCredentialsFromCredentialsJsonAction =
      new SetUpTargetBuildCredentialsFromCredentialsJson(
        appLookupParams,
@@ -152,7 +167,10 @@ describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
        createOrUpdateIosAppBuildCredentialsAsync: jest.fn(() => testBuildCreds),
      },
    });
-    const appLookupParams = getAppLookupParamsFromContext(ctx, findApplicationTarget(testTargets));
+    const appLookupParams = await getAppLookupParamsFromContextAsync(
+      ctx,
+      findApplicationTarget(testTargets)
+    );
    const setupBuildCredentialsFromCredentialsJsonAction =
      new SetUpTargetBuildCredentialsFromCredentialsJson(
        appLookupParams,
@@ -4,7 +4,7 @@ import assert from 'assert';

 import Log, { learnMore } from '../../log';
 import { GradleBuildContext, resolveGradleBuildContextAsync } from '../../project/android/gradle';
-import { getProjectAccountName, getProjectIdAsync } from '../../project/projectUtils';
+import { getOwnerAccountForProjectIdAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { findAccountByName } from '../../user/Account';
 import { ensureActorHasUsername, ensureLoggedInAsync } from '../../user/actions';
@@ -57,11 +57,19 @@ export class ManageAndroid {
      : null;
    const ctx = new CredentialsContext({
      projectDir: process.cwd(),
-      user: await ensureLoggedInAsync(),
+      // this command is interactive by design
+      user: await ensureLoggedInAsync({ nonInteractive: false }),
      env: buildProfile?.env,
+      nonInteractive: false,
    });
+
+    const getAccountNameForProjectAsync = async (): Promise<string> => {
+      const projectId = await getProjectIdAsync(ctx.exp, { nonInteractive: false });
+      return (await getOwnerAccountForProjectIdAsync(projectId)).name;
+    };
+
    const accountName = ctx.hasProjectContext
-      ? getProjectAccountName(ctx.exp, ctx.user)
+      ? await getAccountNameForProjectAsync()
      : ensureActorHasUsername(ctx.user);
    const account = findAccountByName(ctx.user.accounts, accountName);
    if (!account) {
@@ -149,7 +157,7 @@ export class ManageAndroid {
    assert(ctx.hasProjectContext, 'createProjectContextAsync: must have project context.');

    // ensure the project exists on the EAS server
-    await getProjectIdAsync(ctx.exp);
+    await getProjectIdAsync(ctx.exp, { nonInteractive: ctx.nonInteractive });

    return await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
  }
Author	SHA1	Message	Date
Will Schurman	7e154ec9dc	[3/n][eas-cli] getUsername -> getUsernameForActor	2022-09-19 15:32:16 -07:00
Will Schurman	811568737b	[6/n][eas-cli] Clean up some remaining project utils methods (#1373 )	2022-09-19 15:31:07 -07:00
Will Schurman	36b5e0cee8	[5/n][eas-cli] Remove getProjectFullNameAsync (#1372 )	2022-09-19 15:28:34 -07:00
Will Schurman	8681437081	[4/n][eas-cli] Remove getProjectAccountName (#1371 )	2022-09-19 15:26:41 -07:00
Will Schurman	3e79916462	[2/n][eas-cli] Remove rest of getProjectAccountNameAsync callsites (#1369 )	2022-09-19 15:24:13 -07:00
Will Schurman	0613b6c2cd	[eas-cli][1/n] Remove some of getProjectAccountNameAsync (#1368 )	2022-09-19 15:22:42 -07:00
kirb	63ed6f2b4e	[eas-cli] Use confirmation when canceling builds (#1366 )	2022-09-19 09:37:47 -07:00
Will Schurman	9985d618ef	[eas-cli] Make optional nonInteractive arguments non-optional in utility functions (#1367 )	2022-09-19 08:59:35 -07:00
Szymon Dziedzic	46c0ee6423	[eas-cli][ENG-6325] provide suggestions for developers when archive size is large (#1363 ) * [eas-cli] provide suggestions for developers when archive size is large * use learn more function * apply suggestion from review * apply suggestions from code review * update CHANGELOG.md	2022-09-19 10:23:26 +02:00
Will Schurman	5585874c21	[eas-cli] Prompt before configuring EAS project (#1356 )	2022-09-16 13:00:26 -07:00
kirb	b288c31216	[eas-cli] add pagination for build queries (#1353 )	2022-09-16 11:43:57 -07:00
kirb	738c8a21c8	[eas-cli] Add pagination to channel commands (#1352 )	2022-09-16 11:32:57 -07:00
Dominik SokalandJuwan Wheatley	ff5669ff30	[ENG-4730] support uploading files to EAS Secret (#1354 ) * regenerate graphql code * add support for uploading secret files to EAS Secret * address PR feedback * address PR feedback * regenerate graphql code * Update packages/eas-cli/src/commands/secret/create.ts Co-authored-by: Juwan Wheatley <[email protected]> * address PR feedback * address PR feedback * update CHANGELOG.md Co-authored-by: Juwan Wheatley <[email protected]>	2022-09-16 15:47:22 +02:00
kirb	fdf64a8673	[eas-cli] Standardize GQL Update type schema using Fragment (#1348 )	2022-09-14 17:00:06 -07:00
kirb	2c7b442f06	[eas-cli] use paginated query API for update commands (#1323 )	2022-09-14 16:49:46 -07:00