@bobfrankston/mailx-imap 0.1.55 → 0.1.57

package/index.js

@@ -5,7 +5,7 @@
  */
 import { createAutoImapConfig, CompatImapClient } from "@bobfrankston/iflow-direct";
 import { authenticateOAuth } from "@bobfrankston/oauthsupport";
-import { parseSerial, storeBus } from "@bobfrankston/mailx-store";
+import { parseSerial, fixCharsetDeclString, storeBus } from "@bobfrankston/mailx-store";
 import { loadSettings, getConfigDir, getHistoryDays, getPrefetch } from "@bobfrankston/mailx-settings";
 import { EventEmitter } from "node:events";
 import * as fs from "node:fs";
@@ -106,7 +106,11 @@ function decodeEntities(text) {
 /** Extract a plain-text preview from message source */
 async function extractPreview(source) {
     try {
-        const parsed = await parseSerial(source, "background");
+        // Normalize iso-8859-1 → windows-1252 in the part charset declaration
+        // before parsing, so the preview decodes 0x80-0x9F (smart quotes,
+        // em-dash) correctly — same correction the viewer path gets via
+        // sniffAndFixCharset (Bob 2026-05-22).
+        const parsed = await parseSerial(fixCharsetDeclString(source), "background");
         const bodyText = parsed.text || "";
         const bodyHtml = parsed.html || "";
         // Use text part; fall back to stripping HTML tags if text is empty
@@ -3191,6 +3195,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) {
@@ -3200,7 +3213,11 @@ 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);
@@ -3276,6 +3293,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) {
@@ -3292,7 +3325,13 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.55",
+  "version": "0.1.57",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -11,7 +11,7 @@
   "dependencies": {
     "@bobfrankston/mailx-types": "^0.1.18",
     "@bobfrankston/mailx-settings": "^0.1.22",
-    "@bobfrankston/mailx-store": "^0.1.32",
+    "@bobfrankston/mailx-store": "^0.1.34",
     "@bobfrankston/iflow-direct": "^0.1.50",
     "@bobfrankston/tcp-transport": "^0.1.6",
     "@bobfrankston/smtp-direct": "^0.1.8",
@@ -39,7 +39,7 @@
     "dependencies": {
       "@bobfrankston/mailx-types": "^0.1.18",
       "@bobfrankston/mailx-settings": "^0.1.22",
-      "@bobfrankston/mailx-store": "^0.1.32",
+      "@bobfrankston/mailx-store": "^0.1.34",
       "@bobfrankston/iflow-direct": "^0.1.50",
       "@bobfrankston/tcp-transport": "^0.1.6",
       "@bobfrankston/smtp-direct": "^0.1.8",