Remove tools and prompts that rely on GiF ToS

CHANGELOG.md

@@ -1,2 +1,3 @@
+- Removed MCP tools and prompts that required Gemini in Firebase terms of service.
 - Fixes an issue where the `--only` flag was not always respected for `firebase mcp`
 - Removed timeout when connecting to Cloud SQL. Hopefully, should mitigate issue #9314. (#9725)

src/mcp/errors.ts

@@ -1,30 +1,11 @@
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { mcpError } from "./util";
-import { ensureGIFApiTos } from "../dataconnect/ensureApis";
-
 export const NO_PROJECT_ERROR = mcpError(
   "To proceed requires an active project. Use the `firebase_update_environment` tool to set a project ID",
   "PRECONDITION_FAILED",
 );
 
-const GEMINI_TOS_ERROR = mcpError(
-  "To proceed requires features from Gemini in Firebase. You can enable the usage of this service and accept its associated terms of service using `firebase_update_environment`.\n" +
-    "Learn more about Gemini in Firebase and how it uses your data: https://firebase.google.com/docs/gemini-in-firebase#how-gemini-in-firebase-uses-your-data",
-  "PRECONDITION_FAILED",
-);
-
-/** Enable the Gemini in Firebase API or return an error to accept it */
-export async function requireGeminiToS(projectId: string): Promise<CallToolResult | undefined> {
-  if (!projectId) {
-    return NO_PROJECT_ERROR;
-  }
-  if (!(await ensureGIFApiTos(projectId))) {
-    return GEMINI_TOS_ERROR;
-  }
-  return undefined;
-}
-
 export function noProjectDirectory(projectRoot: string | undefined): CallToolResult {
   return mcpError(
     `The current project directory '${
       projectRoot || "<NO PROJECT DIRECTORY FOUND>"
@@ -32,7 +13,7 @@
   );
 }
 
 export function mcpAuthError(skipADC: boolean): CallToolResult {
   if (skipADC) {
     return mcpError(
       `The user is not currently logged into the Firebase CLI, which is required to use this tool. Please run the 'firebase_login' tool to log in.`,

src/mcp/index.ts

@@ -37,7 +37,7 @@
 import { requireAuth } from "../requireAuth";
 import { timeoutFallback } from "../timeout";
 import { trackGA4 } from "../track";
-import { mcpAuthError, NO_PROJECT_ERROR, noProjectDirectory, requireGeminiToS } from "./errors";
+import { mcpAuthError, NO_PROJECT_ERROR, noProjectDirectory } from "./errors";
 import { LoggingStdioServerTransport } from "./logging-transport";
 import { ServerPrompt } from "./prompt";
 import { availablePrompts } from "./prompts/index";
@@ -154,7 +154,7 @@
   }
 
   /** Wait until initialization has finished. */
   ready() {
     if (this._ready) return Promise.resolve();
     return new Promise((resolve, reject) => {
       this._readyPromises.push({ resolve: resolve as () => void, reject });
@@ -165,19 +165,19 @@
     return this.clientInfo?.name ?? (isFirebaseStudio() ? "Firebase Studio" : "<unknown-client>");
   }
 
   private get clientConfigKey() {
     return `mcp.clientConfigs.${this.clientName}:${this.startupRoot || process.cwd()}`;
   }
 
   getStoredClientConfig(): ClientConfig {
     return configstore.get(this.clientConfigKey) || {};
   }
 
   updateStoredClientConfig(update: Partial<ClientConfig>) {
     const config = configstore.get(this.clientConfigKey) || {};
     const newConfig = { ...config, ...update };
     configstore.set(this.clientConfigKey, newConfig);
     return newConfig;
   }
 
   async detectProjectSetup(): Promise<void> {
@@ -192,7 +192,7 @@
     if (this.cachedProjectDir) return this.cachedProjectDir;
     const storedRoot = this.getStoredClientConfig().projectRoot;
     this.cachedProjectDir = storedRoot || this.startupRoot || process.cwd();
     this.logger.debug(`detected and cached project root: ${this.cachedProjectDir}`);
     return this.cachedProjectDir;
   }
 
@@ -371,19 +371,14 @@
     }
     projectId = projectId || "";
 
+    // Check if the user is logged in.
     // Check if the user is logged in.
     const skipAutoAuthForStudio = isFirebaseStudio();
     const accountEmail = await this.getAuthenticatedUser(skipAutoAuthForStudio);
     if (tool.mcp._meta?.requiresAuth && !accountEmail) {
       return mcpAuthError(skipAutoAuthForStudio);
     }
 
-    // Check if the tool requires Gemini in Firebase API.
-    if (tool.mcp._meta?.requiresGemini) {
-      const err = await requireGeminiToS(projectId);
-      if (err) return err;
-    }
-
     const isBillingEnabled = projectId ? await checkBillingEnabled(projectId) : false;
     const toolsCtx = this._createMcpContext(projectId, accountEmail, isBillingEnabled);
     try {

src/mcp/prompts/core/index.ts

@@ -1,7 +1,6 @@
 import { init } from "./init";
 import { deploy } from "./deploy";
-import { consult } from "./consult";
 
-const corePrompts = [deploy, init, consult];
+const corePrompts = [deploy, init];
 
 export { corePrompts };

src/mcp/tool.ts

@@ -33,9 +33,8 @@ export interface ServerTool<InputSchema extends ZodTypeAny = ZodTypeAny> {
       /** Set this on a tool if it *always* requires a project to work. */
       requiresProject?: boolean;
       /** Set this on a tool if it *always* requires a signed-in user to work. */
+      /** Set this on a tool if it *always* requires a signed-in user to work. */
       requiresAuth?: boolean;
-      /** Set this on a tool if it uses Gemini in Firebase API in any way. */
-      requiresGemini?: boolean;
       /** Tools are grouped by feature. --only can configure what tools is available. */
       feature?: string;
     };

src/mcp/tools/core/init.ts

@@ -4,7 +4,6 @@ import { toContent } from "../../util";
 import { DEFAULT_RULES } from "../../../init/features/database";
 import { actuate, Setup, SetupInfo } from "../../../init/index";
 import { freeTrialTermsLink } from "../../../dataconnect/freeTrial";
-import { requireGeminiToS } from "../../errors";
 import { FirebaseError } from "../../../error";
 import {
   parseAppId,
@@ -69,12 +68,6 @@ export const init = tool(
           .describe("Provide this object to initialize Cloud Firestore in this project directory."),
         dataconnect: z
           .object({
-            app_description: z
-              .string()
-              .optional()
-              .describe(
-                "Provide a description of the app you are trying to build. If present, Gemini will help generate Data Connect Schema, Connector and seed data",
-              ),
             service_id: z
               .string()
               .optional()
@@ -202,16 +195,11 @@ export const init = tool(
       };
     }
     if (features.dataconnect) {
-      if (features.dataconnect.app_description) {
-        // If app description is provided, ensure the Gemini in Firebase API is enabled.
-        const err = await requireGeminiToS(projectId);
-        if (err) return err;
-      }
       featuresList.push("dataconnect");
       featureInfo.dataconnectSource = "mcp_init";
       featureInfo.dataconnect = {
         flow: "",
-        appDescription: features.dataconnect.app_description || "",
+        appDescription: "",
         serviceId: features.dataconnect.service_id || "",
         locationId: features.dataconnect.location_id || "",
         cloudSqlInstanceId: features.dataconnect.cloudsql_instance_id || "",

src/mcp/tools/core/update_environment.ts

@@ -4,7 +4,6 @@ import { mcpError, toContent } from "../../util";
 import { setNewActive } from "../../../commands/use";
 import { assertAccount, setProjectAccount } from "../../../auth";
 import { existsSync } from "node:fs";
-import { configstore } from "../../../configstore";
 
 export const update_environment = tool(
   "core",
@@ -31,12 +30,6 @@ export const update_environment = tool(
         .describe(
           "The email address of the signed-in user to authenticate as when interacting with the current project directory.",
         ),
-      accept_gemini_tos: z
-        .boolean()
-        .optional()
-        .describe(
-          "Accept the Gemini in Firebase terms of service. Always prompt the user for confirmation before accepting on their behalf.",
-        ),
     }),
     annotations: {
       title: "Update Firebase Environment",
@@ -48,10 +41,7 @@ export const update_environment = tool(
       requiresProject: false,
     },
   },
-  async (
-    { project_dir, active_project, active_user_account, accept_gemini_tos },
-    { config, rc, host },
-  ) => {
+  async ({ project_dir, active_project, active_user_account }, { config, rc, host }) => {
     let output = "";
     if (project_dir) {
       if (!existsSync(project_dir))
@@ -70,10 +60,6 @@ export const update_environment = tool(
       setProjectAccount(host.cachedProjectDir!, active_user_account);
       output += `- Updated active account to '${active_user_account}'\n`;
     }
-    if (accept_gemini_tos) {
-      configstore.set("gemini", true);
-      output += `- Accepted the Gemini in Firebase terms of service\n`;
-    }
     if (output === "") output = "No changes were made.";
     return toContent(output);
   },

src/mcp/tools/dataconnect/index.ts

@@ -1,14 +1,6 @@
 import type { ServerTool } from "../../tool";
-import { generate_operation } from "./generate_operation";
-import { generate_schema } from "./generate_schema";
 import { list_services } from "./list_services";
 import { compile } from "./compile";
 import { execute } from "./execute";
 
-export const dataconnectTools: ServerTool[] = [
-  compile,
-  generate_schema,
-  generate_operation,
-  list_services,
-  execute,
-];
+export const dataconnectTools: ServerTool[] = [compile, list_services, execute];