@bobfrankston/mailx 1.0.146 → 1.0.150

package/bin/mailx.js

@@ -3,16 +3,17 @@
  * mailx -- email client
  *
  * Usage:
- *   mailx                    Start server + open in msger
- *   mailx --server           Start server + open msger (same as default)
+ *   mailx                    Start service + open in msger (IPC, no TCP)
+ *   mailx --server           Start Express HTTP server (dev/remote)
  *   mailx --no-browser       Start server only (headless)
- *   mailx --external         Bind to all interfaces
- *   mailx --verbose          Show detailed startup info
+ *   mailx --verbose          Show console output (default: log file only)
+ *   mailx --import <file>    Import accounts.jsonc into GDrive and merge
  *   mailx -v / --version     Show version and exit
  *   mailx -kill              Kill running mailx processes
- *   mailx -setup             Interactive first-time setup
- *   mailx -test              Test account connectivity
- *   mailx -rebuild           Wipe local cache, keep accounts
+ *   mailx -setup             Interactive first-time setup (CLI)
+ *   mailx -test              Test IMAP/SMTP connectivity
+ *   mailx -rebuild           Wipe local cache, re-sync from IMAP
+ *   mailx -repair            Re-sync metadata (fix corrupt subjects) keeping .eml files
  */
 import fs from "node:fs";
 import path from "node:path";
@@ -30,8 +31,10 @@ const setupMode = hasFlag("setup");
 const addMode = hasFlag("add");
 const testMode = hasFlag("test");
 const rebuildMode = hasFlag("rebuild");
+const repairMode = hasFlag("repair");
+const importMode = hasFlag("import");
 // Validate arguments
