@bobfrankston/mailx 1.0.306 → 1.0.310

package/packages/mailx-store-web/android-bootstrap.js

@@ -33,8 +33,8 @@ function emitEvent(event) {
         }
         catch { /* ignore */ }
     }
-    if (typeof window._mailxapiEvent === "function") {
-        window._mailxapiEvent(event);
+    if (typeof window._msgapiServiceEvent === "function") {
+        window._msgapiServiceEvent(event);
     }
 }
 // ── Helpers ──
@@ -54,6 +54,10 @@ class AndroidSyncManager {
     bodyStore;
     providers = new Map();
     tokenProviders = new Map();
+    // One prefetch session per account — prevents every syncAll tick from
+    // spawning parallel fetch loops that race on IndexedDB and blow through
+    // Gmail's per-user quota.
+    prefetchingAccounts = new Set();
     constructor(db, bodyStore) {
         this.db = db;
         this.bodyStore = bodyStore;
@@ -150,6 +154,91 @@ class AndroidSyncManager {
                 emitEvent({ type: "syncError", accountId: account.id, error: e.message });
             }
         }
+        // Phase 3: background body prefetch. Fire-and-forget — sync itself is
+        // already done and the UI doesn't wait on this. Per-account guard means
+        // a slow account can't block a fast one.
+        for (const account of accounts) {
+            if (!this.providers.has(account.id))
+                continue;
+            this.prefetchBodies(account.id).catch(e => console.error(`[prefetch] ${account.id}: ${e.message}`));
+        }
+    }
+    /** Background body prefetch — download bodies for messages that don't have
+     *  them yet, so tapping a message in the list opens instantly from cache. */
+    async prefetchBodies(accountId) {
+        if (this.prefetchingAccounts.has(accountId))
+            return;
+        this.prefetchingAccounts.add(accountId);
+        try {
+            const BATCH_SIZE = 20;
+            const THROTTLE_MS = 150;
+            const RATE_LIMIT_PAUSE_MS = 30000;
+            const ERROR_BUDGET = 10;
+            let totalFetched = 0;
+            let errors = 0;
+            let announced = false;
+            while (true) {
+                const missing = this.db.getMessagesWithoutBody(accountId, BATCH_SIZE);
+                if (missing.length === 0)
+                    break;
+                if (!announced) {
+                    console.log(`[prefetch] ${accountId}: ${missing.length}+ bodies to fetch`);
+                    vlog(`prefetch ${accountId} start: ${missing.length}+ pending`);
+                    announced = true;
+                }
+                let progressedThisBatch = false;
+                for (const m of missing) {
+                    // Sync the DB path if the body is already in IndexedDB — common
+                    // when upgrading from a build that didn't set body_path on cache.
+                    if (await this.bodyStore.hasMessage(accountId, m.folderId, m.uid)) {
+                        this.db.updateBodyPath(accountId, m.uid, `idb:${accountId}/${m.folderId}/${m.uid}`);
+                        progressedThisBatch = true;
+                        continue;
+                    }
+                    try {
+                        const result = await this.fetchMessageBody(accountId, m.folderId, m.uid);
+                        if (result) {
+                            totalFetched++;
+                            progressedThisBatch = true;
+                            emitEvent({ type: "bodyCached", accountId, uid: m.uid, folderId: m.folderId });
+                        }
+                        else {
+                            errors++;
+                        }
+                    }
+                    catch (e) {
+                        errors++;
+                        const msg = String(e?.message || "");
+                        if (/429|rate|too many/i.test(msg)) {
+                            console.log(`[prefetch] ${accountId}: rate-limited — pausing ${RATE_LIMIT_PAUSE_MS / 1000}s`);
+                            await new Promise(r => setTimeout(r, RATE_LIMIT_PAUSE_MS));
+                        }
+                        else {
+                            console.error(`[prefetch] ${accountId}/${m.uid}: ${msg}`);
+                        }
+                    }
+                    if (errors >= ERROR_BUDGET) {
+                        console.error(`[prefetch] ${accountId}: stopping after ${errors} errors (${totalFetched} cached)`);
+                        vlog(`prefetch ${accountId} aborted: ${errors} errors, ${totalFetched} cached`);
+                        return;
+                    }
+                    await new Promise(r => setTimeout(r, THROTTLE_MS));
+                }
+                // If a full batch made no progress, bail out to avoid an infinite
+                // loop on messages the server can't deliver.
+                if (!progressedThisBatch) {
+                    console.warn(`[prefetch] ${accountId}: batch made no progress, stopping`);
+                    break;
+                }
+            }
+            if (totalFetched > 0) {
+                console.log(`[prefetch] ${accountId}: done — cached ${totalFetched} bodies`);
+                vlog(`prefetch ${accountId} done: ${totalFetched} cached`);
+            }
+        }
+        finally {
+            this.prefetchingAccounts.delete(accountId);
+        }
     }
     async syncFolders(accountId) {
         const provider = this.getProvider(accountId);

package/packages/mailx-store-web/db.js

@@ -368,7 +368,10 @@ export class WebMailxDB {
         this.run("UPDATE messages SET body_path = ? WHERE account_id = ? AND uid = ?", [bodyPath, accountId, uid]);
     }
     getMessagesWithoutBody(accountId, limit = 50) {
-        return this.all("SELECT uid, folder_id as folderId FROM messages WHERE account_id = ? AND (body_path IS NULL OR body_path = '') ORDER BY date DESC LIMIT ?", [accountId, limit]);
+        // "idb:<acct>/<folder>/<uid>" means the body is cached in IndexedDB via
+        // WebMessageStore. Anything else (NULL, "", "gmail:<id>", legacy paths)
+        // still needs fetching.
+        return this.all("SELECT uid, folder_id as folderId FROM messages WHERE account_id = ? AND (body_path IS NULL OR body_path NOT LIKE 'idb:%') ORDER BY date DESC LIMIT ?", [accountId, limit]);
     }
     getHighestUid(accountId, folderId) {
         const r = this.get("SELECT MAX(uid) as maxUid FROM messages WHERE account_id = ? AND folder_id = ?", [accountId, folderId]);

package/packages/mailx-store-web/main-thread-host.js

@@ -162,8 +162,8 @@ function handleWorkerEvent(event) {
         }
         catch { /* ignore */ }
     }
-    // Also dispatch to the global mailxapi event callback
-    const cb = window._mailxapiEvent;
+    // Also dispatch to the global host service-channel event callback
+    const cb = window._msgapiServiceEvent;
     if (cb)
         try {
             cb(event);

package/tempfix.cmd

@@ -0,0 +1,77 @@
+@echo off
+rem --------------------------------------------------------------------
+rem tempfix.cmd — recover Claude Code + msger build after session wedge
+rem
+rem Problem: Claude Code's Bash tool keeps throwing EEXIST on
+rem   C:\Users\Bob\.claude\session-env\<uuid> because the current session
+rem   left a stale dir and the tool's mkdir isn't recursive.
+rem Separately: msger's Windows build and stable-hardlink update need
+rem   mailx NOT to be holding msgernative.exe when npmglobalize runs.
+rem   (Fixed in source via rename-aside, but we still want a clean slate
+rem   so the first rebuild doesn't have to juggle three generations of
+rem   .old-<ts> files on top of a running process.)
+rem
+rem What this script does, in order:
+rem   1. Kill Claude Code so it releases its session-env lock.
+rem   2. Kill mailx + any running msger window so msgernative.exe can be
+rem      replaced (strictly not required with the rename-aside fix, but
+rem      cleaner for this one-time recovery).
+rem   3. Nuke the entire session-env dir so the NEXT Claude start gets
+rem      a fresh UUID subdir.
+rem   4. Remind you of the next commands to run.
+rem
+rem Safe to re-run. Everything taskkill'd is optional — not-found is fine.
+rem --------------------------------------------------------------------
+
+echo.
+echo === 1/3  Killing Claude Code ===
+taskkill /F /IM claude.exe 2>nul
+if %errorlevel% equ 0 ( echo    claude.exe terminated ) else ( echo    claude.exe was not running )
+
+echo.
+echo === 2/3  Killing mailx + msger so msgernative.exe is free ===
+rem mailx runs as node.exe but node.exe runs EVERYTHING on this box, so
+rem we do NOT blanket-kill node. Instead kill the msger native window and
+rem any mailx launcher by image name. mailx's own node process stays up
+rem unless you want to close the UI — uncomment the last line to kill it.
+taskkill /F /IM msgernative.exe 2>nul
+if %errorlevel% equ 0 ( echo    msgernative.exe terminated ) else ( echo    msgernative.exe was not running )
+rem To also stop mailx's node service, uncomment:
+rem taskkill /F /FI "WINDOWTITLE eq mailx*" 2>nul
+
+echo.
+echo === 3/3  Removing stale Claude session-env dir ===
+if exist "%USERPROFILE%\.claude\session-env" (
+    rmdir /s /q "%USERPROFILE%\.claude\session-env"
+    if exist "%USERPROFILE%\.claude\session-env" (
+        echo    WARNING: session-env still exists — something was holding it open
+    ) else (
+        echo    session-env removed
+    )
+) else (
+    echo    session-env already gone
+)
+
+echo.
+echo --------------------------------------------------------------------
+echo Done. Next steps:
+echo.
+echo   1. Start Claude Code again. Your in-flight state is saved in memory
+echo      at C:\Users\Bob\.claude\projects\Y--dev-email-mailx\memory\
+echo      (see project_session_apr20_state.md for the full handoff).
+echo.
+echo   2. Rebuild msger so the new binary is installed:
+echo        cd /d y:\dev\utils\msgx\msger
+echo        npmglobalize
+echo.
+echo   3. Once that succeeds, test keyboard input:
+echo        msger y:\dev\projects\Cards\bbt\bbs.json
+echo      Try typing + Ctrl+C. If fixed, stale-binary theory was correct.
+echo      If still broken, tell Claude and we'll dig into focus/MoveFocus.
+echo.
+echo   4. In mailx root, wire up the new mailx-host workspace:
+echo        cd /d y:\dev\email\mailx
+echo        npm install
+echo        cd packages\mailx-host
+echo        tsc
+echo --------------------------------------------------------------------