fix(mcp): abort hanging connections to non-standard servers #8413
+25
−4
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
Fixes #8406
Problem
When connecting to non-standard MCP servers, OpenCode can hang indefinitely if the server returns HTTP 200 but:
The existing
withTimeoutwrapper rejects the promise but doesn't cancel the underlying network request, leaving connections hanging.Solution
Add
AbortControllersupport to remote MCP transports using native Web APIs:signaltorequestInit- uses native fetch abort mechanismsetTimeoutcallsabort()at configured timeoutabort()called on error/timeoutChanges
packages/opencode/src/mcp/index.ts:AbortControllerinstances for each transportsignalto transportrequestInitabort().catch()and error pathsBefore: OpenCode hung indefinitely
After: Connection aborted after 30s timeout, clean error message
Implementation Notes
.catch()over try/catch