@bobfrankston/mailx 1.0.349 → 1.0.351

package/client/components/tasks.js

@@ -236,8 +236,13 @@ export async function openTasks() {
         document.removeEventListener("keydown", onKey, true);
         isOpen = false;
     };
+    // Esc always closes. Earlier guard blocked Esc when focus was in the
+    // quickadd input, which made the panel feel stuck — user hits Esc to
+    // dismiss and nothing happens. Blur-on-Esc before close is the right
+    // behavior: the close handler is idempotent and the input loses focus
+    // when the backdrop goes away anyway.
     const onKey = (e) => {
-        if (e.key === "Escape" && document.activeElement?.tagName !== "INPUT") {
+        if (e.key === "Escape") {
             e.stopPropagation();
             e.preventDefault();
             close();

package/client/compose/compose.js

@@ -595,32 +595,66 @@ document.getElementById("btn-send")?.addEventListener("click", () => {
         return;
     }
     console.log(`[compose] Send clicked: from=${body.from} to=${JSON.stringify(body.to)} subject="${body.subject}" attachments=${body.attachments.length}`);
-    // Stop autosave so it can't write a fresh draft after we close.
-    if (draftTimer) {
-        clearInterval(draftTimer);
-        draftTimer = null;
-    }
-    // Fire-and-forget. The disk-write is the durable commit; queue depth +
-    // retry status are visible in the parent status bar. No modal dialogs.
+    // Wait for the IPC round-trip before closing compose. The IPC is supposed
+    // to be <100ms (Node validates + disk-writes synchronously inside send()
+    // then returns). If it throws OR takes too long, the user keeps their
+    // typed message and sees the error inline instead of losing it to a
+    // fire-and-forget that never landed. Earlier fire-and-forget version lost
+    // messages silently when anything upstream of disk write broke.
+    const sendBtn = document.getElementById("btn-send");
+    if (sendBtn) {
+        sendBtn.disabled = true;
+        sendBtn.textContent = "Sending…";
+    }
+    const statusEl = document.getElementById("compose-status");
+    if (statusEl)
+        statusEl.textContent = "";
     const sendStart = Date.now();
-    sendMessage(body)
+    let ipcPromise;
+    try {
+        ipcPromise = sendMessage(body);
+    }
+    catch (e) {
+        const msg = e?.message || String(e);
+        console.error(`[compose] Send threw synchronously: ${msg}`);
+        if (sendBtn) {
+            sendBtn.disabled = false;
+            sendBtn.textContent = "Send";
+        }
+        if (statusEl)
+            statusEl.textContent = `Send failed: ${msg}`;
+        else
+            alert(`Send failed: ${msg}`);
+        return;
+    }
+    Promise.resolve(ipcPromise)
         .then(() => {
         console.log(`[compose] Send IPC returned OK in ${Date.now() - sendStart}ms`);
+        // Stop autosave only after ACK — if send threw we want the draft
+        // autosave to keep the message safe.
+        if (draftTimer) {
+            clearInterval(draftTimer);
+            draftTimer = null;
+        }
         if (draftUid || draftId) {
             deleteDraft(getFromAccountId(), draftUid || 0, draftId || "").catch(() => { });
         }
+        closeCompose();
     })
         .catch((e) => {
         const msg = e?.message || String(e);
         console.error(`[compose] Send IPC failed after ${Date.now() - sendStart}ms: ${msg}`);
-        // Forward to parent so it surfaces in the status bar / banner — no
-        // alert here because the compose window is already closed.
+        if (sendBtn) {
+            sendBtn.disabled = false;
+            sendBtn.textContent = "Send";
+        }
+        if (statusEl)
+            statusEl.textContent = `Send failed: ${msg}`;
         try {
             parent.postMessage({ type: "mailx-send-error", message: msg, accountId: body.from }, "*");
         }
         catch { /* */ }
     });
-    closeCompose();
 });
 // ── Close handling ──
 /** True if the compose has anything worth asking about. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.349",
+  "version": "1.0.351",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,7 +20,7 @@
     "postinstall": "node bin/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow-direct": "^0.1.24",
+    "@bobfrankston/iflow-direct": "^0.1.25",
     "@bobfrankston/iflow-node": "^0.1.7",
     "@bobfrankston/miscinfo": "^1.0.9",
     "@bobfrankston/oauthsupport": "^1.0.24",
@@ -84,7 +84,7 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/iflow-direct": "^0.1.24",
+      "@bobfrankston/iflow-direct": "^0.1.25",
       "@bobfrankston/iflow-node": "^0.1.7",
       "@bobfrankston/miscinfo": "^1.0.9",
       "@bobfrankston/oauthsupport": "^1.0.24",

package/packages/mailx-imap/index.js

@@ -2471,6 +2471,12 @@ export class ImapManager extends EventEmitter {
      *  work and risked double-send when both paths fired on the same message. */
     queueOutgoingLocal(accountId, rawMessage) {
         // Loud logging so a "vanished message" report is diagnosable from the log alone.
+        // ALWAYS leave a backup copy in sending/<acct>/attempted/ first — unconditionally,
+        // before the outbox write. The outbox .ltr may be claimed/consumed by the worker
+        // within milliseconds; this copy survives regardless of SMTP success, IMAP
+        // append, worker crash, or any other downstream failure. User asked for this
+        // as a fallback because "there isn't even the backup copy in sent".
+        this.saveSendingCopy(accountId, rawMessage, "attempted");
         const outboxDir = path.join(getConfigDir(), "outbox", accountId);
         try {
             fs.mkdirSync(outboxDir, { recursive: true });