@bobfrankston/mailx 1.0.36 → 1.0.38

package/README.md

@@ -29,95 +29,127 @@ If you already have mailx configured on another machine with settings on OneDriv
 
 Once OneDrive syncs, mailx picks up your accounts automatically.
 
-### Option B: New user -- set up from scratch
+### Option B: New user -- single machine, local settings
 
-**Step 1.** Create the settings directory:
+**Step 1.** Create `~/.mailx/settings.jsonc` with your account(s):
 
+(On Windows `~` means `%USERPROFILE%`, e.g., `C:\Users\You\.mailx\settings.jsonc`)
+
+**Gmail -- minimal config (just your email):**
+```jsonc
+{
+  "accounts": [
+    { "email": "you@gmail.com" }
+  ]
+}
 ```
-mkdir ~/.mailx
-```
 
-(On Windows: `mkdir %USERPROFILE%\.mailx`)
+mailx auto-fills Gmail's IMAP/SMTP/OAuth settings. First run opens a browser for OAuth consent.
+
+**Standard IMAP -- just host and password:**
+```jsonc
+{
+  "accounts": [
+    {
+      "email": "you@example.com",
+      "password": "your-password",
+      "imap": { "host": "imap.example.com" },
+      "smtp": { "host": "smtp.example.com" }
+    }
+  ]
+}
+```
 
-**Step 2.** Create `~/.mailx/settings.jsonc` with your account(s):
+Defaults: port 993/587, TLS on, auth password, username = email address. Only provide fields that differ from defaults.
 
+**Full config with all optional fields:**
 ```jsonc
 {
   "accounts": [
     {
-      "id": "mymail",                 // Internal ID (no spaces, lowercase)
-      "name": "Your Name",            // Sender name in From: header
-      "label": "Work",                // Display label in UI (optional, defaults to name)
-      "email": "you@example.com",     // Your email address
+      "id": "mymail",                 // Internal ID (default: domain name)
+      "name": "Your Name",            // From: header name (default: local part of email)
+      "label": "Work",                // UI display label (default: name)
+      "email": "you@example.com",
       "imap": {
-        "host": "imap.example.com",   // IMAP server
-        "port": 993,                  // Usually 993 for SSL/TLS
-        "tls": true,
-        "auth": "password",           // "password" or "oauth2" (Gmail)
-        "user": "you@example.com",    // IMAP username
-        "password": "your-password"   // IMAP password (not needed for oauth2)
+        "host": "imap.example.com",   // Default: imap.{domain}
+        "port": 993,                  // Default: 993
+        "tls": true,                  // Default: true
+        "auth": "password",           // Default: "password" (or "oauth2" for Gmail/Outlook)
+        "user": "you@example.com",    // Default: email address
+        "password": "your-password"
       },
       "smtp": {
-        "host": "smtp.example.com",   // SMTP server
-        "port": 587,                  // Usually 587 for STARTTLS
-        "tls": true,
+        "host": "smtp.example.com",   // Default: smtp.{domain}
+        "port": 587,                  // Default: 587
+        "tls": true,                  // Default: true
         "auth": "password",
         "user": "you@example.com",
         "password": "your-password"
       },
-      "enabled": true,
-      "defaultSend": true             // Use this account for sending when From doesn't match
+      "enabled": true,                // Default: true
+      "defaultSend": true,            // Use this account when From doesn't match
+      "relayDomains": [],             // Domains to skip in Delivered-To chain
+      "deliveredToPrefix": []         // Prefixes to strip from Delivered-To alias
     }
   ],
   "sync": {
-    "intervalMinutes": 5,             // Full sync interval (minutes)
-    "historyDays": 0                  // Days of history to sync (0 = all)
+    "intervalMinutes": 5,             // Default: 5
+    "historyDays": 0                  // Default: 30 (0 = all)
+  },
+  "ui": {
+    "theme": "system"                 // "system" (default), "dark", or "light"
   }
 }
 ```
 
-**Step 3.** Run `mailx` and open `http://127.0.0.1:9333` in your browser.
+**Known providers with automatic defaults:** Gmail, Google, Outlook, Hotmail, Yahoo, iCloud. For these, only `email` is required.
+
+No `config.jsonc` needed -- when it doesn't exist, mailx reads settings directly from `~/.mailx/`.
+
+**Step 2.** Run `mailx` and open `http://127.0.0.1:9333` in your browser.
 
 ### Option C: Multi-machine with shared settings (OneDrive/Dropbox)
 
