firebase-tools 14.24.2 → 14.25.0

package/README.md

@@ -1,4 +1,4 @@
-# Firebase CLI and MCP Server [![Actions Status][gh-actions-badge]][gh-actions] [![Node Version][node-badge]][npm] [![NPM version][npm-badge]][npm] [![Install MCP Server](https://cursor.com/deeplink/mcp-install-dark.svg)](https://cursor.com/en/install-mcp?name=firebase&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyIteSIsImZpcmViYXNlLXRvb2xzIiwiZXhwZXBpbWVudGFsOm1jcCIsIi0tZGlyIiwiLiJdfQ==)
+# Firebase CLI and MCP Server [![Actions Status][gh-actions-badge]][gh-actions] [![Node Version][node-badge]][npm] [![NPM version][npm-badge]][npm] [![Install MCP Server](https://cursor.com/deeplink/mcp-install-dark.svg)](https://cursor.com/en/install-mcp?name=firebase&config=eyJjb21tYW5kIjoibnB4IiwiYXJncyI6WyIteSIsImZpcmViYXNlLXRvb2xzIiwibWNwIiwiLS1kaXIiLCIuIl19)
 
 The Firebase Command Line Interface (CLI) Tools can be used to test, manage, and deploy your Firebase project from the command line. This repository is also the home of the official Firebase MCP Server. For more information, please see the [Firebase MCP Server documentation](./src/mcp).
 

package/lib/deploy/functions/deploy.js

@@ -146,7 +146,10 @@ function shouldUploadBeSkipped(context, wantBackend, haveBackend) {
         if (!haveEndpoint) {
             return false;
         }
-        return haveEndpoint.hash && wantEndpoint.hash && haveEndpoint.hash === wantEndpoint.hash;
+        return (haveEndpoint.hash &&
+            wantEndpoint.hash &&
+            haveEndpoint.hash === wantEndpoint.hash &&
+            haveEndpoint.state === "ACTIVE");
     });
 }
 exports.shouldUploadBeSkipped = shouldUploadBeSkipped;

package/lib/deploy/functions/release/fabricator.js

@@ -589,7 +589,7 @@ class Fabricator {
             .catch(rethrowAs(endpoint, "unregister blocking trigger"));
     }
     logOpStart(op, endpoint) {
-        const runtime = supported_1.RUNTIMES[endpoint.runtime].friendly;
+        const runtime = endpoint.runtime ? supported_1.RUNTIMES[endpoint.runtime].friendly : "unknown";
         const platform = (0, functionsDeployHelper_1.getHumanFriendlyPlatformName)(endpoint.platform);
         const label = helper.getFunctionLabel(endpoint);
         utils.logLabeledBullet("functions", `${op} ${runtime} (${platform}) function ${clc.bold(label)}...`);

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,36 +54,36 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "2.17.0",
-            "expectedSize": 29983584,
-            "expectedChecksum": "d9a3a5bd575dc24185ad473a440c4738",
-            "expectedChecksumSHA256": "da5485e68c7adbf86e3fb2f9ca550e4619f55ae75845009837780fcf16dd05cc",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v2.17.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.0"
+            "version": "2.17.1",
+            "expectedSize": 30004064,
+            "expectedChecksum": "89314d496595b250e149d8705ccd2ddc",
+            "expectedChecksumSHA256": "1e95733bf75fd433047345cb4c069ff4ddd2a2e296c53da3787dd708a26a8642",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v2.17.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.1"
         },
         "darwin_arm64": {
-            "version": "2.17.0",
-            "expectedSize": 29459746,
-            "expectedChecksum": "8362a56419a66507b1aead4630b9033c",
-            "expectedChecksumSHA256": "cbb8a3030f69c5aba81d1ef2d64d249f18100915f9738f59b815004b27983dab",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v2.17.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.0"
+            "version": "2.17.1",
+            "expectedSize": 29476450,
+            "expectedChecksum": "038125be57400e11f5013001cf68ce9e",
+            "expectedChecksumSHA256": "a11f6ea1f8b8d80f502df6e9b34865fb12186b4157f2c282a0e6f99c53077ca2",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v2.17.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.1"
         },
         "win32": {
-            "version": "2.17.0",
-            "expectedSize": 30477824,
-            "expectedChecksum": "7d8434eee4f3d33cc8ec6c99c6056a77",
-            "expectedChecksumSHA256": "051c60be0651be4971409da7ab3a15cdfb693400e9293c89010edcb28016d061",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v2.17.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.0.exe"
+            "version": "2.17.1",
+            "expectedSize": 30496768,
+            "expectedChecksum": "939a77bb9a549bc9460f888ac3442397",
+            "expectedChecksumSHA256": "04d6859668c4afc1fa301f5cc892623669bcbf26ce5195bc80dc208783c33853",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v2.17.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.1.exe"
         },
         "linux": {
-            "version": "2.17.0",
-            "expectedSize": 29905080,
-            "expectedChecksum": "ca7003aaee41e3c1261f9655c5f9dd8a",
-            "expectedChecksumSHA256": "79efd09f1bd685cbfa0157b2d08e0f6eb085ed82d83b48fabb7d102db6636c6c",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v2.17.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.0"
+            "version": "2.17.1",
+            "expectedSize": 29925560,
+            "expectedChecksum": "239d20f4aedf0bf6f79caca7453bf5cf",
+            "expectedChecksumSHA256": "756fa6343a659a8a2606ee0df2a321ffaf47645fff8f4b209286681ee36820e3",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v2.17.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-2.17.1"
         }
     }
 }

