Serialize MCP session DO startup#1313
Merged
Merged
Conversation
Deploying with
|
| Status | Name | Latest Commit | Preview URL | Updated (UTC) |
|---|---|---|---|---|
| ✅ Deployment successful! View logs |
executor-marketing | 228367d | Commit Preview URL Branch Preview URL |
Jul 04 2026, 08:37 AM |
Deploying with
|
| Status | Name | Latest Commit | Updated (UTC) |
|---|---|---|---|
| ✅ Deployment successful! View logs |
executor-cloud | 228367d | Jul 04 2026, 08:38 AM |
0275f97 to
0e86933
Compare
78058e1 to
275c406
Compare
cfcce57 to
228367d
Compare
Contributor
Cloudflare previewTorn down — the PR is closed. |
@executor-js/cli
@executor-js/config
@executor-js/execution
@executor-js/sdk
@executor-js/codemode-core
@executor-js/runtime-quickjs
@executor-js/plugin-file-secrets
@executor-js/plugin-graphql
@executor-js/plugin-keychain
@executor-js/plugin-mcp
@executor-js/plugin-onepassword
@executor-js/plugin-openapi
executor
commit: |
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.
Problem
McpAgent.onStartcan be invoked from more than one code path when a session durable object wakes with an existing session id: the explicit session-validation restore path, and the agents SDK serve handler's own wake path. Nothing serialized the two, so two concurrent requests on the same session (e.g. an SSE GET and a POST arriving together) could both driveserver.connect(), and the second throwsAlready connected to a transport. Because the failure left the runtime partially initialized without cleanup, the session stayed in that state for every subsequent request instead of recovering.#1302 serialized the explicit restore path, but the SDK wake path doesn't go through it.
Fix
Serialize at the one point every caller shares: override
onStartinMcpAgentSessionDOBasewith a single in-flight promise, so concurrent callers coalesce onto one initialization regardless of entry path. The start path closes any prior runtime before connecting, and a failed start closes the partial runtime and clears the gate so the next request retries cleanly. The now-redundant restore-level single-flight from #1302 is removed.Tests