@bobfrankston/mailx-imap 0.1.116 → 0.1.118

package/index.js

@@ -2216,10 +2216,17 @@ export class ImapManager extends EventEmitter {
                     // to dest), the (acc, folder, uid) lookup at fire time
                     // won't match — skip. If still at original (truly gone
                     // from server, not just moved), commit the delete.
+                    // Drafts/Sent never receive server-side Sieve moves — the long
+                    // grace only helps INBOX-class folders rebind moves. Worse, the
+                    // 30-min timer dies on every daemon restart and re-detection
+                    // restarts the clock, so on a restart-heavy day a sent-and-
+                    // deleted draft's local orphan NEVER got reaped (Bob 2026-07-13
+                    // "still getting sent messages left in drafts"). Short grace there.
+                    const quickReap = folder.specialUse === "drafts" || folder.specialUse === "sent" || folder.specialUse === "outbox";
                     for (const uid of toDelete) {
-                        this.scheduleDeferredReconcileDelete(accountId, folderId, uid, folder.path);
+                        this.scheduleDeferredReconcileDelete(accountId, folderId, uid, folder.path, quickReap ? 60_000 : undefined);
                     }
-                    console.log(`  [reconcile-defer] ${accountId}/${folder.path}: scheduled ${toDelete.length} deletes (${ImapManager.RECONCILE_DELETE_GRACE_MS / 60_000}min grace for move-detect)`);
+                    console.log(`  [reconcile-defer] ${accountId}/${folder.path}: scheduled ${toDelete.length} deletes (${quickReap ? "60s" : `${ImapManager.RECONCILE_DELETE_GRACE_MS / 60_000}min`} grace)`);
                 }
             }
             catch (e) {
@@ -3303,7 +3310,7 @@ export class ImapManager extends EventEmitter {
      *  in production — the grace expired and rows were committed-deleted
      *  before _Spam / Sent / archive folders had a chance to rebind. */
     static RECONCILE_DELETE_GRACE_MS = 30 * 60_000;
-    scheduleDeferredReconcileDelete(accountId, folderId, uid, folderPath) {
+    scheduleDeferredReconcileDelete(accountId, folderId, uid, folderPath, graceMs) {
         const key = `${accountId}:${folderId}:${uid}`;
         // If already pending, don't reset — the grace clock runs from the
         // FIRST detection so a flapping server can't keep deferring.
@@ -3341,7 +3348,7 @@ export class ImapManager extends EventEmitter {
             }
             this.db.recalcFolderCounts(folderId);
             this.emit("folderCountsChanged", accountId, {});
-        }, ImapManager.RECONCILE_DELETE_GRACE_MS);
+        }, graceMs ?? ImapManager.RECONCILE_DELETE_GRACE_MS);
         this.deferredDeletes.set(key, t);
     }
     /** Delete local rows whose uid >= the server's UIDNEXT for this folder.
@@ -4501,9 +4508,11 @@ export class ImapManager extends EventEmitter {
         // seem to still leave it in draft so I don't know if it has been
         // sent or not. Once you hand it off it must leave draft."
         let localDeletedUid = 0;
+        let localDeletedUuid;
         if (draftUid) {
             const existing = this.db.getMessageByUid(accountId, draftUid, drafts.id);
             if (existing) {
+                localDeletedUuid = existing.uuid;
                 this.unlinkBodyFile(accountId, draftUid, drafts.id).catch(() => { });
                 this.db.deleteMessage(accountId, drafts.id, draftUid, "user sent the message (draft cleanup)", "mailx-imap deleteDraft (local)");
                 localDeletedUid = draftUid;
@@ -4520,6 +4529,17 @@ export class ImapManager extends EventEmitter {
         if (localDeletedUid > 0) {
             this.db.recalcFolderCounts(drafts.id);
             this.emit("folderCountsChanged", accountId, {});
+            // messageRemoved drives the list's remove-stale flow AND the
+            // viewer clear. Without it, discarding a draft that was open in
+            // the preview pane left it displayed after the row vanished
+            // (Bob 2026-07-18: "I discarded a message but it is still
+            // showing in preview"). Same shape the reconciler publishes on
+            // server-side EXPUNGE.
+            storeBus.publish({
+                topic: localDeletedUuid ? `message:${localDeletedUuid}` : `folder:${drafts.id}`,
+                kind: "messageRemoved",
+                accountId, folderId: drafts.id, uid: localDeletedUid, msgUuid: localDeletedUuid,
+            });
         }
         let succeeded = false;
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.116",
+  "version": "0.1.118",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -12,7 +12,7 @@
     "@bobfrankston/mailx-types": "^0.1.24",
     "@bobfrankston/mailx-settings": "^0.1.35",
     "@bobfrankston/mailx-store": "^0.1.58",
-    "@bobfrankston/iflow-direct": "^0.1.56",
+    "@bobfrankston/iflow-direct": "^0.1.59",
     "@bobfrankston/tcp-transport": "^0.1.8",
     "@bobfrankston/smtp-direct": "^0.1.9",
     "@bobfrankston/mailx-sync": "^0.1.27",
@@ -40,7 +40,7 @@
       "@bobfrankston/mailx-types": "^0.1.24",
       "@bobfrankston/mailx-settings": "^0.1.35",
       "@bobfrankston/mailx-store": "^0.1.58",
-      "@bobfrankston/iflow-direct": "^0.1.56",
+      "@bobfrankston/iflow-direct": "^0.1.59",
       "@bobfrankston/tcp-transport": "^0.1.8",
       "@bobfrankston/smtp-direct": "^0.1.9",
       "@bobfrankston/mailx-sync": "^0.1.27",