package/lib/gcp/cloudfunctions.js

@@ -296,7 +296,7 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
     if (endpoint.platform !== "gcfv1") {
         throw new error_1.FirebaseError("Trying to create a v1 CloudFunction with v2 API. This should never happen");
     }
-    if (!supported.isRuntime(endpoint.runtime)) {
+    if (!endpoint.runtime || !supported.isRuntime(endpoint.runtime)) {
         throw new error_1.FirebaseError("Failed internal assertion. Trying to deploy a new function with a deprecated runtime." +
             " This should never happen", { exit: 1 });
     }

package/lib/gcp/cloudfunctionsv2.js

@@ -22,7 +22,7 @@ const client = new apiv2_1.Client({
     apiVersion: exports.API_VERSION,
 });
 function functionsOpLogReject(func, type, err) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     if ((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.includes("Runtime validation errors")) {
         const capturedMessage = (0, cloudfunctions_1.captureRuntimeValidationError)(err.message);
         utils.logLabeledWarning("functions", capturedMessage + " for function " + func.name);
@@ -32,24 +32,24 @@ function functionsOpLogReject(func, type, err) {
         utils.logLabeledWarning("functions", `Your current project quotas don't allow for the current max instances setting of ${maxInstances}. ` +
             "Either reduce this function's maximum instances, or request a quota increase on the underlying Cloud Run service " +
             "at https://cloud.google.com/run/quotas.");
-        const suggestedFix = func.buildConfig.runtime.startsWith("python")
+        const suggestedFix = ((_c = func.buildConfig.runtime) === null || _c === void 0 ? void 0 : _c.startsWith("python"))
             ? "firebase_functions.options.set_global_options(max_instances=10)"
             : "setGlobalOptions({maxInstances: 10})";
         utils.logLabeledWarning("functions", `You can adjust the max instances value in your function's runtime options:\n\t${suggestedFix}`);
     }
     else {
         utils.logLabeledWarning("functions", `${err === null || err === void 0 ? void 0 : err.message}`);
-        if (((_d = (_c = err === null || err === void 0 ? void 0 : err.context) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.statusCode) === 429) {
+        if (((_e = (_d = err === null || err === void 0 ? void 0 : err.context) === null || _d === void 0 ? void 0 : _d.response) === null || _e === void 0 ? void 0 : _e.statusCode) === 429) {
             utils.logLabeledWarning("functions", `Got "Quota Exceeded" error while trying to ${type} ${func.name}. Waiting to retry...`);
         }
-        else if ((_e = err === null || err === void 0 ? void 0 : err.message) === null || _e === void 0 ? void 0 : _e.includes("If you recently started to use Eventarc, it may take a few minutes before all necessary permissions are propagated to the Service Agent")) {
+        else if ((_f = err === null || err === void 0 ? void 0 : err.message) === null || _f === void 0 ? void 0 : _f.includes("If you recently started to use Eventarc, it may take a few minutes before all necessary permissions are propagated to the Service Agent")) {
             utils.logLabeledWarning("functions", `Since this is your first time using 2nd gen functions, we need a little bit longer to finish setting everything up. Retry the deployment in a few minutes.`);
         }
         utils.logLabeledWarning("functions", ` failed to ${type} function ${func.name}`);
     }
     throw new error_1.FirebaseError(`Failed to ${type} function ${func.name}`, {
         original: err,
-        status: (_g = (_f = err === null || err === void 0 ? void 0 : err.context) === null || _f === void 0 ? void 0 : _f.response) === null || _g === void 0 ? void 0 : _g.statusCode,
+        status: (_h = (_g = err === null || err === void 0 ? void 0 : err.context) === null || _g === void 0 ? void 0 : _g.response) === null || _h === void 0 ? void 0 : _h.statusCode,
         context: { function: func.name },
     });
 }
@@ -143,14 +143,14 @@ function functionFromEndpoint(endpoint) {
     if (endpoint.platform !== "gcfv2") {
         throw new error_1.FirebaseError("Trying to create a v2 CloudFunction with v1 API. This should never happen");
     }
-    if (!supported.isRuntime(endpoint.runtime)) {
+    if (endpoint.runtime && !supported.isRuntime(endpoint.runtime)) {
         throw new error_1.FirebaseError("Failed internal assertion. Trying to deploy a new function with a deprecated runtime." +
             " This should never happen");
     }
     const gcfFunction = {
         name: backend.functionName(endpoint),
         buildConfig: {
-            runtime: endpoint.runtime,
+            runtime: endpoint.runtime || undefined,
             entryPoint: endpoint.entryPoint,
             source: {
                 storageSource: (_a = endpoint.source) === null || _a === void 0 ? void 0 : _a.storageSource,
@@ -250,7 +250,7 @@ function functionFromEndpoint(endpoint) {
 }
 exports.functionFromEndpoint = functionFromEndpoint;
 function endpointFromFunction(gcfFunction) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const [, project, , region, , id] = gcfFunction.name.split("/");
     let trigger;
     if (((_a = gcfFunction.labels) === null || _a === void 0 ? void 0 : _a["deployment-scheduled"]) === "true") {
@@ -310,12 +310,12 @@ function endpointFromFunction(gcfFunction) {
     else {
         trigger = { httpsTrigger: {} };
     }
-    if (!supported.isRuntime(gcfFunction.buildConfig.runtime)) {
+    if (((_e = gcfFunction.buildConfig) === null || _e === void 0 ? void 0 : _e.runtime) && !supported.isRuntime(gcfFunction.buildConfig.runtime)) {
         logger_1.logger.debug("GCFv2 function has a deprecated runtime:", JSON.stringify(gcfFunction, null, 2));
     }
     const endpoint = Object.assign(Object.assign({ platform: "gcfv2", id,
         project,
-        region }, trigger), { entryPoint: gcfFunction.buildConfig.entryPoint, runtime: gcfFunction.buildConfig.runtime, source: gcfFunction.buildConfig.source });
+        region }, trigger), { entryPoint: ((_f = gcfFunction.buildConfig) === null || _f === void 0 ? void 0 : _f.entryPoint) || "", runtime: ((_g = gcfFunction.buildConfig) === null || _g === void 0 ? void 0 : _g.runtime) || undefined, source: (_h = gcfFunction.buildConfig) === null || _h === void 0 ? void 0 : _h.source });
     if (gcfFunction.serviceConfig) {
         proto.copyIfPresent(endpoint, gcfFunction.serviceConfig, "ingressSettings", "environmentVariables", "secretEnvironmentVariables", "timeoutSeconds", "uri");
         proto.renameIfPresent(endpoint, gcfFunction.serviceConfig, "serviceAccount", "serviceAccountEmail");
@@ -355,8 +355,8 @@ function endpointFromFunction(gcfFunction) {
         }
     }
     proto.renameIfPresent(endpoint, gcfFunction, "uri", "url");
-    endpoint.codebase = ((_e = gcfFunction.labels) === null || _e === void 0 ? void 0 : _e[constants_1.CODEBASE_LABEL]) || projectConfig.DEFAULT_CODEBASE;
-    if ((_f = gcfFunction.labels) === null || _f === void 0 ? void 0 : _f[constants_1.HASH_LABEL]) {
+    endpoint.codebase = ((_j = gcfFunction.labels) === null || _j === void 0 ? void 0 : _j[constants_1.CODEBASE_LABEL]) || projectConfig.DEFAULT_CODEBASE;
+    if ((_k = gcfFunction.labels) === null || _k === void 0 ? void 0 : _k[constants_1.HASH_LABEL]) {
         endpoint.hash = gcfFunction.labels[constants_1.HASH_LABEL];
     }
     proto.copyIfPresent(endpoint, gcfFunction, "state");

package/lib/gcp/runv2.js

@@ -110,7 +110,7 @@ function endpointFromService(service) {
 }
 exports.endpointFromService = endpointFromService;
 function serviceFromEndpoint(endpoint, image) {
-    const labels = Object.assign(Object.assign({}, endpoint.labels), { [exports.RUNTIME_LABEL]: endpoint.runtime, [exports.CLIENT_NAME_LABEL]: "firebase-functions" });
+    const labels = Object.assign(Object.assign(Object.assign({}, endpoint.labels), (endpoint.runtime ? { [exports.RUNTIME_LABEL]: endpoint.runtime } : {})), { [exports.CLIENT_NAME_LABEL]: "firebase-functions" });
     delete labels["deployment-tool"];
     if (endpoint.codebase) {
         labels[constants_1.CODEBASE_LABEL] = endpoint.codebase;

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

@@ -14,7 +14,8 @@ const logger_1 = require("../../../logger");
 const error_1 = require("../../../error");
 const utils_1 = require("../../../utils");
 const UNKNOWN_VERSION_TOO_HIGH = "2.0.0";
-const MIN_VERSION = "0.6.0";
+const MIN_VERSION = "1.0.0-rc.1";
+const UNIFIED_PLUGIN_VERSION = "1.18.0";
 const LATEST_TEMPLATE = "1.0.0";
 async function getPackageVersion(packageName, envVariable) {
     const envVal = process.env[envVariable];
@@ -49,6 +50,7 @@ async function getGenkitInfo() {
     let stopInstall = false;
     const genkitVersion = await getPackageVersion("genkit", "GENKIT_DEV_VERSION");
     const cliVersion = await getPackageVersion("genkit-cli", "GENKIT_CLI_DEV_VERSION");
+    const genaiVersion = await getPackageVersion("@genkit-ai/google-genai", "GENKIT_GENAI_VERSION");
     const vertexVersion = await getPackageVersion("@genkit-ai/vertexai", "GENKIT_VERTEX_VERSION");
     const googleAiVersion = await getPackageVersion("@genkit-ai/googleai", "GENKIT_GOOGLEAI_VERSION");
     if (semver.gte(genkitVersion, UNKNOWN_VERSION_TOO_HIGH)) {
@@ -63,11 +65,12 @@ async function getGenkitInfo() {
             stopInstall = true;
         }
     }
-    else if (semver.gte(genkitVersion, "1.0.0-rc.1")) {
-        templateVersion = "1.0.0";
+    else if (semver.gte(genkitVersion, UNIFIED_PLUGIN_VERSION) &&
+        semver.gte(genaiVersion, "0.0.2-rc.1")) {
+        templateVersion = UNIFIED_PLUGIN_VERSION;
     }
     else if (semver.gte(genkitVersion, MIN_VERSION)) {
-        templateVersion = "0.9.0";
+        templateVersion = "1.0.0";
     }
     else {
         throw new error_1.FirebaseError(`The requested version of Genkit (${genkitVersion}) is no ` +
@@ -78,6 +81,7 @@ async function getGenkitInfo() {
         cliVersion,
         vertexVersion,
         googleAiVersion,
+        genaiVersion,
         templateVersion,
         stopInstall,
     };
@@ -152,30 +156,78 @@ async function ensureVertexApiEnabled(options) {
 }
 exports.ensureVertexApiEnabled = ensureVertexApiEnabled;
 function getModelOptions(genkitInfo) {
-    const modelOptions = {
-        vertexai: {
-            label: "Google Cloud Vertex AI",
-            plugin: "@genkit-ai/vertexai",
-            package: `@genkit-ai/vertexai@${genkitInfo.vertexVersion}`,
-        },
-        googleai: {
-            label: "Google AI",
-            plugin: "@genkit-ai/googleai",
-            package: `@genkit-ai/googleai@${genkitInfo.googleAiVersion}`,
-        },
-        none: { label: "None", plugin: undefined, package: undefined },
-    };
+    let modelOptions;
+    if (semver.gte(genkitInfo.templateVersion, UNIFIED_PLUGIN_VERSION)) {
+        modelOptions = {
+            vertexai: {
+                label: "Google Cloud Vertex AI",
+                provider: "vertexai",
+                plugin: "@genkit-ai/google-genai",
+                package: `@genkit-ai/google-genai@${genkitInfo.genaiVersion}`,
+            },
+            googleai: {
+                label: "Google AI",
+                provider: "googleai",
+                plugin: "@genkit-ai/google-genai",
+                package: `@genkit-ai/google-genai@${genkitInfo.genaiVersion}`,
+            },
+            none: { label: "None" },
+        };
+    }
+    else {
+        modelOptions = {
+            vertexai: {
+                label: "Google Cloud Vertex AI",
+                plugin: "@genkit-ai/vertexai",
+                package: `@genkit-ai/vertexai@${genkitInfo.vertexVersion}`,
+            },
+            googleai: {
+                label: "Google AI",
+                plugin: "@genkit-ai/googleai",
+                package: `@genkit-ai/googleai@${genkitInfo.googleAiVersion}`,
+            },
+            none: { label: "None" },
+        };
+    }
     return modelOptions;
 }
 const pluginToInfo = {
     "@genkit-ai/firebase": {
+        plugin: "@genkit-ai/firebase",
         imports: "firebase",
         init: `
     // Load the Firebase plugin, which provides integrations with several
     // Firebase services.
     firebase()`.trimStart(),
     },
+    "@genkit-ai/google-genai(vertexai)": {
+        plugin: "@genkit-ai/google-genai",
+        imports: "vertexAI",
+        modelImportComment: `
+// Import vertexAI provider from the unified plugin. The Vertex AI API provides
+// access to many models.`,
+        init: `    // Load the VertexAI provider. You can optionally specify your location
+    // and projectID by passing in a config object; if you don't, the provider
+    // uses the value from environment variables like GCLOUD_PROJECT and GCLOUD_LOCATION.
+    // If you want to use Vertex Express Mode, you can specify apiKey instead.
+    vertexAI({location: "global"})`,
+        model: 'vertexAI.model("gemini-2.5-flash")',
+    },
+    "@genkit-ai/google-genai(googleai)": {
+        plugin: "@genkit-ai/google-genai",
+        imports: "googleAI",
+        modelImportComment: `
+// Import googleAI provider from the unified plugin. The Gemini Developer API
+// provides access to several generative models.`,
+        init: `    // Load the GoogleAI provider. You can optionally specify your API key by
+    // passing in a config object; if you don't, the provider uses the value
+    // from the GOOGLE_GENAI_API_KEY environment variable, which is the
+    // recommended practice.
+    googleAI()`,
+        model: 'googleAI.model("gemini-2.5-flash")',
+    },
     "@genkit-ai/vertexai": {
+        plugin: "@genkit-ai/vertexai",
         imports: "vertexAI",
         modelImportComment: `
 // Import models from the Vertex AI plugin. The Vertex AI API provides access to
@@ -185,9 +237,10 @@ const pluginToInfo = {
     // by passing in a config object; if you don't, the Vertex AI plugin uses
     // the value from the GCLOUD_PROJECT environment variable.
     vertexAI({location: "us-central1"})`.trimStart(),
-        model: "gemini20Flash",
+        model: 'vertexAI.model("gemini-2.5-flash")',
     },
     "@genkit-ai/googleai": {
+        plugin: "@genkit-ai/googleai",
         imports: "googleAI",
         modelImportComment: `
 // Import models from the Google AI plugin. The Google AI API provides access to
@@ -198,16 +251,29 @@ const pluginToInfo = {
     // the value from the GOOGLE_GENAI_API_KEY environment variable, which is
     // the recommended practice.
     googleAI()`.trimStart(),
-        model: "gemini20Flash",
+        model: 'googleAI.model("gemini-2.5-flash")',
     },
 };
+function getPluginInfo(option) {
+    if ((option === null || option === void 0 ? void 0 : option.provider) && option.plugin) {
+        return pluginToInfo[`${option.plugin}(${option.provider})`];
+    }
+    if (option === null || option === void 0 ? void 0 : option.plugin) {
+        return pluginToInfo[option.plugin];
+    }
+    return {
+        plugin: "",
+        imports: "",
+        init: "",
+    };
+}
 function getBasePackages(genkitVersion) {
     const basePackages = ["express", `genkit@${genkitVersion}`];
     return basePackages;
 }
 const externalDevPackages = ["typescript", "tsx"];
 async function genkitSetup(options, genkitInfo, projectDir) {
-    var _a, _b;
+    var _a;
     const modelOptions = getModelOptions(genkitInfo);
     const supportedModels = Object.keys(modelOptions);
     const model = await (0, prompt_1.select)({
@@ -220,13 +286,9 @@ async function genkitSetup(options, genkitInfo, projectDir) {
     if (model === "vertexai") {
         await ensureVertexApiEnabled(options);
     }
-    const plugins = [];
     const pluginPackages = [];
     pluginPackages.push(`@genkit-ai/firebase@${genkitInfo.genkitVersion}`);
-    if ((_a = modelOptions[model]) === null || _a === void 0 ? void 0 : _a.plugin) {
-        plugins.push(modelOptions[model].plugin || "");
-    }
-    if ((_b = modelOptions[model]) === null || _b === void 0 ? void 0 : _b.package) {
+    if ((_a = modelOptions[model]) === null || _a === void 0 ? void 0 : _a.package) {
         pluginPackages.push(modelOptions[model].package || "");
     }
     const packages = [...getBasePackages(genkitInfo.genkitVersion)];
@@ -248,7 +310,7 @@ async function genkitSetup(options, genkitInfo, projectDir) {
                 message: "Would like you to enable telemetry collection?",
                 default: true,
             }));
-        generateSampleFile(modelOptions[model].plugin, plugins, projectDir, genkitInfo.templateVersion, enableTelemetry);
+        generateSampleFile(modelOptions[model], projectDir, genkitInfo.templateVersion, enableTelemetry);
     }
 }
 exports.genkitSetup = genkitSetup;
@@ -325,25 +387,23 @@ async function installNpmPackages(projectDir, packages, devPackages) {
         process.exit(1);
     }
 }
-function generateSampleFile(modelPlugin, configPlugins, projectDir, templateVersion, enableTelemetry) {
+function generateSampleFile(modelOption, projectDir, templateVersion, enableTelemetry) {
+    var _a;
     let modelImport = "";
-    if (modelPlugin && pluginToInfo[modelPlugin].model) {
-        const modelInfo = pluginToInfo[modelPlugin].model || "";
-        modelImport = "\n" + generateImportStatement(modelInfo, modelPlugin) + "\n";
+    const pluginInfo = getPluginInfo(modelOption);
+    if (pluginInfo.imports) {
+        modelImport = "\n" + generateImportStatement(pluginInfo) + "\n";
     }
     let modelImportComment = "";
-    if (modelPlugin && pluginToInfo[modelPlugin].modelImportComment) {
-        const comment = pluginToInfo[modelPlugin].modelImportComment || "";
-        modelImportComment = `\n${comment}`;
+    if (pluginInfo.modelImportComment) {
+        modelImportComment = `\n${pluginInfo.modelImportComment}`;
     }
     const commentedModelImport = `${modelImportComment}${modelImport}`;
     const templatePath = path.join(__dirname, `../../../../templates/genkit/firebase.${templateVersion}.template`);
     const template = fs.readFileSync(templatePath, "utf8");
-    const sample = renderConfig(configPlugins, template
+    const sample = renderConfig(pluginInfo, template
         .replace("$GENKIT_MODEL_IMPORT\n", commentedModelImport)
-        .replace("$GENKIT_MODEL", modelPlugin
-        ? pluginToInfo[modelPlugin].model || pluginToInfo[modelPlugin].modelStr || ""
-        : "'' /* TODO: Set a model. */"), enableTelemetry);
+        .replace("$GENKIT_MODEL", (_a = pluginInfo.model) !== null && _a !== void 0 ? _a : "'' /* TODO: Set a model. */"), enableTelemetry);
     (0, utils_1.logLabeledBullet)("genkit", "Generating sample file");
     try {
         const samplePath = "src/genkit-sample.ts";
@@ -402,19 +462,18 @@ async function updatePackageJson(nonInteractive, projectDir) {
         process.exit(1);
     }
 }
-function renderConfig(pluginNames, template, enableTelemetry) {
-    const imports = pluginNames
-        .map((pluginName) => generateImportStatement(pluginToInfo[pluginName].imports, pluginName))
-        .join("\n");
-    const plugins = pluginNames.map((pluginName) => `    ${pluginToInfo[pluginName].init},`).join("\n") ||
-        "    /* Add your plugins here. */";
+function renderConfig(pluginInfo, template, enableTelemetry) {
+    const plugins = pluginInfo.init || "    /* Add your plugins here. */";
     return template
-        .replace("$GENKIT_CONFIG_IMPORTS", imports)
+        .replace("$GENKIT_CONFIG_IMPORTS", generateImportStatement(pluginInfo))
         .replace("$GENKIT_CONFIG_PLUGINS", plugins)
         .replaceAll("$TELEMETRY_COMMENT", enableTelemetry ? "" : "// ");
 }
-function generateImportStatement(imports, name) {
-    return `import {${imports}} from "${name}";`;
+function generateImportStatement(pluginInfo) {
+    if (pluginInfo.imports && pluginInfo.plugin) {
+        return `import {${pluginInfo.imports}} from "${pluginInfo.plugin}";`;
+    }
+    return "";
 }
 async function promptWriteMode(message, defaultOption = "merge") {
     return (0, prompt_1.select)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "14.24.2",
+  "version": "14.25.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -30,7 +30,7 @@
   ],
   "preferGlobal": true,
   "engines": {
-    "node": ">=20.0.0 || >=22.0.0"
+    "node": ">=20.0.0 || >=22.0.0 || >=24.0.0"
   },
   "author": "Firebase (https://firebase.google.com/)",
   "license": "MIT",
@@ -123,7 +123,7 @@
     "sql-formatter": "^15.3.0",
     "stream-chain": "^2.2.4",
     "stream-json": "^1.7.3",
-    "superstatic": "^9.2.0",
+    "superstatic": "^10.0.0",
     "tar": "^6.1.11",
     "tcp-port-used": "^1.0.2",
     "tmp": "^0.2.3",

package/templates/genkit/firebase.1.18.0.template

@@ -0,0 +1,72 @@
+import {genkit, z} from "genkit";
+$GENKIT_CONFIG_IMPORTS
+
+// Cloud Functions for Firebase supports Genkit natively. The onCallGenkit function creates a callable
+// function from a Genkit action. It automatically implements streaming if your flow does.
+// The https library also has other utility methods such as hasClaim, which verifies that
+// a caller's token has a specific claim (optionally matching a specific value)
+import { onCallGenkit, hasClaim } from "firebase-functions/https";
+
+// Gemini Developer API models and Vertex Express Mode models depend on an API key.
+// API keys should be stored in Cloud Secret Manager so that access to these
+// sensitive values can be controlled. defineSecret does this for you automatically.
+// If you are using Google Developer API (googleAI) you can get an API key at https://aistudio.google.com/app/apikey
+// If you are using Vertex Express Mode (vertexAI with apiKey) you can get an API key
+// from the Vertex AI Studio Express Mode setup.
+import { defineSecret } from "firebase-functions/params";
+const apiKey = defineSecret("GOOGLE_GENAI_API_KEY");
+
+// The Firebase telemetry plugin exports a combination of metrics, traces, and logs to Google Cloud
+// Observability. See https://firebase.google.com/docs/genkit/observability/telemetry-collection.
+$TELEMETRY_COMMENTimport {enableFirebaseTelemetry} from "@genkit-ai/firebase";
+$TELEMETRY_COMMENTenableFirebaseTelemetry();
+
+const ai = genkit({
+  plugins: [
+$GENKIT_CONFIG_PLUGINS
+  ],
+});
+
+// Define a simple flow that prompts an LLM to generate menu suggestions.
+const menuSuggestionFlow = ai.defineFlow({
+    name: "menuSuggestionFlow",
+    inputSchema: z.string().describe("A restaurant theme").default("seafood"),
+    outputSchema: z.string(),
+    streamSchema: z.string(),
+  }, async (subject, { sendChunk }) => {
+    // Construct a request and send it to the model API.
+    const prompt =
+      `Suggest an item for the menu of a ${subject} themed restaurant`;
+    const { response, stream } = ai.generateStream({
+      model: $GENKIT_MODEL,
+      prompt: prompt,
+      config: {
+        temperature: 1,
+      },
+    });
+
+    for await (const chunk of stream) {
+      sendChunk(chunk.text);
+    }
+
+    // Handle the response from the model API. In this sample, we just
+    // convert it to a string, but more complicated flows might coerce the
+    // response into structured output or chain the response into another
+    // LLM call, etc.
+    return (await response).text;
+  }
+);
+
+export const menuSuggestion = onCallGenkit({
+  // Uncomment to enable AppCheck. This can reduce costs by ensuring only your Verified
+  // app users can use your API. Read more at https://firebase.google.com/docs/app-check/cloud-functions
+  // enforceAppCheck: true,
+
+  // authPolicy can be any callback that accepts an AuthData (a uid and tokens dictionary) and the
+  // request data. The isSignedIn() and hasClaim() helpers can be used to simplify. The following
+  // will require the user to have the email_verified claim, for example.
+  // authPolicy: hasClaim("email_verified"),
+
+  // Grant access to the API key to this function:
+  secrets: [apiKey],
+}, menuSuggestionFlow);

package/templates/genkit/firebase.0.9.0.template

@@ -1,57 +0,0 @@
-// Import the Genkit core libraries and plugins.
-import {genkit, z} from "genkit";
-$GENKIT_CONFIG_IMPORTS
-$GENKIT_MODEL_IMPORT
-
-// From the Firebase plugin, import the functions needed to deploy flows using
-// Cloud Functions.
-import {firebaseAuth} from "@genkit-ai/firebase/auth";
-import {onFlow} from "@genkit-ai/firebase/functions";
-
-const ai = genkit({
-  plugins: [
-$GENKIT_CONFIG_PLUGINS
-  ],
-});
-
-// Define a simple flow that prompts an LLM to generate menu suggestions.
-export const menuSuggestionFlow = onFlow(
-  ai,
-  {
-    name: "menuSuggestionFlow",
-    inputSchema: z.string().describe("A restaurant theme").default("seafood"),
-    outputSchema: z.string(),
-    authPolicy: firebaseAuth((user) => {
-      // By default, the firebaseAuth policy requires that all requests have an
-      // `Authorization: Bearer` header containing the user's Firebase
-      // Authentication ID token. All other requests are rejected with error
-      // 403. If your app client uses the Cloud Functions for Firebase callable
-      // functions feature, the library automatically attaches this header to
-      // requests.
-
-      // You should also set additional policy requirements as appropriate for
-      // your app. For example:
-      // if (!user.email_verified) {
-      //   throw new Error("Verified email required to run flow");
-      // }
-    }),
-  },
-  async (subject) => {
-    // Construct a request and send it to the model API.
-    const prompt =
-      `Suggest an item for the menu of a ${subject} themed restaurant`;
-    const llmResponse = await ai.generate({
-      model: $GENKIT_MODEL,
-      prompt: prompt,
-      config: {
-        temperature: 1,
-      },
-    });
-
-    // Handle the response from the model API. In this sample, we just
-    // convert it to a string, but more complicated flows might coerce the
-    // response into structured output or chain the response into another
-    // LLM call, etc.
-    return llmResponse.text;
-  }
-);