@mu-cabin/muc-cli 0.5.4 → 0.5.6

package/REFERENCE.md

@@ -353,7 +353,11 @@ as the personal `~/.muc` account and is mutually exclusive with
   separate iPad slot, so desktop and phone coexist; a real iPad may conflict.
 - **REST `tokenPwd`.** A fresh `muc login` rotates the account's refresh
   token; other devices on that account get logged out when their token
-  next refreshes.
+  next refreshes. Remembered-password daemon recovery is different: it uses
+  `createTokenPwd=false`, refreshing only accessToken and preserving the
+  phone's auto-login credential. The issuing REST platform is persisted as
+  `restPlatform` and reused by every refresh path; it is independent from the
+  daemon's TCP slot (`iPad` remains `os:"iOS" + browser:"iPad"`).
 
 The fix is to give the daemon its **own account**, stored under
 `~/.muc/assistant/` (next to its pid / socket / logs) and completely
@@ -614,7 +618,7 @@ defaultReaction: [点赞]
 | Path | Purpose | Mode |
 |---|---|---|
 | `~/.muc/config.json` | tenant config: APP_KEY, APP_ID, signing secrets, hosts/ports | 600 |
-| `~/.muc/credentials.json` | accessToken, tokenPwd, profile | 600 |
+| `~/.muc/credentials.json` | accessToken, tokenPwd, issuing REST platform, profile | 600 |
 | `~/.muc/device-id` | stable per-CLI deviceId (sha256 hex) | 600 |
 | `~/.muc/remember.salt` | salt for the optional `--remember` password blob | 600 |
 | `~/.muc/runtime/daemon.sock`, `daemon.pid`, `daemon-state.json`, `daemon-events-*.ndjson` | personal daemon IPC, pid/state, and raw event history | — |
@@ -629,6 +633,8 @@ files by hand.
 ## Changelog
 
 #### Unreleased
+- Persist the platform that issued each REST credential and reuse it for `/emp/login` refreshes. Existing personal credentials fall back to iOS and existing assistant credentials to Mac until the next successful login/refresh migrates them. This REST namespace is independent from the TCP iPad slot.
+- Remembered-password recovery requests only a fresh `accessToken` (`createTokenPwd=false`) so daemon recovery no longer rotates another device's auto-login `tokenPwd`.
 - Add the third iPad chat slot. Logical `--os iPad` serializes as `os:"iOS", browser:"iPad"` and is now the built-in default for personal commands, the personal daemon, and assistantd. Existing explicit `defaultChatOs` values remain authoritative.
 - Slot safety guidance is now non-blocking: skills remind that a real iPad may be kicked and continue without asking for slot confirmation. Recipient, content, and destructive-action confirmations are unchanged.
 - Add the personal daemon command family: `muc daemon-start`, `daemon-status`, `daemon-stop`, and `daemon-events`. Ordinary chat-channel commands now route only through the personal daemon and report `daemon_kind:"personal"` when routed.

package/dist/muc.mjs

@@ -22028,6 +22028,12 @@ function getDeviceName() {
   return `${hostname()} (muc-cli)`;
 }
 
