firebase-tools 15.8.1-migrateAngular.0 → 15.9.0

package/lib/apphosting/secrets/dialogs.js

@@ -71,7 +71,7 @@ exports.WARN_NO_BACKENDS = "To use this secret, your backend's service account m
     "It does not look like you have a backend yet. After creating a backend, grant access with " +
     clc.bold("firebase apphosting:secrets:grantaccess");
 exports.GRANT_ACCESS_IN_FUTURE = `To grant access in the future, run ${clc.bold("firebase apphosting:secrets:grantaccess")}`;
-async function selectBackendServiceAccounts(projectNumber, projectId, options) {
+async function selectBackendServiceAccounts(projectNumber, projectId, nonInteractive) {
     const listBackends = await apphosting.listBackends(projectId, "-");
     if (listBackends.unreachable.length) {
         utils.logWarning(`Could not reach location(s) ${listBackends.unreachable.join(", ")}. You may need to run ` +
@@ -83,7 +83,7 @@ async function selectBackendServiceAccounts(projectNumber, projectId, options) {
     }
     if (listBackends.backends.length === 1) {
         const grant = await prompt.confirm({
-            nonInteractive: options.nonInteractive,
+            nonInteractive,
             default: true,
             message: "To use this secret, your backend's service account must be granted access. Would you like to grant access now?",
         });
@@ -101,7 +101,7 @@ async function selectBackendServiceAccounts(projectNumber, projectId, options) {
             serviceAccountDisplay(metadata[0]) +
             ".\nGranting access to one backend will grant access to all backends.");
         const grant = await prompt.confirm({
-            nonInteractive: options.nonInteractive,
+            nonInteractive,
             default: true,
             message: "Would you like to grant access to all backends now?",
         });

package/lib/apphosting/secrets/index.js

@@ -7,6 +7,8 @@ exports.grantEmailsSecretAccess = grantEmailsSecretAccess;
 exports.upsertSecret = upsertSecret;
 exports.fetchSecrets = fetchSecrets;
 exports.getSecretNameParts = getSecretNameParts;
+exports.apphostingSecretsSetAction = apphostingSecretsSetAction;
+const clc = require("colorette");
 const error_1 = require("../../error");
 const gcsm = require("../../gcp/secretManager");
 const gcb = require("../../gcp/cloudbuild");
@@ -16,6 +18,9 @@ const secretManager_1 = require("../../gcp/secretManager");
 const secretManager_2 = require("../../gcp/secretManager");
 const utils = require("../../utils");
 const prompt = require("../../prompt");
+const dialogs = require("../../apphosting/secrets/dialogs");
+const config = require("../../apphosting/config");
+const projects_1 = require("../../management/projects");
 function toMulti(accounts) {
     const m = {
         buildServiceAccounts: [accounts.buildServiceAccount],
@@ -169,3 +174,57 @@ function getSecretNameParts(secret) {
     }
     return [name, version];
 }
+async function apphostingSecretsSetAction(secretName, projectId, projectNumber, location, dataFile, nonInteractive) {
+    if (!projectNumber) {
+        projectNumber = (await (0, projects_1.getProject)(projectId)).projectNumber;
+    }
+    const created = await upsertSecret(projectId, secretName, location);
+    if (created === null) {
+        return;
+    }
+    else if (created) {
+        utils.logSuccess(`Created new secret projects/${projectId}/secrets/${secretName}`);
+    }
+    const secretValue = await utils.readSecretValue(`Enter a value for ${secretName}`, dataFile);
+    const version = await gcsm.addVersion(projectId, secretName, secretValue);
+    utils.logSuccess(`Created new secret version ${gcsm.toSecretVersionResourceName(version)}`);
+    utils.logBullet(`You can access the contents of the secret's latest value with ${clc.bold(`firebase apphosting:secrets:access ${secretName}\n`)}`);
+    if (!created) {
+        return;
+    }
+    const type = await prompt.select({
+        message: "Is this secret for production or only local testing?",
+        choices: [
+            { name: "Production", value: "production" },
+            { name: "Local testing only", value: "local" },
+        ],
+        nonInteractive: !!nonInteractive,
+        default: "production",
+    });
+    if (type === "local") {
+        const emailList = await prompt.input({
+            message: "Please enter a comma separated list of user or groups who should have access to this secret:",
+        });
+        if (emailList.length) {
+            await grantEmailsSecretAccess(projectId, [secretName], emailList.split(","));
+        }
+        else {
+            utils.logBullet("To grant access in the future run " +
+                clc.bold(`firebase apphosting:secrets:grantaccess ${secretName} --emails [email list]`));
+        }
+        await config.maybeAddSecretToYaml(secretName, config.APPHOSTING_EMULATORS_YAML_FILE);
+        return;
+    }
+    const accounts = await dialogs.selectBackendServiceAccounts(projectNumber, projectId, !!nonInteractive);
+    if (!accounts.buildServiceAccounts.length && !accounts.runServiceAccounts.length) {
+        utils.logWarning(`To use this secret in your backend, you must grant access. You can do so in the future with ${clc.bold("firebase apphosting:secrets:grantaccess")}`);
+    }
+    else {
+        await grantSecretAccess(projectId, projectNumber, secretName, accounts);
+    }
+    await config.maybeAddSecretToYaml(secretName, config.APPHOSTING_BASE_YAML_FILE);
+    utils.logBullet("To grant additional users access to this secret run " +
+        clc.bold(`firebase apphosting:secrets:grantaccess ${secretName} --email [email list]`) +
+        ".\nTo grant additional backends access to this secret run " +
+        clc.bold(`firebase apphosting:secrets:grantaccess ${secretName} --backend [backend ID]`));
+}

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

@@ -1,18 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.command = void 0;
-const clc = require("colorette");
 const command_1 = require("../command");
 const projectUtils_1 = require("../projectUtils");
 const requireAuth_1 = require("../requireAuth");
 const gcsm = require("../gcp/secretManager");
 const apphosting = require("../gcp/apphosting");
 const requirePermissions_1 = require("../requirePermissions");
-const secrets = require("../apphosting/secrets");
-const dialogs = require("../apphosting/secrets/dialogs");
-const config = require("../apphosting/config");
-const utils = require("../utils");
-const prompt = require("../prompt");
+const secrets_1 = require("../apphosting/secrets");
 exports.command = new command_1.Command("apphosting:secrets:set <secretName>")
     .description("create or update a secret for use in Firebase App Hosting")
     .option("-l, --location <location>", "optional location to retrict secret replication")
@@ -32,51 +27,5 @@ exports.command = new command_1.Command("apphosting:secrets:set <secretName>")
     .action(async (secretName, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const projectNumber = await (0, projectUtils_1.needProjectNumber)(options);
-    const created = await secrets.upsertSecret(projectId, secretName, options.location);
-    if (created === null) {
-        return;
-    }
-    else if (created) {
-        utils.logSuccess(`Created new secret projects/${projectId}/secrets/${secretName}`);
-    }
-    const secretValue = await utils.readSecretValue(`Enter a value for ${secretName}`, options.dataFile);
-    const version = await gcsm.addVersion(projectId, secretName, secretValue);
-    utils.logSuccess(`Created new secret version ${gcsm.toSecretVersionResourceName(version)}`);
-    utils.logBullet(`You can access the contents of the secret's latest value with ${clc.bold(`firebase apphosting:secrets:access ${secretName}\n`)}`);
-    if (!created) {
-        return;
-    }
-    const type = await prompt.select({
-        message: "Is this secret for production or only local testing?",
-        choices: [
-            { name: "Production", value: "production" },
-            { name: "Local testing only", value: "local" },
-        ],
-    });
-    if (type === "local") {
-        const emailList = await prompt.input({
-            message: "Please enter a comma separated list of user or groups who should have access to this secret:",
-        });
-        if (emailList.length) {
-            await secrets.grantEmailsSecretAccess(projectId, [secretName], emailList.split(","));
-        }
-        else {
-            utils.logBullet("To grant access in the future run " +
-                clc.bold(`firebase apphosting:secrets:grantaccess ${secretName} --emails [email list]`));
-        }
-        await config.maybeAddSecretToYaml(secretName, config.APPHOSTING_EMULATORS_YAML_FILE);
-        return;
-    }
-    const accounts = await dialogs.selectBackendServiceAccounts(projectNumber, projectId, options);
-    if (!accounts.buildServiceAccounts.length && !accounts.runServiceAccounts.length) {
-        utils.logWarning(`To use this secret in your backend, you must grant access. You can do so in the future with ${clc.bold("firebase apphosting:secrets:grantaccess")}`);
-    }
-    else {
-        await secrets.grantSecretAccess(projectId, projectNumber, secretName, accounts);
-    }
-    await config.maybeAddSecretToYaml(secretName, config.APPHOSTING_BASE_YAML_FILE);
-    utils.logBullet("To grant additional users access to this secret run " +
-        clc.bold(`firebase apphosting:secrets:grantaccess ${secretName} --email [email list]`) +
-        ".\nTo grant additional backends access to this secret run " +
-        clc.bold(`firebase apphosting:secrets:grantaccess ${secretName} --backend [backend ID]`));
+    return (0, secrets_1.apphostingSecretsSetAction)(secretName, projectId, projectNumber, options.location, options.dataFile, options.nonInteractive);
 });

package/lib/commands/studio-export.js

@@ -17,5 +17,5 @@ exports.command = new command_1.Command("studio:export <path>")
     }
     const rootPath = path.resolve(exportPath);
     logger_1.logger.info(`Exporting Studio apps from ${rootPath} to Antigravity...`);
-    await (0, migrate_1.migrate)(rootPath, { noStartAgy: !options.startAgy });
+    await (0, migrate_1.migrate)(rootPath, options);
 });

package/lib/dataconnect/schemaMigration.js

@@ -24,6 +24,7 @@ const cloudSqlAdminClient = require("../gcp/cloudsql/cloudsqladmin");
 const errors = require("./errors");
 const provisionCloudSql_1 = require("./provisionCloudSql");
 const requireAuth_1 = require("../requireAuth");
+const cloudbilling_1 = require("../gcp/cloudbilling");
 async function setupSchemaIfNecessary(instanceId, databaseId, options) {
     try {
         await (0, connect_1.setupIAMUsers)(instanceId, options);
@@ -429,7 +430,17 @@ async function ensureServiceIsConnectedToCloudSql(serviceName, instanceName, dat
         postgresql?.schemaValidation === "NONE") {
         const [, , , , , serviceId] = serviceName.split("/");
         const [, projectId, , , , instanceId] = postgresql.cloudSql.instance.split("/");
-        throw new error_1.FirebaseError(`While checking the service ${serviceId}, ` + (0, provisionCloudSql_1.cloudSQLBeingCreated)(projectId, instanceId));
+        let isFreeTrial = false;
+        let billingEnabled = false;
+        try {
+            const instance = await cloudSqlAdminClient.getInstance(projectId, instanceId);
+            isFreeTrial = instance.settings?.userLabels?.["firebase-data-connect"] === "ft";
+            billingEnabled = await (0, cloudbilling_1.checkBillingEnabled)(projectId);
+        }
+        catch (err) {
+        }
+        throw new error_1.FirebaseError(`While checking the service ${serviceId}, ` +
+            (0, provisionCloudSql_1.cloudSQLBeingCreated)(projectId, instanceId, isFreeTrial, billingEnabled));
     }
     if (!currentSchema || !postgresql) {
         if (!linkIfNotConnected) {

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,36 +54,36 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "3.2.0",
-            "expectedSize": 30823264,
-            "expectedChecksum": "165dcd011685866ca7a1970b6f2605f0",
-            "expectedChecksumSHA256": "a4d0a700ae38172324927c7054e7ade86dbdae87389be1d801665e46d3759451",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.2.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.2.0"
+            "version": "3.2.1",
+            "expectedSize": 30880608,
+            "expectedChecksum": "ef63443e5132e4ade7b89506fea60e29",
+            "expectedChecksumSHA256": "0a9c05413cb3048a4bef1968e55109ca67eb607e6d77355741cb9a7dcae51607",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.2.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.2.1"
         },
         "darwin_arm64": {
-            "version": "3.2.0",
-            "expectedSize": 30287890,
-            "expectedChecksum": "b1c75fa410033ed93463ab41b2bd8e61",
-            "expectedChecksumSHA256": "408c52c857af86df7bcf71b9ab7d9e1eeb29a12f042d79c76000e85f22a2e975",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.2.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.2.0"
+            "version": "3.2.1",
+            "expectedSize": 30339010,
+            "expectedChecksum": "866989b28ae5cad1084403bd4404dcee",
+            "expectedChecksumSHA256": "558e334c456c646b1ddf4b32ab43d976c5b03c191a4c92855e8c93cd32e1215a",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.2.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.2.1"
         },
         "win32": {
-            "version": "3.2.0",
-            "expectedSize": 31328256,
-            "expectedChecksum": "474319dff7a1a1eb364c1b5144ae11f5",
-            "expectedChecksumSHA256": "9f3852e35c60bb7adfc2bd24fd2d0a2f815659dbb6fec48bab0bd07bbd7d1651",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.2.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.2.0.exe"
+            "version": "3.2.1",
+            "expectedSize": 31385088,
+            "expectedChecksum": "cb46949156c889d5724f7fa80e8a613b",
+            "expectedChecksumSHA256": "1dd1f9ef7910d8295baac61741fde29fac536d82ff841a2d5cefe25e98f7cd98",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.2.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.2.1.exe"
         },
         "linux": {
-            "version": "3.2.0",
-            "expectedSize": 30744760,
-            "expectedChecksum": "dc9f0766287d982a0dabf1e2f90aa726",
-            "expectedChecksumSHA256": "82bd05e748526330b94b2d2d797507175ea1251b1760f64bc1d1e904f23c2f22",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.2.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.2.0"
+            "version": "3.2.1",
+            "expectedSize": 30798008,
+            "expectedChecksum": "8c29b6b526efcbf13de278bd3b5b598a",
+            "expectedChecksumSHA256": "d7eb7f7afd98dd9018039c83782312f975b160c3708eb49f8fecdf7d27508d82",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.2.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.2.1"
         }
     }
 }

package/lib/experiments.js

@@ -142,7 +142,7 @@ exports.ALL_EXPERIMENTS = experiments({
     },
     fdcwebhooks: {
         shortDescription: "Enable Firebase Data Connect webhooks feature.",
-        default: false,
+        default: true,
         public: false,
     },
     studioexport: {

package/lib/firebase_studio/migrate.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractMetadata = extractMetadata;
+exports.uploadSecrets = uploadSecrets;
 exports.migrate = migrate;
 const fs = require("fs/promises");
 const path = require("path");
@@ -10,7 +12,8 @@ const prompt = require("../prompt");
 const apphosting = require("../gcp/apphosting");
 const utils = require("../utils");
 const templates_1 = require("../templates");
-const frameworks_1 = require("../frameworks");
+const secrets_1 = require("../apphosting/secrets");
+const env = require("../functions/env");
 async function downloadGitHubDir(apiUrl, localPath) {
     const response = await fetch(apiUrl);
     if (!response.ok) {
@@ -32,7 +35,7 @@ async function downloadGitHubDir(apiUrl, localPath) {
         }
     }
 }
-async function extractMetadata(rootPath) {
+async function extractMetadata(rootPath, overrideProjectId) {
     const metadataPath = path.join(rootPath, "metadata.json");
     let metadata = {};
     try {
@@ -42,7 +45,7 @@ async function extractMetadata(rootPath) {
     catch (err) {
         logger_1.logger.debug(`Could not read metadata.json at ${metadataPath}: ${err}`);
     }
-    let projectId = metadata.projectId;
+    let projectId = overrideProjectId || metadata.projectId;
     if (!projectId) {
         try {
             const firebasercContent = await fs.readFile(path.join(rootPath, ".firebaserc"), "utf8");
@@ -77,17 +80,13 @@ async function extractMetadata(rootPath) {
     }
     return { projectId, appName, blueprintContent };
 }
-async function updateReadme(rootPath, blueprintContent, appName, framework) {
+async function updateReadme(rootPath, blueprintContent, appName) {
     const readmePath = path.join(rootPath, "README.md");
     const readmeTemplate = await (0, templates_1.readTemplate)("firebase-studio-export/readme_template.md");
-    const startCommand = framework === "angular" ? "npm run start" : "npm run dev";
-    const localUrl = framework === "angular" ? "http://localhost:4200" : "http://localhost:9002";
     const newReadme = readmeTemplate
         .replace(/\${appName}/g, appName)
         .replace("${exportDate}", new Date().toISOString().split("T")[0])
-        .replace("${blueprintContent}", blueprintContent.replace(/# \*\*App Name\*\*: .*/, "").trim())
-        .replace("${startCommand}", startCommand)
-        .replace("${localUrl}", localUrl);
+        .replace("${blueprintContent}", blueprintContent.replace(/# \*\*App Name\*\*: .*/, "").trim());
     await fs.writeFile(readmePath, newReadme);
     logger_1.logger.info("✅ Updated README.md with project details and origin info");
 }
@@ -147,7 +146,10 @@ async function injectAgyContext(rootPath, projectId, appName) {
         logger_1.logger.debug(`Could not read or write startup workflow: ${err}`);
     }
 }
-async function assertSystemState() {
+async function assertSystemState(startAgy) {
+    if (startAgy === false) {
+        return;
+    }
     try {
         (0, child_process_1.execSync)("agy --version", { stdio: "ignore" });
         logger_1.logger.info("✅ Antigravity IDE CLI (agy) detected");
@@ -214,7 +216,7 @@ async function createFirebaseConfigs(rootPath, projectId) {
         logger_1.logger.info(`✅ Created firebase.json with backendId: ${backendId}`);
     }
 }
-async function writeAgyConfigs(rootPath, framework) {
+async function writeAgyConfigs(rootPath) {
     const vscodeDir = path.join(rootPath, ".vscode");
     await fs.mkdir(vscodeDir, { recursive: true });
     const tasksJson = {
@@ -250,32 +252,19 @@ async function writeAgyConfigs(rootPath, framework) {
     logger_1.logger.info("✅ Updated .vscode/settings.json with startup preferences");
     const launchJson = {
         version: "0.2.0",
-        configurations: [],
+        configurations: [
+            {
+                type: "node",
+                request: "launch",
+                name: "Next.js: debug server-side",
+                runtimeExecutable: "npm",
+                runtimeArgs: ["run", "dev"],
+                port: 9002,
+                console: "integratedTerminal",
+                preLaunchTask: "npm-install",
+            },
+        ],
     };
-    if (framework === "angular") {
-        launchJson.configurations.push({
-            type: "node",
-            request: "launch",
-            name: "Angular: debug server-side",
-            runtimeExecutable: "npm",
-            runtimeArgs: ["run", "start"],
-            port: 4200,
-            console: "integratedTerminal",
-            preLaunchTask: "npm-install",
-        });
-    }
-    else {
-        launchJson.configurations.push({
-            type: "node",
-            request: "launch",
-            name: "Next.js: debug server-side",
-            runtimeExecutable: "npm",
-            runtimeArgs: ["run", "dev"],
-            port: 9002,
-            console: "integratedTerminal",
-            preLaunchTask: "npm-install",
-        });
-    }
     await fs.writeFile(path.join(vscodeDir, "launch.json"), JSON.stringify(launchJson, null, 2));
     logger_1.logger.info("✅ Created .vscode/launch.json");
 }
@@ -316,8 +305,36 @@ async function cleanupUnusedFiles(rootPath) {
         logger_1.logger.debug(`Could not delete ${modifiedPath}: ${err}`);
     }
 }
-async function askToOpenAntigravity(rootPath, appName, noStartAgyFlag) {
-    if (noStartAgyFlag) {
+async function uploadSecrets(rootPath, projectId) {
+    if (!projectId) {
+        return;
+    }
+    const envPath = path.join(rootPath, ".env");
+    try {
+        await fs.access(envPath);
+    }
+    catch {
+        return;
+    }
+    try {
+        const envContent = await fs.readFile(envPath, "utf8");
+        const parsedEnv = env.parse(envContent);
+        const geminiApiKey = parsedEnv.envs["GEMINI_API_KEY"];
+        if (geminiApiKey && geminiApiKey.trim().length > 0) {
+            logger_1.logger.info("⏳ Uploading GEMINI_API_KEY from .env to App Hosting secrets...");
+            await (0, secrets_1.apphostingSecretsSetAction)("GEMINI_API_KEY", projectId, undefined, undefined, envPath, true);
+            logger_1.logger.info("✅ Uploaded GEMINI_API_KEY secret");
+        }
+        else {
+            logger_1.logger.debug("Skipping GEMINI_API_KEY upload: key is missing or blank in .env");
+        }
+    }
+    catch (err) {
+        utils.logWarning(`Failed to upload GEMINI_API_KEY secret: ${err}`);
+    }
+}
+async function askToOpenAntigravity(rootPath, appName, startAgy) {
+    if (startAgy === false) {
         logger_1.logger.info('\n👉 Next steps: Open this folder in Antigravity and run the "Initial Project Setup" workflow.');
         return;
     }
@@ -343,23 +360,19 @@ async function askToOpenAntigravity(rootPath, appName, noStartAgyFlag) {
         logger_1.logger.info('\n👉 Next steps: Open this folder in Antigravity and run the "Initial Project Setup" workflow.');
     }
 }
-async function migrate(rootPath, options = { noStartAgy: false }) {
+async function migrate(rootPath, options = { startAgy: true }) {
     logger_1.logger.info("🚀 Starting Firebase Studio to Antigravity migration...");
-    await assertSystemState();
-    const { projectId, appName, blueprintContent } = await extractMetadata(rootPath);
-    const discovery = await (0, frameworks_1.discover)(rootPath);
-    const framework = discovery?.framework;
-    if (framework) {
-        logger_1.logger.info(`✅ Detected framework: ${framework}`);
-    }
-    await updateReadme(rootPath, blueprintContent, appName, framework);
+    await assertSystemState(options.startAgy);
+    const { projectId, appName, blueprintContent } = await extractMetadata(rootPath, options.project);
+    await updateReadme(rootPath, blueprintContent, appName);
     await createFirebaseConfigs(rootPath, projectId);
+    await uploadSecrets(rootPath, projectId);
     await injectAgyContext(rootPath, projectId, appName);
-    await writeAgyConfigs(rootPath, framework);
+    await writeAgyConfigs(rootPath);
     await cleanupUnusedFiles(rootPath);
     const currentFolderName = path.basename(rootPath);
     if (currentFolderName === "download") {
         logger_1.logger.info(`\n💡 Tip: You might want to rename this folder to "${appName.toLowerCase().replace(/\s+/g, "-")}"`);
     }
-    await askToOpenAntigravity(rootPath, appName, options.noStartAgy);
+    await askToOpenAntigravity(rootPath, appName, options.startAgy);
 }

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -23,6 +23,7 @@ const projectUtils_1 = require("../../projectUtils");
 const logger_1 = require("../../logger");
 const iam_1 = require("../iam");
 const error_1 = require("../../error");
+const freeTrial_1 = require("../../dataconnect/freeTrial");
 const API_VERSION = "v1";
 const client = new apiv2_1.Client({
     urlPrefix: (0, api_1.cloudSQLAdminOrigin)(),
@@ -91,7 +92,7 @@ async function createInstance(args) {
         return;
     }
     catch (err) {
-        handleAllowlistError(err, args.location);
+        await handleCreateInstanceError(err, args.location, args.projectId);
         throw err;
     }
 }
@@ -119,10 +120,14 @@ async function updateInstanceForDataConnect(instance, enableGoogleMlIntegration)
     });
     return pollRes;
 }
-function handleAllowlistError(err, region) {
-    if (err.message.includes("Not allowed to set system label: firebase-data-connect")) {
+async function handleCreateInstanceError(err, region, projectId) {
+    if (err?.message?.includes("Not allowed to set system label: firebase-data-connect")) {
         throw new error_1.FirebaseError(`Cloud SQL free trial instances are not yet available in ${region}. Please check https://firebase.google.com/docs/data-connect/ for a full list of available regions.`);
     }
+    if (err?.message?.includes("The billing account is not in good standing") &&
+        (await (0, freeTrial_1.checkFreeTrialInstanceUsed)(projectId))) {
+        throw new error_1.FirebaseError(`You have already used your Cloud SQL free trial. To create more instances, you need to attach a billing account to project ${projectId}.`);
+    }
 }
 function setDatabaseFlag(flag, flags = []) {
     const temp = flags.filter((f) => f.name !== flag.name);

package/lib/mcp/prompts/apptesting/run_test.js

@@ -64,8 +64,9 @@ Here are a list of prerequisite steps that must be completed before running a te
 
 	* Goal (required): In one sentence or less, describe what you want the agent to do in this step.
 	* Hint (optional): Provide additional information to help Gemini understand and navigate your app.
-	* Final Screen Assertion (required for last step): Your final screen assertion should be phrased as an observation, such as 'The screen shows a
-    success message' or 'The checkout page is visible'. Optional except for the last step, for which it is required.
+	* Final Screen Assertion (required for last step): Your final screen assertion should be phrased as an observation, such
+    as 'The screen shows a success message' or 'The checkout page is visible'. You can think of these as test assertions
+    that are checked at the end of the step. Optional except for the last step, for which it is required.
 
   The developer has optionally specified the following description for their test:
   * ${testDescription}
@@ -79,8 +80,8 @@ Here are a list of prerequisite steps that must be completed before running a te
     For example, if a step has a list in it, it should probably be broken up into multiple steps. Steps do not need
     to be too small though. The test case should provide a good balance between strict guidance and flexibility. As a
     rule of thumb, each step should require between 2-5 actions.
-	* Include a hint and success criteria whenever possible. Specifically, try to always include a success criteria to help
-    the agent determine when the goal has been completed.
+	* Include a hint and final screen assertion whenever possible. Specifically, try to always include a final screen assertion
+    to help the agent determine when the goal has been completed.
 	* Avoid functionality that the app testing agent struggles with. The app testing agent struggles with the following:
 		* Journeys that require specific timing (like observing that something should be visible for a certain number of
       seconds), interacting with moving or transient elements, etc.
@@ -96,7 +97,7 @@ Here are a list of prerequisite steps that must be completed before running a te
   above, convert the test description provided by the user to make it easier for the agent to follow so that the tests can
   be re-run reliably. If there is no test description, generate a test case that you think will be useful given the functionality 
   of the app. Generate an explanation on why you generated the new test case the way you did, and then generate the
-  new test case, which again is an array of steps where each step contains a goal, hint, and success criteria. Show this
+  new test case, which again is an array of steps where each step contains a goal, hint, and final screen assertion. Show this
   to the user and have them confirm before moving forward. 
 
 ## Run Test

package/lib/mcp/tools/apptesting/tests.js

@@ -27,7 +27,7 @@ const AiStepSchema = zod_1.z
     finalScreenAssertion: zod_1.z
         .string()
         .optional()
-        .describe("A description of criteria the agent should use to determine if the goal has been successfully completed."),
+        .describe("A description of what the screen should look like at the end of the step, to determine if the goal has been successfully completed."),
 })
     .describe("Step within a test case; run during the execution of the test.");
 const defaultDevices = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "15.8.1-migrateAngular.0",
+  "version": "15.9.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "mcpName": "io.github.firebase/firebase-mcp",

package/templates/firebase-studio-export/readme_template.md

@@ -8,4 +8,4 @@ ${blueprintContent}
 
 ---
 
-To get started, run `${startCommand}` and visit `${localUrl}`.
+To get started, run \`npm run dev\` and visit \`http://localhost:9002\`.

package/templates/init/functions/javascript/package-ongraphrequest.lint.json

@@ -15,7 +15,7 @@
   "main": "index.js",
   "dependencies": {
     "firebase-admin": "^13.6.0",
-    "firebase-functions": "^7.0.5",
+    "firebase-functions": "^7.1.0",
     "@apollo/server": "^5.2.0",
     "@as-integrations/express4": "^1.1.2"
   },

package/templates/init/functions/javascript/package-ongraphrequest.nolint.json

@@ -14,7 +14,7 @@
   "main": "index.js",
   "dependencies": {
     "firebase-admin": "^13.6.0",
-    "firebase-functions": "^7.0.5",
+    "firebase-functions": "^7.1.0",
     "@apollo/server": "^5.2.0",
     "@as-integrations/express4": "^1.1.2"
   },

package/templates/init/functions/typescript/package-ongraphrequest.lint.json

@@ -16,7 +16,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "firebase-admin": "^13.6.0",
-    "firebase-functions": "^7.0.5",
+    "firebase-functions": "^7.1.0",
     "@apollo/server": "^5.2.0",
     "@as-integrations/express4": "^1.1.2"
   },

package/templates/init/functions/typescript/package-ongraphrequest.nolint.json

@@ -15,7 +15,7 @@
   "main": "lib/index.js",
   "dependencies": {
     "firebase-admin": "^13.6.0",
-    "firebase-functions": "^7.0.5",
+    "firebase-functions": "^7.1.0",
     "@apollo/server": "^5.2.0",
     "@as-integrations/express4": "^1.1.2"
   },