@mu-cabin/muc-cli 0.5.1 → 0.5.2

package/dist/muc.mjs

@@ -22241,10 +22241,9 @@ async function request(opts) {
           recovered = true;
         } catch (refreshErr) {
           if (!(refreshErr instanceof CliError) || cred.rememberedPwd == null) throw refreshErr;
-          if (isAssistantProfile()) throw refreshErr;
         }
       }
-      if (!recovered && cred.rememberedPwd && !isAssistantProfile()) {
+      if (!recovered && cred.rememberedPwd) {
         try {
           await refreshViaRememberedPwd();
           recovered = true;
@@ -22343,9 +22342,6 @@ async function doRefreshViaRememberedPwd() {
     throw new CliError(
       "AUTH_EXPIRED",
       `rememberedPwd refresh rejected: code=${res.code} msg=${res.msg ?? ""}`.trim(),
-      // This arm is gated off on the assistant profile (see request()'s
-      // cascade), so in practice loginCmd() always returns `muc login`
-      // here. Templated anyway for consistency + future-proofing.
       `rerun \`${loginCmd()} --account <UID>\` interactively to mint fresh credentials`
     );
   }
@@ -22522,13 +22518,6 @@ function register(program3, variant) {
           "rerun without --token-pwd, or pass --account + (--password-stdin or interactive prompt)"
         );
       }
-      if (isAssistant && opts.remember === true) {
-        throw new CliError(
-          "USAGE",
-          "--remember is not supported on the assistant profile",
-          "the assistant daemon's refresh cascade stops at Step 2 by design (see http.ts); drop --remember (and run with --no-remember to wipe any pre-existing blob)"
-        );
-      }
       const existing = loadCredentials();
       const accountRaw = opts.account ?? process.env.MUC_ACCOUNT ?? existing?.uid;
       if (!accountRaw) {
@@ -23163,6 +23152,7 @@ var Output3 = external_exports.object({
   tokenPwdSet: external_exports.boolean(),
   tokenPwdExpireAt: external_exports.number().optional(),
   tokenPwdExpiresIn: external_exports.string().optional(),
+  remembered: external_exports.boolean(),
   savedAt: external_exports.number(),
   credentialsPath: external_exports.string()
 });
@@ -23216,6 +23206,7 @@ function register3(program3) {
         tokenPwdSet: Boolean(c.tokenPwd),
         tokenPwdExpireAt: c.tokenPwdExpireAt,
         tokenPwdExpiresIn: relativeFromNow(c.tokenPwdExpireAt),
+        remembered: Boolean(c.rememberedPwd),
         savedAt: c.savedAt,
         credentialsPath: credentialsPath()
       };
@@ -24016,9 +24007,13 @@ async function openChatSession(cred, opts = {}) {
     } catch (refreshErr) {
       const msg = String(refreshErr?.message ?? refreshErr);
       if (msg.includes("61018") || /tokenPwd|自动登陆/.test(msg)) {
+        if (cred.rememberedPwd) {
+          const rememberedFresh = await refreshViaRememberedPwd();
+          return await tryChatLogin(rememberedFresh, opts, cfg);
+        }
         const lc = isAssistantProfile() ? "muc assistant-login" : "muc login";
         throw new Error(
-          `chat login failed: access token expired AND saved tokenPwd is no longer valid (server returned 61018). Run \`${lc}\` with your password to mint fresh credentials, then retry.`
+          `chat login failed: access token expired AND saved tokenPwd is no longer valid (server returned 61018). Run \`${lc}\` with your password (add --remember to allow unattended daemon recovery) to mint fresh credentials, then retry.`
         );
       }
       throw refreshErr;
@@ -28339,6 +28334,10 @@ function formatDuration(ms) {
 }
 
 // src/daemon/broker.ts
+function credentialsForReconnect(current, onDisk) {
+  if (!onDisk || onDisk.uid !== current.uid) return current;
+  return onDisk.savedAt >= current.savedAt ? onDisk : current;
+}
 var ChatBroker = class {
   kind;
   paths;
@@ -28541,6 +28540,7 @@ var ChatBroker = class {
     return true;
   }
   async openSocket() {
+    this.cred = credentialsForReconnect(this.cred, loadCredentials());
     const session = await openChatSession(this.cred, { os: this.os, debug: this.opts.debug });
     const reloaded = loadCredentials();
     if (reloaded) this.cred = reloaded;
@@ -33778,10 +33778,10 @@ var AssistantDaemon = class {
       const loginCmd2 = isAssistantProfile() ? "muc assistant-login" : "muc login";
       this.publishState(
         "paused_auth",
-        `access token expired and saved tokenPwd is invalid. Run \`${loginCmd2}\` to mint fresh credentials, then restart the daemon.`
+        `access token expired and saved tokenPwd is invalid. Run \`${loginCmd2} --remember\` to mint fresh credentials and enable unattended recovery, then restart the daemon.`
       );
       this.statusBoard?.onPause("auth", msg);
-      notifyMac("MUC Assistant paused", `auth expired \u2014 run \`${loginCmd2}\`, then restart the daemon`);
+      notifyMac("MUC Assistant paused", `auth expired \u2014 run \`${loginCmd2} --remember\`, then restart the daemon`);
       return false;
     }
     this.reconnectAttempts++;
@@ -33822,6 +33822,10 @@ var AssistantDaemon = class {
     }
   }
   async openSocket() {
+    const onDisk = loadCredentials();
+    if (onDisk?.uid === this.cred.uid && onDisk.savedAt >= this.cred.savedAt) {
+      this.cred = onDisk;
+    }
     const session = await openChatSession(this.cred, { os: this.os, debug: this.opts.debug });
     const reloaded = loadCredentials();
     if (reloaded) this.cred = reloaded;

package/package.json

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