@bobfrankston/mailx 1.0.215 → 1.0.217

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1344,"width":2151,"x":304,"y":36}
+{"height":1344,"width":2151,"x":243,"y":28}

package/client/components/message-list.js

@@ -335,6 +335,15 @@ function appendMessages(body, accountId, items) {
             tag.title = msgAccountId;
             from.prepend(tag);
         }
+        // Search/cross-folder results carry folderName — show a tag so the user
+        // can tell which folder each hit lives in.
+        if (msg.folderName) {
+            const folderTag = document.createElement("span");
+            folderTag.className = "ml-folder-tag";
+            folderTag.textContent = msg.folderName;
+            folderTag.title = `In folder: ${msg.folderName}`;
+            from.prepend(folderTag);
+        }
         const subject = document.createElement("span");
         subject.className = "ml-subject";
         subject.innerHTML = escapeHtml(msg.subject);

package/client/compose/compose.js

@@ -292,28 +292,10 @@ function applyInit(init) {
     else
         editor.focus();
 }
-// ── Load init data from sessionStorage, then ensure From is populated ──
-const stored = sessionStorage.getItem("composeInit");
-if (stored) {
-    sessionStorage.removeItem("composeInit");
-    applyInit(JSON.parse(stored));
-}
-else {
-    // New compose — focus To
-    toInput.focus();
-}
-// If From dropdown is empty (new compose without init, or init had no accounts), fetch from API
-if (fromSelect.options.length === 0) {
-    getAccounts()
-        .then((accounts) => {
-        populateFromSelect(accounts);
-    })
-        .catch((e) => console.error("Failed to load accounts:", e));
-}
-// ── Auto-save drafts every 5 seconds ──
+// ── Compose state (declared before init so the async IIFE can reference them) ──
 let draftUid = null;
 let draftId = null; // stable ID for dedup when APPENDUID unavailable
-let draftTimer;
+let draftTimer = null;
 let lastDraftContent = "";
 let draftSaving = false; // prevent concurrent saves
 async function saveDraft() {
@@ -347,7 +329,33 @@ async function saveDraft() {
         draftSaving = false;
     }
 }
