Conversation
Every upstream MCP call gets a fixed 60s active-work deadline, so a server whose tools legitimately run longer, such as one driving a browser, fails at the one-minute mark with no setting to change it. Integrations now accept toolTimeoutMs; absent or invalid keeps 60s, and elicitation time still does not count against it.
This branch has not been deployed
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
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
Every upstream MCP tool call runs under a fixed 60s active-work deadline (
MCP_ACTIVE_WORK_TIMEOUT_MS), and nothing reachable from an MCP host can change it. Servers whose tools legitimately take longer, for example one that drives a signed-in browser where a single call takes 60 to 90s, fail at the one-minute mark every time.This adds an optional
toolTimeoutMsto both MCP integration configs (stdio and remote) and to theaddServerinputs. The invoke path passes it tomakeActiveWorkDeadline, which already took a timeout argument but was always called without one. Absent, zero, negative or non-finite values keep today's 60s, and time spent waiting on an elicitation still pauses the deadline as before (#1953).#1988 is related but covers a different caller: it threads per-call
InvokeOptionsfor SDK users. Calls that arrive over MCP (executefrom an agent) never carry those options, so the deadline has to live on the integration.Verification
bun run format:checkbun run lintbun run typecheck, scoped to...@executor-js/plugin-mcp: 39 tasks successfulbun run test, scoped to...@executor-js/plugin-mcpwithout e2e: 7 tasks successful. In@executor-js/plugin-mcpthat is 312 passed, 29 skippedNew cases in
packages/plugins/mcp/src/sdk/invoke.test.ts: a call withactiveWorkTimeoutMsat twice the default is still running after 60s and aborts at 120s, and unusable values fall back to the default. The first fails without the plumbing ininvoke.ts.Checklist
Thanks for Executor; the local daemon plus native elicitation is exactly what we needed to put a whole set of stdio servers behind one endpoint.