@mu-cabin/muc-cli 0.2.0 → 0.2.2

package/README.md

@@ -222,6 +222,19 @@ before using any chat-channel command if you have a real device logged in.**
 Sending to anyone other than yourself requires the explicit `--yes-not-self`
 flag — a guard against accidentally messaging real humans during testing.
 
+**Message tail (signature)**: by default `muc send` appends a short tail to
+the text it sends (e.g. `"\n—— 来自王璐璐的muc-cli"`) so recipients can
+tell automated traffic from a typed message. The check is idempotent —
+if your text already ends with the resolved tail, it is not appended a
+second time. Customise it with the
+`messageTail` field in `~/.muc/config.json` — set to a non-empty string to
+override, or to `""` to disable entirely. You can also use
+`muc init --message-tail "<custom>"` / `muc init --no-message-tail` to
+write the value, and per-call flags `muc send --tail "<one-off>"` /
+`muc send --no-tail` to override on a single send. Only `muc send`
+(plain-text) is affected; `send-file` / `send-image` / `send-voice` are
+not.
+
 ```bash
 muc tcp-ping --wait 8                         # safe protocol smoke test
 muc send "hello from the CLI"                 # to-self (default)

package/dist/muc.mjs

@@ -21301,6 +21301,12 @@ var MucConfigSchema = external_exports.object({
   imPort: external_exports.number().int().min(1).max(65535),
   fileHost: external_exports.string().min(1, "fileHost required"),
   filePort: external_exports.number().int().min(1).max(65535),
+  // Optional signature appended to outbound `muc send` text. Tri-state:
+  //   undefined → use built-in default (defaultMessageTail in constants.ts)
+  //   ""        → explicit opt-out (no tail appended)
+  //   any other → that literal string (e.g. "\n— bot")
+  // Per-call `--tail` / `--no-tail` flags on `muc send` override this.
+  messageTail: external_exports.string().max(200).optional(),
   savedAt: external_exports.number().int().nonnegative(),
   schemaVersion: external_exports.literal(CONFIG_SCHEMA_VERSION)
 });
@@ -21634,11 +21640,59 @@ function read() {
 var CLI_VERSION = read();
 
 // src/commands/login.ts
-import { release } from "node:os";
+import { release as release2 } from "node:os";
 import * as readline from "node:readline";
 
 // src/lib/http.ts
 var import_needle = __toESM(require_needle(), 1);
+import { release } from "node:os";
+
+// src/lib/sign.ts
+var import_crypto_js = __toESM(require_crypto_js(), 1);
+import { createHash } from "node:crypto";
+function getMucSign(qs, secret) {
+  const keys = Object.keys(qs).sort();
+  const body = keys.map((k) => `${k}${qs[k] ?? ""}`).join("");
+  return createHash("md5").update(`${secret}${body}${secret}`).digest("hex");
+}
+function signRest(qs, secret) {
+  return getMucSign(qs, secret);
+}
+function signSecure(qs, secret) {
+  return getMucSign(qs, secret);
+}
+function encryptPassword(plain, desKey) {
+  const key = import_crypto_js.default.enc.Utf8.parse(desKey);
+  const iv = import_crypto_js.default.enc.Hex.parse("0102030405060708");
+  const enc = import_crypto_js.default.DES.encrypt(plain, key, {
+    iv,
+    mode: import_crypto_js.default.mode.CBC,
+    padding: import_crypto_js.default.pad.Pkcs7
+  });
+  return enc.toString();
+}
+
+// src/lib/device.ts
+import { homedir as homedir3, hostname } from "node:os";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync3, existsSync as existsSync3, mkdirSync as mkdirSync3 } from "node:fs";
+import { join as join3 } from "node:path";
+import { randomBytes, createHash as createHash2 } from "node:crypto";
+var DIR3 = join3(homedir3(), ".muc");
+var FILE3 = join3(DIR3, "device-id");
+function getDeviceId() {
+  if (!existsSync3(DIR3)) mkdirSync3(DIR3, { recursive: true, mode: 448 });
+  if (existsSync3(FILE3)) {
+    const v = readFileSync4(FILE3, "utf8").trim();
+    if (v) return v;
+  }
+  const seed = randomBytes(32).toString("hex") + ":" + Date.now();
+  const id = createHash2("sha256").update(seed).digest("hex");
+  writeFileSync3(FILE3, id, { mode: 384 });
+  return id;
+}
+function getDeviceName() {
+  return `${hostname()} (muc-cli)`;
+}
 
 // src/lib/constants.ts
 var APP_NAME = "MUC";
@@ -21652,6 +21706,11 @@ var SECURE_SYS_KEY = "mx_app_key";
 var PWD_DES_IV = Buffer.from([1, 2, 3, 4, 5, 6, 7, 8]);
 var DEFAULT_CHAT_OS = "iOS";
 var DEFAULT_REST_PLATFORM = PLATFORM_IOS;
+function defaultMessageTail(userName) {
+  const name = userName.trim() || "unknown";
+  return `
+\u2014\u2014 \u6765\u81EA${name}\u7684muc-cli`;
+}
 var DEFAULTS = {
   // Hosts/ports for the 东航 deployment. Other tenants override at init.
   restHost: "https://muc.ceair.com/",
@@ -21690,7 +21749,75 @@ function redact(url) {
     return url;
   }
 }
+var inflightRefresh = null;
+async function refreshAccessTokenWithTokenPwd() {
+  if (inflightRefresh) return inflightRefresh;
+  inflightRefresh = (async () => {
+    const cred = loadCredentials();
+    if (!cred?.tokenPwd) {
+      throw new CliError(
+        "AUTH_REQUIRED",
+        "no saved tokenPwd; cannot refresh accessToken",
+        "run `muc login --account <UID>` interactively in your own terminal"
+      );
+    }
+    const cfg = requireConfig();
+    const platform2 = DEFAULT_REST_PLATFORM;
+    const appVersion = platform2 === PLATFORM_IOS ? APP_VERSION_IOS : APP_VERSION;
+    const form = {
+      account: cred.uid,
+      password: encryptPassword(cred.tokenPwd, pwdDesKeyOf(cfg)),
+      appName: APP_NAME,
+      appKey: cfg.appKey,
+      appVersion,
+      platform: platform2,
+      osVersion: release(),
+      deviceId: cred.deviceId || getDeviceId(),
+      deviceName: cred.deviceName || getDeviceName(),
+      passwordType: 1,
+      createTokenPwd: false,
+      encrypt: true
+    };
+    form.sign = signRest(form, cfg.signSecretRest);
+    const res = await requestRaw({
+      method: "POST",
+      url: `${apiUrls(cfg).MUC}/emp/login`,
+      form
+    });
+    if (res.code !== 0 || !res.data?.accessToken) {
+      throw new CliError(
+        "AUTH_REQUIRED",
+        `tokenPwd refresh rejected: code=${res.code} msg=${res.msg ?? ""}`.trim(),
+        "run `muc login --account <UID>` interactively to mint fresh credentials"
+      );
+    }
+    const next = {
+      ...cred,
+      accessToken: res.data.accessToken,
+      accessTokenExpireAt: res.data.accessTokenExpireTime ?? res.data.accessTokenExpireAt ?? cred.accessTokenExpireAt,
+      savedAt: Date.now()
+    };
+    saveCredentials(next);
+    return next;
+  })();
+  try {
+    return await inflightRefresh;
+  } finally {
+    inflightRefresh = null;
+  }
+}
 async function request(opts) {
+  try {
+    return await requestRaw(opts);
+  } catch (e) {
+    if (e instanceof CliError && e.code === "AUTH_EXPIRED" && opts.auth === true && !opts._isRefreshRetry && loadCredentials()?.tokenPwd) {
+      await refreshAccessTokenWithTokenPwd();
+      return await requestRaw({ ...opts, _isRefreshRetry: true });
+    }
+    throw e;
+  }
+}
+async function requestRaw(opts) {
   const method = opts.method ?? "GET";
   const url = appendQs(opts.url, opts.qs);
   const headers = {
@@ -21761,53 +21888,6 @@ function appendQs(url, qs) {
   return u.toString();
 }
 
-// src/lib/sign.ts
-var import_crypto_js = __toESM(require_crypto_js(), 1);
-import { createHash } from "node:crypto";
-function getMucSign(qs, secret) {
-  const keys = Object.keys(qs).sort();
-  const body = keys.map((k) => `${k}${qs[k] ?? ""}`).join("");
-  return createHash("md5").update(`${secret}${body}${secret}`).digest("hex");
-}
-function signRest(qs, secret) {
-  return getMucSign(qs, secret);
-}
-function signSecure(qs, secret) {
-  return getMucSign(qs, secret);
-}
-function encryptPassword(plain, desKey) {
-  const key = import_crypto_js.default.enc.Utf8.parse(desKey);
-  const iv = import_crypto_js.default.enc.Hex.parse("0102030405060708");
-  const enc = import_crypto_js.default.DES.encrypt(plain, key, {
-    iv,
-    mode: import_crypto_js.default.mode.CBC,
-    padding: import_crypto_js.default.pad.Pkcs7
-  });
-  return enc.toString();
-}
-
-// src/lib/device.ts
-import { homedir as homedir3, hostname } from "node:os";
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync3, existsSync as existsSync3, mkdirSync as mkdirSync3 } from "node:fs";
-import { join as join3 } from "node:path";
-import { randomBytes, createHash as createHash2 } from "node:crypto";
-var DIR3 = join3(homedir3(), ".muc");
-var FILE3 = join3(DIR3, "device-id");
-function getDeviceId() {
-  if (!existsSync3(DIR3)) mkdirSync3(DIR3, { recursive: true, mode: 448 });
-  if (existsSync3(FILE3)) {
-    const v = readFileSync4(FILE3, "utf8").trim();
-    if (v) return v;
-  }
-  const seed = randomBytes(32).toString("hex") + ":" + Date.now();
-  const id = createHash2("sha256").update(seed).digest("hex");
-  writeFileSync3(FILE3, id, { mode: 384 });
-  return id;
-}
-function getDeviceName() {
-  return `${hostname()} (muc-cli)`;
-}
-
 // src/commands/login.ts
 var PLATFORM_NAMES = {
   ios: PLATFORM_IOS,
@@ -21866,7 +21946,7 @@ var Output = external_exports.object({
 function register(program3) {
   define2(program3, {
     name: "login",
-    description: "Authenticate against MUC and persist accessToken + tokenPwd. Non-interactive: pass --account and one of --password / --password-stdin / --token-pwd / $MUC_PASSWORD. Interactive: omit those and a TTY prompt with echo suppressed will appear.",
+    description: "Authenticate against MUC and persist accessToken + tokenPwd. Run interactively in your own terminal: `muc login --account <UID>` prompts for the password with echo off. `--token-pwd` reuses the saved refresh token and needs no password (this is the only form an agent should run silently). Avoid `--password` / `--password-stdin` / `$MUC_PASSWORD` \u2014 they leak the password into shell history, process lists, and agent chat scrollback.",
     output: Output,
     configure: (cmd) => {
       cmd.option("-a, --account <uid>", "MUC account uid (uppercase, e.g. WANGLULU8)").option("-p, --password <pwd>", "plaintext password (avoid; ends up in shell history)").option("--password-stdin", "read password from stdin (no trailing newline)").option("--token-pwd", "reuse the saved tokenPwd (skips password)").option("--platform <p>", "ios|android|win|mac or numeric code", (v) => parsePlatform(v)).option("--app-version <v>", "override appVersion sent in the login form");
@@ -21913,7 +21993,7 @@ function register(program3) {
         throw new CliError(
           "AUTH_REQUIRED",
           "password required",
-          "pass --password / --password-stdin / --token-pwd, set $MUC_PASSWORD, or run interactively (TTY)"
+          "open your own terminal and run `muc login --account <UID>` \u2014 it will prompt for the password with echo off. Do not pipe / env-var / inline the password from an agent shell; the prompt cannot be proxied through Claude Code's `!` shell-exec."
         );
       }
       const cfg = requireConfig();
@@ -21929,7 +22009,7 @@ function register(program3) {
         appKey: cfg.appKey,
         appVersion,
         platform: platform2,
-        osVersion: release(),
+        osVersion: release2(),
         deviceId,
         deviceName,
         passwordType: isAutoLogin ? 1 : 0,
@@ -21979,6 +22059,46 @@ function register(program3) {
 
 // src/commands/init.ts
 import * as readline2 from "node:readline";
+
+// src/lib/tail.ts
+function resolveTail(configured, userName, override) {
+  if (override.disable) return "";
+  if (override.custom != null) return override.custom;
+  if (configured === "") return "";
+  if (configured != null) return configured;
+  return defaultMessageTail(userName);
+}
+function applyTail(body, tail) {
+  if (!tail) return body;
+  if (body.endsWith(tail)) return body;
+  return body + tail;
+}
+function detectFlagConflict(argv2, name) {
+  const valueLong = `--${name}`;
+  const negatedLong = `--no-${name}`;
+  const valueEq = `${valueLong}=`;
+  let sawValueForm = false;
+  let sawNegatedForm = false;
+  for (let i = 0; i < argv2.length; i++) {
+    const a = argv2[i];
+    if (a === "--") break;
+    if (a === valueLong) {
+      sawValueForm = true;
+      i++;
+      continue;
+    }
+    if (a.startsWith(valueEq)) {
+      sawValueForm = true;
+      continue;
+    }
+    if (a === negatedLong) {
+      sawNegatedForm = true;
+    }
+  }
+  return { sawValueForm, sawNegatedForm };
+}
+
+// src/commands/init.ts
 var FingerprintShape = external_exports.object({
   appKey: external_exports.string(),
   appId: external_exports.string(),
@@ -21991,6 +22111,8 @@ var FingerprintShape = external_exports.object({
   imPort: external_exports.number(),
   fileHost: external_exports.string(),
   filePort: external_exports.number(),
+  messageTail: external_exports.string(),
+  // summary: "default" / "none" / "custom (N chars)"
   savedAt: external_exports.number(),
   schemaVersion: external_exports.literal(CONFIG_SCHEMA_VERSION)
 });
@@ -22011,6 +22133,11 @@ function fingerprint2(v) {
   if (v.length <= 8) return "***";
   return `${v.slice(0, 4)}\u2026${v.slice(-4)}`;
 }
+function summarizeTail(t) {
+  if (t === void 0) return "default";
+  if (t === "") return "none";
+  return `custom (${t.length} chars)`;
+}
 function redactConfig(c) {
   return {
     appKey: fingerprint2(c.appKey),
@@ -22024,6 +22151,7 @@ function redactConfig(c) {
     imPort: c.imPort,
     fileHost: c.fileHost,
     filePort: c.filePort,
+    messageTail: summarizeTail(c.messageTail),
     savedAt: c.savedAt,
     schemaVersion: c.schemaVersion
   };
@@ -22169,7 +22297,7 @@ function register2(program3) {
     description: "Bootstrap or update ~/.muc/config.json (tenant config: APP_KEY, APP_ID, signing secrets, hosts/ports). Interactive prompts by default; non-interactive via flags or MUC_* env vars. WARNING: env vars are visible to other processes via /proc/<pid>/environ and shell history \u2014 prefer interactive or flag-based for production.",
     output: Output2,
     configure: (cmd) => {
-      cmd.option("--check", "verify config presence and validity (exit 0 ok / 6 missing / 7 invalid); does not modify").option("--show", "print the saved config (secrets are always redacted in both human and JSON output; cat ~/.muc/config.json for raw values)").option("--reset", "delete ~/.muc/config.json (requires --yes)").option("--yes", "confirm a destructive action like --reset").option("--no-interactive", "fail rather than prompt for missing fields").option("--app-key <hex>", "tenant APP_KEY (8 lowercase hex)").option("--app-id <hex>", "tenant APP_ID (24 lowercase hex)").option("--sign-secret-rest <s>", "REST signing secret").option("--sign-secret-secure <s>", "secure-API signing secret").option("--pwd-des-key <s>", "password DES key (defaults to APP_KEY)").option("--rest-host <url>", "REST host URL").option("--sso-host <url>", "SSO host URL (optional)").option("--im-host <h>", "IM TCP host").option("--im-port <n>", "IM TCP port").option("--file-host <h>", "file-channel TCP host").option("--file-port <n>", "file-channel TCP port");
+      cmd.option("--check", "verify config presence and validity (exit 0 ok / 6 missing / 7 invalid); does not modify").option("--show", "print the saved config (secrets are always redacted in both human and JSON output; cat ~/.muc/config.json for raw values)").option("--reset", "delete ~/.muc/config.json (requires --yes)").option("--yes", "confirm a destructive action like --reset").option("--no-interactive", "fail rather than prompt for missing fields").option("--app-key <hex>", "tenant APP_KEY (8 lowercase hex)").option("--app-id <hex>", "tenant APP_ID (24 lowercase hex)").option("--sign-secret-rest <s>", "REST signing secret").option("--sign-secret-secure <s>", "secure-API signing secret").option("--pwd-des-key <s>", "password DES key (defaults to APP_KEY)").option("--rest-host <url>", "REST host URL").option("--sso-host <url>", "SSO host URL (optional)").option("--im-host <h>", "IM TCP host").option("--im-port <n>", "IM TCP port").option("--file-host <h>", "file-channel TCP host").option("--file-port <n>", "file-channel TCP port").option("--message-tail <text>", "custom signature appended to outbound `muc send` text (max 200 chars)").option("--no-message-tail", "explicitly disable the message tail (no signature appended)");
     },
     run: async (cmd) => {
       const opts = cmd.opts();
@@ -22267,6 +22395,18 @@ function register2(program3) {
           partial[f.key] = parsed;
         }
       }
+      const mtConflict = detectFlagConflict(process.argv.slice(2), "message-tail");
+      if (mtConflict.sawValueForm && mtConflict.sawNegatedForm) {
+        throw new CliError("USAGE", "--message-tail and --no-message-tail are mutually exclusive");
+      }
+      let messageTail;
+      if (opts.messageTail === false) {
+        messageTail = "";
+      } else if (typeof opts.messageTail === "string") {
+        messageTail = opts.messageTail;
+      } else if (existing && "messageTail" in existing) {
+        messageTail = existing.messageTail;
+      }
       const draft = {
         appKey: String(partial.appKey ?? ""),
         appId: String(partial.appId ?? ""),
@@ -22279,6 +22419,7 @@ function register2(program3) {
         imPort: Number(partial.imPort ?? 0),
         fileHost: String(partial.fileHost ?? ""),
         filePort: Number(partial.filePort ?? 0),
+        messageTail,
         savedAt: Date.now(),
         schemaVersion: CONFIG_SCHEMA_VERSION
       };
@@ -22614,7 +22755,7 @@ function register8(program3) {
 }
 
 // src/lib/chat.ts
-import { release as release2 } from "node:os";
+import { release as release3 } from "node:os";
 
 // src/lib/wire.ts
 import { EventEmitter } from "node:events";
@@ -22856,7 +22997,7 @@ function buildLoginPayload(cred, chatOs, cfg) {
       account: cred.uid,
       accessToken: cred.accessToken,
       os: chatOs,
-      osVersion: release2(),
+      osVersion: release3(),
       sdkVersion: 21,
       deviceId: cred.deviceId,
       deviceName: cred.deviceName,
@@ -22951,7 +23092,7 @@ async function refreshAccessTokenViaTokenPwd(cred, cfg) {
     appKey: cfg.appKey,
     appVersion: APP_VERSION,
     platform: PLATFORM_MAC,
-    osVersion: release2(),
+    osVersion: release3(),
     deviceId: cred.deviceId,
     deviceName: cred.deviceName,
     passwordType: 1,
@@ -23450,7 +23591,7 @@ function register15(program3) {
     description: "Send a plain-text chat message via the TCP chat channel. VISIBLE TO THE RECIPIENT \u2014 non-self targets require --yes-not-self.",
     output: Output15,
     configure: (cmd) => {
-      cmd.argument("<text...>", "message text (variadic; words rejoined with spaces)").option("--peer <uid>", "1:1 chat with a peer uid").option("--team <id>", "group chat with a team id").option("--to-self", "send to your own uid (default if no target given)").option("--yes-not-self", "required to confirm sending to anyone other than yourself").option("--dry-run", "build the frame but do not connect").option("--os <os>", "chat-channel os slot", parseChatOs, DEFAULT_CHAT_OS).option("--debug", "forward wire-level debug events to stderr");
+      cmd.argument("<text...>", "message text (variadic; words rejoined with spaces)").option("--peer <uid>", "1:1 chat with a peer uid").option("--team <id>", "group chat with a team id").option("--to-self", "send to your own uid (default if no target given)").option("--yes-not-self", "required to confirm sending to anyone other than yourself").option("--dry-run", "build the frame but do not connect").option("--os <os>", "chat-channel os slot", parseChatOs, DEFAULT_CHAT_OS).option("--tail <text>", "override message tail for this call only").option("--no-tail", "do not append a message tail for this call").option("--debug", "forward wire-level debug events to stderr");
     },
     run: async (cmd) => {
       const text = cmd.args.join(" ").trim();
@@ -23459,6 +23600,15 @@ function register15(program3) {
       const cfg = requireConfig();
       const cred = requireAuth(loadCredentials());
       requireSingleTarget(opts, "send");
+      const conflict = detectFlagConflict(process.argv.slice(2), "tail");
+      if (conflict.sawValueForm && conflict.sawNegatedForm) {
+        throw new CliError("USAGE", "--tail and --no-tail are mutually exclusive");
+      }
+      const override = {};
+      if (opts.tail === false) override.disable = true;
+      else if (typeof opts.tail === "string") override.custom = opts.tail;
+      const tail = resolveTail(cfg.messageTail, cred.name ?? "", override);
+      const finalText = applyTail(text, tail);
       let scene;
       let toId;
       if (opts.team) {
@@ -23485,7 +23635,7 @@ function register15(program3) {
         scene,
         type: 1,
         subType: 1,
-        body: text,
+        body: finalText,
         fName: cred.name,
         platform: opts.os === "Mac" || opts.os === "OS X" ? "Mac" : "Windows",
         appKey: cfg.appKey

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mu-cabin/muc-cli",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Terminal client for MUC IM (com.meicloud.im.dh).",
   "license": "MIT",
   "type": "module",