@bobfrankston/rmfmail 1.2.335 → 1.2.337

package/packages/mailx-service/index.ts

@@ -2405,10 +2405,17 @@ export class MailxService implements MailxApi {
             const SERVER_SEARCH_BATCH = 8;
 
             let aborted = false;
+            // 2026-09-16 — Claude Code (Fable 5.1), at Bob's direction ("make
+            // server search honor the folder dropdown"). A folderId means the
+            // scope dropdown says "This folder": sweep only that folder on that
+            // account. folderId 0 / absent = every selectable folder everywhere.
+            const scopedAccounts = folderId && accountId ? dbAccounts.filter((a: any) => a.id === accountId) : dbAccounts;
+            if (folderId) console.log(`  [server-search] q="${q}" scoped to ${accountId}/folder ${folderId}`);
             outer:
-            for (const acct of dbAccounts) {
+            for (const acct of scopedAccounts) {
                 const folders = this.db.getFolders(acct.id)
                     .filter((f: any) => !(f.flags || []).some((x: string) => /noselect/i.test(x)))
+                    .filter((f: any) => !folderId || f.id === folderId)
                     .filter((f: any) => folderTerms.length === 0 || folderTerms.some(t =>
                         (f.name || "").toLowerCase().includes(t) || (f.path || "").toLowerCase().includes(t)));
                 for (let i = 0; i < folders.length; i += SERVER_SEARCH_BATCH) {
@@ -3728,7 +3735,21 @@ export class MailxService implements MailxApi {
         try {
             (this.imapManager as any).emit?.("folderCountsChanged", accountId, {});
         } catch { /* non-fatal */ }
-        await this.imapManager.emptyFolderViaServer(accountId, folder.path);
+        // 2026-09-16 — Claude Code (Fable 5.1), at Bob's direction. Local-first:
+        // the local commit above IS the user's result; the server purge is a
+        // background mirror. This used to be awaited, so the WebView's IPC call
+        // sat on a per-message IMAP delete loop and expired ("Failed: mailxapi
+        // timeout: emptyFolder") while the server kept deleting. Failures now
+        // surface through the syncError banner instead of a dead IPC promise.
+        const started = Date.now();
+        console.log(`  [folder] ${accountId}: emptying "${folder.path}" on the server (background)`);
+        void this.imapManager.emptyFolderViaServer(accountId, folder.path)
+            .then((n: number) => console.log(`  [folder] ${accountId}: emptied "${folder.path}" on the server — ${n} message(s) in ${Date.now() - started} ms`))
+            .catch((e: any) => {
+                console.error(`  [folder] ${accountId}: empty "${folder.path}" on the server FAILED: ${e?.message || e}`);
+                try { (this.imapManager as any).emit?.("syncError", accountId, `Emptying "${folder.name}" on the server failed: ${e?.message || e}. The local copy is cleared; the next sync will show what remains.`); }
+                catch { /* the banner is best-effort; the console line above is the record */ }
+            });
     }
 
     // ── Attachments ──

package/packages/mailx-service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-service",
-  "version": "0.1.42",
+  "version": "0.1.43",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",

package/packages/mailx-store-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store-web",
-  "version": "0.1.120",
+  "version": "0.1.121",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",