@bobfrankston/mailx 1.0.232 → 1.0.234

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1344,"width":2151,"x":1060,"y":329}
+{"height":1344,"width":2151,"x":656,"y":239}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.232",
+  "version": "1.0.234",
   "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.22",
-    "@bobfrankston/msger": "^0.1.294",
+    "@bobfrankston/msger": "^0.1.296",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -78,7 +78,7 @@
       "@bobfrankston/iflow-node": "^0.1.2",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.22",
-      "@bobfrankston/msger": "^0.1.294",
+      "@bobfrankston/msger": "^0.1.296",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-imap/index.js

@@ -1957,6 +1957,8 @@ export class ImapManager extends EventEmitter {
         const ccMatch = raw.match(/^Cc:\s*(.+)$/mi);
         const bccMatch = raw.match(/^Bcc:\s*(.+)$/mi);
         const fromMatch = raw.match(/^From:\s*(.+)$/mi);
+        const subjectMatch = raw.match(/^Subject:\s*(.+)$/mi);
+        const messageIdMatch = raw.match(/^Message-ID:\s*(<[^>]+>)/mi);
         const recipients = [
             ...(toMatch ? parseAddrs(toMatch[1]) : []),
             ...(ccMatch ? parseAddrs(ccMatch[1]) : []),
@@ -1965,9 +1967,22 @@ export class ImapManager extends EventEmitter {
         const sender = fromMatch ? (parseAddrs(fromMatch[1])[0] || account.email) : account.email;
         if (recipients.length === 0)
             throw new Error("No recipients");
+        // Dedup: skip if this Message-ID has already been sent. Prevents the
+        // outbox from re-sending the same file across crash/restart cycles.
+        // Without this, a queued .ltr that was mid-delivery when mailx crashed
+        // would be re-sent on every startup until the rename loop completed.
+        const messageId = messageIdMatch ? messageIdMatch[1] : "";
+        if (messageId && this.db.hasSentMessage(messageId)) {
+            console.log(`  [smtp] ${accountId}: SKIP ${messageId} — already in sent_log`);
+            return; // caller will move the file to sent/ without re-sending
+        }
         const rawToSend = raw.replace(/^Bcc:.*\r?\n/mi, "");
         this.saveSendingCopy(accountId, rawToSend, "sent");
         await transport.sendMail({ envelope: { from: sender, to: recipients }, raw: rawToSend });
+        // Record the successful send so future attempts dedupe against it.
+        if (messageId) {
+            this.db.recordSent(messageId, accountId, subjectMatch?.[1]?.trim() || "", recipients);
+        }
         console.log(`  [smtp] ${accountId}: sent to ${recipients.join(", ")}`);
     }
     /** Process Outbox — send pending messages with flag-based interlock */

package/packages/mailx-store/db.d.ts

@@ -7,6 +7,11 @@ import type { MessageEnvelope, Folder, EmailAddress, PagedResult, MessageQuery }
 export declare class MailxDB {
     private db;
     constructor(dbDir: string);
+    /** Has this Message-ID already been sent? Used to prevent the outbox from
+     *  re-sending the same raw file across crash/restart cycles. */
+    hasSentMessage(messageId: string): boolean;
+    /** Record a successfully sent message so future attempts are skipped. */
+    recordSent(messageId: string, accountId: string, subject: string, recipients: string[]): void;
     /** Idempotently add a column to a table if it's missing. */
     private addColumnIfMissing;
     /** Compute a thread id for an incoming message. Strategy:

package/packages/mailx-store/db.js

@@ -62,6 +62,14 @@ const SCHEMA = `
     CREATE INDEX IF NOT EXISTS idx_messages_thread_id
         ON messages(account_id, thread_id);
 
+    CREATE TABLE IF NOT EXISTS sent_log (
+        message_id TEXT PRIMARY KEY,
+        account_id TEXT NOT NULL,
+        subject TEXT DEFAULT '',
+        recipients TEXT DEFAULT '',
+        sent_at INTEGER NOT NULL
+    );
+
     CREATE TABLE IF NOT EXISTS queue (
         id INTEGER PRIMARY KEY AUTOINCREMENT,
         status TEXT NOT NULL DEFAULT 'pending',
@@ -127,20 +135,49 @@ export class MailxDB {
         this.db.exec("PRAGMA foreign_keys = ON");
         this.db.exec(SCHEMA);
         // Idempotent migrations for older databases that predate new columns.
-        // SQLite doesn't support "ADD COLUMN IF NOT EXISTS", so we probe the
-        // table schema and add missing columns one by one.
+        // SQLite doesn't support "ADD COLUMN IF NOT EXISTS", so we just try the
+        // ALTER and catch the "duplicate column" error. Simpler and more robust
+        // than probing via PRAGMA table_info (which can behave differently
+        // across sqlite drivers).
         this.addColumnIfMissing("messages", "thread_id", "TEXT");
         try {
             this.db.exec("CREATE INDEX IF NOT EXISTS idx_messages_thread_id ON messages(account_id, thread_id)");
         }
         catch { /* already exists */ }
     }
+    // ── Sent-log (dedup) ──
+    /** Has this Message-ID already been sent? Used to prevent the outbox from
+     *  re-sending the same raw file across crash/restart cycles. */
+    hasSentMessage(messageId) {
+        if (!messageId)
+            return false;
+        const row = this.db.prepare("SELECT 1 FROM sent_log WHERE message_id = ? LIMIT 1").get(messageId);
+        return !!row;
+    }
+    /** Record a successfully sent message so future attempts are skipped. */
+    recordSent(messageId, accountId, subject, recipients) {
+        if (!messageId)
+            return;
+        try {
+            this.db.prepare("INSERT INTO sent_log (message_id, account_id, subject, recipients, sent_at) VALUES (?, ?, ?, ?, ?) ON CONFLICT(message_id) DO NOTHING").run(messageId, accountId, subject || "", recipients.join(", "), Date.now());
+        }
+        catch (e) {
+            console.error(`  [sent_log] failed to record ${messageId}: ${e.message}`);
+        }
+    }
     /** Idempotently add a column to a table if it's missing. */
     addColumnIfMissing(table, column, sqlType) {
-        const cols = this.db.prepare(`PRAGMA table_info(${table})`).all();
-        if (cols.some(c => c.name === column))
-            return;
-        this.db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${sqlType}`);
+        try {
+            this.db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${sqlType}`);
+            console.log(`  [db] added column ${table}.${column}`);
+        }
+        catch (e) {
+            const msg = String(e?.message || e);
+            // "duplicate column name" is the expected case when column already exists
+            if (!/duplicate column/i.test(msg)) {
+                console.error(`  [db] migration ${table}.${column} failed: ${msg}`);
+            }
+        }
     }
     /** Compute a thread id for an incoming message. Strategy:
      *  1. If any ancestor (in_reply_to or references) is already present in