@ai-ecoverse/mcpcat 0.17.3 → 0.17.5

package/dist/host/mcpcat.mjs

@@ -8453,22 +8453,20 @@ function mcpNameForMethod(method, params) {
 function makeAbort(timeoutMs, externalSignal) {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
-  if (externalSignal) {
-    if (externalSignal.aborted) {
+  const onAbort = () => {
+    clearTimeout(timer);
+    controller.abort();
+  };
+  if (externalSignal?.aborted) onAbort();
+  else externalSignal?.addEventListener("abort", onAbort, { once: true });
+  return {
+    controller,
+    stopTimer: () => clearTimeout(timer),
+    detach: () => {
       clearTimeout(timer);
-      controller.abort();
-    } else {
-      externalSignal.addEventListener(
-        "abort",
-        () => {
-          clearTimeout(timer);
-          controller.abort();
-        },
-        { once: true }
-      );
+      externalSignal?.removeEventListener("abort", onAbort);
     }
-  }
-  return { controller, timer };
+  };
 }
 function logHeaders(verbose, dir, entries) {
   for (const [k, v] of entries) {
@@ -8586,7 +8584,7 @@ async function createStatelessConnection(options) {
       verbose.request(method, body);
       logHeaders(verbose, ">", Object.entries(headers));
     }
-    const { controller, timer } = makeAbort(timeoutMs, externalSignal);
+    const { controller, stopTimer, detach } = makeAbort(timeoutMs, externalSignal);
     try {
       const res = await fetchImpl(url, {
         method: "POST",
@@ -8598,14 +8596,15 @@ async function createStatelessConnection(options) {
         verbose.http("<", `HTTP/1.1 ${res.status} ${res.statusText}`);
         logHeaders(verbose, "<", res.headers.entries());
       }
-      return { res, token };
+      return { res, token, detach };
     } catch (err) {
+      detach();
       if (controller.signal.aborted && !externalSignal?.aborted) {
         throw new McpTimeoutError2(method, timeoutMs);
       }
       throw err;
     } finally {
-      clearTimeout(timer);
+      stopTimer();
     }
   }
   async function parseResponse(res, id) {
@@ -8654,19 +8653,22 @@ async function createStatelessConnection(options) {
       params: { ...cleanParams, _meta: meta }
     });
     for (let attempt = 0; attempt < 2; attempt++) {
-      const { res, token } = await doFetch(method, params, body);
-      if (res.status >= 400) {
-        try {
-          await handleErrorStatus(res, method);
-        } catch (err) {
-          if (err instanceof AuthRetryableError && attempt === 0) {
-            await handleAuthError(err, token);
-            continue;
+      const { res, token, detach } = await doFetch(method, params, body);
+      let retry;
+      try {
+        if (res.status >= 400) {
+          try {
+            await handleErrorStatus(res, method);
+          } catch (err) {
+            if (!(err instanceof AuthRetryableError && attempt === 0)) throw err;
+            retry = err;
           }
-          throw err;
         }
+        if (!retry) return await parseResponse(res, id);
+      } finally {
+        detach();
       }
-      return parseResponse(res, id);
+      await handleAuthError(retry, token);
     }
     throw new McpAuthError(401, url);
   }
@@ -8858,6 +8860,19 @@ function createStdioJsonRpc(proc, platform2, options) {
       writer.releaseLock();
     }
   }
+  function raceDeadline(linePromise, method, remaining) {
+    let timer;
+    let onAbort;
+    const stop = new Promise((_, reject) => {
+      timer = setTimeout(() => reject(new McpTimeoutError2(method, timeoutMs)), remaining);
+      onAbort = () => reject(new McpTimeoutError2(method, timeoutMs));
+      externalSignal?.addEventListener("abort", onAbort, { once: true });
+    });
+    return Promise.race([linePromise, stop]).finally(() => {
+      clearTimeout(timer);
+      if (onAbort) externalSignal?.removeEventListener("abort", onAbort);
+    });
+  }
   async function request(method, params) {
     const id = nextId2++;
     const meta = {
@@ -8881,11 +8896,7 @@ function createStdioJsonRpc(proc, platform2, options) {
     while (Date.now() < deadline) {
       const remaining = deadline - Date.now();
       if (externalSignal?.aborted) throw new McpTimeoutError2(method, timeoutMs);
-      const linePromise = readLine2();
-      const timeoutPromise = new Promise(
-        (_, reject) => setTimeout(() => reject(new McpTimeoutError2(method, timeoutMs)), remaining)
-      );
-      const line = await Promise.race([linePromise, timeoutPromise]);
+      const line = await raceDeadline(readLine2(), method, remaining);
       const parsed = JSON.parse(line);
       if (verbose?.enabled) verbose.response(line);
       if (parsed.id === id) {
@@ -9118,6 +9129,9 @@ var CONTROL_RE = /[\u0000-\u0008\u000b-\u001f\u007f-\u009f]/g;
 function sanitizeTerminal(text) {
   return text.replace(CONTROL_RE, (c) => `\\x${c.charCodeAt(0).toString(16).padStart(2, "0")}`);
 }
+function sanitizeJson(json) {
+  return json.replace(CONTROL_RE, (c) => `\\u${c.charCodeAt(0).toString(16).padStart(4, "0")}`);
+}
 
 // src/client/elicit.ts
 function readLine(platform2) {
@@ -11018,8 +11032,8 @@ async function runFromDiscovery(platform2, args2) {
   }
   const result = parseEvents(text);
   if ("error" in result) {
-    await platform2.write(2, `mcpcat add --from-discovery: ${result.error}
-`);
+    await platform2.write(2, sanitizeTerminal(`mcpcat add --from-discovery: ${result.error}
+`));
     return result.code;
   }
   resetIdCounter();
@@ -11079,8 +11093,8 @@ async function runAddCandidate(platform2, name, candidateId2, configFile) {
   const { replaced } = await addServer(platform2.fs, path, name, config);
   for (const t of candidate.trust) {
     if (t.type.includes("mismatch")) {
-      await platform2.write(2, `mcpcat add: warning: ${t.type}: ${t.detail}
-`);
+      await platform2.write(2, sanitizeTerminal(`mcpcat add: warning: ${t.type}: ${t.detail}
+`));
     }
   }
   await platform2.write(1, `${replaced ? "replaced" : "added"} ${name} in ${path}
@@ -14221,7 +14235,7 @@ async function jerkLogin(platform2, target, resolved, args2) {
     return 0;
   }
   if (errText.trim()) {
-    await platform2.write(2, errText);
+    await platform2.write(2, sanitizeTerminal(errText));
   }
   if (result.status === JERK_EXIT_SIGN_IN) return 4;
   return result.status;
@@ -16532,14 +16546,14 @@ async function handleInputRequired(platform2, conn, err, respondData, json) {
   const parsed2 = JSON.parse(err.requestJson);
   const inputReq = parseInputRequest(parsed2.result ?? parsed2);
   if (!inputReq) {
-    await platform2.write(2, `${err.requestJson}
+    await platform2.write(2, `${sanitizeJson(err.requestJson)}
 `);
     return EXIT_INPUT_REQUIRED;
   }
   const isTty = platform2.kind === "host" && platform2.isatty(0) && platform2.isatty(2);
   const elicitResult = await handleElicitation(platform2, inputReq, isTty, respondData);
   if ("exitCode" in elicitResult) {
-    await platform2.write(2, `${err.requestJson}
+    await platform2.write(2, `${sanitizeJson(err.requestJson)}
 `);
     return EXIT_INPUT_REQUIRED;
   }
@@ -17011,5 +17025,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.17.3", args);
+var code = await run(platform, "0.17.5", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -8074,22 +8074,20 @@ function mcpNameForMethod(method, params) {
 function makeAbort(timeoutMs, externalSignal) {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
-  if (externalSignal) {
-    if (externalSignal.aborted) {
+  const onAbort = () => {
+    clearTimeout(timer);
+    controller.abort();
+  };
+  if (externalSignal?.aborted) onAbort();
+  else externalSignal?.addEventListener("abort", onAbort, { once: true });
+  return {
+    controller,
+    stopTimer: () => clearTimeout(timer),
+    detach: () => {
       clearTimeout(timer);
-      controller.abort();
-    } else {
-      externalSignal.addEventListener(
-        "abort",
-        () => {
-          clearTimeout(timer);
-          controller.abort();
-        },
-        { once: true }
-      );
+      externalSignal?.removeEventListener("abort", onAbort);
     }
-  }
-  return { controller, timer };
+  };
 }
 function logHeaders(verbose, dir, entries) {
   for (const [k, v] of entries) {
@@ -8207,7 +8205,7 @@ async function createStatelessConnection(options) {
       verbose.request(method, body);
       logHeaders(verbose, ">", Object.entries(headers));
     }
-    const { controller, timer } = makeAbort(timeoutMs, externalSignal);
+    const { controller, stopTimer, detach } = makeAbort(timeoutMs, externalSignal);
     try {
       const res = await fetchImpl(url, {
         method: "POST",
@@ -8219,14 +8217,15 @@ async function createStatelessConnection(options) {
         verbose.http("<", `HTTP/1.1 ${res.status} ${res.statusText}`);
         logHeaders(verbose, "<", res.headers.entries());
       }
-      return { res, token };
+      return { res, token, detach };
     } catch (err) {
+      detach();
       if (controller.signal.aborted && !externalSignal?.aborted) {
         throw new McpTimeoutError2(method, timeoutMs);
       }
       throw err;
     } finally {
-      clearTimeout(timer);
+      stopTimer();
     }
   }
   async function parseResponse(res, id) {
@@ -8275,19 +8274,22 @@ async function createStatelessConnection(options) {
       params: { ...cleanParams, _meta: meta }
     });
     for (let attempt = 0; attempt < 2; attempt++) {
-      const { res, token } = await doFetch(method, params, body);
-      if (res.status >= 400) {
-        try {
-          await handleErrorStatus(res, method);
-        } catch (err) {
-          if (err instanceof AuthRetryableError && attempt === 0) {
-            await handleAuthError(err, token);
-            continue;
+      const { res, token, detach } = await doFetch(method, params, body);
+      let retry;
+      try {
+        if (res.status >= 400) {
+          try {
+            await handleErrorStatus(res, method);
+          } catch (err) {
+            if (!(err instanceof AuthRetryableError && attempt === 0)) throw err;
+            retry = err;
           }
-          throw err;
         }
+        if (!retry) return await parseResponse(res, id);
+      } finally {
+        detach();
       }
-      return parseResponse(res, id);
+      await handleAuthError(retry, token);
     }
     throw new McpAuthError(401, url);
   }
@@ -8479,6 +8481,19 @@ function createStdioJsonRpc(proc, platform2, options) {
       writer.releaseLock();
     }
   }
+  function raceDeadline(linePromise, method, remaining) {
+    let timer;
+    let onAbort;
+    const stop = new Promise((_, reject) => {
+      timer = setTimeout(() => reject(new McpTimeoutError2(method, timeoutMs)), remaining);
+      onAbort = () => reject(new McpTimeoutError2(method, timeoutMs));
+      externalSignal?.addEventListener("abort", onAbort, { once: true });
+    });
+    return Promise.race([linePromise, stop]).finally(() => {
+      clearTimeout(timer);
+      if (onAbort) externalSignal?.removeEventListener("abort", onAbort);
+    });
+  }
   async function request(method, params) {
     const id = nextId2++;
     const meta = {
@@ -8502,11 +8517,7 @@ function createStdioJsonRpc(proc, platform2, options) {
     while (Date.now() < deadline) {
       const remaining = deadline - Date.now();
       if (externalSignal?.aborted) throw new McpTimeoutError2(method, timeoutMs);
-      const linePromise = readLine2();
-      const timeoutPromise = new Promise(
-        (_, reject) => setTimeout(() => reject(new McpTimeoutError2(method, timeoutMs)), remaining)
-      );
-      const line = await Promise.race([linePromise, timeoutPromise]);
+      const line = await raceDeadline(readLine2(), method, remaining);
       const parsed = JSON.parse(line);
       if (verbose?.enabled) verbose.response(line);
       if (parsed.id === id) {
@@ -8739,6 +8750,9 @@ var CONTROL_RE = /[\u0000-\u0008\u000b-\u001f\u007f-\u009f]/g;
 function sanitizeTerminal(text) {
   return text.replace(CONTROL_RE, (c) => `\\x${c.charCodeAt(0).toString(16).padStart(2, "0")}`);
 }
+function sanitizeJson(json) {
+  return json.replace(CONTROL_RE, (c) => `\\u${c.charCodeAt(0).toString(16).padStart(4, "0")}`);
+}
 
 // src/client/elicit.ts
 function readLine(platform2) {
@@ -10639,8 +10653,8 @@ async function runFromDiscovery(platform2, args) {
   }
   const result = parseEvents(text);
   if ("error" in result) {
-    await platform2.write(2, `mcpcat add --from-discovery: ${result.error}
-`);
+    await platform2.write(2, sanitizeTerminal(`mcpcat add --from-discovery: ${result.error}
+`));
     return result.code;
   }
   resetIdCounter();
@@ -10700,8 +10714,8 @@ async function runAddCandidate(platform2, name, candidateId2, configFile) {
   const { replaced } = await addServer(platform2.fs, path, name, config);
   for (const t of candidate.trust) {
     if (t.type.includes("mismatch")) {
-      await platform2.write(2, `mcpcat add: warning: ${t.type}: ${t.detail}
-`);
+      await platform2.write(2, sanitizeTerminal(`mcpcat add: warning: ${t.type}: ${t.detail}
+`));
     }
   }
   await platform2.write(1, `${replaced ? "replaced" : "added"} ${name} in ${path}
@@ -13842,7 +13856,7 @@ async function jerkLogin(platform2, target, resolved, args) {
     return 0;
   }
   if (errText.trim()) {
-    await platform2.write(2, errText);
+    await platform2.write(2, sanitizeTerminal(errText));
   }
   if (result.status === JERK_EXIT_SIGN_IN) return 4;
   return result.status;
@@ -16153,14 +16167,14 @@ async function handleInputRequired(platform2, conn, err, respondData, json) {
   const parsed2 = JSON.parse(err.requestJson);
   const inputReq = parseInputRequest(parsed2.result ?? parsed2);
   if (!inputReq) {
-    await platform2.write(2, `${err.requestJson}
+    await platform2.write(2, `${sanitizeJson(err.requestJson)}
 `);
     return EXIT_INPUT_REQUIRED;
   }
   const isTty = platform2.kind === "host" && platform2.isatty(0) && platform2.isatty(2);
   const elicitResult = await handleElicitation(platform2, inputReq, isTty, respondData);
   if ("exitCode" in elicitResult) {
-    await platform2.write(2, `${err.requestJson}
+    await platform2.write(2, `${sanitizeJson(err.requestJson)}
 `);
     return EXIT_INPUT_REQUIRED;
   }
@@ -16733,7 +16747,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.17.3", args);
+  return run(platform2, "0.17.5", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.17.3",
+  "version": "0.17.5",
   "description": "A curl for the Model Context Protocol",
   "type": "module",
   "license": "Apache-2.0",
@@ -61,15 +61,15 @@
     "trust:dry": "npx fledgling sync --dry-run -y --skip-publish"
   },
   "devDependencies": {
-    "@ai-ecoverse/slicc-bios": "1.33.1",
-    "@ai-ecoverse/slicc-kernel": "1.135.7",
+    "@ai-ecoverse/slicc-bios": "1.35.0",
+    "@ai-ecoverse/slicc-kernel": "1.141.2",
     "@ai-ecoverse/slicc-shared-web": "1.29.2",
     "@biomejs/biome": "2.5.15",
     "@earendil-works/pi-codemode": "1.2.0",
     "@earendil-works/pi-mcp": "1.2.0",
     "@types/node": "26.6.5",
     "esbuild": "0.28.2",
-    "kernel-cert-new": "npm:@ai-ecoverse/slicc-kernel@1.135.7",
+    "kernel-cert-new": "npm:@ai-ecoverse/slicc-kernel@1.141.2",
     "lefthook": "2.2.2",
     "monocart-coverage-reports": "2.13.2",
     "proper-lockfile": "4.1.2",