firebase-tools 14.27.0 → 15.1.0

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

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addSchemaToDataConnectYaml = exports.actuate = exports.askQuestions = void 0;
+const clc = require("colorette");
+const fs = require("fs-extra");
+const path_1 = require("path");
+const yaml = require("yaml");
+const prompt_1 = require("../../../prompt");
+const utils_1 = require("../../../utils");
+const load_1 = require("../../../dataconnect/load");
+const names_1 = require("../../../dataconnect/names");
+const experiments = require("../../../experiments");
+const cloudbilling_1 = require("../../../gcp/cloudbilling");
+const track_1 = require("../../../track");
+async function askQuestions(setup, config) {
+    var _a;
+    const resolverInfo = {
+        id: "",
+        uri: "",
+        serviceInfo: {},
+    };
+    const serviceInfos = await (0, load_1.loadAll)(setup.projectId || "", config);
+    if (!serviceInfos.length) {
+        throw new Error(`No Firebase Data Connect workspace found. Run ${clc.bold("firebase init dataconnect")} to set up a service and main schema.`);
+    }
+    else if (serviceInfos.length === 1) {
+        resolverInfo.serviceInfo = serviceInfos[0];
+    }
+    else {
+        const choices = serviceInfos.map((si) => {
+            const serviceName = (0, names_1.parseServiceName)(si.serviceName);
+            return {
+                name: `${serviceName.location}/${serviceName.serviceId}`,
+                value: si,
+            };
+        });
+        resolverInfo.serviceInfo = await (0, prompt_1.select)({
+            message: "Which service would you like to set up a custom resolver for?",
+            choices,
+        });
+    }
+    resolverInfo.id = await (0, prompt_1.input)({
+        message: `What ID would you like to use for your custom resolver?`,
+        default: (0, utils_1.newUniqueId)(`resolver`, ((_a = resolverInfo.serviceInfo.dataConnectYaml.schemas) === null || _a === void 0 ? void 0 : _a.map((sch) => sch.id || "")) || []),
+    });
+    resolverInfo.uri = `https://${resolverInfo.id}-${setup.projectNumber || "PROJECT_NUMBER"}.${resolverInfo.serviceInfo.dataConnectYaml.location}.run.app/graphql`;
+    (0, utils_1.logBullet)("Setting " +
+        clc.bold(resolverInfo.uri) +
+        " as the custom resolver URL. To change this, update your " +
+        clc.bold(`dataconnect.yaml`) +
+        " later.");
+    setup.featureInfo = setup.featureInfo || {};
+    setup.featureInfo.dataconnectResolver = resolverInfo;
+}
+exports.askQuestions = askQuestions;
+async function actuate(setup, config) {
+    var _a;
+    if (!experiments.isEnabled("fdcwebhooks")) {
+        return;
+    }
+    const resolverInfo = (_a = setup.featureInfo) === null || _a === void 0 ? void 0 : _a.dataconnectResolver;
+    if (!resolverInfo) {
+        throw new Error("Data Connect resolver feature ResolverRequiredInfo not provided");
+    }
+    const startTime = Date.now();
+    try {
+        actuateWithInfo(config, resolverInfo);
+    }
+    finally {
+        const source = "init_resolver";
+        void (0, track_1.trackGA4)("dataconnect_init", {
+            source,
+            project_status: setup.projectId
+                ? (await (0, cloudbilling_1.isBillingEnabled)(setup))
+                    ? "blaze"
+                    : "spark"
+                : "missing",
+        }, Date.now() - startTime);
+    }
+}
+exports.actuate = actuate;
+function actuateWithInfo(config, info) {
+    var _a;
+    const dataConnectYaml = JSON.parse(JSON.stringify((_a = info.serviceInfo) === null || _a === void 0 ? void 0 : _a.dataConnectYaml));
+    addSchemaToDataConnectYaml(dataConnectYaml, info);
+    info.serviceInfo.dataConnectYaml = dataConnectYaml;
+    const dataConnectYamlContents = yaml.stringify(dataConnectYaml);
+    const dataConnectYamlPath = (0, path_1.join)(info.serviceInfo.sourceDirectory, "dataconnect.yaml");
+    config.writeProjectFile((0, path_1.relative)(config.projectDir, dataConnectYamlPath), dataConnectYamlContents);
+    fs.ensureFileSync((0, path_1.join)(info.serviceInfo.sourceDirectory, `schema_${info.id}`, "schema.gql"));
+}
+function addSchemaToDataConnectYaml(dataConnectYaml, info) {
+    const secondarySchema = {
+        source: `./schema_${info.id}`,
+        id: info.id,
+        datasource: {
+            httpGraphql: {
+                uri: info.uri,
+            },
+        },
+    };
+    if (!dataConnectYaml.schemas) {
+        dataConnectYaml.schemas = [];
+        if (dataConnectYaml.schema) {
+            dataConnectYaml.schemas.push(dataConnectYaml.schema);
+            dataConnectYaml.schema = undefined;
+        }
+    }
+    dataConnectYaml.schemas.push(secondarySchema);
+}
+exports.addSchemaToDataConnectYaml = addSchemaToDataConnectYaml;

