@bobfrankston/mailx 1.0.197 → 1.0.199

package/client/.msger-window.json

@@ -1 +1 @@
-{"height":1344,"width":2151,"x":400,"y":28}
+{"height":1344,"width":2151,"x":320,"y":22}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.197",
+  "version": "1.0.199",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -23,8 +23,8 @@
     "@bobfrankston/iflow-direct": "^0.1.6",
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
-    "@bobfrankston/oauthsupport": "^1.0.21",
-    "@bobfrankston/msger": "^0.1.248",
+    "@bobfrankston/oauthsupport": "^1.0.22",
+    "@bobfrankston/msger": "^0.1.250",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",

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

@@ -185,7 +185,7 @@ export declare class ImapManager extends EventEmitter {
     private saveSendingCopy;
     /** Queue a message for sending. Tries IMAP Outbox, falls back to local file. */
     queueOutgoing(accountId: string, rawMessage: string | Buffer): Promise<void>;
-    /** Process local file queue — move to IMAP Outbox when server is reachable */
+    /** Process local file queue — send from outbox/ and sending/queued/ */
     private processLocalQueue;
     /** Send a raw RFC 2822 message via SMTP for a given account */
     private sendRawViaSMTP;

package/packages/mailx-imap/index.js

@@ -1719,23 +1719,33 @@ export class ImapManager extends EventEmitter {
         fs.writeFileSync(path.join(localQueue, filename), rawMessage);
         console.log(`  [outbox] Saved locally: ${filename}`);
     }
-    /** Process local file queue — move to IMAP Outbox when server is reachable */
+    /** Process local file queue — send from outbox/ and sending/queued/ */
     async processLocalQueue(accountId) {
-        const localQueue = path.join(getConfigDir(), "outbox", accountId);
-        if (!fs.existsSync(localQueue))
-            return;
-        const files = fs.readdirSync(localQueue).filter(f => f.endsWith(".ltr"));
-        if (files.length === 0)
+        // Collect files from both outbox/ (legacy .ltr) and sending/queued/ (drop-in)
+        const outboxDir = path.join(getConfigDir(), "outbox", accountId);
+        const queuedDir = path.join(getConfigDir(), "sending", accountId, "queued");
+        const filesToSend = [];
+        for (const dir of [outboxDir, queuedDir]) {
+            if (!fs.existsSync(dir))
+                continue;
+            for (const file of fs.readdirSync(dir).filter(f => f.endsWith(".ltr") || f.endsWith(".eml"))) {
+                filesToSend.push({ dir, file });
+            }
+        }
+        if (filesToSend.length === 0)
             return;
         // Gmail/API accounts: send directly via SMTP from local queue (no IMAP outbox)
+        const sentDir = path.join(getConfigDir(), "sending", accountId, "sent");
+        fs.mkdirSync(sentDir, { recursive: true });
         if (this.isGmailAccount(accountId)) {
-            for (const file of files) {
-                const filePath = path.join(localQueue, file);
+            for (const { dir, file } of filesToSend) {
+                const filePath = path.join(dir, file);
                 const raw = fs.readFileSync(filePath, "utf-8");
                 try {
                     await this.sendRawViaSMTP(accountId, raw);
-                    fs.unlinkSync(filePath);
-                    console.log(`  [outbox] Sent local ${file} via SMTP`);
+                    // Move to sent/
+                    fs.renameSync(filePath, path.join(sentDir, file));
+                    console.log(`  [outbox] Sent ${file} via SMTP → sent/`);
                 }
                 catch (e) {
                     console.error(`  [outbox] Send failed for ${file}: ${e.message}`);
@@ -1748,12 +1758,13 @@ export class ImapManager extends EventEmitter {
             const outboxPath = await this.ensureOutbox(accountId);
             const client = await this.createClientWithLimit(accountId);
             try {
-                for (const file of files) {
-                    const filePath = path.join(localQueue, file);
+                for (const { dir, file } of filesToSend) {
+                    const filePath = path.join(dir, file);
                     const raw = fs.readFileSync(filePath, "utf-8");
                     await client.appendMessage(outboxPath, raw, ["\\Seen"]);
-                    fs.unlinkSync(filePath);
-                    console.log(`  [outbox] Moved local ${file} to IMAP Outbox`);
+                    // Move to sent/
+                    fs.renameSync(filePath, path.join(sentDir, file));
+                    console.log(`  [outbox] Moved ${file} to IMAP Outbox → sent/`);
                 }
             }
             finally {

package/packages/mailx-service/index.js

@@ -396,11 +396,16 @@ export class MailxService {
         const envelope = this.db.getMessageByUid(accountId, uid);
         if (!envelope)
             throw new Error("Message not found");
+        // Update local DB immediately (local-first)
+        this.db.updateMessageFolder(accountId, uid, targetFolderId);
+        this.db.recalcFolderCounts(envelope.folderId);
+        this.db.recalcFolderCounts(targetFolderId);
+        // Sync to server in background
         if (targetAccountId && targetAccountId !== accountId) {
-            await this.imapManager.moveMessageCrossAccount(accountId, envelope.uid, envelope.folderId, targetAccountId, targetFolderId);
+            this.imapManager.moveMessageCrossAccount(accountId, envelope.uid, envelope.folderId, targetAccountId, targetFolderId).catch(e => console.error(`  Move sync failed: ${e.message}`));
         }
         else {
-            await this.imapManager.moveMessage(accountId, envelope.uid, envelope.folderId, targetFolderId);
+            this.imapManager.moveMessage(accountId, envelope.uid, envelope.folderId, targetFolderId).catch(e => console.error(`  Move sync failed: ${e.message}`));
         }
     }
     async moveMessages(accountId, uids, targetFolderId) {
@@ -410,7 +415,16 @@ export class MailxService {
                 return null;
             return { uid: env.uid, folderId: env.folderId };
         }).filter(m => m !== null);
-        await this.imapManager.moveMessages(accountId, messages, targetFolderId);
+        // Update local DB immediately
+        for (const msg of messages) {
+            if (msg) {
+                this.db.updateMessageFolder(accountId, msg.uid, targetFolderId);
+                this.db.recalcFolderCounts(msg.folderId);
+            }
+        }
+        this.db.recalcFolderCounts(targetFolderId);
+        // Sync to server in background
+        this.imapManager.moveMessages(accountId, messages, targetFolderId).catch(e => console.error(`  Move sync failed: ${e.message}`));
     }
     async undeleteMessage(accountId, uid, folderId) {
         await this.imapManager.undeleteMessage(accountId, uid, folderId);

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

@@ -57,6 +57,7 @@ export declare class MailxDB {
     getMessageByUid(accountId: string, uid: number, folderId?: number): MessageEnvelope;
     getMessageBodyPath(accountId: string, uid: number): string;
     updateMessageFlags(accountId: string, uid: number, flags: string[]): void;
+    updateMessageFolder(accountId: string, uid: number, targetFolderId: number): void;
     updateBodyPath(accountId: string, uid: number, bodyPath: string): void;
     /** Get messages without cached bodies (for background prefetch) */
     getMessagesWithoutBody(accountId: string, limit?: number): {

package/packages/mailx-store/db.js

@@ -317,6 +317,9 @@ export class MailxDB {
     updateMessageFlags(accountId, uid, flags) {
         this.db.prepare("UPDATE messages SET flags_json = ? WHERE account_id = ? AND uid = ?").run(JSON.stringify(flags), accountId, uid);
     }
+    updateMessageFolder(accountId, uid, targetFolderId) {
+        this.db.prepare("UPDATE messages SET folder_id = ? WHERE account_id = ? AND uid = ?").run(targetFolderId, accountId, uid);
+    }
     updateBodyPath(accountId, uid, bodyPath) {
         this.db.prepare("UPDATE messages SET body_path = ? WHERE account_id = ? AND uid = ?").run(bodyPath, accountId, uid);
     }