fix: force shutdown server on exit

Author: alexander-zuev

pyproject.toml

@@ -10,6 +10,7 @@ readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
     "asyncpg>=0.30.0",
+    "logfire[system-metrics]>=3.12.0",
     "mcp[cli]>=1.4.1",
     "pglast>=7.3",
     "pyyaml>=6.0.2",

smithery.yaml

@@ -11,15 +11,17 @@ startCommand:
       - supabaseProjectRef
       - supabaseDbPassword
       - supabaseRegion
+      - queryApiKey
     properties:
+      queryApiKey:
+        type: string
+        description: "(required) - Your Query API key"
       supabaseProjectRef:
         type: string
-        description: "(required) - Supabase project reference ID - Default: 127.0.0.1:54322"
-        default: "127.0.0.1:54322"
+        description: "(required) - Supabase project reference ID"
       supabaseDbPassword:
         type: string
-        description: "(required) - Database password - Default: postgres"
-        default: "postgres"
+        description: "(required) - Database password"
       supabaseRegion:
         type: string
         description: "(required) - AWS region where your Supabase project is hosted - Default: us-east-1"
@@ -35,6 +37,7 @@ startCommand:
       command: 'supabase-mcp-server',
       args: [],
       env: {
+        QUERY_API_KEY: config.queryApiKey,
         SUPABASE_PROJECT_REF: config.supabaseProjectRef,
         SUPABASE_DB_PASSWORD: config.supabaseDbPassword,
         SUPABASE_REGION: config.supabaseRegion,

supabase_mcp/clients/api_client.py

@@ -41,7 +41,9 @@ def __init__(
         self.query_api_url = query_api_url or settings.query_api_url
         self._check_api_key_set()
         self.client: httpx.AsyncClient | None = None
-        logger.info(f"Query API client initialized with URL: {self.query_api_url}, key: {self.query_api_key}")
+        logger.info(
+            f"✔️ Query API client initialized successfully with URL: {self.query_api_url}, with key: {bool(self.query_api_key)}"
+        )
 
     async def _ensure_client(self) -> httpx.AsyncClient:
         """Ensure client exists and is ready for use.
@@ -53,7 +55,7 @@ async def _ensure_client(self) -> httpx.AsyncClient:
             logger.info("Creating new Query API client")
             self.client = httpx.AsyncClient(
                 base_url=self.query_api_url,
-                headers={"Authorization": f"Bearer {self.query_api_key}"},
+                headers={"X-API-Key": f"{self.query_api_key}"},
                 timeout=30.0,
             )
         logger.info("Returning existing Query API client")
@@ -79,6 +81,7 @@ async def check_feature_access(self, feature_name: str) -> FeatureAccessResponse
                 method="GET",
                 path=ApiRoutes.FEATURES_ACCESS.format(feature_name=feature_name),
             )
+            logger.debug(f"Feature access response: {result}")
             return FeatureAccessResponse.model_validate(result)
         except Exception as e:
             logger.error(f"Error checking feature access: {e}")

supabase_mcp/clients/management_client.py

@@ -38,7 +38,7 @@ def __init__(self, settings: Settings) -> None:
         self.settings = settings
         self.client = self.create_httpx_client(settings)
 
-        logger.info("Initilized Mangement API client successfully")
+        logger.info("✔️ Management API client initialized successfully")
 
     def create_httpx_client(self, settings: Settings) -> httpx.AsyncClient:
         """Create and configure an httpx client for API requests."""

supabase_mcp/clients/sdk_client.py

@@ -47,7 +47,7 @@ def __init__(
         self.project_ref = settings.supabase_project_ref if settings else project_ref
         self.service_role_key = settings.supabase_service_role_key if settings else service_role_key
         self.supabase_url = self.get_supabase_url()
-        logger.info(f"Initialized Supabase SDK client for project {self.project_ref}")
+        logger.info(f"✔️ Supabase SDK client initialized successfully for project {self.project_ref}")
 
     def get_supabase_url(self) -> str:
         """Returns the Supabase URL based on the project reference"""

supabase_mcp/core/container.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from mcp.server.fastmcp import FastMCP
+
 from supabase_mcp.clients.api_client import ApiClient
 from supabase_mcp.clients.management_client import ManagementAPIClient
 from supabase_mcp.clients.sdk_client import SupabaseSDKClient
@@ -21,7 +23,7 @@ class ServicesContainer:
 
     def __init__(
         self,
-        # mcp_server: FastMCP,
+        mcp_server: FastMCP | None = None,
         postgres_client: PostgresClient | None = None,
         api_client: ManagementAPIClient | None = None,
         sdk_client: SupabaseSDKClient | None = None,
@@ -34,7 +36,6 @@ def __init__(
         feature_manager: FeatureManager | None = None,
     ) -> None:
         """Create a new container container reference"""
-        # self.mcp_server = mcp_server
         self.postgres_client = postgres_client
         self.api_client = api_client
         self.api_manager = api_manager
@@ -45,6 +46,7 @@ def __init__(
         self.log_manager = log_manager
         self.query_api_client = query_api_client
         self.feature_manager = feature_manager
+        self.mcp_server = mcp_server
 
     @classmethod
     def get_instance(cls) -> ServicesContainer:

supabase_mcp/main.py

@@ -1,3 +1,4 @@
+from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 
 from mcp.server.fastmcp import FastMCP
@@ -10,8 +11,10 @@
 
 # Create lifespan for the MCP server
 @asynccontextmanager
-async def lifespan(app: FastMCP):
+async def lifespan(app: FastMCP) -> AsyncGenerator[FastMCP, None]:
     try:
+        logger.info("Initializing services")
+
         # Initialize services
         services_container = ServicesContainer.get_instance()
         services_container.initialize_services(settings)
@@ -20,8 +23,13 @@ async def lifespan(app: FastMCP):
         mcp = ToolRegistry(mcp=app, services_container=services_container).register_tools()
         yield mcp
     finally:
+        logger.info("Shutting down services")
         services_container = ServicesContainer.get_instance()
         await services_container.shutdown_services()
+        # Force kill the entire process - doesn't care about async contexts
+        import os
+
+        os._exit(0)  # Use 0 for successful termination
 
 
 # Create mcp instance
@@ -31,6 +39,7 @@ async def lifespan(app: FastMCP):
 def run_server() -> None:
     logger.info("Starting Supabase MCP server")
     mcp.run()
+    logger.info("This code runs only if I don't exit in lifespan")
 
 
 def run_inspector() -> None:

supabase_mcp/services/database/postgres_client.py

@@ -82,7 +82,7 @@ def __init__(
         # Only log once during initialization with clear project info
         is_local = self.project_ref.startswith("127.0.0.1")
         logger.info(
-            f"PostgreSQL client initialized for {'local' if is_local else 'remote'} "
+            f"✔️ PostgreSQL client initialized successfully for {'local' if is_local else 'remote'} "
             f"project: {self.project_ref} (region: {self.db_region})"
         )
 
@@ -245,12 +245,13 @@ async def close(self) -> None:
 
         This should be called when shutting down the application.
         """
+        import asyncio
+
         if self._pool:
-            await self._pool.close()
+            await asyncio.wait_for(self._pool.close(), timeout=5.0)
             self._pool = None
-            logger.info("Closed PostgreSQL connection pool")
         else:
-            logger.debug("No connection pool to close")
+            logger.debug("No PostgreSQL connection pool to close")
 
     @classmethod
     async def reset(cls) -> None:

supabase_mcp/settings.py

@@ -53,6 +53,10 @@ def find_config_file(env_file: str = ".env") -> str | None:
         global_config = home / ".config" / "supabase-mcp" / ".env"
 
     if global_config.exists():
+        logger.error(
+            f"DEPRECATED: {global_config} is deprecated and will be removed in a future release. "
+            "Use your IDE's native .json config file to configure access to MCP."
+        )
         return str(global_config)
 
     return None