firebase-tools 14.2.2 → 14.3.1

package/lib/api.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cloudRunApiOrigin = exports.hostingApiOrigin = exports.firebaseStorageOrigin = exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.remoteConfigApiOrigin = exports.rtdbMetadataOrigin = exports.rtdbManagementOrigin = exports.realtimeOrigin = exports.extensionsTOSOrigin = exports.extensionsPublisherOrigin = exports.extensionsOrigin = exports.iamOrigin = exports.identityOrigin = exports.hostingOrigin = exports.googleOrigin = exports.pubsubOrigin = exports.cloudTasksOrigin = exports.cloudschedulerOrigin = exports.cloudbuildOrigin = exports.functionsDefaultRegion = exports.runOrigin = exports.functionsV2Origin = exports.functionsOrigin = exports.firestoreOrigin = exports.firestoreOriginOrEmulator = exports.firedataOrigin = exports.firebaseExtensionsRegistryOrigin = exports.firebaseApiOrigin = exports.eventarcOrigin = exports.dynamicLinksKey = exports.dynamicLinksOrigin = exports.consoleOrigin = exports.authOrigin = exports.apphostingGitHubAppInstallationURL = exports.apphostingP4SADomain = exports.apphostingOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = exports.developerConnectP4SADomain = exports.developerConnectOrigin = exports.containerRegistryDomain = exports.cloudMonitoringOrigin = exports.cloudloggingOrigin = exports.cloudbillingOrigin = exports.clientSecret = exports.clientId = exports.authProxyOrigin = void 0;
-exports.setScopes = exports.getScopes = exports.vertexAIOrigin = exports.cloudSQLAdminOrigin = exports.dataConnectLocalConnString = exports.dataconnectP4SADomain = exports.dataconnectOrigin = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = exports.serviceUsageOrigin = void 0;
+exports.hostingApiOrigin = exports.firebaseStorageOrigin = exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.remoteConfigApiOrigin = exports.rtdbMetadataOrigin = exports.rtdbManagementOrigin = exports.realtimeOrigin = exports.extensionsTOSOrigin = exports.extensionsPublisherOrigin = exports.extensionsOrigin = exports.iamOrigin = exports.identityOrigin = exports.hostingOrigin = exports.googleOrigin = exports.pubsubOrigin = exports.cloudTasksOrigin = exports.cloudschedulerOrigin = exports.cloudCompanionOrigin = exports.cloudbuildOrigin = exports.functionsDefaultRegion = exports.runOrigin = exports.functionsV2Origin = exports.functionsOrigin = exports.firestoreOrigin = exports.firestoreOriginOrEmulator = exports.firedataOrigin = exports.firebaseExtensionsRegistryOrigin = exports.firebaseApiOrigin = exports.eventarcOrigin = exports.dynamicLinksKey = exports.dynamicLinksOrigin = exports.consoleOrigin = exports.authOrigin = exports.apphostingGitHubAppInstallationURL = exports.apphostingP4SADomain = exports.apphostingOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = exports.developerConnectP4SADomain = exports.developerConnectOrigin = exports.containerRegistryDomain = exports.cloudMonitoringOrigin = exports.cloudloggingOrigin = exports.cloudbillingOrigin = exports.clientSecret = exports.clientId = exports.authProxyOrigin = void 0;
+exports.setScopes = exports.getScopes = exports.vertexAIOrigin = exports.cloudSQLAdminOrigin = exports.dataConnectLocalConnString = exports.dataconnectP4SADomain = exports.dataconnectOrigin = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = exports.serviceUsageOrigin = exports.cloudRunApiOrigin = void 0;
 const constants_1 = require("./emulator/constants");
 const logger_1 = require("./logger");
 const scopes = require("./scopes");
