@bobfrankston/rmfmail 1.2.316 → 1.2.318

package/.commitmsg

@@ -1,32 +1,19 @@
-New event: spelling suggestions, the right Google account, and a prompt refresh
+New event: choose the calendar; pushes go to the event's own calendar
 
-Three from Bob 2026-09-10 on the calendar sidebar's New event dialog.
+Bob 2026-09-10: "when creating an event I should be able to specify
+which calendar. I want to start making more use of shared calendars."
 
-"Spelling correct didn't work." The main window's right-click handler
-replaced the native WebView2 menu with mailx's Cut/Copy/Paste block on
-every surface — and Chromium's spelling suggestions and "Add to
-dictionary" exist only in the native menu, unreachable from JS. A word in
-the New event box was underlined with no menu that could fix it. Plain
-text controls (TEXTAREA, text-like INPUT) now keep the native menu, which
-already carries Cut/Copy/Paste/Select all for a text field; everything
-else is unchanged. (msger's compose items — Bold, Italic, View source —
-also appear on those fields via its IsEditable gate and forward to the
-compose frame, which is a no-op outside compose; cosmetic, noted.)
+The New event dialog gains a Calendar picker listing the calendars
+Google says the reader can write to (accessRole owner or writer, now
+carried by listCalendars → getCalendars), personal first, shown only
+when there is more than one; the last choice is remembered per machine.
+The status line names the calendar the event went to.
 
-"I just used the add event but don't see them on Google calendar." The
-dialog opens Google Calendar's create page in the browser, which signs in
-as the browser's DEFAULT Google account, not necessarily the one mailx's
-calendar reads. The URL now carries authuser=<primary calendar account
-email> so the event lands where the sidebar looks.
-
-"Creating an event should trigger an immediate update for the calendar
-view." The reader saves the event in the browser; mailx only learned of
-it at the next 5-minute throttled refresh. New refreshCalendarNow IPC
-(service, jsonrpc, mailxapi.js, api-client, MailxApi, Android stub that
-says ok:false) rewinds the throttle once and goes through
-getCalendarEvents, so the in-flight dedup and the calendarUpdated emit
-stay in one place; a 20 s floor of its own keeps it from reopening the
-quota hole the throttle closed. The sidebar arms it after a create: on
-the next window focus, and at 45 s / 2 min / 5 min in case the browser
-sits on another monitor. mailx-types 0.1.93, mailx-service 0.1.36,
-mailx-store-web 0.1.114.
+Underneath, a real bug: the store-sync drain dropped calendarId and sent
+every create, update and delete to "primary". A create could not land
+anywhere else, and an update or delete of an event on a shared calendar
+was a 404 retried on every poll. createCalendarEventLocal takes
+calendarId, the row and the queue payload carry it, update/delete
+payloads carry the row's, and the drain passes it to all three Google
+calls. Rows pulled before today already hold the id the pull recorded.
+mailx-types 0.1.95, mailx-service 0.1.37.

package/.llm/trusted-lists.md

@@ -57,3 +57,9 @@ tests/trust.test.ts, .commitmsg, TODO.md C165, root version 1.2.311. Then rebuil
 - Google account: buildGoogleEventUrl adds authuser=<primary calendar email> (getPrimaryAccount("calendar")).
 - Immediate update: refreshCalendarNow IPC (6 edits) + armPostCreateRefresh() in calendar-sidebar.ts (focus + 45s/2m/5m). Service floor 20s.
 - Status: compiled, bundles built, rebuild.cmd next, then restart.
