@ai-ecoverse/mcpcat 0.20.3 → 0.20.4

package/dist/host/mcpcat.mjs

@@ -7691,7 +7691,7 @@ async function consumeSseStream(stream, options) {
   let dataLines = [];
   let dataBytes = 0;
   const maxEventBytes = options.maxEventBytes ?? DEFAULT_MAX_MESSAGE_BYTES;
-  const dispatch = () => {
+  const dispatch2 = () => {
     if (dataLines.length === 0) {
       eventName = void 0;
       eventId = void 0;
@@ -7707,7 +7707,7 @@ async function consumeSseStream(stream, options) {
   const processLine = (rawLine) => {
     const line = rawLine.endsWith("\r") ? rawLine.slice(0, -1) : rawLine;
     if (line === "") {
-      dispatch();
+      dispatch2();
       return;
     }
     if (line.startsWith(":"))
@@ -7748,7 +7748,7 @@ async function consumeSseStream(stream, options) {
     buffered += decoder3.decode();
     if (buffered)
       processLine(buffered);
-    dispatch();
+    dispatch2();
   } finally {
     reader.releaseLock();
   }
@@ -8352,18 +8352,118 @@ var PlatformStdioTransport = class {
   }
 };
 
+// src/client/modern.ts
+var MODERN_PROTOCOL_VERSION = "2026-07-28";
+var META_PROTOCOL_VERSION = "io.modelcontextprotocol/protocolVersion";
+var META_CLIENT_INFO = "io.modelcontextprotocol/clientInfo";
+var META_CLIENT_CAPABILITIES = "io.modelcontextprotocol/clientCapabilities";
+var META_SERVER_INFO = "io.modelcontextprotocol/serverInfo";
+var HEADER_MISMATCH = -32020;
+var MISSING_REQUIRED_CLIENT_CAPABILITY = -32021;
+var UNSUPPORTED_PROTOCOL_VERSION = -32022;
+var MODERN_ERROR_CODES = /* @__PURE__ */ new Set([
+  HEADER_MISMATCH,
+  MISSING_REQUIRED_CLIENT_CAPABILITY,
+  UNSUPPORTED_PROTOCOL_VERSION
+]);
+function isModernErrorCode(code2) {
+  return MODERN_ERROR_CODES.has(code2);
+}
+function modernRequestMeta(protocolVersion, clientInfo) {
+  return {
+    [META_PROTOCOL_VERSION]: protocolVersion,
+    [META_CLIENT_INFO]: clientInfo,
+    [META_CLIENT_CAPABILITIES]: {}
+  };
+}
+function modernRequestParams(params, protocolVersion, clientInfo) {
+  const { _inputResponses, ...rest } = params;
+  const out = { ...rest };
+  if (_inputResponses) out.inputResponses = _inputResponses;
+  out._meta = modernRequestMeta(protocolVersion, clientInfo);
+  return out;
+}
+var B64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+function base64Utf8(value) {
+  const bytes = new TextEncoder().encode(value);
+  let out = "";
+  for (let i = 0; i < bytes.length; i += 3) {
+    const a = bytes[i];
+    const b = i + 1 < bytes.length ? bytes[i + 1] : 0;
+    const c = i + 2 < bytes.length ? bytes[i + 2] : 0;
+    const n = a << 16 | b << 8 | c;
+    out += B64[n >> 18 & 63] + B64[n >> 12 & 63];
+    out += i + 1 < bytes.length ? B64[n >> 6 & 63] : "=";
+    out += i + 2 < bytes.length ? B64[n & 63] : "=";
+  }
+  return out;
+}
+function encodeHeaderValue(value) {
+  const safe = /^[\x20-\x7e\t]*$/.test(value) && value.trim() === value && !(value.startsWith("=?base64?") && value.endsWith("?="));
+  return safe ? value : `=?base64?${base64Utf8(value)}?=`;
+}
+function isModernRequest(params) {
+  if (!params || typeof params !== "object") return false;
+  const meta = Object.getOwnPropertyDescriptor(params, "_meta")?.value;
+  if (!meta || typeof meta !== "object") return false;
+  return typeof Object.getOwnPropertyDescriptor(meta, META_PROTOCOL_VERSION)?.value === "string";
+}
+function completeModernOutcome(outcome, params) {
+  if (outcome.status !== 200 || !isModernRequest(params)) return outcome;
+  const frame = JSON.parse(outcome.body);
+  const result = frame.result;
+  if (!result || typeof result !== "object" || Array.isArray(result)) return outcome;
+  if (Object.hasOwn(result, "resultType")) return outcome;
+  frame.result = { resultType: "complete", ...result };
+  return { ...outcome, body: JSON.stringify(frame) };
+}
+function modernDiscoverResult(supportedVersions, capabilities, serverInfo, instructions) {
+  return {
+    resultType: "complete",
+    supportedVersions,
+    capabilities,
+    serverInfo,
+    ...instructions ? { instructions } : {},
+    _meta: { [META_SERVER_INFO]: serverInfo }
+  };
+}
+
 // src/client/stateless-connection.ts
-var STATELESS_PROTOCOL_VERSION = "2026-07-28";
+var STATELESS_PROTOCOL_VERSION = MODERN_PROTOCOL_VERSION;
 var StatelessRpcError = class extends Error {
   code;
   data;
-  constructor(code2, message, data) {
+  httpStatus;
+  constructor(code2, message, data, httpStatus) {
     super(`MCP RPC error ${code2}: ${message}`);
     this.name = "StatelessRpcError";
     this.code = code2;
     this.data = data;
+    this.httpStatus = httpStatus;
+  }
+};
+var UnsupportedModernVersionError = class extends Error {
+  constructor(version, supported) {
+    super(`Server does not support ${version} (advertised: ${supported.join(", ") || "none"})`);
+    this.name = "UnsupportedModernVersionError";
   }
 };
+function supportedList(data) {
+  const list = data?.supported;
+  return Array.isArray(list) ? list.filter((v) => typeof v === "string") : void 0;
+}
+function indicatesLegacyServer(err, http) {
+  if (err instanceof UnsupportedModernVersionError) return true;
+  if (http && err instanceof StatelessHttpError) return err.status >= 400 && err.status < 500;
+  if (!(err instanceof StatelessRpcError)) return false;
+  if (err.code === UNSUPPORTED_PROTOCOL_VERSION) {
+    const supported = supportedList(err.data);
+    return !!supported && !supported.includes(STATELESS_PROTOCOL_VERSION);
+  }
+  if (isModernErrorCode(err.code)) return false;
+  if (!http || err.code === -32601) return true;
+  return err.httpStatus !== void 0 && err.httpStatus >= 400 && err.httpStatus < 500;
+}
 var StatelessHttpError = class extends Error {
   status;
   constructor(status, statusText, method, snippet) {
@@ -8475,11 +8575,16 @@ function logHeaders(verbose, dir, entries) {
     else verbose.headerIn(k, v);
   }
 }
+function discoverServerInfo(discoverResult2) {
+  const meta = discoverResult2?._meta;
+  return meta?.[META_SERVER_INFO] ?? discoverResult2?.serverInfo;
+}
 function buildServerInfo(discoverResult2) {
+  const serverInfo = discoverServerInfo(discoverResult2);
   return {
-    name: discoverResult2?.serverInfo?.name,
-    version: discoverResult2?.serverInfo?.version,
-    title: discoverResult2?.serverInfo?.title,
+    name: serverInfo?.name,
+    version: serverInfo?.version,
+    title: serverInfo?.title,
     protocolVersion: STATELESS_PROTOCOL_VERSION,
     capabilities: discoverResult2?.capabilities ?? {},
     instructions: discoverResult2?.instructions
@@ -8562,17 +8667,17 @@ async function createStatelessConnection(options) {
     redact: redact2 = (text) => text
   } = options;
   let nextId2 = 1;
-  let negotiatedVersion;
+  const protocolVersion = STATELESS_PROTOCOL_VERSION;
   function buildHeaders(method, params, token) {
     const h = {
       "Content-Type": "application/json",
       Accept: "application/json, text/event-stream",
+      "MCP-Protocol-Version": protocolVersion,
       "Mcp-Method": method,
       ...extraHeaders
     };
     const n = mcpNameForMethod(method, params);
-    if (n) h["Mcp-Name"] = n;
-    if (negotiatedVersion) h["Mcp-Protocol-Version"] = negotiatedVersion;
+    if (n) h["Mcp-Name"] = encodeHeaderValue(n);
     if (token) h["Authorization"] = `Bearer ${token}`;
     return h;
   }
@@ -8592,7 +8697,7 @@ async function createStatelessConnection(options) {
       if (p.error && typeof p.error.code === "number") rpc = p.error;
     } catch {
     }
-    if (rpc) throw new StatelessRpcError(rpc.code, rpc.message, rpc.data);
+    if (rpc) throw new StatelessRpcError(rpc.code, rpc.message, rpc.data, res.status);
     throw new StatelessHttpError(res.status, res.statusText, method, redact2(text).slice(0, 512));
   }
   async function doFetch(method, params, body) {
@@ -8635,7 +8740,12 @@ async function createStatelessConnection(options) {
     }
     if (verbose?.enabled) verbose.response(JSON.stringify(frame));
     if (frame.error) {
-      throw new StatelessRpcError(frame.error.code, frame.error.message, frame.error.data);
+      throw new StatelessRpcError(
+        frame.error.code,
+        frame.error.message,
+        frame.error.data,
+        res.status
+      );
     }
     return frame.result;
   }
@@ -8654,23 +8764,10 @@ async function createStatelessConnection(options) {
     }
   }
   async function request(method, params) {
-    const id = nextId2++;
-    const meta = {
-      protocolVersion: negotiatedVersion ?? STATELESS_PROTOCOL_VERSION,
-      clientInfo
-    };
-    const cleanParams = { ...params };
-    if (cleanParams._inputResponses) {
-      meta.inputResponses = cleanParams._inputResponses;
-      delete cleanParams._inputResponses;
-    }
-    const body = JSON.stringify({
-      jsonrpc: "2.0",
-      id,
-      method,
-      params: { ...cleanParams, _meta: meta }
-    });
+    const wireParams = modernRequestParams(params, protocolVersion, clientInfo);
     for (let attempt = 0; attempt < 2; attempt++) {
+      const id = nextId2++;
+      const body = JSON.stringify({ jsonrpc: "2.0", id, method, params: wireParams });
       const { res, token, detach } = await doFetch(method, params, body);
       let retry;
       try {
@@ -8690,16 +8787,11 @@ async function createStatelessConnection(options) {
     }
     throw new McpAuthError(401, url);
   }
-  const discoverResult2 = await request("server/discover", {
-    protocolVersion: STATELESS_PROTOCOL_VERSION
-  });
+  const discoverResult2 = await request("server/discover", {});
   const supported = discoverResult2?.supportedVersions?.filter((v) => typeof v === "string") ?? [];
   if (!supported.includes(STATELESS_PROTOCOL_VERSION)) {
-    throw new Error(
-      `Server does not support ${STATELESS_PROTOCOL_VERSION} (advertised: ${supported.join(", ") || "none"})`
-    );
+    throw new UnsupportedModernVersionError(STATELESS_PROTOCOL_VERSION, supported);
   }
-  negotiatedVersion = STATELESS_PROTOCOL_VERSION;
   const extra = buildStatelessMethods(request, discoverResult2);
   return {
     ...extra,
@@ -8846,14 +8938,13 @@ async function createPiConnection(options) {
 }
 
 // src/client/stdio-stateless.ts
-var PROTOCOL_VERSION = "2026-07-28";
+var PROTOCOL_VERSION = MODERN_PROTOCOL_VERSION;
 function createStdioJsonRpc(proc, platform2, options) {
   const encoder2 = new TextEncoder();
   const decoder3 = new TextDecoder();
   let nextId2 = 1;
   let readBuffer = "";
   const reader = proc.stdout.getReader();
-  let negotiatedVersion;
   const { version = "0.0.0", timeoutMs = 6e4, signal: externalSignal, verbose } = options;
   async function readLine2() {
     while (true) {
@@ -8893,20 +8984,11 @@ function createStdioJsonRpc(proc, platform2, options) {
   }
   async function request(method, params) {
     const id = nextId2++;
-    const meta = {
-      protocolVersion: negotiatedVersion ?? PROTOCOL_VERSION,
-      clientInfo: { name: "mcpcat", version }
-    };
-    const cleanParams = { ...params };
-    if (cleanParams._inputResponses) {
-      meta.inputResponses = cleanParams._inputResponses;
-      delete cleanParams._inputResponses;
-    }
     const body = JSON.stringify({
       jsonrpc: "2.0",
       id,
       method,
-      params: { ...cleanParams, _meta: meta }
+      params: modernRequestParams(params, PROTOCOL_VERSION, { name: "mcpcat", version })
     });
     if (verbose?.enabled) verbose.request(method, body);
     await send(body);
@@ -8940,10 +9022,11 @@ function createStdioJsonRpc(proc, platform2, options) {
   };
 }
 function buildServerInfo2(discoverResult2) {
+  const serverInfo = discoverServerInfo(discoverResult2);
   return {
-    name: discoverResult2?.serverInfo?.name,
-    version: discoverResult2?.serverInfo?.version,
-    title: discoverResult2?.serverInfo?.title,
+    name: serverInfo?.name,
+    version: serverInfo?.version,
+    title: serverInfo?.title,
     protocolVersion: PROTOCOL_VERSION,
     capabilities: discoverResult2?.capabilities ?? {},
     instructions: discoverResult2?.instructions
@@ -9017,25 +9100,27 @@ async function probeStdioStateless(options) {
   });
   let discoverRaw;
   try {
-    discoverRaw = await rpc.request("server/discover", {
-      protocolVersion: PROTOCOL_VERSION
-    });
+    discoverRaw = await rpc.request("server/discover", {});
   } catch (err) {
     const pending = rpc.pendingBuffer();
     rpc.close();
     return { proc, pendingStdout: pending, error: err };
   }
-  void readStderr(proc, options.verbose);
   const discoverResult2 = discoverRaw;
-  const supported = (discoverResult2?.supportedVersions ?? []).filter(
+  const advertised = discoverResult2?.supportedVersions;
+  const supported = (Array.isArray(advertised) ? advertised : []).filter(
     (v) => typeof v === "string"
   );
   if (!supported.includes(PROTOCOL_VERSION)) {
-    await proc.kill("SIGTERM");
-    throw new Error(
-      `Server does not support ${PROTOCOL_VERSION} (advertised: ${supported.join(", ") || "none"})`
-    );
+    const pending = rpc.pendingBuffer();
+    rpc.close();
+    return {
+      proc,
+      pendingStdout: pending,
+      error: new UnsupportedModernVersionError(PROTOCOL_VERSION, supported)
+    };
   }
+  void readStderr(proc, options.verbose);
   return buildConnectionMethods(rpc, discoverResult2, proc);
 }
 async function readStderr(proc, verbose) {
@@ -9079,16 +9164,7 @@ async function connect(platform2, options) {
         verbose: options.verbose
       });
       if (!("proc" in result)) return result;
-      const isMethodNotFound = result.error instanceof StatelessRpcError && result.error.code === -32601;
-      const isUnsupported = result.error.message.includes("does not support");
-      if (options.protocolVersion?.startsWith("2026")) {
-        try {
-          await result.proc.kill("SIGTERM");
-        } catch {
-        }
-        throw result.error;
-      }
-      if (!isMethodNotFound && !isUnsupported) {
+      if (options.protocolVersion?.startsWith("2026") || !indicatesLegacyServer(result.error, false)) {
         try {
           await result.proc.kill("SIGTERM");
         } catch {
@@ -9131,12 +9207,11 @@ async function connect(platform2, options) {
       redact: options.redact
     });
   } catch (err) {
-    const isMethodNotFound = err instanceof StatelessRpcError && err.code === -32601 || err instanceof StatelessHttpError && err.status >= 400 && err.status < 500;
     if (options.protocolVersion?.startsWith("2026")) throw err;
     if (err instanceof McpAuthError || err instanceof AuthStepUpError) throw err;
     if (err instanceof TransportRefusalError) throw err;
     if (err.name === "McpOAuthAuthorizationRequiredError") throw err;
-    if (isMethodNotFound) {
+    if (indicatesLegacyServer(err, true)) {
       return createPiConnection({
         url: options.url,
         headers: options.headers,
@@ -10887,11 +10962,21 @@ async function probeLinkHeaders(fetcher, targetUrl, origin, page, userUrlIsPriva
   }
   return events;
 }
+function sseResponse(text, id) {
+  for (const block of text.replace(/\r\n?/g, "\n").split("\n\n")) {
+    const data = block.split("\n").filter((l) => l.startsWith("data:")).map((l) => l.slice(5).replace(/^ /, "")).join("\n");
+    const parsed = tryParseJson(data);
+    if (isRecord4(parsed) && parsed.id === id) return parsed;
+  }
+  return void 0;
+}
 function mcpJsonRpc(method, params, id = 1) {
   return JSON.stringify({ jsonrpc: "2.0", id, method, params });
 }
 function parseServerInfo(result) {
-  const si = isRecord4(result.serverInfo) ? result.serverInfo : void 0;
+  const meta = isRecord4(result._meta) ? result._meta : void 0;
+  const fromMeta = meta && isRecord4(meta[META_SERVER_INFO]) ? meta[META_SERVER_INFO] : void 0;
+  const si = fromMeta ?? (isRecord4(result.serverInfo) ? result.serverInfo : void 0);
   if (!si) return void 0;
   return {
     name: typeof si.name === "string" ? si.name : void 0,
@@ -10907,7 +10992,7 @@ function checkAuthResponse(resp) {
 async function tryMcpPost(fetcher, url, body, extraHeaders) {
   const headers = {
     "Content-Type": "application/json",
-    Accept: "application/json",
+    Accept: "application/json, text/event-stream",
     ...extraHeaders
   };
   try {
@@ -10922,7 +11007,8 @@ async function tryMcpPost(fetcher, url, body, extraHeaders) {
     if (authSignal) return { url, trust: [authSignal] };
     if (resp.status === 200) {
       const text = await resp.text();
-      const parsed = tryParseJson(text);
+      const sse = (resp.headers.get("content-type") ?? "").includes("text/event-stream");
+      const parsed = sse ? sseResponse(text, tryParseJson(body)?.id) : tryParseJson(text);
       if (isRecord4(parsed) && isRecord4(parsed.result)) {
         return { url, serverInfo: parseServerInfo(parsed.result), trust: [] };
       }
@@ -10933,18 +11019,22 @@ async function tryMcpPost(fetcher, url, body, extraHeaders) {
 }
 async function probeMcpEndpoint(fetcher, url) {
   const discoverBody = mcpJsonRpc("server/discover", {
-    protocolVersion: "2026-07-28",
-    clientInfo: { name: "mcpcat", version: "0.0.0" }
+    _meta: modernRequestMeta(MODERN_PROTOCOL_VERSION, { name: "mcpcat", version: "0.0.0" })
   });
   const hit = await tryMcpPost(fetcher, url, discoverBody, {
+    "MCP-Protocol-Version": MODERN_PROTOCOL_VERSION,
     "Mcp-Method": "server/discover"
   });
   if (hit) return hit;
-  const initBody = mcpJsonRpc("initialize", {
-    protocolVersion: "2025-11-25",
-    clientInfo: { name: "mcpcat", version: "0.0.0" },
-    capabilities: {}
-  });
+  const initBody = mcpJsonRpc(
+    "initialize",
+    {
+      protocolVersion: "2025-11-25",
+      clientInfo: { name: "mcpcat", version: "0.0.0" },
+      capabilities: {}
+    },
+    2
+  );
   return tryMcpPost(fetcher, url, initBody);
 }
 async function probeMcp(fetcher, origin, page, targetUrl) {
@@ -12073,6 +12163,12 @@ async function handleJsonRpc(raw, source, call, serverName, serverVersion) {
   if (!hasOwn(parsed, "id")) return { status: 202, contentType: "text/plain", body: "" };
   const id = readId(parsed);
   const params = Object.getOwnPropertyDescriptor(parsed, "params")?.value;
+  return completeModernOutcome(
+    await dispatch(id, method, params, source, call, serverName, serverVersion),
+    params
+  );
+}
+async function dispatch(id, method, params, source, call, serverName, serverVersion) {
   if (method === "initialize")
     return rpcOk(id, initializeResult(params, serverName, serverVersion));
   if (method === "server/discover") return rpcOk(id, discoverResult(serverName, serverVersion));
@@ -12127,12 +12223,11 @@ function initializeResult(params, serverName, serverVersion) {
   };
 }
 function discoverResult(serverName, serverVersion) {
-  return {
-    protocolVersion: PROTOCOL_VERSIONS[0],
-    supportedVersions: PROTOCOL_VERSIONS,
-    capabilities: { tools: { listChanged: false } },
-    serverInfo: { name: serverName, version: serverVersion }
-  };
+  return modernDiscoverResult(
+    PROTOCOL_VERSIONS,
+    { tools: { listChanged: false } },
+    { name: serverName, version: serverVersion }
+  );
 }
 function cap(value) {
   if (value.length <= OUTPUT_CAP) return value;
@@ -12268,15 +12363,18 @@ function translateCapabilities(info) {
   if (info.capabilities.prompts) caps.prompts = { listChanged: false };
   return caps;
 }
+function proxyServerInfo(info) {
+  return {
+    name: info.name ?? "mcpcat-proxy",
+    version: info.version ?? "0.0.0",
+    ...info.title ? { title: info.title } : {}
+  };
+}
 function buildServerResult(info, protocolVersion) {
   return {
     protocolVersion,
     capabilities: translateCapabilities(info),
-    serverInfo: {
-      name: info.name ?? "mcpcat-proxy",
-      version: info.version ?? "0.0.0",
-      ...info.title ? { title: info.title } : {}
-    },
+    serverInfo: proxyServerInfo(info),
     ...info.instructions ? { instructions: info.instructions } : {}
   };
 }
@@ -12324,10 +12422,16 @@ function createProxyHandler(options) {
     return scrubOk(id, buildServerResult(cachedInfo, pv));
   }
   function handleDiscover(id) {
-    return scrubOk(id, {
-      ...buildServerResult(cachedInfo, PROTOCOL_VERSIONS2[0]),
-      supportedVersions: PROTOCOL_VERSIONS2
-    });
+    const info = cachedInfo;
+    return scrubOk(
+      id,
+      modernDiscoverResult(
+        PROTOCOL_VERSIONS2,
+        translateCapabilities(info),
+        proxyServerInfo(info),
+        info.instructions
+      )
+    );
   }
   async function forwardWithRetry(method, doForward, id) {
     try {
@@ -12354,7 +12458,7 @@ function createProxyHandler(options) {
       return scrubErr(id, -32e3, err.message);
     }
   }
-  async function dispatch(method, id, params) {
+  async function dispatch2(method, id, params) {
     try {
       await getConnection();
     } catch (err) {
@@ -12391,7 +12495,7 @@ function createProxyHandler(options) {
     if (!hasOwn2(parsed, "id")) return { status: 202, contentType: "text/plain", body: "" };
     const id = readId2(parsed);
     const params = Object.getOwnPropertyDescriptor(parsed, "params")?.value;
-    return dispatch(method, id, params);
+    return completeModernOutcome(await dispatch2(method, id, params), params);
   }
   async function shutdown() {
     if (conn) {
@@ -17579,5 +17683,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.20.3", args);
+var code = await run(platform, "0.20.4", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -7312,7 +7312,7 @@ async function consumeSseStream(stream, options) {
   let dataLines = [];
   let dataBytes = 0;
   const maxEventBytes = options.maxEventBytes ?? DEFAULT_MAX_MESSAGE_BYTES;
-  const dispatch = () => {
+  const dispatch2 = () => {
     if (dataLines.length === 0) {
       eventName = void 0;
       eventId = void 0;
@@ -7328,7 +7328,7 @@ async function consumeSseStream(stream, options) {
   const processLine = (rawLine) => {
     const line = rawLine.endsWith("\r") ? rawLine.slice(0, -1) : rawLine;
     if (line === "") {
-      dispatch();
+      dispatch2();
       return;
     }
     if (line.startsWith(":"))
@@ -7369,7 +7369,7 @@ async function consumeSseStream(stream, options) {
     buffered += decoder3.decode();
     if (buffered)
       processLine(buffered);
-    dispatch();
+    dispatch2();
   } finally {
     reader.releaseLock();
   }
@@ -7973,18 +7973,118 @@ var PlatformStdioTransport = class {
   }
 };
 
+// src/client/modern.ts
+var MODERN_PROTOCOL_VERSION = "2026-07-28";
+var META_PROTOCOL_VERSION = "io.modelcontextprotocol/protocolVersion";
+var META_CLIENT_INFO = "io.modelcontextprotocol/clientInfo";
+var META_CLIENT_CAPABILITIES = "io.modelcontextprotocol/clientCapabilities";
+var META_SERVER_INFO = "io.modelcontextprotocol/serverInfo";
+var HEADER_MISMATCH = -32020;
+var MISSING_REQUIRED_CLIENT_CAPABILITY = -32021;
+var UNSUPPORTED_PROTOCOL_VERSION = -32022;
+var MODERN_ERROR_CODES = /* @__PURE__ */ new Set([
+  HEADER_MISMATCH,
+  MISSING_REQUIRED_CLIENT_CAPABILITY,
+  UNSUPPORTED_PROTOCOL_VERSION
+]);
+function isModernErrorCode(code) {
+  return MODERN_ERROR_CODES.has(code);
+}
+function modernRequestMeta(protocolVersion, clientInfo) {
+  return {
+    [META_PROTOCOL_VERSION]: protocolVersion,
+    [META_CLIENT_INFO]: clientInfo,
+    [META_CLIENT_CAPABILITIES]: {}
+  };
+}
+function modernRequestParams(params, protocolVersion, clientInfo) {
+  const { _inputResponses, ...rest } = params;
+  const out = { ...rest };
+  if (_inputResponses) out.inputResponses = _inputResponses;
+  out._meta = modernRequestMeta(protocolVersion, clientInfo);
+  return out;
+}
+var B64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+function base64Utf8(value) {
+  const bytes = new TextEncoder().encode(value);
+  let out = "";
+  for (let i = 0; i < bytes.length; i += 3) {
+    const a = bytes[i];
+    const b = i + 1 < bytes.length ? bytes[i + 1] : 0;
+    const c = i + 2 < bytes.length ? bytes[i + 2] : 0;
+    const n = a << 16 | b << 8 | c;
+    out += B64[n >> 18 & 63] + B64[n >> 12 & 63];
+    out += i + 1 < bytes.length ? B64[n >> 6 & 63] : "=";
+    out += i + 2 < bytes.length ? B64[n & 63] : "=";
+  }
+  return out;
+}
+function encodeHeaderValue(value) {
+  const safe = /^[\x20-\x7e\t]*$/.test(value) && value.trim() === value && !(value.startsWith("=?base64?") && value.endsWith("?="));
+  return safe ? value : `=?base64?${base64Utf8(value)}?=`;
+}
+function isModernRequest(params) {
+  if (!params || typeof params !== "object") return false;
+  const meta = Object.getOwnPropertyDescriptor(params, "_meta")?.value;
+  if (!meta || typeof meta !== "object") return false;
+  return typeof Object.getOwnPropertyDescriptor(meta, META_PROTOCOL_VERSION)?.value === "string";
+}
+function completeModernOutcome(outcome, params) {
+  if (outcome.status !== 200 || !isModernRequest(params)) return outcome;
+  const frame = JSON.parse(outcome.body);
+  const result = frame.result;
+  if (!result || typeof result !== "object" || Array.isArray(result)) return outcome;
+  if (Object.hasOwn(result, "resultType")) return outcome;
+  frame.result = { resultType: "complete", ...result };
+  return { ...outcome, body: JSON.stringify(frame) };
+}
+function modernDiscoverResult(supportedVersions, capabilities, serverInfo, instructions) {
+  return {
+    resultType: "complete",
+    supportedVersions,
+    capabilities,
+    serverInfo,
+    ...instructions ? { instructions } : {},
+    _meta: { [META_SERVER_INFO]: serverInfo }
+  };
+}
+
 // src/client/stateless-connection.ts
-var STATELESS_PROTOCOL_VERSION = "2026-07-28";
+var STATELESS_PROTOCOL_VERSION = MODERN_PROTOCOL_VERSION;
 var StatelessRpcError = class extends Error {
   code;
   data;
-  constructor(code, message, data) {
+  httpStatus;
+  constructor(code, message, data, httpStatus) {
     super(`MCP RPC error ${code}: ${message}`);
     this.name = "StatelessRpcError";
     this.code = code;
     this.data = data;
+    this.httpStatus = httpStatus;
+  }
+};
+var UnsupportedModernVersionError = class extends Error {
+  constructor(version, supported) {
+    super(`Server does not support ${version} (advertised: ${supported.join(", ") || "none"})`);
+    this.name = "UnsupportedModernVersionError";
   }
 };
+function supportedList(data) {
+  const list = data?.supported;
+  return Array.isArray(list) ? list.filter((v) => typeof v === "string") : void 0;
+}
+function indicatesLegacyServer(err, http) {
+  if (err instanceof UnsupportedModernVersionError) return true;
+  if (http && err instanceof StatelessHttpError) return err.status >= 400 && err.status < 500;
+  if (!(err instanceof StatelessRpcError)) return false;
+  if (err.code === UNSUPPORTED_PROTOCOL_VERSION) {
+    const supported = supportedList(err.data);
+    return !!supported && !supported.includes(STATELESS_PROTOCOL_VERSION);
+  }
+  if (isModernErrorCode(err.code)) return false;
+  if (!http || err.code === -32601) return true;
+  return err.httpStatus !== void 0 && err.httpStatus >= 400 && err.httpStatus < 500;
+}
 var StatelessHttpError = class extends Error {
   status;
   constructor(status, statusText, method, snippet) {
@@ -8096,11 +8196,16 @@ function logHeaders(verbose, dir, entries) {
     else verbose.headerIn(k, v);
   }
 }
+function discoverServerInfo(discoverResult2) {
+  const meta = discoverResult2?._meta;
+  return meta?.[META_SERVER_INFO] ?? discoverResult2?.serverInfo;
+}
 function buildServerInfo(discoverResult2) {
+  const serverInfo = discoverServerInfo(discoverResult2);
   return {
-    name: discoverResult2?.serverInfo?.name,
-    version: discoverResult2?.serverInfo?.version,
-    title: discoverResult2?.serverInfo?.title,
+    name: serverInfo?.name,
+    version: serverInfo?.version,
+    title: serverInfo?.title,
     protocolVersion: STATELESS_PROTOCOL_VERSION,
     capabilities: discoverResult2?.capabilities ?? {},
     instructions: discoverResult2?.instructions
@@ -8183,17 +8288,17 @@ async function createStatelessConnection(options) {
     redact: redact2 = (text) => text
   } = options;
   let nextId2 = 1;
-  let negotiatedVersion;
+  const protocolVersion = STATELESS_PROTOCOL_VERSION;
   function buildHeaders(method, params, token) {
     const h = {
       "Content-Type": "application/json",
       Accept: "application/json, text/event-stream",
+      "MCP-Protocol-Version": protocolVersion,
       "Mcp-Method": method,
       ...extraHeaders
     };
     const n = mcpNameForMethod(method, params);
-    if (n) h["Mcp-Name"] = n;
-    if (negotiatedVersion) h["Mcp-Protocol-Version"] = negotiatedVersion;
+    if (n) h["Mcp-Name"] = encodeHeaderValue(n);
     if (token) h["Authorization"] = `Bearer ${token}`;
     return h;
   }
@@ -8213,7 +8318,7 @@ async function createStatelessConnection(options) {
       if (p.error && typeof p.error.code === "number") rpc = p.error;
     } catch {
     }
-    if (rpc) throw new StatelessRpcError(rpc.code, rpc.message, rpc.data);
+    if (rpc) throw new StatelessRpcError(rpc.code, rpc.message, rpc.data, res.status);
     throw new StatelessHttpError(res.status, res.statusText, method, redact2(text).slice(0, 512));
   }
   async function doFetch(method, params, body) {
@@ -8256,7 +8361,12 @@ async function createStatelessConnection(options) {
     }
     if (verbose?.enabled) verbose.response(JSON.stringify(frame));
     if (frame.error) {
-      throw new StatelessRpcError(frame.error.code, frame.error.message, frame.error.data);
+      throw new StatelessRpcError(
+        frame.error.code,
+        frame.error.message,
+        frame.error.data,
+        res.status
+      );
     }
     return frame.result;
   }
@@ -8275,23 +8385,10 @@ async function createStatelessConnection(options) {
     }
   }
   async function request(method, params) {
-    const id = nextId2++;
-    const meta = {
-      protocolVersion: negotiatedVersion ?? STATELESS_PROTOCOL_VERSION,
-      clientInfo
-    };
-    const cleanParams = { ...params };
-    if (cleanParams._inputResponses) {
-      meta.inputResponses = cleanParams._inputResponses;
-      delete cleanParams._inputResponses;
-    }
-    const body = JSON.stringify({
-      jsonrpc: "2.0",
-      id,
-      method,
-      params: { ...cleanParams, _meta: meta }
-    });
+    const wireParams = modernRequestParams(params, protocolVersion, clientInfo);
     for (let attempt = 0; attempt < 2; attempt++) {
+      const id = nextId2++;
+      const body = JSON.stringify({ jsonrpc: "2.0", id, method, params: wireParams });
       const { res, token, detach } = await doFetch(method, params, body);
       let retry;
       try {
@@ -8311,16 +8408,11 @@ async function createStatelessConnection(options) {
     }
     throw new McpAuthError(401, url);
   }
-  const discoverResult2 = await request("server/discover", {
-    protocolVersion: STATELESS_PROTOCOL_VERSION
-  });
+  const discoverResult2 = await request("server/discover", {});
   const supported = discoverResult2?.supportedVersions?.filter((v) => typeof v === "string") ?? [];
   if (!supported.includes(STATELESS_PROTOCOL_VERSION)) {
-    throw new Error(
-      `Server does not support ${STATELESS_PROTOCOL_VERSION} (advertised: ${supported.join(", ") || "none"})`
-    );
+    throw new UnsupportedModernVersionError(STATELESS_PROTOCOL_VERSION, supported);
   }
-  negotiatedVersion = STATELESS_PROTOCOL_VERSION;
   const extra = buildStatelessMethods(request, discoverResult2);
   return {
     ...extra,
@@ -8467,14 +8559,13 @@ async function createPiConnection(options) {
 }
 
 // src/client/stdio-stateless.ts
-var PROTOCOL_VERSION = "2026-07-28";
+var PROTOCOL_VERSION = MODERN_PROTOCOL_VERSION;
 function createStdioJsonRpc(proc, platform2, options) {
   const encoder2 = new TextEncoder();
   const decoder3 = new TextDecoder();
   let nextId2 = 1;
   let readBuffer = "";
   const reader = proc.stdout.getReader();
-  let negotiatedVersion;
   const { version = "0.0.0", timeoutMs = 6e4, signal: externalSignal, verbose } = options;
   async function readLine2() {
     while (true) {
@@ -8514,20 +8605,11 @@ function createStdioJsonRpc(proc, platform2, options) {
   }
   async function request(method, params) {
     const id = nextId2++;
-    const meta = {
-      protocolVersion: negotiatedVersion ?? PROTOCOL_VERSION,
-      clientInfo: { name: "mcpcat", version }
-    };
-    const cleanParams = { ...params };
-    if (cleanParams._inputResponses) {
-      meta.inputResponses = cleanParams._inputResponses;
-      delete cleanParams._inputResponses;
-    }
     const body = JSON.stringify({
       jsonrpc: "2.0",
       id,
       method,
-      params: { ...cleanParams, _meta: meta }
+      params: modernRequestParams(params, PROTOCOL_VERSION, { name: "mcpcat", version })
     });
     if (verbose?.enabled) verbose.request(method, body);
     await send(body);
@@ -8561,10 +8643,11 @@ function createStdioJsonRpc(proc, platform2, options) {
   };
 }
 function buildServerInfo2(discoverResult2) {
+  const serverInfo = discoverServerInfo(discoverResult2);
   return {
-    name: discoverResult2?.serverInfo?.name,
-    version: discoverResult2?.serverInfo?.version,
-    title: discoverResult2?.serverInfo?.title,
+    name: serverInfo?.name,
+    version: serverInfo?.version,
+    title: serverInfo?.title,
     protocolVersion: PROTOCOL_VERSION,
     capabilities: discoverResult2?.capabilities ?? {},
     instructions: discoverResult2?.instructions
@@ -8638,25 +8721,27 @@ async function probeStdioStateless(options) {
   });
   let discoverRaw;
   try {
-    discoverRaw = await rpc.request("server/discover", {
-      protocolVersion: PROTOCOL_VERSION
-    });
+    discoverRaw = await rpc.request("server/discover", {});
   } catch (err) {
     const pending = rpc.pendingBuffer();
     rpc.close();
     return { proc, pendingStdout: pending, error: err };
   }
-  void readStderr(proc, options.verbose);
   const discoverResult2 = discoverRaw;
-  const supported = (discoverResult2?.supportedVersions ?? []).filter(
+  const advertised = discoverResult2?.supportedVersions;
+  const supported = (Array.isArray(advertised) ? advertised : []).filter(
     (v) => typeof v === "string"
   );
   if (!supported.includes(PROTOCOL_VERSION)) {
-    await proc.kill("SIGTERM");
-    throw new Error(
-      `Server does not support ${PROTOCOL_VERSION} (advertised: ${supported.join(", ") || "none"})`
-    );
+    const pending = rpc.pendingBuffer();
+    rpc.close();
+    return {
+      proc,
+      pendingStdout: pending,
+      error: new UnsupportedModernVersionError(PROTOCOL_VERSION, supported)
+    };
   }
+  void readStderr(proc, options.verbose);
   return buildConnectionMethods(rpc, discoverResult2, proc);
 }
 async function readStderr(proc, verbose) {
@@ -8700,16 +8785,7 @@ async function connect(platform2, options) {
         verbose: options.verbose
       });
       if (!("proc" in result)) return result;
-      const isMethodNotFound = result.error instanceof StatelessRpcError && result.error.code === -32601;
-      const isUnsupported = result.error.message.includes("does not support");
-      if (options.protocolVersion?.startsWith("2026")) {
-        try {
-          await result.proc.kill("SIGTERM");
-        } catch {
-        }
-        throw result.error;
-      }
-      if (!isMethodNotFound && !isUnsupported) {
+      if (options.protocolVersion?.startsWith("2026") || !indicatesLegacyServer(result.error, false)) {
         try {
           await result.proc.kill("SIGTERM");
         } catch {
@@ -8752,12 +8828,11 @@ async function connect(platform2, options) {
       redact: options.redact
     });
   } catch (err) {
-    const isMethodNotFound = err instanceof StatelessRpcError && err.code === -32601 || err instanceof StatelessHttpError && err.status >= 400 && err.status < 500;
     if (options.protocolVersion?.startsWith("2026")) throw err;
     if (err instanceof McpAuthError || err instanceof AuthStepUpError) throw err;
     if (err instanceof TransportRefusalError) throw err;
     if (err.name === "McpOAuthAuthorizationRequiredError") throw err;
-    if (isMethodNotFound) {
+    if (indicatesLegacyServer(err, true)) {
       return createPiConnection({
         url: options.url,
         headers: options.headers,
@@ -10508,11 +10583,21 @@ async function probeLinkHeaders(fetcher, targetUrl, origin, page, userUrlIsPriva
   }
   return events;
 }
+function sseResponse(text, id) {
+  for (const block of text.replace(/\r\n?/g, "\n").split("\n\n")) {
+    const data = block.split("\n").filter((l) => l.startsWith("data:")).map((l) => l.slice(5).replace(/^ /, "")).join("\n");
+    const parsed = tryParseJson(data);
+    if (isRecord4(parsed) && parsed.id === id) return parsed;
+  }
+  return void 0;
+}
 function mcpJsonRpc(method, params, id = 1) {
   return JSON.stringify({ jsonrpc: "2.0", id, method, params });
 }
 function parseServerInfo(result) {
-  const si = isRecord4(result.serverInfo) ? result.serverInfo : void 0;
+  const meta = isRecord4(result._meta) ? result._meta : void 0;
+  const fromMeta = meta && isRecord4(meta[META_SERVER_INFO]) ? meta[META_SERVER_INFO] : void 0;
+  const si = fromMeta ?? (isRecord4(result.serverInfo) ? result.serverInfo : void 0);
   if (!si) return void 0;
   return {
     name: typeof si.name === "string" ? si.name : void 0,
@@ -10528,7 +10613,7 @@ function checkAuthResponse(resp) {
 async function tryMcpPost(fetcher, url, body, extraHeaders) {
   const headers = {
     "Content-Type": "application/json",
-    Accept: "application/json",
+    Accept: "application/json, text/event-stream",
     ...extraHeaders
   };
   try {
@@ -10543,7 +10628,8 @@ async function tryMcpPost(fetcher, url, body, extraHeaders) {
     if (authSignal) return { url, trust: [authSignal] };
     if (resp.status === 200) {
       const text = await resp.text();
-      const parsed = tryParseJson(text);
+      const sse = (resp.headers.get("content-type") ?? "").includes("text/event-stream");
+      const parsed = sse ? sseResponse(text, tryParseJson(body)?.id) : tryParseJson(text);
       if (isRecord4(parsed) && isRecord4(parsed.result)) {
         return { url, serverInfo: parseServerInfo(parsed.result), trust: [] };
       }
@@ -10554,18 +10640,22 @@ async function tryMcpPost(fetcher, url, body, extraHeaders) {
 }
 async function probeMcpEndpoint(fetcher, url) {
   const discoverBody = mcpJsonRpc("server/discover", {
-    protocolVersion: "2026-07-28",
-    clientInfo: { name: "mcpcat", version: "0.0.0" }
+    _meta: modernRequestMeta(MODERN_PROTOCOL_VERSION, { name: "mcpcat", version: "0.0.0" })
   });
   const hit = await tryMcpPost(fetcher, url, discoverBody, {
+    "MCP-Protocol-Version": MODERN_PROTOCOL_VERSION,
     "Mcp-Method": "server/discover"
   });
   if (hit) return hit;
-  const initBody = mcpJsonRpc("initialize", {
-    protocolVersion: "2025-11-25",
-    clientInfo: { name: "mcpcat", version: "0.0.0" },
-    capabilities: {}
-  });
+  const initBody = mcpJsonRpc(
+    "initialize",
+    {
+      protocolVersion: "2025-11-25",
+      clientInfo: { name: "mcpcat", version: "0.0.0" },
+      capabilities: {}
+    },
+    2
+  );
   return tryMcpPost(fetcher, url, initBody);
 }
 async function probeMcp(fetcher, origin, page, targetUrl) {
@@ -11694,6 +11784,12 @@ async function handleJsonRpc(raw, source, call, serverName, serverVersion) {
   if (!hasOwn(parsed, "id")) return { status: 202, contentType: "text/plain", body: "" };
   const id = readId(parsed);
   const params = Object.getOwnPropertyDescriptor(parsed, "params")?.value;
+  return completeModernOutcome(
+    await dispatch(id, method, params, source, call, serverName, serverVersion),
+    params
+  );
+}
+async function dispatch(id, method, params, source, call, serverName, serverVersion) {
   if (method === "initialize")
     return rpcOk(id, initializeResult(params, serverName, serverVersion));
   if (method === "server/discover") return rpcOk(id, discoverResult(serverName, serverVersion));
@@ -11748,12 +11844,11 @@ function initializeResult(params, serverName, serverVersion) {
   };
 }
 function discoverResult(serverName, serverVersion) {
-  return {
-    protocolVersion: PROTOCOL_VERSIONS[0],
-    supportedVersions: PROTOCOL_VERSIONS,
-    capabilities: { tools: { listChanged: false } },
-    serverInfo: { name: serverName, version: serverVersion }
-  };
+  return modernDiscoverResult(
+    PROTOCOL_VERSIONS,
+    { tools: { listChanged: false } },
+    { name: serverName, version: serverVersion }
+  );
 }
 function cap(value) {
   if (value.length <= OUTPUT_CAP) return value;
@@ -11889,15 +11984,18 @@ function translateCapabilities(info) {
   if (info.capabilities.prompts) caps.prompts = { listChanged: false };
   return caps;
 }
+function proxyServerInfo(info) {
+  return {
+    name: info.name ?? "mcpcat-proxy",
+    version: info.version ?? "0.0.0",
+    ...info.title ? { title: info.title } : {}
+  };
+}
 function buildServerResult(info, protocolVersion) {
   return {
     protocolVersion,
     capabilities: translateCapabilities(info),
-    serverInfo: {
-      name: info.name ?? "mcpcat-proxy",
-      version: info.version ?? "0.0.0",
-      ...info.title ? { title: info.title } : {}
-    },
+    serverInfo: proxyServerInfo(info),
     ...info.instructions ? { instructions: info.instructions } : {}
   };
 }
@@ -11945,10 +12043,16 @@ function createProxyHandler(options) {
     return scrubOk(id, buildServerResult(cachedInfo, pv));
   }
   function handleDiscover(id) {
-    return scrubOk(id, {
-      ...buildServerResult(cachedInfo, PROTOCOL_VERSIONS2[0]),
-      supportedVersions: PROTOCOL_VERSIONS2
-    });
+    const info = cachedInfo;
+    return scrubOk(
+      id,
+      modernDiscoverResult(
+        PROTOCOL_VERSIONS2,
+        translateCapabilities(info),
+        proxyServerInfo(info),
+        info.instructions
+      )
+    );
   }
   async function forwardWithRetry(method, doForward, id) {
     try {
@@ -11975,7 +12079,7 @@ function createProxyHandler(options) {
       return scrubErr(id, -32e3, err.message);
     }
   }
-  async function dispatch(method, id, params) {
+  async function dispatch2(method, id, params) {
     try {
       await getConnection();
     } catch (err) {
@@ -12012,7 +12116,7 @@ function createProxyHandler(options) {
     if (!hasOwn2(parsed, "id")) return { status: 202, contentType: "text/plain", body: "" };
     const id = readId2(parsed);
     const params = Object.getOwnPropertyDescriptor(parsed, "params")?.value;
-    return dispatch(method, id, params);
+    return completeModernOutcome(await dispatch2(method, id, params), params);
   }
   async function shutdown() {
     if (conn) {
@@ -17273,7 +17377,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.20.3", args);
+  return run(platform2, "0.20.4", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.20.3",
+  "version": "0.20.4",
   "description": "A curl for the Model Context Protocol",
   "type": "module",
   "license": "Apache-2.0",
@@ -58,8 +58,8 @@
     "trust:dry": "npx fledgling sync --dry-run -y --skip-publish"
   },
   "devDependencies": {
-    "@ai-ecoverse/slicc-kernel": "1.146.3",
-    "@ai-ecoverse/slicc-shared-web": "2.10.2",
+    "@ai-ecoverse/slicc-kernel": "1.146.5",
+    "@ai-ecoverse/slicc-shared-web": "2.10.4",
     "@biomejs/biome": "2.5.15",
     "@earendil-works/pi-codemode": "1.2.0",
     "@earendil-works/pi-mcp": "1.2.0",