Fixing an issue where MCP server would still hang on studio

src/mcp/errors.ts

@@ -6,8 +6,14 @@
   "PRECONDITION_FAILED",
 );
 
-export function mcpAuthError(): CallToolResult {
+export function mcpAuthError(skipADC: boolean): CallToolResult {
   const cmd = commandExistsSync("firebase") ? "firebase" : "npx -y firebase-tools";
+  if (skipADC) {
+    return mcpError(`The user is not currently logged into the Firebase CLI, which is required to use this tool. Please instruct the user to execute this shell command to sign in.
+\`\`\`sh
+${cmd} login
+\`\`\``);
+  }
   return mcpError(`The user is not currently logged into the Firebase CLI, which is required to use this tool. Please instruct the user to execute this shell command to sign in or to configure [Application Default Credentials][ADC] on their machine.
 \`\`\`sh
 ${cmd} login
@@ -16,7 +22,7 @@
 [ADC]: https://cloud.google.com/docs/authentication/application-default-credentials`);
 }
 
 export function mcpGeminiError(projectId: string) {
   const consoleUrl = `https://firebase.corp.google.com/project/${projectId}/overview`;
   return mcpError(
     `This tool uses the Gemini in Firebase API. Visit Firebase Console to enable the Gemini in Firebase API ${consoleUrl} and try again.`,

src/mcp/index.ts

@@ -47,7 +47,7 @@
 ] as const;
 
 export class FirebaseMcpServer {
   private _ready: boolean = false;
   private _readyPromises: { resolve: () => void; reject: (err: unknown) => void }[] = [];
   startupRoot?: string;
   cachedProjectRoot?: string;
@@ -79,7 +79,7 @@
       mcp_client_name: this.clientInfo?.name || "<unknown-client>",
       mcp_client_version: this.clientInfo?.version || "<unknown-version>",
     };
     trackGA4(event, { ...params, ...clientInfoParams });
   }
 
   constructor(options: { activeFeatures?: ServerFeature[]; projectRoot?: string }) {
@@ -89,11 +89,11 @@
     this.server.registerCapabilities({ tools: { listChanged: true }, logging: {} });
     this.server.setRequestHandler(ListToolsRequestSchema, this.mcpListTools.bind(this));
     this.server.setRequestHandler(CallToolRequestSchema, this.mcpCallTool.bind(this));
     this.server.oninitialized = async () => {
       const clientInfo = this.server.getClientVersion();
       this.clientInfo = clientInfo;
       if (clientInfo?.name) {
         this.trackGA4("mcp_client_connected");
       }
       if (!this.clientInfo?.name) this.clientInfo = { name: "<unknown-client>" };
 
@@ -108,12 +108,12 @@
       return {};
     });
 
     this.detectProjectRoot();
     this.detectActiveFeatures();
   }
 
   /** 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 });
@@ -283,9 +283,10 @@
     projectId = projectId || "";
 
     // Check if the user is logged in.
-    const accountEmail = await this.getAuthenticatedUser();
+    const skipAutoAuthForStudio = isFirebaseStudio();
+    const accountEmail = await this.getAuthenticatedUser(skipAutoAuthForStudio);
     if (tool.mcp._meta?.requiresAuth && !accountEmail) {
-      return mcpAuthError();
+      return mcpAuthError(skipAutoAuthForStudio);
     }
 
     // Check if the tool requires Gemini in Firebase API.