@bobfrankston/mailx 1.0.38 → 1.0.40

package/client/components/folder-tree.js

@@ -317,7 +317,40 @@ async function loadFolderTree(container) {
     try {
         const accounts = await getAccounts();
         if (accounts.length === 0) {
-            container.innerHTML = `<div class="folder-loading">No accounts configured.<br>Edit ~/.mailx/settings.jsonc</div>`;
+            container.innerHTML = `<div class="folder-loading">No accounts</div>`;
+            // Show setup instructions in the main content area (full width)
+            const mainBody = document.getElementById("ml-body");
+            if (mainBody) {
+                mainBody.innerHTML = `<div style="padding:2rem;line-height:1.8;max-width:600px">
+                    <h2 style="margin-bottom:1rem">Welcome to mailx</h2>
+                    <p>Create <code>~/.mailx/settings.jsonc</code> with your email accounts.</p>
+                    <p>If you have settings on OneDrive, create <code>~/.mailx/config.jsonc</code>:</p>
+                    <code style="display:block;padding:0.75rem;background:var(--color-bg-surface);border:1px solid var(--color-border);border-radius:4px;margin:0.5rem 0;white-space:pre;font-size:0.85rem">{ "sharedDir": "~/OneDrive/home/.mailx" }</code>
+                    <h3 style="margin-top:1.5rem">Gmail (just your email):</h3>
+                    <code style="display:block;padding:0.75rem;background:var(--color-bg-surface);border:1px solid var(--color-border);border-radius:4px;margin:0.5rem 0;white-space:pre;font-size:0.85rem">{ "name": "Your Name",
+  "accounts": [
+    { "email": "you@gmail.com" }
+  ]
+}</code>
+                    <h3 style="margin-top:1rem">Standard IMAP:</h3>
+                    <code style="display:block;padding:0.75rem;background:var(--color-bg-surface);border:1px solid var(--color-border);border-radius:4px;margin:0.5rem 0;white-space:pre;font-size:0.85rem">{ "name": "Your Name",
+  "accounts": [
+    { "email": "you@example.com",
+      "password": "secret",
+      "imap": { "host": "imap.example.com" },
+      "smtp": { "host": "smtp.example.com" }
+    }
+  ]
+}</code>
+                    <p style="margin-top:1rem;color:var(--color-text-muted)">Known providers (Gmail, Outlook, Yahoo, iCloud) auto-configure from just the email address. For other providers, specify IMAP/SMTP hosts. Restart after editing settings.</p>
+                </div>`;
+            }
+            // Dismiss startup overlay
+            const overlay = document.getElementById("startup-overlay");
+            if (overlay) {
+                overlay.classList.add("hidden");
+                setTimeout(() => overlay.remove(), 400);
+            }
             return;
         }
         // Clear loading state now that we have data

package/client/components/message-list.js

@@ -197,7 +197,10 @@ export async function loadMessages(accountId, folderId, page = 1, specialUse = "
     // Save scroll position and selected UID for non-autoSelect reloads
     const savedScroll = !autoSelect ? body.scrollTop : 0;
     const savedUid = !autoSelect ? body.querySelector(".ml-row.selected")?.getAttribute("data-uid") : null;
-    body.innerHTML = `<div class="ml-empty">Loading...</div>`;
+    // Only show loading indicator on fresh navigation, not reloads
+    if (autoSelect) {
+        body.innerHTML = `<div class="ml-empty">Loading...</div>`;
+    }
     try {
         const result = await getMessages(accountId, folderId, 1);
         totalMessages = result.total;
@@ -215,13 +218,15 @@ export async function loadMessages(accountId, folderId, page = 1, specialUse = "
                 firstRow.click();
         }
         else {
-            // Sync reload — restore scroll position and selection
-            body.scrollTop = savedScroll;
-            if (savedUid) {
-                const row = body.querySelector(`.ml-row[data-uid="${savedUid}"]`);
-                if (row)
-                    row.classList.add("selected");
-            }
+            // Sync reload — restore scroll position and selection after layout
+            requestAnimationFrame(() => {
+                body.scrollTop = savedScroll;
+                if (savedUid) {
+                    const row = body.querySelector(`.ml-row[data-uid="${savedUid}"]`);
+                    if (row)
+                        row.classList.add("selected");
+                }
+            });
         }
     }
     catch (e) {

package/client/lib/api-client.js

@@ -30,7 +30,7 @@ async function api(path, options) {
         // Network error — server is down
         if (e.name === "AbortError")
             throw e;
-        throw new Error("Server offline — restart with launch.ps1");
+        throw new Error("Server offline — run: mailx -server");
     }
     if (!res.ok) {
         const err = await res.json().catch(() => ({ error: res.statusText }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "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.9",
+    "@bobfrankston/iflow": "^1.0.20",
     "@bobfrankston/miscinfo": "^1.0.6",
     "@bobfrankston/oauthsupport": "^1.0.11",
     "@bobfrankston/rust-builder": "^0.1.2",

package/packages/mailx-imap/index.js

@@ -1103,7 +1103,7 @@ export class ImapManager extends EventEmitter {
     async syncAllContacts() {
         const settings = loadSettings();
         for (const account of settings.accounts) {
-            if (account.imap.auth === "oauth2" && account.enabled) {
+            if (account.imap.auth === "oauth2" && (account.enabled || account.syncContacts)) {
                 await this.syncGoogleContacts(account.id);
             }
         }

package/packages/mailx-server/index.js

@@ -41,10 +41,10 @@ console.error = (...args) => {
     origErr(msg);
     logStream.write(msg + "\n");
 };
-const serverPkg = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, "package.json"), "utf-8"));
-const clientPkg = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, "..", "..", "client", "package.json"), "utf-8"));
-const SERVER_VERSION = serverPkg.version;
-const CLIENT_VERSION = clientPkg.version;
+// Read version from root package.json (the published version)
+const rootPkg = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, "..", "..", "package.json"), "utf-8"));
+const SERVER_VERSION = rootPkg.version;
+const CLIENT_VERSION = rootPkg.version;
 // ── Initialize ──
 initLocalConfig();
 const settings = loadSettings();
@@ -185,11 +185,11 @@ async function start() {
     }, 5000);
     // Add configured accounts
     for (const account of settings.accounts) {
-        if (!account.enabled)
+        if (!account.enabled && !account.syncContacts)
             continue;
         try {
             await imapManager.addAccount(account);
-            console.log(`  Account added: ${account.name} (${account.id})`);
+            console.log(`  Account added: ${account.name} (${account.id})${!account.enabled ? " [contacts only]" : ""}`);
         }
         catch (e) {
             console.error(`  Failed to add account ${account.id}: ${e.message}`);

package/packages/mailx-settings/index.js

@@ -23,6 +23,22 @@ const LOCAL_DIR = path.join(process.env.USERPROFILE || process.env.HOME || ".",
 const LOCAL_CONFIG_PATH = path.join(LOCAL_DIR, "config.jsonc");
 const LEGACY_CONFIG_PATH = path.join(LOCAL_DIR, "config.json");
 const DEFAULT_STORE_PATH = path.join(LOCAL_DIR, "mailxstore");
+/** Resolve a path from config — relative to ~/.mailx/, ~ expands to home */
+function resolvePath(p) {
+    if (!p)
+        return p;
+    const home = process.env.USERPROFILE || process.env.HOME || ".";
+    // Expand ~ to home directory
+    if (p.startsWith("~/") || p.startsWith("~\\"))
+        return path.join(home, p.slice(2));
+    if (p === "~")
+        return home;
+    // Absolute path — use as-is
+    if (path.isAbsolute(p))
+        return p;
+    // Relative — resolve from config directory (~/.mailx/)
+    return path.resolve(LOCAL_DIR, p);
+}
 function readLocalConfig() {
     // Migrate config.json → config.jsonc
     if (!fs.existsSync(LOCAL_CONFIG_PATH) && fs.existsSync(LEGACY_CONFIG_PATH)) {
@@ -35,10 +51,10 @@ function readLocalConfig() {
 function getSharedDir() {
     const config = readLocalConfig();
     if (config.sharedDir)
-        return config.sharedDir;
+        return resolvePath(config.sharedDir);
     // Legacy: derive from settingsPath
     if (config.settingsPath)
-        return path.dirname(config.settingsPath);
+        return path.dirname(resolvePath(config.settingsPath));
     return LOCAL_DIR;
 }
 // ── File helpers ──
@@ -55,7 +71,7 @@ function readJsonc(filePath) {
             return null;
     }
     try {
-        return parseJsonc(fs.readFileSync(actual, "utf-8"));
+        return parseJsonc(fs.readFileSync(actual, "utf-8").replace(/\r/g, ""));
     }
     catch (e) {
         console.error(`Failed to read ${actual}: ${e.message}`);
@@ -160,6 +176,7 @@ function normalizeAccount(acct, globalName) {
         },
         enabled: acct.enabled ?? true,
         defaultSend: acct.defaultSend,
+        syncContacts: acct.syncContacts ?? (provider?.imap.auth === "oauth2"),
         relayDomains: acct.relayDomains,
         deliveredToPrefix: acct.deliveredToPrefix,
     };
@@ -250,8 +267,14 @@ export function saveAllowlist(list) {
 // ── Legacy compatibility ──
 function loadLegacySettings() {
     const config = readLocalConfig();
-    const settingsPath = config.settingsPath || path.join(LOCAL_DIR, "settings.jsonc");
-    return readJsonc(settingsPath);
+    if (config.settingsPath)
+        return readJsonc(resolvePath(config.settingsPath));
+    // Try shared dir first, then local
+    const sharedDir = getSharedDir();
+    const shared = readJsonc(path.join(sharedDir, "settings.jsonc"));
+    if (shared)
+        return shared;
+    return readJsonc(path.join(LOCAL_DIR, "settings.jsonc"));
 }
 /** Load settings — unified view combining all files (backward compatible) */
 export function loadSettings() {
@@ -276,7 +299,7 @@ export function saveSettings(settings) {
 /** Get the local store base path */
 export function getStorePath() {
     const config = readLocalConfig();
-    return config.storePath || DEFAULT_STORE_PATH;
+    return config.storePath ? resolvePath(config.storePath) : DEFAULT_STORE_PATH;
 }
 /** Get the local data directory (DB, store, etc.) */
 export function getConfigDir() {
@@ -292,10 +315,12 @@ function detectSharedDir() {
         process.env.OneDrive && path.join(process.env.OneDrive, "home", ".mailx"),
         process.env.OneDriveConsumer && path.join(process.env.OneDriveConsumer, "home", ".mailx"),
         home && path.join(home, "OneDrive", "home", ".mailx"),
-        // Linux/Mac OneDrive
-        home && path.join(home, "OneDrive", "home", ".mailx"),
+        // Linux/Mac — case variations
+        home && path.join(home, "onedrive", "home", ".mailx"),
+        home && path.join(home, "Onedrive", "home", ".mailx"),
         // Dropbox
         home && path.join(home, "Dropbox", ".mailx"),
+        home && path.join(home, "dropbox", ".mailx"),
         // Local fallback — just use ~/.mailx itself
     ].filter(Boolean);
     for (const dir of candidates) {

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

@@ -30,6 +30,7 @@ export interface AccountConfig {
     };
     enabled: boolean;
     defaultSend?: boolean; /** Use this account's SMTP when From doesn't match any account */
+    syncContacts?: boolean; /** Sync contacts even when account is disabled (contacts-only Gmail) */
     relayDomains?: string[]; /** Domains to skip in Delivered-To chain (e.g., ["m.connectivity.xyz"]) */
     deliveredToPrefix?: string[]; /** Prefixes to strip from Delivered-To to get clean alias (e.g., ["bobf-ma-", "bobf-"]) — order matters, longest first */
 }