@bobfrankston/mailx 1.0.181 → 1.0.183

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1047,"width":1844,"x":339,"y":168}
+{"height":1344,"width":1438,"x":216,"y":107}

package/client/app.js

@@ -265,12 +265,31 @@ async function openCompose(mode) {
         references: [],
         accounts: accounts.map((a) => ({ id: a.id, name: a.name, email: a.email })),
     };
+    // Auto-detect reply From: if the message was delivered to an identity domain,
+    // reply from that address instead of the default account address.
+    // Identity domains configured per-account in accounts.jsonc (identityDomains array).
+    // Default identity domains for bob.ma account:
+    const identityDomains = ["bob.ma", "frankston.com"];
+    function detectReplyFrom() {
+        if (!msg)
+            return undefined;
+        // Check deliveredTo first (most reliable), then To addresses
+        const candidates = [msg.deliveredTo, ...(msg.to || []).map((a) => a.address)].filter(Boolean);
+        for (const addr of candidates) {
+            const domain = addr.split("@")[1]?.toLowerCase();
+            if (domain && identityDomains.some(d => domain === d || domain.endsWith(`.${d}`))) {
+                return addr;
+            }
+        }
+        return undefined;
+    }
     if (msg && mode === "reply") {
         init.to = [msg.from];
         init.subject = `Re: ${cleanSubject}`;
         init.bodyHtml = quoteBody(msg);
         init.inReplyTo = msg.messageId;
         init.references = [...(msg.references || []), msg.messageId];
+        init.fromAddress = detectReplyFrom();
     }
     else if (msg && mode === "replyAll") {
         init.to = [msg.from, ...msg.to.filter((a) => a.address !== msg.from.address)];
@@ -279,6 +298,7 @@ async function openCompose(mode) {
         init.bodyHtml = quoteBody(msg);
         init.inReplyTo = msg.messageId;
         init.references = [...(msg.references || []), msg.messageId];
+        init.fromAddress = detectReplyFrom();
     }
     else if (msg && mode === "forward") {
         init.subject = `Fwd: ${cleanSubject}`;

package/client/compose/compose.js

@@ -260,6 +260,13 @@ function parseAddrs(s) {
 function applyInit(init) {
     // Populate From dropdown
     populateFromSelect(init.accounts, init.accountId);
+    // Auto-detect reply From: if fromAddress is set (identity domain match),
+    // use it as the From address via the "Other..." custom field
+    if (init.fromAddress) {
+        fromSelect.value = "__custom__";
+        fromCustom.hidden = false;
+        fromCustom.value = init.fromAddress;
+    }
     toInput.value = formatAddrs(init.to);
     ccInput.value = formatAddrs(init.cc);
     subjectInput.value = init.subject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.181",
+  "version": "1.0.183",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,7 @@
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.21",
-    "@bobfrankston/msger": "^0.1.231",
+    "@bobfrankston/msger": "^0.1.233",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

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

@@ -178,7 +178,7 @@ export declare class ImapManager extends EventEmitter {
     private readonly hostname;
     /** Ensure Outbox folder exists, create if needed */
     private ensureOutbox;
-    /** Save a debug copy of outgoing mail to the sending directory */
+    /** Save a copy of outgoing mail — label is a subdirectory (editing/queued/sent) */
     private saveSendingCopy;
     /** Queue a message for sending. Tries IMAP Outbox, falls back to local file. */
     queueOutgoing(accountId: string, rawMessage: string | Buffer): Promise<void>;

package/packages/mailx-imap/index.js

@@ -1629,20 +1629,19 @@ export class ImapManager extends EventEmitter {
         outbox = this.findFolder(accountId, "outbox");
         return outbox?.path || "Outbox";
     }
-    /** Save a debug copy of outgoing mail to the sending directory */
+    /** Save a copy of outgoing mail — label is a subdirectory (editing/queued/sent) */
     saveSendingCopy(accountId, rawMessage, label) {
         try {
-            const sendingDir = path.join(getConfigDir(), "sending", accountId);
-            fs.mkdirSync(sendingDir, { recursive: true });
+            const dir = path.join(getConfigDir(), "sending", accountId, label);
+            fs.mkdirSync(dir, { recursive: true });
             const now = new Date();
             const pad2 = (n) => String(n).padStart(2, "0");
             const ts = `${now.getFullYear()}${pad2(now.getMonth() + 1)}${pad2(now.getDate())}_${pad2(now.getHours())}${pad2(now.getMinutes())}${pad2(now.getSeconds())}`;
-            const filename = `${ts}-${label}.eml`;
-            fs.writeFileSync(path.join(sendingDir, filename), rawMessage);
-            console.log(`  [sending] Saved debug copy: ${filename}`);
+            fs.writeFileSync(path.join(dir, `${ts}.eml`), rawMessage);
+            console.log(`  [sending] ${label}/${ts}.eml`);
         }
         catch (e) {
-            console.error(`  [sending] Failed to save debug copy: ${e.message}`);
+            console.error(`  [sending] Failed to save copy: ${e.message}`);
         }
     }
     /** Queue a message for sending. Tries IMAP Outbox, falls back to local file. */

package/packages/mailx-service/index.js

@@ -4,7 +4,9 @@
  * Both the Express API (mailx-api) and the Android bridge call these functions.
  */
 import * as dns from "node:dns/promises";
-import { loadSettings, saveSettings, loadAccounts, loadAccountsAsync, saveAccounts, initCloudConfig, loadAllowlist, saveAllowlist, loadAutocomplete, saveAutocomplete, getStorePath, getStorageInfo } from "@bobfrankston/mailx-settings";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { loadSettings, saveSettings, loadAccounts, loadAccountsAsync, saveAccounts, initCloudConfig, loadAllowlist, saveAllowlist, loadAutocomplete, saveAutocomplete, getStorePath, getStorageInfo, getConfigDir } from "@bobfrankston/mailx-settings";
 import { simpleParser } from "mailparser";
 // ── Quoted-printable encoding (readable in debug .eml files) ──
 function encodeQuotedPrintable(text) {
@@ -106,7 +108,7 @@ export class MailxService {
         for (const cfg of settings.accounts) {
             const a = dbAccounts.find(d => d.id === cfg.id);
             if (a)
-                ordered.push({ ...a, label: cfg.label, defaultSend: cfg.defaultSend || false });
+                ordered.push({ ...a, label: cfg.label, defaultSend: cfg.defaultSend || false, identityDomains: cfg.identityDomains || [] });
         }
         // Append any DB accounts not in settings
         for (const a of dbAccounts) {
@@ -339,7 +341,9 @@ export class MailxService {
         const account = settings.accounts.find(a => a.id === msg.from);
         if (!account)
             throw new Error(`Unknown account: ${msg.from}`);
-        const fromHeader = msg.fromAddress || `${account.name} <${account.email}>`;
+        // Use custom From address if set (identity domain reply), but always wrap with account display name
+        const fromAddr = msg.fromAddress || account.email;
+        const fromHeader = `${account.name} <${fromAddr}>`;
         const to = msg.to.map((a) => a.name ? `${a.name} <${a.address}>` : a.address).join(", ");
         const cc = msg.cc?.map((a) => a.name ? `${a.name} <${a.address}>` : a.address).join(", ");
         const bcc = msg.bcc?.map((a) => a.name ? `${a.name} <${a.address}>` : a.address).join(", ");
@@ -536,6 +540,21 @@ export class MailxService {
             `MIME-Version: 1.0`, `Content-Type: text/html; charset=UTF-8`, `Content-Transfer-Encoding: quoted-printable`,
         ].filter(h => h !== null).join("\r\n");
         const raw = `${headers}\r\n\r\n${bodyEncoded}`;
+        // Save local editing copy — crash recovery, keep last 3
+        try {
+            const editingDir = path.join(getConfigDir(), "sending", accountId, "editing");
+            fs.mkdirSync(editingDir, { recursive: true });
+            const pad2 = (n) => String(n).padStart(2, "0");
+            const now = new Date();
+            const ts = `${now.getFullYear()}${pad2(now.getMonth() + 1)}${pad2(now.getDate())}_${pad2(now.getHours())}${pad2(now.getMinutes())}${pad2(now.getSeconds())}`;
+            fs.writeFileSync(path.join(editingDir, `${ts}.eml`), raw);
+            // Keep only last 3
+            const files = fs.readdirSync(editingDir).filter(f => f.endsWith(".eml")).sort();
+            while (files.length > 3) {
+                fs.unlinkSync(path.join(editingDir, files.shift()));
+            }
+        }
+        catch { /* ignore */ }
         const uid = await this.imapManager.saveDraft(accountId, raw, previousDraftUid, id);
         return { uid, draftId: id };
     }