Handle shutdown signals gracefully in MCP server #4227
Merged
+35
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
keugenek
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
arsenyinfo
approved these changes
Jan 8, 2026
Add signal handling for SIGINT and SIGTERM to prevent crashes during MCP server shutdown. When Claude Code SDK terminates the MCP server process, it now exits cleanly instead of crashing. This fixes the "Command failed with exit code 1" error that occurs when Claude Agent SDK tries to shut down the MCP server. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
keugenek
force-pushed
the
ekniazev/mcp-graceful-shutdown
branch
from
db6a011 to
4ccf6f2
Compare
keugenek
temporarily deployed
to
test-trigger-is
GitHub Actions
Inactive
Collaborator
|
Commit: f5f576b
37 interesting tests: 20 KNOWN, 7 FAIL, 5 flaky, 4 RECOVERED, 1 SKIP
Top 50 slowest tests (at least 2 minutes):
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Shutdown()method when signals are receivedProblem
When Claude Agent SDK terminates the MCP server process, the Go process doesn't handle signals gracefully. This causes the process to crash during cleanup, resulting in "Command failed with exit code 1" error that propagates back to the SDK.
This is a known issue pattern documented in:
Solution
Run the server in a goroutine and wait for either:
When a signal is received, cancel the context and call
Shutdown()to clean up resources gracefully.Test plan
🤖 Generated with Claude Code