-const knownFlags = ["server", "no-browser", "verbose", "external", "kill", "v", "version", "setup", "add", "test", "rebuild", "native-imap", "log"];
+const knownFlags = ["server", "no-browser", "verbose", "external", "kill", "v", "version", "setup", "add", "test", "rebuild", "repair", "native-imap", "log", "import"];
 for (const arg of args) {
     const flag = arg.replace(/^--?/, "");
     if (arg.startsWith("-") && !knownFlags.includes(flag)) {
@@ -128,6 +131,79 @@ if (rebuildMode) {
     console.log("  Rebuild complete. Run 'mailx' to start fresh.");
     process.exit(0);
 }
+// Repair: re-sync metadata (subjects, flags, envelopes) without deleting stored .eml files
+if (repairMode) {
+    const { getConfigDir } = await import("@bobfrankston/mailx-settings");
+    const dbDir = getConfigDir();
+    const dbPath = path.join(dbDir, "mailx.db");
+    if (!fs.existsSync(dbPath)) {
+        console.error("No database found. Run 'mailx' first to create one.");
+        process.exit(1);
+    }
+    console.log("Repairing mailx metadata...");
+    console.log("  Message bodies (.eml files) will be preserved.");
+    console.log("  Clearing message metadata for re-sync...");
+    // Dynamic require — better-sqlite3 is a native module, not typed in bin/
+    const mod = "better-sqlite3";
+    const Database = (await import(/* webpackIgnore: true */ mod)).default;
+    const db = Database(dbPath);
+    db.pragma("journal_mode = WAL");
+    const count = db.prepare("SELECT COUNT(*) as cnt FROM messages").get().cnt;
+    db.exec("DELETE FROM messages");
+    db.exec("DELETE FROM messages_fts");
+    // Reset folder sync state so IMAP re-syncs all envelopes
+    db.exec("UPDATE folders SET total = 0, unread = 0");
+    db.close();
+    console.log(`  Cleared ${count} message entries. Folder sync state reset.`);
+    console.log("  Run 'mailx' to re-sync from IMAP with correct encoding.");
+    process.exit(0);
+}
+// Import accounts from a local file into GDrive
+if (importMode) {
+    const importPath = args.find(a => !a.startsWith("-"));
+    if (!importPath) {
+        console.error("Usage: mailx --import <path-to-accounts.jsonc>");
+        console.error("  Reads accounts from a local file and saves to Google Drive.");
+        console.error("  Example: mailx --import ~/OneDrive/home/.mailx/accounts.jsonc");
+        process.exit(1);
+    }
+    const { parse: parseJsonc } = await import("jsonc-parser");
+    const absPath = path.resolve(importPath);
+    if (!fs.existsSync(absPath)) {
+        console.error(`File not found: ${absPath}`);
+        process.exit(1);
+    }
+    const content = fs.readFileSync(absPath, "utf-8").replace(/\r/g, "");
+    const data = parseJsonc(content);
+    const accounts = data?.accounts || (Array.isArray(data) ? data : null);
+    if (!accounts || accounts.length === 0) {
+        console.error("No accounts found in file. Expected { accounts: [...] } or [...]");
+        process.exit(1);
+    }
+    console.log(`Found ${accounts.length} account(s) in ${absPath}`);
+    // Initialize cloud config (GDrive) and save
+    const { initCloudConfig, loadAccounts, saveAccounts } = await import("@bobfrankston/mailx-settings");
+    await initCloudConfig("gdrive");
+    // Merge: existing cloud accounts + imported, deduplicate by email
+    const existing = loadAccounts();
+    const merged = [...existing];
+    for (const acct of accounts) {
+        if (!merged.some(e => e.email === acct.email)) {
+            merged.push(acct);
+            console.log(`  + ${acct.label || acct.email}`);
+        }
+        else {
+            console.log(`  = ${acct.label || acct.email} (already exists)`);
+        }
+    }
+    // Wrap with name if the source had one
+    const wrapper = { accounts: merged };
+    if (data?.name)
+        wrapper.name = data.name;
+    saveAccounts(merged);
+    console.log(`Saved ${merged.length} account(s). Run 'mailx' to start.`);
+    process.exit(0);
+}
 // Version
 if (hasFlag("v") || hasFlag("version")) {
     const root = path.join(import.meta.dirname, "..");
@@ -324,7 +400,7 @@ async function runSetup() {
     }
     fs.mkdirSync(mailxDir, { recursive: true });
     if (isGoogle) {
-        // Save to Google Drive via API (folder-ID based, no path navigation)
+        // Save to Google Drive via API — merge with existing settings if present
         console.log("\nSaving settings to Google Drive via API...");
         try {
             const { gDriveFindOrCreateFolder, getCloudProvider } = await import("@bobfrankston/mailx-settings/cloud.js");
@@ -332,8 +408,31 @@ async function runSetup() {
             if (folderId) {
                 const gdrive = getCloudProvider("gdrive", folderId);
                 if (gdrive) {
-                    const content = JSON.stringify(settings, null, 2);
-                    const ok = await gdrive.write("settings.jsonc", content);
+                    // Read existing accounts from Drive to merge (don't overwrite other accounts)
+                    let accountsList = [account];
+                    // Check accounts.jsonc first, then legacy settings.jsonc
+                    const existingAccts = await gdrive.read("accounts.jsonc");
+                    const existingSettings = existingAccts ? null : await gdrive.read("settings.jsonc");
+                    const existingContent = existingAccts || existingSettings;
+                    if (existingContent) {
+                        try {
+                            const { parse: parseJsonc } = await import("jsonc-parser");
+                            const prev = parseJsonc(existingContent);
+                            const prevAccounts = prev?.accounts || (Array.isArray(prev) ? prev : []);
+                            if (prevAccounts.length > 0) {
+                                accountsList = [...prevAccounts];
+                                const newEmail = account.email.toLowerCase();
+                                if (!accountsList.some((a) => a.email?.toLowerCase() === newEmail)) {
+                                    accountsList.push(account);
+                                }
+                                console.log(`  Found ${prevAccounts.length} existing account(s) on Drive — merging`);
+                            }
+                        }
+                        catch { /* parse failed, overwrite */ }
+                    }
+                    const accountsData = { name, accounts: accountsList };
+                    const content = JSON.stringify(accountsData, null, 2);
+                    const ok = await gdrive.write("accounts.jsonc", content);
                     if (ok) {
                         console.log("Settings saved to Google Drive (mailx folder)");
                         const config = { sharedDir: { provider: "gdrive", path: "mailx", folderId } };
@@ -488,8 +587,18 @@ async function main() {
             console.log("No mailx configuration found.");
         await runSetup();
     }
-    // TODO: re-enable console redirect once wry crash is fixed
-    // The redirect itself somehow causes wry WebView2 to crash with InvalidUri
+    // Redirect console to log file — keep terminal clean
+    if (!verbose) {
+        const home = process.env.USERPROFILE || process.env.HOME || ".";
+        const logDir = path.join(home, ".mailx", "logs");
+        fs.mkdirSync(logDir, { recursive: true });
+        const logDate = new Date().toISOString().slice(0, 10);
+        const logPath = path.join(logDir, `mailx-${logDate}.log`);
+        const logStream = fs.createWriteStream(logPath, { flags: "a" });
+        const ts = () => new Date().toISOString().slice(11, 23);
+        console.log = (...a) => { logStream.write(`${ts()} ${a.join(" ")}\n`); };
+        console.error = (...a) => { logStream.write(`${ts()} ERROR ${a.join(" ")}\n`); };
+    }
     // --server mode: Express + HTTP (for dev/remote access)
     if (serverMode) {
         console.log("Starting mailx HTTP server...");
@@ -520,20 +629,35 @@ async function main() {
     const imapManager = new ImapManager(db);
     imapManager.useNativeClient = true;
     const svc = new MailxService(db, imapManager);
-    // Open msger in service mode — file:// URL, no HTTP
+    // Open msger in service mode — custom protocol serves files from client dir
     const clientDir = path.join(import.meta.dirname, "..", "client");
-    const indexPath = path.join(clientDir, "index.html");
     const mailxapiPath = path.join(clientDir, "lib", "mailxapi.js");
     const mailxapiScript = fs.readFileSync(mailxapiPath, "utf-8");
     const handle = showService({
-        url: indexPath,
+        url: "index.html",
+        contentDir: clientDir,
         initScript: mailxapiScript,
+        icon: path.join(clientDir, "icon.png"),
         size: { width: 1400, height: 900 },
+        escapeCloses: false,
     });
     // Handle requests from WebView → dispatch to MailxService
+    // Pass server version to dispatch so getVersion returns it
+    const rootPkg = JSON.parse(fs.readFileSync(path.join(import.meta.dirname, "..", "package.json"), "utf-8"));
     handle.onRequest(async (req) => {
-        const response = await dispatch(svc, req);
-        handle.send(response);
+        if (verbose)
+            console.error(`[ipc] ← ${req._action} (${req._cbid})`);
+        req._version = rootPkg.version;
+        try {
+            const response = await dispatch(svc, req);
+            if (verbose)
+                console.error(`[ipc] → ${req._action} (${req._cbid}) ok`);
+            handle.send(response);
+        }
+        catch (e) {
+            console.error(`[ipc] → ${req._action} (${req._cbid}) error: ${e.message}`);
+            handle.send({ _cbid: req._cbid, error: e.message });
+        }
     });
     // Wire IMAP events → push to WebView
     imapManager.on("syncProgress", (accountId, phase, progress) => {
@@ -567,16 +691,36 @@ async function main() {
     }
     imapManager.startPeriodicSync(settings.sync.intervalMinutes);
     imapManager.startOutboxWorker();
+    // Graceful shutdown — close IMAP connections, stop timers, close DB
+    let shuttingDown = false;
+    async function gracefulShutdown(reason) {
+        if (shuttingDown)
+            return;
+        shuttingDown = true;
+        console.log(`${reason} — shutting down`);
+        imapManager.stopPeriodicSync();
+        imapManager.stopOutboxWorker();
+        try {
+            await imapManager.shutdown();
+        }
+        catch { /* proceed */ }
+        db.close();
+        process.exit(0);
+    }
+    process.on("SIGINT", () => gracefulShutdown("SIGINT"));
+    process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
+    process.on("exit", () => {
+        if (!shuttingDown) {
+            // Sync fallback — shutdown() is async so can't fully run here,
+            // but at least stop timers and release semaphores
+            imapManager.stopPeriodicSync();
+            imapManager.stopOutboxWorker();
+            db.close();
+        }
+    });
     // Wait for window close, then shut down
     await handle.closed;
-    console.log("Window closed — shutting down");
-    imapManager.stopPeriodicSync();
-    try {
-        await imapManager.shutdown();
-    }
-    catch { /* proceed */ }
-    db.close();
-    process.exit(0);
+    await gracefulShutdown("Window closed");
 }
 main().catch(console.error);
 //# sourceMappingURL=mailx.js.map

package/client/app.js

@@ -5,7 +5,7 @@
 import { initFolderTree, refreshFolderTree, updateFolderCounts } from "./components/folder-tree.js";
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, getSelectedMessages } from "./components/message-list.js";
 import { showMessage, getCurrentMessage } from "./components/message-viewer.js";
-import { connectWebSocket, onWsEvent, triggerSync, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, rebuildServer } from "./lib/api-client.js";
+import { connectWebSocket, onWsEvent, triggerSync, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, rebuildServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts } from "./lib/api-client.js";
 // ── New message badge (favicon + title) ──
 let baseTitle = "mailx";
 let lastSeenCount = 0;
@@ -226,13 +226,19 @@ document.addEventListener("click", (e) => {
 document.getElementById("btn-restart-quick")?.addEventListener("click", async () => {
     if (restartDropdown)
         restartDropdown.hidden = true;
-    const statusSync = document.getElementById("status-sync");
-    if (statusSync)
-        statusSync.textContent = "Restarting...";
-    try {
-        await restartServer();
+    if (isApp) {
+        // IPC mode: reload the UI (no server to restart)
+        location.reload();
+    }
+    else {
+        const statusSync = document.getElementById("status-sync");
+        if (statusSync)
+            statusSync.textContent = "Restarting...";
+        try {
+            await restartServer();
+        }
+        catch { /* server is shutting down */ }
     }
-    catch { /* server is shutting down */ }
 });
 document.getElementById("btn-rebuild")?.addEventListener("click", async () => {
     if (restartDropdown)
@@ -856,7 +862,7 @@ settingsBtn?.addEventListener("click", (e) => {
 });
 // Close handled by the shared document click handler above
 // Load current editor setting from server
-fetch("/api/settings").then(r => r.json()).then(s => {
+getSettings().then((s) => {
     const ed = s.ui?.editor || "quill";
     if (optEditorQuill)
         optEditorQuill.checked = ed === "quill";
@@ -865,13 +871,9 @@ fetch("/api/settings").then(r => r.json()).then(s => {
 }).catch(() => { });
 // Save editor choice to server settings
 function saveEditorSetting(editor) {
-    fetch("/api/settings").then(r => r.json()).then(settings => {
+    getSettings().then((settings) => {
         settings.ui = { ...settings.ui, editor };
-        fetch("/api/settings", {
-            method: "PUT",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify(settings),
-        });
+        saveSettings(settings);
     }).catch(() => { });
 }
 optEditorQuill?.addEventListener("change", () => {
@@ -885,22 +887,18 @@ optEditorTiptap?.addEventListener("change", () => {
 // ── AI autocomplete toggle ──
 const optAutocomplete = document.getElementById("opt-autocomplete");
 // Load current autocomplete setting
-fetch("/api/autocomplete/settings").then(r => r.json()).then(ac => {
+getAutocompleteSettings().then((ac) => {
     if (optAutocomplete)
         optAutocomplete.checked = ac.enabled || false;
 }).catch(() => { });
 optAutocomplete?.addEventListener("change", () => {
-    fetch("/api/autocomplete/settings").then(r => r.json()).then(ac => {
+    getAutocompleteSettings().then((ac) => {
         ac.enabled = optAutocomplete.checked;
-        fetch("/api/autocomplete/settings", {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify(ac),
-        });
+        saveAutocompleteSettings(ac);
     }).catch(() => { });
 });
 const isApp = typeof mailxapi !== "undefined" && mailxapi?.isApp;
-const versionPromise = isApp ? mailxapi.getVersion() : fetch("/api/version").then(r => r.json());
+const versionPromise = getVersion();
 versionPromise.then((d) => {
     const el = document.getElementById("app-version");
     const storage = d.storage || {};
@@ -928,8 +926,7 @@ versionPromise.then((d) => {
                 btn.textContent = "Restoring...";
                 btn.disabled = true;
                 try {
-                    const r = await fetch("/api/repair-accounts", { method: "POST" });
-                    const data = await r.json();
+                    const data = await repairAccounts();
                     if (data.ok) {
                         hideAlert();
                         setTimeout(() => location.reload(), 1000);
@@ -948,15 +945,16 @@ versionPromise.then((d) => {
     else if (storage.cloudError) {
         showAlert(`Cloud storage error: ${storage.cloudError}`, "cloud-error");
     }
-}).catch(() => {
-    // Version fetch failed — in IPC mode this means service isn't responding yet
-    if (!isApp) {
-        const el = document.getElementById("app-version");
+}).catch((e) => {
+    // Version fetch failed
+    const el = document.getElementById("app-version");
+    if (isApp) {
+        if (el)
+            el.textContent = `mailx [version error: ${e.message}]`;
+    }
+    else {
         if (el)
             el.textContent = "mailx [server offline]";
-        const startupStatus = document.getElementById("startup-status");
-        if (startupStatus)
-            startupStatus.textContent = "Server offline — start with: node packages/mailx-server/index.js";
     }
 });
 // ── Sync pending indicator + server health check (HTTP mode only) ──
@@ -967,10 +965,7 @@ if (isApp) {
 else
     setInterval(async () => {
         try {
-            const res = await fetch("/api/sync/pending");
-            if (!res.ok)
-                return;
-            const data = await res.json();
+            const data = await getSyncPending();
             const el = document.getElementById("status-pending");
             if (el) {
                 el.textContent = data.pending > 0 ? `↻ ${data.pending} pending` : "";
@@ -1010,7 +1005,7 @@ function scheduleMiddnightRefresh() {
 }
 scheduleMiddnightRefresh();
 // ── Apply theme from settings ──
-(isApp ? mailxapi.getVersion() : fetch("/api/version").then(r => r.json())).then((d) => {
+getVersion().then((d) => {
     if (d.theme === "dark")
         document.documentElement.classList.add("theme-dark");
     else if (d.theme === "light")

package/client/components/folder-tree.js

@@ -2,7 +2,7 @@
  * Folder tree component -- renders account folders with hierarchy,
  * expand/collapse, and optional unified inbox.
  */
-import { getAccounts, getFolders, moveMessage, moveMessages, markFolderRead, createFolder, renameFolder, deleteFolder, emptyFolder } from "../lib/api-client.js";
+import { getAccounts, getFolders, moveMessage, moveMessages, markFolderRead, createFolder, renameFolder, deleteFolder, emptyFolder, setupAccount, getVersion } from "../lib/api-client.js";
 import { showContextMenu } from "./context-menu.js";
 let onFolderSelect;
 let onUnifiedInbox = null;
@@ -359,8 +359,9 @@ async function loadFolderTree(container) {
                             <input id="setup-email" type="email" placeholder="you@gmail.com" required style="display:block;width:100%;padding:0.5rem;margin-top:0.25rem;background:var(--color-bg-surface);color:var(--color-text);border:1px solid var(--color-border);border-radius:4px">
                         </label>
                         <label id="setup-password-row" style="display:block;margin-bottom:0.5rem">
-                            Password <span style="color:var(--color-text-muted);font-size:0.85rem">(not needed for Gmail/Outlook)</span>
+                            Password <span id="setup-password-hint" style="color:var(--color-text-muted);font-size:0.85rem">(not needed for Gmail/Outlook)</span>
                             <input id="setup-password" type="password" placeholder="password" style="display:block;width:100%;padding:0.5rem;margin-top:0.25rem;background:var(--color-bg-surface);color:var(--color-text);border:1px solid var(--color-border);border-radius:4px">
+                            <div id="setup-app-password-help" style="display:none;margin-top:0.25rem;font-size:0.8rem;color:var(--color-text-muted)"></div>
                         </label>
                         <button type="submit" style="margin-top:1rem;padding:0.5rem 2rem;background:var(--color-accent);color:#fff;border:none;border-radius:4px;cursor:pointer;font-size:1rem">Add Account</button>
                         <div id="setup-status" style="margin-top:1rem;color:var(--color-text-muted)"></div>
@@ -376,13 +377,24 @@ async function loadFolderTree(container) {
                 const form = document.getElementById("setup-form");
                 const emailInput = document.getElementById("setup-email");
                 const statusEl = document.getElementById("setup-status");
-                // Hide password for known OAuth providers
+                // Hide password for OAuth providers, show app-password help for others
+                const APP_PASSWORD_HELP = {
+                    "yahoo.com": "Use an app password: Yahoo Settings → Account Security → Generate app password",
+                    "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",
+                };
                 emailInput?.addEventListener("input", () => {
                     const domain = emailInput.value.split("@")[1]?.toLowerCase() || "";
-                    const isOAuth = ["gmail.com", "googlemail.com", "outlook.com", "hotmail.com"].includes(domain);
+                    const isOAuth = ["gmail.com", "googlemail.com", "outlook.com", "hotmail.com", "live.com"].includes(domain);
                     const pwRow = document.getElementById("setup-password-row");
                     if (pwRow)
                         pwRow.style.display = isOAuth ? "none" : "block";
+                    const helpEl = document.getElementById("setup-app-password-help");
+                    if (helpEl) {
+                        const help = APP_PASSWORD_HELP[domain];
+                        helpEl.style.display = help ? "block" : "none";
+                        helpEl.textContent = help || "";
+                    }
                 });
                 form?.addEventListener("submit", async (e) => {
                     e.preventDefault();
@@ -393,15 +405,11 @@ async function loadFolderTree(container) {
                         return;
                     statusEl.textContent = "Setting up account...";
                     try {
-                        const res = await fetch("/api/setup", {
-                            method: "POST",
-                            headers: { "Content-Type": "application/json" },
-                            body: JSON.stringify({ name, email, password }),
-                        });
-                        const data = await res.json();
+                        const data = await setupAccount(name, email, password);
                         if (data.ok) {
-                            statusEl.textContent = "Account added! Restarting...";
-                            setTimeout(() => location.reload(), 2000);
+                            statusEl.textContent = "Account added! Syncing...";
+                            // Wait for sync to populate folders before reloading
+                            setTimeout(() => location.reload(), 5000);
                         }
                         else {
                             statusEl.textContent = `Error: ${data.error || "Setup failed"}`;
@@ -412,7 +420,7 @@ async function loadFolderTree(container) {
                     }
                 });
                 // Show cloud storage status in setup form
-                fetch("/api/version").then(r => r.json()).then(d => {
+                getVersion().then((d) => {
                     const cloudEl = document.getElementById("setup-cloud-status");
                     if (!cloudEl)
                         return;

package/client/compose/compose.js

@@ -4,6 +4,7 @@
  * Receives init data via window.opener.postMessage or URL params.
  */
 import { createEditor } from "./editor.js";
+import { getVersion, getSettings, getAccounts, searchContacts, sendMessage, saveDraft as apiSaveDraft, deleteDraft } from "../lib/api-client.js";
 // ── Load editor scripts dynamically ──
 function loadScript(src) {
     return new Promise((resolve, reject) => {
@@ -43,16 +44,10 @@ async function loadEditorAssets(type) {
 let editorType = "quill";
 let appSettings = null;
 try {
-    const res = await fetch("/api/version");
-    if (res.ok) {
-        // Check settings for editor preference
-        const settingsRes = await fetch("/api/settings");
-        if (settingsRes.ok) {
-            appSettings = await settingsRes.json();
-            if (appSettings.ui?.editor === "tiptap")
-                editorType = "tiptap";
-        }
-    }
+    await getVersion(); // verify server is up
+    appSettings = await getSettings();
+    if (appSettings.ui?.editor === "tiptap")
+        editorType = "tiptap";
 }
 catch { /* default to quill */ }
 await loadEditorAssets(editorType);
@@ -171,10 +166,7 @@ function setupAutocomplete(input) {
         }
         debounce = setTimeout(async () => {
             try {
-                const res = await fetch(`/api/contacts?q=${encodeURIComponent(token)}`);
-                if (!res.ok)
-                    return;
-                const results = await res.json();
+                const results = await searchContacts(token);
                 if (results.length === 0) {
                     closeDropdown();
                     return;
@@ -291,12 +283,11 @@ else {
 }
 // If From dropdown is empty (new compose without init, or init had no accounts), fetch from API
 if (fromSelect.options.length === 0) {
-    fetch("/api/accounts")
-        .then(r => r.json())
+    getAccounts()
         .then((accounts) => {
         populateFromSelect(accounts);
     })
-        .catch(e => console.error("Failed to load accounts:", e));
+        .catch((e) => console.error("Failed to load accounts:", e));
 }
 // ── Auto-save drafts every 5 seconds ──
 let draftUid = null;
@@ -315,20 +306,16 @@ async function saveDraft() {
     lastDraftContent = content;
     draftSaving = true;
     try {
-        const data = await fetch("/api/draft", {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({
-                accountId: getFromAccountId(),
-                subject: subjectInput.value,
-                bodyHtml: editor.getHtml(),
-                bodyText: editor.getText(),
-                to: toInput.value,
-                cc: ccInput.value,
-                previousDraftUid: draftUid,
-                draftId: draftId,
-            }),
-        }).then(r => r.ok ? r.json() : null);
+        const data = await apiSaveDraft({
+            accountId: getFromAccountId(),
+            subject: subjectInput.value,
+            bodyHtml: editor.getHtml(),
+            bodyText: editor.getText(),
+            to: toInput.value,
+            cc: ccInput.value,
+            previousDraftUid: draftUid,
+            draftId: draftId,
+        });
         if (data?.draftUid)
             draftUid = data.draftUid;
         if (data?.draftId)
@@ -356,23 +343,11 @@ document.getElementById("btn-send")?.addEventListener("click", async () => {
         bodyText: editor.getText(),
     };
     try {
-        const res = await fetch("/api/send", {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify(body),
-        });
-        if (!res.ok) {
-            const err = await res.json();
-            throw new Error(err.error || res.statusText);
-        }
+        await sendMessage(body);
         // Delete draft after successful send
         clearInterval(draftTimer);
         if (draftUid) {
-            fetch("/api/draft", {
-                method: "DELETE",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify({ accountId: getFromAccountId(), draftUid }),
-            }).catch(() => { });
+            deleteDraft(getFromAccountId(), draftUid).catch(() => { });
         }
         window.close();
     }

package/client/lib/api-client.js

@@ -250,11 +250,45 @@ export function autocomplete(body, signal) {
     return api("/autocomplete", { method: "POST", body: JSON.stringify(body), signal });
 }
 export function getAutocompleteSettings() {
+    if (hasIPC)
+        return mailxapi.getAutocompleteSettings?.();
     return api("/autocomplete/settings");
 }
 export function saveAutocompleteSettings(settings) {
+    if (hasIPC)
+        return mailxapi.saveAutocompleteSettings?.(settings);
     return api("/autocomplete/settings", { method: "POST", body: JSON.stringify(settings) });
 }
+export function getVersion() {
+    if (hasIPC)
+        return mailxapi.getVersion();
+    return api("/version");
+}
+export function getSettings() {
+    if (hasIPC)
+        return mailxapi.getSettings();
+    return api("/settings");
+}
+export function saveSettings(settings) {
+    if (hasIPC)
+        return mailxapi.saveSettingsData?.(settings);
+    return api("/settings", { method: "PUT", body: JSON.stringify(settings) });
+}
+export function repairAccounts() {
+    if (hasIPC)
+        return mailxapi.repairAccounts?.();
+    return api("/repair-accounts", { method: "POST" });
+}
+export function deleteDraft(accountId, draftUid) {
+    if (hasIPC)
+        return mailxapi.deleteDraft?.(accountId, draftUid);
+    return api("/draft", { method: "DELETE", body: JSON.stringify({ accountId, draftUid }) });
+}
+export function setupAccount(name, email, password) {
+    if (hasIPC)
+        return mailxapi.setupAccount?.(name, email, password);
+    return api("/setup", { method: "POST", body: JSON.stringify({ name, email, password }) });
+}
 // Legacy exports for backward compatibility
 export const connectWebSocket = connectEvents;
 export const onWsEvent = onEvent;

package/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-client",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "private": true,
   "type": "module",
   "dependencies": {