+- v1.2.316 published (spelling native menu, authuser, refreshCalendarNow). Superseded same morning:
+  New event now SAVES locally via createCalendarEvent (existing IPC + store-sync push, never called before);
+  buildGoogleEventUrl/authuser/post-create timers removed. viewPinned + followToday + midnight rollover.
+  Refresh button + window focus call refreshCalendarNow. Tooltips on all sidebar controls; event rows:
+  click = edit in Google, right-click = Delete "<title>" (deleteCalendarEvent). Publishing as v1.2.317.
+- v1.2.318: New event Calendar picker (writable calendars via accessRole from listCalendars). Store-sync drain now passes calendarId to create/update/delete (was always "primary" — shared-calendar edits 404'd forever). Google: create/subscribe/share calendars on calendar.google.com; rmfmail lists the ones selected there.

package/client/app.bundle.js

@@ -6668,6 +6668,25 @@ __export(calendar_sidebar_exports, {
   isCalendarSidebarOn: () => isCalendarSidebarOn,
   showCalendarSidebar: () => showCalendarSidebar
 });
+function followToday() {
+  if (viewPinned)
+    return;
+  const t = /* @__PURE__ */ new Date();
+  viewYear = t.getFullYear();
+  viewMonth = t.getMonth();
+  viewDay = t.getDate();
+}
+function armMidnightRollover() {
+  const now = /* @__PURE__ */ new Date();
+  const next = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1, 0, 0, 5);
+  window.setTimeout(() => {
+    void refresh();
+    armMidnightRollover();
+  }, next.getTime() - now.getTime());
+}
+function writableCalendars(list) {
+  return list.filter((c) => c.accessRole === "owner" || c.accessRole === "writer").sort((a, b) => (a.primary ? 0 : 1) - (b.primary ? 0 : 1) || a.name.localeCompare(b.name));
+}
 function calendarKind(id, primary) {
   if (primary)
     return "personal";
@@ -6747,7 +6766,7 @@ async function renderCalendarList() {
       host.innerHTML = "";
     } else {
       const sorted = [...list].sort((a, b) => (a.primary ? 0 : 1) - (b.primary ? 0 : 1) || a.name.localeCompare(b.name));
-      host.innerHTML = sorted.map((c) => `<label class="cal-side-cal-row" title="${escapeHtml6(c.name)}">
+      host.innerHTML = sorted.map((c) => `<label class="cal-side-cal-row" title="${escapeHtml6(c.name)} \u2014 untick to hide its events in this list. Which calendars are listed is set in Google Calendar: the ones selected there appear; use Refresh after changing it.">
                 <input type="checkbox" class="cal-side-cal-check" data-cal-id="${escapeHtml6(c.id)}" ${hiddenCalendars.has(c.id) ? "" : "checked"}>
                 ${calIconHtml(c)}
                 <span class="cal-side-cal-name">${escapeHtml6(c.name)}</span>
@@ -6956,7 +6975,7 @@ function renderEvents(events) {
                 <span class="cal-side-event-title cal-side-event-holiday-title" title="${escapeHtml6(e.title)}">${calIconHtml(info)} ${escapeHtml6(e.title)}</span>
             </div>`;
     } else {
-      const titleAttr = link ? 'title="Click to open in Google Calendar"' : "";
+      const titleAttr = link ? 'title="Click to open in Google Calendar to edit it. Right-click for more."' : 'title="Saved in rmfmail, syncing to Google \u2014 it can be opened there once it has synced. Right-click to delete."';
       html += `<div class="cal-side-event" data-id="${e.id}"${recurAttr} data-link="${escapeHtml6(link)}" ${titleAttr}>
                 ${calIconHtml(info)}
                 <span class="cal-side-event-time">${escapeHtml6(formatTime(e))}</span>
@@ -7001,18 +7020,43 @@ function renderEvents(events) {
     el.addEventListener("contextmenu", (e) => {
       e.preventDefault();
       const link = el.dataset.link;
+      const uuid = el.dataset.id || "";
+      const title = el.querySelector(".cal-side-event-title")?.textContent?.trim() || "this event";
       const items = [];
       if (link)
         items.push({
-          label: "View in browser",
+          label: `Edit "${title}" in Google Calendar`,
           action: () => openInBrowser(link)
         });
       items.push({
         label: "Open Google Calendar",
         action: () => openInBrowser("https://calendar.google.com/")
       });
-      if (items.length > 0)
-        showContextMenu(e.clientX, e.clientY, items, { editTarget: e.target });
+      if (uuid) {
+        items.push({ label: "", action: () => {
+        }, separator: true });
+        items.push({
+          label: `Delete "${title}"`,
+          tooltip: "Removes it from your calendar in rmfmail now and from Google when it syncs.",
+          action: async () => {
+            if (!await confirmAt(e.clientX, e.clientY, `Delete "${title}"`))
+              return;
+            try {
+              await deleteCalendarEvent(uuid);
+              const st = document.getElementById("status-sync");
+              if (st)
+                st.textContent = `Deleted event: ${title}`;
+              await refresh();
+            } catch (err) {
+              const st = document.getElementById("status-sync");
+              if (st)
+                st.textContent = `Couldn't delete "${title}": ${err?.message || err}`;
+              console.error("[calendar] delete failed:", err);
+            }
+          }
+        });
+      }
+      showContextMenu(e.clientX, e.clientY, items, { editTarget: e.target });
     });
   });
 }
@@ -7112,6 +7156,7 @@ async function renderTasks(prefetched) {
   });
 }
 async function refresh() {
+  followToday();
   renderHead();
   const from = new Date(viewYear, viewMonth, viewDay);
   let prefetchedTasks;
@@ -7145,12 +7190,44 @@ function openNewEventDialog() {
   heading.textContent = "New event";
   const hint = document.createElement("div");
   hint.style.cssText = "font-size:0.9em;color:var(--color-text-muted);";
-  hint.textContent = "Describe the event in plain English \u2014 AI extracts the details and opens Google Calendar to confirm.";
+  hint.textContent = "Describe the event in plain English \u2014 AI extracts the details and saves it to your calendar. Edit it afterwards if it needs adjusting.";
   const ta = document.createElement("textarea");
   ta.style.cssText = "width:100%;min-height:120px;font:inherit;padding:8px;border-radius:4px;border:1px solid var(--color-border, #ccc);box-sizing:border-box;resize:vertical;";
   ta.placeholder = "Lunch with John tomorrow at noon at Joe's Pizza";
   const status = document.createElement("div");
   status.style.cssText = "min-height:1.2em;font-size:0.85em;color:var(--color-text-muted);";
+  const calRow = document.createElement("label");
+  calRow.style.cssText = "display:flex;align-items:center;gap:8px;font-size:0.9em;";
+  calRow.title = "The calendar this event is saved to. Only calendars you can write to are listed; to add or share a calendar, do that in Google Calendar and press Refresh.";
+  const calSelect = document.createElement("select");
+  calSelect.style.cssText = "flex:1;font:inherit;padding:4px;";
+  calRow.append("Calendar", calSelect);
+  calRow.hidden = true;
+  const fillCalendars = (list) => {
+    const writable = writableCalendars(list);
+    calSelect.innerHTML = "";
+    let last = "";
+    try {
+      last = localStorage.getItem(LAST_CALENDAR_PREF) || "";
+    } catch {
+    }
+    for (const c of writable) {
+      const opt = document.createElement("option");
+      opt.value = c.id;
+      opt.textContent = c.primary ? `${c.name} (personal)` : c.name;
+      if (c.id === last || !last && c.primary)
+        opt.selected = true;
+      calSelect.append(opt);
+    }
+    calRow.hidden = writable.length < 2;
+  };
+  if (calendarList.length)
+    fillCalendars(calendarList);
+  else
+    getCalendars().then((list) => {
+      calendarList = list;
+      fillCalendars(calendarList);
+    }).catch((e) => console.warn("[calendar] calendar list for the picker failed:", e?.message || e));
   const btnRow = document.createElement("div");
   btnRow.style.cssText = "display:flex;gap:8px;justify-content:flex-end;";
   const cancelBtn = document.createElement("button");
@@ -7160,7 +7237,7 @@ function openNewEventDialog() {
   createBtn.textContent = "Create";
   createBtn.style.cssText = "padding:6px 14px;font-weight:500;";
   btnRow.append(cancelBtn, createBtn);
-  panel.append(heading, hint, ta, status, btnRow);
+  panel.append(heading, hint, ta, calRow, status, btnRow);
   backdrop.append(panel);
   document.body.append(backdrop);
   setTimeout(() => ta.focus(), 0);
@@ -7216,92 +7293,67 @@ function openNewEventDialog() {
         return;
       }
     }
-    const api = window.mailxapi;
     const targets = events.length ? events : [null];
-    let authuser = "";
+    const saved = [];
+    const calendarId = calSelect.value || "primary";
+    const calendarName = calSelect.selectedOptions[0]?.textContent || "";
     try {
-      authuser = String((await getPrimaryAccount("calendar"))?.email || "");
-    } catch (e) {
-      console.warn("[calendar] primary account lookup failed, opening without authuser:", e?.message || e);
+      localStorage.setItem(LAST_CALENDAR_PREF, calendarId);
+    } catch {
     }
     for (const ev of targets) {
-      const url = buildGoogleEventUrl(ev, text, authuser);
-      if (api?.openExternal)
-        api.openExternal(url);
-      else
-        window.open(url, "_blank");
+      const row = { ...eventToLocalRow(ev, text), calendarId };
+      try {
+        await createCalendarEvent(row);
+        saved.push(row.title);
+      } catch (e) {
+        status.textContent = `Couldn't save "${row.title}": ${e?.message || e}`;
+        createBtn.disabled = false;
+        cancelBtn.disabled = false;
+        return;
+      }
     }
-    armPostCreateRefresh();
     close();
+    const st = document.getElementById("status-sync");
+    const where = calendarName && !calRow.hidden ? ` to ${calendarName}` : "";
+    if (st)
+      st.textContent = saved.length === 1 ? `Saved event${where}: ${saved[0]}` : `Saved ${saved.length} events${where}: ${saved.join("; ")}`;
+    await refresh();
   });
 }
