Skip to content

fix(e2e): honor the 503 restart envelope in the cap-eviction helper #1895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ra-co88 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(e2e): honor the 503 restart envelope in the cap-eviction helper #1895

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 33 additions & 12 deletions e2e/cloud/mcp-session-cap-eviction.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,42 @@ const openSession = async (
label: string,
recordSession: (sessionId: string) => void,
): Promise<string> => {
const initialized = await postJson(mcpUrl, bearer, {
jsonrpc: "2.0" as const,
id: "initialize",
method: "initialize",
params: {
protocolVersion: PROTOCOL_VERSION,
capabilities: {},
clientInfo: { name: `executor-e2e-cap-eviction-${label}`, version: "0.0.1" },
},
});
const sessionId = initialized.headers.get("mcp-session-id");
if (!sessionId) {
// The platform can reset a session Durable Object while its initialize
// is in flight, and the server answers that with the documented restart
// envelope (503, -32001, "MCP session is restarting, please retry") — the
// same contract a streamable-http client follows: same request, after the
// advertised delay. Treat it as transient here instead of failing the
// scenario on a retryable platform blip.
const RESTART_ATTEMPTS = 8;
const RESTART_DELAY_MS = 250;
let minted: { readonly response: Response; readonly sessionId: string } | undefined;
for (let attempt = 0; attempt < RESTART_ATTEMPTS; attempt += 1) {
const response = await postJson(mcpUrl, bearer, {
jsonrpc: "2.0" as const,
id: "initialize",
method: "initialize",
params: {
protocolVersion: PROTOCOL_VERSION,
capabilities: {},
clientInfo: { name: `executor-e2e-cap-eviction-${label}`, version: "0.0.1" },
},
});
const candidate = response.headers.get("mcp-session-id");
if (candidate !== null && candidate.length > 0) {
minted = { response, sessionId: candidate };
break;
}
const body = await response.text().catch(() => "");
const isRestart = response.status === 503 && body.includes("MCP session is restarting");
if (!isRestart) break;
if (attempt === RESTART_ATTEMPTS - 1) break;
await new Promise((resolve) => setTimeout(resolve, RESTART_DELAY_MS));
}
if (!minted) {
// oxlint-disable-next-line executor/no-error-constructor -- boundary: e2e setup precondition.
throw new Error(`openSession (${label}): no mcp-session-id header`);
}
const { response: initialized, sessionId } = minted;
// Recorded the moment the id exists — BEFORE the body read and status
// assertion below, either of which can throw with the session already live
// on the server. The cleanup finalizer needs the id on every one of those
Expand Down
Loading