@ai-ecoverse/mcpcat 0.31.10 → 0.31.11

package/dist/host/mcpcat.mjs

@@ -10007,6 +10007,67 @@ function configToTarget(entry) {
   throw new Error("config entry has neither url nor command");
 }
 
+// src/render/redact.ts
+var ENCODING_DEPTH = 3;
+var NON_ASCII = /[\u007f-\uffff]/g;
+function jsonForms(text) {
+  const json = JSON.stringify(text).slice(1, -1);
+  const ascii = json.replace(
+    NON_ASCII,
+    (c) => `\\u${c.charCodeAt(0).toString(16).padStart(4, "0")}`
+  );
+  return [json, sanitizeJson(json), ascii].flatMap((form) => [form, form.replaceAll("/", "\\/")]);
+}
+function encodedForms(secret) {
+  const forms = /* @__PURE__ */ new Set([secret, sanitizeTerminal(secret)]);
+  let level = [secret];
+  for (let depth = 0; depth < ENCODING_DEPTH; depth++) {
+    level = [...new Set(level.flatMap(jsonForms))];
+    for (const form of level) forms.add(form);
+  }
+  return [...forms];
+}
+function redactDeep(value, redact2) {
+  if (typeof value === "string") return redact2(value);
+  if (Array.isArray(value)) return value.map((v) => redactDeep(v, redact2));
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).map(([k, v]) => [redact2(k), redactDeep(v, redact2)])
+    );
+  }
+  return value;
+}
+function redactWrites(platform2, redact2) {
+  return Object.assign(Object.create(platform2), {
+    write: (fd, data) => platform2.write(fd, typeof data === "string" ? redact2(data) : data)
+  });
+}
+function secretMasker(secrets, mask) {
+  const ordered = [...new Set(secrets)].filter((s) => s.length > 0).flatMap(encodedForms);
+  if (ordered.length === 0) return (text) => text;
+  return (text) => {
+    const hidden = new Uint8Array(text.length);
+    for (const secret of ordered) {
+      for (let at = text.indexOf(secret); at >= 0; at = text.indexOf(secret, at + 1)) {
+        hidden.fill(1, at, at + secret.length);
+      }
+    }
+    let out = "";
+    let start = 0;
+    while (start < text.length) {
+      let end = start;
+      const masked = hidden[start] === 1;
+      while (end < text.length && hidden[end] === 1 === masked) end++;
+      out += masked ? mask : text.slice(start, end);
+      start = end;
+    }
+    return out;
+  };
+}
+function redactSecrets(text, secrets) {
+  return secretMasker(secrets, "[REDACTED]")(text);
+}
+
 // src/codemode/search.ts
 var STOP_WORDS = /* @__PURE__ */ new Set([
   "a",
@@ -10087,7 +10148,7 @@ function toolDeclaration(tool) {
     outputSchema: outputSchema ?? { type: "string" }
   };
 }
-async function runDescribeTs(platform2, targets, budget) {
+async function runDescribeTs(platform2, targets, budget, redact2 = (text) => text) {
   const { renderDeclarations: renderDeclarations2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports2));
   const allTools = [];
   for (const target of targets) {
@@ -10105,7 +10166,7 @@ async function runDescribeTs(platform2, targets, budget) {
     return 0;
   }
   const output = renderDeclarations2({
-    tools: allTools
+    tools: redactDeep(allTools, redact2)
   });
   await platform2.write(1, `${output}
 `);
@@ -10400,7 +10461,8 @@ async function runCode(targets, source, options) {
         await saveStore(platform2, stateDir2, store, writes);
       }
     }
-    return await formatOutput(platform2, result, json);
+    const shown = options.redact ? redactDeep(result, options.redact) : result;
+    return await formatOutput(platform2, shown, json);
   } finally {
     await sandbox.close();
   }
@@ -12003,48 +12065,6 @@ async function runDiscover(platform2, args2) {
   return 0;
 }
 
-// src/render/redact.ts
-function redactDeep(value, redact2) {
-  if (typeof value === "string") return redact2(value);
-  if (Array.isArray(value)) return value.map((v) => redactDeep(v, redact2));
-  if (value && typeof value === "object") {
-    return Object.fromEntries(
-      Object.entries(value).map(([k, v]) => [redact2(k), redactDeep(v, redact2)])
-    );
-  }
-  return value;
-}
-function redactWrites(platform2, redact2) {
-  return Object.assign(Object.create(platform2), {
-    write: (fd, data) => platform2.write(fd, typeof data === "string" ? redact2(data) : data)
-  });
-}
-function secretMasker(secrets, mask) {
-  const ordered = [...new Set(secrets)].filter((s) => s.length > 0);
-  if (ordered.length === 0) return (text) => text;
-  return (text) => {
-    const hidden = new Uint8Array(text.length);
-    for (const secret of ordered) {
-      for (let at = text.indexOf(secret); at >= 0; at = text.indexOf(secret, at + 1)) {
-        hidden.fill(1, at, at + secret.length);
-      }
-    }
-    let out = "";
-    let start = 0;
-    while (start < text.length) {
-      let end = start;
-      const masked = hidden[start] === 1;
-      while (end < text.length && hidden[end] === 1 === masked) end++;
-      out += masked ? mask : text.slice(start, end);
-      start = end;
-    }
-    return out;
-  };
-}
-function redactSecrets(text, secrets) {
-  return secretMasker(secrets, "[REDACTED]")(text);
-}
-
 // src/render/result.ts
 function formatBytes(n) {
   if (n < 1024) return `${n} bytes`;
@@ -20704,12 +20724,9 @@ async function dispatchServeVerb(platform2, args2, version, features) {
   }
   return runServe(platform2, serveOptions, version);
 }
-async function connectTargets(platform2, names, config, parsed, version) {
+async function connectTargets(platform2, names, config, parsed, version, hidden, redact2) {
   const conns = [];
   const targets = [];
-  const warn = (msg) => void platform2.write(2, `mcpcat: warning: ${msg}
-`).catch(() => {
-  });
   for (const name of names) {
     let resolved;
     try {
@@ -20721,9 +20738,11 @@ async function connectTargets(platform2, names, config, parsed, version) {
     }
     try {
       const merged = { ...resolved.headers, ...parsed.headers };
+      const { headers, secrets } = expandConfigHeaders(platform2, merged);
+      for (const s of secrets) hidden.add(s);
       const conn = await connect(platform2, {
         ...resolved,
-        headers: isKernel(platform2) ? expandHeaders(merged, platform2.env, warn) : merged,
+        headers,
         authProvider: await placeholderAuthProvider({
           platform: platform2,
           name: config.entry(name) ? name : void 0,
@@ -20732,16 +20751,19 @@ async function connectTargets(platform2, names, config, parsed, version) {
           timeoutMs: parsed.timeoutMs
         }),
         protocolVersion: parsed.protocolVersion,
-        version
+        version,
+        redact: redact2
       });
       conns.push(conn);
       const info = await conn.info();
       targets.push({ name, conn, instructions: info.instructions });
     } catch (err) {
-      await platform2.write(
-        2,
-        sanitizeTerminal(`mcpcat: connection to ${name} failed: ${err.message}
-`)
+      await writeErrRedacted(
+        platform2,
+        false,
+        "connection",
+        `connection to ${name} failed: ${err.message}`,
+        redact2
       );
     }
   }
@@ -20764,10 +20786,19 @@ async function resolveTargetNames(platform2, parsed) {
   const positionalExtra = parsed.toolName;
   if (positionalExtra && parsed.verb !== "call") targets.push(positionalExtra);
   if (targets.length > 0) return targets;
-  const config = await MergedConfigSource.load(platform2);
+  return enabledNames(await MergedConfigSource.load(platform2));
+}
+function enabledNames(config) {
   return config.list().filter((e) => e.config.enabled !== false).map((e) => e.name);
 }
 async function dispatchMultiTarget(platform2, parsed, version) {
+  const { secrets, unset } = expandAndCollect(parsed.headers, platform2.env, parsed.extra);
+  if (unset.length > 0 && !isKernel(platform2)) return refuseUnsetHeaders(platform2, unset);
+  const hidden = new Set(secrets);
+  const redact2 = (text) => redactSecrets(text, hidden);
+  return runMultiTarget(redactWrites(platform2, redact2), parsed, version, hidden, redact2);
+}
+async function runMultiTarget(platform2, parsed, version, hidden, redact2) {
   let activeCleanup;
   async function killTreeAndExit(exitCode) {
     if (activeCleanup) {
@@ -20806,18 +20837,15 @@ async function dispatchMultiTarget(platform2, parsed, version) {
       await platform2.write(2, "mcpcat: code requires -e <source> or a file\n");
       return 2;
     }
-    let serverNames;
-    if (parsed.serverTargets.length > 0) {
-      serverNames = parsed.serverTargets;
-    } else {
-      serverNames = config.list().filter((e) => e.config.enabled !== false).map((e) => e.name);
-    }
+    const serverNames = parsed.serverTargets.length > 0 ? parsed.serverTargets : enabledNames(config);
     const { targets, cleanup } = await connectTargets(
       platform2,
       serverNames,
       config,
       parsed,
-      version
+      version,
+      hidden,
+      redact2
     );
     activeCleanup = cleanup;
     try {
@@ -20826,7 +20854,8 @@ async function dispatchMultiTarget(platform2, parsed, version) {
         timeoutMs: parsed.timeoutMs,
         memoryLimitMiB: parsed.memoryLimitMiB,
         allowShell: parsed.allowShell,
-        platform: platform2
+        platform: platform2,
+        redact: redact2
       });
     } catch (err) {
       await platform2.write(2, `mcpcat: ${err.message}
@@ -20844,13 +20873,15 @@ async function dispatchMultiTarget(platform2, parsed, version) {
       await platform2.write(2, "mcpcat: grep requires a pattern\n");
       return 2;
     }
-    const serverNames = parsed.toolName ? [parsed.toolName] : config.list().filter((e) => e.config.enabled !== false).map((e) => e.name);
+    const serverNames = parsed.toolName ? [parsed.toolName] : enabledNames(config);
     const { targets, cleanup } = await connectTargets(
       platform2,
       serverNames,
       config,
       parsed,
-      version
+      version,
+      hidden,
+      redact2
     );
     activeCleanup = cleanup;
     try {
@@ -20858,6 +20889,8 @@ async function dispatchMultiTarget(platform2, parsed, version) {
         rank: parsed.rank,
         extended: parsed.extendedRegex
       });
+    } catch (err) {
+      return await reportError(platform2, parsed.jsonOutput, err, redact2);
     } finally {
       await cleanup();
       await killAllStdio().catch(() => {
@@ -20871,11 +20904,15 @@ async function dispatchMultiTarget(platform2, parsed, version) {
       serverNames,
       config,
       parsed,
-      version
+      version,
+      hidden,
+      redact2
     );
     activeCleanup = cleanup;
     try {
-      return await runDescribeTs(platform2, targets, parsed.tsBudget);
+      return await runDescribeTs(platform2, targets, parsed.tsBudget, redact2);
+    } catch (err) {
+      return await reportError(platform2, parsed.jsonOutput, err, redact2);
     } finally {
       await cleanup();
       await killAllStdio().catch(() => {
@@ -21312,14 +21349,7 @@ async function handleInputRequired(platform2, conn, err, respondData, json, reda
 }
 async function runClientVerb(platform2, version, parsed) {
   const { expanded, secrets, unset } = expandAndCollect(parsed.headers, platform2.env, parsed.extra);
-  if (unset.length > 0) {
-    await platform2.write(
-      2,
-      `mcpcat: unset variable${unset.length > 1 ? "s" : ""} in -H: ${unset.join(", ")}
-`
-    );
-    return EXIT_USAGE;
-  }
+  if (unset.length > 0) return refuseUnsetHeaders(platform2, unset);
   const verbose = createVerboseLogger(platform2, parsed.verbose);
   for (const s of secrets) verbose.secrets.add(s);
   const timeoutMs = parsed.timeoutMs;
@@ -21371,12 +21401,10 @@ async function runClientVerb(platform2, version, parsed) {
     await writeErr(platform2, parsed.jsonOutput, "usage", err.message);
     return EXIT_USAGE;
   }
-  const configHeaders = expandHeaders(resolved.headers, platform2.env, (msg) => {
-    platform2.write(2, `mcpcat: warning: ${msg}
-`).catch(() => {
-    });
-  });
-  const configSecrets = collectConfigSecrets(resolved.headers, platform2.env);
+  const { headers: configHeaders, secrets: configSecrets } = expandConfigHeaders(
+    platform2,
+    resolved.headers
+  );
   for (const s of configSecrets) verbose.secrets.add(s);
   const allSecrets = /* @__PURE__ */ new Set([...secrets, ...configSecrets]);
   const redact2 = (text) => redactSecrets(text, allSecrets);
@@ -21476,9 +21504,7 @@ async function runClientVerb(platform2, version, parsed) {
 `);
       return EXIT_INPUT_REQUIRED;
     }
-    const e = classifyError(err);
-    await writeErrRedacted(platform2, parsed.jsonOutput, e.kind, e.msg, redact2);
-    return e.code;
+    return await reportError(platform2, parsed.jsonOutput, err, redact2);
   } finally {
     await closeAndKillStdio(conn);
   }
@@ -21505,6 +21531,28 @@ async function writeErrRedacted(p, json, kind, msg, redact2) {
   else await p.write(2, sanitizeTerminal(`mcpcat: ${redact2(msg)}
 `));
 }
+async function reportError(platform2, json, err, redact2) {
+  const e = classifyError(err);
+  await writeErrRedacted(platform2, json, e.kind, e.msg, redact2);
+  return e.code;
+}
+async function refuseUnsetHeaders(platform2, unset) {
+  await platform2.write(
+    2,
+    `mcpcat: unset variable${unset.length > 1 ? "s" : ""} in -H: ${unset.join(", ")}
+`
+  );
+  return EXIT_USAGE;
+}
+function expandConfigHeaders(platform2, headers) {
+  const warn = (msg) => void platform2.write(2, `mcpcat: warning: ${msg}
+`).catch(() => {
+  });
+  return {
+    headers: expandHeaders(headers, platform2.env, warn),
+    secrets: collectConfigSecrets(headers, platform2.env)
+  };
+}
 function collectConfigSecrets(headers, env) {
   if (!headers) return [];
   const secrets = [];
@@ -22168,5 +22216,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.31.10", args);
+var code = await run(platform, "0.31.11", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -9628,6 +9628,67 @@ function configToTarget(entry) {
   throw new Error("config entry has neither url nor command");
 }
 
+// src/render/redact.ts
+var ENCODING_DEPTH = 3;
+var NON_ASCII = /[\u007f-\uffff]/g;
+function jsonForms(text) {
+  const json = JSON.stringify(text).slice(1, -1);
+  const ascii = json.replace(
+    NON_ASCII,
+    (c) => `\\u${c.charCodeAt(0).toString(16).padStart(4, "0")}`
+  );
+  return [json, sanitizeJson(json), ascii].flatMap((form) => [form, form.replaceAll("/", "\\/")]);
+}
+function encodedForms(secret) {
+  const forms = /* @__PURE__ */ new Set([secret, sanitizeTerminal(secret)]);
+  let level = [secret];
+  for (let depth = 0; depth < ENCODING_DEPTH; depth++) {
+    level = [...new Set(level.flatMap(jsonForms))];
+    for (const form of level) forms.add(form);
+  }
+  return [...forms];
+}
+function redactDeep(value, redact2) {
+  if (typeof value === "string") return redact2(value);
+  if (Array.isArray(value)) return value.map((v) => redactDeep(v, redact2));
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).map(([k, v]) => [redact2(k), redactDeep(v, redact2)])
+    );
+  }
+  return value;
+}
+function redactWrites(platform2, redact2) {
+  return Object.assign(Object.create(platform2), {
+    write: (fd, data) => platform2.write(fd, typeof data === "string" ? redact2(data) : data)
+  });
+}
+function secretMasker(secrets, mask) {
+  const ordered = [...new Set(secrets)].filter((s) => s.length > 0).flatMap(encodedForms);
+  if (ordered.length === 0) return (text) => text;
+  return (text) => {
+    const hidden = new Uint8Array(text.length);
+    for (const secret of ordered) {
+      for (let at = text.indexOf(secret); at >= 0; at = text.indexOf(secret, at + 1)) {
+        hidden.fill(1, at, at + secret.length);
+      }
+    }
+    let out = "";
+    let start = 0;
+    while (start < text.length) {
+      let end = start;
+      const masked = hidden[start] === 1;
+      while (end < text.length && hidden[end] === 1 === masked) end++;
+      out += masked ? mask : text.slice(start, end);
+      start = end;
+    }
+    return out;
+  };
+}
+function redactSecrets(text, secrets) {
+  return secretMasker(secrets, "[REDACTED]")(text);
+}
+
 // src/codemode/search.ts
 var STOP_WORDS = /* @__PURE__ */ new Set([
   "a",
@@ -9708,7 +9769,7 @@ function toolDeclaration(tool) {
     outputSchema: outputSchema ?? { type: "string" }
   };
 }
-async function runDescribeTs(platform2, targets, budget) {
+async function runDescribeTs(platform2, targets, budget, redact2 = (text) => text) {
   const { renderDeclarations: renderDeclarations2 } = await Promise.resolve().then(() => (init_dist2(), dist_exports2));
   const allTools = [];
   for (const target of targets) {
@@ -9726,7 +9787,7 @@ async function runDescribeTs(platform2, targets, budget) {
     return 0;
   }
   const output = renderDeclarations2({
-    tools: allTools
+    tools: redactDeep(allTools, redact2)
   });
   await platform2.write(1, `${output}
 `);
@@ -10021,7 +10082,8 @@ async function runCode(targets, source, options) {
         await saveStore(platform2, stateDir2, store, writes);
       }
     }
-    return await formatOutput(platform2, result, json);
+    const shown = options.redact ? redactDeep(result, options.redact) : result;
+    return await formatOutput(platform2, shown, json);
   } finally {
     await sandbox.close();
   }
@@ -11624,48 +11686,6 @@ async function runDiscover(platform2, args) {
   return 0;
 }
 
-// src/render/redact.ts
-function redactDeep(value, redact2) {
-  if (typeof value === "string") return redact2(value);
-  if (Array.isArray(value)) return value.map((v) => redactDeep(v, redact2));
-  if (value && typeof value === "object") {
-    return Object.fromEntries(
-      Object.entries(value).map(([k, v]) => [redact2(k), redactDeep(v, redact2)])
-    );
-  }
-  return value;
-}
-function redactWrites(platform2, redact2) {
-  return Object.assign(Object.create(platform2), {
-    write: (fd, data) => platform2.write(fd, typeof data === "string" ? redact2(data) : data)
-  });
-}
-function secretMasker(secrets, mask) {
-  const ordered = [...new Set(secrets)].filter((s) => s.length > 0);
-  if (ordered.length === 0) return (text) => text;
-  return (text) => {
-    const hidden = new Uint8Array(text.length);
-    for (const secret of ordered) {
-      for (let at = text.indexOf(secret); at >= 0; at = text.indexOf(secret, at + 1)) {
-        hidden.fill(1, at, at + secret.length);
-      }
-    }
-    let out = "";
-    let start = 0;
-    while (start < text.length) {
-      let end = start;
-      const masked = hidden[start] === 1;
-      while (end < text.length && hidden[end] === 1 === masked) end++;
-      out += masked ? mask : text.slice(start, end);
-      start = end;
-    }
-    return out;
-  };
-}
-function redactSecrets(text, secrets) {
-  return secretMasker(secrets, "[REDACTED]")(text);
-}
-
 // src/render/result.ts
 function formatBytes(n) {
   if (n < 1024) return `${n} bytes`;
@@ -20221,12 +20241,9 @@ async function dispatchServeVerb(platform2, args, version, features) {
   }
   return runServe(platform2, serveOptions, version);
 }
-async function connectTargets(platform2, names, config, parsed, version) {
+async function connectTargets(platform2, names, config, parsed, version, hidden, redact2) {
   const conns = [];
   const targets = [];
-  const warn = (msg) => void platform2.write(2, `mcpcat: warning: ${msg}
-`).catch(() => {
-  });
   for (const name of names) {
     let resolved;
     try {
@@ -20238,9 +20255,11 @@ async function connectTargets(platform2, names, config, parsed, version) {
     }
     try {
       const merged = { ...resolved.headers, ...parsed.headers };
+      const { headers, secrets } = expandConfigHeaders(platform2, merged);
+      for (const s of secrets) hidden.add(s);
       const conn = await connect(platform2, {
         ...resolved,
-        headers: isKernel(platform2) ? expandHeaders(merged, platform2.env, warn) : merged,
+        headers,
         authProvider: await placeholderAuthProvider({
           platform: platform2,
           name: config.entry(name) ? name : void 0,
@@ -20249,16 +20268,19 @@ async function connectTargets(platform2, names, config, parsed, version) {
           timeoutMs: parsed.timeoutMs
         }),
         protocolVersion: parsed.protocolVersion,
-        version
+        version,
+        redact: redact2
       });
       conns.push(conn);
       const info = await conn.info();
       targets.push({ name, conn, instructions: info.instructions });
     } catch (err) {
-      await platform2.write(
-        2,
-        sanitizeTerminal(`mcpcat: connection to ${name} failed: ${err.message}
-`)
+      await writeErrRedacted(
+        platform2,
+        false,
+        "connection",
+        `connection to ${name} failed: ${err.message}`,
+        redact2
       );
     }
   }
@@ -20281,10 +20303,19 @@ async function resolveTargetNames(platform2, parsed) {
   const positionalExtra = parsed.toolName;
   if (positionalExtra && parsed.verb !== "call") targets.push(positionalExtra);
   if (targets.length > 0) return targets;
-  const config = await MergedConfigSource.load(platform2);
+  return enabledNames(await MergedConfigSource.load(platform2));
+}
+function enabledNames(config) {
   return config.list().filter((e) => e.config.enabled !== false).map((e) => e.name);
 }
 async function dispatchMultiTarget(platform2, parsed, version) {
+  const { secrets, unset } = expandAndCollect(parsed.headers, platform2.env, parsed.extra);
+  if (unset.length > 0 && !isKernel(platform2)) return refuseUnsetHeaders(platform2, unset);
+  const hidden = new Set(secrets);
+  const redact2 = (text) => redactSecrets(text, hidden);
+  return runMultiTarget(redactWrites(platform2, redact2), parsed, version, hidden, redact2);
+}
+async function runMultiTarget(platform2, parsed, version, hidden, redact2) {
   let activeCleanup;
   async function killTreeAndExit(exitCode) {
     if (activeCleanup) {
@@ -20323,18 +20354,15 @@ async function dispatchMultiTarget(platform2, parsed, version) {
       await platform2.write(2, "mcpcat: code requires -e <source> or a file\n");
       return 2;
     }
-    let serverNames;
-    if (parsed.serverTargets.length > 0) {
-      serverNames = parsed.serverTargets;
-    } else {
-      serverNames = config.list().filter((e) => e.config.enabled !== false).map((e) => e.name);
-    }
+    const serverNames = parsed.serverTargets.length > 0 ? parsed.serverTargets : enabledNames(config);
     const { targets, cleanup } = await connectTargets(
       platform2,
       serverNames,
       config,
       parsed,
-      version
+      version,
+      hidden,
+      redact2
     );
     activeCleanup = cleanup;
     try {
@@ -20343,7 +20371,8 @@ async function dispatchMultiTarget(platform2, parsed, version) {
         timeoutMs: parsed.timeoutMs,
         memoryLimitMiB: parsed.memoryLimitMiB,
         allowShell: parsed.allowShell,
-        platform: platform2
+        platform: platform2,
+        redact: redact2
       });
     } catch (err) {
       await platform2.write(2, `mcpcat: ${err.message}
@@ -20361,13 +20390,15 @@ async function dispatchMultiTarget(platform2, parsed, version) {
       await platform2.write(2, "mcpcat: grep requires a pattern\n");
       return 2;
     }
-    const serverNames = parsed.toolName ? [parsed.toolName] : config.list().filter((e) => e.config.enabled !== false).map((e) => e.name);
+    const serverNames = parsed.toolName ? [parsed.toolName] : enabledNames(config);
     const { targets, cleanup } = await connectTargets(
       platform2,
       serverNames,
       config,
       parsed,
-      version
+      version,
+      hidden,
+      redact2
     );
     activeCleanup = cleanup;
     try {
@@ -20375,6 +20406,8 @@ async function dispatchMultiTarget(platform2, parsed, version) {
         rank: parsed.rank,
         extended: parsed.extendedRegex
       });
+    } catch (err) {
+      return await reportError(platform2, parsed.jsonOutput, err, redact2);
     } finally {
       await cleanup();
       await killAllStdio().catch(() => {
@@ -20388,11 +20421,15 @@ async function dispatchMultiTarget(platform2, parsed, version) {
       serverNames,
       config,
       parsed,
-      version
+      version,
+      hidden,
+      redact2
     );
     activeCleanup = cleanup;
     try {
-      return await runDescribeTs(platform2, targets, parsed.tsBudget);
+      return await runDescribeTs(platform2, targets, parsed.tsBudget, redact2);
+    } catch (err) {
+      return await reportError(platform2, parsed.jsonOutput, err, redact2);
     } finally {
       await cleanup();
       await killAllStdio().catch(() => {
@@ -20829,14 +20866,7 @@ async function handleInputRequired(platform2, conn, err, respondData, json, reda
 }
 async function runClientVerb(platform2, version, parsed) {
   const { expanded, secrets, unset } = expandAndCollect(parsed.headers, platform2.env, parsed.extra);
-  if (unset.length > 0) {
-    await platform2.write(
-      2,
-      `mcpcat: unset variable${unset.length > 1 ? "s" : ""} in -H: ${unset.join(", ")}
-`
-    );
-    return EXIT_USAGE;
-  }
+  if (unset.length > 0) return refuseUnsetHeaders(platform2, unset);
   const verbose = createVerboseLogger(platform2, parsed.verbose);
   for (const s of secrets) verbose.secrets.add(s);
   const timeoutMs = parsed.timeoutMs;
@@ -20888,12 +20918,10 @@ async function runClientVerb(platform2, version, parsed) {
     await writeErr(platform2, parsed.jsonOutput, "usage", err.message);
     return EXIT_USAGE;
   }
-  const configHeaders = expandHeaders(resolved.headers, platform2.env, (msg) => {
-    platform2.write(2, `mcpcat: warning: ${msg}
-`).catch(() => {
-    });
-  });
-  const configSecrets = collectConfigSecrets(resolved.headers, platform2.env);
+  const { headers: configHeaders, secrets: configSecrets } = expandConfigHeaders(
+    platform2,
+    resolved.headers
+  );
   for (const s of configSecrets) verbose.secrets.add(s);
   const allSecrets = /* @__PURE__ */ new Set([...secrets, ...configSecrets]);
   const redact2 = (text) => redactSecrets(text, allSecrets);
@@ -20993,9 +21021,7 @@ async function runClientVerb(platform2, version, parsed) {
 `);
       return EXIT_INPUT_REQUIRED;
     }
-    const e = classifyError(err);
-    await writeErrRedacted(platform2, parsed.jsonOutput, e.kind, e.msg, redact2);
-    return e.code;
+    return await reportError(platform2, parsed.jsonOutput, err, redact2);
   } finally {
     await closeAndKillStdio(conn);
   }
@@ -21022,6 +21048,28 @@ async function writeErrRedacted(p, json, kind, msg, redact2) {
   else await p.write(2, sanitizeTerminal(`mcpcat: ${redact2(msg)}
 `));
 }
+async function reportError(platform2, json, err, redact2) {
+  const e = classifyError(err);
+  await writeErrRedacted(platform2, json, e.kind, e.msg, redact2);
+  return e.code;
+}
+async function refuseUnsetHeaders(platform2, unset) {
+  await platform2.write(
+    2,
+    `mcpcat: unset variable${unset.length > 1 ? "s" : ""} in -H: ${unset.join(", ")}
+`
+  );
+  return EXIT_USAGE;
+}
+function expandConfigHeaders(platform2, headers) {
+  const warn = (msg) => void platform2.write(2, `mcpcat: warning: ${msg}
+`).catch(() => {
+  });
+  return {
+    headers: expandHeaders(headers, platform2.env, warn),
+    secrets: collectConfigSecrets(headers, platform2.env)
+  };
+}
 function collectConfigSecrets(headers, env2) {
   if (!headers) return [];
   const secrets = [];
@@ -21521,7 +21569,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.31.10", args);
+  return run(platform2, "0.31.11", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.31.10",
+  "version": "0.31.11",
   "description": "A curl for the Model Context Protocol",
   "type": "module",
   "license": "Apache-2.0",