firebase-tools 14.11.1 → 14.12.0

package/lib/api.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.crashlyticsApiOrigin = exports.messagingApiOrigin = 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.authManagementOrigin = 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.appTestingOrigin = exports.cloudAiCompanionOrigin = 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 = exports.hostingApiOrigin = exports.firebaseStorageOrigin = void 0;
+exports.setScopes = exports.getScopes = exports.appTestingOrigin = exports.cloudAiCompanionOrigin = exports.vertexAIOrigin = exports.cloudSQLAdminOrigin = exports.dataConnectLocalConnString = exports.dataconnectP4SADomain = exports.dataconnectOrigin = exports.githubClientSecret = exports.githubClientId = exports.computeOrigin = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = exports.studioApiOrigin = exports.serviceUsageOrigin = exports.cloudRunApiOrigin = exports.hostingApiOrigin = exports.firebaseStorageOrigin = void 0;
 const constants_1 = require("./emulator/constants");
 const logger_1 = require("./logger");
 const scopes = require("./scopes");
@@ -120,6 +120,8 @@ const cloudRunApiOrigin = () => utils.envOverride("CLOUD_RUN_API_URL", "https://
 exports.cloudRunApiOrigin = cloudRunApiOrigin;
 const serviceUsageOrigin = () => utils.envOverride("FIREBASE_SERVICE_USAGE_URL", "https://serviceusage.googleapis.com");
 exports.serviceUsageOrigin = serviceUsageOrigin;
+const studioApiOrigin = () => utils.envOverride("FIREBASE_STUDIO_URL", "https://monospace-pa.googleapis.com");
+exports.studioApiOrigin = studioApiOrigin;
 const githubOrigin = () => utils.envOverride("GITHUB_URL", "https://github.com");
 exports.githubOrigin = githubOrigin;
 const githubApiOrigin = () => utils.envOverride("GITHUB_API_URL", "https://api.github.com");

package/lib/apptesting/ensureProjectConfigured.js

@@ -11,9 +11,10 @@ const prompt_1 = require("../prompt");
 const TEST_RUNNER_ROLE = "roles/firebaseapptesting.testRunner";
 const TEST_RUNNER_SERVICE_ACCOUNT_NAME = "firebaseapptesting-test-runner";
 async function ensureProjectConfigured(projectId) {
-    await (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.appTestingOrigin)(), "storage", false);
-    await (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.appTestingOrigin)(), "run", false);
-    await (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.appTestingOrigin)(), "artifactregistry", false);
+    await (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.appTestingOrigin)(), "Firebase App Testing", false);
+    await (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.cloudRunApiOrigin)(), "Cloud Run", false);
+    await (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.storageOrigin)(), "Cloud Storage", false);
+    await (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.artifactRegistryDomain)(), "Artifact Registry", false);
     const serviceAccount = runnerServiceAccount(projectId);
     const serviceAccountExistsAndIsRunner = await (0, resourceManager_1.serviceAccountHasRoles)(projectId, serviceAccount, [TEST_RUNNER_ROLE], true);
     if (!serviceAccountExistsAndIsRunner) {

package/lib/command.js

@@ -12,8 +12,10 @@ const detectProjectRoot_1 = require("./detectProjectRoot");
 const track_1 = require("./track");
 const auth_1 = require("./auth");
 const projects_1 = require("./management/projects");
+const studio_1 = require("./management/studio");
 const requireAuth_1 = require("./requireAuth");
 const logger_1 = require("./logger");
+const env_1 = require("./env");
 class Command {
     constructor(cmd) {
         this.cmd = cmd;
@@ -184,19 +186,23 @@ class Command {
         if (activeAccount) {
             (0, auth_1.setActiveAccount)(options, activeAccount);
         }
-        this.applyRC(options);
+        await this.applyRC(options);
         if (options.project) {
             await this.resolveProjectIdentifiers(options);
             validateProjectId(options.projectId);
         }
     }
-    applyRC(options) {
+    async applyRC(options) {
         var _a, _b;
         const rc = (0, rc_1.loadRC)(options);
         options.rc = rc;
-        const activeProject = options.projectRoot
+        let activeProject = options.projectRoot
             ? ((_a = configstore_1.configstore.get("activeProjects")) !== null && _a !== void 0 ? _a : {})[options.projectRoot]
             : undefined;
+        const isUseCommand = process.argv.includes("use");
+        if ((0, env_1.isFirebaseStudio)() && !options.project && !isUseCommand) {
+            activeProject = await (0, studio_1.reconcileStudioFirebaseProject)(options, activeProject);
+        }
         options.project = (_b = options.project) !== null && _b !== void 0 ? _b : activeProject;
         if (options.config && !options.project) {
             options.project = options.config.defaults.project;

package/lib/commands/ext-export.js

@@ -45,7 +45,7 @@ exports.command = new command_1.Command("ext:export")
         return;
     }
     const manifestSpecs = withRefSubbed.map((spec) => {
-        const paramCopy = Object.assign({}, spec.params);
+        const paramCopy = Object.assign(Object.assign({}, spec.params), spec.systemParams);
         if (spec.eventarcChannel) {
             paramCopy.EVENTARC_CHANNEL = spec.eventarcChannel;
         }

package/lib/commands/init.js

@@ -16,7 +16,6 @@ const utils = require("../utils");
 const experiments_1 = require("../experiments");
 const templates_1 = require("../templates");
 const error_1 = require("../error");
-const track_1 = require("../track");
 const homeDir = os.homedir();
 const BANNER_TEXT = (0, templates_1.readTemplateSync)("banner.txt");
 const GITIGNORE_TEMPLATE = (0, templates_1.readTemplateSync)("_gitignore");
@@ -106,6 +105,12 @@ if ((0, experiments_1.isEnabled)("apptesting")) {
         checked: false,
     });
 }
+choices.push({
+    value: "aitools",
+    name: "AI Tools: Configure AI coding assistants to work with your Firebase project",
+    checked: false,
+    hidden: true,
+});
 const featureNames = choices.map((choice) => choice.value);
 const HELP = `Interactively configure the current directory as a Firebase project or initialize new features in an already configured Firebase project directory.
 
@@ -122,14 +127,13 @@ exports.command = new command_1.Command("init [feature]")
     .before(requireAuth_1.requireAuth)
     .action(initAction);
 async function initAction(feature, options) {
-    var _a, _b;
+    var _a;
     if (feature && !featureNames.includes(feature)) {
         return utils.reject(clc.bold(feature) +
             " is not a supported feature; must be one of " +
             featureNames.join(", ") +
             ".");
     }
-    const start = process.uptime();
     const cwd = options.cwd || process.cwd();
     const warnings = [];
     let warningText = "";
@@ -209,8 +213,6 @@ async function initAction(feature, options) {
     if (!fsutils.fileExistsSync(config.path(".gitignore"))) {
         config.writeProjectFile(".gitignore", GITIGNORE_TEMPLATE);
     }
-    const duration = Math.floor((process.uptime() - start) * 1000);
-    await (0, track_1.trackGA4)("product_init", { products_initialized: (_b = setup.features) === null || _b === void 0 ? void 0 : _b.join(",") }, duration);
     logger_1.logger.info();
     utils.logSuccess("Firebase initialization complete!");
 }

package/lib/commands/internaltesting-functions-discover.js

@@ -8,6 +8,10 @@ const projectConfig_1 = require("../functions/projectConfig");
 const adminSdkConfig_1 = require("../emulator/adminSdkConfig");
 const projectUtils_1 = require("../projectUtils");
 const error_1 = require("../error");
+const ensureApiEnabled = require("../ensureApiEnabled");
+const api_1 = require("../api");
+const experiments = require("../experiments");
+const prepareFunctionsUpload_1 = require("../deploy/functions/prepareFunctionsUpload");
 exports.command = new command_1.Command("internaltesting:functions:discover")
     .description("discover function triggers defined in the current project directory")
     .action(async (options) => {
@@ -17,9 +21,20 @@ exports.command = new command_1.Command("internaltesting:functions:discover")
     if (!firebaseConfig) {
         throw new error_1.FirebaseError("Admin SDK config unexpectedly undefined - have you run firebase init?");
     }
-    const builds = await (0, prepare_1.loadCodebases)(fnConfig, options, firebaseConfig, {
-        firebase: firebaseConfig,
-    });
-    logger_1.logger.info(JSON.stringify(builds, null, 2));
-    return builds;
+    let runtimeConfig = { firebase: firebaseConfig };
+    const allowFunctionsConfig = experiments.isEnabled("dangerouslyAllowFunctionsConfig");
+    if (allowFunctionsConfig) {
+        try {
+            const runtimeConfigApiEnabled = await ensureApiEnabled.check(projectId, (0, api_1.runtimeconfigOrigin)(), "runtimeconfig", true);
+            if (runtimeConfigApiEnabled) {
+                runtimeConfig = Object.assign(Object.assign({}, runtimeConfig), (await (0, prepareFunctionsUpload_1.getFunctionsConfig)(projectId)));
+            }
+        }
+        catch (err) {
+            logger_1.logger.debug("Could not check Runtime Config API status, assuming disabled:", err);
+        }
+    }
+    const wantBuilds = await (0, prepare_1.loadCodebases)(fnConfig, options, firebaseConfig, runtimeConfig, undefined);
+    logger_1.logger.info(JSON.stringify(wantBuilds, null, 2));
+    return wantBuilds;
 });

package/lib/commands/login.js

@@ -22,7 +22,7 @@ exports.command = new command_1.Command("login")
     }
     const user = options.user;
     const tokens = options.tokens;
-    if (user && tokens && !options.reauth) {
+    if (user && (tokens === null || tokens === void 0 ? void 0 : tokens.refresh_token) && !options.reauth) {
         logger_1.logger.info("Already logged in as", clc.bold(user.email));
         return user;
     }
@@ -37,7 +37,7 @@ exports.command = new command_1.Command("login")
         configstore_1.configstore.set("usage", collectUsage);
         if (geminiUsage || collectUsage) {
             logger_1.logger.info();
-            utils.logBullet("To change your the preference at any time, run `firebase logout` and `firebase login` again.");
+            utils.logBullet("To change your preferences at any time, run `firebase logout` and `firebase login` again.");
         }
     }
     const useLocalhost = (0, utils_1.isCloudEnvironment)() ? false : options.localhost;

package/lib/commands/use.js

@@ -4,12 +4,14 @@ exports.command = exports.setNewActive = void 0;
 const clc = require("colorette");
 const command_1 = require("../command");
 const projects_1 = require("../management/projects");
+const studio_1 = require("../management/studio");
 const logger_1 = require("../logger");
 const prompt_1 = require("../prompt");
 const requireAuth_1 = require("../requireAuth");
 const command_2 = require("../command");
 const utils = require("../utils");
 const error_1 = require("../error");
+const env_1 = require("../env");
 function listAliases(options) {
     if (options.rc.hasProjects) {
         logger_1.logger.info("Project aliases for", clc.bold(options.projectRoot || "") + ":");
@@ -41,6 +43,9 @@ async function setNewActive(projectOrAlias, aliasOpt, rc, projectRoot) {
     catch (_a) {
         throw new error_1.FirebaseError("Invalid project selection, " + verifyMessage(projectOrAlias));
     }
+    if ((0, env_1.isFirebaseStudio)()) {
+        await (0, studio_1.updateStudioFirebaseProject)(resolvedProject);
+    }
     if (aliasOpt) {
         if (!project) {
             throw new error_1.FirebaseError(`Cannot create alias ${clc.bold(aliasOpt)}, ${verifyMessage(projectOrAlias)}`);

package/lib/dataconnect/ensureApis.js

@@ -12,6 +12,7 @@ async function ensureApis(projectId) {
 exports.ensureApis = ensureApis;
 async function ensureSparkApis(projectId) {
     await (0, ensureApiEnabled_1.ensure)(projectId, api.cloudSQLAdminOrigin(), prefix);
+    await (0, ensureApiEnabled_1.ensure)(projectId, api.dataconnectOrigin(), prefix);
 }
 exports.ensureSparkApis = ensureSparkApis;
 async function ensureGIFApis(projectId) {

package/lib/deploy/functions/params.js

@@ -108,6 +108,10 @@ class ParamValue {
         return ["true", "y", "yes", "1"].includes(this.rawValue);
     }
     asList() {
+        if (this.rawValue.includes("[")) {
+            const unquoted = this.rawValue.replace(/'/g, '"');
+            return JSON.parse(unquoted);
+        }
         return this.rawValue.split(this.delimiter);
     }
     asNumber() {

package/lib/deploy/functions/prepare.js

@@ -11,6 +11,7 @@ const runtimes = require("./runtimes");
 const supported = require("./runtimes/supported");
 const validate = require("./validate");
 const ensure = require("./ensure");
+const experiments = require("../../experiments");
 const api_1 = require("../../api");
 const functionsDeployHelper_1 = require("./functionsDeployHelper");
 const utils_1 = require("../../utils");
@@ -51,13 +52,12 @@ async function prepare(context, options, payload) {
     ]);
     const firebaseConfig = await functionsConfig.getFirebaseConfig(options);
     context.firebaseConfig = firebaseConfig;
+    context.codebaseDeployEvents = {};
     let runtimeConfig = { firebase: firebaseConfig };
-    if (checkAPIsEnabled[1]) {
-        const config = await (0, prepareFunctionsUpload_1.getFunctionsConfig)(projectId);
-        runtimeConfig = Object.assign(Object.assign({}, runtimeConfig), config);
-        context.hasRuntimeConfig = Object.keys(config).length > 0;
+    const allowFunctionsConfig = experiments.isEnabled("dangerouslyAllowFunctionsConfig");
+    if (allowFunctionsConfig && checkAPIsEnabled[1]) {
+        runtimeConfig = Object.assign(Object.assign({}, runtimeConfig), (await (0, prepareFunctionsUpload_1.getFunctionsConfig)(projectId)));
     }
-    context.codebaseDeployEvents = {};
     const wantBuilds = await loadCodebases(context.config, options, firebaseConfig, runtimeConfig, context.filters);
     if (Object.values(wantBuilds).some((b) => b.extensions)) {
         const extContext = {};

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,28 +54,28 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.10.1",
-            "expectedSize": 29336416,
-            "expectedChecksum": "328ae0a354505430f1c162edf37da776",
-            "expectedChecksumSHA256": "ede5dc299045151f228b2adc346f47ad5d3ee10c3c9d7528df5fc0f0c6d70808",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.10.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.10.1"
+            "version": "2.11.0",
+            "expectedSize": 29234016,
+            "expectedChecksum": "96da48708b8210f0d3d97099d777b322",
+            "expectedChecksumSHA256": "10fe334f2c4145e4c9d27bc442bdc92b1252164d3daac47bb7555da42b6d7050",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-v2.11.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.0"
         },
         "win32": {
-            "version": "2.10.1",
-            "expectedSize": 29829632,
-            "expectedChecksum": "82e82e35c1728a214db37967dba751e7",
-            "expectedChecksumSHA256": "ba509e921c692ac60c1138b5b9c83a23b4e11feb339f08df5f1cfced44cffc91",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.10.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.10.1.exe"
+            "version": "2.11.0",
+            "expectedSize": 29719040,
+            "expectedChecksum": "df6b221af204a4a21163bcc73367f99e",
+            "expectedChecksumSHA256": "af17c0d873b2b8f1919652c1ad9fd4aed417cd82bc35bbc5cc4a302fc90f9a03",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-v2.11.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.0.exe"
         },
         "linux": {
-            "version": "2.10.1",
-            "expectedSize": 29266104,
-            "expectedChecksum": "d183c2335e16f8c568bdc9e782dcd240",
-            "expectedChecksumSHA256": "338e0cce561d29993737b91abfe7fc12c7d82d014ef114348ccdafeb3b7be3ae",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.10.1",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.10.1"
+            "version": "2.11.0",
+            "expectedSize": 29159608,
+            "expectedChecksum": "38d6161f7e8f06ee89e5dc4094f1a9b6",
+            "expectedChecksumSHA256": "3391efac3570164141b5d7f3e3d48b6426ec9c8cf9eafeabee3fa31678120218",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-v2.11.0",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.11.0"
         }
     }
 }

package/lib/firestore/api-types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecurrenceType = exports.PointInTimeRecoveryEnablement = exports.PointInTimeRecoveryEnablementOption = exports.DatabaseDeleteProtectionState = exports.DatabaseDeleteProtectionStateOption = exports.DatabaseType = exports.StateTtl = exports.State = exports.ArrayConfig = exports.Order = exports.QueryScope = exports.Mode = void 0;
+exports.RecurrenceType = exports.DatabaseEdition = exports.PointInTimeRecoveryEnablement = exports.PointInTimeRecoveryEnablementOption = exports.DatabaseDeleteProtectionState = exports.DatabaseDeleteProtectionStateOption = exports.DatabaseType = exports.StateTtl = exports.State = exports.ArrayConfig = exports.Order = exports.QueryScope = exports.Mode = void 0;
 var Mode;
 (function (Mode) {
     Mode["ASCENDING"] = "ASCENDING";
@@ -58,6 +58,12 @@ var PointInTimeRecoveryEnablement;
     PointInTimeRecoveryEnablement["ENABLED"] = "POINT_IN_TIME_RECOVERY_ENABLED";
     PointInTimeRecoveryEnablement["DISABLED"] = "POINT_IN_TIME_RECOVERY_DISABLED";
 })(PointInTimeRecoveryEnablement = exports.PointInTimeRecoveryEnablement || (exports.PointInTimeRecoveryEnablement = {}));
+var DatabaseEdition;
+(function (DatabaseEdition) {
+    DatabaseEdition["DATABASE_EDITION_UNSPECIFIED"] = "DATABASE_EDITION_UNSPECIFIED";
+    DatabaseEdition["STANDARD"] = "STANDARD";
+    DatabaseEdition["ENTERPRISE"] = "ENTERPRISE";
+})(DatabaseEdition = exports.DatabaseEdition || (exports.DatabaseEdition = {}));
 var RecurrenceType;
 (function (RecurrenceType) {
     RecurrenceType["DAILY"] = "DAILY";

package/lib/firestore/pretty-print.js

@@ -41,7 +41,11 @@ class PrettyPrint {
             head: ["Field", "Value"],
             colWidths: [30, colValueWidth],
         });
-        table.push(["Name", clc.yellow(database.name)], ["Create Time", clc.yellow(database.createTime)], ["Last Update Time", clc.yellow(database.updateTime)], ["Type", clc.yellow(database.type)], ["Location", clc.yellow(database.locationId)], ["Delete Protection State", clc.yellow(database.deleteProtectionState)], ["Point In Time Recovery", clc.yellow(database.pointInTimeRecoveryEnablement)], ["Earliest Version Time", clc.yellow(database.earliestVersionTime)], ["Version Retention Period", clc.yellow(database.versionRetentionPeriod)]);
+        const edition = !database.databaseEdition ||
+            database.databaseEdition === types.DatabaseEdition.DATABASE_EDITION_UNSPECIFIED
+            ? types.DatabaseEdition.STANDARD
+            : database.databaseEdition;
+        table.push(["Name", clc.yellow(database.name)], ["Create Time", clc.yellow(database.createTime)], ["Last Update Time", clc.yellow(database.updateTime)], ["Type", clc.yellow(database.type)], ["Edition", clc.yellow(edition)], ["Location", clc.yellow(database.locationId)], ["Delete Protection State", clc.yellow(database.deleteProtectionState)], ["Point In Time Recovery", clc.yellow(database.pointInTimeRecoveryEnablement)], ["Earliest Version Time", clc.yellow(database.earliestVersionTime)], ["Version Retention Period", clc.yellow(database.versionRetentionPeriod)]);
         if (database.cmekConfig) {
             table.push(["KMS Key Name", clc.yellow(database.cmekConfig.kmsKeyName)]);
             if (database.cmekConfig.activeKeyVersion) {

package/lib/init/features/aitools/claude.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.claude = void 0;
 const promptUpdater_1 = require("./promptUpdater");
-const CLAUDE_SETTINGS_PATH = ".claude/settings.local.json";
-const CLAUDE_PROMPT_PATH = "CLAUDE.local.md";
+const MCP_CONFIG_PATH = ".mcp.json";
+const CLAUDE_PROMPT_PATH = "CLAUDE.md";
 exports.claude = {
     name: "claude",
     displayName: "Claude Code",
@@ -11,9 +11,9 @@ exports.claude = {
         var _a;
         const files = [];
         let existingConfig = {};
-        let settingsUpdated = false;
+        let mcpUpdated = false;
         try {
-            const existingContent = config.readProjectFile(CLAUDE_SETTINGS_PATH);
+            const existingContent = config.readProjectFile(MCP_CONFIG_PATH);
             if (existingContent) {
                 existingConfig = JSON.parse(existingContent);
             }
@@ -28,10 +28,10 @@ exports.claude = {
                 command: "npx",
                 args: ["-y", "firebase-tools", "experimental:mcp", "--dir", projectPath],
             };
-            config.writeProjectFile(CLAUDE_SETTINGS_PATH, JSON.stringify(existingConfig, null, 2));
-            settingsUpdated = true;
+            config.writeProjectFile(MCP_CONFIG_PATH, JSON.stringify(existingConfig, null, 2));
+            mcpUpdated = true;
         }
-        files.push({ path: CLAUDE_SETTINGS_PATH, updated: settingsUpdated });
+        files.push({ path: MCP_CONFIG_PATH, updated: mcpUpdated });
         const { updated } = await (0, promptUpdater_1.updateFirebaseSection)(config, CLAUDE_PROMPT_PATH, enabledFeatures, {
             interactive: true,
         });

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

@@ -107,7 +107,7 @@ async function actuate(setup, config, options) {
         info.connectors = [defaultConnector];
     }
     await writeFiles(config, info, options);
-    if (setup.projectId && info.shouldProvisionCSQL) {
+    if (setup.projectId && info.shouldProvisionCSQL && (await (0, cloudbilling_1.isBillingEnabled)(setup))) {
         await (0, provisionCloudSql_1.provisionCloudSql)({
             projectId: setup.projectId,
             location: info.locationId,

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

@@ -170,7 +170,7 @@ async function actuate(sdkInfo, config) {
     var _a, _b;
     const connectorYamlPath = `${sdkInfo.connectorInfo.directory}/connector.yaml`;
     (0, utils_1.logBullet)(`Writing your new SDK configuration to ${connectorYamlPath}`);
-    await config.askWriteProjectFile(path.relative(config.projectDir, connectorYamlPath), sdkInfo.connectorYamlContents, false, true);
+    config.writeProjectFile(path.relative(config.projectDir, connectorYamlPath), sdkInfo.connectorYamlContents);
     const account = (0, auth_1.getGlobalDefaultAccount)();
     await dataconnectEmulator_1.DataConnectEmulator.generate({
         configDir: sdkInfo.connectorInfo.directory,

package/lib/init/features/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apptestingAcutate = exports.apptestingAskQuestions = exports.genkit = exports.apphosting = exports.dataconnectSdk = exports.dataconnectPostSetup = exports.dataconnectActuate = exports.dataconnectAskQuestions = exports.hostingGithub = exports.remoteconfig = exports.project = exports.extensions = exports.emulators = exports.storageActuate = exports.storageAskQuestions = exports.hosting = exports.functions = exports.firestoreActuate = exports.firestoreAskQuestions = exports.databaseActuate = exports.databaseAskQuestions = exports.account = void 0;
+exports.aitools = exports.apptestingAcutate = exports.apptestingAskQuestions = exports.genkit = exports.apphosting = exports.dataconnectSdk = exports.dataconnectPostSetup = exports.dataconnectActuate = exports.dataconnectAskQuestions = exports.hostingGithub = exports.remoteconfig = exports.project = exports.extensions = exports.emulators = exports.storageActuate = exports.storageAskQuestions = exports.hosting = exports.functions = exports.firestoreActuate = exports.firestoreAskQuestions = exports.databaseActuate = exports.databaseAskQuestions = exports.account = void 0;
 var account_1 = require("./account");
 Object.defineProperty(exports, "account", { enumerable: true, get: function () { return account_1.doSetup; } });
 var database_1 = require("./database");
@@ -39,3 +39,5 @@ Object.defineProperty(exports, "genkit", { enumerable: true, get: function () {
 var apptesting_1 = require("./apptesting");
 Object.defineProperty(exports, "apptestingAskQuestions", { enumerable: true, get: function () { return apptesting_1.askQuestions; } });
 Object.defineProperty(exports, "apptestingAcutate", { enumerable: true, get: function () { return apptesting_1.actuate; } });
+var aitools_1 = require("./aitools");
+Object.defineProperty(exports, "aitools", { enumerable: true, get: function () { return aitools_1.doSetup; } });

package/lib/init/index.js

@@ -6,6 +6,7 @@ const clc = require("colorette");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const features = require("./features");
+const track_1 = require("../track");
 const featuresList = [
     { name: "account", doSetup: features.account },
     {
@@ -44,12 +45,14 @@ const featuresList = [
         askQuestions: features.apptestingAskQuestions,
         actuate: features.apptestingAcutate,
     },
+    { name: "aitools", displayName: "AI Tools", doSetup: features.aitools },
 ];
 const featureMap = new Map(featuresList.map((feature) => [feature.name, feature]));
 async function init(setup, config, options) {
     var _a;
     const nextFeature = (_a = setup.features) === null || _a === void 0 ? void 0 : _a.shift();
     if (nextFeature) {
+        const start = process.uptime();
         const f = featureMap.get(nextFeature);
         if (!f) {
             const availableFeatures = Object.keys(features)
@@ -72,6 +75,8 @@ async function init(setup, config, options) {
         if (f.postSetup) {
             await f.postSetup(setup, config, options);
         }
+        const duration = Math.floor((process.uptime() - start) * 1000);
+        await (0, track_1.trackGA4)("product_init", { feature: nextFeature }, duration);
         return init(setup, config, options);
     }
 }
@@ -80,6 +85,7 @@ async function actuate(setup, config, options) {
     var _a;
     const nextFeature = (_a = setup.features) === null || _a === void 0 ? void 0 : _a.shift();
     if (nextFeature) {
+        const start = process.uptime();
         const f = lookupFeature(nextFeature);
         logger_1.logger.info(clc.bold(`\n${clc.white("===")} ${(0, lodash_1.capitalize)(nextFeature)} Setup Actuation`));
         if (f.doSetup) {
@@ -90,6 +96,8 @@ async function actuate(setup, config, options) {
                 await f.actuate(setup, config, options);
             }
         }
+        const duration = Math.floor((process.uptime() - start) * 1000);
+        await (0, track_1.trackGA4)("product_init_mcp", { feature: nextFeature }, duration);
         return actuate(setup, config, options);
     }
 }

package/lib/management/studio.js

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateStudioFirebaseProject = exports.reconcileStudioFirebaseProject = void 0;
+const apiv2_1 = require("../apiv2");
+const prompt = require("../prompt");
+const api = require("../api");
+const logger_1 = require("../logger");
+const utils = require("../utils");
+const configstore_1 = require("../configstore");
+const TIMEOUT_MILLIS = 30000;
+const studioClient = new apiv2_1.Client({
+    urlPrefix: api.studioApiOrigin(),
+    apiVersion: "v1",
+});
+async function reconcileStudioFirebaseProject(options, activeProjectFromConfig) {
+    const studioWorkspace = await getStudioWorkspace();
+    if (!studioWorkspace) {
+        return activeProjectFromConfig;
+    }
+    if (!studioWorkspace.firebaseProjectId) {
+        if (activeProjectFromConfig) {
+            await updateStudioFirebaseProject(activeProjectFromConfig);
+        }
+        return activeProjectFromConfig;
+    }
+    if (!activeProjectFromConfig) {
+        await writeStudioProjectToConfigStore(options, studioWorkspace.firebaseProjectId);
+        return studioWorkspace.firebaseProjectId;
+    }
+    if (studioWorkspace.firebaseProjectId !== activeProjectFromConfig && !options.nonInteractive) {
+        const choices = [
+            {
+                name: `Set ${studioWorkspace.firebaseProjectId} from Firebase Studio as my active project in both places`,
+                value: false,
+            },
+            {
+                name: `Set ${activeProjectFromConfig} from Firebase CLI as my active project in both places`,
+                value: true,
+            },
+        ];
+        const useCliProject = await prompt.select({
+            message: "Found different active Firebase Projects in the Firebase CLI and your Firebase Studio Workspace. Which project would you like to set as your active project?",
+            choices,
+        });
+        if (useCliProject) {
+            await updateStudioFirebaseProject(activeProjectFromConfig);
+            return activeProjectFromConfig;
+        }
+        else {
+            await writeStudioProjectToConfigStore(options, studioWorkspace.firebaseProjectId);
+            return studioWorkspace.firebaseProjectId;
+        }
+    }
+    return studioWorkspace.firebaseProjectId;
+}
+exports.reconcileStudioFirebaseProject = reconcileStudioFirebaseProject;
+async function getStudioWorkspace() {
+    const workspaceId = process.env.WORKSPACE_SLUG;
+    if (!workspaceId) {
+        logger_1.logger.error(`Failed to fetch Firebase Project from Studio Workspace because WORKSPACE_SLUG environment variable is empty`);
+        return undefined;
+    }
+    try {
+        const res = await studioClient.request({
+            method: "GET",
+            path: `/workspaces/${workspaceId}`,
+            timeout: TIMEOUT_MILLIS,
+        });
+        return res.body;
+    }
+    catch (err) {
+        let message = err.message;
+        if (err.original) {
+            message += ` (original: ${err.original.message})`;
+        }
+        logger_1.logger.error(`Failed to fetch Firebase Project from current Studio Workspace: ${message}`);
+        return undefined;
+    }
+}
+async function writeStudioProjectToConfigStore(options, studioProjectId) {
+    if (options.projectRoot) {
+        logger_1.logger.info(`Updating Firebase CLI active project to match Studio Workspace '${studioProjectId}'`);
+        utils.makeActiveProject(options.projectRoot, studioProjectId);
+        recordStudioProjectSyncTime();
+    }
+}
+async function updateStudioFirebaseProject(projectId) {
+    logger_1.logger.info(`Updating Studio Workspace active project to match Firebase CLI '${projectId}'`);
+    const workspaceId = process.env.WORKSPACE_SLUG;
+    if (!workspaceId) {
+        logger_1.logger.error(`Failed to update Firebase Project for Studio Workspace because WORKSPACE_SLUG environment variable is empty`);
+        return;
+    }
+    try {
+        await studioClient.request({
+            method: "PATCH",
+            path: `/workspaces/${workspaceId}`,
+            responseType: "json",
+            body: {
+                firebaseProjectId: projectId,
+            },
+            queryParams: {
+                updateMask: "workspace.firebaseProjectId",
+            },
+            timeout: TIMEOUT_MILLIS,
+        });
+    }
+    catch (err) {
+        let message = err.message;
+        if (err.original) {
+            message += ` (original: ${err.original.message})`;
+        }
+        logger_1.logger.warn(`Failed to update active Firebase Project for current Studio Workspace: ${message}`);
+    }
+    recordStudioProjectSyncTime();
+}
+exports.updateStudioFirebaseProject = updateStudioFirebaseProject;
+function recordStudioProjectSyncTime() {
+    configstore_1.configstore.set("firebaseStudioProjectLastSynced", Date.now());
+}

package/lib/mcp/errors.js

@@ -3,8 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mcpGeminiError = exports.mcpAuthError = exports.NO_PROJECT_ERROR = void 0;
 const util_1 = require("./util");
 exports.NO_PROJECT_ERROR = (0, util_1.mcpError)('No active project was found. Use the `firebase_update_environment` tool to set the project directory to an absolute folder location containing a firebase.json config file. Alternatively, change the MCP server config to add [...,"--dir","/absolute/path/to/project/directory"] in its command-line arguments.', "PRECONDITION_FAILED");
-function mcpAuthError() {
+function mcpAuthError(skipADC) {
     const cmd = (0, util_1.commandExistsSync)("firebase") ? "firebase" : "npx -y firebase-tools";
+    if (skipADC) {
+        return (0, util_1.mcpError)(`The user is not currently logged into the Firebase CLI, which is required to use this tool. Please instruct the user to execute this shell command to sign in.
+\`\`\`sh
+${cmd} login
+\`\`\``);
+    }
     return (0, util_1.mcpError)(`The user is not currently logged into the Firebase CLI, which is required to use this tool. Please instruct the user to execute this shell command to sign in or to configure [Application Default Credentials][ADC] on their machine.
 \`\`\`sh
 ${cmd} login