Performance improvements and new billing info for get_environment

joehan · joehan · commit 5bddb9364d92 · 2025-12-04T15:25:57.000-08:00
diff --git a/src/appUtils.ts b/src/appUtils.ts
@@ -59,29 +59,30 @@ export async function getPlatformsFromFolder(dirPath: string): Promise<Platform[
  * @return A list of apps detected.
  */
 export async function detectApps(dirPath: string): Promise<App[]> {
-  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 [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 flutterApps = flutterAppPromises.flat();
 
-  const androidAppPromises = await Promise.all(
-    srcMainFolders.map((f) => processAndroidDir(dirPath, f)),
+  const iosApps = iosAppsRaw.filter(
+    (a) => !flutterApps.some((f) => isPathInside(f.directory, a.directory)),
   );
-  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)));
   return [...flutterApps, ...androidApps, ...iosApps, ...adminAndWebApps];
 }
 
diff --git a/src/mcp/index.ts b/src/mcp/index.ts
@@ -47,6 +47,7 @@ import { timeoutFallback } from "../timeout";
 import { resolveResource, resources, resourceTemplates } from "./resources";
 import * as crossSpawn from "cross-spawn";
 import { getDefaultFeatureAvailabilityCheck } from "./util/availability";
+import { checkBillingEnabled } from "../gcp/cloudbilling";
 
 const SERVER_VERSION = "0.3.0";
 
