@ai-ecoverse/mcpcat 0.17.10 → 0.18.0

package/dist/host/mcpcat.mjs

@@ -13284,23 +13284,29 @@ function resolveProxyUrl(target, headers, version) {
   const url = target.startsWith("http") ? target : `https://${target}`;
   return { url, headers, version };
 }
+function unsetIn(header, value, env) {
+  const missing = missingPlaceholders(value, env);
+  if (missing.length === 0) return void 0;
+  return `unset variable ${missing.join(", ")} in header '${header}'`;
+}
+function hide(hidden, template, expanded, env) {
+  if (template) hidden.add(template);
+  if (expanded) hidden.add(expanded);
+  for (const p of placeholderValues(template, env)) hidden.add(p);
+}
 async function resolveProxyConfig(platform2, target, connectHeaders, hiddenValues, version) {
   const config = await MergedConfigSource.load(platform2);
   const entry = await config.get(target);
   if (!entry) return `unknown target '${target}'`;
   if ("url" in entry && entry.url) {
-    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 p of placeholderValues(v, platform2.env)) hiddenValues.add(p);
-      }
+    const expanded = {};
+    for (const [k, v] of Object.entries(entry.headers ?? {})) {
+      const missing = unsetIn(k, v, platform2.env);
+      if (missing) return missing;
+      expanded[k] = expandPlaceholders(v, platform2.env);
+      hide(hiddenValues, v, expanded[k], platform2.env);
     }
+    const merged = { ...expanded, ...connectHeaders };
     return { url: entry.url, headers: merged, version };
   }
   if ("command" in entry && entry.command) {
@@ -13319,12 +13325,12 @@ async function buildProxyConnectOpts(platform2, options, version) {
   const connectHeaders = {};
   const hiddenValues = /* @__PURE__ */ new Set();
   for (const [k, v] of options.proxyHeaders) {
-    const expanded = expandPlaceholdersStrict(v, platform2.env);
-    if (expanded === void 0) return { error: `unset variable in header '${k}'` };
+    const missing = unsetIn(k, v, platform2.env);
+    if (missing) return { error: missing };
+    const expanded = expandPlaceholders(v, platform2.env);
     const key = k.toLowerCase() === "authorization" ? "Authorization" : k;
     connectHeaders[key] = expanded;
-    hiddenValues.add(expanded);
-    for (const p of placeholderValues(v, platform2.env)) hiddenValues.add(p);
+    hide(hiddenValues, v, expanded, platform2.env);
   }
   const isUrl = target.startsWith("http://") || target.startsWith("https://") || target.includes(".");
   let connectOpts;
@@ -15556,6 +15562,7 @@ Options:
   -v, --verbose              Trace on stderr
   --silent                   Suppress progress
   -o, --output <path>        Write result to file
+  --no-input                 Never prompt (non-TTY implies it)
   -V, --version              Print version
   -h, --help                 Show this help
 `;
@@ -15609,6 +15616,7 @@ function parseFlags(args2) {
   const positional = [];
   let trailingCommand;
   let respondArg;
+  let noInput = false;
   const roots = [];
   let outputPath;
   let noValidate = false;
@@ -15655,6 +15663,8 @@ function parseFlags(args2) {
       timeoutMs = Number(args2[++i]) * 1e3;
     } else if (arg === "--respond" && args2[i + 1]) {
       respondArg = args2[++i];
+    } else if (arg === "--no-input") {
+      noInput = true;
     } else if (arg === "--root" && args2[i + 1]) {
       roots.push(args2[++i]);
     } else if ((arg === "-o" || arg === "--output") && args2[i + 1]) {
@@ -15681,6 +15691,10 @@ function parseFlags(args2) {
       jsonOutput = true;
     } else if (ra === "--no-validate") {
       noValidate = true;
+    } else if (ra === "--no-input") {
+      noInput = true;
+    } else if (ra === "--respond" && rest[j + 1] !== void 0) {
+      respondArg = rest[++j];
     } else if ((ra === "-o" || ra === "--output") && rest[j + 1] !== void 0) {
       outputPath = rest[++j];
     } else if (ra === "--help" || ra === "-h") {
@@ -15710,6 +15724,7 @@ function parseFlags(args2) {
     positional,
     trailingCommand,
     respondArg,
+    noInput,
     roots,
     outputPath,
     noValidate,
@@ -15767,6 +15782,7 @@ function parseArgs(args2) {
     silent: flags.silent,
     noValidate: flags.noValidate,
     respondArg: flags.respondArg,
+    noInput: flags.noInput,
     roots: flags.roots,
     outputPath: flags.outputPath
   };
@@ -16591,7 +16607,7 @@ async function loadRespondData(platform2, respondArg, json) {
     return { exitCode: EXIT_USAGE };
   }
 }
-async function handleInputRequired(platform2, conn, err, respondData, json, redact2) {
+async function handleInputRequired(platform2, conn, err, respondData, json, redact2, noInput) {
   const parsed2 = JSON.parse(err.requestJson);
   const requestOut = sanitizeJson(JSON.stringify(redactDeep(parsed2, redact2), null, 2));
   const inputReq = parseInputRequest(parsed2.result ?? parsed2);
@@ -16600,7 +16616,7 @@ async function handleInputRequired(platform2, conn, err, respondData, json, reda
 `);
     return EXIT_INPUT_REQUIRED;
   }
