firebase-tools 15.0.0 → 15.1.0

package/lib/appUtils.js

@@ -27,21 +27,20 @@ async function getPlatformsFromFolder(dirPath) {
 }
 exports.getPlatformsFromFolder = getPlatformsFromFolder;
 async function detectApps(dirPath) {
-    const packageJsonFiles = await detectFiles(dirPath, "package.json");
-    const pubSpecYamlFiles = await detectFiles(dirPath, "pubspec.yaml");
-    const srcMainFolders = await detectFiles(dirPath, "src/main/");
-    const xCodeProjects = await detectFiles(dirPath, "*.xcodeproj/");
-    const adminAndWebApps = (await Promise.all(packageJsonFiles.map((p) => packageJsonToAdminOrWebApp(dirPath, p)))).flat();
-    const flutterAppPromises = await Promise.all(pubSpecYamlFiles.map((f) => processFlutterDir(dirPath, f)));
-    const flutterApps = flutterAppPromises.flat();
-    const androidAppPromises = await Promise.all(srcMainFolders.map((f) => processAndroidDir(dirPath, f)));
-    const androidApps = androidAppPromises
-        .flat()
-        .filter((a) => !flutterApps.some((f) => isPathInside(f.directory, a.directory)));
-    const iosAppPromises = await Promise.all(xCodeProjects.map((f) => processIosDir(dirPath, f)));
-    const iosApps = iosAppPromises
-        .flat()
-        .filter((a) => !flutterApps.some((f) => isPathInside(f.directory, a.directory)));
+    const [packageJsonFiles, pubSpecYamlFiles, srcMainFolders, xCodeProjects] = await Promise.all([
+        detectFiles(dirPath, "package.json"),
+        detectFiles(dirPath, "pubspec.yaml"),
+        detectFiles(dirPath, "src/main/"),
+        detectFiles(dirPath, "*.xcodeproj/"),
+    ]);
+    const [adminAndWebApps, flutterApps, androidAppsRaw, iosAppsRaw] = await Promise.all([
+        Promise.all(packageJsonFiles.map((p) => packageJsonToAdminOrWebApp(dirPath, p))).then((r) => r.flat()),
+        Promise.all(pubSpecYamlFiles.map((f) => processFlutterDir(dirPath, f))).then((r) => r.flat()),
+        Promise.all(srcMainFolders.map((f) => processAndroidDir(dirPath, f))).then((r) => r.flat()),
+        Promise.all(xCodeProjects.map((f) => processIosDir(dirPath, f))).then((r) => r.flat()),
+    ]);
+    const androidApps = androidAppsRaw.filter((a) => !flutterApps.some((f) => isPathInside(f.directory, a.directory)));
+    const iosApps = iosAppsRaw.filter((a) => !flutterApps.some((f) => isPathInside(f.directory, a.directory)));
     return [...flutterApps, ...androidApps, ...iosApps, ...adminAndWebApps];
 }
 exports.detectApps = detectApps;

package/lib/bin/mcp.js

@@ -2,14 +2,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mcp = void 0;
+const path_1 = require("path");
+const util_1 = require("util");
 const logger_1 = require("../logger");
 const index_1 = require("../mcp/index");
-const util_1 = require("util");
+const index_js_1 = require("../mcp/prompts/index.js");
+const index_js_2 = require("../mcp/resources/index.js");
+const index_js_3 = require("../mcp/tools/index.js");
 const types_1 = require("../mcp/types");
-const index_js_1 = require("../mcp/tools/index.js");
-const index_js_2 = require("../mcp/prompts/index.js");
-const index_js_3 = require("../mcp/resources/index.js");
-const path_1 = require("path");
 const STARTUP_MESSAGE = `
 This is a running process of the Firebase MCP server. This command should only be executed by an MCP client. An example MCP client configuration might be:
 
@@ -22,28 +22,60 @@ This is a running process of the Firebase MCP server. This command should only b
   }
 }
 `;
