Revert "Migrate outbound MCP client to SDK v2" (8cb0d22) (#1692)

* Revert "Migrate outbound MCP client to SDK v2" (#8cb0d22a3)

* Revert "Opt-in modern protocol negotiation for stdio MCP servers" (#1646)

Depends on the v2 client getProtocolEra API removed above.

Author: RhysSullivan

bun.lock

@@ -146,36 +146,6 @@ scenario(
           declTools.map((t) => t.name),
           "connecting with the secret discovers the env-gated tool",
         ).toContain("whoami");
-
-        // --- versionNegotiation "auto" survives the API → config → connector
-        // path and still reaches a legacy server: the probe gets the fixture's
-        // method-not-found for `server/discover` (a definitive legacy verdict)
-        // and falls back to `initialize`. Modern-era acceptance against a real
-        // legacy-disabled SDK v2 server lives in the plugin's
-        // stdio-negotiation.test.ts. ---
-        const autoSlug = "e2e-stdio-auto";
-        yield* client.mcp.addServer({
-          payload: {
-            transport: "stdio",
-            name: "E2E Stdio Auto",
-            command: "node",
-            args: [FIXTURE],
-            versionNegotiation: "auto",
-            slug: autoSlug,
-          },
-        });
-
-        const autoStored = yield* client.mcp.getServer({ params: { slug: autoSlug } });
-        expect(
-          JSON.stringify(autoStored?.config ?? {}),
-          "the negotiation mode is persisted on the integration config",
-        ).toContain('"versionNegotiation":"auto"');
-
-        const autoTools = yield* client.tools.list({ query: { integration: autoSlug } });
-        expect(
-          autoTools.map((t) => t.name),
-          "auto negotiation falls back to legacy and still discovers tools",
-        ).toContain("echo_tool");
       }),
     );
   }),

e2e/local/stdio-mcp.test.ts

@@ -69,7 +69,7 @@
     "@executor-js/react": "workspace:*",
     "@executor-js/runtime-quickjs": "workspace:*",
     "@modelcontextprotocol/ext-apps": "^1.7.4",
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/sdk": "^1.12.1",
     "@tanstack/react-query": "^5.99.0",
     "effect": "catalog:",
     "esbuild": "^0.27.7",

packages/hosts/mcp-apps-shell/package.json

@@ -65,8 +65,6 @@
     "@effect/platform-node": "catalog:",
     "@executor-js/config": "workspace:*",
     "@executor-js/sdk": "workspace:*",
-    "@modelcontextprotocol/client": "2.0.0",
-    "@modelcontextprotocol/core": "2.0.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "zod": "4.3.6"
   },
@@ -75,7 +73,6 @@
     "@effect/vitest": "catalog:",
     "@executor-js/api": "workspace:*",
     "@executor-js/react": "workspace:*",
-    "@modelcontextprotocol/server": "2.0.0",
     "@types/node": "catalog:",
     "@types/react": "catalog:",
     "bun-types": "catalog:",

packages/plugins/mcp/package.json

@@ -57,10 +57,6 @@ const AddStdioServerPayload = Schema.Struct({
   /** One-shot secret env values (programmatic). The UI sends `envVars`. */
   env: Schema.optional(StringMap),
   cwd: Schema.optional(Schema.String),
-  /** Protocol negotiation at connect: `auto` probes `server/discover` (spec
-   *  2026-07-28) for modern-only servers; default is the legacy `initialize`
-   *  handshake. */
-  versionNegotiation: Schema.optional(Schema.Literals(["legacy", "auto"])),
   slug: Schema.optional(Schema.String),
 });
 

packages/plugins/mcp/src/api/group.ts

@@ -39,7 +39,6 @@ const toServerInput = (
       envVars?: readonly string[];
       env?: Record<string, string>;
       cwd?: string;
-      versionNegotiation?: "legacy" | "auto";
       slug?: string;
     };
     return {
@@ -51,7 +50,6 @@ const toServerInput = (
       envVars: p.envVars ? [...p.envVars] : undefined,
       env: p.env,
       cwd: p.cwd,
-      versionNegotiation: p.versionNegotiation,
       slug: p.slug,
     };
   }

packages/plugins/mcp/src/api/handlers.ts