-  const isTty = platform2.kind === "host" && platform2.isatty(0) && platform2.isatty(2);
+  const isTty = !noInput && platform2.kind === "host" && platform2.isatty(0) && platform2.isatty(2);
   const elicitResult = await handleElicitation(
     redactWrites(platform2, redact2),
     inputReq,
@@ -16770,7 +16786,15 @@ async function runClientVerb(platform2, version, parsed) {
       return termExitCode;
     }
     if (err instanceof InputRequiredError) {
-      return await handleInputRequired(platform2, conn, err, respondData, parsed.jsonOutput, redact2);
+      return await handleInputRequired(
+        platform2,
+        conn,
+        err,
+        respondData,
+        parsed.jsonOutput,
+        redact2,
+        parsed.noInput
+      );
     }
     const e = classifyError(err);
     await writeErrRedacted(platform2, parsed.jsonOutput, e.kind, e.msg, redact2);
@@ -17072,5 +17096,5 @@ try {
   });
 } catch {
 }
-var code = await run(platform, "0.17.10", args);
+var code = await run(platform, "0.18.0", args);
 process.exit(code);

package/dist/kernel/mcpcat.mjs

@@ -12905,23 +12905,29 @@ function resolveProxyUrl(target, headers, version) {
   const url = target.startsWith("http") ? target : `https://${target}`;
   return { url, headers, version };
 }
+function unsetIn(header, value, env2) {
+  const missing = missingPlaceholders(value, env2);
+  if (missing.length === 0) return void 0;
+  return `unset variable ${missing.join(", ")} in header '${header}'`;
+}
+function hide(hidden, template, expanded, env2) {
+  if (template) hidden.add(template);
+  if (expanded) hidden.add(expanded);
+  for (const p of placeholderValues(template, env2)) hidden.add(p);
+}
 async function resolveProxyConfig(platform2, target, connectHeaders, hiddenValues, version) {
   const config = await MergedConfigSource.load(platform2);
   const entry = await config.get(target);
   if (!entry) return `unknown target '${target}'`;
   if ("url" in entry && entry.url) {
-    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 p of placeholderValues(v, platform2.env)) hiddenValues.add(p);
-      }
+    const expanded = {};
+    for (const [k, v] of Object.entries(entry.headers ?? {})) {
+      const missing = unsetIn(k, v, platform2.env);
+      if (missing) return missing;
+      expanded[k] = expandPlaceholders(v, platform2.env);
+      hide(hiddenValues, v, expanded[k], platform2.env);
     }
