@bobfrankston/mailx 1.0.446 → 1.0.448

package/client/lib/message-state.js

@@ -27,13 +27,18 @@ function notify(change) {
         catch { /* don't let one subscriber break others */ }
     }
 }
-/** Replace the entire message list (folder load, search, unified inbox) */
+/** Replace the entire message list (folder load, search, unified inbox).
+ *  Selection stays even when the previously-selected message isn't in
+ *  the new list — that case happens whenever a periodic sync re-fetches
+ *  page 1 of the unified inbox and a row the user opened earlier has
+ *  scrolled off, or when the same row's accountId/uid pair changes
+ *  shape after dedup. Yanking the viewer mid-read was a user-reported
+ *  surprise (2026-04-30: "I was reading a message but now it just
+ *  jumped to Select a message to read"). The viewer keeps the message
+ *  it has; it'll only clear when the user explicitly clicks elsewhere
+ *  or the message is removed via removeMessages (real delete/move). */
 export function setMessages(msgs) {
     messages = msgs;
-    // If the previously selected message is no longer in the list, deselect
-    if (selected && !messages.find(m => m.uid === selected.uid && m.accountId === selected.accountId)) {
-        selected = null;
-    }
     notify("messages");
 }
 /** Get current messages */
@@ -52,6 +57,10 @@ export function getSelected() {
 /**
  * Remove messages from the list (after move or delete).
  * If the selected message is removed, auto-selects the next message or null.
+ * Decrements dupeCount on any remaining messages that shared a Message-ID
+ * with one of the removed rows — so the unified-inbox ⇆ marker disappears
+ * when one half of a duplicate pair is deleted, instead of pointing at a
+ * sibling that no longer exists.
  */
 export function removeMessages(uids) {
     const removeSet = new Set(uids.map(u => `${u.accountId}:${u.uid}`));
@@ -60,7 +69,28 @@ export function removeMessages(uids) {
         selectedIdx = messages.findIndex(m => m.uid === selected.uid && m.accountId === selected.accountId);
     }
     const wasSelectedRemoved = selected && removeSet.has(`${selected.accountId}:${selected.uid}`);
+    // Capture Message-IDs of the rows about to leave, so we can fix up the
+    // dupeCount on any remaining siblings. Only IDs that were in the list
+    // and had a non-empty messageId count — empty IDs would match every
+    // headerless row and falsely "merge" them.
+    const removedIds = new Set();
+    for (const m of messages) {
+        if (removeSet.has(`${m.accountId}:${m.uid}`) && m.messageId) {
+            removedIds.add(m.messageId);
+        }
+    }
     messages = messages.filter(m => !removeSet.has(`${m.accountId}:${m.uid}`));
+    // Sibling dupeCount adjustment. dupeCount is server-recomputed on the
+    // next getUnifiedInbox fetch, but we don't want to wait for that —
+    // user just deleted, the marker should drop now. Decrement once per
+    // remaining message whose messageId matches a removed one.
+    if (removedIds.size > 0) {
+        for (const m of messages) {
+            if (m.messageId && removedIds.has(m.messageId) && typeof m.dupeCount === "number") {
+                m.dupeCount = Math.max(0, m.dupeCount - 1);
+            }
+        }
+    }
     if (wasSelectedRemoved) {
         // Auto-select next message (same index, or last, or null)
         if (messages.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.446",
+  "version": "1.0.448",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",

package/rebuild.cmd

@@ -1,12 +1,12 @@
 @echo off
-REM ─────────────────────────────────────────────────────────────────────────
+REM -------------------------------------------------------------------------
 REM  rebuild.cmd — one-shot release: npmglobalize + APK.
 REM  Runs the desktop release workflow (npmglobalize commits, tags, bumps,
 REM  publishes the npm package) and, only if that succeeds, rebuilds the
 REM  Android MAUI APK + copies it into download/apks/ + updates versions.json.
 REM  Anything non-zero from npmglobalize aborts before the APK stage — no
 REM  point building an APK against a failed publish.
-REM ─────────────────────────────────────────────────────────────────────────
+REM -------------------------------------------------------------------------
 
 cls
 setlocal

package/#build-apk.cmd.asv#

@@ -1,4 +0,0 @@
-setlocal
-cd %~dp0android-maui
-call build-apk.cmd
-cls &