@bobfrankston/rmfmail 1.1.5 → 1.1.7

package/client/app.bundle.js

@@ -2440,12 +2440,14 @@ async function refreshPriorityIndex() {
 function rowKey(accountId, uid) {
   return `${accountId}:${uid}`;
 }
-function focusRow(row) {
+function focusRow(row, opts = {}) {
   if (focusedRow && focusedRow !== row)
     focusedRow.setSelected(false);
   row.setSelected(true);
   focusedRow = row;
-  row.el.scrollIntoView({ block: "nearest" });
+  if (opts.scroll !== false) {
+    row.el.scrollIntoView({ block: "nearest" });
+  }
   showMessage(row.accountId, row.msg.uid, row.msg.folderId, currentSpecialUse || void 0, false, row.msg);
   onMessageSelect(row.accountId, row.msg.uid, row.msg.folderId);
   document.dispatchEvent(new CustomEvent("mailx-focus-changed", { detail: row.msg }));
@@ -2454,11 +2456,11 @@ function focusRow(row) {
 function getCurrentFocused() {
   return focusedRow ? focusedRow.msg : null;
 }
-function focusByIdentity(accountId, uid) {
+function focusByIdentity(accountId, uid, opts = {}) {
   const row = rowByKey.get(rowKey(accountId, uid));
   if (!row)
     return false;
-  focusRow(row);
+  focusRow(row, opts);
   return true;
 }
 function setRowFlagged(accountId, uid, yes) {
@@ -2668,18 +2670,29 @@ function removeMessagesAndReconcile(uids) {
     for (const row of Array.from(body.querySelectorAll(".ml-row"))) {
       const el = row;
       const key = `${el.dataset.accountId}:${el.dataset.uid}`;
-      if (!stateUids.has(key))
-        el.remove();
+      if (!stateUids.has(key)) {
+        const dead = rowByKey.get(key);
+        if (dead)
+          dead.detach();
+        else
+          el.remove();
+      }
     }
     if (getMessages2().length === 0) {
       body.innerHTML = `<div class="ml-empty">No messages</div>`;
     }
   }
   if (outcome.focusedWasRemoved) {
-    if (outcome.nextSurvivor && focusByIdentity(outcome.nextSurvivor.accountId, outcome.nextSurvivor.uid)) {
-    } else {
-      releaseFocus();
+    const survivor = outcome.nextSurvivor;
+    if (survivor && focusByIdentity(survivor.accountId, survivor.uid)) {
+      return;
+    }
+    const remaining = getMessages2();
+    for (const m of remaining) {
+      if (focusByIdentity(m.accountId, m.uid))
+        return;
     }
+    releaseFocus();
   }
 }
 function reloadCurrentFolder() {
@@ -2943,7 +2956,7 @@ function restoreSelection(body, savedUid) {
     return;
   const accountId = body.querySelector(`.ml-row[data-uid="${savedUid}"]`)?.dataset.accountId;
   if (accountId) {
-    focusByIdentity(accountId, Number(savedUid));
+    focusByIdentity(accountId, Number(savedUid), { scroll: false });
   }
 }
 async function showThreadPopup(pillEl, headMsg) {
@@ -4655,7 +4668,8 @@ async function collectDueAlarms(now) {
   try {
     const events = await getCalendarEvents(now - LOOKBACK_MS, now + LOOKAHEAD_MS);
     for (const ev of events) {
-      if (!ev.uuid)
+      const stableId = ev.providerId || ev.uuid;
+      if (!stableId)
         continue;
       const startMs = ev.startMs || 0;
       if (!startMs)
@@ -4663,7 +4677,7 @@ async function collectDueAlarms(now) {
       if (!Array.isArray(ev.reminderMinutes) || ev.reminderMinutes.length === 0)
         continue;
       const offsets = ev.reminderMinutes.map((m) => m * 6e4);
-      const occBaseKey = occKey(ev.uuid, startMs);
+      const occBaseKey = occKey(stableId, startMs);
       let pick = null;
       const eligibleOffsets = [];
       for (const offsetMs of offsets) {
@@ -4937,6 +4951,17 @@ async function firePopupForItem(item) {
       snoozeItem(item, 60);
       break;
     case "Dismiss":
+    case "dismissed":
+    // msger reports window-close as r.dismissed=true → daemon
+    // wrapper lowercases to "dismissed". Treat the same as
+    // explicit Dismiss-button: the popup HAD a clear button
+    // for that action, so any close that lands here is the
+    // user's "I'm done with this reminder" — not a 15-min
+    // snooze. Bob 2026-05-14: "I keep dismissing the
+    // reminder but it keeps coming back" — the lowercase
+    // path was hitting the snooze-15-min default, so the
+    // popup re-fired every 15 min indefinitely.
+    case "closed":
       {
         const m = loadDismissed();
         m[item.uuid] = true;
@@ -4953,7 +4978,12 @@ async function firePopupForItem(item) {
       deleteCalendarEvent(item.uuid).catch((e) => console.error(`  [alarm] delete failed for ${item.uuid}: ${e?.message || e}`));
       break;
     default:
-      snoozeItem(item, 15);
+      console.warn(`[alarm] unknown popup result: button=${JSON.stringify(r.button)}, form=${JSON.stringify(r.form)}`);
+      {
+        const m = loadDismissed();
+        m[item.uuid] = true;
+        saveDismissed(m);
+      }
       break;
   }
 }
@@ -7988,6 +8018,10 @@ subscribeStore("*", (ev) => {
     document.dispatchEvent(new CustomEvent("mailx-remove-stale", {
       detail: { accountId: ev.accountId, uid: ev.uid }
     }));
+  } else if (ev.kind === "messageMoved" && ev.accountId && ev.uid) {
+    document.dispatchEvent(new CustomEvent("mailx-remove-stale", {
+      detail: { accountId: ev.accountId, uid: ev.uid }
+    }));
   }
 });
 async function openComposeFromMailto(m) {