@@ -3,10 +3,6 @@ import { Cause, Effect, Exit, Predicate } from "effect";
 import type { McpConnection, McpConnector } from "./connection";
 import type { McpInvocationError } from "./errors";
 
-// The pool preserves sessions for sessionful legacy servers. Stateless
-// 2026-07-28 servers do not need it, but retaining a cheap idle client is
-// harmless and keeps one lifecycle for both protocol eras.
-
 const IDLE_TTL_MS = 5 * 60 * 1_000;
 
 type IdleConnection = {

packages/plugins/mcp/src/sdk/connection-pool.ts

@@ -1,18 +1,16 @@
-import {
-  Client,
-  SSEClientTransport,
-  StreamableHTTPClientTransport,
-  type FetchLike,
-  type OAuthClientProvider,
-} from "@modelcontextprotocol/client";
-import { CfWorkerJsonSchemaValidator } from "@modelcontextprotocol/client/validators/cf-worker";
+import type { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import type { FetchLike } from "@modelcontextprotocol/sdk/shared/transport.js";
+import { CfWorkerJsonSchemaValidator } from "@modelcontextprotocol/sdk/validation/cfworker";
 import { Effect, Layer, Predicate, Stream } from "effect";
 import { HttpClient, HttpClientRequest } from "effect/unstable/http";
 
 // NOTE: `StdioClientTransport` is NOT imported eagerly. The upstream module
-// (`@modelcontextprotocol/client/stdio`) still imports Node process/stream and
-// `cross-spawn` eagerly at evaluation time, which crashes workerd (including
-// vitest-pool-workers) with SIGSEGV on module instantiation. Cloud callers set
+// (`@modelcontextprotocol/sdk/client/stdio.js`) touches `node:child_process`
+// at evaluation time, which crashes workerd (incl. vitest-pool-workers) at
+// SIGSEGV on module instantiation. Cloud callers set
 // `dangerouslyAllowStdioMCP: false` and never reach the stdio branch below;
 // prod bundles that DO use stdio load it via a dynamic import inside the
 // stdio branch of `createMcpConnector`.
@@ -203,13 +201,12 @@ const fetchFromHttpClientLayer = (
 // MCP plugin runs inside a Cloudflare Worker (executor.sh). The
 // cfworker validator does not use code generation and works in every
 // runtime we ship to.
-const createClient = (versionNegotiation?: { readonly mode: "auto" }): Client =>
+const createClient = (): Client =>
   new Client(
     { name: "executor-mcp", version: "0.1.0" },
     {
       capabilities: { elicitation: { form: {}, url: {} } },
       jsonSchemaValidator: new CfWorkerJsonSchemaValidator(),
-      ...(versionNegotiation === undefined ? {} : { versionNegotiation }),
     },
   );
 
@@ -250,10 +247,9 @@ const connectionFailure = (
 const connectClient = (input: {
   transport: string;
   createTransport: () => Parameters<Client["connect"]>[0];
-  versionNegotiation?: { readonly mode: "auto" };
 }): Effect.Effect<McpConnection, McpConnectionError | McpOAuthReauthorizationRequired> =>
   Effect.gen(function* () {
-    const client = createClient(input.versionNegotiation);
+    const client = createClient();
     const transportInstance = input.createTransport();
 
     yield* Effect.tryPromise({
@@ -266,15 +262,6 @@ const connectClient = (input: {
       catch: (cause) =>
         connectionFailure(input.transport, `Failed connecting via ${input.transport}`, cause),
     }).pipe(
-      // The negotiated era ("modern" = 2026-07-28 server/discover, "legacy" =
-      // 2025 initialize) is otherwise invisible: both eras list and call tools
-      // identically, so traces are the one place an integration author can
-      // verify which handshake a connection actually used.
-      Effect.tap(() =>
-        Effect.annotateCurrentSpan({
-          "plugin.mcp.protocol_era": client.getProtocolEra() ?? "unknown",
-        }),
-      ),
       Effect.withSpan("plugin.mcp.connection.handshake", {
         attributes: { "plugin.mcp.transport": input.transport },
       }),
@@ -313,12 +300,6 @@ export const createMcpConnector = (input: ConnectorInput): McpConnector => {
 
       return yield* connectClient({
         transport: "stdio",
-        // Opt-in per integration (default legacy) — see
-        // `McpStdioVersionNegotiation` for why stdio does not follow the
-        // remote transport's unconditional auto.
-        ...(input.versionNegotiation === "auto"
-          ? { versionNegotiation: { mode: "auto" as const } }
-          : {}),
         createTransport: () =>
           createStdioTransport({
             command,
@@ -338,13 +319,8 @@ export const createMcpConnector = (input: ConnectorInput): McpConnector => {
 
   const endpoint = buildEndpointUrl(input.endpoint, input.queryParams ?? {});
 
-  // Auto-negotiate the 2026-07-28 era unconditionally only on Streamable
-  // HTTP. SSE is a legacy-only transport; stdio negotiates per the
-  // integration's `versionNegotiation` (default legacy — see the stdio
-  // branch above).
   const connectStreamableHttp = connectClient({
     transport: "streamable-http",
-    versionNegotiation: { mode: "auto" },
     createTransport: () =>
       new StreamableHTTPClientTransport(endpoint, {
         requestInit,

packages/plugins/mcp/src/sdk/connection.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from "@effect/vitest";
 import { Effect, Predicate, Schema, Semaphore } from "effect";
-import type { JsonSchemaType } from "@modelcontextprotocol/client";
-import { CfWorkerJsonSchemaValidator } from "@modelcontextprotocol/client/validators/cf-worker";
+import { CfWorkerJsonSchemaValidator } from "@modelcontextprotocol/sdk/validation/cfworker";
+import type { JsonSchemaType } from "@modelcontextprotocol/sdk/validation/types";
 
 import {
   AuthTemplateSlug,
@@ -226,7 +226,7 @@ describe("MCP elicitation (end-to-end)", () => {
         ]),
       );
       expect(schema?.outputTypeScript).toContain('type: "text"');
-      expect(schema?.outputTypeScript).toContain("structuredContent?: unknown;");
+      expect(schema?.outputTypeScript).toContain("structuredContent?: { [k: string]: unknown; }");
 
       const result = yield* executor.execute(
         simpleEcho.address,

packages/plugins/mcp/src/sdk/elicitation.test.ts

@@ -1,5 +1,4 @@
 import { describe, expect, it } from "@effect/vitest";
-import { InsufficientScopeError, SdkErrorCode, SdkHttpError } from "@modelcontextprotocol/client";
 
 // oxlint-disable executor/no-error-constructor -- boundary: these tests reproduce the MCP SDK's own transport rejections, which are built-in Errors
 import { insufficientScopeFromCause } from "./http-status";
@@ -10,8 +9,7 @@ import { insufficientScopeFromCause } from "./http-status";
 //   - with an authProvider (the production OAuth path): the StreamableHTTP
 //     transport consumes the insufficient_scope challenge itself, retries
 //     with the broader scope, and only when THAT fails throws the fixed
-//     typed `InsufficientScopeError`, or after retry exhaustion the fixed
-//     `SdkHttpError` step-up message.
+//     "Server returned 403 after trying upscoping" message.
 describe("insufficientScopeFromCause", () => {
   it("detects the OAuth error body embedded in a transport message", () => {
     expect(
@@ -33,21 +31,9 @@ describe("insufficientScopeFromCause", () => {
     ).toBe(true);
   });
 
-  it("detects the SDK's typed insufficient-scope failure", () => {
+  it("detects the SDK's exhausted-upscoping failure (the authProvider path)", () => {
     expect(
-      insufficientScopeFromCause(new InsufficientScopeError({ requiredScope: "files.read" })),
-    ).toBe(true);
-  });
-
-  it("detects the SDK's exhausted step-up failure (the authProvider path)", () => {
-    expect(
-      insufficientScopeFromCause(
-        new SdkHttpError(
-          SdkErrorCode.ClientHttpForbidden,
-          "Server returned 403 insufficient_scope after step-up re-authorization (retry limit 2 reached)",
-          { status: 403 },
-        ),
-      ),
+      insufficientScopeFromCause(new Error("Server returned 403 after trying upscoping")),
     ).toBe(true);
   });