+const HELP_TEXT = `Usage: firebase mcp [options]
+
+Description:
+  Starts the Model Context Protocol (MCP) server for the Firebase CLI. This server provides a
+  standardized way for AI agents and IDEs to interact with your Firebase project.
+
+Tool Discovery & Loading:
+  The server automatically determines which tools to expose based on your project context.
+
+  1. Auto-Detection (Default):
+     - Scans 'firebase.json' for configured services (e.g., Hosting, Firestore).
+     - Checks enabled Google Cloud APIs for the active project.
+     - Inspects project files for specific SDKs (e.g., Crashlytics in Android/iOS).
+
+  2. Manual Overrides:
+     - Use '--only' to restrict tool discovery to specific feature sets (e.g., core, firestore).
+     - Use '--tools' to disable auto-detection entirely and load specific tools by name.
+
+Options:
+  --dir <path>              Project root directory (defaults to current working directory).
+  --only <features>         Comma-separated list of features to enable (e.g. core, firestore).
+                            If specified, auto-detection is disabled for other features.
+  --tools <tools>           Comma-separated list of specific tools to enable. Disables
+                            auto-detection entirely.
+  -h, --help                Show this help message.
+`;
 async function mcp() {
     const { values } = (0, util_1.parseArgs)({
         options: {
             only: { type: "string", default: "" },
+            tools: { type: "string", default: "" },
             dir: { type: "string" },
             "generate-tool-list": { type: "boolean", default: false },
             "generate-prompt-list": { type: "boolean", default: false },
             "generate-resource-list": { type: "boolean", default: false },
+            help: { type: "boolean", default: false, short: "h" },
         },
         allowPositionals: true,
     });
     let earlyExit = false;
+    if (values.help) {
+        console.log(HELP_TEXT);
+        earlyExit = true;
+    }
     if (values["generate-tool-list"]) {
-        console.log((0, index_js_1.markdownDocsOfTools)());
+        console.log((0, index_js_3.markdownDocsOfTools)());
         earlyExit = true;
     }
     if (values["generate-prompt-list"]) {
-        console.log((0, index_js_2.markdownDocsOfPrompts)());
+        console.log((0, index_js_1.markdownDocsOfPrompts)());
         earlyExit = true;
     }
     if (values["generate-resource-list"]) {
-        console.log((0, index_js_3.markdownDocsOfResources)());
+        console.log((0, index_js_2.markdownDocsOfResources)());
         earlyExit = true;
     }
     if (earlyExit)
@@ -52,9 +84,15 @@ async function mcp() {
     (0, logger_1.useFileLogger)();
     const activeFeatures = (values.only || "")
         .split(",")
+        .map((f) => f.trim())
         .filter((f) => types_1.SERVER_FEATURES.includes(f));
+    const enabledTools = (values.tools || "")
+        .split(",")
+        .map((t) => t.trim())
+        .filter((t) => t.length > 0);
     const server = new index_1.FirebaseMcpServer({
         activeFeatures,
+        enabledTools,
         projectRoot: values.dir ? (0, path_1.resolve)(values.dir) : undefined,
     });
     await server.start();

package/lib/emulator/downloadableEmulatorInfo.json

@@ -54,36 +54,36 @@
     },
     "dataconnect": {
         "darwin": {
-            "version": "3.0.0",
-            "expectedSize": 30155616,
-            "expectedChecksum": "cda7603cc22f37e06c372dcfca55b612",
-            "expectedChecksumSHA256": "bd57becce3712cf535d91fe97dfbdeee333a8bf2eb9c050a183643a3d7c4fa5f",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.0.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.0.0"
+            "version": "3.0.1",
+            "expectedSize": 30212960,
+            "expectedChecksum": "5a556a6e52d8e4707be9e65555cf6fc0",
+            "expectedChecksumSHA256": "04507e034d26a9e1053a246508351881473c82daf86357a28472e112f50e0128",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.0.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.0.1"
         },
         "darwin_arm64": {
-            "version": "3.0.0",
-            "expectedSize": 29630050,
-            "expectedChecksum": "34c68e4dff99a933b71bee73c35307be",
-            "expectedChecksumSHA256": "ff29f821f4a242d93c13c22dbd7b5d6c65ea16bbad78b2b36d075f943345b7c7",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.0.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.0.0"
+            "version": "3.0.1",
+            "expectedSize": 29680322,
+            "expectedChecksum": "31b21517979ce3acc408c432023a97e5",
+            "expectedChecksumSHA256": "36e2db3abf7a024436ba045805153a5f7ae2845f34658c187c38aeff329c6626",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.0.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.0.1"
         },
         "win32": {
-            "version": "3.0.0",
-            "expectedSize": 30653440,
-            "expectedChecksum": "6087cb5b1dea5154fd168dd131006e85",
-            "expectedChecksumSHA256": "0efa54faf43f1eb3bba200e0a1c369f3fec8d2a929911a223d06322ef94afdec",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.0.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.0.0.exe"
+            "version": "3.0.1",
+            "expectedSize": 30712832,
+            "expectedChecksum": "953603294bf7112a5100936db813f928",
+            "expectedChecksumSHA256": "4a71d6ce535302a28215e08cc3b645818cf8d8204f4bb2512455d3b7d3c17df1",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.0.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.0.1.exe"
         },
         "linux": {
-            "version": "3.0.0",
-            "expectedSize": 30077112,
-            "expectedChecksum": "1e8b62069c07fbb2139521b7ff631865",
-            "expectedChecksumSHA256": "19d0a384d80ba1128ca4a64814d76b67e4da012020fec5b5dd329ece8fc37471",
-            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.0.0",
-            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.0.0"
+            "version": "3.0.1",
+            "expectedSize": 30138552,
+            "expectedChecksum": "48d5f03c2edea8d4c6b200dccc9bf8a8",
+            "expectedChecksumSHA256": "cdf2d37f69b4372c0757afcc6c6ed4d7c6162fe7d29d9191e20e1411e116a665",
+            "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.0.1",
+            "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.0.1"
         }
     }
 }

package/lib/gcp/cloudsql/cloudsqladmin.js

@@ -51,7 +51,7 @@ function instanceConsoleLink(projectId, instanceId) {
     return `https://console.cloud.google.com/sql/instances/${instanceId}/overview?project=${projectId}`;
 }
 exports.instanceConsoleLink = instanceConsoleLink;
-exports.DEFAULT_DATABASE_VERSION = "POSTGRES_15";
+exports.DEFAULT_DATABASE_VERSION = "POSTGRES_17";
 async function createInstance(args) {
     const databaseFlags = [{ name: "cloudsql.iam_authentication", value: "on" }];
     if (args.enableGoogleMlIntegration) {

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/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": "15.0.0",
+  "version": "15.1.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "mcpName": "io.github.firebase/firebase-mcp",