@ai-ecoverse/mcpcat 0.17.7 → 0.17.9

package/dist/host/mcpcat.mjs

@@ -11172,11 +11172,30 @@ function redactWrites(platform2, redact2) {
     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) {
-  const ordered = [...secrets].filter((s) => s.length > 0).sort((a, b) => b.length - a.length);
-  let result = text;
-  for (const secret of ordered) result = result.replaceAll(secret, "[REDACTED]");
-  return result;
+  return secretMasker(secrets, "[REDACTED]")(text);
 }
 
 // src/render/result.ts
@@ -12153,27 +12172,18 @@ function rpcError2(id, code2, message) {
     body: JSON.stringify({ jsonrpc: "2.0", id, error: { code: code2, message } })
   };
 }
-function scrubValue(value, secrets) {
-  if (typeof value === "string") return scrubString(value, secrets);
-  if (Array.isArray(value)) return value.map((v) => scrubValue(v, secrets));
+function scrubValue(value, scrub) {
+  if (typeof value === "string") return scrub(value);
+  if (Array.isArray(value)) return value.map((v) => scrubValue(v, scrub));
   if (value && typeof value === "object") {
     const out = {};
     for (const [k, v] of Object.entries(value)) {
-      out[k] = scrubValue(v, secrets);
+      out[k] = scrubValue(v, scrub);
     }
     return out;
   }
   return value;
 }
-function scrubString(s, secrets) {
-  let result = s;
-  for (const h of secrets) {
-    if (result.includes(h)) {
-      result = result.replaceAll(h, "***");
-    }
-  }
-  return result;
-}
 function translateCapabilities(info) {
   const caps = {};
   if (info.capabilities.tools) caps.tools = { listChanged: false };
@@ -12197,7 +12207,7 @@ function createProxyHandler(options) {
   let conn = null;
   let cachedInfo = null;
   let connecting = null;
-  const secrets = options.hiddenHeaders;
+  const scrub = secretMasker(options.hiddenHeaders, "***");
   async function doConnect() {
     const c = await connect(options.platform, options.connectOpts);
     cachedInfo = await c.info();
@@ -12226,10 +12236,10 @@ function createProxyHandler(options) {
     return getConnection();
   }
   function scrubOk(id, result) {
-    return rpcOk2(id, scrubValue(result, secrets));
+    return rpcOk2(id, scrubValue(result, scrub));
   }
   function scrubErr(id, code2, message) {
-    return rpcError2(id, code2, scrubString(message, secrets));
+    return rpcError2(id, code2, scrub(message));
   }
   function handleInitialize(id, params) {
     const requested = params && typeof params === "object" ? Object.getOwnPropertyDescriptor(params, "protocolVersion")?.value : void 0;
@@ -13276,9 +13286,17 @@ async function resolveProxyConfig(platform2, target, connectHeaders, hiddenValue
   const entry = await config.get(target);
   if (!entry) return `unknown target '${target}'`;
   if ("url" in entry && entry.url) {
-    const merged = { ...entry.headers, ...connectHeaders };
+    const expanded = expandHeaders(entry.headers, platform2.env, (msg) => {
+      platform2.write(2, `mcpcat serve --proxy: warning: ${msg}
+`).catch(() => {
+      });
+    });
+    const merged = { ...expanded, ...connectHeaders };
     if (entry.headers) {
-      for (const v of Object.values(entry.headers)) hiddenValues.add(v);
+      for (const v of Object.values(entry.headers)) {
+        hiddenValues.add(v);
+        for (const p of placeholderValues(v, platform2.env)) hiddenValues.add(p);
+      }
     }
     return { url: entry.url, headers: merged, version };
   }
@@ -13303,6 +13321,7 @@ async function buildProxyConnectOpts(platform2, options, version) {
     const key = k.toLowerCase() === "authorization" ? "Authorization" : k;
     connectHeaders[key] = expanded;
     hiddenValues.add(expanded);
+    for (const p of placeholderValues(v, platform2.env)) hiddenValues.add(p);
   }
   const isUrl = target.startsWith("http://") || target.startsWith("https://") || target.includes(".");
   let connectOpts;
@@ -16100,13 +16119,15 @@ async function runVerb(platform2, parsed, conn, onProgress, respondData) {
   }
 }
 async function probeServer(_name, config, platform2) {
+  let secrets = [];
   try {
     const opts = { version: "probe" };
     if ("url" in config && config.url) {
       opts.url = config.url;
-      if ("headers" in config) {
-        const expanded = expandHeaders(config.headers, platform2.env);
-        if (expanded) opts.headers = expanded;
+      if ("headers" in config && config.headers) {
+        const collected = expandAndCollect(config.headers, platform2.env);
+        secrets = collected.secrets;
+        if (Object.keys(collected.expanded).length > 0) opts.headers = collected.expanded;
       }
     } else if ("command" in config && config.command) {
       opts.command = config.command;
@@ -16127,7 +16148,7 @@ async function probeServer(_name, config, platform2) {
     }
     return void 0;
   } catch (err) {
-    return err.message;
+    return redactSecrets(err.message, secrets);
   }
 }
 async function dispatchConfigVerb(platform2, verb, args2, version) {
@@ -16588,10 +16609,11 @@ async function handleInputRequired(platform2, conn, err, respondData, json, reda
     return EXIT_INPUT_REQUIRED;
   }
   try {
-    const retryResult = await conn.callTool(parsed2.name, {
-      ...parsed2.arguments,
-      _meta: { inputResponses: elicitResult.answers }
-    });
+    const retryResult = await conn.callTool(
+      parsed2.name,
+      parsed2.arguments,
+      { inputResponses: elicitResult.answers }
+    );
     return renderCallResult(platform2, retryResult, { json });
   } catch (retryErr) {
     const e2 = classifyError(retryErr);
@@ -16743,7 +16765,7 @@ async function runClientVerb(platform2, version, parsed) {
       return termExitCode;
     }
     if (err instanceof InputRequiredError) {
-      return handleInputRequired(platform2, conn, err, respondData, parsed.jsonOutput, redact2);
+      return await handleInputRequired(platform2, conn, err, respondData, parsed.jsonOutput, redact2);
     }
     const e = classifyError(err);
     await writeErrRedacted(platform2, parsed.jsonOutput, e.kind, e.msg, redact2);
@@ -17045,5 +17067,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.17.7", args);
+var code = await run(platform, "0.17.9", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -10793,11 +10793,30 @@ function redactWrites(platform2, redact2) {
     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) {
-  const ordered = [...secrets].filter((s) => s.length > 0).sort((a, b) => b.length - a.length);
-  let result = text;
-  for (const secret of ordered) result = result.replaceAll(secret, "[REDACTED]");
-  return result;
+  return secretMasker(secrets, "[REDACTED]")(text);
 }
 
 // src/render/result.ts
@@ -11774,27 +11793,18 @@ function rpcError2(id, code, message) {
     body: JSON.stringify({ jsonrpc: "2.0", id, error: { code, message } })
   };
 }
-function scrubValue(value, secrets) {
-  if (typeof value === "string") return scrubString(value, secrets);
-  if (Array.isArray(value)) return value.map((v) => scrubValue(v, secrets));
+function scrubValue(value, scrub) {
+  if (typeof value === "string") return scrub(value);
+  if (Array.isArray(value)) return value.map((v) => scrubValue(v, scrub));
   if (value && typeof value === "object") {
     const out = {};
     for (const [k, v] of Object.entries(value)) {
-      out[k] = scrubValue(v, secrets);
+      out[k] = scrubValue(v, scrub);
     }
     return out;
   }
   return value;
 }
-function scrubString(s, secrets) {
-  let result = s;
-  for (const h of secrets) {
-    if (result.includes(h)) {
-      result = result.replaceAll(h, "***");
-    }
-  }
-  return result;
-}
 function translateCapabilities(info) {
   const caps = {};
   if (info.capabilities.tools) caps.tools = { listChanged: false };
@@ -11818,7 +11828,7 @@ function createProxyHandler(options) {
   let conn = null;
   let cachedInfo = null;
   let connecting = null;
-  const secrets = options.hiddenHeaders;
+  const scrub = secretMasker(options.hiddenHeaders, "***");
   async function doConnect() {
     const c = await connect(options.platform, options.connectOpts);
     cachedInfo = await c.info();
@@ -11847,10 +11857,10 @@ function createProxyHandler(options) {
     return getConnection();
   }
   function scrubOk(id, result) {
-    return rpcOk2(id, scrubValue(result, secrets));
+    return rpcOk2(id, scrubValue(result, scrub));
   }
   function scrubErr(id, code, message) {
-    return rpcError2(id, code, scrubString(message, secrets));
+    return rpcError2(id, code, scrub(message));
   }
   function handleInitialize(id, params) {
     const requested = params && typeof params === "object" ? Object.getOwnPropertyDescriptor(params, "protocolVersion")?.value : void 0;
@@ -12897,9 +12907,17 @@ async function resolveProxyConfig(platform2, target, connectHeaders, hiddenValue
   const entry = await config.get(target);
   if (!entry) return `unknown target '${target}'`;
   if ("url" in entry && entry.url) {
-    const merged = { ...entry.headers, ...connectHeaders };
+    const expanded = expandHeaders(entry.headers, platform2.env, (msg) => {
+      platform2.write(2, `mcpcat serve --proxy: warning: ${msg}
+`).catch(() => {
+      });
+    });
+    const merged = { ...expanded, ...connectHeaders };
     if (entry.headers) {
-      for (const v of Object.values(entry.headers)) hiddenValues.add(v);
+      for (const v of Object.values(entry.headers)) {
+        hiddenValues.add(v);
+        for (const p of placeholderValues(v, platform2.env)) hiddenValues.add(p);
+      }
     }
     return { url: entry.url, headers: merged, version };
   }
@@ -12924,6 +12942,7 @@ async function buildProxyConnectOpts(platform2, options, version) {
     const key = k.toLowerCase() === "authorization" ? "Authorization" : k;
     connectHeaders[key] = expanded;
     hiddenValues.add(expanded);
+    for (const p of placeholderValues(v, platform2.env)) hiddenValues.add(p);
   }
   const isUrl = target.startsWith("http://") || target.startsWith("https://") || target.includes(".");
   let connectOpts;
@@ -15721,13 +15740,15 @@ async function runVerb(platform2, parsed, conn, onProgress, respondData) {
   }
 }
 async function probeServer(_name, config, platform2) {
+  let secrets = [];
   try {
     const opts = { version: "probe" };
     if ("url" in config && config.url) {
       opts.url = config.url;
-      if ("headers" in config) {
-        const expanded = expandHeaders(config.headers, platform2.env);
-        if (expanded) opts.headers = expanded;
+      if ("headers" in config && config.headers) {
+        const collected = expandAndCollect(config.headers, platform2.env);
+        secrets = collected.secrets;
+        if (Object.keys(collected.expanded).length > 0) opts.headers = collected.expanded;
       }
     } else if ("command" in config && config.command) {
       opts.command = config.command;
@@ -15748,7 +15769,7 @@ async function probeServer(_name, config, platform2) {
     }
     return void 0;
   } catch (err) {
-    return err.message;
+    return redactSecrets(err.message, secrets);
   }
 }
 async function dispatchConfigVerb(platform2, verb, args, version) {
@@ -16209,10 +16230,11 @@ async function handleInputRequired(platform2, conn, err, respondData, json, reda
     return EXIT_INPUT_REQUIRED;
   }
   try {
-    const retryResult = await conn.callTool(parsed2.name, {
-      ...parsed2.arguments,
-      _meta: { inputResponses: elicitResult.answers }
-    });
+    const retryResult = await conn.callTool(
+      parsed2.name,
+      parsed2.arguments,
+      { inputResponses: elicitResult.answers }
+    );
     return renderCallResult(platform2, retryResult, { json });
   } catch (retryErr) {
     const e2 = classifyError(retryErr);
@@ -16364,7 +16386,7 @@ async function runClientVerb(platform2, version, parsed) {
       return termExitCode;
     }
     if (err instanceof InputRequiredError) {
-      return handleInputRequired(platform2, conn, err, respondData, parsed.jsonOutput, redact2);
+      return await handleInputRequired(platform2, conn, err, respondData, parsed.jsonOutput, redact2);
     }
     const e = classifyError(err);
     await writeErrRedacted(platform2, parsed.jsonOutput, e.kind, e.msg, redact2);
@@ -16767,7 +16789,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.17.7", args);
+  return run(platform2, "0.17.9", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.17.7",
+  "version": "0.17.9",
   "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.36.1",
-    "@ai-ecoverse/slicc-kernel": "1.141.3",
-    "@ai-ecoverse/slicc-shared-web": "1.29.8",
+    "@ai-ecoverse/slicc-bios": "1.37.3",
+    "@ai-ecoverse/slicc-kernel": "1.142.1",
+    "@ai-ecoverse/slicc-shared-web": "1.29.11",
     "@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.141.3",
+    "kernel-cert-new": "npm:@ai-ecoverse/slicc-kernel@1.142.1",
     "lefthook": "2.2.2",
     "monocart-coverage-reports": "2.13.2",
     "proper-lockfile": "4.1.2",