@bobfrankston/rmfmail 1.2.165 → 1.2.167

package/TODO.md

@@ -18,6 +18,9 @@ These items don't need user input — source-only changes, compile-verified befo
 | ~~4~~ | ~~**C122 — Recent-unread count overlay on taskbar icon**~~ — **DONE** (shipped ~v1.1.x 2026-05-29; TODO entry was stale). `updateBadge` in `client/app.ts` renders the red count pill on a 32×32 canvas (badge-only, transparent field) and pushes it via `mailxapi.setTaskbarOverlay`; hooked to `folderCountsChanged` + startup via `updateNewMessageCount`. Badge shows NEW-since-last-seen, matching the "recent-unread" spec. S65 (badge while not running) remains open/blocked. | S | |
 | ~~5~~ | ~~**C126 — Cold-start latency (~28s observed)**~~ — **MOSTLY DONE** (2026-05-11). Root cause IDed from boot log: 43 s of cascading ES module imports through msger's custom protocol IPC (one roundtrip per file). Fixes shipped: (a) bundling via esbuild (`bin/build-bundles.mjs`) collapses the cascade to one fetch per entry point — `client/app.bundle.js` 345 kb, `client/compose/compose.bundle.js` 99 kb; (b) boot-snapshot hydration — bundled app saves `folder-tree` + `ml-body` innerHTML to localStorage every 30 s; inline script in `index.html` restores at cold start before the bundle has fetched. Sub-bullet (c) [500 ms placeholder pause] not in current code at cited line — skipped as stale. Expected cold start now 3-5 s (full WebView2 + bundle parse), with near-instant *feel* via hydrated snapshot after the first run. | M | |
 | **6** | **C125 — Unify desktop + Android IMAP code paths** | M | Today's split (`mailx-imap` Node-only + `mailx-store-web` browser-only) duplicates orchestration that's protocol-identical. Differences boil down to (a) transport factory choice (b) whether clients are persistent — both parameters, not architectural divides. Plan: extract `mailx-imap-core` with ImapManager + ops queue + fast-lane + sync orchestration over a `Transport` and a `Storage` interface, no Node-specific imports. `mailx-imap` and `mailx-store-web` become thin shims that wire engine-specific Storage + Transport. `{persistent: true\|false}` flag on ImapManager covers the lifetime split (no fast-lane queue when ephemeral). Pre-req for Android non-Gmail IMAP without forking sync code. |
