fix(acp): clean up session mcp servers#32377
Open
hereswilson wants to merge 1 commit into
Open
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Issue for this PR
Closes #32371
Type of change
What does this PR do?
ACP sessions can register MCP servers through
mcpServers, but closing the ACP session only removed ACP bookkeeping. The dynamically added MCP server stayed registered on the instance.This adds a matching dynamic MCP remove path and uses it when ACP sessions close. Session-owned MCP servers are removed when their last owner closes, shared registrations stay active, and static MCP config is preserved or restored when a dynamic server had overridden it.
How did you verify your code works?
From
packages/opencode:bun test --timeout 60000 test/mcp/lifecycle.test.ts test/server/httpapi-mcp.test.ts test/acp/service-session.test.tsbun test --timeout 90000 test/server/httpapi-public-openapi.test.ts test/session/snapshot-tool-race.test.tsbun run script/httpapi-exercise.ts --mode coverage --fail-on-missing --fail-on-skipbun typecheckFrom
packages/sdk/js:bun typecheckThe pre-push hook also ran
bun turbo typechecksuccessfully.Screenshots / recordings
N/A
Checklist