@@ -70,6 +70,8 @@ const functionsDefaultRegion = () => utils.envOverride("FIREBASE_FUNCTIONS_DEFAU
 exports.functionsDefaultRegion = functionsDefaultRegion;
 const cloudbuildOrigin = () => utils.envOverride("FIREBASE_CLOUDBUILD_URL", "https://cloudbuild.googleapis.com");
 exports.cloudbuildOrigin = cloudbuildOrigin;
+const cloudCompanionOrigin = () => utils.envOverride("CLOUD_COMPANION_URL", "https://cloudaicompanion.googleapis.com");
+exports.cloudCompanionOrigin = cloudCompanionOrigin;
 const cloudschedulerOrigin = () => utils.envOverride("FIREBASE_CLOUDSCHEDULER_URL", "https://cloudscheduler.googleapis.com");
 exports.cloudschedulerOrigin = cloudschedulerOrigin;
 const cloudTasksOrigin = () => utils.envOverride("FIREBASE_CLOUD_TAKS_URL", "https://cloudtasks.googleapis.com");

package/lib/apphosting/backend.js

@@ -62,21 +62,14 @@ async function doSetup(projectId, webAppName, serviceAccount) {
     await ensureAppHostingComputeServiceAccount(projectId, serviceAccount);
     const location = await promptLocation(projectId, "Select a primary region to host your backend:\n");
     const gitRepositoryLink = await githubConnections.linkGitHubRepository(projectId, location);
-    const rootDir = await (0, prompt_1.promptOnce)({
-        name: "rootDir",
-        type: "input",
+    const rootDir = await (0, prompt_1.input)({
         default: "/",
         message: "Specify your app's root directory relative to your repository",
     });
     const branch = await githubConnections.promptGitHubBranch(gitRepositoryLink);
     (0, utils_1.logSuccess)(`Repo linked successfully!\n`);
     (0, utils_1.logBullet)(`${clc.yellow("===")} Set up your backend`);
-    const backendId = await promptNewBackendId(projectId, location, {
-        name: "backendId",
-        type: "input",
-        default: "my-web-app",
-        message: "Provide a name for your backend [1-30 characters]",
-    });
+    const backendId = await promptNewBackendId(projectId, location);
     (0, utils_1.logSuccess)(`Name set to ${backendId}\n`);
     const webApp = await app_1.webApps.getOrCreateWebApp(projectId, webAppName, backendId);
     if (!webApp) {
@@ -86,9 +79,7 @@ async function doSetup(projectId, webAppName, serviceAccount) {
     const backend = await createBackend(projectId, location, backendId, gitRepositoryLink, serviceAccount, webApp === null || webApp === void 0 ? void 0 : webApp.id, rootDir);
     createBackendSpinner.succeed(`Successfully created backend!\n\t${backend.name}\n`);
     await setDefaultTrafficPolicy(projectId, location, backendId, branch);
-    const confirmRollout = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        name: "rollout",
+    const confirmRollout = await (0, prompt_1.confirm)({
         default: true,
         message: "Do you want to deploy now?",
     });
@@ -158,9 +149,13 @@ async function ensureAppHostingComputeServiceAccount(projectId, serviceAccount)
     }
 }
 exports.ensureAppHostingComputeServiceAccount = ensureAppHostingComputeServiceAccount;
-async function promptNewBackendId(projectId, location, prompt) {
+async function promptNewBackendId(projectId, location) {
     while (true) {
-        const backendId = await (0, prompt_1.promptOnce)(prompt);
+        const backendId = await (0, prompt_1.input)({
+            default: "my-web-app",
+            message: "Provide a name for your backend [1-30 characters]",
+            validate: (s) => s.length >= 1 && s.length <= 30,
+        });
         try {
             await apphosting.getBackend(projectId, location, backendId);
         }
@@ -230,9 +225,7 @@ async function promptLocation(projectId, prompt = "Please select a location:") {
     if (allowedLocations.length === 1) {
         return allowedLocations[0];
     }
-    const location = (await (0, prompt_1.promptOnce)({
-        name: "location",
-        type: "list",
+    const location = (await (0, prompt_1.select)({
         default: constants_1.DEFAULT_LOCATION,
         message: prompt,
         choices: allowedLocations,
@@ -273,9 +266,7 @@ async function chooseBackends(projectId, backendId, chooseBackendPrompt, force)
         const { location, id } = apphosting.parseBackendName(backend.name);
         backendsByDisplay.set(`${id}(${location})`, backend);
     });
-    const chosenBackendDisplays = await (0, prompt_1.promptOnce)({
-        name: "backend",
-        type: "checkbox",
+    const chosenBackendDisplays = await (0, prompt_1.checkbox)({
         message: chooseBackendPrompt,
         choices: Array.from(backendsByDisplay.keys(), (name) => {
             return {
@@ -313,9 +304,7 @@ async function getBackendForAmbiguousLocation(projectId, backendId, locationDisa
     }
     const backendsByLocation = new Map();
     backends.forEach((backend) => backendsByLocation.set(apphosting.parseBackendName(backend.name).location, backend));
-    const location = await (0, prompt_1.promptOnce)({
-        name: "location",
-        type: "list",
+    const location = await (0, prompt_1.select)({
         message: locationDisambugationPrompt,
         choices: [...backendsByLocation.keys()],
     });

package/lib/apphosting/config.js

@@ -113,7 +113,7 @@ async function maybeAddSecretToYaml(secretName, fileName = exports.APPHOSTING_BA
         return;
     }
     if (!path) {
-        path = await prompt.promptOnce({
+        path = await prompt.input({
             message: `It looks like you don't have an ${fileName} yet. Where would you like to store it?`,
             default: process.cwd(),
         });
@@ -127,8 +127,8 @@ async function maybeAddSecretToYaml(secretName, fileName = exports.APPHOSTING_BA
     dynamicDispatch.store(path, projectYaml);
 }
 exports.maybeAddSecretToYaml = maybeAddSecretToYaml;
-async function maybeGenerateEmulatorYaml(projectId, repoRoot) {
-    const basePath = dynamicDispatch.discoverBackendRoot(repoRoot) || repoRoot;
+async function maybeGenerateEmulatorYaml(projectId, backendRoot) {
+    const basePath = dynamicDispatch.discoverBackendRoot(backendRoot) || backendRoot;
     if (fs.fileExistsSync((0, path_1.join)(basePath, exports.APPHOSTING_EMULATORS_YAML_FILE))) {
         logger_1.logger.debug("apphosting.emulator.yaml already exists, skipping generation and secrets access prompt");
         return null;
@@ -174,12 +174,9 @@ async function overrideChosenEnv(projectId, env) {
     if (!names.length) {
         return {};
     }
-    const toOverwrite = await prompt.promptOnce({
-        type: "checkbox",
+    const toOverwrite = await prompt.checkbox({
         message: "Which environment variables would you like to override?",
-        choices: names.map((name) => {
-            return { name };
-        }),
+        choices: names,
     });
     if (!projectId && toOverwrite.some((name) => "secret" in env[name])) {
         throw new error_1.FirebaseError(`Need a project ID to overwrite a secret. Either use ${clc.bold("firebase use")} or pass the ${clc.bold("--project")} flag`);
@@ -187,24 +184,19 @@ async function overrideChosenEnv(projectId, env) {
     const newEnv = {};
     for (const name of toOverwrite) {
         if ("value" in env[name]) {
-            const newValue = await prompt.promptOnce({
-                type: "input",
-                message: `What new value would you like for plaintext ${name}?`,
-            });
+            const newValue = await prompt.input(`What new value would you like for plaintext ${name}?`);
             newEnv[name] = { variable: name, value: newValue };
             continue;
         }
         let secretRef;
         let action = "pick-new";
         while (action === "pick-new") {
-            secretRef = await prompt.promptOnce({
-                type: "input",
+            secretRef = await prompt.input({
                 message: `What would you like to name the secret reference for ${name}?`,
                 default: suggestedTestKeyName(name),
             });
             if (await csm.secretExists(projectId, secretRef)) {
-                action = await prompt.promptOnce({
-                    type: "list",
+                action = await prompt.select({
                     message: "This secret reference already exists, would you like to reuse it or create a new one?",
                     choices: [
                         { name: "Reuse it", value: "reuse" },
@@ -220,10 +212,7 @@ async function overrideChosenEnv(projectId, env) {
         if (action === "reuse") {
             continue;
         }
-        const secretValue = await prompt.promptOnce({
-            type: "password",
-            message: `What new value would you like for secret ${name} [input is hidden]?`,
-        });
+        const secretValue = await prompt.password(`What new value would you like for secret ${name} [input is hidden]?`);
         await csm.createSecret(projectId, secretRef, { [csm.FIREBASE_MANAGED]: "apphosting" });
         await csm.addVersion(projectId, secretRef, secretValue);
     }

package/lib/apphosting/githubConnections.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGitHubCommit = exports.getGitHubBranch = exports.fetchRepositoryCloneUris = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.ensureSecretManagerAdminGrant = exports.promptGitHubBranch = exports.getOrCreateOauthConnection = exports.listValidInstallations = exports.promptGitHubInstallation = exports.getConnectionForInstallation = exports.linkGitHubRepository = exports.getOrCreateGithubConnectionWithSentinel = exports.generateRepositoryId = exports.extractRepoSlugFromUri = exports.parseConnectionName = void 0;
+exports.getGitHubCommit = exports.getGitHubBranch = exports.fetchRepositoryCloneUris = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.ensureSecretManagerAdminGrant = exports.promptGitHubBranch = exports.getOrCreateOauthConnection = exports.listValidInstallations = exports.promptGitHubInstallation = exports.getConnectionForInstallation = exports.linkGitHubRepository = exports.getOrCreateFullyInstalledGithubConnection = exports.generateConnectionId = exports.generateRepositoryId = exports.extractRepoSlugFromUri = exports.parseConnectionName = void 0;
 const clc = require("colorette");
 const devConnect = require("../gcp/devConnect");
 const rm = require("../gcp/resourceManager");
@@ -11,11 +11,9 @@ const prompt_1 = require("../prompt");
 const getProjectNumber_1 = require("../getProjectNumber");
 const api_1 = require("../api");
 const fuzzy = require("fuzzy");
-const inquirer = require("inquirer");
 const apiv2_1 = require("../apiv2");
 const githubApiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.githubApiOrigin)(), auth: false });
 const APPHOSTING_CONN_PATTERN = /.+\/apphosting-github-conn-.+$/;
-const APPHOSTING_OAUTH_CONN_NAME = "firebase-app-hosting-github-oauth";
 const CONNECTION_NAME_REGEX = /^projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/connections\/(?<id>[^\/]+)$/;
 function parseConnectionName(name) {
     const match = CONNECTION_NAME_REGEX.exec(name);
@@ -49,13 +47,14 @@ function generateRepositoryId(remoteUri) {
     return (_a = extractRepoSlugFromUri(remoteUri)) === null || _a === void 0 ? void 0 : _a.replaceAll("/", "-");
 }
 exports.generateRepositoryId = generateRepositoryId;
-function generateConnectionId() {
+const generateConnectionId = () => {
     const randomHash = Math.random().toString(36).slice(6);
     return `apphosting-github-conn-${randomHash}`;
-}
+};
+exports.generateConnectionId = generateConnectionId;
 const ADD_ACCOUNT_CHOICE = "@ADD_ACCOUNT";
 const MANAGE_INSTALLATION_CHOICE = "@MANAGE_INSTALLATION";
-async function getOrCreateGithubConnectionWithSentinel(projectId, location, createConnectionId) {
+async function getOrCreateFullyInstalledGithubConnection(projectId, location, createConnectionId) {
     utils.logBullet(clc.bold(`${clc.yellow("===")} Import a GitHub repository`));
     if (createConnectionId) {
         try {
@@ -76,10 +75,7 @@ async function getOrCreateGithubConnectionWithSentinel(projectId, location, crea
         const apphostingGitHubInstallationURL = (0, api_1.apphostingGitHubAppInstallationURL)();
         utils.logBullet(apphostingGitHubInstallationURL);
         await utils.openInBrowser(apphostingGitHubInstallationURL);
-        await (0, prompt_1.promptOnce)({
-            type: "input",
-            message: "Press Enter once you have installed or configured the Firebase App Hosting GitHub app to access your GitHub repo.",
-        });
+        await (0, prompt_1.input)("Press Enter once you have installed or configured the Firebase App Hosting GitHub app to access your GitHub repo.");
         installationId = await promptGitHubInstallation(projectId, location, oauthConn);
     }
     const connectionMatchingInstallation = await getConnectionForInstallation(projectId, location, installationId);
@@ -91,15 +87,15 @@ async function getOrCreateGithubConnectionWithSentinel(projectId, location, crea
         }
     }
     if (!createConnectionId) {
-        createConnectionId = generateConnectionId();
+        createConnectionId = (0, exports.generateConnectionId)();
     }
     const connection = await createFullyInstalledConnection(projectId, location, createConnectionId, oauthConn, installationId);
     return connection;
 }
-exports.getOrCreateGithubConnectionWithSentinel = getOrCreateGithubConnectionWithSentinel;
+exports.getOrCreateFullyInstalledGithubConnection = getOrCreateFullyInstalledGithubConnection;
 async function linkGitHubRepository(projectId, location, createConnectionId) {
     var _a, _b;
-    const connection = await getOrCreateGithubConnectionWithSentinel(projectId, location, createConnectionId);
+    const connection = await getOrCreateFullyInstalledGithubConnection(projectId, location, createConnectionId);
     let repoCloneUri;
     do {
         if (repoCloneUri === MANAGE_INSTALLATION_CHOICE) {
@@ -127,10 +123,7 @@ async function createFullyInstalledConnection(projectId, location, connectionId,
         const targetUri = conn.installationState.actionUri;
         utils.logBullet(targetUri);
         await utils.openInBrowser(targetUri);
-        await (0, prompt_1.promptOnce)({
-            type: "input",
-            message: "Press Enter once you have installed or configured the Firebase App Hosting GitHub app to access your GitHub repo.",
-        });
+        await (0, prompt_1.input)("Press Enter once you have installed or configured the Firebase App Hosting GitHub app to access your GitHub repo.");
         conn = await devConnect.getConnection(projectId, location, connectionId);
     }
     return conn;
@@ -144,10 +137,7 @@ async function manageInstallation(connection) {
     }
     utils.logBullet(targetUri);
     await utils.openInBrowser(targetUri);
-    await (0, prompt_1.promptOnce)({
-        type: "input",
-        message: "Press Enter once you have installed or configured the Firebase App Hosting GitHub app to access your GitHub repo.",
-    });
+    await (0, prompt_1.input)("Press Enter once you have installed or configured the Firebase App Hosting GitHub app to access your GitHub repo.");
 }
 async function getConnectionForInstallation(projectId, location, installationId) {
     const connections = await listAppHostingConnections(projectId, location);
@@ -164,30 +154,26 @@ async function getConnectionForInstallation(projectId, location, installationId)
 exports.getConnectionForInstallation = getConnectionForInstallation;
 async function promptGitHubInstallation(projectId, location, connection) {
     const installations = await listValidInstallations(projectId, location, connection);
-    const installationName = await (0, prompt_1.promptOnce)({
-        type: "autocomplete",
-        name: "installation",
+    const installationName = await (0, prompt_1.search)({
         message: "Which GitHub account do you want to use?",
-        source: (_, input = "") => {
-            return new Promise((resolve) => resolve([
-                new inquirer.Separator(),
-                {
-                    name: "Missing an account? Select this option to add a GitHub account",
-                    value: ADD_ACCOUNT_CHOICE,
-                },
-                new inquirer.Separator(),
-                ...fuzzy
-                    .filter(input, installations, {
-                    extract: (installation) => installation.name || "",
-                })
-                    .map((result) => {
-                    return {
-                        name: result.original.name || "",
-                        value: result.original.id,
-                    };
-                }),
-            ]));
-        },
+        source: (input = "") => [
+            new prompt_1.Separator(),
+            {
+                name: "Missing an account? Select this option to add a GitHub account",
+                value: ADD_ACCOUNT_CHOICE,
+            },
+            new prompt_1.Separator(),
+            ...fuzzy
+                .filter(input, installations, {
+                extract: (installation) => installation.name || "",
+            })
+                .map((result) => {
+                return {
+                    name: result.original.name || "",
+                    value: result.original.id,
+                };
+            }),
+        ],
     });
     return installationName;
 }
@@ -206,26 +192,17 @@ async function listValidInstallations(projectId, location, connection) {
 exports.listValidInstallations = listValidInstallations;
 async function getOrCreateOauthConnection(projectId, location) {
     let conn;
-    try {
-        conn = await devConnect.getConnection(projectId, location, APPHOSTING_OAUTH_CONN_NAME);
-    }
-    catch (err) {
-        if (err.status === 404) {
-            await ensureSecretManagerAdminGrant(projectId);
-            conn = await createConnection(projectId, location, APPHOSTING_OAUTH_CONN_NAME);
-        }
-        else {
-            throw err;
-        }
+    const completedConnections = await listAppHostingConnections(projectId, location);
+    if (completedConnections.length > 0) {
+        return completedConnections[0];
     }
+    await ensureSecretManagerAdminGrant(projectId);
+    conn = await createConnection(projectId, location, (0, exports.generateConnectionId)());
     while (conn.installationState.stage === "PENDING_USER_OAUTH") {
         utils.logBullet("Please authorize the Firebase GitHub app by visiting this url:");
         const { url, cleanup } = await utils.openInBrowserPopup(conn.installationState.actionUri, "Authorize the GitHub app");
         utils.logBullet(`\t${url}`);
-        await (0, prompt_1.promptOnce)({
-            type: "input",
-            message: "Press Enter once you have authorized the GitHub App.",
-        });
+        await (0, prompt_1.input)("Press Enter once you have authorized the GitHub App.");
         cleanup();
         const { projectId, location, id } = parseConnectionName(conn.name);
         conn = await devConnect.getConnection(projectId, location, id);
@@ -236,49 +213,41 @@ async function getOrCreateOauthConnection(projectId, location) {
 exports.getOrCreateOauthConnection = getOrCreateOauthConnection;
 async function promptCloneUri(projectId, connection) {
     const cloneUris = await fetchRepositoryCloneUris(projectId, connection);
-    const cloneUri = await (0, prompt_1.promptOnce)({
-        type: "autocomplete",
-        name: "cloneUri",
+    const cloneUri = await (0, prompt_1.search)({
         message: "Which GitHub repo do you want to deploy?",
-        source: (_, input = "") => {
-            return new Promise((resolve) => resolve([
-                new inquirer.Separator(),
-                {
-                    name: "Missing a repo? Select this option to configure your GitHub connection settings",
-                    value: MANAGE_INSTALLATION_CHOICE,
-                },
-                new inquirer.Separator(),
-                ...fuzzy
-                    .filter(input, cloneUris, {
-                    extract: (uri) => extractRepoSlugFromUri(uri) || "",
-                })
-                    .map((result) => {
-                    return {
-                        name: extractRepoSlugFromUri(result.original) || "",
-                        value: result.original,
-                    };
-                }),
-            ]));
-        },
+        source: (input = "") => [
+            new prompt_1.Separator(),
+            {
+                name: "Missing a repo? Select this option to configure your GitHub connection settings",
+                value: MANAGE_INSTALLATION_CHOICE,
+            },
+            new prompt_1.Separator(),
+            ...fuzzy
+                .filter(input, cloneUris, {
+                extract: (uri) => extractRepoSlugFromUri(uri) || "",
+            })
+                .map((result) => {
+                return {
+                    name: extractRepoSlugFromUri(result.original) || "",
+                    value: result.original,
+                };
+            }),
+        ],
     });
     return cloneUri;
 }
 async function promptGitHubBranch(repoLink) {
     const branches = await devConnect.listAllBranches(repoLink.name);
-    const branch = await (0, prompt_1.promptOnce)({
-        type: "autocomplete",
-        name: "branch",
+    const branch = await (0, prompt_1.search)({
         message: "Pick a branch for continuous deployment",
-        source: (_, input = "") => {
-            return new Promise((resolve) => resolve([
-                ...fuzzy.filter(input, Array.from(branches)).map((result) => {
-                    return {
-                        name: result.original,
-                        value: result.original,
-                    };
-                }),
-            ]));
-        },
+        source: (input = "") => [
+            ...fuzzy.filter(input, Array.from(branches)).map((result) => {
+                return {
+                    name: result.original,
+                    value: result.original,
+                };
+            }),
+        ],
     });
     return branch;
 }
@@ -292,10 +261,7 @@ async function ensureSecretManagerAdminGrant(projectId) {
         return;
     }
     utils.logBullet("To create a new GitHub connection, Secret Manager Admin role (roles/secretmanager.admin) is required on the Developer Connect Service Agent.");
-    const grant = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        message: "Grant the required role to the Developer Connect Service Agent?",
-    });
+    const grant = await (0, prompt_1.confirm)("Grant the required role to the Developer Connect Service Agent?");
     if (!grant) {
         utils.logBullet("You, or your project administrator, should run the following command to grant the required role:\n\n" +
             "You, or your project adminstrator, can run the following command to grant the required role manually:\n\n" +

package/lib/apphosting/repo.js

@@ -11,7 +11,6 @@ const error_1 = require("../error");
 const prompt_1 = require("../prompt");
 const getProjectNumber_1 = require("../getProjectNumber");
 const fuzzy = require("fuzzy");
-const inquirer = require("inquirer");
 const APPHOSTING_CONN_PATTERN = /.+\/apphosting-github-conn-.+$/;
 const APPHOSTING_OAUTH_CONN_NAME = "apphosting-github-oauth";
 const CONNECTION_NAME_REGEX = /^projects\/(?<projectId>[^\/]+)\/locations\/(?<location>[^\/]+)\/connections\/(?<id>[^\/]+)$/;
@@ -89,10 +88,7 @@ async function createFullyInstalledConnection(projectId, location, connectionId,
         const targetUri = conn.installationState.actionUri;
         utils.logBullet(targetUri);
         await utils.openInBrowser(targetUri);
-        await (0, prompt_1.promptOnce)({
-            type: "input",
-            message: "Press Enter once you have installed or configured the Cloud Build GitHub app to access your GitHub repo.",
-        });
+        await (0, prompt_1.input)("Press Enter once you have installed or configured the Cloud Build GitHub app to access your GitHub repo.");
         conn = await gcb.getConnection(projectId, location, connectionId);
     }
     return conn;
@@ -116,10 +112,7 @@ async function getOrCreateOauthConnection(projectId, location) {
         utils.logBullet("Sign in to GitHub and authorize Cloud Build GitHub app:");
         const { url, cleanup } = await utils.openInBrowserPopup(conn.installationState.actionUri, "Authorize the GitHub app");
         utils.logBullet(`\t${url}`);
-        await (0, prompt_1.promptOnce)({
-            type: "input",
-            message: "Press Enter once you have authorized the app",
-        });
+        await (0, prompt_1.input)("Press Enter once you have authorized the app");
         cleanup();
         const { projectId, location, id } = parseConnectionName(conn.name);
         conn = await gcb.getConnection(projectId, location, id);
@@ -129,30 +122,26 @@ async function getOrCreateOauthConnection(projectId, location) {
 exports.getOrCreateOauthConnection = getOrCreateOauthConnection;
 async function promptRepositoryUri(projectId, connections) {
     const { repos, remoteUriToConnection } = await fetchAllRepositories(projectId, connections);
-    const remoteUri = await (0, prompt_1.promptOnce)({
-        type: "autocomplete",
-        name: "remoteUri",
+    const remoteUri = await (0, prompt_1.search)({
         message: "Which GitHub repo do you want to deploy?",
-        source: (_, input = "") => {
-            return new Promise((resolve) => resolve([
-                new inquirer.Separator(),
-                {
-                    name: "Missing a repo? Select this option to configure your GitHub connection settings",
-                    value: ADD_CONN_CHOICE,
-                },
-                new inquirer.Separator(),
-                ...fuzzy
-                    .filter(input, repos, {
-                    extract: (repo) => extractRepoSlugFromUri(repo.remoteUri) || "",
-                })
-                    .map((result) => {
-                    return {
-                        name: extractRepoSlugFromUri(result.original.remoteUri) || "",
-                        value: result.original.remoteUri,
-                    };
-                }),
-            ]));
-        },
+        source: (input) => [
+            new prompt_1.Separator(),
+            {
+                name: "Missing a repo? Select this option to configure your GitHub connection settings",
+                value: ADD_CONN_CHOICE,
+            },
+            new prompt_1.Separator(),
+            ...fuzzy
+                .filter(input !== null && input !== void 0 ? input : "", repos, {
+                extract: (repo) => extractRepoSlugFromUri(repo.remoteUri) || "",
+            })
+                .map((result) => {
+                return {
+                    name: extractRepoSlugFromUri(result.original.remoteUri) || "",
+                    value: result.original.remoteUri,
+                };
+            }),
+        ],
     });
     return { remoteUri, connection: remoteUriToConnection[remoteUri] };
 }
@@ -164,10 +153,7 @@ async function ensureSecretManagerAdminGrant(projectId) {
         return;
     }
     utils.logBullet("To create a new GitHub connection, Secret Manager Admin role (roles/secretmanager.admin) is required on the Cloud Build Service Agent.");
-    const grant = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        message: "Grant the required role to the Cloud Build Service Agent?",
-    });
+    const grant = await (0, prompt_1.confirm)("Grant the required role to the Cloud Build Service Agent?");
     if (!grant) {
         utils.logBullet("You, or your project administrator, should run the following command to grant the required role:\n\n" +
             "You, or your project adminstrator, can run the following command to grant the required role manually:\n\n" +

package/lib/apphosting/secrets/dialogs.js

@@ -125,8 +125,7 @@ async function selectBackendServiceAccounts(projectNumber, projectId, options) {
         accum.add(row.runServiceAccount);
         return accum;
     }, new Set());
-    const chosen = await prompt.promptOnce({
-        type: "checkbox",
+    const chosen = await prompt.checkbox({
         message: "Which service accounts would you like to grant access? " +
             "Press Space to select accounts, then Enter to confirm your choices.",
         choices: [...allAccounts.values()].sort(),
@@ -157,7 +156,7 @@ async function envVarForSecret(secret, trimTestPrefix = false) {
         }
     }
     do {
-        const test = await prompt.promptOnce({
+        const test = await prompt.input({
             message: "What environment variable name would you like to use?",
             default: upper,
         });

package/lib/apphosting/utils.js

@@ -30,9 +30,7 @@ async function promptForAppHostingYaml(apphostingFileNameToPathMap, promptMessag
             value: apphostingFileNameToPathMap.get(fileName),
         };
     });
-    const fileToExportPath = await prompt.promptOnce({
-        name: "apphosting-yaml",
-        type: "list",
+    const fileToExportPath = await prompt.select({
         message: promptMessage,
         choices: listOptions,
     });

package/lib/auth.js

@@ -299,10 +299,7 @@ async function loginRemotely() {
     logger_1.logger.info();
     logger_1.logger.info("3. Paste or enter the authorization code below once you have it:");
     logger_1.logger.info();
-    const code = await (0, prompt_1.promptOnce)({
-        type: "input",
-        message: "Enter authorization code:",
-    });
+    const code = await (0, prompt_1.input)({ message: "Enter authorization code:" });
     try {
         const tokens = await getTokensFromAuthorizationCode(code, `${(0, api_1.authProxyOrigin)()}/complete`, codeVerifier);
         void (0, track_1.trackGA4)("login", { method: "google_remote" });

package/lib/commands/apphosting-backends-delete.js

@@ -21,12 +21,12 @@ exports.command = new command_1.Command("apphosting:backends:delete <backend>")
     const backends = await (0, backend_1.chooseBackends)(projectId, backendId, "Please select the backends you'd like to delete:", options.force);
     utils.logWarning("You are about to permanently delete these backend(s):");
     (0, apphosting_backends_list_1.printBackendsTable)(backends);
-    const confirmDeletion = await (0, prompt_1.promptOnce)({
-        type: "confirm",
-        name: "force",
-        default: false,
+    const confirmDeletion = await (0, prompt_1.confirm)({
         message: "Are you sure?",
-    }, options);
+        default: false,
+        force: options.force,
+        nonInteractive: options.nonInteractive,
+    });
     if (!confirmDeletion) {
         return;
     }

package/lib/commands/apphosting-secrets-set.js

@@ -46,9 +46,7 @@ exports.command = new command_1.Command("apphosting:secrets:set <secretName>")
     if (!created) {
         return;
     }
-    const type = await prompt.promptOnce({
-        type: "list",
-        name: "type",
+    const type = await prompt.select({
         message: "Is this secret for production or only local testing?",
         choices: [
             { name: "Production", value: "production" },
@@ -56,9 +54,7 @@ exports.command = new command_1.Command("apphosting:secrets:set <secretName>")
         ],
     });
     if (type === "local") {
-        const emailList = await prompt.promptOnce({
-            type: "input",
-            name: "emails",
+        const emailList = await prompt.input({
             message: "Please enter a comma separated list of user or groups who should have access to this secret:",
         });
         if (emailList.length) {