@bobfrankston/rmfmail 1.1.243 → 1.1.245

package/client/app.ts

@@ -1418,7 +1418,7 @@ interface MovedBatch {
 // when older entries get shifted off the front of the stack).
 type UndoFlagEntry = { accountId: string; uid: number; prevFlagged: boolean };
 type UndoOp =
-    | { kind: "delete"; at: number; payload: DeletedMessage }
+    | { kind: "delete"; at: number; payload: DeletedMessage[] }
     | { kind: "move"; at: number; payload: MovedBatch }
     | { kind: "flag"; at: number; payload: UndoFlagEntry[] };
 
@@ -1466,6 +1466,18 @@ async function deleteSelectedMessages(): Promise<void> {
         selected.push({ accountId: current.accountId, uid: current.message.uid, folderId: current.message.folderId });
     }
 
+    // SAFETY GATE: confirm before a BULK delete. `Ctrl+A` selects every
+    // visible row, and in the "All Inboxes" view that's a scattered screenful
+    // across accounts — so a single Ctrl+A then Delete could silently trash
+    // dozens of messages with no prompt. That is exactly what trashed 114 of
+    // Bob's messages on 2026-06-12. A single-message delete (the common quick-
+    // triage case) stays instant; anything larger must be confirmed.
+    if (selected.length > 1) {
+        if (!confirm(`Move ${selected.length} messages to Trash?\n\n(Ctrl+Z restores them if this was a mistake.)`)) {
+            return;
+        }
+    }
+
     const statusSync = document.getElementById("status-sync");
 
     // Optimistic UI: remove from list IMMEDIATELY, then queue the IPC.
@@ -1477,17 +1489,14 @@ async function deleteSelectedMessages(): Promise<void> {
     const snapshot = [...selected];
     removeMessagesAndReconcile(selected);
 
-    // Undo support set immediately too — Ctrl+Z works the moment rows
-    // disappear from the list, not only after the daemon ACKs. Multi-select
-    // deletes only support undo for the first message today (consistent with
-    // the previous single-slot semantics); the loop+push pattern can be
-    // generalized later if Bob hits it.
-    if (snapshot.length === 1) {
-        pushUndo({ kind: "delete", at: Date.now(), payload: { ...snapshot[0], subject: "" } });
-        if (statusSync) statusSync.textContent = `Trashed 1 message (syncing) — Ctrl+Z to undo`;
-    } else {
-        if (statusSync) statusSync.textContent = `Trashed ${snapshot.length} messages (syncing)`;
-    }
+    // Undo restores the WHOLE batch, not just the first message — a bulk
+    // delete must be fully recoverable via Ctrl+Z (the old single-slot undo
+    // left the other N-1 unrecoverable, which made an accidental mass-delete
+    // unrecoverable; Bob 2026-06-12).
+    pushUndo({ kind: "delete", at: Date.now(), payload: snapshot.map(m => ({ ...m, subject: "" })) });
+    if (statusSync) statusSync.textContent = snapshot.length === 1
+        ? `Trashed 1 message (syncing) — Ctrl+Z to undo`
+        : `Trashed ${snapshot.length} messages (syncing) — Ctrl+Z to undo`;
 
     // Fire-and-forget per local-first: optimistic remove above already
     // updated the UI; the daemon-side trash is sync DB + queued IMAP.
@@ -1519,9 +1528,16 @@ async function performUndo(): Promise<void> {
     const statusSync = document.getElementById("status-sync");
     try {
         if (op.kind === "delete") {
-            const { accountId, uid, folderId } = op.payload;
-            await undeleteMessage(accountId, uid, folderId);
-            if (statusSync) statusSync.textContent = "Message restored";
+            // payload is the full batch (was a single object pre-2026-06-12;
+            // tolerate both shapes so an in-flight undo from an old build
+            // doesn't throw).
+            const msgs = Array.isArray(op.payload) ? op.payload : [op.payload];
+            for (const m of msgs) {
+                await undeleteMessage(m.accountId, m.uid, m.folderId);
+            }
+            if (statusSync) statusSync.textContent = msgs.length === 1
+                ? "Message restored"
+                : `Restored ${msgs.length} messages`;
         } else if (op.kind === "move") {
             const { messages } = op.payload;
             const byDest = new Map<string, { accountId: string; folderId: number; uids: number[] }>();