+// src/lib/rest-platform.ts
+init_profile();
+function resolveRestPlatform(cred) {
+  return cred?.restPlatform ?? (isAssistantProfile() ? PLATFORM_MAC : DEFAULT_REST_PLATFORM);
+}
+
 // src/lib/http.ts
 var UA = `MUC/${APP_VERSION} (CLI; muc-cli/${CLI_VERSION})`;
 function loginCmd() {
@@ -22107,6 +22113,7 @@ async function tryRefreshViaEmpGet() {
     const next = {
       ...cred,
       accessToken: res.data.accessToken,
+      restPlatform: resolveRestPlatform(cred),
       accessTokenExpireAt: accessTokenExpiry ?? cred.accessTokenExpireAt,
       savedAt: Date.now()
     };
@@ -22134,7 +22141,7 @@ async function refreshAccessTokenWithTokenPwd() {
       );
     }
     const cfg = requireConfig();
-    const platform3 = DEFAULT_REST_PLATFORM;
+    const platform3 = resolveRestPlatform(cred);
     const appVersion = platform3 === PLATFORM_IOS ? APP_VERSION_IOS : APP_VERSION;
     const form = {
       account: cred.uid,
@@ -22199,6 +22206,7 @@ async function refreshAccessTokenWithTokenPwd() {
     const fresh = {
       ...cred,
       accessToken: res.data.accessToken,
+      restPlatform: platform3,
       // Capture rotated tokenPwd if the server returned one; otherwise keep
       // the existing value. Server may rotate tokenPwd on every successful
       // /emp/login (single-use refresh-token semantics) — if it does and we
@@ -22282,7 +22290,7 @@ async function doRefreshViaRememberedPwd() {
     );
   }
   const cfg = requireConfig();
-  const platform3 = DEFAULT_REST_PLATFORM;
+  const platform3 = resolveRestPlatform(cred);
   const appVersion = platform3 === PLATFORM_IOS ? APP_VERSION_IOS : APP_VERSION;
   const form = {
     account: cred.uid,
@@ -22296,8 +22304,8 @@ async function doRefreshViaRememberedPwd() {
     deviceName: cred.deviceName || getDeviceName(),
     passwordType: 0,
     // plaintext password (DES-encoded), not tokenPwd
-    createTokenPwd: true,
-    // mint a fresh refresh token while we're here
+    createTokenPwd: false,
+    // accessToken only; do not rotate phone auto-login
     encrypt: true
   };
   form.sign = signRest(form, cfg.signSecretRest);
@@ -22349,6 +22357,7 @@ async function doRefreshViaRememberedPwd() {
   const fresh = {
     ...cred,
     accessToken: res.data.accessToken,
+    restPlatform: platform3,
     tokenPwd: res.data.tokenPwdInfo?.tokenPwd ?? cred.tokenPwd,
     tokenPwdExpireAt: newTokenPwdExpiry ?? cred.tokenPwdExpireAt,
     accessTokenExpireAt: newAccessTokenExpiry ?? cred.accessTokenExpireAt,
@@ -22567,7 +22576,7 @@ function register(program3, variant) {
       const deviceId = getDeviceId();
       const deviceName = getDeviceName();
       const password = encryptPassword(rawPwd, pwdDesKeyOf(cfg));
-      const platform3 = opts.platform ?? (isAssistant ? PLATFORM_MAC : DEFAULT_REST_PLATFORM);
+      const platform3 = opts.platform ?? (existing?.uid === account ? existing.restPlatform : void 0) ?? (isAssistant ? PLATFORM_MAC : DEFAULT_REST_PLATFORM);
       const appVersion = opts.appVersion ?? appVersionFor(platform3);
       const form = {
         account,
@@ -22625,6 +22634,7 @@ function register(program3, variant) {
         name: userInfo2.name,
         accessToken: data.accessToken,
         tokenPwd: tokenPwd ?? existing?.tokenPwd,
+        restPlatform: platform3,
         deviceId,
         deviceName,
         savedAt: Date.now(),
@@ -24052,13 +24062,15 @@ async function tryRefreshViaEmpGet2(cred, cfg) {
   }
 }
 async function refreshAccessTokenViaTokenPwd(cred, cfg) {
+  const platform3 = resolveRestPlatform(cred);
+  const appVersion = platform3 === 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: APP_VERSION,
-    platform: PLATFORM_MAC,
+    appVersion,
+    platform: platform3,
     osVersion: release3(),
     deviceId: cred.deviceId,
     deviceName: cred.deviceName,
@@ -24080,6 +24092,7 @@ async function refreshAccessTokenViaTokenPwd(cred, cfg) {
   return {
     ...cred,
     accessToken: data.accessToken,
+    restPlatform: platform3,
     accessTokenExpireAt: pickExpireMs(
       data.accessTokenExpireTime,
       data.accessTokenExpireAt,

package/package.json

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