-Put `settings.jsonc` on a cloud-synced folder, then create a local pointer:
+To share settings across machines, put `settings.jsonc` in a cloud-synced folder and create a local pointer file.
+
+**Step 1.** Move `settings.jsonc` to a shared location:
+
+```
+# Example: OneDrive
+mkdir "%OneDrive%\home\.mailx"
+move "%USERPROFILE%\.mailx\settings.jsonc" "%OneDrive%\home\.mailx\settings.jsonc"
+```
+
+**Step 2.** Create `~/.mailx/config.jsonc` pointing to the shared location:
 
-**`~/.mailx/config.jsonc`:**
 ```jsonc
 {
-  // Point to shared settings on OneDrive (or Dropbox, network share, etc.)
+  // Where the shared settings live (OneDrive, Dropbox, network share, etc.)
   "sharedDir": "C:/Users/You/OneDrive/home/.mailx",
-  // Local-only: where cached messages are stored
-  "storePath": "C:/Users/You/.mailx/mailxstore",
-  // Per-machine override: days of history (0 = all)
-  "historyDays": 90
+
+  // Local-only settings (not synced):
+  "storePath": "C:/Users/You/.mailx/mailxstore",   // cached message bodies
+  "historyDays": 90                                  // override sync depth per machine
 }
 ```
 
-The shared directory contains: `settings.jsonc`, `allowlist.jsonc`, `preferences.jsonc`. Each machine caches them locally for offline use.
+**How it works:**
+- `config.jsonc` is local to each machine -- never synced
+- `sharedDir` points to the cloud folder containing `settings.jsonc`, `allowlist.jsonc`, `preferences.jsonc`
+- mailx caches shared files locally for offline use
+- `historyDays` in `config.jsonc` overrides the shared default per machine
+- On new machines, if `config.jsonc` doesn't exist, mailx auto-detects OneDrive at `%OneDrive%/home/.mailx/`
 
-### Adding a Gmail account
+### Gmail OAuth setup
 
