firebase-tools 14.18.0 → 14.19.1

package/lib/deploy/apphosting/prepare.js

@@ -8,6 +8,8 @@ const devConnect_1 = require("../../gcp/devConnect");
 const projectUtils_1 = require("../../projectUtils");
 const prompt_1 = require("../../prompt");
 const utils_1 = require("../../utils");
+const localbuilds_1 = require("../../apphosting/localbuilds");
+const error_1 = require("../../error");
 async function default_1(context, options) {
     var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
@@ -17,6 +19,7 @@ async function default_1(context, options) {
     context.backendConfigs = {};
     context.backendLocations = {};
     context.backendStorageUris = {};
+    context.backendLocalBuilds = {};
     const configs = getBackendConfigs(options);
     const { backends } = await (0, apphosting_1.listBackends)(projectId, "-");
     const foundBackends = [];
@@ -105,7 +108,26 @@ async function default_1(context, options) {
     if (skippedBackends.length > 0) {
         (0, utils_1.logLabeledWarning)("apphosting", `Skipping deployment of backend(s) ${skippedBackends.map((cfg) => cfg.backendId).join(", ")}.`);
     }
-    return;
+    for (const cfg of Object.values(context.backendConfigs)) {
+        if (!cfg.localBuild) {
+            continue;
+        }
+        (0, utils_1.logLabeledBullet)("apphosting", `Starting local build for backend ${cfg.backendId}`);
+        try {
+            const { outputFiles, annotations, buildConfig } = await (0, localbuilds_1.localBuild)(options.projectRoot || "./", "nextjs");
+            if (outputFiles.length !== 1) {
+                throw new error_1.FirebaseError(`Local build for backend ${cfg.backendId} failed: No output files found.`);
+            }
+            context.backendLocalBuilds[cfg.backendId] = {
+                buildDir: outputFiles[0],
+                buildConfig,
+                annotations,
+            };
+        }
+        catch (e) {
+            throw new error_1.FirebaseError(`Local Build for backend ${cfg.backendId} failed: ${e}`);
+        }
+    }
 }
 exports.default = default_1;
 function getBackendConfigs(options) {

package/lib/deploy/apphosting/release.js

@@ -13,6 +13,11 @@ async function default_1(context, options) {
         (0, utils_1.logLabeledWarning)("apphosting", `Failed to find metadata for backend(s) ${backendIds.join(", ")}. Please contact support with the contents of your firebase-debug.log to report your issue.`);
         backendIds = backendIds.filter((id) => !missingBackends.includes(id));
     }
+    const localBuildBackends = backendIds.filter((id) => context.backendLocalBuilds[id]);
+    if (localBuildBackends.length > 0) {
+        (0, utils_1.logLabeledWarning)("apphosting", `Skipping backend(s) ${localBuildBackends.join(", ")}. Local Builds are not supported yet.`);
+        backendIds = backendIds.filter((id) => !localBuildBackends.includes(id));
+    }
     if (backendIds.length === 0) {
         return;
     }

package/lib/deploy/apphosting/util.js

@@ -7,20 +7,21 @@ const path = require("path");
 const tmp = require("tmp");
 const error_1 = require("../../error");
 const fsAsync = require("../../fsAsync");
-async function createArchive(config, rootDir) {
+async function createArchive(config, rootDir, targetSubDir) {
     const tmpFile = tmp.fileSync({ prefix: `${config.backendId}-`, postfix: ".zip" }).name;
     const fileStream = fs.createWriteStream(tmpFile, {
         flags: "w",
         encoding: "binary",
     });
     const archive = archiver("zip");
+    const targetDir = targetSubDir ? path.join(rootDir, targetSubDir) : rootDir;
     const ignore = config.ignore || ["node_modules", ".git"];
     ignore.push("firebase-debug.log", "firebase-debug.*.log");
-    const gitIgnorePatterns = parseGitIgnorePatterns(rootDir);
+    const gitIgnorePatterns = parseGitIgnorePatterns(targetDir);
     ignore.push(...gitIgnorePatterns);
     try {
         const files = await fsAsync.readdirRecursive({
-            path: rootDir,
+            path: targetDir,
             ignore: ignore,
             isGitIgnore: true,
         });

package/lib/deploy/functions/deploy.js

@@ -59,14 +59,15 @@ async function uploadSourceV2(projectId, projectNumber, source, wantBackend) {
         await gcs.upload(uploadOpts, res.uploadUrl, undefined, true);
         return res.storageSource;
     }
-    const bucketName = `firebase-functions-src-${projectNumber}`;
-    await gcs.upsertBucket({
+    const baseName = `firebase-functions-src-${projectNumber}`;
+    const bucketName = await gcs.upsertBucket({
         product: "functions",
         projectId,
-        createMessage: `Creating Cloud Storage bucket in ${region} to store Functions source code uploads at ${bucketName}...`,
+        createMessage: `Creating Cloud Storage bucket in ${region} to store Functions source code uploads at ${baseName}...`,
         req: {
-            name: bucketName,
+            baseName,
             location: region,
+            purposeLabel: `functions-source-${region.toLowerCase()}`,
             lifecycle: {
                 rule: [
                     {

package/lib/deploy/functions/params.js

@@ -415,7 +415,7 @@ async function promptResourceString(prompt, input, projectId, resolvedDefault) {
     const notFound = new error_1.FirebaseError(`No instances of ${input.resource.type} found.`);
     switch (input.resource.type) {
         case "storage.googleapis.com/Bucket":
-            const buckets = await (0, storage_1.listBuckets)(projectId);
+            const buckets = (await (0, storage_1.listBuckets)(projectId)).map((b) => b.name);
             if (buckets.length === 0) {
                 throw notFound;
             }
@@ -436,7 +436,7 @@ async function promptResourceStrings(prompt, input, projectId) {
     const notFound = new error_1.FirebaseError(`No instances of ${input.resource.type} found.`);
     switch (input.resource.type) {
         case "storage.googleapis.com/Bucket":
-            const buckets = await (0, storage_1.listBuckets)(projectId);
+            const buckets = (await (0, storage_1.listBuckets)(projectId)).map((b) => b.name);
             if (buckets.length === 0) {
                 throw notFound;
             }

package/lib/emulator/commandUtils.js

@@ -384,6 +384,6 @@ async function checkJavaMajorVersion() {
     });
 }
 exports.checkJavaMajorVersion = checkJavaMajorVersion;
-exports.MIN_SUPPORTED_JAVA_MAJOR_VERSION = 11;
-exports.JAVA_DEPRECATION_WARNING = "firebase-tools no longer supports Java versions before 11. " +
-    "Please install a JDK at version 11 or above to get a compatible runtime.";
+exports.MIN_SUPPORTED_JAVA_MAJOR_VERSION = 21;
+exports.JAVA_DEPRECATION_WARNING = "firebase-tools will drop support for Java version < 21 soon in firebase-tools@15. " +
+    "Please install a JDK at version 21 or above to get a compatible runtime.";

package/lib/emulator/controller.js

@@ -177,10 +177,11 @@ async function startAll(options, showUI = true, runningTestScript = false) {
     if (targets.length === 0) {
         throw new error_1.FirebaseError(`No emulators to start, run ${clc.bold("firebase init emulators")} to get started.`);
     }
+    const deprecationNotices = [];
     if (targets.some(downloadableEmulators_1.requiresJava)) {
         if ((await commandUtils.checkJavaMajorVersion()) < commandUtils_1.MIN_SUPPORTED_JAVA_MAJOR_VERSION) {
             utils.logLabeledError("emulators", commandUtils_1.JAVA_DEPRECATION_WARNING, "warn");
-            throw new error_1.FirebaseError(commandUtils_1.JAVA_DEPRECATION_WARNING);
+            deprecationNotices.push(commandUtils_1.JAVA_DEPRECATION_WARNING);
         }
     }
     if (options.logVerbosity) {
@@ -685,7 +686,7 @@ async function startAll(options, showUI = true, runningTestScript = false) {
         count_all: running.length,
         is_demo_project: String(isDemoProject),
     });
-    return { deprecationNotices: [] };
+    return { deprecationNotices };
 }
 exports.startAll = startAll;
 function getListenConfig(options, emulator) {

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -60,7 +60,7 @@ async function createInstance(args) {
         await client.post(`projects/${args.projectId}/instances`, {
             name: args.instanceId,
             region: args.location,
-            databaseVersion: "POSTGRES_17",
+            databaseVersion: "POSTGRES_15",
             settings: {
                 tier: "db-f1-micro",
                 edition: "ENTERPRISE",

package/lib/gcp/storage.js

@@ -1,14 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDownloadUrl = exports.getServiceAccount = exports.listBuckets = exports.upsertBucket = exports.createBucket = exports.getBucket = exports.deleteObject = exports.getObject = exports.uploadObject = exports.upload = exports.getDefaultBucket = void 0;
+exports.getDownloadUrl = exports.getServiceAccount = exports.listBuckets = exports.upsertBucket = exports.randomString = exports.patchBucket = exports.createBucket = exports.getBucket = exports.deleteObject = exports.getObject = exports.uploadObject = exports.upload = exports.getDefaultBucket = void 0;
 const path = require("path");
 const clc = require("colorette");
+const crypto_1 = require("crypto");
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const utils = require("../utils");
+const proto_1 = require("./proto");
 async function getDefaultBucket(projectId) {
     var _a;
     await (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.firebaseStorageOrigin)(), "storage", false);
@@ -120,37 +122,88 @@ async function createBucket(projectId, req, projectPrivate) {
     }
 }
 exports.createBucket = createBucket;
-async function upsertBucket(opts) {
+async function patchBucket(bucketName, metadata) {
     try {
-        await exports.getBucket(opts.req.name);
-        return;
+        const localAPIClient = new apiv2_1.Client({ urlPrefix: (0, api_1.storageOrigin)() });
+        const mask = (0, proto_1.fieldMasks)(metadata, "labels", "acl", "defaultObjectAcl", "lifecycle");
+        const result = await localAPIClient.patch(`/storage/v1/b/${bucketName}`, metadata, { queryParams: { updateMask: mask.join(",") } });
+        return result.body;
     }
     catch (err) {
-        const errStatus = (0, error_1.getErrStatus)(err.original);
-        if (errStatus !== 403 && errStatus !== 404) {
-            throw err;
-        }
+        logger_1.logger.debug(err);
+        throw new error_1.FirebaseError("Failed to patch the storage bucket", {
+            original: err,
+        });
     }
-    utils.logLabeledBullet(opts.product, opts.createMessage);
-    try {
-        await exports.createBucket(opts.projectId, opts.req, true);
+}
+exports.patchBucket = patchBucket;
+function randomString(length) {
+    const chars = "abcdefghijklmnopqrstuvwxyz0123456789";
+    let result = "";
+    for (let i = length; i > 0; --i) {
+        result += chars[(0, crypto_1.randomInt)(chars.length)];
+    }
+    return result;
+}
+exports.randomString = randomString;
+const dynamicDispatch = exports;
+async function upsertBucket(opts) {
+    const existingBuckets = await dynamicDispatch.listBuckets(opts.projectId);
+    const managedBucket = existingBuckets.find((b) => opts.req.purposeLabel in (b.labels || {}));
+    if (managedBucket) {
+        return managedBucket.name;
+    }
+    const existingUnmanaged = existingBuckets.find((b) => b.name === opts.req.baseName);
+    if (existingUnmanaged) {
+        logger_1.logger.debug(`Found existing bucket ${existingUnmanaged.name} without purpose label. Because it is known not to be squatted, we can use it.`);
+        const labels = Object.assign(Object.assign({}, existingUnmanaged.labels), { [opts.req.purposeLabel]: "true" });
+        await dynamicDispatch.patchBucket(existingUnmanaged.name, { labels });
+        return existingUnmanaged.name;
     }
-    catch (err) {
-        if ((0, error_1.getErrStatus)(err.original) === 403) {
-            utils.logLabeledWarning(opts.product, "Failed to create Cloud Storage bucket because user does not have sufficient permissions. " +
-                "See https://cloud.google.com/storage/docs/access-control/iam-roles for more details on " +
-                "IAM roles that are able to create a Cloud Storage bucket, and ask your project administrator " +
-                "to grant you one of those roles.");
+    utils.logLabeledBullet(opts.product, opts.createMessage);
+    for (let retryCount = 0; retryCount < 5; retryCount++) {
+        const name = retryCount === 0
+            ? opts.req.baseName
+            : `${opts.req.baseName}-${dynamicDispatch.randomString(6)}`;
+        try {
+            await dynamicDispatch.createBucket(opts.projectId, {
+                name,
+                location: opts.req.location,
+                lifecycle: opts.req.lifecycle,
+                labels: {
+                    [opts.req.purposeLabel]: "true",
+                },
+            }, true);
+            return name;
+        }
+        catch (err) {
+            if ((0, error_1.getErrStatus)(err.original) === 409) {
+                utils.logLabeledBullet(opts.product, `Bucket ${name} already exists, creating a new bucket with a conflict-avoiding hash`);
+                continue;
+            }
+            if ((0, error_1.getErrStatus)(err.original) === 403) {
+                utils.logLabeledWarning(opts.product, "Failed to create Cloud Storage bucket because user does not have sufficient permissions. " +
+                    "See https://cloud.google.com/storage/docs/access-control/iam-roles for more details on " +
+                    "IAM roles that are able to create a Cloud Storage bucket, and ask your project administrator " +
+                    "to grant you one of those roles.");
+            }
+            throw err;
         }
-        throw err;
     }
+    throw new error_1.FirebaseError("Failed to create a unique Cloud Storage bucket name after 5 attempts.");
 }
 exports.upsertBucket = upsertBucket;
 async function listBuckets(projectId) {
     try {
+        let buckets = [];
         const localAPIClient = new apiv2_1.Client({ urlPrefix: (0, api_1.storageOrigin)() });
-        const result = await localAPIClient.get(`/storage/v1/b?project=${projectId}`);
-        return result.body.items.map((bucket) => bucket.name);
+        let pageToken;
+        do {
+            const result = await localAPIClient.get(`/storage/v1/b?project=${projectId}`, { queryParams: pageToken ? { pageToken } : {} });
+            buckets = buckets.concat(result.body.items || []);
+            pageToken = result.body.nextPageToken;
+        } while (pageToken);
+        return buckets;
     }
     catch (err) {
         logger_1.logger.debug(err);

package/lib/init/features/dataconnect/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newUniqueId = exports.toDNSCompatibleId = exports.actuate = exports.askQuestions = void 0;
+exports.newUniqueId = exports.toDNSCompatibleId = exports.actuate = exports.askQuestions = exports.FDC_DEFAULT_REGION = void 0;
 const path_1 = require("path");
 const clc = require("colorette");
 const fs = require("fs-extra");
@@ -21,6 +21,7 @@ const sdk = require("./sdk");
 const fdcExperience_1 = require("../../../gemini/fdcExperience");
 const configstore_1 = require("../../../configstore");
 const track_1 = require("../../../track");
+exports.FDC_DEFAULT_REGION = "us-east4";
 const DATACONNECT_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/dataconnect.yaml");
 const CONNECTOR_YAML_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/connector.yaml");
 const SCHEMA_TEMPLATE = (0, templates_1.readTemplateSync)("init/dataconnect/schema.gql");
@@ -76,6 +77,9 @@ async function askQuestions(setup) {
         if (hasBilling) {
             await promptForCloudSQL(setup, info);
         }
+        else if (info.appDescription) {
+            await promptForLocation(setup, info);
+        }
     }
     setup.featureInfo = setup.featureInfo || {};
     setup.featureInfo.dataconnect = info;
@@ -93,7 +97,7 @@ async function actuate(setup, config, options) {
     }
     info.serviceId = info.serviceId || defaultServiceId();
     info.cloudSqlInstanceId = info.cloudSqlInstanceId || `${info.serviceId.toLowerCase()}-fdc`;
-    info.locationId = info.locationId || `us-central1`;
+    info.locationId = info.locationId || exports.FDC_DEFAULT_REGION;
     info.cloudSqlDatabase = info.cloudSqlDatabase || `fdcdb`;
     try {
         await actuateWithInfo(setup, config, info, options);
@@ -269,10 +273,10 @@ async function writeConnectorFiles(config, connectorInfo, options) {
 function subDataconnectYamlValues(replacementValues) {
     const replacements = {
         serviceId: "__serviceId__",
+        locationId: "__location__",
         cloudSqlDatabase: "__cloudSqlDatabase__",
         cloudSqlInstanceId: "__cloudSqlInstanceId__",
         connectorDirs: "__connectorDirs__",
-        locationId: "__location__",
     };
     let replaced = DATACONNECT_YAML_TEMPLATE;
     for (const [k, v] of Object.entries(replacementValues)) {
@@ -422,12 +426,7 @@ async function promptForCloudSQL(setup, info) {
         }
     }
     if (info.locationId === "") {
-        const choices = await locationChoices(setup);
-        info.locationId = await (0, prompt_1.select)({
-            message: "What location would like to use?",
-            choices,
-            default: "us-east4",
-        });
+        await promptForLocation(setup, info);
         info.shouldProvisionCSQL = await (0, prompt_1.confirm)({
             message: `Would you like to provision your Cloud SQL instance and database now?`,
             default: true,
@@ -445,6 +444,16 @@ async function promptForCloudSQL(setup, info) {
     }
     return;
 }
+async function promptForLocation(setup, info) {
+    if (info.locationId === "") {
+        const choices = await locationChoices(setup);
+        info.locationId = await (0, prompt_1.select)({
+            message: "What location should the new Cloud SQL instance be in?",
+            choices,
+            default: exports.FDC_DEFAULT_REGION,
+        });
+    }
+}
 async function locationChoices(setup) {
     if (setup.projectId) {
         const locations = await (0, client_1.listLocations)(setup.projectId);

package/lib/init/features/project.js

@@ -3,101 +3,92 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.doSetup = void 0;
 const clc = require("colorette");
 const _ = require("lodash");
-const error_1 = require("../../error");
 const projects_1 = require("../../management/projects");
 const logger_1 = require("../../logger");
 const utils = require("../../utils");
 const prompt = require("../../prompt");
+const requireAuth_1 = require("../../requireAuth");
+const constants_1 = require("../../emulator/constants");
+const error_1 = require("../../error");
 const OPTION_NO_PROJECT = "Don't set up a default project";
 const OPTION_USE_PROJECT = "Use an existing project";
 const OPTION_NEW_PROJECT = "Create a new project";
 const OPTION_ADD_FIREBASE = "Add Firebase to an existing Google Cloud Platform project";
-function toInitProjectInfo(projectMetaData) {
-    const { projectId, displayName, resources } = projectMetaData;
-    return {
-        id: projectId,
-        label: `${projectId}` + (displayName ? ` (${displayName})` : ""),
-        instance: resources === null || resources === void 0 ? void 0 : resources.realtimeDatabaseInstance,
-        location: resources === null || resources === void 0 ? void 0 : resources.locationId,
-    };
-}
-async function promptAndCreateNewProject(options) {
-    utils.logBullet("If you want to create a project in a Google Cloud organization or folder, please use " +
-        `"firebase projects:create" instead, and return to this command when you've created the project.`);
-    const { projectId, displayName } = await (0, projects_1.promptProjectCreation)(options);
-    if (!projectId) {
-        throw new error_1.FirebaseError("Project ID cannot be empty");
-    }
-    return await (0, projects_1.createFirebaseProjectAndLog)(projectId, { displayName });
-}
-async function promptAndAddFirebaseToCloudProject() {
-    const projectId = await (0, projects_1.promptAvailableProjectId)();
-    if (!projectId) {
-        throw new error_1.FirebaseError("Project ID cannot be empty");
-    }
-    return await (0, projects_1.addFirebaseToCloudProjectAndLog)(projectId);
-}
-async function projectChoicePrompt(options) {
-    const choices = [OPTION_USE_PROJECT, OPTION_NEW_PROJECT, OPTION_ADD_FIREBASE, OPTION_NO_PROJECT];
-    const projectSetupOption = await prompt.select({
-        message: "Please select an option:",
-        choices,
-    });
-    switch (projectSetupOption) {
-        case OPTION_USE_PROJECT:
-            return (0, projects_1.getOrPromptProject)(options);
-        case OPTION_NEW_PROJECT:
-            return promptAndCreateNewProject(options);
-        case OPTION_ADD_FIREBASE:
-            return promptAndAddFirebaseToCloudProject();
-        default:
-            return;
-    }
-}
 async function doSetup(setup, config, options) {
-    var _a, _b, _c;
+    var _a, _b;
     setup.project = {};
     logger_1.logger.info();
     logger_1.logger.info(`First, let's associate this project directory with a Firebase project.`);
     logger_1.logger.info(`You can create multiple project aliases by running ${clc.bold("firebase use --add")}, `);
-    logger_1.logger.info(`but for now we'll just set up a default project.`);
     logger_1.logger.info();
+    if (options.project) {
+        if (constants_1.Constants.isDemoProject(options.project)) {
+            logger_1.logger.info(`Skipping Firebase project setup because a demo project is provided`);
+            return;
+        }
+        await (0, requireAuth_1.requireAuth)(options);
+        await usingProject(setup, config, options.project);
+        return;
+    }
     const projectFromRcFile = (_b = (_a = setup.rcfile) === null || _a === void 0 ? void 0 : _a.projects) === null || _b === void 0 ? void 0 : _b.default;
-    if (projectFromRcFile && !options.project) {
-        utils.logBullet(`.firebaserc already has a default project, using ${projectFromRcFile}.`);
-        const rcProject = await (0, projects_1.getFirebaseProject)(projectFromRcFile);
-        setup.projectId = rcProject.projectId;
-        setup.projectLocation = (_c = rcProject === null || rcProject === void 0 ? void 0 : rcProject.resources) === null || _c === void 0 ? void 0 : _c.locationId;
+    if (projectFromRcFile) {
+        await (0, requireAuth_1.requireAuth)(options);
+        await usingProject(setup, config, projectFromRcFile, ".firebaserc");
         return;
     }
-    let projectMetaData;
-    if (options.project) {
-        logger_1.logger.debug(`Using project from CLI flag: ${options.project}`);
-        projectMetaData = await (0, projects_1.getFirebaseProject)(options.project);
+    const projectEnvVar = utils.envOverride("FIREBASE_PROJECT", "");
+    if (projectEnvVar) {
+        await (0, requireAuth_1.requireAuth)(options);
+        await usingProject(setup, config, projectEnvVar, "$FIREBASE_PROJECT");
+        return;
     }
-    else {
-        const projectEnvVar = utils.envOverride("FIREBASE_PROJECT", "");
-        if (projectEnvVar) {
-            logger_1.logger.debug(`Using project from $FIREBASE_PROJECT: ${projectEnvVar}`);
-            projectMetaData = await (0, projects_1.getFirebaseProject)(projectEnvVar);
+    if (options.nonInteractive) {
+        logger_1.logger.info("No default project found. Continuing without a project in non interactive mode.");
+        return;
+    }
+    const choices = [OPTION_USE_PROJECT, OPTION_NEW_PROJECT, OPTION_ADD_FIREBASE, OPTION_NO_PROJECT];
+    const projectSetupOption = await prompt.select({
+        message: "Please select an option:",
+        choices,
+    });
+    switch (projectSetupOption) {
+        case OPTION_USE_PROJECT: {
+            await (0, requireAuth_1.requireAuth)(options);
+            const pm = await (0, projects_1.selectProjectInteractively)();
+            return await usingProjectMetadata(setup, config, pm);
         }
-        else {
-            if (options.nonInteractive) {
-                logger_1.logger.info("No default project found. Continuing without a project in non interactive mode.");
-                return;
-            }
-            projectMetaData = await projectChoicePrompt(options);
-            if (!projectMetaData) {
-                return;
-            }
+        case OPTION_NEW_PROJECT: {
+            utils.logBullet("If you want to create a project in a Google Cloud organization or folder, please use " +
+                `"firebase projects:create" instead, and return to this command when you've created the project.`);
+            await (0, requireAuth_1.requireAuth)(options);
+            const { projectId, displayName } = await (0, projects_1.promptProjectCreation)(options);
+            const pm = await (0, projects_1.createFirebaseProjectAndLog)(projectId, { displayName });
+            return await usingProjectMetadata(setup, config, pm);
         }
+        case OPTION_ADD_FIREBASE: {
+            await (0, requireAuth_1.requireAuth)(options);
+            const pm = await (0, projects_1.addFirebaseToCloudProjectAndLog)(await (0, projects_1.promptAvailableProjectId)());
+            return await usingProjectMetadata(setup, config, pm);
+        }
+        default:
+            return;
     }
-    const projectInfo = toInitProjectInfo(projectMetaData);
-    utils.logBullet(`Using project ${projectInfo.label}`);
-    _.set(setup.rcfile, "projects.default", projectInfo.id);
-    setup.projectId = projectInfo.id;
-    setup.instance = projectInfo.instance;
-    setup.projectLocation = projectInfo.location;
-    utils.makeActiveProject(config.projectDir, projectInfo.id);
 }
 exports.doSetup = doSetup;
+async function usingProject(setup, config, projectId, from = "") {
+    const pm = await (0, projects_1.getFirebaseProject)(projectId);
+    const label = `${pm.projectId}` + (pm.displayName ? ` (${pm.displayName})` : "");
+    utils.logBullet(`Using project ${label} ${from ? "from ${from}" : ""}.`);
+    await usingProjectMetadata(setup, config, pm);
+}
+async function usingProjectMetadata(setup, config, pm) {
+    var _a, _b;
+    if (!pm) {
+        throw new error_1.FirebaseError("null FirebaseProjectMetadata");
+    }
+    _.set(setup.rcfile, "projects.default", pm.projectId);
+    setup.projectId = pm.projectId;
+    setup.instance = (_a = pm.resources) === null || _a === void 0 ? void 0 : _a.realtimeDatabaseInstance;
+    setup.projectLocation = (_b = pm.resources) === null || _b === void 0 ? void 0 : _b.locationId;
+    utils.makeActiveProject(config.projectDir, pm.projectId);
+}

package/lib/management/projects.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkFirebaseEnabledForCloudProject = exports.getProject = exports.getFirebaseProject = exports.checkAndRecommendProjectId = exports.listFirebaseProjects = exports.getAvailableCloudProjectPage = exports.getFirebaseProjectPage = exports.addFirebaseToCloudProject = exports.createCloudProject = exports.promptAvailableProjectId = exports.getOrPromptProject = exports.addFirebaseToCloudProjectAndLog = exports.createFirebaseProjectAndLog = exports.promptProjectCreation = exports.ProjectParentResourceType = void 0;
+exports.checkFirebaseEnabledForCloudProject = exports.getProject = exports.getFirebaseProject = exports.checkAndRecommendProjectId = exports.listFirebaseProjects = exports.getAvailableCloudProjectPage = exports.getFirebaseProjectPage = exports.addFirebaseToCloudProject = exports.createCloudProject = exports.promptAvailableProjectId = exports.selectProjectInteractively = exports.getOrPromptProject = exports.addFirebaseToCloudProjectAndLog = exports.createFirebaseProjectAndLog = exports.promptProjectCreation = exports.ProjectParentResourceType = void 0;
 const clc = require("colorette");
 const ora = require("ora");
 const apiv2_1 = require("../apiv2");
@@ -11,6 +11,7 @@ const api = require("../api");
 const logger_1 = require("../logger");
 const utils = require("../utils");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
+const constants_1 = require("../emulator/constants");
 const TIMEOUT_MILLIS = 30000;
 const MAXIMUM_PROMPT_LIST = 100;
 const PROJECT_LIST_PAGE_SIZE = 1000;
@@ -33,6 +34,9 @@ async function promptProjectCreation(options) {
             else if (projectId.length > 30) {
                 return "Project ID cannot be longer than 30 characters";
             }
+            if (constants_1.Constants.isDemoProject(projectId)) {
+                return "Project ID cannot starts with demo-";
+            }
             try {
                 const { isAvailable, suggestedProjectId } = await checkAndRecommendProjectId(projectId);
                 if (!isAvailable && suggestedProjectId) {
@@ -137,13 +141,20 @@ async function selectProjectInteractively(pageSize = MAXIMUM_PROMPT_LIST) {
     }
     if (nextPageToken) {
         logger_1.logger.debug(`Found more than ${projects.length} projects, selecting via prompt`);
-        return selectProjectByPrompting();
+        return await getFirebaseProject(await selectProjectByPrompting());
     }
     return selectProjectFromList(projects);
 }
+exports.selectProjectInteractively = selectProjectInteractively;
 async function selectProjectByPrompting() {
     const projectId = await prompt.input("Please input the project ID you would like to use:");
-    return await getFirebaseProject(projectId);
+    if (!projectId) {
+        throw new error_1.FirebaseError("Project ID cannot be empty");
+    }
+    if (constants_1.Constants.isDemoProject(projectId)) {
+        throw new error_1.FirebaseError("Project ID cannot starts with demo-");
+    }
+    return projectId;
 }
 async function selectProjectFromList(projects = []) {
     const choices = projects
@@ -179,7 +190,8 @@ async function promptAvailableProjectId() {
         throw new error_1.FirebaseError("There are no available Google Cloud projects to add Firebase services.");
     }
     if (nextPageToken) {
-        return await prompt.input("Please input the ID of the Google Cloud Project you would like to add Firebase:");
+        logger_1.logger.debug(`Found more than ${projects.length} projects, selecting via prompt`);
+        return await selectProjectByPrompting();
     }
     else {
         const choices = projects

package/lib/mcp/index.js

@@ -22,6 +22,7 @@ const logging_transport_1 = require("./logging-transport");
 const env_1 = require("../env");
 const timeout_1 = require("../timeout");
 const resources_1 = require("./resources");
+const crossSpawn = require("cross-spawn");
 const SERVER_VERSION = "0.3.0";
 const cmd = new command_1.Command("mcp");
 const orderedLogLevels = [
@@ -212,8 +213,16 @@ class FirebaseMcpServer {
             config: config_1.Config.load(options, true) || new config_1.Config({}, options),
             rc: (0, rc_1.loadRC)(options),
             accountEmail,
+            firebaseCliCommand: this._getFirebaseCliCommand(),
         };
     }
+    _getFirebaseCliCommand() {
+        if (!this.cliCommand) {
+            const testCommand = crossSpawn.sync("firebase --version");
+            this.cliCommand = testCommand.error ? "npx firebase-tools@latest" : "firebase";
+        }
+        return this.cliCommand;
+    }
     async mcpListTools() {
         await Promise.all([this.detectActiveFeatures(), this.detectProjectRoot()]);
         const hasActiveProject = !!(await this.getProjectId());