@bobfrankston/rmfmail 1.1.124 → 1.1.125

package/packages/mailx-imap/index.ts

@@ -3205,6 +3205,15 @@ export class ImapManager extends EventEmitter {
                             }
                             continue;
                         }
+                        // Success — clear the in-flight delete/move
+                        // suppression (see the IMAP branch below for the
+                        // full rationale). After a move the local row lives
+                        // at the TARGET folder, so the (uid, folder) lookup
+                        // uses targetFolderId.
+                        if (action.action === "move") {
+                            this.db.clearTombstoneForUid(accountId, action.uid, action.targetFolderId);
+                            this.db.clearMessagePendingDelete(accountId, action.uid, action.targetFolderId);
+                        }
                         this.db.completeSyncAction(action.id);
                     } catch (e: any) {
                         console.error(`  [api] ${accountId}: flag sync failed UID ${action.uid}: ${e.message}`);
@@ -3213,7 +3222,10 @@ export class ImapManager extends EventEmitter {
                             // Terminal failure on delete/move → clear tombstone
                             // so the row reappears on next sync (server still
                             // has it). Same rationale as the IMAP branch below.
-                            if (action.action === "delete" || action.action === "move") {
+                            if (action.action === "move") {
+                                this.db.clearTombstoneForUid(accountId, action.uid, action.targetFolderId);
+                                this.db.clearMessagePendingDelete(accountId, action.uid, action.targetFolderId);
+                            } else if (action.action === "delete") {
                                 this.db.clearTombstoneForUid(accountId, action.uid, action.folderId);
                             }
                             this.db.completeSyncAction(action.id);
@@ -3287,6 +3299,22 @@ export class ImapManager extends EventEmitter {
                             break;
                         }
                     }
+                    // Success: the local action reached the server. Lift the
+                    // in-flight delete/move suppression so the destination
+                    // folder syncs the moved message under its real
+                    // post-move UID. hasTombstone's documented contract is
+                    // "cleared on successful action complete OR permanent
+                    // failure" — only the failure half had been wired, so a
+                    // successful move left a Message-ID tombstone alive for
+                    // 30 days, blocking the Trash folder from ever storing
+                    // the message (and resurrecting it once the tombstone
+                    // finally aged out). After a move the local row lives at
+                    // the TARGET folder, so the (uid, folder) lookup uses
+                    // targetFolderId.
+                    if (action.action === "move") {
+                        this.db.clearTombstoneForUid(accountId, action.uid, action.targetFolderId);
+                        this.db.clearMessagePendingDelete(accountId, action.uid, action.targetFolderId);
+                    }
                     this.db.completeSyncAction(action.id);
                 } catch (e: any) {
                     console.error(`  [sync] Failed action ${action.action} UID ${action.uid}: ${e.message}`);
@@ -3302,7 +3330,12 @@ export class ImapManager extends EventEmitter {
                         // reflecting "your action didn't take, here it is
                         // again." Applies to delete + move; flags/append
                         // never tombstone.
-                        if (action.action === "delete" || action.action === "move") {
+                        if (action.action === "move") {
+                            // Local row is at the TARGET folder (the local
+                            // move committed; only the server move failed).
+                            this.db.clearTombstoneForUid(accountId, action.uid, action.targetFolderId);
+                            this.db.clearMessagePendingDelete(accountId, action.uid, action.targetFolderId);
+                        } else if (action.action === "delete") {
                             this.db.clearTombstoneForUid(accountId, action.uid, action.folderId);
                         }
                         this.db.completeSyncAction(action.id);

package/packages/mailx-imap/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.56",
+  "version": "0.1.57",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bobfrankston/mailx-imap",
-      "version": "0.1.56",
+      "version": "0.1.57",
       "license": "ISC",
       "dependencies": {
         "@bobfrankston/iflow-direct": "^0.1.27",

package/packages/mailx-imap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.56",
+  "version": "0.1.57",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",