@bobfrankston/mailx 1.0.114 → 1.0.116

package/client/app.js

@@ -839,9 +839,14 @@ const isApp = typeof mailxapi !== "undefined" && mailxapi?.isApp;
 fetch("/api/version").then(r => r.json()).then(d => {
     const el = document.getElementById("app-version");
     const storage = d.storage || {};
-    const storageLabel = storage.provider && storage.provider !== "local" ? ` [${storage.provider}]` : "";
+    const storageLabel = storage.provider && storage.provider !== "local"
+        ? ` [${storage.provider}${storage.mode === "api" ? " API" : ""}]`
+        : "";
     if (el)
         el.textContent = `mailx v${d.version}${storageLabel}${isApp ? "" : " [browser]"}`;
+    if (storage.cloudError) {
+        showAlert(`Cloud storage error: ${storage.cloudError}`, "cloud-error");
+    }
 }).catch(async () => {
     // Server not running — try to start it if we're in the app
     const startupStatus = document.getElementById("startup-status");

package/client/components/folder-tree.js

@@ -322,6 +322,7 @@ async function loadFolderTree(container) {
             if (mainBody) {
                 mainBody.innerHTML = `<div style="padding:2rem;line-height:1.8;max-width:500px">
                     <h2 style="margin-bottom:1rem">Welcome to mailx</h2>
+                    <div id="setup-cloud-status"></div>
                     <p>Add your email account to get started.</p>
                     <form id="setup-form" style="margin-top:1rem">
                         <label style="display:block;margin-bottom:0.5rem">
@@ -384,6 +385,24 @@ async function loadFolderTree(container) {
                         statusEl.textContent = `Error: ${err.message}`;
                     }
                 });
+                // Show cloud storage status in setup form
+                fetch("/api/version").then(r => r.json()).then(d => {
+                    const cloudEl = document.getElementById("setup-cloud-status");
+                    if (!cloudEl)
+                        return;
+                    const s = d.storage || {};
+                    if (s.cloudError) {
+                        cloudEl.innerHTML = `<div style="padding:0.75rem;margin-bottom:1rem;background:#5c1a1a;color:#fca;border:1px solid #a33;border-radius:4px">
+                            <strong>Cloud storage unavailable:</strong> ${s.cloudError}<br>
+                            <span style="font-size:0.85rem">Settings on ${s.provider || "cloud"} cannot be read. Add an account below to initialize cloud storage.</span>
+                        </div>`;
+                    }
+                    else if (s.mode === "api") {
+                        cloudEl.innerHTML = `<div style="padding:0.5rem;margin-bottom:1rem;background:var(--color-bg-surface);border:1px solid var(--color-border);border-radius:4px;color:var(--color-text-muted)">
+                            Using ${s.provider} API (no local mount)
+                        </div>`;
+                    }
+                }).catch(() => { });
             }
             // Dismiss startup overlay
             const overlay = document.getElementById("startup-overlay");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.114",
+  "version": "1.0.116",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,7 +20,7 @@
     "postinstall": "node launcher/builder/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow": "^1.0.44",
+    "@bobfrankston/iflow": "^1.0.46",
     "@bobfrankston/miscinfo": "^1.0.7",
     "@bobfrankston/oauthsupport": "^1.0.20",
     "@bobfrankston/rust-builder": "^0.1.3",

package/packages/mailx-api/index.js

@@ -4,7 +4,7 @@
  */
 import { Router } from "express";
 import { MailxService } from "@bobfrankston/mailx-service";
-import { loadAccounts, saveAccounts, initLocalConfig } from "@bobfrankston/mailx-settings";
+import { loadAccounts, loadAccountsAsync, saveAccounts, initLocalConfig, initCloudConfig, loadSettings } from "@bobfrankston/mailx-settings";
 export function createApiRouter(db, imapManager) {
     const svc = new MailxService(db, imapManager);
     const router = Router();
@@ -116,13 +116,20 @@ export function createApiRouter(db, imapManager) {
             }
             // Ensure ~/.mailx exists
             initLocalConfig();
+            // Default to gdrive for Gmail users (creates config.jsonc with gdrive provider)
+            const domain = email.split("@")[1]?.toLowerCase() || "";
+            if (["gmail.com", "googlemail.com"].includes(domain)) {
+                initCloudConfig("gdrive");
+            }
             // Build account config (normalizeAccount handles provider detection)
             const account = { email, name: name || email.split("@")[0] };
             if (password)
                 account.password = password;
-            // Load existing accounts, add new one, save
-            const accounts = loadAccounts();
-            const domain = email.split("@")[1]?.toLowerCase() || "";
+            // Load existing accounts — try cloud API in case home/.mailx already exists on Drive
+            let accounts = loadAccounts();
+            if (accounts.length === 0) {
+                accounts = await loadAccountsAsync();
+            }
             const id = domain.split(".")[0] || "account";
             if (accounts.some((a) => a.email === email)) {
                 res.json({ ok: false, error: "Account already exists" });
@@ -131,7 +138,21 @@ export function createApiRouter(db, imapManager) {
             account.id = id;
             accounts.push(account);
             saveAccounts(accounts);
-            res.json({ ok: true, message: "Account added. Restart to begin syncing." });
+            // Reload settings and register the new account in DB + IMAP so it works immediately
+            const settings = loadSettings();
+            const normalized = settings.accounts.find(a => a.id === id);
+            if (normalized) {
+                try {
+                    await imapManager.addAccount(normalized);
+                    console.log(`  Account added: ${normalized.name} (${normalized.id})`);
+                    // Start syncing in background
+                    imapManager.syncAll().catch(() => { });
+                }
+                catch (e) {
+                    console.error(`  Account setup IMAP error: ${e.message}`);
+                }
+            }
+            res.json({ ok: true, message: "Account added and syncing." });
         }
         catch (e) {
             res.status(500).json({ error: e.message });

package/packages/mailx-service/index.js

@@ -75,7 +75,10 @@ export class MailxService {
                 hasRemoteContent: false, remoteAllowed: false, attachments: [], emlPath: "", deliveredTo: "", returnPath: "", listUnsubscribe: ""
             };
         }
-        if (raw) {
+        if (!raw) {
+            bodyText = "[Message body not available — not cached locally and IMAP fetch failed. Try again or re-sync the folder.]";
+        }
+        else {
             const parsed = await simpleParser(raw);
             bodyHtml = parsed.html || "";
             bodyText = parsed.text || "";

package/packages/mailx-settings/cloud.js

@@ -20,14 +20,20 @@ function findGoogleCredentials() {
     const local = path.join(SETTINGS_DIR, "google-credentials.json");
     if (fs.existsSync(local))
         return local;
-    // Try to find iflow's credentials
+    // Try to find iflow's credentials via import.meta.resolve or node_modules walk
     try {
-        const iflowPkg = require.resolve("@bobfrankston/iflow/package.json");
-        const iflowDir = path.dirname(iflowPkg);
-        for (const name of ["iflow-credentials.json", "credentials.json"]) {
-            const p = path.join(iflowDir, name);
-            if (fs.existsSync(p))
-                return p;
+        // Walk up from this package to find iflow in node_modules
+        let dir = import.meta.dirname;
+        for (let i = 0; i < 5; i++) {
+            for (const name of ["iflow-credentials.json", "credentials.json"]) {
+                const p = path.join(dir, "node_modules", "@bobfrankston", "iflow", name);
+                if (fs.existsSync(p))
+                    return p;
+            }
+            const parent = path.dirname(dir);
+            if (parent === dir)
+                break;
+            dir = parent;
         }
     }
     catch { /* iflow not installed */ }
@@ -55,8 +61,10 @@ async function getMicrosoftToken() {
 }
 async function getGoogleDriveToken() {
     const creds = findGoogleCredentials();
-    if (!creds)
+    if (!creds) {
+        console.error("  [cloud] No Google credentials found (checked ~/.mailx/google-credentials.json and iflow package)");
         return null;
+    }
     try {
         const token = await authenticateOAuth(creds, {
             scope: GDRIVE_SCOPES,
@@ -154,8 +162,10 @@ async function gDriveFind(fileName, parentName) {
 }
 async function gDriveRead(filePath) {
     const token = await getGoogleDriveToken();
-    if (!token)
+    if (!token) {
+        console.error(`  [cloud] gdrive read ${filePath}: no token`);
         return null;
+    }
     try {
         // Parse path: "home/.mailx/settings.jsonc" → find by folder structure
         const parts = filePath.split("/");
@@ -169,11 +179,15 @@ async function gDriveRead(filePath) {
             const res = await fetch(`https://www.googleapis.com/drive/v3/files?q=${encodeURIComponent(query)}&fields=files(id)`, {
                 headers: { Authorization: `Bearer ${token}` },
             });
-            if (!res.ok)
+            if (!res.ok) {
+                console.error(`  [cloud] gdrive folder lookup '${folder}': ${res.status} ${res.statusText}`);
                 return null;
+            }
             const data = await res.json();
-            if (!data.files?.[0])
+            if (!data.files?.[0]) {
+                console.error(`  [cloud] gdrive folder '${folder}' not found (drive.file scope can only see app-created files)`);
                 return null;
+            }
             parentId = data.files[0].id;
         }
         // Find the file
@@ -183,21 +197,28 @@ async function gDriveRead(filePath) {
         const fileRes = await fetch(`https://www.googleapis.com/drive/v3/files?q=${encodeURIComponent(query)}&fields=files(id)`, {
             headers: { Authorization: `Bearer ${token}` },
         });
-        if (!fileRes.ok)
+        if (!fileRes.ok) {
+            console.error(`  [cloud] gdrive file lookup '${fileName}': ${fileRes.status} ${fileRes.statusText}`);
             return null;
+        }
         const fileData = await fileRes.json();
         const fileId = fileData.files?.[0]?.id;
-        if (!fileId)
+        if (!fileId) {
+            console.error(`  [cloud] gdrive file '${fileName}' not found in ${parts.join("/")}`);
             return null;
+        }
         // Download content
         const contentRes = await fetch(`https://www.googleapis.com/drive/v3/files/${fileId}?alt=media`, {
             headers: { Authorization: `Bearer ${token}` },
         });
-        if (!contentRes.ok)
+        if (!contentRes.ok) {
+            console.error(`  [cloud] gdrive download ${fileId}: ${contentRes.status} ${contentRes.statusText}`);
             return null;
+        }
         return await contentRes.text();
     }
-    catch {
+    catch (e) {
+        console.error(`  [cloud] gdrive read ${filePath}: ${e.message}`);
         return null;
     }
 }

package/packages/mailx-settings/index.d.ts

@@ -28,6 +28,7 @@ export declare function isCloudMode(): boolean;
 export declare function getStorageInfo(): {
     provider: string;
     mode: "mount" | "api" | "local";
+    cloudError?: string;
 };
 declare const DEFAULT_PREFERENCES: {
     ui: {
@@ -88,6 +89,8 @@ export declare function getConfigDir(): string;
 export { getSharedDir };
 /** Initialize local config if it doesn't exist */
 export declare function initLocalConfig(sharedDir?: string, storePath?: string): void;
+/** Initialize config with a cloud provider (e.g. gdrive for Gmail users) */
+export declare function initCloudConfig(provider: "gdrive" | "onedrive" | "dropbox", cloudPath?: string): void;
 declare const DEFAULT_SETTINGS: MailxSettings;
 /** Get historyDays for an account: per-account override > system override > shared default */
 export declare function getHistoryDays(accountId?: string): number;

package/packages/mailx-settings/index.js

@@ -92,6 +92,8 @@ function resolveProvider(cfg) {
 }
 /** Pending cloud config for API fallback (set when mount not found) */
 let pendingCloudConfig = null;
+/** Last cloud API error (for UI display) */
+let lastCloudError = null;
 function resolveSharedEntry(entry) {
     if (typeof entry === "string") {
         const p = resolvePath(entry);
@@ -127,12 +129,15 @@ export async function cloudRead(filename) {
     if (!pendingCloudConfig)
         return null;
     const provider = getCloudProvider(pendingCloudConfig.provider);
-    if (!provider)
+    if (!provider) {
+        lastCloudError = `No cloud provider for ${pendingCloudConfig.provider}`;
         return null;
+    }
     const cloudPath = `${pendingCloudConfig.path}/${filename}`;
     console.log(`  [cloud] Reading ${cloudPath} via ${pendingCloudConfig.provider} API...`);
     const content = await provider.read(cloudPath);
     if (content) {
+        lastCloudError = null;
         // Cache locally
         try {
             fs.mkdirSync(LOCAL_DIR, { recursive: true });
@@ -140,6 +145,9 @@ export async function cloudRead(filename) {
         }
         catch { /* ignore cache write failure */ }
     }
+    else {
+        lastCloudError = `Could not read ${filename} from ${pendingCloudConfig.provider} (check credentials and drive.file scope)`;
+    }
     return content;
 }
 /** Write a file via cloud API */
@@ -177,7 +185,7 @@ export function getStorageInfo() {
             const name = pendingCloudConfig.provider === "onedrive" ? "OneDrive" :
                 (pendingCloudConfig.provider === "gdrive" || pendingCloudConfig.provider === "google") ? "Google Drive" :
                     pendingCloudConfig.provider === "dropbox" ? "Dropbox" : pendingCloudConfig.provider;
-            return { provider: name, mode: "api" };
+            return { provider: name, mode: "api", cloudError: lastCloudError || undefined };
         }
     }
     return { provider: "local", mode: "local" };
@@ -234,7 +242,7 @@ function loadFile(filename, defaults) {
     }
     return { ...defaults, ...data };
 }
-/** Save a config file to the shared directory */
+/** Save a config file to the shared directory (and cloud API if active) */
 function saveFile(filename, data) {
     const sharedDir = getSharedDir();
     atomicWrite(path.join(sharedDir, filename), data);
@@ -245,6 +253,15 @@ function saveFile(filename, data) {
         }
         catch { /* ignore */ }
     }
+    // Write to cloud API if filesystem mount unavailable (creates app-owned file for drive.file scope)
+    if (pendingCloudConfig) {
+        cloudWrite(filename, JSON.stringify(data, null, 2)).then(ok => {
+            if (ok)
+                console.log(`  [cloud] Saved ${filename} via ${pendingCloudConfig.provider} API`);
+            else
+                console.error(`  [cloud] Failed to save ${filename} via ${pendingCloudConfig.provider} API`);
+        }).catch(() => { });
+    }
 }
 const PROVIDERS = {
     "gmail.com": {
@@ -571,6 +588,22 @@ export function initLocalConfig(sharedDir, storePath) {
     fs.mkdirSync(LOCAL_DIR, { recursive: true });
     atomicWrite(LOCAL_CONFIG_PATH, config);
 }
+/** Initialize config with a cloud provider (e.g. gdrive for Gmail users) */
+export function initCloudConfig(provider, cloudPath = "home/.mailx") {
+    const existing = readLocalConfig();
+    if (existing.sharedDir)
+        return; // Already configured
+    const config = {
+        ...existing,
+        sharedDir: { provider, path: cloudPath },
+        storePath: existing.storePath || DEFAULT_STORE_PATH,
+    };
+    fs.mkdirSync(LOCAL_DIR, { recursive: true });
+    atomicWrite(LOCAL_CONFIG_PATH, config);
+    // Set up cloud API fallback immediately
+    pendingCloudConfig = { provider, path: cloudPath };
+    console.log(`  Initialized cloud config: ${provider} → ${cloudPath}`);
+}
 const DEFAULT_SETTINGS = {
     accounts: [],
     ui: DEFAULT_PREFERENCES.ui,