@bobfrankston/mailx 1.0.288 → 1.0.290

package/client/app.js

@@ -1019,7 +1019,11 @@ onWsEvent((event) => {
             }
             break;
         case "folderCountsChanged": {
-            // Update folder badges + silently refresh message list (preserves selection and viewer)
+            // Update folder badges + full tree refresh (not just counts) so
+            // newly-synced folders appear. Without this, the first sync after
+            // setup creates DB folders but the tree never picks them up because
+            // syncComplete fires during page reload and gets lost.
+            refreshFolderTree();
             updateFolderCounts();
             updateNewMessageCount();
             // Debounced silent reload — preserves scroll position, selection, and viewer

package/client/components/folder-tree.js

@@ -482,22 +482,34 @@ async function loadFolderTree(container) {
                     "aol.com": "Use an app password: AOL Settings → Account Security → Generate app password",
                     "icloud.com": "Use an app-specific password: appleid.apple.com → Sign-In and Security → App-Specific Passwords",
                 };
+                let oauthAutoFired = false;
                 emailInput?.addEventListener("input", () => {
                     const email = emailInput.value.trim();
                     const domain = email.split("@")[1]?.toLowerCase() || "";
                     const hasAt = email.includes("@") && domain.length > 0;
                     const isOAuth = ["gmail.com", "googlemail.com", "outlook.com", "hotmail.com", "live.com"].includes(domain);
-                    // Progressive reveal: email first, then name + submit,
-                    // password only for non-OAuth providers.
+                    const isGmailLike = ["gmail.com", "googlemail.com"].includes(domain);
+                    // OAuth providers: auto-fire setup immediately once domain
+                    // is recognized — don't show name/password (name is auto-
+                    // detected from Google profile, no password needed). This
+                    // eliminates the "form flash" where fields briefly appear
+                    // before the page reloads.
+                    if (hasAt && isOAuth && !oauthAutoFired && !setupTriggered) {
+                        oauthAutoFired = true;
+                        statusEl.textContent = `Connecting to ${isGmailLike ? "Gmail" : "Outlook"}...`;
+                        trySetup();
+                        return;
+                    }
+                    // Non-OAuth: progressive reveal of name + password + submit.
                     const nameRow = document.getElementById("setup-name-row");
                     const pwRow = document.getElementById("setup-password-row");
                     const submitBtn = document.getElementById("setup-submit");
                     if (nameRow)
-                        nameRow.style.display = hasAt ? "block" : "none";
+                        nameRow.style.display = hasAt && !isOAuth ? "block" : "none";
                     if (pwRow)
                         pwRow.style.display = hasAt && !isOAuth ? "block" : "none";
                     if (submitBtn)
-                        submitBtn.style.display = hasAt ? "block" : "none";
+                        submitBtn.style.display = hasAt && !isOAuth ? "block" : "none";
                     const helpEl = document.getElementById("setup-app-password-help");
                     if (helpEl) {
                         const help = APP_PASSWORD_HELP[domain];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.288",
+  "version": "1.0.290",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",

package/packages/mailx-settings/cloud.js

@@ -58,18 +58,25 @@ async function getGoogleDriveToken() {
         console.error("  [cloud] No Google credentials found (checked ~/.mailx/google-credentials.json and iflow package)");
         return null;
     }
-    // Delete stale token if scope changed (drive → drive.file or vice versa)
     const tokenPath = path.join(GDRIVE_TOKEN_DIR, "token.json");
+    // Log token state so failures are diagnosable
     if (fs.existsSync(tokenPath)) {
         try {
             const existing = JSON.parse(fs.readFileSync(tokenPath, "utf-8"));
+            const expired = existing.expires_at ? Date.now() >= existing.expires_at : true;
+            const hasRefresh = !!existing.refresh_token;
+            console.log(`  [cloud] GDrive token: ${expired ? "expired" : "valid"}, refresh_token: ${hasRefresh ? "yes" : "NO"}, scope: ${existing.scope || "?"}`);
+            // Delete stale token if scope changed (drive → drive.file or vice versa)
             if (existing.scope && existing.scope !== GDRIVE_SCOPES) {
-                console.log(`  [cloud] Scope changed — re-authenticating...`);
+                console.log(`  [cloud] Scope changed (${existing.scope} → ${GDRIVE_SCOPES}) — re-authenticating...`);
                 fs.unlinkSync(tokenPath);
             }
         }
         catch { /* ignore parse errors */ }
     }
+    else {
+        console.log(`  [cloud] GDrive token: not found at ${tokenPath}`);
+    }
     try {
         const token = await authenticateOAuth(creds, {
             scope: GDRIVE_SCOPES,
@@ -78,10 +85,16 @@ async function getGoogleDriveToken() {
             credentialsKey: "installed",
             includeOfflineAccess: true,
         });
+        if (token?.access_token) {
+            console.log(`  [cloud] GDrive auth: success (token refreshed/valid)`);
+        }
+        else {
+            console.error(`  [cloud] GDrive auth: returned null — OAuth callback likely timed out or was denied`);
+        }
         return token?.access_token || null;
     }
     catch (e) {
-        console.error(`  [cloud] Google Drive auth failed: ${e.message}`);
+        console.error(`  [cloud] GDrive auth FAILED: ${e.message}`);
         return null;
     }
 }

package/packages/mailx-settings/index.js

@@ -145,7 +145,8 @@ export async function cloudRead(filename) {
  *  and the onCloudError listener. */
 export async function cloudWrite(filename, content) {
     if (!pendingCloudConfig) {
-        const err = `No cloud configured — cannot save ${filename} to cloud`;
+        const err = `Cloud not initialized yet — cannot save ${filename} (pendingCloudConfig is null; loadSettings may not have run, or config.jsonc has no sharedDir)`;
+        console.error(`  [cloud] cloudWrite: ${err}`);
         setCloudError(err, { op: "write", filename });
         throw new Error(err);
     }