+    const merged = { ...expanded, ...connectHeaders };
     return { url: entry.url, headers: merged, version };
   }
   if ("command" in entry && entry.command) {
@@ -12940,12 +12946,12 @@ async function buildProxyConnectOpts(platform2, options, version) {
   const connectHeaders = {};
   const hiddenValues = /* @__PURE__ */ new Set();
   for (const [k, v] of options.proxyHeaders) {
-    const expanded = expandPlaceholdersStrict(v, platform2.env);
-    if (expanded === void 0) return { error: `unset variable in header '${k}'` };
+    const missing = unsetIn(k, v, platform2.env);
+    if (missing) return { error: missing };
+    const expanded = expandPlaceholders(v, platform2.env);
     const key = k.toLowerCase() === "authorization" ? "Authorization" : k;
     connectHeaders[key] = expanded;
-    hiddenValues.add(expanded);
-    for (const p of placeholderValues(v, platform2.env)) hiddenValues.add(p);
+    hide(hiddenValues, v, expanded, platform2.env);
   }
   const isUrl = target.startsWith("http://") || target.startsWith("https://") || target.includes(".");
   let connectOpts;
@@ -15177,6 +15183,7 @@ Options:
   -v, --verbose              Trace on stderr
   --silent                   Suppress progress
   -o, --output <path>        Write result to file
+  --no-input                 Never prompt (non-TTY implies it)
   -V, --version              Print version
   -h, --help                 Show this help
 `;
@@ -15230,6 +15237,7 @@ function parseFlags(args) {
   const positional = [];
   let trailingCommand;
   let respondArg;
+  let noInput = false;
   const roots = [];
   let outputPath;
   let noValidate = false;
@@ -15276,6 +15284,8 @@ function parseFlags(args) {
       timeoutMs = Number(args[++i]) * 1e3;
     } else if (arg === "--respond" && args[i + 1]) {
       respondArg = args[++i];
+    } else if (arg === "--no-input") {
+      noInput = true;
     } else if (arg === "--root" && args[i + 1]) {
       roots.push(args[++i]);
     } else if ((arg === "-o" || arg === "--output") && args[i + 1]) {
@@ -15302,6 +15312,10 @@ function parseFlags(args) {
       jsonOutput = true;
     } else if (ra === "--no-validate") {
       noValidate = true;
+    } else if (ra === "--no-input") {
+      noInput = true;
+    } else if (ra === "--respond" && rest[j + 1] !== void 0) {
+      respondArg = rest[++j];
     } else if ((ra === "-o" || ra === "--output") && rest[j + 1] !== void 0) {
       outputPath = rest[++j];
     } else if (ra === "--help" || ra === "-h") {
@@ -15331,6 +15345,7 @@ function parseFlags(args) {
     positional,
     trailingCommand,
     respondArg,
+    noInput,
     roots,
     outputPath,
     noValidate,
@@ -15388,6 +15403,7 @@ function parseArgs(args) {
     silent: flags.silent,
     noValidate: flags.noValidate,
     respondArg: flags.respondArg,
+    noInput: flags.noInput,
     roots: flags.roots,
     outputPath: flags.outputPath
   };
@@ -16212,7 +16228,7 @@ async function loadRespondData(platform2, respondArg, json) {
     return { exitCode: EXIT_USAGE };
   }
 }
-async function handleInputRequired(platform2, conn, err, respondData, json, redact2) {
+async function handleInputRequired(platform2, conn, err, respondData, json, redact2, noInput) {
   const parsed2 = JSON.parse(err.requestJson);
   const requestOut = sanitizeJson(JSON.stringify(redactDeep(parsed2, redact2), null, 2));
   const inputReq = parseInputRequest(parsed2.result ?? parsed2);
@@ -16221,7 +16237,7 @@ async function handleInputRequired(platform2, conn, err, respondData, json, reda
 `);
     return EXIT_INPUT_REQUIRED;
   }
-  const isTty = platform2.kind === "host" && platform2.isatty(0) && platform2.isatty(2);
+  const isTty = !noInput && platform2.kind === "host" && platform2.isatty(0) && platform2.isatty(2);
   const elicitResult = await handleElicitation(
     redactWrites(platform2, redact2),
     inputReq,
@@ -16391,7 +16407,15 @@ async function runClientVerb(platform2, version, parsed) {
       return termExitCode;
     }
     if (err instanceof InputRequiredError) {
-      return await handleInputRequired(platform2, conn, err, respondData, parsed.jsonOutput, redact2);
+      return await handleInputRequired(
+        platform2,
+        conn,
+        err,
+        respondData,
+        parsed.jsonOutput,
+        redact2,
+        parsed.noInput
+      );
     }
     const e = classifyError(err);
     await writeErrRedacted(platform2, parsed.jsonOutput, e.kind, e.msg, redact2);
@@ -16794,7 +16818,7 @@ async function main(ctx) {
     packageDir: "/node_modules/@ai-ecoverse/mcpcat"
   });
   const args = ctx.argv.slice(1);
-  return run(platform2, "0.17.10", args);
+  return run(platform2, "0.18.0", args);
 }
 export {
   main as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/mcpcat",
-  "version": "0.17.10",
+  "version": "0.18.0",
   "description": "A curl for the Model Context Protocol",
   "type": "module",
   "license": "Apache-2.0",
@@ -62,14 +62,14 @@
   },
   "devDependencies": {
     "@ai-ecoverse/slicc-bios": "1.38.0",
-    "@ai-ecoverse/slicc-kernel": "1.142.1",
-    "@ai-ecoverse/slicc-shared-web": "1.29.13",
+    "@ai-ecoverse/slicc-kernel": "1.143.1",
+    "@ai-ecoverse/slicc-shared-web": "1.29.16",
     "@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.142.1",
+    "kernel-cert-new": "npm:@ai-ecoverse/slicc-kernel@1.143.1",
     "lefthook": "2.2.2",
     "monocart-coverage-reports": "2.13.2",
     "proper-lockfile": "4.1.2",