fix: address code review feedback from coderabbitai

- Fix stale tool count in CLAUDE.md
- Remove extra blank line in .gitignore
- Add projectId and credential to fakeApp mock so list_databases
  happy path is properly asserted
- Resolve projectId via getProjectId() fallback instead of casting
  credential object
- Add 10s timeout to Firestore Admin API fetch call
- Fix broken error-handling test by adding missing module mocks

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: mtio

.gitignore

@@ -70,6 +70,5 @@ firestore.indexes.json
 firestore.rules
 storage.rules
 
-
 # claude settings
 .claude/settings.local.json

CLAUDE.md

@@ -27,7 +27,7 @@ Single test file: `npx vitest run path/to/file.test.ts`
 ### Server Core (`src/index.ts`)
 Single `FirebaseMcpServer` class that:
 1. Initializes Firebase Admin SDK from `SERVICE_ACCOUNT_KEY_PATH`
-2. Registers 12 MCP tools via `setupToolHandlers()` (ListTools + CallTool handlers)
+2. Registers MCP tools via `setupToolHandlers()` (ListTools + CallTool handlers)
 3. Dispatches tool calls through a switch statement
 4. Connects to a transport (stdio or HTTP)
 

src/__tests__/index.test.ts

@@ -2594,6 +2594,15 @@ describe('Firebase MCP Server', () => {
       }));
       vi.doMock('../utils/logger', () => ({ logger: loggerMock }));
       vi.doMock('firebase-admin', () => adminMock);
+      vi.doMock('firebase-admin/firestore', () => ({
+        Timestamp: { fromDate: vi.fn() },
+        getFirestore: vi.fn().mockImplementation(() => {
+          throw genericError;
+        }),
+      }));
+      vi.doMock('../lib/firebase/firebaseConfig.js', () => ({
+        getProjectId: vi.fn().mockReturnValue('test-project'),
+      }));
 
       await import('../index');
 

src/__tests__/multi-db.test.ts

@@ -107,7 +107,15 @@ describe('Multi-database support', () => {
    * including a working Firebase app so getFirestoreInstance succeeds.
    */
   async function setupModule(configOverrides: Record<string, unknown> = {}) {
-    const fakeApp = { name: '[DEFAULT]' };
+    const fakeApp = {
+      name: '[DEFAULT]',
+      options: {
+        projectId: 'test-project',
+        credential: {
+          getAccessToken: vi.fn().mockResolvedValue({ access_token: 'test-token' }),
+        },
+      },
+    };
 
     const adminMock = {
       default: {
@@ -179,6 +187,9 @@ describe('Multi-database support', () => {
     vi.doMock('../transports/index.js', () => ({
       initializeTransport: vi.fn().mockResolvedValue(undefined),
     }));
+    vi.doMock('../lib/firebase/firebaseConfig.js', () => ({
+      getProjectId: vi.fn().mockReturnValue('test-project'),
+    }));
     vi.doMock('fs', () => fsMock);
 
     await import('../index');
@@ -387,15 +398,11 @@ describe('Multi-database support', () => {
 
       const content = JSON.parse(result.content[0].text);
 
-      // In test env, app may not be fully initialized — accept either outcome
-      if (content.error) {
-        expect(content).toHaveProperty('error');
-      } else {
-        expect(content.databases).toHaveLength(2);
-        expect(content.databases[0].id).toBe('(default)');
-        expect(content.databases[1].id).toBe('my-other-db');
-        expect(content.databases[0].location).toBe('us-east1');
-      }
+      expect(content.databases).toHaveLength(2);
+      expect(content.databases[0].id).toBe('(default)');
+      expect(content.databases[1].id).toBe('my-other-db');
+      expect(content.databases[0].location).toBe('us-east1');
+      expect(content.databases[0].type).toBe('FIRESTORE_NATIVE');
     });
 
     it('should handle API errors gracefully', async () => {

src/index.ts

@@ -22,6 +22,7 @@ import { logger } from './utils/logger.js';
 import { Timestamp, getFirestore } from 'firebase-admin/firestore';
 import config from './config.js';
 import { initializeTransport } from './transports/index.js';
+import { getProjectId } from './lib/firebase/firebaseConfig.js';
 import * as fs from 'fs';
 
 // Initialize Firebase
@@ -1585,7 +1586,7 @@ class FirebaseMcpServer {
               const tokenResult = await credential.getAccessToken();
               const projectId =
                 app.options.projectId ||
-                (app.options.credential as unknown as { projectId?: string }).projectId;
+                (config.serviceAccountKeyPath ? getProjectId(config.serviceAccountKeyPath) : null);
 
               if (!projectId) {
                 return {
@@ -1599,9 +1600,17 @@ class FirebaseMcpServer {
               }
 
               const url = `https://firestore.googleapis.com/v1/projects/${projectId}/databases`;
-              const response = await fetch(url, {
-                headers: { Authorization: `Bearer ${tokenResult.access_token}` },
-              });
+              const controller = new AbortController();
+              const timeoutId = setTimeout(() => controller.abort(), 10000);
+              let response: Response;
+              try {
+                response = await fetch(url, {
+                  headers: { Authorization: `Bearer ${tokenResult.access_token}` },
+                  signal: controller.signal,
+                });
+              } finally {
+                clearTimeout(timeoutId);
+              }
 
               if (!response.ok) {
                 const errorBody = await response.text();