-draftTimer = setInterval(saveDraft, 5000);
+// ── Initialize: always fetch real accounts from the API before applying init, then
+//    start the auto-save timer. Callers like message-viewer's Edit Draft pass
+//    init.accounts=[], so we can't trust what's in the init blob. ──
+(async () => {
+    let accounts = [];
+    try {
+        accounts = await getAccounts();
+    }
+    catch (e) {
+        console.error("Failed to load accounts:", e);
+    }
+    const stored = sessionStorage.getItem("composeInit");
+    if (stored) {
+        sessionStorage.removeItem("composeInit");
+        const init = JSON.parse(stored);
+        if (!init.accounts || init.accounts.length === 0)
+            init.accounts = accounts;
+        applyInit(init);
+    }
+    else {
+        populateFromSelect(accounts);
+        toInput.focus();
+    }
+    // Start auto-save after init so draftUid/draftId from the edit-draft flow are
+    // already in place when the first save fires.
+    draftTimer = setInterval(saveDraft, 5000);
+})();
 // ── Send ──
 document.getElementById("btn-send")?.addEventListener("click", async () => {
     const btn = document.getElementById("btn-send");
@@ -365,10 +373,15 @@ document.getElementById("btn-send")?.addEventListener("click", async () => {
     };
     try {
         await sendMessage(body);
-        // Delete draft after successful send
-        clearInterval(draftTimer);
-        if (draftUid) {
-            deleteDraft(getFromAccountId(), draftUid).catch(() => { });
+        // Delete draft after successful send — stop auto-save first so it can't
+        // append a fresh copy after we delete. Use the stored draftId as a fallback
+        // so any orphaned drafts with the same stable ID are cleaned up too.
+        if (draftTimer) {
+            clearInterval(draftTimer);
+            draftTimer = null;
+        }
+        if (draftUid || draftId) {
+            deleteDraft(getFromAccountId(), draftUid || 0, draftId || "").catch(() => { });
         }
         closeCompose();
     }

package/client/lib/api-client.js

@@ -143,8 +143,8 @@ export function saveSettings(settings) {
 export function repairAccounts() {
     return ipc().repairAccounts?.();
 }
-export function deleteDraft(accountId, draftUid) {
-    return ipc().deleteDraft?.(accountId, draftUid);
+export function deleteDraft(accountId, draftUid, draftId) {
+    return ipc().deleteDraft?.(accountId, draftUid, draftId);
 }
 export function setupAccount(name, email, password) {
     return ipc().setupAccount?.(name, email, password);

package/client/lib/mailxapi.js

@@ -89,8 +89,8 @@
         // Compose
         sendMessage: function(msg) { return callNode("sendMessage", msg); },
         saveDraft: function(params) { return callNode("saveDraft", params); },
-        deleteDraft: function(accountId, draftUid) {
-            return callNode("deleteDraft", { accountId: accountId, draftUid: draftUid });
+        deleteDraft: function(accountId, draftUid, draftId) {
+            return callNode("deleteDraft", { accountId: accountId, draftUid: draftUid, draftId: draftId });
         },
 
         // Search

package/client/styles/components.css

@@ -385,6 +385,20 @@ button.tb-menu-item { background: none; border: none; color: inherit; width: 100
 }
 .ml-account-tag[title="gmail"] { background: #d93025; }
 .ml-account-tag[title="bobma"] { background: #1a73e8; }
+.ml-folder-tag {
+    display: inline-block;
+    padding: 0 6px;
+    font-size: 0.72rem;
+    font-weight: 500;
+    border-radius: 3px;
+    margin-right: 4px;
+    color: var(--color-text);
+    background: color-mix(in oklch, var(--color-accent) 18%, transparent);
+    vertical-align: baseline;
+    max-width: 10em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
 .ml-subject {
     overflow: hidden;
     text-overflow: ellipsis;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.215",
+  "version": "1.0.217",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,7 @@
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.22",
-    "@bobfrankston/msger": "^0.1.277",
+    "@bobfrankston/msger": "^0.1.279",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -78,7 +78,7 @@
       "@bobfrankston/iflow-node": "^0.1.2",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.22",
-      "@bobfrankston/msger": "^0.1.277",
+      "@bobfrankston/msger": "^0.1.279",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-api/index.js

@@ -274,7 +274,7 @@ export function createApiRouter(db, imapManager) {
         try {
             const { accountId, subject, bodyHtml, bodyText, to, cc, previousDraftUid, draftId } = req.body;
             const result = await svc.saveDraft(accountId, subject, bodyHtml, bodyText, to, cc, previousDraftUid, draftId);
-            res.json({ ok: true, draftUid: result.uid, draftId: result.draftId });
+            res.json({ ok: true, draftUid: result.draftUid, draftId: result.draftId });
         }
         catch (e) {
             res.status(500).json({ error: e.message });
@@ -282,8 +282,8 @@ export function createApiRouter(db, imapManager) {
     });
     router.delete("/draft", async (req, res) => {
         try {
-            if (req.body.accountId && req.body.draftUid)
-                await svc.deleteDraft(req.body.accountId, req.body.draftUid);
+            if (req.body.accountId && (req.body.draftUid || req.body.draftId))
+                await svc.deleteDraft(req.body.accountId, req.body.draftUid || 0, req.body.draftId);
             res.json({ ok: true });
         }
         catch (e) {

package/packages/mailx-core/index.d.ts

@@ -51,6 +51,7 @@ export declare function getMessage(params: {
     id: number;
     accountId: string;
     folderId: number;
+    folderName?: string;
     uid: number;
     messageId: string;
     inReplyTo: string;

package/packages/mailx-imap/index.d.ts

@@ -169,8 +169,10 @@ export declare class ImapManager extends EventEmitter {
     /** Save a draft to the Drafts folder via IMAP APPEND.
      *  Returns the UID of the saved draft (for replacing on next save). */
     saveDraft(accountId: string, rawMessage: string | Buffer, previousDraftUid?: number, draftId?: string): Promise<number | null>;
-    /** Delete a draft after successful send */
-    deleteDraft(accountId: string, draftUid: number): Promise<void>;
+    /** Delete a draft (or all drafts with a stable X-Mailx-Draft-ID) after successful send.
+     *  Tries the specific UID first, then falls back to searchByHeader so orphaned copies
+     *  from earlier failed autosaves are cleaned up at the same time. */
+    deleteDraft(accountId: string, draftUid: number, draftId?: string): Promise<void>;
     /** Queue outgoing message locally — never fails, worker handles IMAP+SMTP */
     queueOutgoingLocal(accountId: string, rawMessage: string): void;
     /** Guard against concurrent processSendActions for the same account */

package/packages/mailx-imap/index.js

@@ -1558,24 +1558,32 @@ export class ImapManager extends EventEmitter {
         }
         const client = this.createClient(accountId);
         try {
-            // Delete previous draft — by UID if we have it, otherwise by X-Mailx-Draft-ID header
+            // Delete previous draft — try UID first (fast path), and ALWAYS also try
+            // searchByHeader(X-Mailx-Draft-ID) as a safety net. Running both catches
+            // orphans from a crash-mid-save or a UID delete that failed silently.
             if (previousDraftUid) {
                 try {
                     await client.deleteMessageByUid(drafts.path, previousDraftUid);
                 }
-                catch { /* previous draft may already be gone */ }
+                catch (e) {
+                    console.error(`  [drafts] Delete prev UID ${previousDraftUid} failed: ${e.message}`);
+                }
             }
-            else if (draftId) {
-                // Search Drafts for our draft ID and delete it
+            if (draftId) {
                 try {
                     const uids = await client.searchByHeader(drafts.path, "X-Mailx-Draft-ID", draftId);
                     for (const uid of uids) {
-                        await client.deleteMessageByUid(drafts.path, uid);
+                        try {
+                            await client.deleteMessageByUid(drafts.path, uid);
+                        }
+                        catch { /* next */ }
                     }
                     if (uids.length > 0)
-                        console.log(`  [drafts] Deleted ${uids.length} previous draft(s) by ID ${draftId}`);
+                        console.log(`  [drafts] Deleted ${uids.length} stale draft(s) by ID ${draftId}`);
+                }
+                catch (e) {
+                    console.error(`  [drafts] searchByHeader for ${draftId} failed: ${e.message}`);
                 }
-                catch { /* search not supported or failed — tolerate duplicate */ }
             }
             // Append new draft
             const result = await client.appendMessage(drafts.path, rawMessage, ["\\Draft", "\\Seen"]);
@@ -1590,18 +1598,42 @@ export class ImapManager extends EventEmitter {
             catch { /* ignore */ }
         }
     }
-    /** Delete a draft after successful send */
-    async deleteDraft(accountId, draftUid) {
+    /** Delete a draft (or all drafts with a stable X-Mailx-Draft-ID) after successful send.
+     *  Tries the specific UID first, then falls back to searchByHeader so orphaned copies
+     *  from earlier failed autosaves are cleaned up at the same time. */
+    async deleteDraft(accountId, draftUid, draftId) {
         const drafts = this.findFolder(accountId, "drafts");
-        if (!drafts || !draftUid)
+        if (!drafts)
+            return;
+        if (!draftUid && !draftId)
             return;
         const client = this.createClient(accountId);
         try {
-            await client.deleteMessageByUid(drafts.path, draftUid);
-            console.log(`  [drafts] Deleted draft UID ${draftUid}`);
-        }
-        catch (e) {
-            console.error(`  [drafts] Delete error: ${e.message}`);
+            if (draftUid) {
+                try {
+                    await client.deleteMessageByUid(drafts.path, draftUid);
+                    console.log(`  [drafts] Deleted draft UID ${draftUid}`);
+                }
+                catch (e) {
+                    console.error(`  [drafts] Delete by UID ${draftUid} failed: ${e.message}`);
+                }
+            }
+            if (draftId) {
+                try {
+                    const uids = await client.searchByHeader(drafts.path, "X-Mailx-Draft-ID", draftId);
+                    for (const uid of uids) {
+                        try {
+                            await client.deleteMessageByUid(drafts.path, uid);
+                        }
+                        catch { /* next */ }
+                    }
+                    if (uids.length > 0)
+                        console.log(`  [drafts] Deleted ${uids.length} draft(s) by ID ${draftId}`);
+                }
+                catch (e) {
+                    console.error(`  [drafts] searchByHeader for ${draftId} failed: ${e.message}`);
+                }
+            }
         }
         finally {
             try {

package/packages/mailx-service/index.d.ts

@@ -48,10 +48,10 @@ export declare class MailxService {
         filename: string;
     }>;
     saveDraft(accountId: string, subject: string, bodyHtml: string, bodyText: string, to?: string, cc?: string, previousDraftUid?: number, draftId?: string): Promise<{
-        uid: number | null;
+        draftUid: number | null;
         draftId: string;
     }>;
-    deleteDraft(accountId: string, draftUid: number): Promise<void>;
+    deleteDraft(accountId: string, draftUid: number, draftId?: string): Promise<void>;
     searchContacts(query: string): any[];
     syncGoogleContacts(): Promise<void>;
     seedContacts(): number;

package/packages/mailx-service/index.js

@@ -572,11 +572,11 @@ export class MailxService {
             }
         }
         catch { /* ignore */ }
-        const uid = await this.imapManager.saveDraft(accountId, raw, previousDraftUid, id);
-        return { uid, draftId: id };
+        const draftUid = await this.imapManager.saveDraft(accountId, raw, previousDraftUid, id);
+        return { draftUid, draftId: id };
     }
-    async deleteDraft(accountId, draftUid) {
-        await this.imapManager.deleteDraft(accountId, draftUid);
+    async deleteDraft(accountId, draftUid, draftId) {
+        await this.imapManager.deleteDraft(accountId, draftUid, draftId);
     }
     // ── Contacts ──
     searchContacts(query) {

package/packages/mailx-service/jsonrpc.js

@@ -76,7 +76,7 @@ async function dispatchAction(svc, action, p) {
         case "saveDraft":
             return svc.saveDraft(p.accountId, p.subject, p.bodyHtml, p.bodyText, p.to, p.cc, p.previousDraftUid, p.draftId);
         case "deleteDraft":
-            await svc.deleteDraft(p.accountId, p.draftUid);
+            await svc.deleteDraft(p.accountId, p.draftUid, p.draftId);
             return { ok: true };
         // Sync
         case "syncAll":

package/packages/mailx-store/db.js

@@ -448,8 +448,9 @@ export class MailxDB {
             }
             const countRow = this.db.prepare(`SELECT COUNT(*) as cnt FROM messages m JOIN messages_fts fts ON m.id = fts.rowid WHERE messages_fts MATCH ?${scopeWhere}`).get(ftsQuery, ...scopeParams);
             const total = countRow?.cnt || 0;
-            const rows = this.db.prepare(`SELECT m.* FROM messages m
+            const rows = this.db.prepare(`SELECT m.*, f.name AS folder_name FROM messages m
                  JOIN messages_fts fts ON m.id = fts.rowid
+                 LEFT JOIN folders f ON f.id = m.folder_id AND f.account_id = m.account_id
                  WHERE messages_fts MATCH ?${scopeWhere}
                  ORDER BY m.date DESC
                  LIMIT ? OFFSET ?`).all(ftsQuery, ...scopeParams, pageSize, offset);
@@ -457,6 +458,7 @@ export class MailxDB {
                 id: r.id,
                 accountId: r.account_id,
                 folderId: r.folder_id,
+                folderName: r.folder_name || "",
                 uid: r.uid,
                 messageId: r.message_id || "",
                 inReplyTo: r.in_reply_to || "",

package/packages/mailx-types/index.d.ts

@@ -59,6 +59,7 @@ export interface MessageEnvelope {
     id: number; /** Local store ID */
     accountId: string;
     folderId: number;
+    folderName?: string; /** Leaf folder name; populated by cross-folder search so the UI can tag each hit */
     uid: number; /** IMAP UID */
     messageId: string; /** RFC Message-ID header */
     inReplyTo: string; /** For threading */