@bobfrankston/rmfmail 1.1.106 → 1.1.108

package/client/app.ts

@@ -8,7 +8,7 @@ import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, rel
 import { seenOf, flaggedOf, draftOf, setSeen, setFlagged } from "@bobfrankston/mailx-types";
 import { initTabs, setActiveView as setActiveTabView, openTab, type ViewTab } from "./components/tabs.js";
 import { showMessage, getCurrentMessage, initViewer, popOutCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu, wrapHtmlBody } from "./components/message-viewer.js";
-import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessage, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage, subscribeStore } from "./lib/api-client.js";
+import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessage, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage, subscribeStore, cancelServerSearch } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
 
 // ── New message badge (favicon + title) ──
@@ -1237,9 +1237,12 @@ function quoteBody(msg: any): string {
     const date = new Date(msg.date).toLocaleString();
     const from = msg.from.name ? `${msg.from.name} <${msg.from.address}>` : msg.from.address;
     const body = sanitizeQuotedBody(msg);
-    // Two blank lines above the quote so the cursor lands with breathing room
-    // between the user's reply and the "On ... wrote:" line.
-    return `<br><br><div class="reply"><p>On ${date}, ${from} wrote:</p><blockquote>${body}</blockquote></div>`;
+    // Lead with an empty paragraph so every editor has a real block for the
+    // caret to land in and the user's reply to flow into — bare <br>s aren't
+    // a block container, so TinyMCE's caret fell through to the quote (Bob
+    // 2026-05-21). The blank-line spacing lives in <br>s AFTER the </p>, not
+    // inside it.
+    return `<p></p><br><br><div class="reply"><p>On ${date}, ${from} wrote:</p><blockquote>${body}</blockquote></div>`;
 }
 
 function forwardBody(msg: any): string {
@@ -1247,7 +1250,7 @@ function forwardBody(msg: any): string {
     const from = msg.from.name ? `${msg.from.name} &lt;${msg.from.address}&gt;` : msg.from.address;
     const to = msg.to.map((a: any) => a.name ? `${a.name} &lt;${a.address}&gt;` : a.address).join(", ");
     const body = sanitizeQuotedBody(msg);
-    return `<br><br><div class="reply"><p>---------- Forwarded message ----------<br>From: ${from}<br>Date: ${date}<br>Subject: ${msg.subject}<br>To: ${to}</p>${body}</div>`;
+    return `<p></p><br><br><div class="reply"><p>---------- Forwarded message ----------<br>From: ${from}<br>Date: ${date}<br>Subject: ${msg.subject}<br>To: ${to}</p>${body}</div>`;
 }
 
 // ── Delete with undo ──
@@ -1922,23 +1925,41 @@ searchInput?.addEventListener("scroll", () => {
 searchInput?.addEventListener("change", () => updateSearchHighlight());
 updateSearchHighlight();
 
+// Server search is slow (per-folder IMAP SEARCH across ~90 folders). It must
+// never gate the local result display, and it should only fire once typing
+// has settled. Local search runs immediately on every doSearch; the server
+// pass is scheduled `SERVER_SEARCH_DALLY_MS` later and any new keystroke
+// clears+reschedules it. message-list's loadGen counter discards a stale
+// server pass's results, so a restart is effectively an abort at the UI.
+const SERVER_SEARCH_DALLY_MS = 700;
+let serverSearchTimer: ReturnType<typeof setTimeout> | null = null;
+
 function doSearch(immediate = false): void {
     const query = searchInput.value.trim();
     if (query.length === 0) { reloadCurrentFolder(); return; }
     if (query.length < 2 && !immediate) return;
 
-    // P20: orthogonal "Server" checkbox. When checked, scope switches to
-    // "server" which spans all folders on all accounts. Local scope dropdown
-    // is unchanged (all/current) for the local-only case.
+    // P20: orthogonal "Server" checkbox. When checked, the search ALSO spans
+    // every folder on the server — but as a deferred second phase, never a
+    // replacement for the instant local pass.
     const serverCheck = document.getElementById("search-server-too") as HTMLInputElement | null;
     const trashCheck = document.getElementById("search-include-trash") as HTMLInputElement | null;
     const localScope = searchScope?.value || "all";
-    const effectiveScope = serverCheck?.checked ? "server" : localScope;
     const includeTrash = !!trashCheck?.checked;
-
-    // "This folder" scope: instant client-side filter on debounce, server search on Enter
-    if (effectiveScope === "current" && !immediate) {
-        // Client-side filter of visible rows
+    const serverOn = !!serverCheck?.checked;
+
+    // Any re-run aborts a pending server pass — it'll be rescheduled below
+    // if still wanted. This is the "editing the search aborts + restarts"
+    // behavior: each keystroke cancels the prior server search. clearTimeout
+    // kills a not-yet-fired pass; cancelServerSearch() aborts one that's
+    // already mid-sweep on the daemon (generation bump → loop bails).
+    if (serverSearchTimer) { clearTimeout(serverSearchTimer); serverSearchTimer = null; }
+    cancelServerSearch();
+
+    // "This folder" scope: instant client-side filter of the visible rows.
+    // Only when the server checkbox is OFF — with it on we want the real
+    // local+server search, not a row filter.
+    if (localScope === "current" && !serverOn && !immediate) {
         const body = document.getElementById("ml-body");
         if (body) {
             const lower = query.toLowerCase();
@@ -1950,10 +1971,13 @@ function doSearch(immediate = false): void {
         return;
     }
 
-    loadSearchResults(query, effectiveScope, currentAccountId, currentFolderId, includeTrash);
+    // ── Phase 1: LOCAL search — always, immediately ──
+    // The local SQLite store is fast; results paint as the user types.
+    const localScopeEff = localScope === "current" ? "current" : "all";
+    loadSearchResults(query, localScopeEff, currentAccountId, currentFolderId, includeTrash);
     setTitle(`${APP_NAME} - Search: ${query}`);
     setActiveTabView(
-        { kind: "search", query, scope: effectiveScope, accountId: currentAccountId, folderId: currentFolderId, includeTrash },
+        { kind: "search", query, scope: serverOn ? "server" : localScopeEff, accountId: currentAccountId, folderId: currentFolderId, includeTrash },
         `Search: ${query}`,
     );
     // Record every executed search — Enter AND a settled debounced search
@@ -1961,6 +1985,18 @@ function doSearch(immediate = false): void {
     // keystroke progression, so a search the user typed without pressing
     // Enter ("Hoddie") still shows up in history.
     recordSearchHistory(query);
+
+    // ── Phase 2: SERVER search — deferred, augments phase 1 ──
+    // Fires after the dally so a burst of keystrokes only triggers one IMAP
+    // sweep. The local rows from phase 1 stay on screen the whole time
+    // (loadSearchResults won't blank a list that already has rows), so the
+    // server pass never makes the user stare at an empty list.
+    if (serverOn) {
+        serverSearchTimer = setTimeout(() => {
+            serverSearchTimer = null;
+            loadSearchResults(query, "server", currentAccountId, currentFolderId, includeTrash);
+        }, SERVER_SEARCH_DALLY_MS);
+    }
 }
 
 // Track current folder for scoped search
@@ -1970,6 +2006,7 @@ let reloadDebounceTimer: ReturnType<typeof setTimeout> | null = null;
 
 searchInput?.addEventListener("input", () => {
     clearTimeout(searchTimeout);
+    if (serverSearchTimer) { clearTimeout(serverSearchTimer); serverSearchTimer = null; cancelServerSearch(); }
     updateSearchHighlight();
     if (searchInput.value.trim() === "") {
         // Cleared — reset immediately, no debounce. Must exit search mode
@@ -1981,7 +2018,10 @@ searchInput?.addEventListener("input", () => {
         reloadCurrentFolder();
         setTitle(APP_NAME);
     } else {
-        searchTimeout = setTimeout(() => doSearch(false), 300);
+        // Short debounce — just enough to coalesce a keystroke burst. The
+        // local pass is cheap; the server pass has its own longer dally
+        // inside doSearch, so this stays snappy.
+        searchTimeout = setTimeout(() => doSearch(false), 180);
     }
 });
 searchInput?.addEventListener("keydown", (e) => {
@@ -1991,6 +2031,8 @@ searchInput?.addEventListener("keydown", (e) => {
     }
     if (e.key === "Escape") {
         searchInput.value = "";
+        if (serverSearchTimer) { clearTimeout(serverSearchTimer); serverSearchTimer = null; }
+        cancelServerSearch();
         updateSearchHighlight();
         clearSearchMode();
         // Clear any client-side filters
@@ -4181,6 +4223,14 @@ getSettings().then((s: any) => {
 
 // Save editor choice to server settings
 function saveEditorSetting(editor: string): void {
+    // Update the localStorage cache SYNCHRONOUSLY. compose.ts reads
+    // `mailx-editor-type` from localStorage at module-load to pick the
+    // editor — its async getSettings() refresh only runs when a compose
+    // window opens, and reads localStorage FIRST. Without this write the
+    // cache stays stale and the next compose keeps the old editor until a
+    // full app restart (Bob 2026-05-21: "changed to quill but got tinymce
+    // until I restarted"). With it, the very next compose-open is correct.
+    try { localStorage.setItem("mailx-editor-type", editor); } catch { /* private mode */ }
     getSettings().then((settings: any) => {
         settings.ui = { ...settings.ui, editor };
         saveSettings(settings);

package/client/compose/compose.bundle.js

@@ -44,6 +44,7 @@ __export(api_client_exports, {
   allowRemoteContent: () => allowRemoteContent,
   autocomplete: () => autocomplete,
   cancelQueuedOutgoing: () => cancelQueuedOutgoing,
+  cancelServerSearch: () => cancelServerSearch,
   closeWordEdit: () => closeWordEdit,
   connectEvents: () => connectEvents,
   connectWebSocket: () => connectWebSocket,
@@ -217,6 +218,9 @@ function getUnifiedInbox(page = 1, pageSize = 50) {
 function searchMessages(query, page = 1, pageSize = 50, scope = "all", accountId = "", folderId = 0, includeTrashSpam = false) {
   return ipc().searchMessages(query, page, pageSize, scope, accountId, folderId, includeTrashSpam);
 }
+function cancelServerSearch() {
+  return ipc().cancelServerSearch?.();
+}
 function getMessage(accountId, uid, allowRemote = false, folderId) {
   return ipc().getMessage(accountId, uid, allowRemote, folderId);
 }
@@ -824,17 +828,33 @@ async function createTinyMceEditor(container2, opts = {}) {
       editor2.focus();
     },
     setCursor(pos) {
-      try {
-        editor2.selection.select(editor2.getBody(), true);
-        editor2.selection.collapse(
-          pos === 0
-          /* true = start */
-        );
-        editor2.focus();
-        if (pos === 0)
+      const place = () => {
+        const body = editor2.getBody();
+        if (pos === 0) {
+          const first = body.firstChild;
+          if (first && first.nodeType === 1) {
+            editor2.selection.setCursorLocation(first, 0);
+          } else {
+            editor2.selection.select(body, true);
+            editor2.selection.collapse(true);
+          }
+          editor2.focus();
           editor2.getWin()?.scrollTo(0, 0);
-        else
+        } else {
+          editor2.selection.select(body, true);
+          editor2.selection.collapse(false);
+          editor2.focus();
           editor2.selection.scrollIntoView();
+        }
+      };
+      try {
+        place();
+        editor2.getWin()?.requestAnimationFrame?.(() => {
+          try {
+            place();
+          } catch {
+          }
+        });
       } catch {
       }
     },