@bobfrankston/rmfmail 1.1.170 → 1.1.177

package/bin/mailx.ts

@@ -399,7 +399,7 @@ function pidIsMailx(pid: number): boolean {
 // on an old UI with no indication that the install has been upgraded.
 // Skip this logic for command-only flags (kill, rebuild, setup, ...) and for
 // the internal --daemon respawn.
-const __commandFlags = ["kill", "v", "version", "setup", "add", "test", "rebuild", "repair", "recover", "import", "log", "reauth"];
+const __commandFlags = ["kill", "v", "version", "setup", "add", "test", "rebuild", "repair", "recover", "fix-flags", "import", "log", "reauth"];
 const __isCommandInvocation = process.argv.slice(2).some(a => __commandFlags.includes(a.replace(/^--?/, "")));
 // `--another` opts out of the replace-on-launch sweep so the user can run
 // multiple rmfmail instances side by side (testing, parallel sessions, etc.).
@@ -473,7 +473,7 @@ const recoverMode = hasFlag("recover");
 const importMode = hasFlag("import");
 
 // Validate arguments
-const knownFlags = ["verbose", "kill", "v", "version", "setup", "add", "test", "rebuild", "repair", "recover", "log", "import", "email", "mail", "daemon", "reauth", "mailto", "register-mailto", "unregister-mailto", "allow-elevated", "another", "server", "no-browser", "debug-server", "send", "account"];
+const knownFlags = ["verbose", "kill", "v", "version", "setup", "add", "test", "rebuild", "repair", "recover", "fix-flags", "log", "import", "email", "mail", "daemon", "reauth", "mailto", "register-mailto", "unregister-mailto", "allow-elevated", "another", "server", "no-browser", "debug-server", "send", "account"];
 for (const arg of args) {
     // Strip a leading -/-- and any `=value` suffix before checking.
     const flag = arg.replace(/^--?/, "").split("=")[0];
@@ -500,6 +500,10 @@ for (const arg of args) {
             "                           (same 200-newest cap; fixes corrupt fields)\n" +
             "    -recover               REBUILD DB index from .eml files on disk\n" +
             "                           (no network; restores everything you had)\n" +
+            "    -fix-flags             Reconcile local \\Flagged stars against the\n" +
+            "                           IMAP server's actual SEARCH FLAGGED truth\n" +
+            "                           (one-shot cleanup for the pre-1.1.172 UID-\n" +
+            "                           collision bug)\n" +
             "    -reauth                Clear cached OAuth tokens; re-consent on next start\n" +
             "    -log                   Print log file path and exit\n" +
             "    -email <addr>          First-time setup with this email (skips prompt)\n" +
@@ -761,12 +765,28 @@ if (recoverMode) {
 
     console.log("Recovering rmfmail index from .eml files on disk...");
     console.log(`  Store: ${storePath}`);
-    console.log("  No network access; existing DB rows preserved.");
+    console.log("  Local-only — no IMAP/network calls. Existing DB rows preserved.");
 
     const { DatabaseSync } = await import("node:sqlite");
     const db = new DatabaseSync(dbPath);
     db.exec("PRAGMA journal_mode = WAL");
 
+    // BACKFILL existing rows that are missing a message_folders membership.
+    // The unified inbox view + per-folder list view both JOIN through
+    // message_folders, so a messages row with no membership is INVISIBLE
+    // in the UI even though it's in the DB. This catches the pre-1.1.174
+    // -recover runs that only populated messages — Bob's symptom was 8304
+    // INBOX rows in the folder badge but an empty list view (2026-05-27).
+    const backfilled = db.prepare(`
+        INSERT OR IGNORE INTO message_folders (message_row_id, folder_id, uid, last_seen_at)
+        SELECT m.id, m.folder_id, m.uid, m.cached_at
+        FROM messages m
+        WHERE NOT EXISTS (SELECT 1 FROM message_folders mf WHERE mf.message_row_id = m.id)
+    `).run();
+    if ((backfilled as any).changes > 0) {
+        console.log(`  [backfill] inserted ${(backfilled as any).changes} missing message_folders rows`);
+    }
+
     // Build the Message-ID set already in the DB so we can skip duplicates.
     const seenStmt = db.prepare("SELECT message_id FROM messages WHERE account_id = ? AND message_id IS NOT NULL AND message_id != ''");
     // INBOX folder per account (target for recovered rows). If no INBOX row
@@ -784,6 +804,12 @@ if (recoverMode) {
              has_attachments, preview, body_path, cached_at)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `);
+    // Insert a membership row for every messages row we create so the
+    // list views (which JOIN through message_folders) can see them.
+    const insertMembership = db.prepare(`
+        INSERT OR IGNORE INTO message_folders (message_row_id, folder_id, uid, last_seen_at)
+        VALUES (?, ?, ?, ?)
+    `);
 
     // Walk every account directory under storePath.
     const accountDirs = fs.readdirSync(storePath, { withFileTypes: true })
@@ -861,10 +887,11 @@ if (recoverMode) {
                     const ccList = parseAddrs(ccRaw);
                     const stat = fs.statSync(p);
                     const rel = path.relative(storePath, p).replace(/\\/g, "/");
-                    insertMsg.run(
+                    const thisSynthUid = synthUid--;
+                    const result = insertMsg.run(
                         acct,
                         inboxFolderId,
-                        synthUid--,
+                        thisSynthUid,
                         messageId,
                         date,
                         subject,
@@ -879,6 +906,12 @@ if (recoverMode) {
                         rel,                        // body_path (relative to storePath)
                         Date.now(),                 // cached_at
                     );
+                    // Membership row — list views JOIN through this, without
+                    // it the recovered row is invisible in the UI.
+                    const newRowId = Number((result as any).lastInsertRowid);
+                    if (newRowId > 0) {
+                        insertMembership.run(newRowId, inboxFolderId, thisSynthUid, Date.now());
+                    }
                     seen.add(messageId);
                     indexed++;
                     if (indexed % 500 === 0) console.log(`  [${acct}] ${indexed} indexed (${scanned} scanned)`);
@@ -905,6 +938,95 @@ if (recoverMode) {
     process.exit(0);
 }
 
+// Fix flags: strip every \Flagged that exists ONLY in the local DB but NOT
+// on the IMAP server, per folder. The pre-1.1.172 updateMessageFlags had a
+// UID-without-folder bug that propagated a flag set on one folder's UID to
+// every same-numeric-UID row across the account — leaving stars on hundreds
+// of letters the user never starred. This is the one-shot cleanup that
+// reconciles every local flag against the server's truth.
+//
+// What it does: per IMAP-account folder, runs `UID SEARCH FLAGGED` on the
+// server, takes that as authoritative, and clears \Flagged from every local
+// row whose UID isn't in the server's set.
+//
+// What it does NOT touch: \Seen, \Draft, or any custom flags — only the
+// star (\Flagged). That keeps the cleanup scope tight to the symptom the
+// user reported.
+if (hasFlag("fix-flags")) {
+    const { getConfigDir } = await import("@bobfrankston/mailx-settings");
+    const { loadSettings } = await import("@bobfrankston/mailx-settings");
+    const { NativeImapClient } = await import("@bobfrankston/iflow-direct");
+    const { NodeTcpTransport } = await import("@bobfrankston/node-tcp-transport");
+    const dbDir = getConfigDir();
+    const dbPath = path.join(dbDir, "mailx.db");
+    if (!fs.existsSync(dbPath)) { console.error("No database found."); process.exit(1); }
+    const settings = loadSettings();
+    const { DatabaseSync } = await import("node:sqlite");
+    const db = new DatabaseSync(dbPath);
+    db.exec("PRAGMA journal_mode = WAL");
+    console.log("Fixing spurious \\Flagged stars...");
+    console.log("  Authoritative source: each folder's server-side UID SEARCH FLAGGED.");
+    console.log("  Only \\Flagged is touched; \\Seen and others are left alone.");
+    let totalCleared = 0;
+    let totalFolders = 0;
+    for (const acct of settings.accounts) {
+        const imap: any = (acct as any).imap;
+        if (!imap) { console.log(`  [skip] ${acct.id}: no IMAP config (likely Gmail-API)`); continue; }
+        if (!imap.password) { console.log(`  [skip] ${acct.id}: OAuth account — fix-flags only supports password-auth IMAP for now`); continue; }
+        let client: any;
+        try {
+            client = new (NativeImapClient as any)({
+                server: imap.host, port: imap.port || 993,
+                user: imap.user || acct.email, password: imap.password,
+                useTls: imap.tls !== false,
+            }, () => new (NodeTcpTransport as any)());
+            await client.connect();
+            const folderRows = db.prepare("SELECT id, path FROM folders WHERE account_id = ?").all(acct.id) as { id: number; path: string }[];
+            for (const folder of folderRows) {
+                try {
+                    await client.select(folder.path);
+                    const serverFlaggedUids: number[] = await client.search("FLAGGED");
+                    const serverSet = new Set<number>(serverFlaggedUids);
+                    // Pull every local row in this folder that has \Flagged
+                    const stmt = db.prepare(
+                        "SELECT uid, flags_json FROM messages WHERE account_id = ? AND folder_id = ? AND flags_json LIKE ?"
+                    );
+                    const upd = db.prepare(
+                        "UPDATE messages SET flags_json = ? WHERE account_id = ? AND folder_id = ? AND uid = ?"
+                    );
+                    let cleared = 0;
+                    for (const r of stmt.iterate(acct.id, folder.id, "%\\\\Flagged%") as any) {
+                        const uid = r.uid;
+                        if (serverSet.has(uid)) continue;
+                        let flags: string[] = [];
+                        try { flags = JSON.parse(r.flags_json); } catch { /* */ }
+                        const without = flags.filter(f => f !== "\\Flagged");
+                        if (without.length !== flags.length) {
+                            upd.run(JSON.stringify(without), acct.id, folder.id, uid);
+                            cleared++;
+                        }
+                    }
+                    if (cleared > 0) {
+                        console.log(`  [${acct.id}] ${folder.path}: cleared ${cleared} spurious \\Flagged (server has ${serverFlaggedUids.length} actual)`);
+                        totalCleared += cleared;
+                    }
+                    totalFolders++;
+                } catch (e: any) {
+                    console.error(`  [${acct.id}] ${folder.path}: ${e?.message || e}`);
+                }
+            }
+        } catch (e: any) {
+            console.error(`  [${acct.id}] connect failed: ${e?.message || e}`);
+        } finally {
+            try { if (client) await client.logout(); } catch { /* */ }
+        }
+    }
+    db.close();
+    console.log(`Done. Cleared ${totalCleared} spurious \\Flagged rows across ${totalFolders} folders.`);
+    console.log("  Run 'rmfmail' to start the daemon.");
+    process.exit(0);
+}
+
 // Import accounts from a local file into GDrive
 if (importMode) {
     const importPath = args.find(a => !a.startsWith("-"));

package/client/android-bootstrap.bundle.js

@@ -5209,8 +5209,9 @@ var WebMailxDB = class {
     const r = this.get("SELECT provider_id FROM messages WHERE account_id = ? AND uid = ?", [accountId, uid]);
     return r?.provider_id || "";
   }
-  updateMessageFlags(accountId, uid, flags) {
-    this.run("UPDATE messages SET flags_json = ? WHERE account_id = ? AND uid = ?", [JSON.stringify(flags), accountId, uid]);
+  /** folderId required — see main mailx-store/db.ts for why. */
+  updateMessageFlags(accountId, folderId, uid, flags) {
+    this.run("UPDATE messages SET flags_json = ? WHERE account_id = ? AND folder_id = ? AND uid = ?", [JSON.stringify(flags), accountId, folderId, uid]);
   }
   updateBodyPath(accountId, uid, bodyPath) {
     this.run("UPDATE messages SET body_path = ? WHERE account_id = ? AND uid = ?", [bodyPath, accountId, uid]);
@@ -9995,7 +9996,7 @@ var AndroidSyncManager = class {
     return raw;
   }
   async updateFlagsLocal(accountId, uid, folderId, flags) {
-    this.db.updateMessageFlags(accountId, uid, flags);
+    this.db.updateMessageFlags(accountId, folderId, uid, flags);
     this.db.recalcFolderCounts(folderId);
     this.db.queueSyncAction(accountId, "flags", uid, folderId, { flags });
     emitEvent({ type: "folderCountsChanged", accountId, counts: {} });