package/lib/init/features/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aiLogicActuate = exports.aiLogicAskQuestions = exports.aitools = exports.apptestingAcutate = exports.apptestingAskQuestions = exports.genkit = exports.apphosting = exports.dataconnectSdkActuate = exports.dataconnectSdkAskQuestions = exports.dataconnectActuate = exports.dataconnectAskQuestions = exports.hostingGithub = exports.remoteconfig = exports.project = exports.extensions = exports.emulators = exports.storageActuate = exports.storageAskQuestions = exports.hostingActuate = exports.hostingAskQuestions = exports.functions = exports.firestoreActuate = exports.firestoreAskQuestions = exports.databaseActuate = exports.databaseAskQuestions = exports.account = void 0;
+exports.aiLogicActuate = exports.aiLogicAskQuestions = exports.aitools = exports.apptestingAcutate = exports.apptestingAskQuestions = exports.genkit = exports.apphosting = exports.dataconnectResolverActuate = exports.dataconnectResolverAskQuestions = exports.dataconnectSdkActuate = exports.dataconnectSdkAskQuestions = exports.dataconnectActuate = exports.dataconnectAskQuestions = exports.hostingGithub = exports.remoteconfig = exports.project = exports.extensions = exports.emulators = exports.storageActuate = exports.storageAskQuestions = exports.hostingActuate = exports.hostingAskQuestions = 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");
@@ -33,6 +33,9 @@ Object.defineProperty(exports, "dataconnectActuate", { enumerable: true, get: fu
 var sdk_1 = require("./dataconnect/sdk");
 Object.defineProperty(exports, "dataconnectSdkAskQuestions", { enumerable: true, get: function () { return sdk_1.askQuestions; } });
 Object.defineProperty(exports, "dataconnectSdkActuate", { enumerable: true, get: function () { return sdk_1.actuate; } });
+var resolver_1 = require("./dataconnect/resolver");
+Object.defineProperty(exports, "dataconnectResolverAskQuestions", { enumerable: true, get: function () { return resolver_1.askQuestions; } });
+Object.defineProperty(exports, "dataconnectResolverActuate", { enumerable: true, get: function () { return resolver_1.actuate; } });
 var apphosting_1 = require("./apphosting");
 Object.defineProperty(exports, "apphosting", { enumerable: true, get: function () { return apphosting_1.doSetup; } });
 var genkit_1 = require("./genkit");

package/lib/init/features/project.js

@@ -88,6 +88,7 @@ async function usingProjectMetadata(setup, config, pm) {
     }
     _.set(setup.rcfile, "projects.default", pm.projectId);
     setup.projectId = pm.projectId;
+    setup.projectNumber = pm.projectNumber;
     setup.instance = (_a = pm.resources) === null || _a === void 0 ? void 0 : _a.realtimeDatabaseInstance;
     setup.projectLocation = (_b = pm.resources) === null || _b === void 0 ? void 0 : _b.locationId;
     utils.makeActiveProject(config.projectDir, pm.projectId);

package/lib/init/index.js

@@ -29,6 +29,11 @@ const featuresList = [
         askQuestions: features.dataconnectSdkAskQuestions,
         actuate: features.dataconnectSdkActuate,
     },
+    {
+        name: "dataconnect:resolver",
+        askQuestions: features.dataconnectResolverAskQuestions,
+        actuate: features.dataconnectResolverActuate,
+    },
     { name: "functions", doSetup: features.functions },
     {
         name: "hosting",

package/lib/mcp/index.js

@@ -4,26 +4,27 @@ exports.FirebaseMcpServer = void 0;
 const index_js_1 = require("@modelcontextprotocol/sdk/server/index.js");
 const stdio_js_1 = require("@modelcontextprotocol/sdk/server/stdio.js");
 const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
-const util_1 = require("./util");
-const types_1 = require("./types");
-const index_1 = require("./tools/index");
-const index_2 = require("./prompts/index");
-const configstore_1 = require("../configstore");
+const crossSpawn = require("cross-spawn");
+const node_fs_1 = require("node:fs");
 const command_1 = require("../command");
-const requireAuth_1 = require("../requireAuth");
-const projectUtils_1 = require("../projectUtils");
-const errors_1 = require("./errors");
-const track_1 = require("../track");
 const config_1 = require("../config");
-const rc_1 = require("../rc");
+const configstore_1 = require("../configstore");
 const hubClient_1 = require("../emulator/hubClient");
-const node_fs_1 = require("node:fs");
-const logging_transport_1 = require("./logging-transport");
 const env_1 = require("../env");
+const projectUtils_1 = require("../projectUtils");
+const rc_1 = require("../rc");
+const requireAuth_1 = require("../requireAuth");
 const timeout_1 = require("../timeout");
+const track_1 = require("../track");
+const errors_1 = require("./errors");
+const logging_transport_1 = require("./logging-transport");
+const index_1 = require("./prompts/index");
 const resources_1 = require("./resources");
-const crossSpawn = require("cross-spawn");
+const index_2 = require("./tools/index");
+const types_1 = require("./types");
+const util_1 = require("./util");
 const availability_1 = require("./util/availability");
+const cloudbilling_1 = require("../gcp/cloudbilling");
 const SERVER_VERSION = "0.3.0";
 const cmd = new command_1.Command("mcp");
 const orderedLogLevels = [
@@ -55,6 +56,7 @@ class FirebaseMcpServer {
         this.currentLogLevel = process.env.FIREBASE_MCP_DEBUG_LOG ? "debug" : undefined;
         this.activeFeatures = options.activeFeatures;
         this.startupRoot = options.projectRoot || process.env.PROJECT_ROOT;
+        this.enabledTools = options.enabledTools;
         this.server = new index_js_1.Server({ name: "firebase", version: SERVER_VERSION });
         this.server.registerCapabilities({
             tools: { listChanged: true },
@@ -135,7 +137,8 @@ class FirebaseMcpServer {
         this.logger.debug("detecting active features of Firebase MCP server...");
         const projectId = (await this.getProjectId()) || "";
         const accountEmail = await this.getAuthenticatedUser();
-        const ctx = this._createMcpContext(projectId, accountEmail);
+        const isBillingEnabled = projectId ? await (0, cloudbilling_1.checkBillingEnabled)(projectId) : false;
+        const ctx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
         const detected = await Promise.all(types_1.SERVER_FEATURES.map(async (f) => {
             const availabilityCheck = (0, availability_1.getDefaultFeatureAvailabilityCheck)(f);
             if (await availabilityCheck(ctx))
@@ -172,8 +175,9 @@ class FirebaseMcpServer {
         const features = ((_a = this.activeFeatures) === null || _a === void 0 ? void 0 : _a.length) ? this.activeFeatures : this.detectedFeatures;
         const projectId = (await this.getProjectId()) || "";
         const accountEmail = await this.getAuthenticatedUser();
-        const ctx = this._createMcpContext(projectId, accountEmail);
-        return (0, index_1.availableTools)(ctx, features);
+        const isBillingEnabled = projectId ? await (0, cloudbilling_1.checkBillingEnabled)(projectId) : false;
+        const ctx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
+        return (0, index_2.availableTools)(ctx, features, this.enabledTools);
     }
     async getTool(name) {
         const tools = await this.getAvailableTools();
@@ -184,8 +188,9 @@ class FirebaseMcpServer {
         const features = ((_a = this.activeFeatures) === null || _a === void 0 ? void 0 : _a.length) ? this.activeFeatures : this.detectedFeatures;
         const projectId = (await this.getProjectId()) || "";
         const accountEmail = await this.getAuthenticatedUser();
-        const ctx = this._createMcpContext(projectId, accountEmail);
-        return (0, index_2.availablePrompts)(ctx, features);
+        const isBillingEnabled = projectId ? await (0, cloudbilling_1.checkBillingEnabled)(projectId) : false;
+        const ctx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
+        return (0, index_1.availablePrompts)(ctx, features);
     }
     async getPrompt(name) {
         const prompts = await this.getAvailablePrompts();
@@ -218,7 +223,7 @@ class FirebaseMcpServer {
             return null;
         }
     }
-    _createMcpContext(projectId, accountEmail) {
+    _createMcpContext(projectId, accountEmail, isBillingEnabled) {
         const options = { projectDir: this.cachedProjectDir, cwd: this.cachedProjectDir };
         return {
             projectId: projectId,
@@ -227,6 +232,7 @@ class FirebaseMcpServer {
             rc: (0, rc_1.loadRC)(options),
             accountEmail,
             firebaseCliCommand: this._getFirebaseCliCommand(),
+            isBillingEnabled,
         };
     }
     _getFirebaseCliCommand() {
@@ -282,7 +288,8 @@ class FirebaseMcpServer {
             if (err)
                 return err;
         }
-        const toolsCtx = this._createMcpContext(projectId, accountEmail);
+        const isBillingEnabled = projectId ? await (0, cloudbilling_1.checkBillingEnabled)(projectId) : false;
+        const toolsCtx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
         try {
             const res = await tool.fn(toolArgs, toolsCtx);
             await this.trackGA4("mcp_tool_call", {
@@ -332,7 +339,8 @@ class FirebaseMcpServer {
         projectId = projectId || "";
         const skipAutoAuthForStudio = (0, env_1.isFirebaseStudio)();
         const accountEmail = await this.getAuthenticatedUser(skipAutoAuthForStudio);
-        const promptsCtx = this._createMcpContext(projectId, accountEmail);
+        const isBillingEnabled = projectId ? await (0, cloudbilling_1.checkBillingEnabled)(projectId) : false;
+        const promptsCtx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
         try {
             const messages = await prompt.fn(promptArgs, promptsCtx);
             await this.trackGA4("mcp_get_prompt", {
@@ -366,7 +374,8 @@ class FirebaseMcpServer {
         projectId = projectId || "";
         const skipAutoAuthForStudio = (0, env_1.isFirebaseStudio)();
         const accountEmail = await this.getAuthenticatedUser(skipAutoAuthForStudio);
-        const resourceCtx = this._createMcpContext(projectId, accountEmail);
+        const isBillingEnabled = projectId ? await (0, cloudbilling_1.checkBillingEnabled)(projectId) : false;
+        const resourceCtx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
         const resolved = await (0, resources_1.resolveResource)(req.params.uri, resourceCtx);
         if (!resolved) {
             throw new types_js_1.McpError(types_js_1.ErrorCode.InvalidParams, `Resource '${req.params.uri}' could not be found.`);

package/lib/mcp/tools/core/get_environment.js

@@ -15,6 +15,7 @@ function hydrateTemplate(config) {
         : "<NONE>";
     const projectConfigPath = config.projectConfigPath || "<NO CONFIG PRESENT>";
     const geminiTosAccepted = config.geminiTosAccepted ? "Accepted" : "<NOT ACCEPTED>";
+    const billingEnabled = config.projectId ? (config.isBillingEnabled ? "Yes" : "No") : "N/A";
     const authenticatedUser = config.authenticatedUser || "<NONE>";
     const detectedApps = Object.entries(config.detectedAppIds).length > 0
         ? `\n\n${(0, js_yaml_1.dump)(config.detectedAppIds).trim()}\n`
@@ -30,6 +31,7 @@ Project Directory: ${config.projectDir}
 Project Config Path: ${projectConfigPath}
 Active Project ID: ${activeProject}
 Gemini in Firebase Terms of Service: ${geminiTosAccepted}
+Billing Enabled: ${billingEnabled}
 Authenticated User: ${authenticatedUser}
 Detected App IDs: ${detectedApps}
 Available Project Aliases (format: '[alias]: [projectId]'): ${availableProjects}${hasOtherAccounts ? `\nAvailable Accounts: \n\n${availableAccounts}` : ""}
@@ -63,7 +65,7 @@ exports.get_environment = (0, tool_1.tool)("core", {
         requiresAuth: false,
         requiresProject: false,
     },
-}, async (_, { projectId, host, accountEmail, rc, config }) => {
+}, async (_, { projectId, host, accountEmail, rc, config, isBillingEnabled }) => {
     const aliases = projectId ? (0, projectUtils_1.getAliases)({ rc }, projectId) : [];
     const geminiTosAccepted = !!configstore_1.configstore.get("gemini");
     const projectFileExists = config.projectFileExists("firebase.json");
@@ -84,6 +86,7 @@ exports.get_environment = (0, tool_1.tool)("core", {
         projectDir: host.cachedProjectDir,
         projectConfigPath: projectFileExists ? config.path("firebase.json") : undefined,
         geminiTosAccepted,
+        isBillingEnabled,
         authenticatedUser: accountEmail || undefined,
         projectAliasMap: rc.projects,
         allAccounts,

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compile = void 0;
 const zod_1 = require("zod");
 const tool_1 = require("../../tool");
-const load_1 = require("../../../dataconnect/load");
 const compile_1 = require("../../util/dataconnect/compile");
+const load_1 = require("../../../dataconnect/load");
 exports.compile = (0, tool_1.tool)("dataconnect", {
     name: "build",
     description: "Use this to compile Firebase Data Connect schema, operations, and/or connectors and check for build errors.",
@@ -16,7 +16,11 @@ exports.compile = (0, tool_1.tool)("dataconnect", {
         service_id: zod_1.z
             .string()
             .optional()
-            .describe("The Firebase Data Connect service ID to look for. If omitted, builds all services defined in `firebase.json`."),
+            .describe(`Service ID of the Data Connect service to compile. Used to disambiguate when there are multiple Data Connect services in firebase.json.`),
+        location_id: zod_1.z
+            .string()
+            .optional()
+            .describe(`Data Connect Service location ID to disambiguate among multiple Data Connect services.`),
     }),
     annotations: {
         title: "Compile Data Connect",
@@ -26,15 +30,17 @@ exports.compile = (0, tool_1.tool)("dataconnect", {
         requiresProject: false,
         requiresAuth: false,
     },
-}, async ({ service_id, error_filter }, { projectId, config }) => {
-    const serviceInfo = await (0, load_1.pickService)(projectId, config, service_id || undefined);
-    const errors = await (0, compile_1.compileErrors)(serviceInfo.sourceDirectory, error_filter);
-    if (errors)
+}, async ({ service_id, location_id, error_filter }, { projectId, config }) => {
+    const serviceInfos = await (0, load_1.pickServices)(projectId, config, service_id || undefined, location_id || undefined);
+    const errors = (await Promise.all(serviceInfos.map(async (serviceInfo) => {
+        return await (0, compile_1.compileErrors)(serviceInfo.sourceDirectory, error_filter);
+    }))).flat();
+    if (errors.length > 0)
         return {
             content: [
                 {
                     type: "text",
-                    text: `The following errors were encountered while compiling Data Connect from directory \`${serviceInfo.sourceDirectory}\`:\n\n${errors}`,
+                    text: `The following errors were encountered while compiling Data Connect:\n\n${errors.join("\n")}`,
                 },
             ],
             isError: true,

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

@@ -15,11 +15,14 @@ exports.execute = (0, tool_1.tool)("dataconnect", {
 You can use the \`dataconnect_generate_operation\` tool to generate a query.
 Example Data Connect schema and example queries can be found in files ending in \`.graphql\` or \`.gql\`.
 `),
-        service_id: zod_1.z.string().optional()
-            .describe(`Data Connect Service ID to dis-ambulate if there are multiple.
-It's only necessary if there are multiple dataconnect sources in \`firebase.json\`.
-You can find candidate service_id in \`dataconnect.yaml\`
-`),
+        service_id: zod_1.z
+            .string()
+            .optional()
+            .describe(`Service ID of the Data Connect service to compile. Used to disambiguate when there are multiple Data Connect services in firebase.json.`),
+        location_id: zod_1.z
+            .string()
+            .optional()
+            .describe(`Data Connect Service location ID to disambiguate among multiple Data Connect services.`),
         variables_json: zod_1.z
             .string()
             .optional()
@@ -42,8 +45,8 @@ You can find candidate service_id in \`dataconnect.yaml\`
         requiresProject: true,
         requiresAuth: true,
     },
-}, async ({ query, service_id, variables_json: unparsedVariables, use_emulator, auth_token_json: unparsedAuthToken, }, { projectId, config, host }) => {
-    const serviceInfo = await (0, load_1.pickService)(projectId, config, service_id || undefined);
+}, async ({ query, service_id, location_id, variables_json: unparsedVariables, use_emulator, auth_token_json: unparsedAuthToken, }, { projectId, config, host }) => {
+    const serviceInfo = await (0, load_1.pickOneService)(projectId, config, service_id || undefined, location_id || undefined);
     let apiClient;
     if (use_emulator) {
         apiClient = await (0, emulator_1.getDataConnectEmulatorClient)(host);

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

@@ -16,7 +16,11 @@ exports.generate_operation = (0, tool_1.tool)("dataconnect", {
         service_id: zod_1.z
             .string()
             .optional()
-            .describe("Optional: Uses the service ID from the firebase.json file if nothing provided. The service ID of the deployed Firebase resource."),
+            .describe(`Service ID of the Data Connect service to compile. Used to disambiguate when there are multiple Data Connect services in firebase.json.`),
+        location_id: zod_1.z
+            .string()
+            .optional()
+            .describe(`Data Connect Service location ID to disambiguate among multiple Data Connect services.`),
     }),
     annotations: {
         title: "Generate Data Connect Operation",
@@ -27,8 +31,8 @@ exports.generate_operation = (0, tool_1.tool)("dataconnect", {
         requiresAuth: true,
         requiresGemini: true,
     },
-}, async ({ prompt, service_id }, { projectId, config }) => {
-    const serviceInfo = await (0, load_1.pickService)(projectId, config, service_id || undefined);
+}, async ({ prompt, service_id, location_id }, { projectId, config }) => {
+    const serviceInfo = await (0, load_1.pickOneService)(projectId, config, service_id || undefined, location_id || undefined);
     const schema = await (0, fdcExperience_1.generateOperation)(prompt, serviceInfo.serviceName, projectId);
     return (0, util_1.toContent)(schema);
 });

package/lib/mcp/tools/index.js

@@ -1,20 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.markdownDocsOfTools = exports.availableTools = void 0;
-const index_1 = require("./auth/index");
-const index_2 = require("./dataconnect/index");
-const index_3 = require("./firestore/index");
+const index_1 = require("./apphosting/index");
+const index_2 = require("./apptesting/index");
+const index_3 = require("./auth/index");
 const index_4 = require("./core/index");
-const index_5 = require("./storage/index");
-const index_6 = require("./messaging/index");
-const index_7 = require("./remoteconfig/index");
-const index_8 = require("./crashlytics/index");
-const index_9 = require("./apphosting/index");
-const index_10 = require("./apptesting/index");
-const index_11 = require("./realtime_database/index");
-const index_12 = require("./functions/index");
-async function availableTools(ctx, activeFeatures) {
-    const allTools = getAllTools(activeFeatures);
+const index_5 = require("./crashlytics/index");
+const index_6 = require("./dataconnect/index");
+const index_7 = require("./firestore/index");
+const index_8 = require("./functions/index");
+const index_9 = require("./messaging/index");
+const index_10 = require("./realtime_database/index");
+const index_11 = require("./remoteconfig/index");
+const index_12 = require("./storage/index");
+function addFeaturePrefix(feature, tools) {
+    return tools.map((tool) => (Object.assign(Object.assign({}, tool), { mcp: Object.assign(Object.assign({}, tool.mcp), { name: `${feature}_${tool.mcp.name}`, _meta: Object.assign(Object.assign({}, tool.mcp._meta), { feature }) }) })));
+}
+const tools = {
+    apphosting: addFeaturePrefix("apphosting", index_1.appHostingTools),
+    apptesting: addFeaturePrefix("apptesting", index_2.apptestingTools),
+    auth: addFeaturePrefix("auth", index_3.authTools),
+    core: addFeaturePrefix("firebase", index_4.coreTools),
+    crashlytics: addFeaturePrefix("crashlytics", index_5.crashlyticsTools),
+    database: addFeaturePrefix("realtimedatabase", index_10.realtimeDatabaseTools),
+    dataconnect: addFeaturePrefix("dataconnect", index_6.dataconnectTools),
+    firestore: addFeaturePrefix("firestore", index_7.firestoreTools),
+    functions: addFeaturePrefix("functions", index_8.functionsTools),
+    messaging: addFeaturePrefix("messaging", index_9.messagingTools),
+    remoteconfig: addFeaturePrefix("remoteconfig", index_11.remoteConfigTools),
+    storage: addFeaturePrefix("storage", index_12.storageTools),
+};
+const allToolsMap = new Map(Object.values(tools)
+    .flat()
+    .sort((a, b) => a.mcp.name.localeCompare(b.mcp.name))
+    .map((t) => [t.mcp.name, t]));
+function getToolsByName(names) {
+    const selectedTools = new Set();
+    for (const toolName of names) {
+        const tool = allToolsMap.get(toolName);
+        if (tool) {
+            selectedTools.add(tool);
+        }
+    }
+    return Array.from(selectedTools);
+}
+function getToolsByFeature(serverFeatures) {
+    const features = new Set((serverFeatures === null || serverFeatures === void 0 ? void 0 : serverFeatures.length) ? serverFeatures : Object.keys(tools));
+    features.add("core");
+    return Array.from(features).flatMap((feature) => tools[feature] || []);
+}
+async function availableTools(ctx, activeFeatures, enabledTools) {
+    if (enabledTools === null || enabledTools === void 0 ? void 0 : enabledTools.length) {
+        return getToolsByName(enabledTools);
+    }
+    const allTools = getToolsByFeature(activeFeatures);
     const availabilities = await Promise.all(allTools.map((t) => {
         if (t.isAvailable) {
             return t.isAvailable(ctx);
@@ -24,39 +63,9 @@ async function availableTools(ctx, activeFeatures) {
     return allTools.filter((_, i) => availabilities[i]);
 }
 exports.availableTools = availableTools;
-function getAllTools(activeFeatures) {
-    const toolDefs = [];
-    if (!(activeFeatures === null || activeFeatures === void 0 ? void 0 : activeFeatures.length)) {
-        activeFeatures = Object.keys(tools);
-    }
-    if (!activeFeatures.includes("core")) {
-        activeFeatures.unshift("core");
-    }
-    for (const key of activeFeatures) {
-        toolDefs.push(...tools[key]);
-    }
-    return toolDefs;
-}
-const tools = {
-    core: addFeaturePrefix("firebase", index_4.coreTools),
-    firestore: addFeaturePrefix("firestore", index_3.firestoreTools),
-    auth: addFeaturePrefix("auth", index_1.authTools),
-    dataconnect: addFeaturePrefix("dataconnect", index_2.dataconnectTools),
-    storage: addFeaturePrefix("storage", index_5.storageTools),
-    messaging: addFeaturePrefix("messaging", index_6.messagingTools),
-    functions: addFeaturePrefix("functions", index_12.functionsTools),
-    remoteconfig: addFeaturePrefix("remoteconfig", index_7.remoteConfigTools),
-    crashlytics: addFeaturePrefix("crashlytics", index_8.crashlyticsTools),
-    apptesting: addFeaturePrefix("apptesting", index_10.apptestingTools),
-    apphosting: addFeaturePrefix("apphosting", index_9.appHostingTools),
-    database: addFeaturePrefix("realtimedatabase", index_11.realtimeDatabaseTools),
-};
-function addFeaturePrefix(feature, tools) {
-    return tools.map((tool) => (Object.assign(Object.assign({}, tool), { mcp: Object.assign(Object.assign({}, tool.mcp), { name: `${feature}_${tool.mcp.name}`, _meta: Object.assign(Object.assign({}, tool.mcp._meta), { feature }) }) })));
-}
 function markdownDocsOfTools() {
     var _a, _b, _c;
-    const allTools = getAllTools([]);
+    const allTools = getToolsByFeature([]);
     let doc = `
 | Tool Name | Feature Group | Description |
 | --------- | ------------- | ----------- |`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "14.27.0",
+  "version": "15.1.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "mcpName": "io.github.firebase/firebase-mcp",
@@ -125,7 +125,6 @@
     "stream-chain": "^2.2.4",
     "stream-json": "^1.7.3",
     "superstatic": "^10.0.0",
-    "tar": "^6.1.11",
     "tcp-port-used": "^1.0.2",
     "tmp": "^0.2.3",
     "triple-beam": "^1.3.0",

package/lib/deploy/functions/runtimes/node/extractTriggers.js

@@ -1,23 +0,0 @@
-"use strict";
-var extractTriggers = function (mod, triggers, prefix) {
-    prefix = prefix || "";
-    for (var funcName of Object.keys(mod)) {
-        var child = mod[funcName];
-        if (typeof child === "function" && child.__trigger && typeof child.__trigger === "object") {
-            if (funcName.indexOf("-") >= 0) {
-                throw new Error('Function name "' + funcName + '" is invalid. Function names cannot contain dashes.');
-            }
-            var trigger = {};
-            for (var key of Object.keys(child.__trigger)) {
-                trigger[key] = child.__trigger[key];
-            }
-            trigger.name = prefix + funcName;
-            trigger.entryPoint = trigger.name.replace(/-/g, ".");
-            triggers.push(trigger);
-        }
-        else if (typeof child === "object" && child !== null) {
-            extractTriggers(child, triggers, prefix + funcName + "-");
-        }
-    }
-};
-module.exports = extractTriggers;