@@ -193,7 +194,8 @@ export 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 checkBillingEnabled(projectId) : false;
+    const ctx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
     const detected = await Promise.all(
       SERVER_FEATURES.map(async (f) => {
         const availabilityCheck = getDefaultFeatureAvailabilityCheck(f);
@@ -244,7 +246,8 @@ export class FirebaseMcpServer {
     // We need a project ID and user for the context, but it's ok if they're empty.
     const projectId = (await this.getProjectId()) || "";
     const accountEmail = await this.getAuthenticatedUser();
-    const ctx = this._createMcpContext(projectId, accountEmail);
+    const isBillingEnabled = projectId ? await checkBillingEnabled(projectId) : false;
+    const ctx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
     return availableTools(ctx, features);
   }
 
@@ -258,7 +261,8 @@ export class FirebaseMcpServer {
     // We need a project ID and user for the context, but it's ok if they're empty.
     const projectId = (await this.getProjectId()) || "";
     const accountEmail = await this.getAuthenticatedUser();
-    const ctx = this._createMcpContext(projectId, accountEmail);
+    const isBillingEnabled = projectId ? await checkBillingEnabled(projectId) : false;
+    const ctx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
     return availablePrompts(ctx, features);
   }
 
@@ -297,7 +301,11 @@ export class FirebaseMcpServer {
     }
   }
 
-  private _createMcpContext(projectId: string, accountEmail: string | null): McpContext {
+  private _createMcpContext(
+    projectId: string,
+    accountEmail: string | null,
+    isBillingEnabled: boolean,
+  ): McpContext {
     const options = { projectDir: this.cachedProjectDir, cwd: this.cachedProjectDir };
     return {
       projectId: projectId,
@@ -306,6 +314,7 @@ export class FirebaseMcpServer {
       rc: loadRC(options),
       accountEmail,
       firebaseCliCommand: this._getFirebaseCliCommand(),
+      isBillingEnabled,
     };
   }
 
@@ -370,7 +379,8 @@ export class FirebaseMcpServer {
       if (err) return err;
     }
 
-    const toolsCtx = this._createMcpContext(projectId, accountEmail);
+    const isBillingEnabled = projectId ? await checkBillingEnabled(projectId) : false;
+    const toolsCtx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
     try {
       const res = await tool.fn(toolArgs, toolsCtx);
       await this.trackGA4("mcp_tool_call", {
@@ -424,7 +434,8 @@ export class FirebaseMcpServer {
     const skipAutoAuthForStudio = isFirebaseStudio();
     const accountEmail = await this.getAuthenticatedUser(skipAutoAuthForStudio);
 
-    const promptsCtx = this._createMcpContext(projectId, accountEmail);
+    const isBillingEnabled = projectId ? await checkBillingEnabled(projectId) : false;
+    const promptsCtx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
 
     try {
       const messages = await prompt.fn(promptArgs, promptsCtx);
@@ -464,7 +475,8 @@ export class FirebaseMcpServer {
     const skipAutoAuthForStudio = isFirebaseStudio();
     const accountEmail = await this.getAuthenticatedUser(skipAutoAuthForStudio);
 
-    const resourceCtx = this._createMcpContext(projectId, accountEmail);
+    const isBillingEnabled = projectId ? await checkBillingEnabled(projectId) : false;
+    const resourceCtx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
 
     const resolved = await resolveResource(req.params.uri, resourceCtx);
     if (!resolved) {
diff --git a/src/mcp/tools/core/get_environment.spec.ts b/src/mcp/tools/core/get_environment.spec.ts
@@ -54,6 +54,7 @@ describe("get_environment tool", () => {
       rc,
       config,
       firebaseCliCommand: "firebase",
+      isBillingEnabled: false,
     };
   };
 
@@ -72,6 +73,7 @@ Project Directory: /test-dir
 Project Config Path: <NO CONFIG PRESENT>
 Active Project ID: <NONE>
 Gemini in Firebase Terms of Service: <NOT ACCEPTED>
+Billing Enabled: No
 Authenticated User: <NONE>
 Detected App IDs: <NONE>
 Available Project Aliases (format: '[alias]: [projectId]'): <NONE>
@@ -120,6 +122,7 @@ Project Directory: /test-dir
 Project Config Path: /test-dir/firebase.json
 Active Project ID: test-project (alias: my-alias)
 Gemini in Firebase Terms of Service: Accepted
+Billing Enabled: No
 Authenticated User: test@example.com
 Detected App IDs: 
 
diff --git a/src/mcp/tools/core/get_environment.ts b/src/mcp/tools/core/get_environment.ts
@@ -23,6 +23,9 @@ interface EnvironmentTemplateValues {
   // Whether the user has accepted Gemini in Firebase TOS
   geminiTosAccepted: boolean;
 
+  // Whether billing is enabled for the project
+  isBillingEnabled: boolean;
+
   // The authenticated user identifier
   authenticatedUser?: string;
 
@@ -48,6 +51,7 @@ export function hydrateTemplate(config: EnvironmentTemplateValues): string {
     : "<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
@@ -67,6 +71,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}` : ""}
@@ -106,9 +111,10 @@ export const get_environment = tool(
       requiresProject: false,
     },
   },
-  async (_, { projectId, host, accountEmail, rc, config }) => {
+  async (_, { projectId, host, accountEmail, rc, config, isBillingEnabled }) => {
     const aliases = projectId ? getAliases({ rc }, projectId) : [];
     const geminiTosAccepted = !!configstore.get("gemini");
+    const billingEnabled = isBillingEnabled;
     const projectFileExists = config.projectFileExists("firebase.json");
     const detectedApps = await detectApps(process.cwd());
     const allAccounts = getAllAccounts().map((account) => account.user.email);
@@ -129,6 +135,7 @@ export const get_environment = tool(
       projectDir: host.cachedProjectDir,
       projectConfigPath: projectFileExists ? config.path("firebase.json") : undefined,
       geminiTosAccepted,
+      isBillingEnabled: billingEnabled,
       authenticatedUser: accountEmail || undefined,
       projectAliasMap: rc.projects,
       allAccounts,
diff --git a/src/mcp/types.ts b/src/mcp/types.ts
@@ -30,4 +30,5 @@ export interface McpContext {
   host: FirebaseMcpServer;
   rc: RC;
   firebaseCliCommand: string;
+  isBillingEnabled: boolean;
 }
diff --git a/src/mcp/util/apptesting/availability.spec.ts b/src/mcp/util/apptesting/availability.spec.ts
@@ -31,6 +31,7 @@ describe("isAppTestingAvailable", () => {
     host: new FirebaseMcpServer({}),
     rc: {} as RC,
     firebaseCliCommand: "firebase",
+    isBillingEnabled: false,
   });
 
   it("returns false for non mobile project", async () => {
diff --git a/src/mcp/util/availability.spec.ts b/src/mcp/util/availability.spec.ts
@@ -17,6 +17,7 @@ describe("getDefaultFeatureAvailabilityCheck", () => {
     host: {} as any,
     rc: {} as any,
     firebaseCliCommand: "firebase",
+    isBillingEnabled: false,
   });
 
   beforeEach(() => {
diff --git a/src/mcp/util/crashlytics/availability.spec.ts b/src/mcp/util/crashlytics/availability.spec.ts
@@ -20,6 +20,7 @@ describe("isCrashlyticsAvailable", () => {
     host: new FirebaseMcpServer({}),
     rc: {} as RC,
     firebaseCliCommand: "firebase",
+    isBillingEnabled: false,
   });
 
   it("should return true for an Android project with Crashlytics in build.gradle", async () => {

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,5 @@ export interface McpContext {`
`30`	`30`	`host: FirebaseMcpServer;`
`31`	`31`	`rc: RC;`
`32`	`32`	`firebaseCliCommand: string;`
	`33`	`+ isBillingEnabled: boolean;`
`33`	`34`	`}`