-Gmail requires OAuth2 instead of a password:
+Gmail accounts auto-configure -- just add `{ "email": "you@gmail.com" }` to accounts. But OAuth requires a one-time Google Cloud setup:
 
 1. Go to [Google Cloud Console](https://console.cloud.google.com/) and create a project
 2. Enable the **Gmail API** (and **People API** for contacts)
 3. Create **OAuth 2.0 credentials** (Desktop app type)
 4. Download `credentials.json` to the iflow package directory
-5. Add the Gmail account to `settings.jsonc` with `"auth": "oauth2"`
-6. First connection opens a browser for OAuth consent. Tokens are cached and refresh automatically.
-
-```jsonc
-{
-  "id": "gmail",
-  "name": "Your Name",
-  "label": "Gmail",
-  "email": "you@gmail.com",
-  "imap": { "host": "imap.gmail.com", "port": 993, "tls": true, "auth": "oauth2", "user": "you@gmail.com" },
-  "smtp": { "host": "smtp.gmail.com", "port": 587, "tls": true, "auth": "oauth2", "user": "you@gmail.com" },
-  "enabled": true
-}
-```
+5. First connection opens a browser for OAuth consent. Tokens are cached and refresh automatically.
 
 ## Usage
 

package/bin/mailx.js

@@ -172,16 +172,34 @@ async function main() {
 
         let launcherPath = launcherPaths.find(p => fs.existsSync(p));
 
+        // On Linux, skip native launcher if no display server available
+        if (launcherPath && process.platform === "linux" && !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY) {
+            log("No display server (DISPLAY/WAYLAND_DISPLAY not set) — skipping native launcher");
+            launcherPath = undefined;
+        }
+
         if (launcherPath) {
             console.log("Starting mailx...");
             log(`Launching: ${launcherPath}`);
             const { spawn } = await import("node:child_process");
-            const child = spawn(launcherPath, args, { detached: true, stdio: "ignore" });
-            child.unref();
-            console.log("mailx launched");
+            try {
+                const child = spawn(launcherPath, args, { detached: true, stdio: "ignore" });
+                child.on("error", () => {
+                    console.log("Native launcher failed, starting in browser mode...");
+                    process.argv.push("--server");
+                    main();
+                });
+                child.unref();
+                console.log("mailx launched");
+            } catch (e) {
+                console.log(`Native launcher failed: ${e.message}`);
+                console.log("Starting in browser mode...");
+                process.argv.push("--server");
+                await main();
+            }
         } else {
-            console.log("Native launcher not found, starting in browser mode...");
-            log("Falling back to --server mode");
+            console.log("Starting in browser mode...");
+            log("No native launcher — falling back to --server mode");
             process.argv.push("--server");
             await main(); // recurse with --server
         }

package/client/app.js

@@ -639,6 +639,14 @@ setInterval(async () => {
 }, 5000);
 console.log("mailx client initialized, location:", location.href);
 updateNewMessageCount();
+// ── Apply theme from settings ──
+fetch("/api/version").then(r => r.json()).then(d => {
+    if (d.theme === "dark")
+        document.documentElement.classList.add("theme-dark");
+    else if (d.theme === "light")
+        document.documentElement.classList.add("theme-light");
+    // "system" or missing = no class, CSS media query handles it
+}).catch(() => { });
 // Diagnostic: test API connectivity (helps debug WebView2 blank screen)
 fetch("/api/version").then(r => r.json()).then(d => {
     console.log("API reachable:", d);

package/client/components/folder-tree.js

@@ -387,7 +387,16 @@ async function loadFolderTree(container) {
         // Re-select previous folder on refresh, or auto-select Inbox on first load
         const allFolderEls = container.querySelectorAll('.ft-folder');
         let target = null;
-        if (selectedAccountId && selectedFolderId !== null && selectedFolderId >= 0) {
+        if (selectedFolderId === -1) {
+            // Unified inbox was selected — just re-highlight it, don't click
+            const unified = container.querySelector('.ft-unified');
+            if (unified) {
+                unified.classList.add("selected");
+                selectedElement = unified;
+                target = unified;
+            }
+        }
+        else if (selectedAccountId && selectedFolderId !== null && selectedFolderId >= 0) {
             for (const f of allFolderEls) {
                 const el = f;
                 if (el.dataset.accountId === selectedAccountId && el.dataset.folderId === String(selectedFolderId)) {

package/client/styles/variables.css

@@ -1,4 +1,5 @@
 /* mailx design tokens -- all theming via custom properties */
+/* Theme controlled by class on <html>: theme-dark, theme-light, or absent (system) */
 
 :root {
     /* Layout */
@@ -8,19 +9,19 @@
     --splitter-size: 5px;
     --list-viewer-split: 40%;
 
-    /* Colors in oklch */
-    --color-brand: oklch(0.88 0.04 240);         /* mailx light blue — toolbar, highlights */
-    --color-brand-dark: oklch(0.45 0.10 240);     /* darker brand for text on light bg */
+    /* Colors — dark by default */
+    --color-brand: oklch(0.88 0.04 240);
+    --color-brand-dark: oklch(0.45 0.10 240);
     --color-bg: oklch(0.20 0.02 270);
     --color-bg-surface: oklch(0.25 0.03 270);
     --color-bg-hover: color-mix(in oklch, var(--color-bg-surface) 80%, white);
     --color-bg-selected: var(--color-brand);
     --color-bg-toolbar: oklch(0.22 0.02 270);
-    --color-text: oklch(0.90 0.01 270);
-    --color-text-muted: oklch(0.55 0.02 270);
+    --color-text: oklch(0.92 0.01 270);
+    --color-text-muted: oklch(0.68 0.02 270);
     --color-accent: var(--color-brand-dark);
     --color-unread: oklch(0.95 0.02 270);
-    --color-border: oklch(0.35 0.02 270);
+    --color-border: oklch(0.40 0.02 270);
     --color-danger: oklch(0.65 0.15 15);
     --color-success: oklch(0.65 0.15 145);
     --color-badge: oklch(0.60 0.18 250);
@@ -46,9 +47,26 @@
     color-scheme: dark light;
 }
 
-/* Light theme -- follows system preference */
+/* Light overrides */
+.theme-light {
+    --color-bg: oklch(0.97 0.005 270);
+    --color-bg-surface: oklch(1.0 0 0);
+    --color-bg-hover: oklch(0.95 0.005 270);
+    --color-brand: oklch(0.88 0.04 240);
+    --color-brand-dark: oklch(0.35 0.12 240);
+    --color-bg-selected: var(--color-brand);
+    --color-bg-toolbar: oklch(0.95 0.005 270);
+    --color-text: oklch(0.20 0.02 270);
+    --color-text-muted: oklch(0.45 0.02 270);
+    --color-accent: var(--color-brand-dark);
+    --color-unread: oklch(0.10 0.02 270);
+    --color-border: oklch(0.85 0.01 270);
+    color-scheme: light;
+}
+
+/* System preference: light — apply when no explicit theme class */
 @media (prefers-color-scheme: light) {
-    :root {
+    :root:not(.theme-dark):not(.theme-light) {
         --color-bg: oklch(0.97 0.005 270);
         --color-bg-surface: oklch(1.0 0 0);
         --color-bg-hover: oklch(0.95 0.005 270);
@@ -61,5 +79,6 @@
         --color-accent: var(--color-brand-dark);
         --color-unread: oklch(0.10 0.02 270);
         --color-border: oklch(0.85 0.01 270);
+        color-scheme: light;
     }
 }

package/package.json

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

package/packages/mailx-server/index.js

@@ -81,7 +81,7 @@ app.use("/node_modules", express.static(path.join(rootDir, "node_modules"), { et
 // Mount API
 const apiRouter = createApiRouter(db, imapManager);
 app.use("/api", apiRouter);
-app.get("/api/version", (req, res) => res.json({ server: SERVER_VERSION, client: CLIENT_VERSION }));
+app.get("/api/version", (req, res) => res.json({ server: SERVER_VERSION, client: CLIENT_VERSION, theme: settings.ui?.theme || "system" }));
 app.get("/status", (req, res) => {
     const accounts = db.getAccounts();
     const pendingSync = db.getTotalPendingSyncCount();

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

@@ -20,7 +20,7 @@ declare const LOCAL_DIR: string;
 declare function getSharedDir(): string;
 declare const DEFAULT_PREFERENCES: {
     ui: {
-        theme: "dark" | "light";
+        theme: "system" | "dark" | "light";
         folderWidth: number;
         listViewerSplit: number;
         fontSize: number;
@@ -39,7 +39,7 @@ declare const DEFAULT_ALLOWLIST: {
 export declare function loadAccounts(): AccountConfig[];
 /** Save account configs */
 export declare function saveAccounts(accounts: AccountConfig[]): void;
-/** Load preferences (shared + local overrides) */
+/** Load preferences (shared + local overrides, with legacy fallback) */
 export declare function loadPreferences(): typeof DEFAULT_PREFERENCES;
 /** Save preferences */
 export declare function savePreferences(prefs: typeof DEFAULT_PREFERENCES): void;

package/packages/mailx-settings/index.js

@@ -105,11 +105,70 @@ function saveFile(filename, data) {
         catch { /* ignore */ }
     }
 }
+const PROVIDERS = {
+    "gmail.com": {
+        imap: { host: "imap.gmail.com", port: 993, tls: true, auth: "oauth2" },
+        smtp: { host: "smtp.gmail.com", port: 587, tls: true, auth: "oauth2" },
+    },
+    "googlemail.com": {
+        imap: { host: "imap.gmail.com", port: 993, tls: true, auth: "oauth2" },
+        smtp: { host: "smtp.gmail.com", port: 587, tls: true, auth: "oauth2" },
+    },
+    "outlook.com": {
+        imap: { host: "outlook.office365.com", port: 993, tls: true, auth: "oauth2" },
+        smtp: { host: "smtp.office365.com", port: 587, tls: true, auth: "oauth2" },
+    },
+    "hotmail.com": {
+        imap: { host: "outlook.office365.com", port: 993, tls: true, auth: "oauth2" },
+        smtp: { host: "smtp.office365.com", port: 587, tls: true, auth: "oauth2" },
+    },
+    "yahoo.com": {
+        imap: { host: "imap.mail.yahoo.com", port: 993, tls: true, auth: "password" },
+        smtp: { host: "smtp.mail.yahoo.com", port: 587, tls: true, auth: "password" },
+    },
+    "icloud.com": {
+        imap: { host: "imap.mail.me.com", port: 993, tls: true, auth: "password" },
+        smtp: { host: "smtp.mail.me.com", port: 587, tls: true, auth: "password" },
+    },
+};
+/** Fill in provider defaults for an account based on email domain */
+function normalizeAccount(acct, globalName) {
+    const email = acct.email || "";
+    const domain = email.split("@")[1]?.toLowerCase() || "";
+    const provider = PROVIDERS[domain];
+    const user = acct.imap?.user || acct.user || email;
+    return {
+        id: acct.id || domain.split(".")[0] || "account",
+        name: acct.name || globalName || email.split("@")[0],
+        label: acct.label,
+        email,
+        imap: {
+            host: acct.imap?.host || provider?.imap.host || `imap.${domain}`,
+            port: acct.imap?.port || provider?.imap.port || 993,
+            tls: acct.imap?.tls ?? provider?.imap.tls ?? true,
+            auth: acct.imap?.auth || provider?.imap.auth || "password",
+            user: acct.imap?.user || user,
+            password: acct.imap?.password || acct.password,
+        },
+        smtp: {
+            host: acct.smtp?.host || provider?.smtp.host || `smtp.${domain}`,
+            port: acct.smtp?.port || provider?.smtp.port || 587,
+            tls: acct.smtp?.tls ?? provider?.smtp.tls ?? true,
+            auth: acct.smtp?.auth || provider?.smtp.auth || "password",
+            user: acct.smtp?.user || user,
+            password: acct.smtp?.password || acct.password,
+        },
+        enabled: acct.enabled ?? true,
+        defaultSend: acct.defaultSend,
+        relayDomains: acct.relayDomains,
+        deliveredToPrefix: acct.deliveredToPrefix,
+    };
+}
 // ── Defaults ──
 const DEFAULT_ACCOUNTS = [];
 const DEFAULT_PREFERENCES = {
     ui: {
-        theme: "dark",
+        theme: "system",
         folderWidth: 220,
         listViewerSplit: 40,
         fontSize: 15,
@@ -143,21 +202,29 @@ export function loadAccounts() {
             }
             catch { /* ignore */ }
         }
-        return accounts.accounts || accounts;
+        const raw = accounts.accounts || accounts;
+        const globalName = accounts.name || "";
+        return raw.map((a) => normalizeAccount(a, globalName));
     }
     // Legacy: read from settings.jsonc
     const legacy = loadLegacySettings();
     if (legacy?.accounts)
-        return legacy.accounts;
+        return legacy.accounts.map((a) => normalizeAccount(a, legacy.name));
     return DEFAULT_ACCOUNTS;
 }
 /** Save account configs */
 export function saveAccounts(accounts) {
     saveFile("accounts.jsonc", { accounts });
 }
-/** Load preferences (shared + local overrides) */
+/** Load preferences (shared + local overrides, with legacy fallback) */
 export function loadPreferences() {
-    const shared = loadFile("preferences.jsonc", DEFAULT_PREFERENCES);
+    let shared = loadFile("preferences.jsonc", DEFAULT_PREFERENCES);
+    // Legacy fallback: read ui/sync from settings.jsonc if preferences.jsonc had only defaults
+    const legacy = loadLegacySettings();
+    if (legacy?.ui)
+        shared = { ...shared, ui: { ...shared.ui, ...legacy.ui } };
+    if (legacy?.sync)
+        shared = { ...shared, sync: { ...shared.sync, ...legacy.sync } };
     const localConfig = readLocalConfig();
     // Local overrides
     if (localConfig.historyDays !== undefined) {

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

@@ -175,7 +175,7 @@ export type WsEvent = {
 export interface MailxSettings {
     accounts: AccountConfig[];
     ui: {
-        theme: "dark" | "light";
+        theme: "system" | "dark" | "light";
         folderWidth: number;
         listViewerSplit: number; /** Percentage for message list height */
         fontSize: number;