@bobfrankston/rmfmail 1.1.250 → 1.1.251

package/client/app.ts

@@ -2341,18 +2341,16 @@ function doSearch(immediate = false): void {
     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) {
-        // Register as a live list filter (not a raw DOM toggle) so it survives
-        // background sync reloads and blocks reloadCurrentFolder — otherwise a
-        // sync mid-read wipes the filter, deselects the open message, and pops
-        // back to the full list while the search box still shows the query
-        // (Bob 2026-05-31). setLiveFilter applies the hide to current rows.
-        setLiveFilter(query);
-        return;
-    }
+    // "This folder" scope used to be an instant client-side filter of the
+    // VISIBLE rows. That was doubly wrong (Bob 2026-06-12): it only saw the
+    // loaded page (so a match deeper in a big folder like Trash never showed),
+    // and it did a dumb substring match that didn't understand qualifiers
+    // (`from:amazon` matched the literal text and so found nothing). "This
+    // folder" now runs the REAL DB search below (scope="current"), which the
+    // service scopes to the current folder AND forces includeTrashSpam=true —
+    // so searching inside Trash finds Trash messages, and `from:`/`subject:`
+    // qualifiers work. The DB FTS pass is sub-second, so we don't lose the
+    // instant feel. (Server checkbox still adds the cross-folder IMAP sweep.)
 
     // ── Phase 1: LOCAL search — always, immediately ──
     // The local SQLite store is fast; results paint as the user types.

package/client/compose/compose.bundle.js

@@ -4,11 +4,20 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+var __esm = (fn, res, err) => function __init() {
+  if (err) throw err[0];
+  try {
+    return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+  } catch (e) {
+    throw err = [e], e;
+  }
 };
 var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  try {
+    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  } catch (e) {
+    throw mod = 0, e;
+  }
 };
 var __export = (target, all) => {
   for (var name in all)