-function armPostCreateRefresh() {
-  disarmPostCreateRefresh();
-  const pull = async (why) => {
-    try {
-      const r = await refreshCalendarNow();
-      if (!r?.ok)
-        console.log(`[calendar] post-create refresh (${why}) not started: ${r?.reason || "unknown"}`);
-    } catch (e) {
-      console.warn(`[calendar] post-create refresh (${why}) failed:`, e?.message || e);
-    }
-  };
-  postCreateFocusHandler = () => {
-    void pull("window focus");
-  };
-  window.addEventListener("focus", postCreateFocusHandler);
-  postCreateTimers = POST_CREATE_REFRESH_DELAYS_MS.map((ms, i) => window.setTimeout(() => {
-    void pull(`${ms / 1e3} s after create`);
-    if (i === POST_CREATE_REFRESH_DELAYS_MS.length - 1)
-      disarmPostCreateRefresh();
-  }, ms));
-}
-function disarmPostCreateRefresh() {
-  for (const t of postCreateTimers)
-    window.clearTimeout(t);
-  postCreateTimers = [];
-  if (postCreateFocusHandler)
-    window.removeEventListener("focus", postCreateFocusHandler);
-  postCreateFocusHandler = null;
-}
-function buildGoogleEventUrl(event, fallbackText, authuser = "") {
-  const base = "https://calendar.google.com/calendar/render?action=TEMPLATE";
-  const params = [];
-  if (authuser)
-    params.push(`authuser=${encodeURIComponent(authuser)}`);
-  const fmt = (iso) => {
-    const m = iso.match(/(\d{4})-(\d{2})-(\d{2})(?:T(\d{2}):(\d{2})(?::(\d{2}))?)?/);
-    if (!m)
-      return "";
-    const [, y, mo, d, hh, mm, ss] = m;
-    const date = `${y}${mo}${d}`;
-    if (!hh)
-      return date;
-    return `${date}T${hh}${mm}${ss || "00"}`;
-  };
-  if (event?.title)
-    params.push(`text=${encodeURIComponent(event.title)}`);
+function eventToLocalRow(event, fallbackText) {
+  const startOfToday = /* @__PURE__ */ new Date();
+  startOfToday.setHours(0, 0, 0, 0);
+  if (!event?.startISO) {
+    return { title: (event?.title || fallbackText).slice(0, 200), startMs: startOfToday.getTime(), endMs: startOfToday.getTime() + 864e5, allDay: true };
+  }
+  const allDay = !!event.allDay || !event.startISO.includes("T");
+  const startMs = allDay ? (/* @__PURE__ */ new Date(event.startISO.slice(0, 10) + "T00:00:00")).getTime() : wallClockToMs(event.startISO, event.timeZone);
+  let endMs;
+  if (event.endISO)
+    endMs = allDay ? (/* @__PURE__ */ new Date(event.endISO.slice(0, 10) + "T00:00:00")).getTime() : wallClockToMs(event.endISO, event.timeZone);
   else
-    params.push(`text=${encodeURIComponent(fallbackText.slice(0, 200))}`);
-  if (event?.startISO) {
-    const startFmt = fmt(event.startISO);
-    if (event.allDay) {
-      const startDate = /* @__PURE__ */ new Date(event.startISO + (event.startISO.includes("T") ? "" : "T00:00:00"));
-      const endDate = new Date(startDate.getTime() + 864e5);
-      const endFmt = `${endDate.getFullYear()}${String(endDate.getMonth() + 1).padStart(2, "0")}${String(endDate.getDate()).padStart(2, "0")}`;
-      params.push(`dates=${startFmt}/${endFmt}`);
-    } else {
-      const endFmt = event.endISO ? fmt(event.endISO) : fmt(new Date(new Date(event.startISO).getTime() + 36e5).toISOString().slice(0, 19));
-      params.push(`dates=${startFmt}/${endFmt}`);
+    endMs = startMs + (allDay ? 864e5 : 36e5);
+  if (allDay && endMs <= startMs)
+    endMs = startMs + 864e5;
+  return { title: event.title || fallbackText.slice(0, 200), startMs, endMs, allDay, location: event.location || void 0, notes: event.notes || void 0 };
+}
+function wallClockToMs(iso, timeZone) {
+  const local = new Date(iso).getTime();
+  if (!timeZone)
+    return local;
+  try {
+    let ms = local;
+    for (let i = 0; i < 2; i++) {
+      const parts = new Intl.DateTimeFormat("en-US", { timeZone, hourCycle: "h23", year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit" }).formatToParts(new Date(ms)).reduce((o, p) => (o[p.type] = p.value, o), {});
+      const asIfLocal = (/* @__PURE__ */ new Date(`${parts.year}-${parts.month}-${parts.day}T${parts.hour}:${parts.minute}:${parts.second}`)).getTime();
+      ms += local - asIfLocal;
     }
+    return ms;
+  } catch (e) {
+    console.warn(`[calendar] unknown time zone "${timeZone}", reading the time as local:`, e?.message || e);
+    return local;
   }
-  if (event?.location)
-    params.push(`location=${encodeURIComponent(event.location)}`);
-  if (event?.notes)
-    params.push(`details=${encodeURIComponent(event.notes)}`);
-  if (event?.timeZone)
-    params.push(`ctz=${encodeURIComponent(event.timeZone)}`);
-  return `${base}&${params.join("&")}`;
 }
 async function showCalendarSidebar() {
   const el = document.getElementById("calendar-sidebar");
@@ -7345,6 +7397,7 @@ function initCalendarSidebar() {
     el.addEventListener("click", fn);
   };
   wireOnce("cal-side-prev", () => {
+    viewPinned = true;
     const d = new Date(viewYear, viewMonth, viewDay - 1);
     viewYear = d.getFullYear();
     viewMonth = d.getMonth();
@@ -7352,6 +7405,7 @@ function initCalendarSidebar() {
     refresh();
   });
   wireOnce("cal-side-next", () => {
+    viewPinned = true;
     const d = new Date(viewYear, viewMonth, viewDay + 1);
     viewYear = d.getFullYear();
     viewMonth = d.getMonth();
@@ -7359,12 +7413,22 @@ function initCalendarSidebar() {
     refresh();
   });
   wireOnce("cal-side-today", () => {
-    const t = /* @__PURE__ */ new Date();
-    viewYear = t.getFullYear();
-    viewMonth = t.getMonth();
-    viewDay = t.getDate();
+    viewPinned = false;
+    followToday();
     refresh();
   });
+  if (!window.__mailxCalRolloverArmed) {
+    window.__mailxCalRolloverArmed = true;
+    armMidnightRollover();
+    window.addEventListener("focus", () => {
+      if (!isCalendarSidebarOn())
+        return;
+      void refreshCalendarNow().then((r) => {
+        if (!r?.ok && r?.reason && !/refreshed \d+ s ago/.test(r.reason))
+          console.log(`[calendar] focus refresh not started: ${r.reason}`);
+      }).catch((e) => console.warn("[calendar] focus refresh failed:", e?.message || e));
+    });
+  }
   wireOnce("cal-side-new", () => {
     openNewEventDialog();
   });
@@ -7399,7 +7463,12 @@ function initCalendarSidebar() {
     if (btn)
       btn.disabled = true;
     try {
-      await Promise.all([renderCalendarList(), refresh()]);
+      const [, , pulled] = await Promise.all([renderCalendarList(), refresh(), refreshCalendarNow()]);
+      if (!pulled?.ok) {
+        const st = document.getElementById("status-sync");
+        if (st)
+          st.textContent = `Calendar not pulled from Google: ${pulled?.reason || "unknown"}`;
+      }
     } finally {
       setTimeout(() => {
         btn?.classList.remove("cal-side-refreshing");
@@ -7493,7 +7562,7 @@ function initCalendarSidebar() {
     }
   }
 }
-var SIDEBAR_PREF, SHOW_RECURRING_PREF, SHOW_DONE_PREF, HORIZON_DAYS_PREF, HORIZON_DEFAULT_DAYS, HOLIDAY_HORIZON_MS, viewYear, viewMonth, viewDay, lastEvents, lastOverdueTasks, calById, calendarList, hiddenCalendars, selectedTaskUuids, TASK_DELETE_NOTE, POST_CREATE_REFRESH_DELAYS_MS, postCreateTimers, postCreateFocusHandler;
+var SIDEBAR_PREF, SHOW_RECURRING_PREF, SHOW_DONE_PREF, HORIZON_DAYS_PREF, HORIZON_DEFAULT_DAYS, HOLIDAY_HORIZON_MS, viewYear, viewMonth, viewDay, viewPinned, lastEvents, lastOverdueTasks, LAST_CALENDAR_PREF, calById, calendarList, hiddenCalendars, selectedTaskUuids, TASK_DELETE_NOTE;
 var init_calendar_sidebar = __esm({
   "client/components/calendar-sidebar.js"() {
     "use strict";
@@ -7508,16 +7577,15 @@ var init_calendar_sidebar = __esm({
     viewYear = (/* @__PURE__ */ new Date()).getFullYear();
     viewMonth = (/* @__PURE__ */ new Date()).getMonth();
     viewDay = (/* @__PURE__ */ new Date()).getDate();
+    viewPinned = false;
     lastEvents = [];
     lastOverdueTasks = [];
+    LAST_CALENDAR_PREF = "mailx.calendar.lastCreateCalendar";
     calById = /* @__PURE__ */ new Map();
     calendarList = [];
     hiddenCalendars = /* @__PURE__ */ new Set();
     selectedTaskUuids = /* @__PURE__ */ new Set();
     TASK_DELETE_NOTE = "Removes it from Google Tasks. To mark it done instead, use the checkbox.";
-    POST_CREATE_REFRESH_DELAYS_MS = [45e3, 12e4, 3e5];
-    postCreateTimers = [];
-    postCreateFocusHandler = null;
   }
 });