@bobfrankston/mailx-sync 0.1.16 → 0.1.18

package/gmail.d.ts

@@ -63,11 +63,11 @@ export declare class GmailApiProvider implements MailProvider {
      *  as a destination folder — `POST /messages/{id}/trash` is the native
      *  path (equivalent to setting TRASH and removing INBOX in one op).
      *  Used by mailx's delete/trash path. */
-    trashMessage(folder: string, uid: number): Promise<void>;
+    trashMessage(folder: string, uid: number, gmailId?: string): Promise<void>;
     /** Move between "folders" == swap one label for another via modifyLabels.
      *  System labels (INBOX/SENT/TRASH/SPAM) are translated from the folder
      *  path; user labels use the folder path verbatim as the label id. */
-    moveMessage(fromFolder: string, uid: number, toFolder: string): Promise<void>;
+    moveMessage(fromFolder: string, uid: number, toFolder: string, gmailId?: string): Promise<void>;
     /** Folder path → Gmail label id. System folders map to uppercase label
      *  constants; anything else is treated as a user label (identical name). */
     private folderPathToLabelId;

package/gmail.js

@@ -556,10 +556,19 @@ export class GmailApiProvider {
      *  as a destination folder — `POST /messages/{id}/trash` is the native
      *  path (equivalent to setting TRASH and removing INBOX in one op).
      *  Used by mailx's delete/trash path. */
-    async trashMessage(folder, uid) {
-        const query = `in:${this.folderToLabel(folder)}`;
-        const ids = await this.listMessageIds(query, 1000);
-        const id = ids.find(id => idToUid(id) === uid);
+    async trashMessage(folder, uid, gmailId) {
+        // Prefer the caller-supplied Gmail message id (mailx stores it as
+        // `provider_id`). The fallback — list the folder and hash-match the
+        // uid — is capped at 1000, so on a large mailbox it CANNOT find a
+        // message past the most-recent ~1000: the trash then throws, the
+        // sync action fails its retries, and clearTombstoneForUid resurrects
+        // the message ("deletions un-happening", Bob 2026-05-17). Passing the
+        // stored id skips that broken search entirely.
+        let id = gmailId;
+        if (!id) {
+            const ids = await this.listMessageIds(`in:${this.folderToLabel(folder)}`, 1000);
+            id = ids.find(x => idToUid(x) === uid);
+        }
         if (!id)
             throw new Error(`Gmail trashMessage: UID ${uid} not found in ${folder}`);
         await this.fetch(`/messages/${id}/trash`, { method: "POST" });
@@ -567,10 +576,15 @@ export class GmailApiProvider {
     /** Move between "folders" == swap one label for another via modifyLabels.
      *  System labels (INBOX/SENT/TRASH/SPAM) are translated from the folder
      *  path; user labels use the folder path verbatim as the label id. */
-    async moveMessage(fromFolder, uid, toFolder) {
-        const query = `in:${this.folderToLabel(fromFolder)}`;
-        const ids = await this.listMessageIds(query, 1000);
-        const id = ids.find(id => idToUid(id) === uid);
+    async moveMessage(fromFolder, uid, toFolder, gmailId) {
+        // See trashMessage — prefer the caller's stored Gmail id; the
+        // list-and-hash fallback is capped at 1000 and breaks on large
+        // folders.
+        let id = gmailId;
+        if (!id) {
+            const ids = await this.listMessageIds(`in:${this.folderToLabel(fromFolder)}`, 1000);
+            id = ids.find(x => idToUid(x) === uid);
+        }
         if (!id)
             throw new Error(`Gmail moveMessage: UID ${uid} not found in ${fromFolder}`);
         // Map the folder path to the label id. System labels are uppercased

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-sync",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Platform-agnostic mail provider implementations + sync orchestration. Single source of truth for Gmail/IMAP/Outlook protocol code, consumed by both desktop (Node) and Android (WebView) — eliminates the parallel mailx-imap/mailx-store-web Gmail providers that drifted in practice.",
   "main": "index.js",
   "types": "index.ts",
@@ -19,7 +19,7 @@
   "author": "Bob Frankston",
   "license": "ISC",
   "dependencies": {
-    "@bobfrankston/iflow-direct": "^0.1.38",
+    "@bobfrankston/iflow-direct": "^0.1.50",
     "@bobfrankston/tcp-transport": "^0.1.6"
   },
   "exports": {
@@ -44,7 +44,7 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/iflow-direct": "^0.1.38",
+      "@bobfrankston/iflow-direct": "^0.1.50",
       "@bobfrankston/tcp-transport": "^0.1.6"
     }
   }