Add lifecycle management for beads-mcp processes (bd-148)

- Register atexit handler to close daemon connections
- Add signal handlers for SIGTERM/SIGINT for graceful shutdown
- Implement cleanup() to close all daemon client connections
- Track daemon clients globally for cleanup
- Add close() method to BdDaemonClient (no-op since connections are per-request)
- Register client on first use via _get_client()
- Add comprehensive lifecycle tests

This prevents MCP server processes from accumulating without cleanup.
Each tool invocation will now properly clean up on exit.

Amp-Thread-ID: https://ampcode.com/threads/T-05d76b8e-dac9-472b-bfd0-afe10e3457cd
Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
Steve Yegge
2025-10-18 14:27:37 -07:00
parent 0baac7b22c
commit 5e0030d283
6 changed files with 231 additions and 4 deletions

View File

@@ -424,3 +424,14 @@ class BdDaemonClient(BdClientBase):
return True
except (DaemonNotRunningError, DaemonConnectionError, DaemonError):
return False
def close(self) -> None:
"""Close daemon client connections and cleanup resources.
This is called during MCP server shutdown to ensure clean termination.
Since we use asyncio.open_unix_connection which closes per-request,
there's no persistent connection to close. This method is a no-op
but exists for API consistency.
"""
# No persistent connections to close - each request opens/closes its own
pass

View File

@@ -1,8 +1,12 @@
"""FastMCP server for beads issue tracker."""
import asyncio
import atexit
import logging
import os
import signal
import subprocess
import sys
from functools import wraps
from typing import Callable, TypeVar
@@ -24,8 +28,19 @@ from beads_mcp.tools import (
beads_update_issue,
)
# Setup logging for lifecycle events
logger = logging.getLogger(__name__)
logging.basicConfig(
level=logging.INFO,
format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
)
T = TypeVar("T")
# Global state for cleanup
_daemon_clients: list = []
_cleanup_done = False
# Create FastMCP server
mcp = FastMCP(
name="Beads",
@@ -38,6 +53,49 @@ IMPORTANT: Call set_context with your workspace root before any write operations
)
def cleanup() -> None:
"""Clean up resources on exit.
Closes daemon connections and removes temp files.
Safe to call multiple times.
"""
global _cleanup_done
if _cleanup_done:
return
_cleanup_done = True
logger.info("Cleaning up beads-mcp resources...")
# Close all daemon client connections
for client in _daemon_clients:
try:
if hasattr(client, 'close'):
client.close()
logger.debug(f"Closed daemon client: {client}")
except Exception as e:
logger.warning(f"Error closing daemon client: {e}")
_daemon_clients.clear()
logger.info("Cleanup complete")
def signal_handler(signum: int, frame) -> None:
"""Handle termination signals gracefully."""
sig_name = signal.Signals(signum).name
logger.info(f"Received {sig_name}, shutting down gracefully...")
cleanup()
sys.exit(0)
# Register cleanup handlers
atexit.register(cleanup)
signal.signal(signal.SIGTERM, signal_handler)
signal.signal(signal.SIGINT, signal_handler)
logger.info("beads-mcp server initialized with lifecycle management")
def require_context(func: Callable[..., T]) -> Callable[..., T]:
"""Decorator to enforce context has been set before write operations.

View File

@@ -1,9 +1,12 @@
"""MCP tools for beads issue tracker."""
import os
from typing import Annotated
from typing import Annotated, TYPE_CHECKING
from .bd_client import create_bd_client, BdClientBase, BdError
if TYPE_CHECKING:
from typing import List
from .models import (
AddDependencyParams,
BlockedIssue,
@@ -25,12 +28,28 @@ from .models import (
# Global client instance - initialized on first use
_client: BdClientBase | None = None
_version_checked: bool = False
_client_registered: bool = False
# Default constants
DEFAULT_ISSUE_TYPE: IssueType = "task"
DEFAULT_DEPENDENCY_TYPE: DependencyType = "blocks"
def _register_client_for_cleanup(client: BdClientBase) -> None:
"""Register client with server cleanup system.
This ensures daemon connections are properly closed on server shutdown.
Import is deferred to avoid circular dependency.
"""
try:
from . import server
if hasattr(server, '_daemon_clients'):
server._daemon_clients.append(client)
except (ImportError, AttributeError):
# Server module not available or cleanup not initialized - that's ok
pass
async def _get_client() -> BdClientBase:
"""Get a BdClient instance, creating it on first use.
@@ -43,7 +62,7 @@ async def _get_client() -> BdClientBase:
Raises:
BdError: If bd is not installed or version is incompatible
"""
global _client, _version_checked
global _client, _version_checked, _client_registered
if _client is None:
# Check if daemon should be used (default: yes)
use_daemon = os.environ.get("BEADS_USE_DAEMON", "1") == "1"
@@ -53,6 +72,11 @@ async def _get_client() -> BdClientBase:
prefer_daemon=use_daemon,
working_dir=workspace_root
)
# Register for cleanup on first creation
if not _client_registered:
_register_client_for_cleanup(_client)
_client_registered = True
# Check version once per server lifetime (only for CLI client)
if not _version_checked: