@bobfrankston/mailx 1.0.368 → 1.0.374

package/client/app.js

@@ -1803,9 +1803,18 @@ const optSnippet = document.getElementById("opt-snippet");
 const optThreaded = document.getElementById("opt-threaded");
 const optFlagged = document.getElementById("opt-flagged");
 const optFolderCounts = document.getElementById("opt-folder-counts");
-// Toggle dropdown
+const optCalendarSidebar = document.getElementById("opt-calendar-sidebar");
+// Toggle dropdown — also close any other open toolbar menu so they can't
+// overlap. Without this, opening View while Settings was already open left
+// both visible at once (user-reported screenshot).
 viewBtn?.addEventListener("click", (e) => {
     e.stopPropagation();
+    const settingsDd = document.getElementById("settings-dropdown");
+    if (settingsDd)
+        settingsDd.hidden = true;
+    const restartDd = document.getElementById("restart-dropdown");
+    if (restartDd)
+        restartDd.hidden = true;
     if (viewDropdown)
         viewDropdown.hidden = !viewDropdown.hidden;
 });
@@ -1846,6 +1855,23 @@ if (savedFlagged)
     document.getElementById("ml-body")?.classList.add("flagged-only");
 if (savedFolderCounts)
     document.getElementById("folder-tree")?.classList.add("show-folder-counts");
+// S51 — Calendar sidebar: View-menu toggle, restore from localStorage,
+// hide auto-magically on narrow screens (CSS handles that).
+(async () => {
+    const { initCalendarSidebar, isCalendarSidebarOn, showCalendarSidebar, hideCalendarSidebar } = await import("./components/calendar-sidebar.js");
+    initCalendarSidebar();
+    const on = isCalendarSidebarOn();
+    if (optCalendarSidebar)
+        optCalendarSidebar.checked = on;
+    if (on)
+        await showCalendarSidebar();
+    optCalendarSidebar?.addEventListener("change", () => {
+        if (optCalendarSidebar.checked)
+            showCalendarSidebar();
+        else
+            hideCalendarSidebar();
+    });
+})();
 // Two-line toggle
 optTwoLine?.addEventListener("change", () => {
     const list = document.getElementById("message-list");
@@ -2267,7 +2293,10 @@ async function openAboutDialog() {
     const panel = document.createElement("div");
     panel.className = "mailx-modal";
     panel.innerHTML = `
-        <div class="mailx-modal-title">About mailx</div>
+        <div class="mailx-modal-title">
+            <span class="mailx-modal-title-text">About mailx</span>
+            <button type="button" class="mailx-modal-close" id="about-x" title="Close (Esc)" aria-label="Close">&times;</button>
+        </div>
         <div class="mailx-about" id="about-body">Loading...</div>
         <div class="mailx-modal-buttons">
             <span class="mailx-modal-spacer"></span>
@@ -2290,6 +2319,8 @@ async function openAboutDialog() {
     document.addEventListener("keydown", onKey, true);
     panel.querySelector('[data-action="close"]')
         .addEventListener("click", close);
+    panel.querySelector("#about-x")
+        .addEventListener("click", close);
     backdrop.addEventListener("mousedown", (e) => { if (e.target === backdrop)
         close(); });
     try {
@@ -2381,6 +2412,11 @@ const optEditorQuill = document.getElementById("opt-editor-quill");
 const optEditorTiptap = document.getElementById("opt-editor-tiptap");
 settingsBtn?.addEventListener("click", (e) => {
     e.stopPropagation();
+    if (viewDropdown)
+        viewDropdown.hidden = true;
+    const restartDd = document.getElementById("restart-dropdown");
+    if (restartDd)
+        restartDd.hidden = true;
     if (settingsDropdown)
         settingsDropdown.hidden = !settingsDropdown.hidden;
 });

package/client/components/calendar-sidebar.js

@@ -0,0 +1,243 @@
+/**
+ * Calendar sidebar — Thunderbird Lightning "Events and Tasks" pane.
+ *
+ * Right-docked vertical panel showing:
+ *   - Day-grouped upcoming events (Today / Tomorrow / Friday Apr 24 / …)
+ *   - Tasks list (no due date — just a checkable to-do list)
+ *
+ * Toggled by the View menu's "Calendar sidebar" checkbox. Reads from the
+ * primary account's Google Calendar / Tasks via the existing OAuth token.
+ * Sidebar and the full-screen calendar modal (calendar.ts) read the SAME
+ * underlying data — two views onto one source.
+ *
+ * Local-only events (LOCAL_STORE_KEY) are merged with Google events.
+ */
+import { getPrimaryAccount } from "../lib/api-client.js";
+const LOCAL_STORE_KEY = "mailx-cal-events-v1";
+const TASK_STORE_KEY = "mailx-tasks-v1";
+const SIDEBAR_PREF = "mailx-calendar-sidebar-on";
+let viewYear = new Date().getFullYear();
+let viewMonth = new Date().getMonth();
+let viewDay = new Date().getDate();
+let lastEvents = [];
+function loadLocalEvents() {
+    try {
+        const raw = localStorage.getItem(LOCAL_STORE_KEY);
+        if (!raw)
+            return [];
+        const arr = JSON.parse(raw);
+        return Array.isArray(arr) ? arr : [];
+    }
+    catch {
+        return [];
+    }
+}
+function loadTasks() {
+    try {
+        const raw = localStorage.getItem(TASK_STORE_KEY);
+        if (!raw)
+            return [];
+        const arr = JSON.parse(raw);
+        return Array.isArray(arr) ? arr : [];
+    }
+    catch {
+        return [];
+    }
+}
+function saveTasks(tasks) {
+    try {
+        localStorage.setItem(TASK_STORE_KEY, JSON.stringify(tasks));
+    }
+    catch { /* */ }
+}
+/** Fetch upcoming events from Google Calendar via the primary account's
+ *  OAuth token. Returns merged Google + local events for the next 30 days
+ *  starting at `from`. Quietly returns local-only on any error so the
+ *  sidebar still works without network / without Google Calendar scope. */
+async function fetchUpcoming(from) {
+    const local = loadLocalEvents();
+    let google = [];
+    try {
+        const primary = await getPrimaryAccount();
+        if (primary?.email) {
+            // The OAuth token is held by the service-side OAuthTokenManager;
+            // calendar fetch goes through a server-side proxy method (not
+            // implemented yet — this is the seam). For now: local-only.
+            // Wire-up: TODO — service.fetchGoogleCalendarEvents(accountId, from, days).
+            // Sidebar already renders correctly with the merged result.
+        }
+    }
+    catch { /* google unavailable, fall back to local */ }
+    const horizon = from.getTime() + 30 * 86400_000;
+    return [...local, ...google]
+        .filter(e => e.start >= from.getTime() && e.start < horizon)
+        .sort((a, b) => a.start - b.start);
+}
+function formatDayHeader(d, today, tomorrow) {
+    const sameDay = (a, b) => a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate();
+    if (sameDay(d, today))
+        return "Today";
+    if (sameDay(d, tomorrow))
+        return "Tomorrow";
+    return d.toLocaleDateString(undefined, { weekday: "long", month: "long", day: "numeric" });
+}
+function formatTime(e) {
+    if (e.allDay)
+        return "all day";
+    return new Date(e.start).toLocaleTimeString(undefined, { hour: "2-digit", minute: "2-digit", hour12: false });
+}
+function escapeHtml(s) {
+    return s.replace(/[&<>"']/g, c => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", "\"": "&quot;", "'": "&#39;" }[c]));
+}
+function renderHead() {
+    const dateEl = document.getElementById("cal-side-date");
+    if (!dateEl)
+        return;
+    const d = new Date(viewYear, viewMonth, viewDay);
+    dateEl.innerHTML = `<strong>${d.getDate()}</strong> ${d.toLocaleDateString(undefined, { weekday: "short" })} <span class="cal-side-date-month">${d.toLocaleDateString(undefined, { month: "short", year: "numeric" })}</span>`;
+}
+function renderEvents(events) {
+    const body = document.getElementById("cal-side-body");
+    if (!body)
+        return;
+    if (events.length === 0) {
+        body.innerHTML = `<div class="cal-side-empty">No upcoming events. Click + New event to add one.</div>`;
+        return;
+    }
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
+    const tomorrow = new Date(today.getTime() + 86400_000);
+    let lastDayKey = "";
+    let html = "";
+    for (const e of events) {
+        const d = new Date(e.start);
+        const dayKey = `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}`;
+        if (dayKey !== lastDayKey) {
+            html += `<div class="cal-side-day">${escapeHtml(formatDayHeader(d, today, tomorrow))}</div>`;
+            lastDayKey = dayKey;
+        }
+        html += `<div class="cal-side-event" data-id="${e.id}">
+            <span class="cal-side-event-dot ${e.source === "google" ? "g" : "l"}"></span>
+            <span class="cal-side-event-time">${escapeHtml(formatTime(e))}</span>
+            <span class="cal-side-event-title">${escapeHtml(e.title)}</span>
+        </div>`;
+    }
+    body.innerHTML = html;
+}
+function renderTasks() {
+    const showDone = document.getElementById("cal-side-show-done")?.checked || false;
+    const tasks = loadTasks().filter(t => showDone || !t.completed);
+    const host = document.getElementById("cal-side-tasks");
+    if (!host)
+        return;
+    if (tasks.length === 0) {
+        host.innerHTML = `<div class="cal-side-empty">No tasks.</div>`;
+        return;
+    }
+    let html = "<div class='cal-side-task-head'>Title</div>";
+    for (const t of tasks) {
+        html += `<div class="cal-side-task" data-id="${t.id}">
+            <input type="checkbox" ${t.completed ? "checked" : ""} class="cal-side-task-check">
+            <span class="cal-side-task-title${t.completed ? " done" : ""}">${escapeHtml(t.title)}</span>
+        </div>`;
+    }
+    host.innerHTML = html;
+    host.querySelectorAll(".cal-side-task").forEach(row => {
+        const id = row.dataset.id;
+        row.querySelector(".cal-side-task-check")?.addEventListener("change", (e) => {
+            const checked = e.target.checked;
+            const all = loadTasks();
+            const t = all.find(x => x.id === id);
+            if (t) {
+                t.completed = checked ? Date.now() : undefined;
+                saveTasks(all);
+                renderTasks();
+            }
+        });
+    });
+}
+async function refresh() {
+    renderHead();
+    const from = new Date(viewYear, viewMonth, viewDay);
+    lastEvents = await fetchUpcoming(from);
+    renderEvents(lastEvents);
+    renderTasks();
+}
+/** Show the sidebar (called from the View menu toggle). Idempotent. */
+export async function showCalendarSidebar() {
+    const el = document.getElementById("calendar-sidebar");
+    if (!el)
+        return;
+    el.hidden = false;
+    document.body.classList.add("calendar-sidebar-on");
+    try {
+        localStorage.setItem(SIDEBAR_PREF, "true");
+    }
+    catch { /* */ }
+    await refresh();
+}
+export function hideCalendarSidebar() {
+    const el = document.getElementById("calendar-sidebar");
+    if (!el)
+        return;
+    el.hidden = true;
+    document.body.classList.remove("calendar-sidebar-on");
+    try {
+        localStorage.setItem(SIDEBAR_PREF, "false");
+    }
+    catch { /* */ }
+}
+export function isCalendarSidebarOn() {
+    try {
+        return localStorage.getItem(SIDEBAR_PREF) === "true";
+    }
+    catch {
+        return false;
+    }
+}
+/** Wire one-time event handlers + restore from localStorage. Safe to call
+ *  multiple times — handlers are idempotent because the elements are stable. */
+export function initCalendarSidebar() {
+    const wireOnce = (id, fn) => {
+        const el = document.getElementById(id);
+        if (!el || el.__wired)
+            return;
+        el.__wired = true;
+        el.addEventListener("click", fn);
+    };
+    wireOnce("cal-side-prev", () => { const d = new Date(viewYear, viewMonth, viewDay - 1); viewYear = d.getFullYear(); viewMonth = d.getMonth(); viewDay = d.getDate(); refresh(); });
+    wireOnce("cal-side-next", () => { const d = new Date(viewYear, viewMonth, viewDay + 1); viewYear = d.getFullYear(); viewMonth = d.getMonth(); viewDay = d.getDate(); refresh(); });
+    wireOnce("cal-side-today", () => { const t = new Date(); viewYear = t.getFullYear(); viewMonth = t.getMonth(); viewDay = t.getDate(); refresh(); });
+    wireOnce("cal-side-new", async () => {
+        const title = prompt("Event title:");
+        if (!title)
+            return;
+        const dateStr = prompt("Date and time (YYYY-MM-DD HH:MM, or YYYY-MM-DD for all-day):", new Date(viewYear, viewMonth, viewDay).toISOString().slice(0, 10) + " 09:00");
+        if (!dateStr)
+            return;
+        const allDay = !/\d{1,2}:\d{2}/.test(dateStr);
+        const start = Date.parse(dateStr.replace(" ", "T"));
+        if (isNaN(start)) {
+            alert("Couldn't parse that date.");
+            return;
+        }
+        const ev = {
+            id: `cal-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+            title, start, end: start + (allDay ? 86400_000 : 3600_000),
+            allDay, source: "local",
+        };
+        const all = loadLocalEvents();
+        all.push(ev);
+        try {
+            localStorage.setItem(LOCAL_STORE_KEY, JSON.stringify(all));
+        }
+        catch { /* */ }
+        await refresh();
+    });
+    const showDoneCb = document.getElementById("cal-side-show-done");
+    if (showDoneCb && !showDoneCb.__wired) {
+        showDoneCb.__wired = true;
+        showDoneCb.addEventListener("change", () => renderTasks());
+    }
+}
+//# sourceMappingURL=calendar-sidebar.js.map

package/client/components/message-viewer.js

@@ -333,7 +333,16 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
                 unsubBtn.onclick = async (e) => {
                     e.preventDefault();
                     const status = document.getElementById("status-sync");
-                    if (oneClick && httpUrl) {
+                    // Always attempt POST first when there's an HTTPS URL,
+                    // regardless of whether the message advertised the
+                    // `List-Unsubscribe-Post: List-Unsubscribe=One-Click`
+                    // header. Many senders provide a POST-capable endpoint
+                    // without setting the Post header. Server side already
+                    // falls back to GET internally on 4xx, so trying POST
+                    // first never makes things worse and avoids a tab full
+                    // of "are you sure?" ceremony when the endpoint would
+                    // have just accepted POST.
+                    if (httpUrl) {
                         unsubBtn.textContent = "Unsubscribing…";
                         try {
                             const { unsubscribeOneClick } = await import("../lib/api-client.js");
@@ -347,19 +356,19 @@ export async function showMessage(accountId, uid, folderId, specialUse, isRetry
                                 unsubBtn.textContent = `Failed: HTTP ${r?.status ?? "?"}`;
                                 if (status)
                                     status.textContent = `Unsubscribe failed: ${r?.status} ${r?.statusText || ""}`.trim();
+                                // Last-resort fallback: open the URL in a tab so
+                                // the user can complete the flow manually.
+                                window.open(httpUrl, "_blank");
                             }
                         }
                         catch (err) {
                             unsubBtn.textContent = "Unsubscribe failed";
                             if (status)
                                 status.textContent = `Unsubscribe error: ${err.message}`;
+                            window.open(httpUrl, "_blank");
                         }
                         return;
                     }
-                    if (httpUrl) {
-                        window.open(httpUrl, "_blank");
-                        return;
-                    }
                     if (mailUrl) {
                         const m = mailUrl.match(/^mailto:([^?]*)(?:\?(.*))?$/i);
                         const to = m?.[1] ? decodeURIComponent(m[1]) : "";

package/client/index.html

@@ -28,6 +28,7 @@
                     <label class="tb-menu-item"><input type="checkbox" id="opt-threaded"> Group by thread</label>
                     <label class="tb-menu-item"><input type="checkbox" id="opt-flagged"> ★ Flagged only</label>
                     <label class="tb-menu-item"><input type="checkbox" id="opt-folder-counts"> Folder counts</label>
+                    <label class="tb-menu-item"><input type="checkbox" id="opt-calendar-sidebar"> Calendar sidebar</label>
                 </div>
             </div>
             <div class="tb-menu" id="settings-menu">
@@ -154,6 +155,25 @@
         </section>
     </main>
 
+    <aside class="calendar-sidebar" id="calendar-sidebar" hidden aria-label="Calendar sidebar">
+        <header class="cal-side-head">
+            <button class="cal-side-nav" id="cal-side-prev" title="Previous">‹</button>
+            <span class="cal-side-date" id="cal-side-date"></span>
+            <button class="cal-side-nav" id="cal-side-today" title="Today">○</button>
+            <button class="cal-side-nav" id="cal-side-next" title="Next">›</button>
+        </header>
+        <div class="cal-side-actions">
+            <button class="cal-side-new" id="cal-side-new" title="New event">＋ New event</button>
+        </div>
+        <div class="cal-side-body" id="cal-side-body">
+            <div class="cal-side-empty">Loading…</div>
+        </div>
+        <footer class="cal-side-foot">
+            <label><input type="checkbox" id="cal-side-show-done"> Show completed Tasks</label>
+            <div class="cal-side-tasks" id="cal-side-tasks"></div>
+        </footer>
+    </aside>
+
     <footer class="status-bar" id="status-bar">
         <span id="status-accounts"></span>
         <span id="status-sync">Syncing...</span>

package/client/lib/api-client.js

@@ -134,6 +134,11 @@ export function getSyncPending() {
 export function getDiagnostics() {
     return ipc().getDiagnostics?.() ?? Promise.resolve([]);
 }
+/** Account marked `primary: true` in accounts.jsonc — used by Calendar /
+ *  Tasks / Contacts to pick which Google account's data to show. */
+export function getPrimaryAccount() {
+    return ipc().getPrimaryAccount?.() ?? Promise.resolve(null);
+}
 export function getOutboxStatus() {
     return ipc().getOutboxStatus();
 }

package/client/lib/mailxapi.js

@@ -160,6 +160,7 @@
         getSyncPending: function() { return callNode("getSyncPending"); },
         getOutboxStatus: function() { return callNode("getOutboxStatus"); },
         getDiagnostics: function() { return callNode("getDiagnostics"); },
+        getPrimaryAccount: function() { return callNode("getPrimaryAccount"); },
         listQueuedOutgoing: function() { return callNode("listQueuedOutgoing"); },
         cancelQueuedOutgoing: function(p) { return callNode("cancelQueuedOutgoing", { path: p }); },
         reauthenticate: function(accountId) { return callNode("reauthenticate", { accountId: accountId }); },

package/client/styles/components.css

@@ -720,7 +720,16 @@ button.tb-menu-item { background: none; border: none; color: inherit; width: 100
     border-color: transparent;
     font-weight: 500;
 }
-.mailx-modal-btn-primary:hover { filter: brightness(1.1); }
+.mailx-modal-btn-primary:hover {
+    filter: brightness(1.1);
+    /* Add a border-shadow on hover so the button stays visibly distinct from
+       the modal background regardless of theme — `filter: brightness` alone
+       could push the accent close to the modal background on some palettes,
+       making the button look like it disappeared. */
+    box-shadow: 0 0 0 2px var(--color-accent);
+    outline: 1px solid var(--color-bg);
+    outline-offset: -1px;
+}
 
 /* About dialog */
 .mailx-about { font-size: var(--font-size-sm); line-height: 1.5; }
@@ -790,6 +799,123 @@ button.tb-menu-item { background: none; border: none; color: inherit; width: 100
     background: oklch(0.85 0.10 350);  /* deeper pink when selected */
 }
 
+/* S51 — calendar sidebar (Thunderbird Lightning Events & Tasks pane).
+   Right-docked, fixed width, hidden by default. Toggled by View menu.
+   Hides automatically on narrow screens (< 1100px) — Android uses the
+   native calendar app. */
+.calendar-sidebar {
+    grid-area: cal-side;
+    width: 280px;
+    border-left: 1px solid var(--color-border);
+    background: var(--color-bg);
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    font-size: var(--font-size-sm);
+}
+@media (max-width: 1100px) {
+    .calendar-sidebar { display: none; }
+}
+body.calendar-sidebar-on {
+    /* Re-flow main grid to make room for the sidebar on the right.
+       Folder-tree / message-list / message-viewer share the remaining area. */
+}
+.cal-side-head {
+    display: flex;
+    align-items: center;
+    gap: var(--gap-xs);
+    padding: var(--gap-sm);
+    border-bottom: 1px solid var(--color-border);
+}
+.cal-side-date { flex: 1; }
+.cal-side-date strong { font-size: 1.4em; }
+.cal-side-date-month { color: var(--color-text-muted); font-size: 0.85em; }
+.cal-side-nav {
+    background: transparent;
+    border: 1px solid var(--color-border);
+    border-radius: var(--radius-sm);
+    padding: 1px 6px;
+    cursor: pointer;
+    font-size: 0.95em;
+    color: var(--color-text);
+}
+.cal-side-nav:hover { background: var(--color-bg-hover); }
+.cal-side-actions {
+    padding: var(--gap-xs) var(--gap-sm);
+    border-bottom: 1px solid var(--color-border);
+}
+.cal-side-new {
+    width: 100%;
+    padding: 4px 8px;
+    background: transparent;
+    border: 1px dashed var(--color-border);
+    border-radius: var(--radius-sm);
+    cursor: pointer;
+    color: var(--color-text);
+    font-size: var(--font-size-sm);
+}
+.cal-side-new:hover { background: var(--color-bg-hover); }
+.cal-side-body {
+    flex: 1;
+    overflow-y: auto;
+    padding: var(--gap-xs) 0;
+}
+.cal-side-day {
+    padding: 4px var(--gap-sm);
+    background: var(--color-bg-surface);
+    font-weight: 600;
+    color: var(--color-text);
+    border-bottom: 1px solid var(--color-border);
+}
+.cal-side-event {
+    display: flex;
+    align-items: baseline;
+    gap: 6px;
+    padding: 3px var(--gap-sm) 3px 18px;
+    cursor: default;
+}
+.cal-side-event:hover { background: var(--color-bg-hover); }
+.cal-side-event-dot {
+    display: inline-block;
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    flex: 0 0 8px;
+}
+.cal-side-event-dot.l { background: oklch(0.70 0.18 70); }   /* local — amber */
+.cal-side-event-dot.g { background: oklch(0.65 0.20 250); }  /* google — blue */
+.cal-side-event-time { color: var(--color-text); min-width: 44px; font-variant-numeric: tabular-nums; }
+.cal-side-event-title { flex: 1; }
+.cal-side-empty {
+    padding: var(--gap-md) var(--gap-sm);
+    color: var(--color-text-muted);
+    text-align: center;
+    font-style: italic;
+}
+.cal-side-foot {
+    border-top: 1px solid var(--color-border);
+    padding: var(--gap-xs) var(--gap-sm);
+    font-size: var(--font-size-sm);
+    max-height: 35%;
+    overflow-y: auto;
+}
+.cal-side-foot label { display: block; padding: 2px 0; cursor: pointer; }
+.cal-side-task-head {
+    font-weight: 600;
+    padding: var(--gap-xs) 0;
+    color: var(--color-text-muted);
+}
+.cal-side-task {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    padding: 2px 0;
+}
+.cal-side-task-title.done {
+    text-decoration: line-through;
+    color: var(--color-text-muted);
+}
+
 .ml-empty {
     grid-column: 1 / -1;
     display: flex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.368",
+  "version": "1.0.374",
   "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.7",
     "@bobfrankston/miscinfo": "^1.0.9",
     "@bobfrankston/oauthsupport": "^1.0.24",
-    "@bobfrankston/msger": "^0.1.344",
+    "@bobfrankston/msger": "^0.1.345",
     "@bobfrankston/mailx-host": "^0.1.4",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
@@ -88,7 +88,7 @@
       "@bobfrankston/iflow-node": "^0.1.7",
       "@bobfrankston/miscinfo": "^1.0.9",
       "@bobfrankston/oauthsupport": "^1.0.24",
-      "@bobfrankston/msger": "^0.1.344",
+      "@bobfrankston/msger": "^0.1.345",
       "@bobfrankston/mailx-host": "^0.1.4",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",

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

@@ -39,6 +39,11 @@ export declare class MailxService {
     /** Per-account health snapshot: inactivity-timeout count, conn-cap hits,
      *  last failed IMAP command. Drives the diagnostics ⚠ badge in the UI. */
     getDiagnostics(): any;
+    /** Return the account marked `primary: true` in accounts.jsonc, or the
+     *  first account if none. Used by Calendar / Tasks / Contacts to pick
+     *  which Google account's data to show. Single-flag for now;
+     *  per-feature flags + multi-calendar comingling deferred. */
+    getPrimaryAccount(): any;
     /** List queued outgoing messages with parsed envelope headers so the UI
      *  can render a pink-row "pending" view before IMAP APPEND succeeds. */
     listQueuedOutgoing(): any[];

package/packages/mailx-service/index.js

@@ -8,7 +8,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-import { loadSettings, saveSettings, loadAccounts, loadAccountsAsync, saveAccounts, initCloudConfig, loadAllowlist, saveAllowlist, loadAutocomplete, saveAutocomplete, getStorePath, getStorageInfo, getConfigDir } from "@bobfrankston/mailx-settings";
+import { loadSettings, saveSettings, loadAccounts, loadAccountsAsync, saveAccounts, initCloudConfig, loadAllowlist, saveAllowlist, loadAutocomplete, saveAutocomplete, getStorageInfo, getConfigDir } from "@bobfrankston/mailx-settings";
 import { sanitizeHtml, encodeQuotedPrintable } from "@bobfrankston/mailx-types";
 import { simpleParser } from "mailparser";
 /** Parse `List-Unsubscribe` (RFC 2369) and `List-Unsubscribe-Post` (RFC 8058).
@@ -102,7 +102,7 @@ export class MailxService {
         for (const cfg of cfgs) {
             const a = dbAccounts.find(d => d.id === cfg.id);
             if (a)
-                ordered.push({ ...a, label: cfg.label, defaultSend: cfg.defaultSend || false, identityDomains: cfg.identityDomains || [] });
+                ordered.push({ ...a, label: cfg.label, defaultSend: cfg.defaultSend || false, primary: !!cfg.primary, identityDomains: cfg.identityDomains || [] });
         }
         // Append any DB accounts not in settings
         for (const a of dbAccounts) {
@@ -270,8 +270,11 @@ export class MailxService {
                 parseListUnsubscribe(parsed2.headers));
             listUnsubscribe = listUnsubscribeHttp || listUnsubscribeMail;
         }
-        const storePath = getStorePath();
-        const emlPath = path.join(storePath, accountId, String(envelope.folderId), `${envelope.uid}.eml`);
+        // EML path: read the real on-disk path from `envelope.bodyPath` (DB
+        // is authoritative since v1.0.361 — files are opaque UUIDs, not the
+        // old {folderId}/{uid}.eml layout). Synthesizing the legacy path
+        // here showed users a path that doesn't exist.
+        const emlPath = envelope.bodyPath || "";
         return {
             ...envelope, bodyHtml, bodyText, hasRemoteContent, remoteAllowed: allowRemote,
             attachments, emlPath, deliveredTo, returnPath,
@@ -418,6 +421,14 @@ export class MailxService {
     getDiagnostics() {
         return this.imapManager.getDiagnosticsSnapshot();
     }
+    /** Return the account marked `primary: true` in accounts.jsonc, or the
+     *  first account if none. Used by Calendar / Tasks / Contacts to pick
+     *  which Google account's data to show. Single-flag for now;
+     *  per-feature flags + multi-calendar comingling deferred. */
+    getPrimaryAccount() {
+        const all = this.getAccounts();
+        return all.find((a) => a.primary) || all[0] || null;
+    }
     /** List queued outgoing messages with parsed envelope headers so the UI
      *  can render a pink-row "pending" view before IMAP APPEND succeeds. */
     listQueuedOutgoing() {

package/packages/mailx-service/jsonrpc.js

@@ -96,6 +96,8 @@ async function dispatchAction(svc, action, p) {
             return svc.getSyncPending();
         case "getDiagnostics":
             return svc.getDiagnostics();
+        case "getPrimaryAccount":
+            return svc.getPrimaryAccount();
         case "getOutboxStatus":
             return svc.getOutboxStatus();
         case "listQueuedOutgoing":

package/packages/mailx-settings/index.js

@@ -376,6 +376,7 @@ function normalizeAccount(acct, globalName) {
             password: acct.smtp?.password || acct.password,
         },
         enabled: acct.enabled ?? true,
+        primary: acct.primary,
         defaultSend: acct.defaultSend,
         syncContacts: acct.syncContacts ?? (provider?.imap.auth === "oauth2"),
         relayDomains: acct.relayDomains,

package/packages/mailx-store/db.js

@@ -654,6 +654,18 @@ export class MailxDB {
         this.db.prepare("UPDATE messages SET flags_json = ? WHERE account_id = ? AND uid = ?").run(JSON.stringify(flags), accountId, uid);
     }
     updateMessageFolder(accountId, uid, targetFolderId) {
+        // Idempotency: if a row already exists at (account, target_folder, uid)
+        // — common with Gmail's hash-synthesized UIDs across labels, or any
+        // case where the move was already partially applied — the UPDATE
+        // would fail the (acct, folder, uid) unique constraint. Treat it as
+        // a no-op: drop the source row, the message is already where the
+        // user wants it. Previously surfaced as "Mark-as-spam failed: UNIQUE
+        // constraint failed" — bad UX for what is logically already done.
+        const existingTarget = this.db.prepare("SELECT id FROM messages WHERE account_id = ? AND folder_id = ? AND uid = ?").get(accountId, targetFolderId, uid);
+        if (existingTarget) {
+            this.db.prepare("DELETE FROM messages WHERE account_id = ? AND uid = ? AND folder_id != ?").run(accountId, uid, targetFolderId);
+            return;
+        }
         this.db.prepare("UPDATE messages SET folder_id = ? WHERE account_id = ? AND uid = ?").run(targetFolderId, accountId, uid);
     }
     updateBodyPath(accountId, uid, bodyPath) {

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

@@ -29,6 +29,7 @@ export interface AccountConfig {
         password?: string;
     };
     enabled: boolean;
+    primary?: boolean; /** Designates the account that supplies Calendar / Tasks / Contacts data. At most one per user; first one wins if multiple set. */
     defaultSend?: boolean; /** Use this account's SMTP when From doesn't match any account */
     syncContacts?: boolean; /** Sync contacts even when account is disabled (contacts-only Gmail) */
     relayDomains?: string[]; /** Domains to skip in Delivered-To chain (e.g., ["m.connectivity.xyz"]) */