+| **7** | **C156 — Android first-boot/setup progress narration** [M] | M | New-device install looked frozen (Bob 2026-07-22): no indication of "Signing into <gmail>…", "Fetching settings from Google Drive…", "Syncing INBOX (120/2000)…". Surface the android-bootstrap stage breadcrumbs (already vlog'd since v1.2.167) in the startup status area / folder-tree loading slot. |
+| **8** | **C157 — Android fresh install: paint folder list before message sync** [S/M] | S/M | First sync ran minutes with an empty tree. Prioritize per-account folder-LIST fetch + paint ahead of message sync so the skeleton appears in seconds; message counts stream in behind. |
+| **9** | **C158 — Android double-init after fold-triggered reload** [M] | M | 2026-07-22 13:07:49 logit trail: ONE page reload after unfolding produced TWO module loads, duplicate "bridge installed", duplicate GDrive lookups, and THREE "Starting OAuth flow" launches. Activity did NOT recreate (ConfigChanges already declared; no OnCreate in trail) — find what reloads the WebView on fold and make android-bootstrap init idempotent (single-flight guard on the module-level init, dedupe OAuth intent launches). |
 | **5** | **C124 — mailto handler on macOS** (Linux ✅ 2026-07-08 v1.2.115) | S | Linux half shipped: `--register-mailto` on linux writes `~/.local/share/applications/rmfmail.desktop` (`MimeType=x-scheme-handler/mailto;`, quoted node+mailx.js Exec, bare `%u`), runs `xdg-mime default` + `update-desktop-database`; `--unregister-mailto` removes it. **Remaining: macOS** — real `.app` bundle (LaunchServices won't register a bare script) with `Info.plist` `CFBundleURLTypes` declaring `mailto` + a tiny launcher binary; `LSSetDefaultHandlerForURLScheme` programmatically sets the default. Rust `rmfmailto-src/` crate already portable — drop the Win32 imports and `cargo build --target x86_64-apple-darwin` produces the macOS launcher. Needs a Mac to build/verify. |
 | ~~7~~ | ~~**C154 — Audit Android bridge vs MailxApi contract**~~ — **DONE** (2026-07-08, v1.2.115). Bridge now has a generic contract-backstop: every service method not explicitly adapted gets a positional pass-through, so a missing method can never again fail as `parent bridge has no method "X"`. Wire-shape mismatches adapted explicitly (`readJsoncFile`/`writeJsoncFile`/`formatJsonc`/`readConfigHelp` → `{content}`/`{ok}`, `drainStoreSync`/`syncFolderNow` → `{ok}`). Contract gained the missing entries (`getMessageSource`, `copyMessages`, `syncFolderNow`, `cancelServerSearch`, `getReminderSound`, `getCalendars`, optional `popoutWindow`) with web-service stubs per the policy (reads → graceful default, writes/OS → notImpl). Bonus fixes: bridge `getMessages` was dropping sort/sortDir/search and `searchMessages` was dropping scope/accountId/folderId — Android sort toggles and scoped search silently didn't work. | S | |
 ~~done — C120 read transport diagnostics~~ shipped v1.0.583 (per-folder timeout error now includes `[conn#X r=YB w=ZB writes=N sinceLastRead=Tms]` snapshot for the doomed socket).

package/client/android-bootstrap.bundle.js

@@ -10593,10 +10593,12 @@ var AndroidSyncManager = class {
       auth = { method: "XOAUTH2", user: smtpUser, token };
     }
     const parseAddrs = (s) => s.match(/[\w.+-]+@[\w.-]+/g) || [];
-    const toMatch = raw.match(/^To:\s*(.+)$/mi);
-    const ccMatch = raw.match(/^Cc:\s*(.+)$/mi);
-    const bccMatch = raw.match(/^Bcc:\s*(.+)$/mi);
-    const fromMatch = raw.match(/^From:\s*(.+)$/mi);
+    const headerEnd = raw.search(/\r?\n\r?\n/);
+    const headerSec = (headerEnd === -1 ? raw : raw.slice(0, headerEnd)).replace(/\r?\n[ \t]+/g, " ");
+    const toMatch = headerSec.match(/^To:\s*(.+)$/mi);
+    const ccMatch = headerSec.match(/^Cc:\s*(.+)$/mi);
+    const bccMatch = headerSec.match(/^Bcc:\s*(.+)$/mi);
+    const fromMatch = headerSec.match(/^From:\s*(.+)$/mi);
     const recipients = [
       ...toMatch ? parseAddrs(toMatch[1]) : [],
       ...ccMatch ? parseAddrs(ccMatch[1]) : [],
@@ -10604,7 +10606,8 @@ var AndroidSyncManager = class {
     ];
     const sender = fromMatch ? parseAddrs(fromMatch[1])[0] || account.email : account.email;
     if (recipients.length === 0) throw new Error("No recipients");
-    const rawToSend = raw.replace(/^Bcc:.*\r?\n/mi, "");
+    const stripBcc = (h) => h.replace(/^Bcc:[^\n]*(\r?\n[ \t][^\n]*)*(\r?\n|$)/mi, "").replace(/\r?\n$/, "");
+    const rawToSend = headerEnd === -1 ? stripBcc(raw) : stripBcc(raw.slice(0, headerEnd)) + raw.slice(headerEnd);
     const client = new SmtpClient({
       host: smtpHost,
       port: smtpPort,
@@ -11019,10 +11022,20 @@ async function initAndroid() {
   }, 1e3);
   if (gmailTokenProvider) {
     const tp = gmailTokenProvider;
-    (async () => {
+    const RECONCILE_RETRY_MS = 3e4;
+    const RECONCILE_MAX_TRIES = 5;
+    let reconcileTry = 0;
+    const reconcile = async () => {
+      reconcileTry++;
       setGDriveTokenProvider(tp);
       try {
-        console.log("[android] Looking up GDrive .rmfmail folder\u2026");
+        console.log(`[android] Looking up GDrive .rmfmail folder\u2026 (try ${reconcileTry}/${RECONCILE_MAX_TRIES})`);
+        vlog(`gdrive-reconcile try ${reconcileTry}: token fetch`);
+        await Promise.race([
+          tp(),
+          new Promise((_, rej) => setTimeout(() => rej(new Error("token fetch timed out (20s)")), 2e4))
+        ]);
+        vlog(`gdrive-reconcile try ${reconcileTry}: folder lookup`);
         const folder = await findGDriveMailxFolder(tp);
         if (!folder) {
           emitEvent({
@@ -11072,13 +11085,22 @@ async function initAndroid() {
           await registerDeviceInGDrive(tp, folderId, accounts.map((a) => a.id));
         }
       } catch (e) {
+        vlog(`gdrive-reconcile try ${reconcileTry} FAILED: ${e.message}`);
+        if (reconcileTry < RECONCILE_MAX_TRIES) {
+          console.warn(`[android] GDrive reconcile failed (${e.message}) \u2014 retrying in ${RECONCILE_RETRY_MS / 1e3}s`);
+          setTimeout(() => {
+            void reconcile();
+          }, RECONCILE_RETRY_MS);
+          return;
+        }
         emitEvent({
           type: "fatal",
           key: "gdrive-access-failed",
-          message: `GDrive access failed \u2014 app cannot start: ${e.message}`
+          message: `GDrive access failed after ${RECONCILE_MAX_TRIES} attempts: ${e.message}. Mail from this device's local accounts still works; restart the app to retry cloud settings.`
         });
       }
-    })();
+    };
+    void reconcile();
   }
   service.loadContactsConfig().catch((e) => console.error(`[android] startup contacts.jsonc load: ${e?.message || e}`));
   for (const account of db.getAccounts()) {