@bobfrankston/rmfmail 1.2.252 → 1.2.254

package/client/app.ts

@@ -6066,6 +6066,30 @@ document.addEventListener("mailx-popout-message", (async (e: any) => {
             draftFolderId: msg.folderId,
             draftId: msg.mailxDraftId || "",
         };
+        // Reopening a draft must bring its attachments back into compose,
+        // exactly as forward / edit-as-new do. Drafts had none to bring until
+        // saveDraft started including them (2026-08-11); without this, editing
+        // a draft and re-saving would strip the files a second time.
+        if (Array.isArray(msg.attachments) && msg.attachments.length) {
+            const loaded: { filename: string; mimeType: string; dataBase64: string }[] = [];
+            for (const att of msg.attachments) {
+                try {
+                    const data = await getAttachment(accountId, msg.uid, att.id, msg.folderId);
+                    if (data?.content) {
+                        loaded.push({
+                            filename: data.filename || att.filename || "attachment",
+                            mimeType: data.contentType || att.contentType || "application/octet-stream",
+                            dataBase64: data.content,
+                        });
+                    }
+                } catch (e: any) {
+                    // Loud: a dropped attachment here means the next autosave
+                    // writes a draft without it.
+                    console.error(`[compose] edit draft: failed to load attachment ${att.id} ("${att.filename}"): ${e?.message || e}`);
+                }
+            }
+            if (loaded.length) (init as any).attachments = loaded;
+        }
         sessionStorage.setItem("composeInit", JSON.stringify(init));
         showComposeOverlay(msg.subject ? `Edit: ${msg.subject}` : "Edit draft");
         return;

package/client/compose/compose.bundle.js

@@ -1093,6 +1093,7 @@ __export(api_client_exports, {
   openInTextEditor: () => openInTextEditor,
   openInWord: () => openInWord,
   openLocalPath: () => openLocalPath,
+  openPendingAttachment: () => openPendingAttachment,
   popoutCompose: () => popoutCompose,
   popoutMainWindow: () => popoutMainWindow,
   popoutWindow: () => popoutWindow,
@@ -1656,6 +1657,10 @@ async function openAttachment(accountId, uid, attachmentId, folderId, filename)
   const fn = ipc().openAttachment;
   return fn ? fn(accountId, uid, attachmentId, folderId, filename) : void 0;
 }
+async function openPendingAttachment(filename, mimeType, dataBase64) {
+  const fn = ipc().openPendingAttachment;
+  return fn ? fn(filename, mimeType, dataBase64) : void 0;
+}
 async function getMessageSource(accountId, uid, folderId) {
   return ipc().getMessageSource(accountId, uid, folderId);
 }
@@ -6002,7 +6007,13 @@ function getContentSnapshot() {
     to: toInput?.value || "",
     cc: ccInput?.value || "",
     bcc: bccInput?.value || "",
-    subject: subjectInput?.value || ""
+    subject: subjectInput?.value || "",
+    // Attaching or removing a file IS a change. Without it here, adding an
+    // attachment to an otherwise-untouched draft left the snapshot equal
+    // and autosave skipped the save entirely. Fingerprint only — the
+    // base64 would make this string megabytes and it is compared on every
+    // 5s tick.
+    atts: attachments.map((a) => `${a.filename}:${a.size}`).join("|")
   });
 }
 function recordContentBaseline() {
@@ -6050,7 +6061,11 @@ async function saveDraft2() {
       cc: ccInput.value,
       bcc: bccInput.value,
       previousDraftUid: draftUid,
-      draftId
+      draftId,
+      // Same shape the send path uses. Omitted until 2026-08-11, which
+      // meant a draft never carried its attachments — reopening one
+      // silently lost them.
+      attachments: attachments.map((a) => ({ filename: a.filename, mimeType: a.mimeType, dataBase64: a.dataBase64 }))
     });
     if (data?.draftUid) draftUid = data.draftUid;
     if (data?.draftId) draftId = data.draftId;
@@ -6593,7 +6608,25 @@ function renderAttachmentChips() {
     const a = attachments[i];
     const chip = document.createElement("span");
     chip.className = "compose-att-chip";
-    chip.innerHTML = `\u{1F4CE} ${escapeHtml2(a.filename)} (${formatSize(a.size)}) `;
+    const open = document.createElement("button");
+    open.type = "button";
+    open.className = "compose-att-open";
+    open.title = `Open ${a.filename}`;
+    open.textContent = `\u{1F4CE} ${a.filename} (${formatSize(a.size)})`;
+    open.addEventListener("click", async () => {
+      const was = open.textContent;
+      open.textContent = `\u{1F4CE} Opening ${a.filename}\u2026`;
+      try {
+        const { openPendingAttachment: openPendingAttachment2 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+        const r = await openPendingAttachment2(a.filename, a.mimeType, a.dataBase64);
+        if (!r?.ok) throw new Error("the host could not open it");
+      } catch (e) {
+        showDraftStatus(`Couldn't open "${a.filename}": ${e?.message || e}`, true);
+      } finally {
+        open.textContent = was;
+      }
+    });
+    chip.appendChild(open);
     const rm = document.createElement("button");
     rm.type = "button";
     rm.title = "Remove attachment";
@@ -6601,6 +6634,7 @@ function renderAttachmentChips() {
     rm.addEventListener("click", () => {
       attachments.splice(i, 1);
       renderAttachmentChips();
+      void saveDraft2();
     });
     chip.appendChild(rm);
     attEl.appendChild(chip);