firebase-tools 14.19.0 → 14.20.0

package/lib/deploy/index.js

@@ -26,6 +26,7 @@ const prepare_1 = require("./hosting/prepare");
 const github_1 = require("../init/features/hosting/github");
 const deploy_1 = require("../commands/deploy");
 const requirePermissions_1 = require("../requirePermissions");
+const context_1 = require("./dataconnect/context");
 const TARGETS = {
     hosting: HostingTarget,
     database: DatabaseTarget,
@@ -63,7 +64,7 @@ const isDeployingWebFramework = (options) => {
 };
 exports.isDeployingWebFramework = isDeployingWebFramework;
 const deploy = async function (targetNames, options, customContext = {}) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const payload = {};
     const context = Object.assign({ projectId }, customContext);
@@ -115,34 +116,52 @@ const deploy = async function (targetNames, options, customContext = {}) {
     logger_1.logger.info((0, colorette_1.bold)((0, colorette_1.white)("===") + " Deploying to '" + projectId + "'..."));
     logger_1.logger.info();
     (0, utils_1.logBullet)("deploying " + (0, colorette_1.bold)(targetNames.join(", ")));
-    await chain(predeploys, context, options, payload);
-    await chain(prepares, context, options, payload);
-    await chain(deploys, context, options, payload);
-    await chain(releases, context, options, payload);
-    await chain(postdeploys, context, options, payload);
-    const duration = Date.now() - startTime;
-    const analyticsParams = {
-        interactive: options.nonInteractive ? "false" : "true",
-    };
-    Object.keys(TARGETS).reduce((accum, t) => {
-        accum[t] = "false";
-        return accum;
-    }, analyticsParams);
-    for (const t of targetNames) {
-        analyticsParams[t] = "true";
+    let result = "predeploys_error";
+    try {
+        await chain(predeploys, context, options, payload);
+        result = "prepares_error";
+        await chain(prepares, context, options, payload);
+        result = "deploys_error";
+        await chain(deploys, context, options, payload);
+        result = "releases_error";
+        await chain(releases, context, options, payload);
+        result = "postdeploys_error";
+        await chain(postdeploys, context, options, payload);
+        result = "success";
+    }
+    finally {
+        const baseParams = {
+            interactive: options.nonInteractive ? "false" : "true",
+            dry_run: options.dryRun ? "true" : "false",
+            result: result,
+        };
+        const duration = Date.now() - startTime;
+        const params = Object.assign({}, baseParams);
+        Object.keys(TARGETS).reduce((accum, t) => {
+            accum[t] = "false";
+            return accum;
+        }, params);
+        for (const t of targetNames) {
+            params[t] = "true";
+        }
+        void (0, track_1.trackGA4)("product_deploy", params, duration);
+        const stats = (_a = context === null || context === void 0 ? void 0 : context.dataconnect) === null || _a === void 0 ? void 0 : _a.deployStats;
+        if (stats) {
+            const fdcParams = (0, context_1.deployStatsParams)(stats);
+            void (0, track_1.trackGA4)("dataconnect_deploy", Object.assign(Object.assign({}, fdcParams), baseParams), duration);
+        }
     }
-    await (0, track_1.trackGA4)("product_deploy", analyticsParams, duration);
     const successMessage = options.dryRun ? "Dry run complete!" : "Deploy complete!";
     logger_1.logger.info();
     (0, utils_1.logSuccess)((0, colorette_1.bold)((0, colorette_1.underline)(successMessage)));
     logger_1.logger.info();
     const deployedHosting = (0, lodash_1.includes)(targetNames, "hosting");
-    logger_1.logger.info((0, colorette_1.bold)("Project Console:"), (0, utils_1.consoleUrl)((_a = options.project) !== null && _a !== void 0 ? _a : "_", "/overview"));
+    logger_1.logger.info((0, colorette_1.bold)("Project Console:"), (0, utils_1.consoleUrl)((_b = options.project) !== null && _b !== void 0 ? _b : "_", "/overview"));
     if (deployedHosting) {
-        (0, lodash_1.each)((_b = context.hosting) === null || _b === void 0 ? void 0 : _b.deploys, (deploy) => {
+        (0, lodash_1.each)((_c = context.hosting) === null || _c === void 0 ? void 0 : _c.deploys, (deploy) => {
             logger_1.logger.info((0, colorette_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)((0, api_1.hostingOrigin)(), deploy.config.site));
         });
-        const versionNames = (_c = context.hosting) === null || _c === void 0 ? void 0 : _c.deploys.map((deploy) => deploy.version);
+        const versionNames = (_d = context.hosting) === null || _d === void 0 ? void 0 : _d.deploys.map((deploy) => deploy.version);
         return { hosting: (versionNames === null || versionNames === void 0 ? void 0 : versionNames.length) === 1 ? versionNames[0] : versionNames };
     }
     else {

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,28 +54,28 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.14.0",
-            "expectedSize": 29602656,
-            "expectedChecksum": "4570cfde37b7def2ac9ead63752dda34",
-            "expectedChecksumSHA256": "88d3e13e860be59bc3520fe685b695be51341d13203838d48e7502c62504acb8",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.14.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.14.0"
+            "version": "2.15.0",
+            "expectedSize": 29610848,
+            "expectedChecksum": "182ddca17f4974ec081fd5a769f8eeac",
+            "expectedChecksumSHA256": "3bcdc39b7f149f8c2d96f397188ca003daf1b43a1ce845780146b79217970a52",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.15.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.0"
         },
         "win32": {
-            "version": "2.14.0",
-            "expectedSize": 30091264,
-            "expectedChecksum": "43338765d5f7ec2fabb6fe8f212bab82",
-            "expectedChecksumSHA256": "1de9ce32f4958c6e1e56ca7a0a7f5f4364d6cd17de77d08f76d3638830bc3c16",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.14.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.14.0.exe"
+            "version": "2.15.0",
+            "expectedSize": 30099456,
+            "expectedChecksum": "5dd4efd368c3987925c41784e21c7af6",
+            "expectedChecksumSHA256": "a664f29cd21f826dd4936f8b95f0673e0ea603ab0d85a426d8231f1aaa8947f9",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.15.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.0.exe"
         },
         "linux": {
-            "version": "2.14.0",
-            "expectedSize": 29524152,
-            "expectedChecksum": "711dd1e6d97bbeabc070efcdf0a22ee4",
-            "expectedChecksumSHA256": "bc468019bfb87b846adf02f21f65e5243854dbeee72258fe98f5e3201d1b1363",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.14.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.14.0"
+            "version": "2.15.0",
+            "expectedSize": 29532344,
+            "expectedChecksum": "38baf423fbfc9c67a89975a27f0a3974",
+            "expectedChecksumSHA256": "d3c5b26470639fedce9e3ac667948fa07473e77f6c2d0b361d78c5f2e856a1ec",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.15.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.15.0"
         }
     }
 }

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.deleteDatabase = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.instanceConsoleLink = exports.getInstance = exports.listInstances = exports.iamUserIsCSQLAdmin = void 0;
+exports.listUsers = exports.deleteUser = exports.getUser = exports.createUser = exports.deleteDatabase = exports.createDatabase = exports.getDatabase = exports.listDatabases = exports.updateInstanceForDataConnect = exports.createInstance = exports.DEFAULT_DATABASE_VERSION = exports.instanceConsoleLink = exports.getInstance = exports.listInstances = exports.iamUserIsCSQLAdmin = void 0;
 const apiv2_1 = require("../../apiv2");
 const api_1 = require("../../api");
 const clc = require("colorette");
@@ -51,6 +51,7 @@ function instanceConsoleLink(projectId, instanceId) {
     return `https://console.cloud.google.com/sql/instances/${instanceId}/overview?project=${projectId}`;
 }
 exports.instanceConsoleLink = instanceConsoleLink;
+exports.DEFAULT_DATABASE_VERSION = "POSTGRES_15";
 async function createInstance(args) {
     const databaseFlags = [{ name: "cloudsql.iam_authentication", value: "on" }];
     if (args.enableGoogleMlIntegration) {
@@ -60,7 +61,7 @@ async function createInstance(args) {
         await client.post(`projects/${args.projectId}/instances`, {
             name: args.instanceId,
             region: args.location,
-            databaseVersion: "POSTGRES_17",
+            databaseVersion: exports.DEFAULT_DATABASE_VERSION,
             settings: {
                 tier: "db-f1-micro",
                 edition: "ENTERPRISE",
@@ -70,7 +71,7 @@ async function createInstance(args) {
                 enableGoogleMlIntegration: args.enableGoogleMlIntegration,
                 databaseFlags,
                 storageAutoResize: false,
-                userLabels: { "firebase-data-connect": args.freeTrial ? "ft" : "nt" },
+                userLabels: { "firebase-data-connect": args.freeTrialLabel },
                 insightsConfig: {
                     queryInsightsEnabled: true,
                     queryPlansPerMinute: 5,

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

@@ -66,12 +66,22 @@ async function askQuestions(setup) {
             if (!configstore_1.configstore.get("gemini")) {
                 (0, utils_1.logBullet)("Learn more about Gemini in Firebase and how it uses your data: https://firebase.google.com/docs/gemini-in-firebase#how-gemini-in-firebase-uses-your-data");
             }
-            info.appDescription = await (0, prompt_1.input)({
-                message: `Describe your app to automatically generate a schema with Gemini [Enter to use a template]:`,
+            const wantToGenerate = await (0, prompt_1.confirm)({
+                message: "Do you want to generate schema and queries with Gemini?",
+                default: false,
             });
-            if (info.appDescription) {
+            if (wantToGenerate) {
                 configstore_1.configstore.set("gemini", true);
                 await (0, ensureApis_1.ensureGIFApiTos)(setup.projectId);
+                info.appDescription = await (0, prompt_1.input)({
+                    message: `Describe your app idea:`,
+                    validate: async (s) => {
+                        if (s.length > 0) {
+                            return true;
+                        }
+                        return "Please enter a description for your app idea.";
+                    },
+                });
             }
         }
         if (hasBilling) {
@@ -105,9 +115,14 @@ async function actuate(setup, config, options) {
     }
     finally {
         void (0, track_1.trackGA4)("dataconnect_init", {
-            project_status: setup.projectId ? (setup.isBillingEnabled ? "blaze" : "spark") : "missing",
             flow: info.analyticsFlow,
-            provision_cloud_sql: String(info.shouldProvisionCSQL),
+            project_status: setup.projectId
+                ? setup.isBillingEnabled
+                    ? info.shouldProvisionCSQL
+                        ? "blaze_provisioned_csql"
+                        : "blaze"
+                    : "spark"
+                : "missing",
         });
     }
     if (info.appDescription) {
@@ -136,6 +151,7 @@ async function actuateWithInfo(setup, config, info, options) {
             instanceId: info.cloudSqlInstanceId,
             databaseId: info.cloudSqlDatabase,
             requireGoogleMlIntegration: false,
+            source: info.analyticsFlow.startsWith("mcp") ? "mcp_init" : "init",
         });
     }
     const serviceName = `projects/${projectId}/locations/${info.locationId}/services/${info.serviceId}`;
@@ -448,7 +464,7 @@ 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?",
+            message: "What location would you like to use?",
             choices,
             default: exports.FDC_DEFAULT_REGION,
         });

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

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addSdkGenerateToConnectorYaml = exports.actuate = exports.askQuestions = exports.FDC_SDK_PLATFORM_ENV = exports.FDC_SDK_FRAMEWORKS_ENV = exports.FDC_APP_FOLDER = void 0;
+exports.addSdkGenerateToConnectorYaml = exports.actuate = exports.chooseApp = exports.askQuestions = exports.FDC_SDK_PLATFORM_ENV = exports.FDC_SDK_FRAMEWORKS_ENV = exports.FDC_APP_FOLDER = void 0;
 const yaml = require("yaml");
 const clc = require("colorette");
 const path = require("path");
 const cwd = process.cwd();
 const prompt_1 = require("../../../prompt");
-const appFinder_1 = require("../../../dataconnect/appFinder");
 const load_1 = require("../../../dataconnect/load");
-const types_1 = require("../../../dataconnect/types");
 const error_1 = require("../../../error");
 const lodash_1 = require("lodash");
 const utils_1 = require("../../../utils");
+const appUtils_1 = require("../../../appUtils");
 const dataconnectEmulator_1 = require("../../../emulator/dataconnectEmulator");
 const auth_1 = require("../../../auth");
 const create_app_1 = require("./create_app");
@@ -65,19 +64,20 @@ async function askQuestions(setup) {
 }
 exports.askQuestions = askQuestions;
 async function chooseApp() {
-    let apps = await (0, appFinder_1.detectApps)(cwd);
+    let apps = dedupeAppsByPlatformAndDirectory(await (0, appUtils_1.detectApps)(cwd));
     if (apps.length) {
-        (0, utils_1.logLabeledSuccess)("dataconnect", `Detected existing apps ${apps.map((a) => (0, appFinder_1.appDescription)(a)).join(", ")}`);
+        (0, utils_1.logLabeledSuccess)("dataconnect", `Detected existing apps ${apps.map((a) => (0, appUtils_1.appDescription)(a)).join(", ")}`);
     }
     else {
         (0, utils_1.logLabeledWarning)("dataconnect", "No app exists in the current directory.");
     }
     const envAppFolder = (0, utils_1.envOverride)(exports.FDC_APP_FOLDER, "");
-    const envPlatform = (0, utils_1.envOverride)(exports.FDC_SDK_PLATFORM_ENV, types_1.Platform.NONE);
+    const envPlatform = (0, utils_1.envOverride)(exports.FDC_SDK_PLATFORM_ENV, "");
     const envFrameworks = (0, utils_1.envOverride)(exports.FDC_SDK_FRAMEWORKS_ENV, "")
         .split(",")
+        .filter((f) => !!f)
         .map((f) => f);
-    if (envAppFolder && envPlatform !== types_1.Platform.NONE) {
+    if (envAppFolder && envPlatform) {
         const envAppRelDir = path.relative(cwd, path.resolve(cwd, envAppFolder));
         const matchedApps = apps.filter((app) => app.directory === envAppRelDir && (!app.platform || app.platform === envPlatform));
         if (matchedApps.length) {
@@ -97,7 +97,7 @@ async function chooseApp() {
     if (apps.length >= 2) {
         const choices = apps.map((a) => {
             return {
-                name: (0, appFinder_1.appDescription)(a),
+                name: (0, appUtils_1.appDescription)(a),
                 value: a,
                 checked: a.directory === ".",
             };
@@ -106,13 +106,14 @@ async function chooseApp() {
             message: "Which apps do you want to set up Data Connect SDKs in?",
             choices,
         });
-        if (!pickedApps.length) {
+        if (!pickedApps || !pickedApps.length) {
             throw new error_1.FirebaseError("Command Aborted. Please choose at least one app.");
         }
         apps = pickedApps;
     }
     return apps;
 }
+exports.chooseApp = chooseApp;
 async function actuate(setup, config) {
     var _a, _b;
     const fdcInfo = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.dataconnect;
@@ -143,13 +144,13 @@ async function actuate(setup, config) {
 exports.actuate = actuate;
 async function actuateWithInfo(setup, config, info) {
     if (!info.apps.length) {
-        info.apps = await (0, appFinder_1.detectApps)(cwd);
+        info.apps = await (0, appUtils_1.detectApps)(cwd);
         if (!info.apps.length) {
             (0, utils_1.logLabeledBullet)("dataconnect", "No apps to setup Data Connect Generated SDKs");
             return;
         }
     }
-    const apps = info.apps;
+    const apps = dedupeAppsByPlatformAndDirectory(info.apps);
     const connectorInfo = await chooseExistingConnector(setup, config);
     const connectorYaml = JSON.parse(JSON.stringify(connectorInfo.connectorYaml));
     for (const app of apps) {
@@ -173,14 +174,14 @@ async function actuateWithInfo(setup, config, info) {
     catch (e) {
         (0, utils_1.logLabeledError)("dataconnect", `Failed to generate Data Connect SDKs\n${e === null || e === void 0 ? void 0 : e.message}`);
     }
-    (0, utils_1.logLabeledSuccess)("dataconnect", `Installed generated SDKs for ${clc.bold(apps.map((a) => (0, appFinder_1.appDescription)(a)).join(", "))}`);
-    if (apps.some((a) => a.platform === types_1.Platform.IOS)) {
+    (0, utils_1.logLabeledSuccess)("dataconnect", `Installed generated SDKs for ${clc.bold(apps.map((a) => (0, appUtils_1.appDescription)(a)).join(", "))}`);
+    if (apps.some((a) => a.platform === appUtils_1.Platform.IOS)) {
         (0, utils_1.logBullet)(clc.bold("Please follow the instructions here to add your generated sdk to your XCode project:\n\thttps://firebase.google.com/docs/data-connect/ios-sdk#set-client"));
     }
-    if (apps.some((a) => { var _a; return (_a = a.frameworks) === null || _a === void 0 ? void 0 : _a.includes("react"); })) {
+    if (apps.some((a) => { var _a; return (_a = a.frameworks) === null || _a === void 0 ? void 0 : _a.includes(appUtils_1.Framework.REACT); })) {
         (0, utils_1.logBullet)("Visit https://firebase.google.com/docs/data-connect/web-sdk#react for more information on how to set up React Generated SDKs for Firebase Data Connect");
     }
-    if (apps.some((a) => { var _a; return (_a = a.frameworks) === null || _a === void 0 ? void 0 : _a.includes("angular"); })) {
+    if (apps.some((a) => { var _a; return (_a = a.frameworks) === null || _a === void 0 ? void 0 : _a.includes(appUtils_1.Framework.ANGULAR); })) {
         (0, utils_1.logBullet)("Run `ng add @angular/fire` to install angular sdk dependencies.\nVisit https://github.com/invertase/tanstack-query-firebase/tree/main/packages/angular for more information on how to set up Angular Generated SDKs for Firebase Data Connect");
     }
 }
@@ -222,7 +223,7 @@ function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
     }
     const generate = connectorYaml.generate;
     switch (app.platform) {
-        case types_1.Platform.WEB: {
+        case appUtils_1.Platform.WEB: {
             const javascriptSdk = {
                 outputDir: path.relative(connectorDir, path.join(appDir, `src/dataconnect-generated`)),
                 package: `@dataconnect/generated`,
@@ -241,7 +242,7 @@ function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
             }
             break;
         }
-        case types_1.Platform.FLUTTER: {
+        case appUtils_1.Platform.FLUTTER: {
             const dartSdk = {
                 outputDir: path.relative(connectorDir, path.join(appDir, `lib/dataconnect_generated`)),
                 package: "dataconnect_generated",
@@ -254,7 +255,7 @@ function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
             }
             break;
         }
-        case types_1.Platform.ANDROID: {
+        case appUtils_1.Platform.ANDROID: {
             const kotlinSdk = {
                 outputDir: path.relative(connectorDir, path.join(appDir, `src/main/kotlin`)),
                 package: `com.google.firebase.dataconnect.generated`,
@@ -267,7 +268,7 @@ function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
             }
             break;
         }
-        case types_1.Platform.IOS: {
+        case appUtils_1.Platform.IOS: {
             const swiftSdk = {
                 outputDir: path.relative(connectorDir, path.join(app.directory, `../FirebaseDataConnectGenerated`)),
                 package: "DataConnectGenerated",
@@ -281,9 +282,26 @@ function addSdkGenerateToConnectorYaml(connectorInfo, connectorYaml, app) {
             break;
         }
         default:
-            throw new error_1.FirebaseError(`Unsupported platform ${app.platform} for Data Connect SDK generation. Supported platforms are: ${Object.values(types_1.Platform)
-                .filter((p) => p !== types_1.Platform.NONE && p !== types_1.Platform.MULTIPLE)
-                .join(", ")}\n${JSON.stringify(app)}`);
+            throw new error_1.FirebaseError(`Unsupported platform ${app.platform} for Data Connect SDK generation. Supported platforms are: ${Object.values(appUtils_1.Platform).join(", ")}\n${JSON.stringify(app)}`);
     }
 }
 exports.addSdkGenerateToConnectorYaml = addSdkGenerateToConnectorYaml;
+function dedupeAppsByPlatformAndDirectory(apps) {
+    var _a;
+    const uniqueApps = new Map();
+    for (const app of apps) {
+        const frameworkKey = app.frameworks ? [...app.frameworks].sort().join(",") : "";
+        const key = `${app.platform}:${app.directory}:${frameworkKey}`;
+        if (!uniqueApps.has(key)) {
+            const minifiedApp = {
+                platform: app.platform,
+                directory: app.directory,
+            };
+            if ((_a = app.frameworks) === null || _a === void 0 ? void 0 : _a.length) {
+                minifiedApp.frameworks = [...app.frameworks];
+            }
+            uniqueApps.set(key, minifiedApp);
+        }
+    }
+    return Array.from(uniqueApps.values());
+}

package/lib/management/apps.js

@@ -9,46 +9,49 @@ const api_1 = require("../api");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const operation_poller_1 = require("../operation-poller");
-const types_1 = require("../dataconnect/types");
 const projectUtils_1 = require("../projectUtils");
-const prompt = require("../prompt");
+const prompt_1 = require("../prompt");
 const projects_1 = require("./projects");
-const appFinder_1 = require("../dataconnect/appFinder");
+const appUtils_1 = require("../appUtils");
 const utils_1 = require("../utils");
 const TIMEOUT_MILLIS = 30000;
 exports.APP_LIST_PAGE_SIZE = 100;
 const CREATE_APP_API_REQUEST_TIMEOUT_MILLIS = 15000;
 async function getDisplayName() {
-    return await prompt.input("What would you like to call your app?");
+    return await (0, prompt_1.input)("What would you like to call your app?");
 }
 async function getPlatform(appDir, config) {
-    let targetPlatform = await (0, appFinder_1.getPlatformFromFolder)(appDir);
-    if (targetPlatform === types_1.Platform.NONE) {
+    let targetPlatforms = await (0, appUtils_1.getPlatformsFromFolder)(appDir);
+    let targetPlatform;
+    if (targetPlatforms.length === 0) {
         appDir = await (0, utils_1.promptForDirectory)({
             config,
             relativeTo: appDir,
             message: "We couldn't determine what kind of app you're using. Where is your app directory?",
         });
-        targetPlatform = await (0, appFinder_1.getPlatformFromFolder)(appDir);
+        targetPlatforms = await (0, appUtils_1.getPlatformsFromFolder)(appDir);
     }
-    if (targetPlatform === types_1.Platform.NONE || targetPlatform === types_1.Platform.MULTIPLE) {
-        if (targetPlatform === types_1.Platform.NONE) {
-            (0, utils_1.logBullet)(`Couldn't automatically detect app your in directory ${appDir}.`);
+    if (targetPlatforms.length !== 1) {
+        if (targetPlatforms.length === 0) {
+            (0, utils_1.logBullet)(`Couldn't automatically detect your app in directory ${appDir}.`);
         }
         else {
             (0, utils_1.logSuccess)(`Detected multiple app platforms in directory ${appDir}`);
         }
         const platforms = [
-            { name: "iOS (Swift)", value: types_1.Platform.IOS },
-            { name: "Web (JavaScript)", value: types_1.Platform.WEB },
-            { name: "Android (Kotlin)", value: types_1.Platform.ANDROID },
+            { name: "iOS (Swift)", value: appUtils_1.Platform.IOS },
+            { name: "Web (JavaScript)", value: appUtils_1.Platform.WEB },
+            { name: "Android (Kotlin)", value: appUtils_1.Platform.ANDROID },
         ];
-        targetPlatform = await prompt.select({
+        targetPlatform = await (0, prompt_1.select)({
             message: "Which platform do you want to set up an SDK for? Note: We currently do not support automatically setting up C++ or Unity projects.",
             choices: platforms,
         });
     }
-    else if (targetPlatform === types_1.Platform.FLUTTER) {
+    else {
+        targetPlatform = targetPlatforms[0];
+    }
+    if (targetPlatform === appUtils_1.Platform.FLUTTER) {
         (0, utils_1.logWarning)(`Detected ${targetPlatform} app in directory ${appDir}`);
         throw new error_1.FirebaseError(`Flutter is not supported by apps:configure.
 Please follow the link below to set up firebase for your Flutter app:
@@ -58,18 +61,15 @@ https://firebase.google.com/docs/flutter/setup
     else {
         (0, utils_1.logSuccess)(`Detected ${targetPlatform} app in directory ${appDir}`);
     }
-    return targetPlatform === types_1.Platform.MULTIPLE
-        ? AppPlatform.PLATFORM_UNSPECIFIED
-        : targetPlatform;
+    return targetPlatform;
 }
 exports.getPlatform = getPlatform;
 async function initiateIosAppCreation(options) {
     if (!options.nonInteractive) {
         options.displayName = options.displayName || (await getDisplayName());
-        options.bundleId =
-            options.bundleId || (await prompt.input("Please specify your iOS app bundle ID:"));
+        options.bundleId = options.bundleId || (await (0, prompt_1.input)("Please specify your iOS app bundle ID:"));
         options.appStoreId =
-            options.appStoreId || (await prompt.input("Please specify your iOS app App Store ID:"));
+            options.appStoreId || (await (0, prompt_1.input)("Please specify your iOS app App Store ID:"));
     }
     if (!options.bundleId) {
         throw new error_1.FirebaseError("Bundle ID for iOS app cannot be empty");
@@ -93,7 +93,7 @@ async function initiateAndroidAppCreation(options) {
     if (!options.nonInteractive) {
         options.displayName = options.displayName || (await getDisplayName());
         options.packageName =
-            options.packageName || (await prompt.input("Please specify your Android app package name:"));
+            options.packageName || (await (0, prompt_1.input)("Please specify your Android app package name:"));
     }
     if (!options.packageName) {
         throw new error_1.FirebaseError("Package name for Android app cannot be empty");
@@ -179,7 +179,7 @@ async function selectAppInteractively(apps, appPlatform) {
             value: app,
         };
     });
-    return await prompt.select({
+    return await (0, prompt_1.select)({
         message: `Select the ${appPlatform === AppPlatform.ANY ? "" : appPlatform + " "}` +
             "app to get the configuration data:",
         choices,
@@ -416,7 +416,7 @@ async function writeConfigToFile(filename, nonInteractive, fileContents) {
         if (nonInteractive) {
             throw new error_1.FirebaseError(`${filename} already exists`);
         }
-        const overwrite = await prompt.confirm(`${filename} already exists. Do you want to overwrite?`);
+        const overwrite = await (0, prompt_1.confirm)(`${filename} already exists. Do you want to overwrite?`);
         if (!overwrite) {
             return false;
         }

package/lib/mcp/prompts/core/consult.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.consult = void 0;
-const appFinder_1 = require("../../../dataconnect/appFinder");
+const appUtils_1 = require("../../../appUtils");
 const fdcExperience_1 = require("../../../gemini/fdcExperience");
 const errors_1 = require("../../errors");
 const prompt_1 = require("../../prompt");
@@ -32,8 +32,7 @@ exports.consult = (0, prompt_1.prompt)({
             },
         ];
     }
-    const apps = await (0, appFinder_1.detectApps)(config.projectDir);
-    const platforms = apps.map((a) => a.platform);
+    const platforms = await (0, appUtils_1.getPlatformsFromFolder)(config.projectDir);
     const gifPrompt = `I am using a coding agent to build with Firebase and I have a specific question that I would like answered. Provide a robust and detailed response that will help the coding agent act on my behalf in a local workspace.
 
 App Platform(s): ${platforms.join(", ")}

package/lib/mcp/prompts/core/init.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
-const appFinder_1 = require("../../../dataconnect/appFinder");
-const types_1 = require("../../../dataconnect/types");
+const appUtils_1 = require("../../../appUtils");
 const prompt_1 = require("../../prompt");
 exports.init = (0, prompt_1.prompt)({
     name: "init",
@@ -12,7 +11,7 @@ exports.init = (0, prompt_1.prompt)({
     },
 }, async (_, mcp) => {
     const { config, projectId, accountEmail, firebaseCliCommand } = mcp;
-    const platform = await (0, appFinder_1.getPlatformFromFolder)(config.projectDir);
+    const platforms = await (0, appUtils_1.getPlatformsFromFolder)(config.projectDir);
     return [
         {
             role: "user",
@@ -29,7 +28,7 @@ Your goal is to help the user setup Firebase services in this workspace. Firebas
 
 Use this information to determine which Firebase services the user is already using (if any).
 
-Workspace platform: ${[types_1.Platform.NONE, types_1.Platform.MULTIPLE].includes(platform) ? "<UNABLE TO DETECT>" : platform}
+Workspace platform(s): ${platforms.length > 0 ? platforms.join(", ") : "<UNABLE TO DETECT>"}
 Active user: ${accountEmail || "<NONE>"}
 Active project: ${projectId || "<NONE>"}
 

package/lib/mcp/resources/index.js

@@ -5,19 +5,15 @@ const docs_1 = require("./docs");
 const init_ai_1 = require("./guides/init_ai");
 const init_auth_1 = require("./guides/init_auth");
 const init_backend_1 = require("./guides/init_backend");
-const init_data_connect_1 = require("./guides/init_data_connect");
 const init_firestore_1 = require("./guides/init_firestore");
 const init_firestore_rules_1 = require("./guides/init_firestore_rules");
 const init_hosting_1 = require("./guides/init_hosting");
-const init_rtdb_1 = require("./guides/init_rtdb");
 const track_1 = require("../../track");
 exports.resources = [
     init_backend_1.init_backend,
     init_ai_1.init_ai,
-    init_data_connect_1.init_data_connect,
     init_firestore_1.init_firestore,
     init_firestore_rules_1.init_firestore_rules,
-    init_rtdb_1.init_rtdb,
     init_auth_1.init_auth,
     init_hosting_1.init_hosting,
 ];

package/lib/mcp/tools/dataconnect/execute.js

@@ -56,7 +56,6 @@ You can find candidate service_id in \`dataconnect.yaml\`
         executeGraphQL = dataplane.executeGraphQLRead;
     }
     const response = await executeGraphQL(apiClient, serviceInfo.serviceName, {
-        name: "",
         query,
         variables: (0, converter_1.parseVariables)(unparsedVariables),
         extensions: {

package/lib/mcp/util/dataconnect/converter.js

@@ -49,14 +49,15 @@ function graphqlResponseToToolResponse(g) {
 }
 exports.graphqlResponseToToolResponse = graphqlResponseToToolResponse;
 function parseVariables(unparsedVariables) {
+    let obj;
     try {
-        const variables = JSON.parse(unparsedVariables || "{}");
-        if (typeof variables !== "object")
-            throw new Error("not an object");
-        return variables;
+        obj = JSON.parse(unparsedVariables || "{}");
     }
     catch (e) {
         throw new Error("Provided variables string `" + unparsedVariables + "` is not valid JSON.");
     }
+    if (typeof obj !== "object" || obj == null)
+        throw new Error("not an object");
+    return obj;
 }
 exports.parseVariables = parseVariables;

package/lib/mcp/util/dataconnect/emulator.js

@@ -9,7 +9,6 @@ async function getDataConnectEmulatorClient(host) {
     const apiClient = new apiv2_1.Client({
         urlPrefix: emulatorUrl,
         apiVersion: dataplaneClient_1.DATACONNECT_API_VERSION,
-        auth: false,
     });
     return apiClient;
 }