@bobfrankston/rmfmail 1.2.214 → 1.2.216

package/client/app.ts

@@ -1758,10 +1758,24 @@ async function deleteSelectedMessages(): Promise<void> {
     }
 }
 
+/** Serialize Ctrl+Z presses. Each undo is several awaited IPCs plus a
+ *  revealMessage + folder reload; firing them concurrently (hold Ctrl and tap Z
+ *  three times to walk back three deletions) had them interleaving — two
+ *  reveals fighting over the list position, reloads landing out of order. The
+ *  stack is LIFO and each queued call pops its own entry when its turn comes,
+ *  so N presses undo the N most recent actions, in order. */
+let undoChain: Promise<void> = Promise.resolve();
+function queueUndo(): void {
+    undoChain = undoChain.then(() => performUndo()).catch(() => { /* performUndo reports its own failures */ });
+}
+
 async function performUndo(): Promise<void> {
     const op = popUndo();
     if (!op) return;
     const statusSync = document.getElementById("status-sync");
+    // "3 more to undo" — without it, a stack of undone deletions is invisible
+    // and the user can't tell whether pressing Ctrl+Z again will do anything.
+    const remaining = undoStack.length ? ` — ${undoStack.length} more to undo` : "";
     try {
         if (op.kind === "delete") {
             // payload is the full batch (was a single object pre-2026-06-12;
@@ -1771,9 +1785,9 @@ async function performUndo(): Promise<void> {
             for (const m of msgs) {
                 await undeleteMessage(m.accountId, m.uid, m.folderId);
             }
-            if (statusSync) statusSync.textContent = msgs.length === 1
+            if (statusSync) statusSync.textContent = (msgs.length === 1
                 ? "Message restored"
-                : `Restored ${msgs.length} messages`;
+                : `Restored ${msgs.length} messages`) + remaining;
             // Position at what was just restored — an undo whose effect lands
             // off-screen (or in a folder you've since left) reads as a no-op.
             // Reveal the first of the batch; the rest are in the same view.
@@ -1797,7 +1811,7 @@ async function performUndo(): Promise<void> {
                 if (group.uids.length === 1) await moveMessage(group.accountId, group.uids[0], group.folderId);
                 else await moveMessages(group.accountId, group.uids, group.folderId);
             }
-            if (statusSync) statusSync.textContent = `Undid move of ${messages.length} message${messages.length !== 1 ? "s" : ""}`;
+            if (statusSync) statusSync.textContent = `Undid move of ${messages.length} message${messages.length !== 1 ? "s" : ""}${remaining}`;
             // Same positioning rule as undo-delete: show the message back in
             // its original folder.
             const firstMoved = messages[0];
@@ -1820,7 +1834,7 @@ async function performUndo(): Promise<void> {
                 setRowFlagged(entry.accountId, entry.uid, entry.prevFlagged);
                 messageState.updateMessageFlags(entry.accountId, entry.uid, flagsAfter);
             }
-            if (statusSync) statusSync.textContent = `Undid flag change on ${op.payload.length} message${op.payload.length !== 1 ? "s" : ""}`;
+            if (statusSync) statusSync.textContent = `Undid flag change on ${op.payload.length} message${op.payload.length !== 1 ? "s" : ""}${remaining}`;
         }
         reloadCurrentFolder();
     } catch (e: any) {
@@ -2107,7 +2121,25 @@ async function spamSelectedMessages(): Promise<void> {
         g.folderIds.push(msg.folderId);
         byAccount.set(msg.accountId, g);
     }
-    if (statusSync) statusSync.textContent = `Spam: ${snapshot.length} queued — pending server sync`;
+    // Marking spam is just a move to the \Junk folder (service-side
+    // markAsSpamMessages), so its inverse is the move back — the same undo op
+    // a drag-to-folder move records. Pushed BEFORE the IPC, not in its `.then`:
+    // a misfired spam click is exactly the case where the user reaches for
+    // Ctrl+Z immediately, and the local move has already happened by then
+    // (Bob 2026-08-03: "^z should undo send-to-spam"). The move branch of
+    // performUndo restores each message to its own sourceFolderId, so a
+    // selection spanning folders comes back correctly; targetFolderId is only
+    // known once the service answers and the undo doesn't need it.
+    pushUndo({
+        kind: "move",
+        at: Date.now(),
+        payload: {
+            messages: snapshot.map(m => ({ accountId: m.accountId, uid: m.uid, sourceFolderId: m.folderId })),
+            targetAccountId: snapshot[0].accountId,
+            targetFolderId: 0,
+        },
+    });
+    if (statusSync) statusSync.textContent = `Spam: ${snapshot.length} queued — Ctrl+Z to undo`;
     for (const [accountId, { uids, folderIds }] of byAccount) {
         markAsSpamMessages(accountId, uids, folderIds)
             .then(result => {
@@ -3899,7 +3931,7 @@ document.addEventListener("keydown", (e) => {
         const composeOpen = !!document.querySelector(".compose-overlay");
         if (!inEditable && !composeOpen && undoStack.length > 0) {
             e.preventDefault();
-            performUndo();
+            queueUndo();
         }
     }
     // F5 = Sync
@@ -4113,7 +4145,7 @@ function openShortcutsDialog(): void {
                 ["Forward", "Ctrl+F"],
                 ["Sync", "F5"],
                 ["Delete selected", "Del or Ctrl+D"],
-                ["Undo last delete/move", "Ctrl+Z"],
+                ["Undo delete / move / spam / flag (repeat to go back further)", "Ctrl+Z"],
                 ["Toggle read/unread", "R"],
                 ["Toggle flag (★)", "(⚑ button in viewer)"],
                 ["Select all visible", "Ctrl+A"],

package/client/index.html

@@ -779,7 +779,7 @@
                 </div>
             </div>
             <button class="tb-btn" id="btn-tb-delete" title="Delete selected message (Del)">🗑</button>
-            <button class="tb-btn" id="btn-tb-spam" title="Mark as spam — move to the configured Junk folder">⚠</button>
+            <button class="tb-btn" id="btn-tb-spam" title="Mark as spam — move to the configured Junk folder (Ctrl+Z to undo)">⚠</button>
             <button class="tb-btn" id="btn-tb-flag" title="Flag / unflag selected message(s) — Ctrl+Z to undo">★</button>
             <span id="app-version" class="app-version"></span>
             <span class="tb-hint" title="Cycle pane focus: F6 = forward (folders → list → viewer), Shift+F6 = back. From the preview, ⇧F6 lands on the message-list row that drove it.">⇧F6 ← list</span>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/rmfmail",
-  "version": "1.2.214",
+  "version": "1.2.216",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -34,13 +34,13 @@
     "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow-direct": "^0.1.63",
+    "@bobfrankston/iflow-direct": "^0.1.65",
     "@bobfrankston/mailx-host": "^0.1.14",
     "@bobfrankston/mailx-imap": "^0.1.140",
     "@bobfrankston/mailx-store-web": "^0.1.69",
     "@bobfrankston/mailx-sync": "^0.1.29",
     "@bobfrankston/miscinfo": "^1.0.15",
-    "@bobfrankston/msger": "^0.1.418",
+    "@bobfrankston/msger": "^0.1.421",
     "@bobfrankston/node-tcp-transport": "^0.1.10",
     "@bobfrankston/oauthsupport": "^1.0.34",
     "@bobfrankston/rmf-tiny": "^0.1.43",
@@ -114,13 +114,13 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/iflow-direct": "^0.1.63",
+      "@bobfrankston/iflow-direct": "^0.1.65",
       "@bobfrankston/mailx-host": "^0.1.14",
       "@bobfrankston/mailx-imap": "^0.1.140",
       "@bobfrankston/mailx-store-web": "^0.1.69",
       "@bobfrankston/mailx-sync": "^0.1.29",
       "@bobfrankston/miscinfo": "^1.0.15",
-      "@bobfrankston/msger": "^0.1.418",
+      "@bobfrankston/msger": "^0.1.421",
       "@bobfrankston/node-tcp-transport": "^0.1.10",
       "@bobfrankston/oauthsupport": "^1.0.34",
       "@bobfrankston/rmf-tiny": "^0.1.43",