@bobfrankston/rmfmail 1.0.666 → 1.0.668

package/bin/mailx.ts

@@ -23,8 +23,9 @@ import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
 import net from "node:net";
+import { execSync } from "node:child_process";
 import { ports } from "@bobfrankston/miscinfo";
-import { showMessageBox, showService, setAppName, setAppIcon } from "@bobfrankston/mailx-host";
+import { showMessageBox, showMessageBoxEx, showService, setAppName, setAppIcon } from "@bobfrankston/mailx-host";
 
 setAppName("rmfmail");
 // Prefer the .ico (Windows Explorer / taskbar-pin shortcut uses the embedded
@@ -225,7 +226,16 @@ const __selfVersion: string = (() => {
 })();
 const __instanceFile = path.join(process.env.USERPROFILE || process.env.HOME || ".", ".rmfmail", "instance.json");
 
-function readInstanceFile(): { pid: number; version: string; startedAt: number } | null {
+interface InstanceFile {
+    pid: number;
+    version: string;
+    startedAt: number;
+    /** PIDs of children spawned by this daemon: msger WebView host,
+     *  reminder popups, anything else we launched. Tracked so `-kill`
+     *  can SIGTERM them too without resorting to name-based sweeps. */
+    childPids?: number[];
+}
+function readInstanceFile(): InstanceFile | null {
     try {
         const raw = fs.readFileSync(__instanceFile, "utf-8");
         const inst = JSON.parse(raw);
@@ -233,12 +243,29 @@ function readInstanceFile(): { pid: number; version: string; startedAt: number }
     } catch { /* missing or unreadable — treated as no instance */ }
     return null;
 }
-function writeInstanceFile(pid: number): void {
+function writeInstanceFile(pid: number, childPids: number[] = []): void {
     try {
         fs.mkdirSync(path.dirname(__instanceFile), { recursive: true });
-        fs.writeFileSync(__instanceFile, JSON.stringify({ pid, version: __selfVersion, startedAt: Date.now() }, null, 2));
+        const payload: InstanceFile = { pid, version: __selfVersion, startedAt: Date.now(), childPids };
+        fs.writeFileSync(__instanceFile, JSON.stringify(payload, null, 2));
     } catch { /* non-fatal */ }
 }
+/** Add a child PID to the daemon's instance.json so a later `-kill`
+ *  knows to reap it. Caller is expected to remove it (via
+ *  removeChildPid) when the child exits naturally. */
+function addChildPid(pid: number): void {
+    const inst = readInstanceFile();
+    if (!inst) return;
+    const set = new Set(inst.childPids || []);
+    set.add(pid);
+    writeInstanceFile(inst.pid, [...set]);
+}
+function removeChildPid(pid: number): void {
+    const inst = readInstanceFile();
+    if (!inst) return;
+    const next = (inst.childPids || []).filter(p => p !== pid);
+    writeInstanceFile(inst.pid, next);
+}
 function clearInstanceFile(): void {
     try { fs.unlinkSync(__instanceFile); } catch { /* ignore */ }
 }
@@ -253,16 +280,17 @@ function pidAlive(pid: number): boolean {
  *  with "already running". Verify it's actually us. Non-Windows: fall back
  *  to pidAlive — POSIX PID reuse is rare enough that we don't bother. */
 function pidIsMailx(pid: number): boolean {
-    if (!pidAlive(pid)) return false;
-    if (process.platform !== "win32") return true;
-    try {
-        const { execSync } = require("node:child_process");
-        const out = execSync(
-            `powershell -NoProfile -Command "(Get-CimInstance Win32_Process -Filter \\"ProcessId=${pid}\\").CommandLine"`,
-            { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"], windowsHide: true },
-        ).toString();
-        return /(?:rmfmail|mailx)[\\\/](?:bin|packages|app)|mailx-server/i.test(out);
-    } catch { return false; }
+    // Cross-platform: trust instance.json as the source of identity.
+    // We registered this PID at startup; if it's still alive, treat it
+    // as ours. Earlier Windows-only check used PowerShell + CimInstance
+    // to grep the command line, which violated the cross-platform rule
+    // (see memory: feedback_cross_platform_strong_rule). The downside is
+    // a brief PID-reuse window after a crash: if Windows recycles the
+    // PID between crash and the next launch, our SIGTERM hits an
+    // unrelated process. Mitigation: daemon clears instance.json on
+    // graceful exit; stale-instance file only persists across hard
+    // crashes, which is rare.
+    return pidAlive(pid);
 }
 
 // Version-mismatch upgrade: if a daemon from an older version is running when
@@ -291,23 +319,17 @@ if (!isDaemon && !__isCommandInvocation && !__keepOthers) {
     if (inst && pidIsMailx(inst.pid) && inst.pid !== myPid) {
         try { process.kill(inst.pid, "SIGTERM"); killedPids.push(inst.pid); } catch { /* */ }
     }
-    // Backstop sweep: catches stragglers not in instance.json. Slow (~2s
-    // PowerShell+CIM startup) but only runs once per launch, and it's the
-    // only way to guarantee no orphan windows survive.
-    if (process.platform === "win32") {
-        try {
-            const { execSync } = require("node:child_process");
-            const out = execSync(
-                `powershell -NoProfile -Command "Get-CimInstance Win32_Process -Filter \\"name='node.exe'\\" | Where-Object { $_.CommandLine -match '(?:rmfmail|mailx)[\\\\/](?:bin|packages)|(?:rmfmail|mailx)-server' } | Select-Object -ExpandProperty ProcessId"`,
-                { encoding: "utf-8", windowsHide: true },
-            ).toString();
-            for (const line of out.split("\n").map((s: string) => s.trim()).filter((s: string) => /^\d+$/.test(s))) {
-                const pid = Number(line);
-                if (pid === myPid) continue;
-                try { process.kill(pid, "SIGTERM"); if (!killedPids.includes(pid)) killedPids.push(pid); } catch { /* */ }
-            }
-        } catch { /* sweep failed — proceed; instance.json kill above usually covers it */ }
-    }
+    // Replace-on-launch trusts the registered PID in instance.json. The
+    // graceful-shutdown handler in the prior daemon (this same file, below)
+    // is responsible for closing its own child msger/popup processes via
+    // handle.close() — name-based sweeps over `node.exe` / `msgernative.exe`
+    // / per-app exes are fragile and ALSO not portable (taskkill is
+    // Windows-only). If a daemon crashed without graceful shutdown, the
+    // instance file gets cleared next launch via the stale-PID check and
+    // the orphan stays until the user resolves it manually — preferable to
+    // a sweep that risks killing an unrelated `mailx` / `rmfmail` process
+    // owned by a different user (e.g., a developer running it from a
+    // sibling worktree).
     // Brief wait + SIGKILL anything that didn't exit gracefully.
     if (killedPids.length) {
         const deadline = Date.now() + 2000;
@@ -371,7 +393,6 @@ function log(...msg: any[]): void { if (verbose) console.log("[rmfmail]", ...msg
 function isElevated(): boolean {
     try {
         if (process.platform === "win32") {
-            const { execSync } = require("node:child_process");
             execSync("net session >nul 2>&1", { stdio: "ignore", windowsHide: true });
             return true;
         }
@@ -410,60 +431,41 @@ if (hasFlag("kill")) {
     const { execSync } = await import("node:child_process");
     let killed = 0;
 
-    // Try graceful exit first
-    try {
-        execSync(`curl -s -m 2 http://localhost:${PORT}/api/exit`, { stdio: "pipe" });
-        log("Sent graceful exit");
-        execSync("timeout /t 1 /nobreak", { stdio: "pipe" });
-    } catch { /* server may not be responding */ }
-
-    if (process.platform === "win32") {
-        // Kill by port
-        try {
-            const out = execSync(`netstat -ano | findstr :${PORT} | findstr LISTENING`, { encoding: "utf-8" }).trim();
-            const pids = [...new Set(out.split("\n").map(l => l.trim().split(/\s+/).pop()).filter(Boolean))];
-            for (const pid of pids) {
-                try { execSync(`taskkill /F /PID ${pid}`, { stdio: "pipe" }); console.log(`Killed PID ${pid} (port ${PORT})`); killed++; } catch { /* */ }
-            }
-        } catch { /* no process on port */ }
-
-        // Kill any node.exe running rmfmail (server or IPC service). Match
-        // the legacy `mailx` path too — source tree dir is still
-        // `Y:\dev\email\mailx\` and per-app exes from older installs are
-        // under `%LOCALAPPDATA%\mailx\` until those get cleaned up.
-        try {
-            const ps = execSync(
-                // Match both `\` and `/` path separators — node CommandLine
-                // can show either depending on how it was invoked. The
-                // earlier `\\packages` / `\\bin` variants missed forward-
-                // slash paths and left a daemon running. The character
-                // class [\\\\/] covers both. `(?:...)` keeps the regex
-                // unanchored — substring match anywhere in CommandLine.
-                `powershell -NoProfile -Command "Get-CimInstance Win32_Process -Filter \\"name='node.exe'\\" | Where-Object { $_.CommandLine -match '(?:rmfmail|mailx)[\\\\/](?:bin|packages)|(?:rmfmail|mailx)-server' } | Select-Object -ExpandProperty ProcessId"`,
-                { encoding: "utf-8" }
-            ).trim();
-            for (const pid of ps.split("\n").map(s => s.trim()).filter(s => /^\d+$/.test(s))) {
-                try { execSync(`taskkill /F /PID ${pid}`, { stdio: "pipe" }); console.log(`Killed PID ${pid} (rmfmail node process)`); killed++; } catch { /* */ }
-            }
-        } catch { /* */ }
-
-        // Kill orphaned msgernative.exe windows. When the node process dies
-        // without cascade-killing its WebView child (old crash, forced
-        // taskkill, etc.), the msgernative.exe stays on screen and looks
-        // like a live rmfmail. rmfmail -kill should leave no trace.
-        // Scoped to exes launched for rmfmail by filtering CommandLine —
-        // don't touch msger windows started by other apps (msga, bbs, etc.).
+    // Cross-platform kill via instance.json. Daemon writes its PID +
+    // child PIDs (msger WebView, popups) at startup and on each spawn;
+    // -kill reads them and SIGTERMs each. No name-based sweeps, no
+    // PowerShell, no taskkill — those were Windows-only AND fragile
+    // (could match unrelated processes). See memory:
+    // feedback_cross_platform_strong_rule.
+    const inst = readInstanceFile();
+    const targets: number[] = [];
+    if (inst && pidAlive(inst.pid)) targets.push(inst.pid);
+    for (const cp of (inst?.childPids || [])) {
+        if (pidAlive(cp)) targets.push(cp);
+    }
+    for (const pid of targets) {
         try {
-            const ps = execSync(
-                `powershell -NoProfile -Command "Get-CimInstance Win32_Process -Filter \\"name='msgernative.exe'\\" | Where-Object { $_.CommandLine -match 'rmfmail|mailx' -or $_.Path -match 'rmfmail|mailx' } | Select-Object -ExpandProperty ProcessId"`,
-                { encoding: "utf-8" }
-            ).trim();
-            for (const pid of ps.split("\n").map(s => s.trim()).filter(s => /^\d+$/.test(s))) {
-                try { execSync(`taskkill /F /PID ${pid}`, { stdio: "pipe" }); console.log(`Killed PID ${pid} (rmfmail msgernative/WebView)`); killed++; } catch { /* */ }
+            process.kill(pid, "SIGTERM");
+            console.log(`SIGTERM → PID ${pid}`);
+            killed++;
+        } catch (e: any) {
+            // ESRCH: stale PID, already dead. Anything else is unexpected.
+            if (e?.code !== "ESRCH") console.error(`  kill ${pid}: ${e?.message || e}`);
+        }
+    }
+    // Wait briefly for graceful shutdown, then SIGKILL anything still alive.
+    if (targets.length) {
+        const deadline = Date.now() + 2000;
+        while (Date.now() < deadline && targets.some(p => pidAlive(p))) {
+            const sab = new SharedArrayBuffer(4);
+            Atomics.wait(new Int32Array(sab), 0, 0, 100);
+        }
+        for (const pid of targets) {
+            if (pidAlive(pid)) {
+                try { process.kill(pid, "SIGKILL"); console.log(`SIGKILL → PID ${pid}`); }
+                catch { /* */ }
             }
-        } catch { /* */ }
-    } else {
-        try { execSync(`fuser -k ${PORT}/tcp`, { stdio: "pipe" }); console.log(`Killed process on port ${PORT}`); killed++; } catch { /* */ }
+        }
     }
 
     // Clean up stale SQLite WAL/SHM files
@@ -1308,9 +1310,22 @@ RFC 5322 with CRLF line endings. Bodies are quoted-printable encoded (readable i
     // Inject the popup function so MailxService.showReminderPopup can spawn
     // an OS-level always-on-top window via mailx-host. Kept as injection
     // (not import) so mailx-service stays host-agnostic.
+    //
+    // Uses showMessageBoxEx so we get a MessageBoxHandle back with
+    // `pid` and `close()`. The pid goes into instance.json's childPids
+    // for the lifetime of the popup, so a `rmfmail -kill` from another
+    // shell can SIGTERM it without name-based sweeps (cross-platform —
+    // see memory: feedback_cross_platform_strong_rule). Remove on
+    // resolution so the file doesn't accumulate stale PIDs.
     svc.setPopupFn(async (opts: any) => {
-        const r = await showMessageBox(opts);
-        return { button: r.button, closed: r.closed, dismissed: r.dismissed };
+        const h = showMessageBoxEx(opts);
+        if (typeof h.pid === "number") addChildPid(h.pid);
+        try {
+            const r = await h.result;
+            return { button: r.button, closed: r.closed, dismissed: r.dismissed, form: (r as any).form };
+        } finally {
+            if (typeof h.pid === "number") removeChildPid(h.pid);
+        }
     });
 
     // Open msger in service mode — custom protocol serves files from client dir
@@ -1378,17 +1393,24 @@ RFC 5322 with CRLF line endings. Bodies are quoted-printable encoded (readable i
         escapeCloses: false,
     });
 
-    // Register ourselves as the live instance so subsequent `mailx` invocations
-    // can detect version-mismatch and upgrade us (see top of file). Clear on
-    // any of: SIGINT, SIGTERM, normal exit.
+    // Register ourselves as the live instance so subsequent `rmfmail`
+    // invocations can detect version-mismatch and upgrade us (see top of
+    // file). Clear on any of: SIGINT, SIGTERM, normal exit.
     //
     // Critical: the SIGTERM handler must *close the WebView child process*
-    // (handle.close() → kills msgernative.exe) before Node exits. Without
-    // this, the auto-upgrade leaves the old WebView orphaned on screen and
-    // the user sees an apparently frozen "old mailx" while the new Node is
-    // trying to spawn a second one. Cascade-killing the child makes the
-    // version-mismatch auto-upgrade actually transparent to the user.
-    writeInstanceFile(process.pid);
+    // (handle.close() → SIGTERM to the msger child) before Node exits.
+    // Without this, the auto-upgrade leaves the old WebView orphaned on
+    // screen and the user sees an apparently frozen "old rmfmail" while
+    // the new Node is trying to spawn a second one. Cascade-closing the
+    // child makes the version-mismatch auto-upgrade transparent.
+    //
+    // Child PIDs (the msger WebView host + any reminder popups) go into
+    // instance.json so that a future `rmfmail -kill` can SIGTERM them
+    // cross-platform without resorting to name-based process sweeps.
+    const initialChildPids: number[] = [];
+    const handleChild = (handle as any)?.pid ?? (handle as any)?.child?.pid;
+    if (typeof handleChild === "number") initialChildPids.push(handleChild);
+    writeInstanceFile(process.pid, initialChildPids);
     const __cleanupInstance = () => {
         // Only clear if WE are still the registered instance. Prevents the
         // restart-daemon sequence (clear → spawn → new daemon writes its

package/client/app.bundle.js

@@ -3426,7 +3426,8 @@ async function fetchUpcoming(from) {
     notes: r.notes,
     source: r.providerId ? "google" : "local",
     recurringEventId: r.recurringEventId,
-    htmlLink: r.htmlLink
+    htmlLink: r.htmlLink,
+    isHoliday: !!r.isHoliday
   }));
 }
 function formatDayHeader(d, today, tomorrow) {
@@ -3518,8 +3519,12 @@ function renderEvents(events) {
     }
     const recurMark = e.recurringEventId ? `<span class="cal-side-event-recur" title="Recurring event">\u21BB</span>` : "";
     const link = e.htmlLink || "";
-    html += `<div class="cal-side-event" data-id="${e.id}" data-link="${escapeHtml4(link)}" ${link ? 'title="Click to open in Google Calendar"' : ""}>
-            <span class="cal-side-event-dot ${e.source === "google" ? "g" : "l"}"></span>
+    const holidayAttr = e.isHoliday ? ' data-holiday="1"' : "";
+    const clickable = !e.isHoliday;
+    const titleAttr = clickable && link ? 'title="Click to open in Google Calendar"' : "";
+    const dataLink = clickable ? `data-link="${escapeHtml4(link)}"` : "";
+    html += `<div class="cal-side-event" data-id="${e.id}"${holidayAttr} ${dataLink} ${titleAttr}>
+            <span class="cal-side-event-dot ${e.isHoliday ? "h" : e.source === "google" ? "g" : "l"}"></span>
             <span class="cal-side-event-time">${escapeHtml4(formatTime(e))}</span>
             <span class="cal-side-event-title">${escapeHtml4(e.title)}${recurMark}</span>
         </div>`;
@@ -3908,6 +3913,28 @@ function initCalendarSidebar() {
       refresh();
     });
   }
+  const wireHolidayCheckbox = (cbId, settingsKey) => {
+    const cb = document.getElementById(cbId);
+    if (!cb || cb.__wired)
+      return;
+    cb.__wired = true;
+    getSettings().then((s) => {
+      cb.checked = !!s?.calendar?.[settingsKey];
+    }).catch(() => {
+    });
+    cb.addEventListener("change", async () => {
+      try {
+        const s = await getSettings();
+        s.calendar = { ...s.calendar || {}, [settingsKey]: cb.checked };
+        await saveSettings(s);
+      } catch (e) {
+        console.error(`[cal] ${settingsKey} save failed:`, e);
+      }
+      refresh();
+    });
+  };
+  wireHolidayCheckbox("cal-side-show-holidays", "showHolidays");
+  wireHolidayCheckbox("cal-side-show-jewish-holidays", "showJewishHolidays");
   const horizonInput = document.getElementById("cal-side-horizon");
   if (horizonInput && !horizonInput.__wired) {
     horizonInput.__wired = true;
@@ -4346,21 +4373,104 @@ async function firePopupForItem(item) {
   if (openPopups.has(item.uuid))
     return;
   openPopups.add(item.uuid);
+  const buttons = ["snooze", "Dismiss"];
+  if (item.htmlLink)
+    buttons.push("Open");
+  if (item.kind === "calendar")
+    buttons.push("Delete");
+  const icon = item.kind === "calendar" ? "\u{1F4C5}" : "\u2611";
+  const kindLabel = item.kind === "calendar" ? "Calendar event" : "Task due";
+  const presets = [
+    { label: "5m", minutes: 5 },
+    { label: "15m", minutes: 15 },
+    { label: "30m", minutes: 30 },
+    { label: "1h", minutes: 60 },
+    { label: "2h", minutes: 120 },
+    { label: "1d", minutes: 60 * 24 }
+  ];
+  const presetChips = presets.map((p) => `<button type="button" class="chip" data-snooze-min="${p.minutes}">${p.label}</button>`).join("");
+  const actionBtns = ["Dismiss"];
+  if (item.htmlLink)
+    actionBtns.push("Open");
+  if (item.kind === "calendar")
+    actionBtns.push("Delete");
+  const actionHtml = actionBtns.map((b) => `<button type="button" class="action" data-btn="${escapeHtml6(b)}">${escapeHtml6(b)}</button>`).join("");
   const html = `<!DOCTYPE html>
 <html><head><meta charset="utf-8"><style>
-  body { font: 13px system-ui, sans-serif; margin: 0; padding: 16px 18px; background: #fff; color: #222; }
-  .icon { display: inline-block; width: 18px; text-align: center; margin-right: 4px; }
-  .title { font-size: 1.05em; font-weight: 600; margin-bottom: 6px; }
-  .when  { color: #555; font-size: 0.95em; margin-bottom: 4px; }
+  html, body { height: 100%; }
+  body { font: 13px system-ui, sans-serif; margin: 0; padding: 14px 16px; background: #fff; color: #222; display:flex; flex-direction:column; box-sizing:border-box; gap: 8px; }
+  .icon { display: inline-block; width: 20px; text-align: center; margin-right: 4px; }
+  .title { font-size: 1.1em; font-weight: 600; }
+  .when  { color: #555; font-size: 0.95em; }
   .kind  { color: #888; font-size: 0.85em; }
+  .spacer { flex: 1; }
+  .row { display: flex; align-items: center; gap: 6px; flex-wrap: wrap; }
+  .row-label { color: #555; font-size: 0.85em; margin-right: 2px; }
+  button { font: 13px system-ui, sans-serif; cursor: pointer; }
+  .chip { padding: 3px 9px; border: 1px solid #ccc; border-radius: 12px; background: #f7f7f7; color: #222; }
+  .chip:hover { background: #e8f0fe; border-color: #0066cc; color: #0066cc; }
+  .custom { display: flex; align-items: center; gap: 4px; }
+  .custom input[type=number] { width: 48px; padding: 2px 4px; border: 1px solid #ccc; border-radius: 3px; font: inherit; }
+  .custom select { padding: 2px 4px; border: 1px solid #ccc; border-radius: 3px; font: inherit; background: #fff; }
+  .custom button.ok { padding: 2px 8px; border: 1px solid #0066cc; border-radius: 3px; background: #0066cc; color: #fff; }
+  .custom button.ok:hover { background: #0052a3; }
+  .actions { display: flex; gap: 8px; justify-content: flex-end; margin-top: 4px; }
+  .actions button.action { padding: 5px 14px; border: none; border-radius: 4px; background: #0066cc; color: #fff; min-width: 70px; }
+  .actions button.action:hover { background: #0052a3; }
+  .actions button.action[data-btn="Delete"] { background: #b00; }
+  .actions button.action[data-btn="Delete"]:hover { background: #800; }
 </style></head><body>
-  <div class="title"><span class="icon">${item.kind === "calendar" ? "\u{1F4C5}" : "\u2611"}</span>${escapeHtml6(item.title)}</div>
+  <div class="title"><span class="icon">${icon}</span>${escapeHtml6(item.title)}</div>
   <div class="when">${escapeHtml6(formatWhen(item.whenMs))}</div>
-  <div class="kind">${item.kind === "calendar" ? "Calendar event" : "Task due"}</div>
+  <div class="kind">${kindLabel}</div>
+  <div class="row">
+    <span class="row-label">Snooze:</span>
+    ${presetChips}
+  </div>
+  <div class="row custom">
+    <span class="row-label">Custom:</span>
+    <input type="number" id="customN" value="5" min="1" max="999">
+    <select id="customUnit">
+      <option value="1">minutes</option>
+      <option value="60">hours</option>
+      <option value="1440">days</option>
+    </select>
+    <button type="button" class="ok" id="customGo">Snooze</button>
+  </div>
+  <div class="spacer"></div>
+  <div class="actions">${actionHtml}</div>
+<script>
+  function send(payload) {
+    try { window.ipc.postMessage(JSON.stringify(payload)); }
+    catch (e) { try { window.close(); } catch (_) {} }
+  }
+  // Preset chips \u2192 snooze N minutes
+  document.querySelectorAll("button[data-snooze-min]").forEach(function(b) {
+    b.addEventListener("click", function() {
+      var m = parseInt(b.getAttribute("data-snooze-min"), 10) || 15;
+      send({ button: "snooze", form: { minutes: m } });
+    });
+  });
+  // Custom snooze form \u2192 snooze N * unit-multiplier minutes
+  var customGo = document.getElementById("customGo");
+  var customN = document.getElementById("customN");
+  var customUnit = document.getElementById("customUnit");
+  function submitCustom() {
+    var n = parseInt(customN.value, 10);
+    if (!isFinite(n) || n < 1) n = 5;
+    var mult = parseInt(customUnit.value, 10) || 1;
+    send({ button: "snooze", form: { minutes: n * mult } });
+  }
+  customGo.addEventListener("click", submitCustom);
+  customN.addEventListener("keydown", function(e) { if (e.key === "Enter") submitCustom(); });
+  // Action buttons (Dismiss/Open/Delete) \u2192 discriminate by label.
+  document.querySelectorAll("button[data-btn]").forEach(function(b) {
+    b.addEventListener("click", function() {
+      send({ button: b.getAttribute("data-btn") });
+    });
+  });
+<\/script>
 </body></html>`;
-  const buttons = ["Snooze 15m", "Snooze 1h", "Dismiss"];
-  if (item.htmlLink)
-    buttons.push("Open");
   const title = item.kind === "calendar" ? "Calendar reminder" : "Task reminder";
   const hasHost = !!window.mailxapi?.showReminderPopup;
   let r;
@@ -4370,7 +4480,10 @@ async function firePopupForItem(item) {
         title,
         html,
         buttons,
-        size: { width: 480, height: 210 }
+        // Sized for the new snooze form (chips row + custom input
+        // row + action buttons) plus title/when/kind. Width fits
+        // "5m 15m 30m 1h 2h 1d" on one line in Segoe UI.
+        size: { width: 560, height: 300 }
       });
     } else {
       r = await showInWebViewPopup({ title, html, buttons });
@@ -4398,6 +4511,14 @@ async function firePopupForItem(item) {
       firedThisSession.delete(item.uuid);
       snoozeItem(item, 2);
       break;
+    case "snooze": {
+      const m = Math.max(1, Math.floor(r.form?.minutes ?? 15));
+      snoozeItem(item, m);
+      break;
+    }
+    // Legacy literal labels — retained so a pre-upgrade popup whose
+    // bundle still says "Snooze 15m" / "Snooze 1h" continues to work
+    // through a daemon-side rebuild without a UI restart.
     case "Snooze 15m":
       snoozeItem(item, 15);
       break;
@@ -4411,6 +4532,15 @@ async function firePopupForItem(item) {
         saveDismissed(m);
       }
       break;
+    case "Delete":
+      {
+        const m = loadDismissed();
+        m[item.uuid] = true;
+        saveDismissed(m);
+      }
+      firedThisSession.delete(item.uuid);
+      deleteCalendarEvent(item.uuid).catch((e) => console.error(`  [alarm] delete failed for ${item.uuid}: ${e?.message || e}`));
+      break;
     default:
       snoozeItem(item, 15);
       break;